Skip to contentSkip to conversation

net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag

PATCH Superseded Charles Keepax 2 participants 4 messages Dec 30, 2020 – Jan 4, 2021

Subsystems (3)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

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 v2 1/1
#1 lore raw
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")

Hi Charles

Since this is a fix, this should be based on the net tree. And you indicate this in the subject line with [PATCH net]. If this applies cleanly to net, Dave will probably just accept it, but please keep this in mind for any more submissions you make to netdev.

Andrew

#2 lore raw
Quoted 23 lines · Andrew Lunn
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")
Quoted 9 lines

Hi Charles

Since this is a fix, this should be based on the net tree. And you indicate this in the subject line with [PATCH net]. If this applies cleanly to net, Dave will probably just accept it, but please keep this in mind for any more submissions you make to netdev.

Is already based on the net tree, sorry wasn't aware I needed to add that into the subject line. Will do a respin today.

Thanks,
Charles

#3 lore raw
In reply to Andrew Lunn
Quoted 23 lines · Andrew Lunn
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")
Quoted 8 lines

Hi Charles

Since this is a fix, this should be based on the net tree. And you indicate this in the subject line with [PATCH net]. If this applies cleanly to net, Dave will probably just accept it, but please keep this in mind for any more submissions you make to netdev.

Apologies I totally forgot to add your Reviewed-by on the new version. Too much turkey on the brain after the fattening season.

Thanks,
Charles