Skip to content

Commit 0835fbe

Browse files
shawn1221gregkh
authored andcommitted
PCI: dw-rockchip: Remove PCIE_L0S_ENTRY check from rockchip_pcie_link_up()
commit 7d9b5d6 upstream. rockchip_pcie_link_up() currently has two issues: 1. Value 0x11 of PCIE_L0S_ENTRY corresponds to L0 state, not L0S. So the naming is wrong from the very beginning. 2. Checking for value 0x11 treats other states like L0S and L1 as link down, which is wrong. Hence, remove the PCIE_L0S_ENTRY check and also its definition. This allows adding ASPM support in the successive commits. Fixes: 0e898eb ("PCI: rockchip-dwc: Add Rockchip RK356X host controller driver") Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> [mani: commit message rewording] Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Niklas Cassel <cassel@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Cc: stable@vger.kernel.org Link: https://patch.msgid.link/1744850111-236269-1-git-send-email-shawn.lin@rock-chips.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent be0cf75 commit 0835fbe

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

drivers/pci/controller/dwc/pcie-dw-rockchip.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
#define PCIE_LINKUP (PCIE_SMLH_LINKUP | PCIE_RDLH_LINKUP)
4545
#define PCIE_RDLH_LINK_UP_CHGED BIT(1)
4646
#define PCIE_LINK_REQ_RST_NOT_INT BIT(2)
47-
#define PCIE_L0S_ENTRY 0x11
4847
#define PCIE_CLIENT_GENERAL_CONTROL 0x0
4948
#define PCIE_CLIENT_INTR_STATUS_LEGACY 0x8
5049
#define PCIE_CLIENT_INTR_MASK_LEGACY 0x1c
@@ -177,8 +176,7 @@ static int rockchip_pcie_link_up(struct dw_pcie *pci)
177176
struct rockchip_pcie *rockchip = to_rockchip_pcie(pci);
178177
u32 val = rockchip_pcie_get_ltssm(rockchip);
179178

180-
if ((val & PCIE_LINKUP) == PCIE_LINKUP &&
181-
(val & PCIE_LTSSM_STATUS_MASK) == PCIE_L0S_ENTRY)
179+
if ((val & PCIE_LINKUP) == PCIE_LINKUP)
182180
return 1;
183181

184182
return 0;

0 commit comments

Comments
 (0)