stmmac: intel: Check return value of clk_prepare_enable()
Subsystems (4)
PATCH 1/5 stmmac: intel: Check return value of clk_prepare_enable()
clk_prepare_enable() might fail, we have to check its returned value.
While at it, remove leftover in stmmac_pci, also remove unneeded condition for NULL-aware clk_unregister_fixed_rate() call and call it when stmmac_dvr_probe() fails.
--- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 18 ++++++++++++++---- .../net/ethernet/stmicro/stmmac/stmmac_pci.c | 3 --- 2 files changed, 14 insertions(+), 7 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +14 -4
@@ -252,6 +252,7 @@ static void common_default_data(struct plat_stmmacenet_data *plat)static int intel_mgbe_common_data (struct pci_dev *pdev,struct plat_stmmacenet_data *plat) { +int ret;int i; plat->clk_csr =5 ;
@@ -324,7 +325,12 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,dev_warn (&pdev->dev,"Fail to register stmmac-clk\n" ); plat->stmmac_clk =NULL ; } -clk_prepare_enable (plat->stmmac_clk); + + ret =clk_prepare_enable (plat->stmmac_clk); +if (ret) { +clk_unregister_fixed_rate (plat->stmmac_clk); +return ret; + }/* Set default value for multicast hash bins */ plat->multicast_filter_bins =HASH_TABLE_SIZE ;
@@ -657,7 +663,12 @@ static int intel_eth_pci_probe(struct pci_dev *pdev, res.wol_irq = pdev->irq; res.irq = pdev->irq; -return stmmac_dvr_probe (&pdev->dev, plat, &res); + ret =stmmac_dvr_probe (&pdev->dev, plat, &res); +if (ret) { +clk_unregister_fixed_rate (plat->stmmac_clk); + } + +return ret; }/**
@@ -675,8 +686,7 @@ static void intel_eth_pci_remove(struct pci_dev *pdev)stmmac_dvr_remove (&pdev->dev); -if (priv->plat->stmmac_clk) -clk_unregister_fixed_rate (priv->plat->stmmac_clk); +clk_unregister_fixed_rate (priv->plat->stmmac_clk);for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +0 -3
@@ -223,9 +223,6 @@ static void stmmac_pci_remove(struct pci_dev *pdev)stmmac_dvr_remove (&pdev->dev); -if (priv->plat->stmmac_clk) -clk_unregister_fixed_rate (priv->plat->stmmac_clk); -for (i =0 ; i <PCI_STD_NUM_BARS ; i++) {if (pci_resource_len (pdev, i) ==0 )continue ;
Signature · 1 line
2.26.2
PATCH 2/5 stmmac: intel: Remove unnecessary loop for PCI BARs
Copy'n'paste without thinking is not a good idea and in this case it brought unnecessary loop over PCI BAR resources which was needed to workaround one of STMicro RVP boards. Remove unnecessary loops from Intel driver.
--- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +5 -18
@@ -606,7 +606,6 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,struct intel_priv_data *intel_priv;struct plat_stmmacenet_data *plat;struct stmmac_resources res; -int i;int ret; intel_priv = devm_kzalloc(&pdev->dev, sizeof(*intel_priv),
@@ -637,15 +636,9 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,return ret; } -/* Get the base address of device */ -for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { -if (pci_resource_len (pdev, i) ==0 ) -continue ; - ret =pcim_iomap_regions (pdev,BIT (i),pci_name (pdev)); -if (ret) -return ret; -break ; - } + ret =pcim_iomap_regions (pdev,BIT (0 ),pci_name (pdev)); +if (ret) +return ret;pci_set_master (pdev);
@@ -659,7 +652,7 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,pci_enable_msi (pdev);memset (&res,0 ,sizeof (res)); - res.addr =pcim_iomap_table (pdev)[i]; + res.addr =pcim_iomap_table (pdev)[0 ]; res.wol_irq = pdev->irq; res.irq = pdev->irq;
@@ -682,18 +675,12 @@ static void intel_eth_pci_remove(struct pci_dev *pdev) {struct net_device *ndev =dev_get_drvdata (&pdev->dev);struct stmmac_priv *priv =netdev_priv (ndev); -int i;stmmac_dvr_remove (&pdev->dev);clk_unregister_fixed_rate (priv->plat->stmmac_clk); -for (i =0 ; i <PCI_STD_NUM_BARS ; i++) { -if (pci_resource_len (pdev, i) ==0 ) -continue ; -pcim_iounmap_regions (pdev,BIT (i)); -break ; - } +pcim_iounmap_regions (pdev,BIT (0 ));pci_disable_device (pdev); }
Signature · 1 line
2.26.2
PATCH 3/5 stmmac: intel: Convert to use pci_alloc_irq_vectors() API
In reply to Andy Shevchenkopci_enable_msi() is deprecated API, thus, switch to modern pci_alloc_irq_vectors().
--- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +8 -3
@@ -649,15 +649,18 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,if (ret)return ret; -pci_enable_msi (pdev); + ret =pci_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_ALL_TYPES ); +if (ret <0 ) +return ret;memset (&res,0 ,sizeof (res)); res.addr =pcim_iomap_table (pdev)[0 ]; - res.wol_irq = pdev->irq; - res.irq = pdev->irq; + res.wol_irq =pci_irq_vector (pdev,0 ); + res.irq =pci_irq_vector (pdev,0 ); ret =stmmac_dvr_probe (&pdev->dev, plat, &res);if (ret) { +pci_free_irq_vectors (pdev);clk_unregister_fixed_rate (plat->stmmac_clk); }
@@ -678,6 +681,8 @@ static void intel_eth_pci_remove(struct pci_dev *pdev)stmmac_dvr_remove (&pdev->dev); +pci_free_irq_vectors (pdev); +clk_unregister_fixed_rate (priv->plat->stmmac_clk);pcim_iounmap_regions (pdev,BIT (0 ));
Signature · 1 line
2.26.2
PATCH 4/5 stmmac: intel: Eliminate useless conditions and variables
In reply to Andy ShevchenkoThere are useless conditions like
func()
{
...
int ret;
...
ret = foo();
if (ret)
return ret;
return 0;
}which may be replaced with direct return statement, what we have done here.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +2 -12
@@ -347,16 +347,11 @@ static int intel_mgbe_common_data(struct pci_dev *pdev,static int ehl_common_data (struct pci_dev *pdev,struct plat_stmmacenet_data *plat) { -int ret; - plat->rx_queues_to_use =8 ; plat->tx_queues_to_use =8 ; plat->clk_ptp_rate =200000000 ; - ret =intel_mgbe_common_data (pdev, plat); -if (ret) -return ret; -return 0 ; +return intel_mgbe_common_data (pdev, plat); } static int ehl_sgmii_data(struct pci_dev *pdev,
@@ -457,16 +452,11 @@ static struct stmmac_pci_info ehl_pse1_sgmii1g_pci_info = {static int tgl_common_data (struct pci_dev *pdev,struct plat_stmmacenet_data *plat) { -int ret; - plat->rx_queues_to_use =6 ; plat->tx_queues_to_use =4 ; plat->clk_ptp_rate =200000000 ; - ret =intel_mgbe_common_data (pdev, plat); -if (ret) -return ret; -return 0 ; +return intel_mgbe_common_data (pdev, plat); } static int tgl_sgmii_data(struct pci_dev *pdev,
Signature · 1 line
2.26.2
PATCH 5/5 stmmac: intel: Fix indentation to put on one line affected code
In reply to Andy ShevchenkoThere is no competition to get more LOCs into the kernel, and driver can look better and have improved readability without those additional line breaks.
While at it, shorten info structures that they are all PCI, at the end it's a PCI driver for Intel hardware.
--- .../net/ethernet/stmicro/stmmac/dwmac-intel.c | 92 +++++++------------ 1 file changed, 32 insertions(+), 60 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +32 -60
@@ -83,13 +83,9 @@ static int intel_serdes_powerup(struct net_device *ndev, void *priv_data) serdes_phy_addr = intel_priv->mdio_adhoc_addr;/* assert clk_req */ - data =mdiobus_read (priv->mii, serdes_phy_addr, -SERDES_GCR0 ); - + data =mdiobus_read (priv->mii, serdes_phy_addr,SERDES_GCR0 ); data |=SERDES_PLL_CLK ; - -mdiobus_write (priv->mii, serdes_phy_addr, -SERDES_GCR0 , data); +mdiobus_write (priv->mii, serdes_phy_addr,SERDES_GCR0 , data);/* check for clk_ack assertion */ data = serdes_status_poll(priv, serdes_phy_addr,
@@ -103,13 +99,9 @@ static int intel_serdes_powerup(struct net_device *ndev, void *priv_data) }/* assert lane reset */ - data =mdiobus_read (priv->mii, serdes_phy_addr, -SERDES_GCR0 ); - + data =mdiobus_read (priv->mii, serdes_phy_addr,SERDES_GCR0 ); data |=SERDES_RST ; - -mdiobus_write (priv->mii, serdes_phy_addr, -SERDES_GCR0 , data); +mdiobus_write (priv->mii, serdes_phy_addr,SERDES_GCR0 , data);/* check for assert lane reset reflection */ data = serdes_status_poll(priv, serdes_phy_addr,
@@ -123,14 +115,12 @@ static int intel_serdes_powerup(struct net_device *ndev, void *priv_data) }/* move power state to P0 */ - data =mdiobus_read (priv->mii, serdes_phy_addr, -SERDES_GCR0 ); + data =mdiobus_read (priv->mii, serdes_phy_addr,SERDES_GCR0 ); data &= ~SERDES_PWR_ST_MASK ; data |=SERDES_PWR_ST_P0 <<SERDES_PWR_ST_SHIFT ; -mdiobus_write (priv->mii, serdes_phy_addr, -SERDES_GCR0 , data); +mdiobus_write (priv->mii, serdes_phy_addr,SERDES_GCR0 , data);/* Check for P0 state */ data = serdes_status_poll(priv, serdes_phy_addr,
@@ -159,14 +149,12 @@ static void intel_serdes_powerdown(struct net_device *ndev, void *intel_data) serdes_phy_addr = intel_priv->mdio_adhoc_addr;/* move power state to P3 */ - data =mdiobus_read (priv->mii, serdes_phy_addr, -SERDES_GCR0 ); + data =mdiobus_read (priv->mii, serdes_phy_addr,SERDES_GCR0 ); data &= ~SERDES_PWR_ST_MASK ; data |=SERDES_PWR_ST_P3 <<SERDES_PWR_ST_SHIFT ; -mdiobus_write (priv->mii, serdes_phy_addr, -SERDES_GCR0 , data); +mdiobus_write (priv->mii, serdes_phy_addr,SERDES_GCR0 , data);/* Check for P3 state */ data = serdes_status_poll(priv, serdes_phy_addr,
@@ -180,13 +168,9 @@ static void intel_serdes_powerdown(struct net_device *ndev, void *intel_data) }/* de-assert clk_req */ - data =mdiobus_read (priv->mii, serdes_phy_addr, -SERDES_GCR0 ); - + data =mdiobus_read (priv->mii, serdes_phy_addr,SERDES_GCR0 ); data &= ~SERDES_PLL_CLK ; - -mdiobus_write (priv->mii, serdes_phy_addr, -SERDES_GCR0 , data); +mdiobus_write (priv->mii, serdes_phy_addr,SERDES_GCR0 , data);/* check for clk_ack de-assert */ data = serdes_status_poll(priv, serdes_phy_addr,
@@ -200,13 +184,9 @@ static void intel_serdes_powerdown(struct net_device *ndev, void *intel_data) }/* de-assert lane reset */ - data =mdiobus_read (priv->mii, serdes_phy_addr, -SERDES_GCR0 ); - + data =mdiobus_read (priv->mii, serdes_phy_addr,SERDES_GCR0 ); data &= ~SERDES_RST ; - -mdiobus_write (priv->mii, serdes_phy_addr, -SERDES_GCR0 , data); +mdiobus_write (priv->mii, serdes_phy_addr,SERDES_GCR0 , data);/* check for de-assert lane reset reflection */ data = serdes_status_poll(priv, serdes_phy_addr,
@@ -367,7 +347,7 @@ static int ehl_sgmii_data(struct pci_dev *pdev,return ehl_common_data (pdev, plat); } -static struct stmmac_pci_info ehl_sgmii1g_pci_info = { +static struct stmmac_pci_info ehl_sgmii1g_info = { .setup = ehl_sgmii_data, };
@@ -381,7 +361,7 @@ static int ehl_rgmii_data(struct pci_dev *pdev,return ehl_common_data (pdev, plat); } -static struct stmmac_pci_info ehl_rgmii1g_pci_info = { +static struct stmmac_pci_info ehl_rgmii1g_info = { .setup = ehl_rgmii_data, };
@@ -400,7 +380,7 @@ static int ehl_pse0_rgmii1g_data(struct pci_dev *pdev,return ehl_pse0_common_data (pdev, plat); } -static struct stmmac_pci_info ehl_pse0_rgmii1g_pci_info = { +static struct stmmac_pci_info ehl_pse0_rgmii1g_info = { .setup = ehl_pse0_rgmii1g_data, };
@@ -413,7 +393,7 @@ static int ehl_pse0_sgmii1g_data(struct pci_dev *pdev,return ehl_pse0_common_data (pdev, plat); } -static struct stmmac_pci_info ehl_pse0_sgmii1g_pci_info = { +static struct stmmac_pci_info ehl_pse0_sgmii1g_info = { .setup = ehl_pse0_sgmii1g_data, };
@@ -432,7 +412,7 @@ static int ehl_pse1_rgmii1g_data(struct pci_dev *pdev,return ehl_pse1_common_data (pdev, plat); } -static struct stmmac_pci_info ehl_pse1_rgmii1g_pci_info = { +static struct stmmac_pci_info ehl_pse1_rgmii1g_info = { .setup = ehl_pse1_rgmii1g_data, };
@@ -445,7 +425,7 @@ static int ehl_pse1_sgmii1g_data(struct pci_dev *pdev,return ehl_pse1_common_data (pdev, plat); } -static struct stmmac_pci_info ehl_pse1_sgmii1g_pci_info = { +static struct stmmac_pci_info ehl_pse1_sgmii1g_info = { .setup = ehl_pse1_sgmii1g_data, };
@@ -470,7 +450,7 @@ static int tgl_sgmii_data(struct pci_dev *pdev,return tgl_common_data (pdev, plat); } -static struct stmmac_pci_info tgl_sgmii1g_pci_info = { +static struct stmmac_pci_info tgl_sgmii1g_info = { .setup = tgl_sgmii_data, };
@@ -573,7 +553,7 @@ static int quark_default_data(struct pci_dev *pdev,return 0 ; } -static const struct stmmac_pci_info quark_pci_info = { +static const struct stmmac_pci_info quark_info = { .setup = quark_default_data, };
@@ -598,8 +578,7 @@ static int intel_eth_pci_probe(struct pci_dev *pdev,struct stmmac_resources res;int ret; - intel_priv =devm_kzalloc (&pdev->dev,sizeof (*intel_priv), -GFP_KERNEL ); + intel_priv =devm_kzalloc (&pdev->dev,sizeof (*intel_priv),GFP_KERNEL );if (!intel_priv)return -ENOMEM ;
@@ -734,26 +713,19 @@ static SIMPLE_DEV_PM_OPS(intel_eth_pm_ops, intel_eth_pci_suspend,#define PCI_DEVICE_ID_INTEL_TGL_SGMII1G_ID 0xa0acstatic const struct pci_device_id intel_eth_pci_id_table[] = { - {PCI_DEVICE_DATA (INTEL ,QUARK_ID , &quark_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_RGMII1G_ID , &ehl_rgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_SGMII1G_ID , &ehl_sgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_SGMII2G5_ID , &ehl_sgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_PSE0_RGMII1G_ID , - &ehl_pse0_rgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_PSE0_SGMII1G_ID , - &ehl_pse0_sgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_PSE0_SGMII2G5_ID , - &ehl_pse0_sgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_PSE1_RGMII1G_ID , - &ehl_pse1_rgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_PSE1_SGMII1G_ID , - &ehl_pse1_sgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,EHL_PSE1_SGMII2G5_ID , - &ehl_pse1_sgmii1g_pci_info) }, - {PCI_DEVICE_DATA (INTEL ,TGL_SGMII1G_ID , &tgl_sgmii1g_pci_info) }, + {PCI_DEVICE_DATA (INTEL ,QUARK_ID , &quark_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_RGMII1G_ID , &ehl_rgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_SGMII1G_ID , &ehl_sgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_SGMII2G5_ID , &ehl_sgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_PSE0_RGMII1G_ID , &ehl_pse0_rgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_PSE0_SGMII1G_ID , &ehl_pse0_sgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_PSE0_SGMII2G5_ID , &ehl_pse0_sgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_PSE1_RGMII1G_ID , &ehl_pse1_rgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_PSE1_SGMII1G_ID , &ehl_pse1_sgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,EHL_PSE1_SGMII2G5_ID , &ehl_pse1_sgmii1g_info) }, + {PCI_DEVICE_DATA (INTEL ,TGL_SGMII1G_ID , &tgl_sgmii1g_info) }, {} }; -MODULE_DEVICE_TABLE (pci, intel_eth_pci_id_table);static struct pci_driver intel_eth_pci_driver = {
Signature · 1 line
2.26.2
Quoted 5 lines · Andy Shevchenko
clk_prepare_enable()might fail, we have to check its returned value.While at it, remove leftover in
stmmac_pci, also remove unneeded condition for NULL-awareclk_unregister_fixed_rate()call and call it whenstmmac_dvr_probe()fails.
Please, ignore this series. It appears that there is one more issue with proper error handling. I'll send v2 soon after additional testing.
Signature · 2 lines
With Best Regards, Andy Shevchenko
David Miller
maintainerPlease post your patch series with a proper header posting, explaining what the patch series does, how it does it, and why you are doing it that way.
Thank you.