Subject: [RFC][PATCH 04/11] stmmac: fix breakage in stmmac_hw_setup()

Subject: [RFC][PATCH 04/11] stmmac: fix breakage in stmmac_hw_setup()

[Al Viro]

Since "drivers: net: stmmac: reworking the PCS code" ->pcs_ctrl_ane()
had been taking iomem address to access as the first argument; its
predecessor (->ctrl_ane()) used to take struct mac_device_info instead.

One of the callers had not been converted; as the result, instead of
reading and modifying a word in card iomem we read and modify a word
in (or near) the in-core strucct mac_device_info.

Fixes: 70523e639bf8 (drivers: net: stmmac: reworking the PCS code)
Cc: stable@vger.kernel.org
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index d9c98fd810bb..68ed903f0ac8 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2571,7 +2571,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
 	}
 
 	if (priv->hw->pcs && priv->hw->mac->pcs_ctrl_ane)
-		priv->hw->mac->pcs_ctrl_ane(priv->hw, 1, priv->hw->ps, 0);
+		priv->hw->mac->pcs_ctrl_ane(priv->ioaddr, 1, priv->hw->ps, 0);
 
 	/* set TX and RX rings length */
 	stmmac_set_rings_length(priv);
-- 
2.11.0

Re: Subject: [RFC][PATCH 04/11] stmmac: fix breakage in stmmac_hw_setup()

[David Miller]

From: Al Viro <viro@ftp.linux.org.uk>
Date: Fri, 05 Jan 2018 19:31:58 +0000

> Since "drivers: net: stmmac: reworking the PCS code" ->pcs_ctrl_ane()
> had been taking iomem address to access as the first argument; its
> predecessor (->ctrl_ane()) used to take struct mac_device_info instead.
> 
> One of the callers had not been converted; as the result, instead of
> reading and modifying a word in card iomem we read and modify a word
> in (or near) the in-core strucct mac_device_info.
> 
> Fixes: 70523e639bf8 (drivers: net: stmmac: reworking the PCS code)
> Cc: stable@vger.kernel.org
> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Yikes...

Al, can you split the bug fixes like this one into a separate series
for me to pull into my net GIT tree?

Don't include the pure annotation or partial endianness conversion
ones, those should go to net-next.

Re: Subject: [RFC][PATCH 04/11] stmmac: fix breakage in stmmac_hw_setup()

[Niklas Cassel]

On Tue, Jan 9, 2018 at 3:02 AM, David Miller <davem@davemloft.net> wrote:
> From: Al Viro <viro@ftp.linux.org.uk>
> Date: Fri, 05 Jan 2018 19:31:58 +0000
>
>> Since "drivers: net: stmmac: reworking the PCS code" ->pcs_ctrl_ane()
>> had been taking iomem address to access as the first argument; its
>> predecessor (->ctrl_ane()) used to take struct mac_device_info instead.
>>
>> One of the callers had not been converted; as the result, instead of
>> reading and modifying a word in card iomem we read and modify a word
>> in (or near) the in-core strucct mac_device_info.
>>
>> Fixes: 70523e639bf8 (drivers: net: stmmac: reworking the PCS code)
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
>
> Yikes...
>
> Al, can you split the bug fixes like this one into a separate series
> for me to pull into my net GIT tree?

This looks like a nasty bug,
I haven't seen a resubmission of this.
Would be a shame if it just went forgotten.

Regards,
Niklas