| Message ID | 5f03e777-6838-f70d-31bc-2046d253c11a@cogentembedded.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3249b1e442a1be1a6b9f1026785b519d1443f807 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | [net] sh_eth: check sh_eth_cpu_data::dual_port when dumping registers | expand |
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Date: Wed, 8 Jan 2020 23:42:42 +0300 > When adding the sh_eth_cpu_data::dual_port flag I forgot to add the flag > checks to __sh_eth_get_regs(), causing the non-existing TSU registers to > be dumped by 'ethtool' on the single port Ether controllers having TSU... > > Fixes: a94cf2a614f8 ("sh_eth: fix TSU init on SH7734/R8A7740") > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Applied, thanks.
Hello: The following patches were marked "accepted", because they were applied to geert/renesas-devel (refs/heads/master): Patch: [net] sh_eth: check sh_eth_cpu_data::dual_port when dumping registers Submitter: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=225633 Total patches: 1
Index: net/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net/drivers/net/ethernet/renesas/sh_eth.c @@ -2204,24 +2204,28 @@ static size_t __sh_eth_get_regs(struct n if (cd->tsu) { add_tsu_reg(ARSTR); add_tsu_reg(TSU_CTRST); - add_tsu_reg(TSU_FWEN0); - add_tsu_reg(TSU_FWEN1); - add_tsu_reg(TSU_FCM); - add_tsu_reg(TSU_BSYSL0); - add_tsu_reg(TSU_BSYSL1); - add_tsu_reg(TSU_PRISL0); - add_tsu_reg(TSU_PRISL1); - add_tsu_reg(TSU_FWSL0); - add_tsu_reg(TSU_FWSL1); + if (cd->dual_port) { + add_tsu_reg(TSU_FWEN0); + add_tsu_reg(TSU_FWEN1); + add_tsu_reg(TSU_FCM); + add_tsu_reg(TSU_BSYSL0); + add_tsu_reg(TSU_BSYSL1); + add_tsu_reg(TSU_PRISL0); + add_tsu_reg(TSU_PRISL1); + add_tsu_reg(TSU_FWSL0); + add_tsu_reg(TSU_FWSL1); + } add_tsu_reg(TSU_FWSLC); - add_tsu_reg(TSU_QTAGM0); - add_tsu_reg(TSU_QTAGM1); - add_tsu_reg(TSU_FWSR); - add_tsu_reg(TSU_FWINMK); - add_tsu_reg(TSU_ADQT0); - add_tsu_reg(TSU_ADQT1); - add_tsu_reg(TSU_VTAG0); - add_tsu_reg(TSU_VTAG1); + if (cd->dual_port) { + add_tsu_reg(TSU_QTAGM0); + add_tsu_reg(TSU_QTAGM1); + add_tsu_reg(TSU_FWSR); + add_tsu_reg(TSU_FWINMK); + add_tsu_reg(TSU_ADQT0); + add_tsu_reg(TSU_ADQT1); + add_tsu_reg(TSU_VTAG0); + add_tsu_reg(TSU_VTAG1); + } add_tsu_reg(TSU_ADSBSY); add_tsu_reg(TSU_TEN); add_tsu_reg(TSU_POST1);
When adding the sh_eth_cpu_data::dual_port flag I forgot to add the flag checks to __sh_eth_get_regs(), causing the non-existing TSU registers to be dumped by 'ethtool' on the single port Ether controllers having TSU... Fixes: a94cf2a614f8 ("sh_eth: fix TSU init on SH7734/R8A7740") Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- This patch is against DaveM's 'net.git' repo. There are 3 more alike patches that check the same kind of omissions but they seem to be subject to the latter register offset sanity checking, so shouldn't affect the register dumping... drivers/net/ethernet/renesas/sh_eth.c | 38 ++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 17 deletions(-)