| Message ID | TYZPR01MB5556B8833322A83632709631C9762@TYZPR01MB5556.apcprd01.prod.exchangelabs.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ipq5018: enable ethernet support | expand |
Hi Ziyang, kernel test robot noticed the following build errors: [auto build test ERROR on robh/for-next] [also build test ERROR on clk/clk-next pza/reset/next linus/master v6.8-rc1 next-20240123] [cannot apply to pza/imx-drm/next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Ziyang-Huang/net-phy-Introduce-Qualcomm-IPQ5018-internal-PHY-driver/20240121-204840 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next patch link: https://lore.kernel.org/r/TYZPR01MB5556B8833322A83632709631C9762%40TYZPR01MB5556.apcprd01.prod.exchangelabs.com patch subject: [PATCH 3/8] net: stmmac: Introduce Qualcomm IPQ50xx DWMAC driver config: powerpc-allmodconfig (https://download.01.org/0day-ci/archive/20240124/202401241342.SL4CiC8m-lkp@intel.com/config) compiler: clang version 18.0.0git (https://github.com/llvm/llvm-project a31a60074717fc40887cfe132b77eec93bedd307) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240124/202401241342.SL4CiC8m-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401241342.SL4CiC8m-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c:94:13: error: call to undeclared function 'stmmac_probe_config_dt'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 94 | plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); | ^ drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c:94:13: note: did you mean 'devm_stmmac_probe_config_dt'? drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h:15:1: note: 'devm_stmmac_probe_config_dt' declared here 15 | devm_stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac); | ^ >> drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c:94:11: error: incompatible integer to pointer conversion assigning to 'struct plat_stmmacenet_data *' from 'int' [-Wint-conversion] 94 | plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. vim +/stmmac_probe_config_dt +94 drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c 80 81 static int ipq50xx_gmac_probe(struct platform_device *pdev) 82 { 83 struct device *dev = &pdev->dev; 84 struct stmmac_resources stmmac_res; 85 struct plat_stmmacenet_data *plat_dat; 86 struct ipq50xx_gmac *gmac; 87 int ret; 88 89 ret = stmmac_get_platform_resources(pdev, &stmmac_res); 90 if (ret) 91 return dev_err_probe(dev, ret, 92 "failed to get stmmac platform resources\n"); 93 > 94 plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); 95 if (IS_ERR_OR_NULL(plat_dat)) 96 return dev_err_probe(dev, PTR_ERR(plat_dat), 97 "failed to parse stmmac dt parameters\n"); 98 99 gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); 100 if (!gmac) 101 return dev_err_probe(dev, -ENOMEM, 102 "failed to allocate priv\n"); 103 104 gmac->dev = dev; 105 106 memcpy(gmac->clks, ipq50xx_gmac_clks, sizeof(gmac->clks)); 107 ret = devm_clk_bulk_get_optional(dev, ARRAY_SIZE(gmac->clks), gmac->clks); 108 if (ret) 109 return dev_err_probe(dev, ret, 110 "failed to acquire clocks\n"); 111 112 ret = clk_bulk_prepare_enable(ARRAY_SIZE(gmac->clks), gmac->clks); 113 if (ret) 114 return dev_err_probe(dev, ret, 115 "failed to enable clocks\n"); 116 117 gmac->rst = devm_reset_control_array_get_exclusive(dev); 118 if (IS_ERR_OR_NULL(gmac->rst)) 119 return dev_err_probe(dev, PTR_ERR(gmac->rst), 120 "failed to acquire reset\n"); 121 122 ret = reset_control_reset(gmac->rst); 123 if (ret) 124 return dev_err_probe(dev, ret, 125 "failed to reset\n"); 126 127 gmac->uniphy = devm_phy_optional_get(dev, "uniphy"); 128 if (IS_ERR(gmac->uniphy)) 129 return dev_err_probe(dev, PTR_ERR(gmac->uniphy), 130 "failed to acquire uniphy\n"); 131 132 plat_dat->bsp_priv = gmac; 133 plat_dat->serdes_powerup = ipq50xx_gmac_powerup; 134 plat_dat->fix_mac_speed = ipq50xx_gmac_fix_speed; 135 136 return stmmac_dvr_probe(dev, plat_dat, &stmmac_res); 137 } 138
Hi Ziyang, kernel test robot noticed the following build errors: [auto build test ERROR on robh/for-next] [also build test ERROR on clk/clk-next pza/reset/next linus/master v6.8-rc1 next-20240123] [cannot apply to pza/imx-drm/next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Ziyang-Huang/net-phy-Introduce-Qualcomm-IPQ5018-internal-PHY-driver/20240121-204840 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next patch link: https://lore.kernel.org/r/TYZPR01MB5556B8833322A83632709631C9762%40TYZPR01MB5556.apcprd01.prod.exchangelabs.com patch subject: [PATCH 3/8] net: stmmac: Introduce Qualcomm IPQ50xx DWMAC driver config: parisc-allmodconfig (https://download.01.org/0day-ci/archive/20240124/202401241733.H4p1Af19-lkp@intel.com/config) compiler: hppa-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240124/202401241733.H4p1Af19-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202401241733.H4p1Af19-lkp@intel.com/ All error/warnings (new ones prefixed by >>): drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c: In function 'ipq50xx_gmac_probe': >> drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c:94:20: error: implicit declaration of function 'stmmac_probe_config_dt'; did you mean 'devm_stmmac_probe_config_dt'? [-Werror=implicit-function-declaration] 94 | plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); | ^~~~~~~~~~~~~~~~~~~~~~ | devm_stmmac_probe_config_dt >> drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c:94:18: warning: assignment to 'struct plat_stmmacenet_data *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 94 | plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); | ^ cc1: some warnings being treated as errors vim +94 drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c 80 81 static int ipq50xx_gmac_probe(struct platform_device *pdev) 82 { 83 struct device *dev = &pdev->dev; 84 struct stmmac_resources stmmac_res; 85 struct plat_stmmacenet_data *plat_dat; 86 struct ipq50xx_gmac *gmac; 87 int ret; 88 89 ret = stmmac_get_platform_resources(pdev, &stmmac_res); 90 if (ret) 91 return dev_err_probe(dev, ret, 92 "failed to get stmmac platform resources\n"); 93 > 94 plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); 95 if (IS_ERR_OR_NULL(plat_dat)) 96 return dev_err_probe(dev, PTR_ERR(plat_dat), 97 "failed to parse stmmac dt parameters\n"); 98 99 gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); 100 if (!gmac) 101 return dev_err_probe(dev, -ENOMEM, 102 "failed to allocate priv\n"); 103 104 gmac->dev = dev; 105 106 memcpy(gmac->clks, ipq50xx_gmac_clks, sizeof(gmac->clks)); 107 ret = devm_clk_bulk_get_optional(dev, ARRAY_SIZE(gmac->clks), gmac->clks); 108 if (ret) 109 return dev_err_probe(dev, ret, 110 "failed to acquire clocks\n"); 111 112 ret = clk_bulk_prepare_enable(ARRAY_SIZE(gmac->clks), gmac->clks); 113 if (ret) 114 return dev_err_probe(dev, ret, 115 "failed to enable clocks\n"); 116 117 gmac->rst = devm_reset_control_array_get_exclusive(dev); 118 if (IS_ERR_OR_NULL(gmac->rst)) 119 return dev_err_probe(dev, PTR_ERR(gmac->rst), 120 "failed to acquire reset\n"); 121 122 ret = reset_control_reset(gmac->rst); 123 if (ret) 124 return dev_err_probe(dev, ret, 125 "failed to reset\n"); 126 127 gmac->uniphy = devm_phy_optional_get(dev, "uniphy"); 128 if (IS_ERR(gmac->uniphy)) 129 return dev_err_probe(dev, PTR_ERR(gmac->uniphy), 130 "failed to acquire uniphy\n"); 131 132 plat_dat->bsp_priv = gmac; 133 plat_dat->serdes_powerup = ipq50xx_gmac_powerup; 134 plat_dat->fix_mac_speed = ipq50xx_gmac_fix_speed; 135 136 return stmmac_dvr_probe(dev, plat_dat, &stmmac_res); 137 } 138
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index 06c6871f8788..baf6601d759c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -78,6 +78,13 @@ config DWMAC_INGENIC device driver. This driver is used on for the Ingenic SoCs MAC ethernet controller. +config DWMAC_IPQ50XX + tristate "Qualcomm IPQ50xx DWMAC driver" + default ARCH_QCOM + depends on OF && (ARCH_QCOM || COMPILE_TEST) + help + Support for the Qualcomm IPQ50xx DWMAC. + config DWMAC_IPQ806X tristate "QCA IPQ806x DWMAC support" default ARCH_QCOM diff --git a/drivers/net/ethernet/stmicro/stmmac/Makefile b/drivers/net/ethernet/stmicro/stmmac/Makefile index 5b57aee19267..eec4405d76d2 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Makefile +++ b/drivers/net/ethernet/stmicro/stmmac/Makefile @@ -15,6 +15,7 @@ stmmac-$(CONFIG_STMMAC_SELFTESTS) += stmmac_selftests.o obj-$(CONFIG_STMMAC_PLATFORM) += stmmac-platform.o obj-$(CONFIG_DWMAC_ANARION) += dwmac-anarion.o obj-$(CONFIG_DWMAC_INGENIC) += dwmac-ingenic.o +obj-$(CONFIG_DWMAC_IPQ50XX) += dwmac-ipq50xx.o obj-$(CONFIG_DWMAC_IPQ806X) += dwmac-ipq806x.o obj-$(CONFIG_DWMAC_LPC18XX) += dwmac-lpc18xx.o obj-$(CONFIG_DWMAC_MEDIATEK) += dwmac-mediatek.o diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c new file mode 100644 index 000000000000..de8e9a0b2cb6 --- /dev/null +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c @@ -0,0 +1,155 @@ +#include <linux/clk.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/reset.h> +#include <linux/stmmac.h> + +#include "stmmac_platform.h" + +enum { + IPQ50XX_GMAC_CLK_SYS, + IPQ50XX_GMAC_CLK_CFG, + IPQ50XX_GMAC_CLK_AHB, + IPQ50XX_GMAC_CLK_AXI, + IPQ50XX_GMAC_CLK_RX, + IPQ50XX_GMAC_CLK_TX, + IPQ50XX_GMAC_CLK_PTP, +}; + +static const struct clk_bulk_data ipq50xx_gmac_clks[] = { + [IPQ50XX_GMAC_CLK_SYS] = { .id = "sys" }, + [IPQ50XX_GMAC_CLK_CFG] = { .id = "cfg" }, + [IPQ50XX_GMAC_CLK_AHB] = { .id = "ahb" }, + [IPQ50XX_GMAC_CLK_AXI] = { .id = "axi" }, + [IPQ50XX_GMAC_CLK_RX] = { .id = "rx" }, + [IPQ50XX_GMAC_CLK_TX] = { .id = "tx" }, + [IPQ50XX_GMAC_CLK_PTP] = { .id = "ptp" }, +}; + +struct ipq50xx_gmac { + struct device *dev; + struct clk_bulk_data clks[ARRAY_SIZE(ipq50xx_gmac_clks)]; + struct reset_control *rst; + struct phy *uniphy; +}; + +static int ipq50xx_gmac_powerup(struct net_device *ndev, void *priv) +{ + struct ipq50xx_gmac *gmac = priv; + int ret; + + ret = phy_init(gmac->uniphy); + if (ret) + return ret; + + ret = phy_power_on(gmac->uniphy); + if (ret) + return ret; + + return 0; +} + +static void ipq50xx_gmac_fix_speed(void *priv, unsigned int speed, unsigned int mode) +{ + struct ipq50xx_gmac *gmac = priv; + unsigned long rate; + + switch(speed) { + case SPEED_10: + rate = 2500000; + break; + case SPEED_100: + rate = 25000000; + break; + case SPEED_1000: + rate = 125000000; + break; + case SPEED_2500: + rate = 312500000; + break; + default: + dev_err(gmac->dev, "Unsupported speed: %d\n", speed); + rate = 125000000; + break; + } + + clk_set_rate(gmac->clks[IPQ50XX_GMAC_CLK_RX].clk, rate); + clk_set_rate(gmac->clks[IPQ50XX_GMAC_CLK_TX].clk, rate); + phy_calibrate(gmac->uniphy); +} + +static int ipq50xx_gmac_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct stmmac_resources stmmac_res; + struct plat_stmmacenet_data *plat_dat; + struct ipq50xx_gmac *gmac; + int ret; + + ret = stmmac_get_platform_resources(pdev, &stmmac_res); + if (ret) + return dev_err_probe(dev, ret, + "failed to get stmmac platform resources\n"); + + plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac); + if (IS_ERR_OR_NULL(plat_dat)) + return dev_err_probe(dev, PTR_ERR(plat_dat), + "failed to parse stmmac dt parameters\n"); + + gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL); + if (!gmac) + return dev_err_probe(dev, -ENOMEM, + "failed to allocate priv\n"); + + gmac->dev = dev; + + memcpy(gmac->clks, ipq50xx_gmac_clks, sizeof(gmac->clks)); + ret = devm_clk_bulk_get_optional(dev, ARRAY_SIZE(gmac->clks), gmac->clks); + if (ret) + return dev_err_probe(dev, ret, + "failed to acquire clocks\n"); + + ret = clk_bulk_prepare_enable(ARRAY_SIZE(gmac->clks), gmac->clks); + if (ret) + return dev_err_probe(dev, ret, + "failed to enable clocks\n"); + + gmac->rst = devm_reset_control_array_get_exclusive(dev); + if (IS_ERR_OR_NULL(gmac->rst)) + return dev_err_probe(dev, PTR_ERR(gmac->rst), + "failed to acquire reset\n"); + + ret = reset_control_reset(gmac->rst); + if (ret) + return dev_err_probe(dev, ret, + "failed to reset\n"); + + gmac->uniphy = devm_phy_optional_get(dev, "uniphy"); + if (IS_ERR(gmac->uniphy)) + return dev_err_probe(dev, PTR_ERR(gmac->uniphy), + "failed to acquire uniphy\n"); + + plat_dat->bsp_priv = gmac; + plat_dat->serdes_powerup = ipq50xx_gmac_powerup; + plat_dat->fix_mac_speed = ipq50xx_gmac_fix_speed; + + return stmmac_dvr_probe(dev, plat_dat, &stmmac_res); +} + +static const struct of_device_id ipq50xx_gmac_dwmac_match[] = { + { .compatible = "qcom,ipq50xx-gmac" }, + { } +}; +MODULE_DEVICE_TABLE(of, ipq50xx_gmac_dwmac_match); + +static struct platform_driver ipq50xx_gmac_dwmac_driver = { + .probe = ipq50xx_gmac_probe, + .driver = { + .name = "ipq50xx-gmac-dwmac", + .of_match_table = ipq50xx_gmac_dwmac_match, + }, +}; +module_platform_driver(ipq50xx_gmac_dwmac_driver); + +MODULE_DESCRIPTION("Qualcomm IPQ50xx DWMAC driver"); +MODULE_AUTHOR("Ziyang Huang <hzyitc@outlook.com>");
Signed-off-by: Ziyang Huang <hzyitc@outlook.com> --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 7 + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + .../ethernet/stmicro/stmmac/dwmac-ipq50xx.c | 155 ++++++++++++++++++ 3 files changed, 163 insertions(+) create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-ipq50xx.c