2020-04-11 23:49:22

by Sasha Levin

Subject: [PATCH AUTOSEL 5.6 056/149] sh_eth: check sh_eth_cpu_data::no_xdfar when dumping registers

From: Sergei Shtylyov <[email protected]>

[ Upstream commit 7bf47f609f7eaac4f7e9c407a85ad78997288a38 ]

When adding the sh_eth_cpu_data::no_xdfar flag I forgot to add the flag
check to __sh_eth_get_regs(), causing the non-existing RDFAR/TDFAR to be
considered for dumping on the R-Car gen1/2 SoCs (the register offset check
has the final say here)...

Fixes: 4c1d45850d5 ("sh_eth: add sh_eth_cpu_data::cexcr flag")
Signed-off-by: Sergei Shtylyov <[email protected]>
Tested-by: Chris Brandt <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
drivers/net/ethernet/renesas/sh_eth.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index ae9469c90ae2c..44e8c2a5a7b69 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -2140,11 +2140,13 @@ static size_t __sh_eth_get_regs(struct net_device *ndev, u32 *buf)
add_reg(EESR);
add_reg(EESIPR);
add_reg(TDLAR);
- add_reg(TDFAR);
+ if (!cd->no_xdfar)
+ add_reg(TDFAR);
add_reg(TDFXR);
add_reg(TDFFR);
add_reg(RDLAR);
- add_reg(RDFAR);
+ if (!cd->no_xdfar)
+ add_reg(RDFAR);
add_reg(RDFXR);
add_reg(RDFFR);
add_reg(TRSCER);
--
2.20.1

2020-04-12 09:31:24

by Sergei Shtylyov

Subject: Re: [PATCH AUTOSEL 5.6 056/149] sh_eth: check sh_eth_cpu_data::no_xdfar when dumping registers

Hello!

On 12.04.2020 2:02, Sasha Levin wrote:

> From: Sergei Shtylyov <[email protected]>
>
> [ Upstream commit 7bf47f609f7eaac4f7e9c407a85ad78997288a38 ]
>
> When adding the sh_eth_cpu_data::no_xdfar flag I forgot to add the flag
> check to __sh_eth_get_regs(), causing the non-existing RDFAR/TDFAR to be
> considered for dumping on the R-Car gen1/2 SoCs (the register offset check
> has the final say here)...
>
> Fixes: 4c1d45850d5 ("sh_eth: add sh_eth_cpu_data::cexcr flag")

Oops, wrong commit here, should've been:

Fixes: 6e80e55bd37a ("sh_eth: add sh_eth_cpu_data::no_xdfar flag")

Luckily, both commits appeared in the same version, 4.17. :-)

> Signed-off-by: Sergei Shtylyov <[email protected]>
> Tested-by: Chris Brandt <[email protected]>
> Signed-off-by: David S. Miller <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>
[...]

MBR, Sergei