PCI: imx6: Return the real error code
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/2 PCI: imx6: Return the real error code
From: Fabio Estevam <[email protected]>
When devm_request_irq() fails we should better return the real error code instead of returning a 'fake' one.
--- drivers/pci/host/pci-imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/host/pci-imx6.c +1 -1
@@ -539,7 +539,7 @@ static int __init imx6_add_pcie_port(struct pcie_port *pp, IRQF_SHARED, "mx6-pcie-msi", pp);if (ret) {dev_err (&pdev->dev,"failed to request MSI irq\n" ); -return -ENODEV ; +return ret; } }
Signature · 1 line
1.9.1
Fabio Estevam
reviewerPATCH 2/2 PCI: imx6: Add some defines for improving code readability
From: Fabio Estevam <[email protected]>
Instead of having some hardcoded values, it is preferred to use defines when possible.
--- drivers/pci/host/pci-imx6.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/host/pci-imx6.c +4 -2
@@ -55,6 +55,7 @@ struct imx6_pcie {#define PCIE_PL_PFLR_LINK_STATE_MASK (0x3f << 16)#define PCIE_PL_PFLR_FORCE_LINK (1 << 15)#define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28) +#define PCIE_PHY_DEBUG_R0_LTSSM_MASK 0x3f#define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)#define PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING (1 << 29)#define PCIE_PHY_DEBUG_R1_XMLH_LINK_UP (1 << 4)
@@ -74,6 +75,7 @@ struct imx6_pcie {/* PHY registers (not memory-mapped) */ #define PCIE_PHY_RX_ASIC_OUT 0x100D +#define PCIE_PHY_RX_ASIC_OUT_VALID 1#define PHY_RX_OVRD_IN_LO 0x1005#define PHY_RX_OVRD_IN_LO_RX_DATA_EN (1 << 5)
@@ -503,10 +505,10 @@ static int imx6_pcie_link_up(struct pcie_port *pp)pcie_phy_read (pp->dbi_base,PCIE_PHY_RX_ASIC_OUT , &rx_valid); debug_r0 =readl (pp->dbi_base +PCIE_PHY_DEBUG_R0 ); -if (rx_valid &0x01 ) +if (rx_valid &PCIE_PHY_RX_ASIC_OUT_VALID )return 0 ; -if ((debug_r0 &0x3f ) !=0x0d ) +if ((debug_r0 &PCIE_PHY_DEBUG_R0_LTSSM_MASK ) !=0x0d )return 0 ;dev_err (pp->dev,"transition to gen2 is stuck, reset PHY!\n" );
Signature · 1 line
1.9.1
Re: [PATCH 2/2] PCI: imx6: Add some defines for improving code readability
Am Donnerstag, den 10.09.2015, 20:43 -0300 schrieb Fabio Estevam:
Quoted 23 lines
From: Fabio Estevam <[email protected]>
Instead of having some hardcoded values, it is preferred to use defines when possible.
Signed-off-by Fabio Estevam <[email protected]>--- drivers/pci/host/pci-imx6.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/pci/host/pci-imx6.c +1
-0@@ -55,6 +55,7 @@ struct imx6_pcie {#define PCIE_PL_PFLR_LINK_STATE_MASK (0x3f << 16)#define PCIE_PL_PFLR_FORCE_LINK (1 << 15)#define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28) +#define PCIE_PHY_DEBUG_R0_LTSSM_MASK 0x3f#define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c)#define PCIE_PHY_DEBUG_R1_XMLH_LINK_IN_TRAINING (1 << 29)#define PCIE_PHY_DEBUG_R1_XMLH_LINK_UP (1 << 4)
drivers/pci/host/pci-imx6.c struct imx6_pcie { · line 78
Quoted 4 lines
drivers/pci/host/pci-imx6.c +1
-0@@ -74,6 +75,7 @@ struct imx6_pcie {/* PHY registers (not memory-mapped) */ #define PCIE_PHY_RX_ASIC_OUT 0x100D +#define PCIE_PHY_RX_ASIC_OUT_VALID 1
I know these defines are a bit inconsistent right now, but for new defines I would like them in a way that they are clearly visible as a bitfields. Please change this to (1 << 0).
For the LTSSM_MASK the same logic might also improve readability.
Regards,
Lucas
Quoted 16 lines
drivers/pci/host/pci-imx6.c +2
-2#define PHY_RX_OVRD_IN_LO 0x1005#define PHY_RX_OVRD_IN_LO_RX_DATA_EN (1 << 5)@@ -503,10 +505,10 @@ static int imx6_pcie_link_up(struct pcie_port *pp)pcie_phy_read (pp->dbi_base,PCIE_PHY_RX_ASIC_OUT , &rx_valid); debug_r0 =readl (pp->dbi_base +PCIE_PHY_DEBUG_R0 ); -if (rx_valid &0x01 ) +if (rx_valid &PCIE_PHY_RX_ASIC_OUT_VALID )return 0 ; -if ((debug_r0 &0x3f ) !=0x0d ) +if ((debug_r0 &PCIE_PHY_DEBUG_R0_LTSSM_MASK ) !=0x0d )return 0 ;dev_err (pp->dev,"transition to gen2 is stuck, reset PHY!\n" );
Signature · 2 lines
Pengutronix e.K. | Lucas Stach | Industrial Linux Solutions | http://www.pengutronix.de/ |
Am Donnerstag, den 10.09.2015, 20:43 -0300 schrieb Fabio Estevam:
Quoted 6 lines
From: Fabio Estevam <[email protected]>
When
devm_request_irq()fails we should better return the real error code instead of returning a 'fake' one.Signed-off-by Fabio Estevam <[email protected]>
Quoted 17 lines
--- drivers/pci/host/pci-imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/host/pci-imx6.c +1
-1@@ -539,7 +539,7 @@ static int __init imx6_add_pcie_port(struct pcie_port *pp, IRQF_SHARED, "mx6-pcie-msi", pp);if (ret) {dev_err (&pdev->dev,"failed to request MSI irq\n" ); -return -ENODEV ; +return ret; } }
Signature · 2 lines
Pengutronix e.K. | Lucas Stach | Industrial Linux Solutions | http://www.pengutronix.de/ |