Commit 56627336 authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller

net: stmmac: xgmac: Fix RSS writing wrong keys

Commit b6b6cc9a, changed the call to dwxgmac2_rss_write_reg()
passing it the variable cfg->key[i].

As key is an u8 but we write 32 bits at a time we need to cast it into
an u32 so that the correct key values are written. Notice that the for
loop already takes this into account so we don't try to write past the
keys size.

Fixes: b6b6cc9a ("net: stmmac: selftest: avoid large stack usage")
Signed-off-by: default avatarJose Abreu <Jose.Abreu@synopsys.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3c72d4d3
...@@ -523,8 +523,8 @@ static int dwxgmac2_rss_configure(struct mac_device_info *hw, ...@@ -523,8 +523,8 @@ static int dwxgmac2_rss_configure(struct mac_device_info *hw,
struct stmmac_rss *cfg, u32 num_rxq) struct stmmac_rss *cfg, u32 num_rxq)
{ {
void __iomem *ioaddr = hw->pcsr; void __iomem *ioaddr = hw->pcsr;
u32 value, *key;
int i, ret; int i, ret;
u32 value;
value = readl(ioaddr + XGMAC_RSS_CTRL); value = readl(ioaddr + XGMAC_RSS_CTRL);
if (!cfg || !cfg->enable) { if (!cfg || !cfg->enable) {
...@@ -533,8 +533,9 @@ static int dwxgmac2_rss_configure(struct mac_device_info *hw, ...@@ -533,8 +533,9 @@ static int dwxgmac2_rss_configure(struct mac_device_info *hw,
return 0; return 0;
} }
key = (u32 *)cfg->key;
for (i = 0; i < (ARRAY_SIZE(cfg->key) / sizeof(u32)); i++) { for (i = 0; i < (ARRAY_SIZE(cfg->key) / sizeof(u32)); i++) {
ret = dwxgmac2_rss_write_reg(ioaddr, true, i, cfg->key[i]); ret = dwxgmac2_rss_write_reg(ioaddr, true, i, key[i]);
if (ret) if (ret)
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment