PCI: imx6: Return the real error code
Subsystems (2)
Fabio Estevam
reviewerPATCH v2 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.
---
Changes since v1:
- None
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 v2 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.
---
Changes since v1:
- Make clear that the defines represent bitfields (Lucas)
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 << 0)#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 << 0)#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 v2 2/2] PCI: imx6: Add some defines for improving code readability
Am Freitag, den 11.09.2015, 09:08 -0300 schrieb Fabio Estevam:
Quoted 6 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]>
Quoted 40 lines
---
Changes since v1:
- Make clear that the defines represent bitfields (Lucas)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 << 0)#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 << 0)#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/ |
Quoted 7 lines · Fabio Estevam
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]>Reviewed-by Lucas Stach <[email protected]>
Applied both of these to pci/host-imx6 for v4.4 with changelogs:
commit 89b2d4f14b147bcb499f5e7b1c6e6ce082a58e8f
Author: Fabio Estevam <[email protected]>
Date: Fri Sep 11 09:08:52 2015 -0300
PCI: imx6: Return real error code from imx6_add_pcie_port()
When devm_request_irq() fails, imx6_add_pcie_port() should return the real error code instead of always returning -ENODEV.
commit 80ec3f14471dfb2536bfc4de36980fb42361b6e4
Author: Fabio Estevam <[email protected]>
Date: Fri Sep 11 09:08:53 2015 -0300
PCI: imx6: Add #defines to improve code readability
Add #defines and use them instead of hardcoded values.
Thanks!
Quoted 27 lines
---
Changes since v1:
- Nonedrivers/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 · 6 lines
1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html