2024-03-21 02:11:41

by Duanqiang Wen

Subject: [PATCH net v3] net: txgbe: fix i2c dev name cannot match clkdev

txgbe clkdev shortened clk_name, so i2c_dev info_name
also need to shorten. Otherwise, i2c_dev cannot initialize
clock. And had "i2c_dw" string in a define.

Fixes: e30cef001da2 ("net: txgbe: fix clk_name exceed MAX_DEV_ID limits")

Signed-off-by: Duanqiang Wen <[email protected]>
---
drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 6 +++---
drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
index 5b5d5e4310d1..3f61f161f1ed 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
@@ -571,8 +571,8 @@ static int txgbe_clock_register(struct txgbe *txgbe)
char clk_name[32];
struct clk *clk;

- snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
- pci_dev_id(pdev));
+ snprintf(clk_name, sizeof(clk_name), "%s.%d",
+ TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev));

clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
if (IS_ERR(clk))
@@ -634,7 +634,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe)

info.parent = &pdev->dev;
info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]);
- info.name = "i2c_designware";
+ info.name = TXGBE_I2C_CLK_DEV_NAME;
info.id = pci_dev_id(pdev);

info.res = &DEFINE_RES_IRQ(pdev->irq);
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
index 1b4ff50d5857..de33313c475f 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
@@ -129,6 +129,8 @@

#define TXGBE_MAX_EITR GENMASK(11, 3)

+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
+
extern char txgbe_driver_name[];

void txgbe_down(struct wx *wx);
--
2.27.0

2024-03-21 03:46:12

by Jakub Kicinski

Subject: Re: [PATCH net v3] net: txgbe: fix i2c dev name cannot match clkdev

On Thu, 21 Mar 2024 10:09:01 +0800 Duanqiang Wen wrote:
> txgbe clkdev shortened clk_name, so i2c_dev info_name
> also need to shorten. Otherwise, i2c_dev cannot initialize
> clock. And had "i2c_dw" string in a define.
>
> Fixes: e30cef001da2 ("net: txgbe: fix clk_name exceed MAX_DEV_ID limits")
>
> Signed-off-by: Duanqiang Wen <[email protected]>

No empty lines between Fixes and Signed-off... please.

And please read:
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html
--
pw-bot: cr
pv-bot: 24h

2024-03-21 15:32:58

by Jiri Pirko

Subject: Re: [PATCH net v3] net: txgbe: fix i2c dev name cannot match clkdev

Thu, Mar 21, 2024 at 03:09:01AM CET, [email protected] wrote:

v3:
Date: Thu, 21 Mar 2024 10:09:01 +0800
v2:
Date: Thu, 21 Mar 2024 09:51:39 +0800

Where's the 24hours before re-submission?
https://www.kernel.org/doc/html/next/process/maintainer-netdev.html?highlight=network#tl-dr

Next time, please honour that.


>txgbe clkdev shortened clk_name, so i2c_dev info_name
>also need to shorten. Otherwise, i2c_dev cannot initialize
>clock. And had "i2c_dw" string in a define.
>
>Fixes: e30cef001da2 ("net: txgbe: fix clk_name exceed MAX_DEV_ID limits")
>
>Signed-off-by: Duanqiang Wen <[email protected]>

Reviewed-by: Jiri Pirko <[email protected]>