lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Thu, 27 Oct 2022 09:21:58 +0100 From: Biju Das <biju.das.jz@...renesas.com> To: Wolfgang Grandegger <wg@...ndegger.com>, Marc Kleine-Budde <mkl@...gutronix.de>, "David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com> Cc: Biju Das <biju.das.jz@...renesas.com>, Vincent Mailhol <mailhol.vincent@...adoo.fr>, Stefan Mätje <stefan.maetje@....eu>, Ulrich Hecht <uli+renesas@...nd.eu>, Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>, Christophe JAILLET <christophe.jaillet@...adoo.fr>, linux-can@...r.kernel.org, netdev@...r.kernel.org, Geert Uytterhoeven <geert+renesas@...der.be>, Chris Paterson <Chris.Paterson2@...esas.com>, Biju Das <biju.das@...renesas.com>, linux-renesas-soc@...r.kernel.org Subject: [PATCH v3 6/6] can: rcar_canfd: Add has_gerfl_eef to struct rcar_canfd_hw_info R-Car has ECC error flags in global error interrupts whereas it is not available on RZ/G2L. Add has_gerfl_eef to struct rcar_canfd_hw_info so that rcar_canfd_ global_error() will process ECC errors only for R-Car. whilst, this patch fixes the below checkpatch warnings CHECK: Unnecessary parentheses around 'ch == 0' CHECK: Unnecessary parentheses around 'ch == 1' Signed-off-by: Biju Das <biju.das.jz@...renesas.com> --- v2->v3: * No change. v1->v2: * Replaced info->has_gerfl to gpriv->info->has_gerfl and wrapped the ECC error flag check within single if statement. --- drivers/net/can/rcar/rcar_canfd.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index f8eafb132b39..00242eac377d 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -523,6 +523,7 @@ struct rcar_canfd_hw_info { /* hardware features */ unsigned shared_global_irqs:1; /* Has shared global irqs */ unsigned multi_channel_irqs:1; /* Has multiple channel irqs */ + unsigned has_gerfl_eef:1; /* Has ECC Error Flag */ }; /* Channel priv data */ @@ -596,6 +597,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_info = { .max_channels = 2, .postdiv = 2, .shared_global_irqs = 1, + .has_gerfl_eef = 1, }; static const struct rcar_canfd_hw_info rzg2l_hw_info = { @@ -608,6 +610,7 @@ static const struct rcar_canfd_hw_info r8a779a0_hw_info = { .max_channels = 8, .postdiv = 2, .shared_global_irqs = 1, + .has_gerfl_eef = 1, }; /* Helper functions */ @@ -955,13 +958,15 @@ static void rcar_canfd_global_error(struct net_device *ndev) u32 ridx = ch + RCANFD_RFFIFO_IDX; gerfl = rcar_canfd_read(priv->base, RCANFD_GERFL); - if ((gerfl & RCANFD_GERFL_EEF0) && (ch == 0)) { - netdev_dbg(ndev, "Ch0: ECC Error flag\n"); - stats->tx_dropped++; - } - if ((gerfl & RCANFD_GERFL_EEF1) && (ch == 1)) { - netdev_dbg(ndev, "Ch1: ECC Error flag\n"); - stats->tx_dropped++; + if (gpriv->info->has_gerfl_eef) { + if ((gerfl & RCANFD_GERFL_EEF0) && ch == 0) { + netdev_dbg(ndev, "Ch0: ECC Error flag\n"); + stats->tx_dropped++; + } + if ((gerfl & RCANFD_GERFL_EEF1) && ch == 1) { + netdev_dbg(ndev, "Ch1: ECC Error flag\n"); + stats->tx_dropped++; + } } if (gerfl & RCANFD_GERFL_MES) { sts = rcar_canfd_read(priv->base, -- 2.25.1
Powered by blists - more mailing lists