diff options
| author | Joakim Zhang <qiangqing.zhang@nxp.com> | 2019-08-15 08:00:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 19:20:43 +0100 |
| commit | 0327c7818da27b018464c0b9f541c5d276c57172 (patch) | |
| tree | c71fcee7f492f3fcf82126d3eabdedb8468dc21c /drivers/net | |
| parent | 46265660e5baea9d2120c55a887f89835c43b717 (diff) | |
| download | linux-stable-0327c7818da27b018464c0b9f541c5d276c57172.tar.gz linux-stable-0327c7818da27b018464c0b9f541c5d276c57172.tar.bz2 linux-stable-0327c7818da27b018464c0b9f541c5d276c57172.zip | |
can: flexcan: disable completely the ECC mechanism
commit 5e269324db5adb2f5f6ec9a93a9c7b0672932b47 upstream.
The ECC (memory error detection and correction) mechanism can be
activated or not, controlled by the ECCDIS bit in CAN_MECR. When
disabled, updates on indications and reporting registers are stopped.
So if want to disable ECC completely, had better assert ECCDIS bit, not
just mask the related interrupts.
Fixes: cdce844865be ("can: flexcan: add vf610 support for FlexCAN")
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/flexcan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 6f265d2e647b..581e84d8e2c8 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -1048,6 +1048,7 @@ static int flexcan_chip_start(struct net_device *dev) reg_mecr = priv->read(®s->mecr); reg_mecr &= ~FLEXCAN_MECR_ECRWRDIS; priv->write(reg_mecr, ®s->mecr); + reg_mecr |= FLEXCAN_MECR_ECCDIS; reg_mecr &= ~(FLEXCAN_MECR_NCEFAFRZ | FLEXCAN_MECR_HANCEI_MSK | FLEXCAN_MECR_FANCEI_MSK); priv->write(reg_mecr, ®s->mecr); |