mirror of
https://github.com/openwrt/openwrt.git
synced 2025-03-11 06:54:21 +00:00
mvebu: remove patch that was applied into linux stable
The patch PCI: aardvark: Don't touch PCIe registers if no card connected was applied into Linux stable version 5.4.163. Remove it from patches-5.4. (It applied even though it was applied already, resulting in repeated code.) Fixes: 14940aee4566 ("kernel: bump 5.4 to 5.4.163") Signed-off-by: Marek Behún <marek.behun@nic.cz>
This commit is contained in:
parent
5beaa75d94
commit
96b5962704
@ -1,50 +0,0 @@
|
|||||||
From 70e380250c3621c55ff218cbaf2272830d9dbb1d Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
|
|
||||||
Date: Thu, 2 Jul 2020 10:30:36 +0200
|
|
||||||
Subject: [PATCH] PCI: aardvark: Don't touch PCIe registers if no card
|
|
||||||
connected
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
When there is no PCIe card connected and advk_pcie_rd_conf() or
|
|
||||||
advk_pcie_wr_conf() is called for PCI bus which doesn't belong to emulated
|
|
||||||
root bridge, the aardvark driver throws the following error message:
|
|
||||||
|
|
||||||
advk-pcie d0070000.pcie: config read/write timed out
|
|
||||||
|
|
||||||
Obviously accessing PCIe registers of disconnected card is not possible.
|
|
||||||
|
|
||||||
Extend check in advk_pcie_valid_device() function for validating
|
|
||||||
availability of PCIe bus. If PCIe link is down, then the device is marked
|
|
||||||
as Not Found and the driver does not try to access these registers.
|
|
||||||
|
|
||||||
This is just an optimization to prevent accessing PCIe registers when card
|
|
||||||
is disconnected. Trying to access PCIe registers of disconnected card does
|
|
||||||
not cause any crash, kernel just needs to wait for a timeout. So if card
|
|
||||||
disappear immediately after checking for PCIe link (before accessing PCIe
|
|
||||||
registers), it does not cause any problems.
|
|
||||||
|
|
||||||
Link: https://lore.kernel.org/r/20200702083036.12230-1-pali@kernel.org
|
|
||||||
Signed-off-by: Pali Rohár <pali@kernel.org>
|
|
||||||
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
|
|
||||||
---
|
|
||||||
drivers/pci/controller/pci-aardvark.c | 7 +++++++
|
|
||||||
1 file changed, 7 insertions(+)
|
|
||||||
|
|
||||||
--- a/drivers/pci/controller/pci-aardvark.c
|
|
||||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
|
||||||
@@ -976,6 +976,13 @@ static bool advk_pcie_valid_device(struc
|
|
||||||
if (bus->number != pcie->root_bus_nr && !advk_pcie_link_up(pcie))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * If the link goes down after we check for link-up, nothing bad
|
|
||||||
+ * happens but the config access times out.
|
|
||||||
+ */
|
|
||||||
+ if (bus->number != pcie->root_bus_nr && !advk_pcie_link_up(pcie))
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
@ -31,7 +31,7 @@ Cc: <stable@vger.kernel.org> # 5.8+: ea17a0f153af: phy: marvell: comphy: Convert
|
|||||||
|
|
||||||
--- a/drivers/pci/controller/pci-aardvark.c
|
--- a/drivers/pci/controller/pci-aardvark.c
|
||||||
+++ b/drivers/pci/controller/pci-aardvark.c
|
+++ b/drivers/pci/controller/pci-aardvark.c
|
||||||
@@ -1533,7 +1533,9 @@ static int advk_pcie_enable_phy(struct a
|
@@ -1526,7 +1526,9 @@ static int advk_pcie_enable_phy(struct a
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = phy_power_on(pcie->phy);
|
ret = phy_power_on(pcie->phy);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user