]> git.baikalelectronics.ru Git - kernel.git/commit
net: macb: Correct usage of MACB_CAPS_CLK_HW_CHG flag
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Mon, 4 Jan 2021 10:38:02 +0000 (10:38 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 4 Jan 2021 21:28:09 +0000 (13:28 -0800)
commit784c6ac5a68b7dd791197beeebfe54e7acc7114f
treee4551eec38a6246b99bc066e0d6766e5561df13d
parent2137a98886419a59ab1071480ec90c22f222100a
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: 42bd67d8a944 ("net: macb: add capability to not set the clock rate")
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20210104103802.13091-1-ckeepax@opensource.cirrus.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cadence/macb_main.c