txgbe clkdev shortened clk_name, so i2c_dev info_name
also need to shorten. Otherwise, i2c_dev cannot initialize
clock.
Change log:
v4-v5: address comments:
Jiri Pirko:
Well, since it is used in txgbe_phy.c, it should be probably
rather defined locally in txgbe_phy.c.
v3->v4: address comments:
Jakub Kicinski:
No empty lines between Fixes and Signed-off... please.
v2->v3: address comments:
Jiawen Wu:
Please add the define in txgbe_type.h
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 | 8 +++++---
1 file 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..2fa511227eac 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
@@ -20,6 +20,8 @@
#include "txgbe_phy.h"
#include "txgbe_hw.h"
+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
+
static int txgbe_swnodes_register(struct txgbe *txgbe)
{
struct txgbe_nodes *nodes = &txgbe->nodes;
@@ -571,8 +573,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 +636,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);
--
2.27.0
Fri, Mar 22, 2024 at 09:04:16AM CET, [email protected] wrote:
>txgbe clkdev shortened clk_name, so i2c_dev info_name
>also need to shorten. Otherwise, i2c_dev cannot initialize
>clock.
>
>Change log:
>v4-v5: address comments:
> Jiri Pirko:
> Well, since it is used in txgbe_phy.c, it should be probably
> rather defined locally in txgbe_phy.c.
Did you read Florian's comment? Please do.
pw-bot: cr
>v3->v4: address comments:
> Jakub Kicinski:
> No empty lines between Fixes and Signed-off... please.
>v2->v3: address comments:
> Jiawen Wu:
> Please add the define in txgbe_type.h
>
>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 | 8 +++++---
> 1 file 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..2fa511227eac 100644
>--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>@@ -20,6 +20,8 @@
> #include "txgbe_phy.h"
> #include "txgbe_hw.h"
>
>+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
>+
> static int txgbe_swnodes_register(struct txgbe *txgbe)
> {
> struct txgbe_nodes *nodes = &txgbe->nodes;
>@@ -571,8 +573,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 +636,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);
>--
>2.27.0
>
>
-----Original Message-----
From: Jiri Pirko <[email protected]>
Sent: 2024??3??22?? 16:12
To: Duanqiang Wen <[email protected]>
Cc: [email protected]; [email protected];
[email protected]; [email protected]; [email protected];
[email protected]; [email protected]; [email protected];
[email protected]; [email protected]; [email protected];
[email protected]
Subject: Re: [PATCH net v5] net: txgbe: fix i2c dev name cannot match clkdev
Fri, Mar 22, 2024 at 09:04:16AM CET, [email protected] wrote:
>txgbe clkdev shortened clk_name, so i2c_dev info_name also need to
>shorten. Otherwise, i2c_dev cannot initialize clock.
>
>Change log:
>v4-v5: address comments:
> Jiri Pirko:
> Well, since it is used in txgbe_phy.c, it should be probably
> rather defined locally in txgbe_phy.c.
Did you read Florian's comment? Please do.
pw-bot: cr
--------
I replied to Florian:
" I want to shorten "i2c_desginware" to "i2c_dw" in txgbe driver, so other
drivers
which use "i2c_designware" need another patch to use a define. "
Sorry, this email forgot to cc the mailing list.
>v3->v4: address comments:
> Jakub Kicinski:
> No empty lines between Fixes and Signed-off... please.
>v2->v3: address comments:
> Jiawen Wu:
> Please add the define in txgbe_type.h
>
>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 | 8 +++++---
> 1 file 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..2fa511227eac 100644
>--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>@@ -20,6 +20,8 @@
> #include "txgbe_phy.h"
> #include "txgbe_hw.h"
>
>+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
>+
> static int txgbe_swnodes_register(struct txgbe *txgbe) {
> struct txgbe_nodes *nodes = &txgbe->nodes; @@ -571,8 +573,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 +636,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);
>--
>2.27.0
>
>
Fri, Mar 22, 2024 at 09:20:04AM CET, [email protected] wrote:
>
>-----Original Message-----
>From: Jiri Pirko <[email protected]>
>Sent: 2024年3月22日 16:12
>To: Duanqiang Wen <[email protected]>
>Cc: [email protected]; [email protected];
>[email protected]; [email protected]; [email protected];
>[email protected]; [email protected]; [email protected];
>[email protected]; [email protected]; [email protected];
>[email protected]
>Subject: Re: [PATCH net v5] net: txgbe: fix i2c dev name cannot match clkdev
>
>Fri, Mar 22, 2024 at 09:04:16AM CET, [email protected] wrote:
>>txgbe clkdev shortened clk_name, so i2c_dev info_name also need to
>>shorten. Otherwise, i2c_dev cannot initialize clock.
>>
>>Change log:
>>v4-v5: address comments:
>> Jiri Pirko:
>> Well, since it is used in txgbe_phy.c, it should be probably
>> rather defined locally in txgbe_phy.c.
>
>Did you read Florian's comment? Please do.
>
>pw-bot: cr
>--------
>I replied to Florian:
>" I want to shorten "i2c_desginware" to "i2c_dw" in txgbe driver, so other
>drivers
>which use "i2c_designware" need another patch to use a define. "
>
>Sorry, this email forgot to cc the mailing list.
Could you please use some sane email client that properly prefixes the
original text by ">"?
>
>>v3->v4: address comments:
>> Jakub Kicinski:
>> No empty lines between Fixes and Signed-off... please.
>>v2->v3: address comments:
>> Jiawen Wu:
>> Please add the define in txgbe_type.h
>>
>>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 | 8 +++++---
>> 1 file 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..2fa511227eac 100644
>>--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>>+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
>>@@ -20,6 +20,8 @@
>> #include "txgbe_phy.h"
>> #include "txgbe_hw.h"
>>
>>+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
>>+
>> static int txgbe_swnodes_register(struct txgbe *txgbe) {
>> struct txgbe_nodes *nodes = &txgbe->nodes; @@ -571,8 +573,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 +636,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);
>>--
>>2.27.0
>>
>>
>
>
> -----Original Message-----
> From: Jiri Pirko <[email protected]>
> Sent: 2024年3月22日 17:02
> To: [email protected]
> Cc: [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: Re: [PATCH net v5] net: txgbe: fix i2c dev name cannot match clkdev
>
> Fri, Mar 22, 2024 at 09:20:04AM CET, [email protected] wrote:
> >
> >-----Original Message-----
> >From: Jiri Pirko <[email protected]>
> >Sent: 2024年3月22日 16:12
> >To: Duanqiang Wen <[email protected]>
> >Cc: [email protected]; [email protected];
> >[email protected]; [email protected];
> [email protected];
> >[email protected]; [email protected]; [email protected];
> >[email protected]; [email protected];
> >[email protected]; [email protected]
> >Subject: Re: [PATCH net v5] net: txgbe: fix i2c dev name cannot match
> >clkdev
> >
> >Fri, Mar 22, 2024 at 09:04:16AM CET, [email protected] wrote:
> >>txgbe clkdev shortened clk_name, so i2c_dev info_name also need to
> >>shorten. Otherwise, i2c_dev cannot initialize clock.
> >>
> >>Change log:
> >>v4-v5: address comments:
> >> Jiri Pirko:
> >> Well, since it is used in txgbe_phy.c, it should be probably
> >> rather defined locally in txgbe_phy.c.
> >
> >Did you read Florian's comment? Please do.
> >
> >pw-bot: cr
> >--------
> >I replied to Florian:
> >" I want to shorten "i2c_desginware" to "i2c_dw" in txgbe driver, so
> >other drivers which use "i2c_designware" need another patch to use a
> >define. "
> >
> >Sorry, this email forgot to cc the mailing list.
>
> Could you please use some sane email client that properly prefixes the
> original text by ">"?
I'm sorry, and I have set up the right email client settings now.
> >
> >>v3->v4: address comments:
> >> Jakub Kicinski:
> >> No empty lines between Fixes and Signed-off... please.
> >>v2->v3: address comments:
> >> Jiawen Wu:
> >> Please add the define in txgbe_type.h
> >>
> >>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 | 8 +++++---
> >> 1 file 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..2fa511227eac 100644
> >>--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> >>+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> >>@@ -20,6 +20,8 @@
> >> #include "txgbe_phy.h"
> >> #include "txgbe_hw.h"
> >>
> >>+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
> >>+
> >> static int txgbe_swnodes_register(struct txgbe *txgbe) {
> >> struct txgbe_nodes *nodes = &txgbe->nodes; @@ -571,8 +573,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 +636,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);
> >>--
> >>2.27.0
> >>
> >>
> >
> >
>
> -----Original Message-----
> From: Jiri Pirko <[email protected]>
> Sent: 2024??3??22?? 16:12
> To: Duanqiang Wen <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]
> Subject: Re: [PATCH net v5] net: txgbe: fix i2c dev name cannot match
clkdev
>
> Fri, Mar 22, 2024 at 09:04:16AM CET, [email protected] wrote:
> >txgbe clkdev shortened clk_name, so i2c_dev info_name also need to
> >shorten. Otherwise, i2c_dev cannot initialize clock.
> >
> >Change log:
> >v4-v5: address comments:
> > Jiri Pirko:
> > Well, since it is used in txgbe_phy.c, it should be probably
> > rather defined locally in txgbe_phy.c.
>
> Did you read Florian's comment? Please do.
>
> pw-bot: cr
>
I replied to Florian:
" I want to shorten "i2c_desginware" to "i2c_dw" in txgbe driver, so other
drivers which use "i2c_designware" need another patch to use a define. "
He hasn't replied to me for several days, what should I do next?
>
> >v3->v4: address comments:
> > Jakub Kicinski:
> > No empty lines between Fixes and Signed-off... please.
> >v2->v3: address comments:
> > Jiawen Wu:
> > Please add the define in txgbe_type.h
> >
> >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 | 8 +++++---
> > 1 file 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..2fa511227eac 100644
> >--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> >+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
> >@@ -20,6 +20,8 @@
> > #include "txgbe_phy.h"
> > #include "txgbe_hw.h"
> >
> >+#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
> >+
> > static int txgbe_swnodes_register(struct txgbe *txgbe) {
> > struct txgbe_nodes *nodes = &txgbe->nodes; @@ -571,8 +573,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 +636,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);
> >--
> >2.27.0
> >
> >
>
On 3/26/2024 6:29 PM, [email protected] wrote:
>> -----Original Message-----
>> From: Jiri Pirko <[email protected]>
>> Sent: 2024年3月22日 16:12
>> To: Duanqiang Wen <[email protected]>
>> Cc: [email protected]; [email protected];
>> [email protected]; [email protected];
>> [email protected]; [email protected]; [email protected];
>> [email protected]; [email protected];
>> [email protected]; [email protected];
>> [email protected]
>> Subject: Re: [PATCH net v5] net: txgbe: fix i2c dev name cannot match
> clkdev
>>
>> Fri, Mar 22, 2024 at 09:04:16AM CET, [email protected] wrote:
>>> txgbe clkdev shortened clk_name, so i2c_dev info_name also need to
>>> shorten. Otherwise, i2c_dev cannot initialize clock.
>>>
>>> Change log:
>>> v4-v5: address comments:
>>> Jiri Pirko:
>>> Well, since it is used in txgbe_phy.c, it should be probably
>>> rather defined locally in txgbe_phy.c.
>>
>> Did you read Florian's comment? Please do.
>>
>> pw-bot: cr
>>
>
> I replied to Florian:
> " I want to shorten "i2c_desginware" to "i2c_dw" in txgbe driver, so other
> drivers which use "i2c_designware" need another patch to use a define. "
>
> He hasn't replied to me for several days, what should I do next?
You emailed me directly rather than do a reply-all and have the mailing
list copied. At any rate, you are only changing your internal clock
name, so my suggestion to standardize the 'i2c_designware' string beyond
your driver did not really make sense.
With that:
Reviewed-by: Florian Fainelli <[email protected]>
Thanks!
--
Florian