Skip to contentSkip to conversation

net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag

PATCH Applied Charles Keepax 4 participants 4 messages Jan 4, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag

A new flag MACB_CAPS_CLK_HW_CHG was added and all callers of macb_set_tx_clk were gated on the presence of this flag.

- if (!clk)
+ if (!bp->tx_clk || !(bp->caps & MACB_CAPS_CLK_HW_CHG))

However the flag was not added to anything other than the new sama7g5_gem, turning that function call into a no op for all other systems. This breaks the networking on Zynq.

The commit message adding this states: a new capability so that macb_set_tx_clock() to not be called for IPs having this capability

This strongly implies that present of the flag was intended to skip the function not absence of the flag. Update the if statement to this effect, which repairs the existing users.

Fixes daafa1d33cc9 ("net: macb: add capability to not set the clock rate")

---

Changes since v1:
- Updated flag semantics to skip function, as appears to have been intended by the initial commit.

Changes since v2:
- Adding "net" to the subject line

Thanks,
Charles

 drivers/net/ethernet/cadence/macb_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +1 -1
index d5d910916c2e8..814a5b10141d1 100644
@@ -467,7 +467,7 @@ static void macb_set_tx_clk(struct macb *bp, int speed)
 {
 	long ferr, rate, rate_rounded;
 
-	if (!bp->tx_clk || !(bp->caps & MACB_CAPS_CLK_HW_CHG))
+	if (!bp->tx_clk || (bp->caps & MACB_CAPS_CLK_HW_CHG))
 		return;
 
 	switch (speed) {
Signature · 1 line
2.11.0
Reviewed-by on v3 1/1
#1 lore raw

Hi Charles,

Quoted 12 lines · Charles Keepax

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

A new flag MACB_CAPS_CLK_HW_CHG was added and all callers of macb_set_tx_clk were gated on the presence of this flag.

- if (!clk)
+ if (!bp->tx_clk || !(bp->caps & MACB_CAPS_CLK_HW_CHG))

However the flag was not added to anything other than the new sama7g5_gem, turning that function call into a no op for all other systems. This breaks the networking on Zynq.

Quoted 7 lines

The commit message adding this states: a new capability so that macb_set_tx_clock() to not be called for IPs having this capability

This strongly implies that present of the flag was intended to skip the function not absence of the flag. Update the if statement to this effect, which repairs the existing users.

Yes, the presence of the flag should involve skipping the calling of clk_set_rate() since the IP logic would take care of proper clock division depending on the link speed. I wrongly cherry pick this one from internal branches. Sorry for this breakage.

Quoted 4 lines
Fixes daafa1d33cc9 ("net: macb: add capability to not set the clock rate")
Quoted 31 lines

---

Changes since v1:
- Updated flag semantics to skip function, as appears to have been intended by the initial commit.

Changes since v2:
- Adding "net" to the subject line

Thanks,
Charles

 drivers/net/ethernet/cadence/macb_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/cadence/macb_main.c +1 -2
index d5d910916c2e8..814a5b10141d1 100644
@@ -467,7 +467,7 @@ static void macb_set_tx_clk(struct macb *bp, int speed)
 {
        long ferr, rate, rate_rounded;
 
-       if (!bp->tx_clk || !(bp->caps & MACB_CAPS_CLK_HW_CHG))
+       if (!bp->tx_clk || (bp->caps & MACB_CAPS_CLK_HW_CHG))
                return;
 
        switch (speed) {
--

2.11.0

Reviewed-by on v3 1/1
#2 lore raw
In reply to Charles Keepax
Quoted 14 lines · Charles Keepax

A new flag MACB_CAPS_CLK_HW_CHG was added and all callers of macb_set_tx_clk were gated on the presence of this flag.

- if (!clk)
+ if (!bp->tx_clk || !(bp->caps & MACB_CAPS_CLK_HW_CHG))

However the flag was not added to anything other than the new sama7g5_gem, turning that function call into a no op for all other systems. This breaks the networking on Zynq.

The commit message adding this states: a new capability so that macb_set_tx_clock() to not be called for IPs having this capability

Quoted 7 lines

This strongly implies that present of the flag was intended to skip the function not absence of the flag. Update the if statement to this effect, which repairs the existing users.

Fixes daafa1d33cc9 ("net: macb: add capability to not set the clock rate")

Andrew

maintainer Applied
#3 lore raw
Quoted 19 lines · On Mon, 4 Jan 2021 15:18:50 +0100 Andrew Lunn wrote:
Quoted 18 lines · Charles Keepax

A new flag MACB_CAPS_CLK_HW_CHG was added and all callers of macb_set_tx_clk were gated on the presence of this flag.

- if (!clk)
+ if (!bp->tx_clk || !(bp->caps & MACB_CAPS_CLK_HW_CHG))

However the flag was not added to anything other than the new sama7g5_gem, turning that function call into a no op for all other systems. This breaks the networking on Zynq.

The commit message adding this states: a new capability so that macb_set_tx_clock() to not be called for IPs having this capability

This strongly implies that present of the flag was intended to skip the function not absence of the flag. Update the if statement to this effect, which repairs the existing users.

Quoted 5 lines
Quoted 3 lines
Fixes daafa1d33cc9 ("net: macb: add capability to not set the clock rate")

Applied, thanks!