From: Sergei Shtylyov Date: Sat, 15 Feb 2020 20:09:35 +0000 (+0300) Subject: sh_eth: check sh_eth_cpu_data::cexcr when dumping registers X-Git-Tag: v5.7-rc1~146^2~417^2~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f75ca32403dbf91e20c275719aab705401b9e718;p=tomoyo%2Ftomoyo-test1.git sh_eth: check sh_eth_cpu_data::cexcr when dumping registers When adding the sh_eth_cpu_data::cexcr flag I forgot to add the flag check to __sh_eth_get_regs(), causing the non-existing RX packet counter registers to be considered for dumping on the R7S72100 SoC (the register offset sanity check has the final say here)... Fixes: 4c1d45850d5 ("sh_eth: add sh_eth_cpu_data::cexcr flag") Signed-off-by: Sergei Shtylyov Tested-by: Chris Brandt Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index cd1f5842b131..ae9469c90ae2 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2194,8 +2194,10 @@ static size_t __sh_eth_get_regs(struct net_device *ndev, u32 *buf) add_reg(FRECR); add_reg(TSFRCR); add_reg(TLFRCR); - add_reg(CERCR); - add_reg(CEECR); + if (cd->cexcr) { + add_reg(CERCR); + add_reg(CEECR); + } add_reg(MAFCR); if (cd->rtrate) add_reg(RTRATE);