linux-stable.git/drivers/pci/controller, branch v5.4.26

PCI: iproc: Apply quirk_paxc_bridge() for module as well as built-in

2020-02-24T07:36:35+00:00

[ Upstream commit 574f29036fce385e28617547955dd6911d375025 ]

Previously quirk_paxc_bridge() was applied when the iproc driver was
built-in, but not when it was compiled as a module.

This happened because it was under #ifdef CONFIG_PCIE_IPROC_PLATFORM:
PCIE_IPROC_PLATFORM=y causes CONFIG_PCIE_IPROC_PLATFORM to be defined, but
PCIE_IPROC_PLATFORM=m causes CONFIG_PCIE_IPROC_PLATFORM_MODULE to be
defined.

Move quirk_paxc_bridge() to pcie-iproc.c and drop the #ifdef so the quirk
is always applied, whether iproc is built-in or a module.

[bhelgaas: commit log, move to pcie-iproc.c, not pcie-iproc-platform.c]
Link: https://lore.kernel.org/r/20191211174511.89713-1-wei.liu@kernel.org
Signed-off-by: Wei Liu 
Signed-off-by: Bjorn Helgaas 
Signed-off-by: Sasha Levin

PCI: tegra: Fix afi_pex2_ctrl reg offset for Tegra30

2020-02-14T21:34:09+00:00

commit 21a92676e1fe292acb077b13106b08c22ed36b14 upstream.

Fix AFI_PEX2_CTRL reg offset for Tegra30 by moving it from the Tegra20
SoC struct where it erroneously got added. This fixes the AFI_PEX2_CTRL
reg offset being uninitialised subsequently failing to bring up the
third PCIe port.

Fixes: adb2653b3d2e ("PCI: tegra: Add AFI_PEX2_CTRL reg offset as part of SoC struct")
Signed-off-by: Marcel Ziswiler 
Signed-off-by: Lorenzo Pieralisi 
Reviewed-by: Andrew Murray 
Acked-by: Thierry Reding 
Signed-off-by: Greg Kroah-Hartman

PCI: keystone: Fix error handling when "num-viewport" DT property is not populated

2020-02-11T12:35:19+00:00

commit b0de922af53eede340986a2d05b6cd4b6d6efa43 upstream.

Fix error handling when "num-viewport" DT property is not populated.

Fixes: 23284ad677a9 ("PCI: keystone: Add support for PCIe EP in AM654x Platforms")
Signed-off-by: Kishon Vijay Abraham I 
Signed-off-by: Lorenzo Pieralisi 
Cc: stable@vger.kernel.org # v5.2+
Signed-off-by: Greg Kroah-Hartman

PCI: keystone: Fix link training retries initiation

2020-02-11T12:35:19+00:00

commit 6df19872d881641e6394f93ef2938cffcbdae5bb upstream.

ks_pcie_stop_link() function does not clear LTSSM_EN_VAL bit so
link training was not triggered more than once after startup.
In configurations where link can be unstable during early boot,
for example, under low temperature, it will never be established.

Fixes: 0c4ffcfe1fbc ("PCI: keystone: Add TI Keystone PCIe driver")
Signed-off-by: Yurii Monakov 
Signed-off-by: Lorenzo Pieralisi 
Acked-by: Andrew Murray 
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman

PCI: keystone: Fix outbound region mapping

2020-02-11T12:35:18+00:00

commit 2d0c3fbe43fa0e6fcb7a6c755c5f4cd702c0d2f4 upstream.

The Keystone outbound Address Translation Unit (ATU) maps PCI MMIO space in
8 MB windows.  When programming the ATU windows, we previously incremented
the starting address by 8, not 8 MB, so all the windows were mapped to the
first 8 MB.  Therefore, only 8 MB of MMIO space was accessible.

Update the loop so it increments the starting address by 8 MB, not 8, so
more MMIO space is accessible.

Fixes: e75043ad9792 ("PCI: keystone: Cleanup outbound window configuration")
Link: https://lore.kernel.org/r/20191004154811.GA31397@monakov-y.office.kontur-niirs.ru
Signed-off-by: Yurii Monakov 
[bhelgaas: commit log]
Signed-off-by: Bjorn Helgaas 
Signed-off-by: Lorenzo Pieralisi 
Acked-by: Andrew Murray 
Acked-by: Kishon Vijay Abraham I 
Cc: stable@vger.kernel.org	# v4.20+
Signed-off-by: Greg Kroah-Hartman

PCI: tegra: Fix return value check of pm_runtime_get_sync()

2020-02-11T12:35:18+00:00

commit 885199148442f56b880995d703d2ed03b6481a3c upstream.

pm_runtime_get_sync() returns the device's usage counter. This might
be >0 if the device is already powered up or CONFIG_PM is disabled.

Abort probe function on real error only.

Fixes: da76ba50963b ("PCI: tegra: Add power management support")
Link: https://lore.kernel.org/r/20191216111825.28136-1-david.engraf@sysgo.com
Signed-off-by: David Engraf 
Signed-off-by: Bjorn Helgaas 
Signed-off-by: Lorenzo Pieralisi 
Acked-by: Andrew Murray 
Cc: stable@vger.kernel.org	# v4.17+
Signed-off-by: Greg Kroah-Hartman

PCI: mobiveil: Fix csr_read()/write() build issue

2020-01-26T09:01:04+00:00

[ Upstream commit 4906c05b87d44c19b225935e24d62e4480ca556d ]

RISCV has csr_read()/write() macros in arch/riscv/include/asm/csr.h.

The same function naming is used in the PCI mobiveil driver thus
causing build error.

Rename csr_[read,write][l,] to mobiveil_csr_read()/write() to fix it.

drivers/pci/controller/pcie-mobiveil.c:238:69: error: macro "csr_read" passed 3 arguments, but takes just 1
 static u32 csr_read(struct mobiveil_pcie *pcie, u32 off, size_t size)

drivers/pci/controller/pcie-mobiveil.c:253:80: error: macro "csr_write" passed 4 arguments, but takes just 2
 static void csr_write(struct mobiveil_pcie *pcie, u32 val, u32 off, size_t size)

Fixes: bcbe0d9a8d93 ("PCI: mobiveil: Unify register accessors")
Signed-off-by: Kefeng Wang 
Signed-off-by: Lorenzo Pieralisi 
Reviewed-by: Andrew Murray 
Cc: Hou Zhiqiang 
Cc: Lorenzo Pieralisi 
Cc: Minghuan Lian 
Cc: Subrahmanya Lingappa 
Cc: Andrew Murray 
Signed-off-by: Sasha Levin

PCI: dwc: Fix find_next_bit() usage

2020-01-17T18:48:53+00:00

commit 1137e61dcb99f7f8b54e77ed83f68b5b485a3e34 upstream.

find_next_bit() takes a parameter of size long, and performs arithmetic
that assumes that the argument is of size long.

Therefore we cannot pass a u32, since this will cause find_next_bit()
to read outside the stack buffer and will produce the following print:
BUG: KASAN: stack-out-of-bounds in find_next_bit+0x38/0xb0

Fixes: 1b497e6493c4 ("PCI: dwc: Fix uninitialized variable in dw_handle_msi_irq()")
Tested-by: Bjorn Andersson 
Signed-off-by: Niklas Cassel 
Signed-off-by: Lorenzo Pieralisi 
Reviewed-by: Andrew Murray 
Acked-by: Gustavo Pimentel 
Signed-off-by: Greg Kroah-Hartman

PCI: aardvark: Fix PCI_EXP_RTCTL register configuration

2020-01-17T18:48:53+00:00

commit c0f05a6ab52535c1bf5f43272eede3e11c5701a5 upstream.

PCI_EXP_RTCTL is used to activate PME interrupt only, so writing into it
should not modify other interrupts' mask. The ISR mask polarity was also
inverted, when PCI_EXP_RTCTL_PMEIE is set PCIE_MSG_PM_PME_MASK mask bit
should actually be cleared.

Fixes: 8a3ebd8de328 ("PCI: aardvark: Implement emulated root PCI bridge config space")
Signed-off-by: Remi Pommarel 
Signed-off-by: Lorenzo Pieralisi 
Acked-by: Thomas Petazzoni 
Signed-off-by: Greg Kroah-Hartman

PCI: aardvark: Use LTSSM state to build link training flag

2020-01-17T18:48:53+00:00

commit 364b3f1ff8f096d45f042a9c85daf7a1fc78413e upstream.

Aardvark's PCI_EXP_LNKSTA_LT flag in its link status register is not
implemented and does not reflect the actual link training state (the
flag is always set to 0). In order to support link re-training feature
this flag has to be emulated. The Link Training and Status State
Machine (LTSSM) flag in Aardvark LMI config register could be used as
a link training indicator. Indeed if the LTSSM is in L0 or upper state
then link training has completed (see [1]).

Unfortunately because after asking a link retraining it takes a while
for the LTSSM state to become less than 0x10 (due to L0s to recovery
state transition delays), LTSSM can still be in L0 while link training
has not finished yet. So this waits for link to be in recovery or lesser
state before returning after asking for a link retrain.

[1] "PCI Express Base Specification", REV. 4.0
    PCI Express, February 19 2014, Table 4-14

Fixes: 8a3ebd8de328 ("PCI: aardvark: Implement emulated root PCI bridge config space")
Tested-by: Marc Zyngier 
Signed-off-by: Remi Pommarel 
Signed-off-by: Lorenzo Pieralisi 
Reviewed-by: Andrew Murray 
Acked-by: Thomas Petazzoni 
Signed-off-by: Greg Kroah-Hartman