From 9fa19f66540ae0550475b82e7aa20628e287ac30 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 12 Mar 2021 13:15:51 +0100 Subject: [PATCH] 4.19-stable patches added patches: sh_eth-fix-trscer-mask-for-sh771x.patch --- queue-4.19/series | 1 + .../sh_eth-fix-trscer-mask-for-sh771x.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-4.19/sh_eth-fix-trscer-mask-for-sh771x.patch diff --git a/queue-4.19/series b/queue-4.19/series index 9806656e301..44096c79b29 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -14,5 +14,6 @@ tcp-add-sanity-tests-to-tcp_queue_seq.patch cifs-return-proper-error-code-in-statfs-2.patch scripts-recordmcount.-c-pl-support-ffunction-sections-.text.-section-names.patch revert-mm-slub-consider-rest-of-partial-list-if-acquire_slab-fails.patch +sh_eth-fix-trscer-mask-for-sh771x.patch net-check-if-protocol-extracted-by-virtio_net_hdr_set_proto-is-correct.patch net-avoid-infinite-loop-in-mpls_gso_segment-when-mpls_hlen-0.patch diff --git a/queue-4.19/sh_eth-fix-trscer-mask-for-sh771x.patch b/queue-4.19/sh_eth-fix-trscer-mask-for-sh771x.patch new file mode 100644 index 00000000000..14fb0870d25 --- /dev/null +++ b/queue-4.19/sh_eth-fix-trscer-mask-for-sh771x.patch @@ -0,0 +1,36 @@ +From 8c91bc3d44dfef8284af384877fbe61117e8b7d1 Mon Sep 17 00:00:00 2001 +From: Sergey Shtylyov +Date: Sun, 28 Feb 2021 23:25:43 +0300 +Subject: sh_eth: fix TRSCER mask for SH771x + +From: Sergey Shtylyov + +commit 8c91bc3d44dfef8284af384877fbe61117e8b7d1 upstream. + +According to the SH7710, SH7712, SH7713 Group User's Manual: Hardware, +Rev. 3.00, the TRSCER register actually has only bit 7 valid (and named +differently), with all the other bits reserved. Apparently, this was not +the case with some early revisions of the manual as we have the other +bits declared (and set) in the original driver. Follow the suit and add +the explicit sh_eth_cpu_data::trscer_err_mask initializer for SH771x... + +Fixes: 86a74ff21a7a ("net: sh_eth: add support for Renesas SuperH Ethernet") +Signed-off-by: Sergey Shtylyov +Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/renesas/sh_eth.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/net/ethernet/renesas/sh_eth.c ++++ b/drivers/net/ethernet/renesas/sh_eth.c +@@ -1126,6 +1126,9 @@ static struct sh_eth_cpu_data sh771x_dat + EESIPR_CEEFIP | EESIPR_CELFIP | + EESIPR_RRFIP | EESIPR_RTLFIP | EESIPR_RTSFIP | + EESIPR_PREIP | EESIPR_CERFIP, ++ ++ .trscer_err_mask = DESC_I_RINT8, ++ + .tsu = 1, + .dual_port = 1, + }; -- 2.47.3