From: Greg Kroah-Hartman Date: Sun, 22 Nov 2020 08:56:07 +0000 (+0100) Subject: drop queue-4.14/can-flexcan-add-ecc-initialization-for-vf610.patch X-Git-Tag: v4.4.245~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cc0256aa15cf0f1d93c5e3dbd6d3095d5866ee5a;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.14/can-flexcan-add-ecc-initialization-for-vf610.patch and queue-4.19/can-flexcan-add-ecc-initialization-for-vf610.patch --- diff --git a/queue-4.14/can-flexcan-add-ecc-initialization-for-vf610.patch b/queue-4.14/can-flexcan-add-ecc-initialization-for-vf610.patch deleted file mode 100644 index 6d16cb37645..00000000000 --- a/queue-4.14/can-flexcan-add-ecc-initialization-for-vf610.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5fdf04a9fdc27fc6cd37bb2ae44a84a282323773 Mon Sep 17 00:00:00 2001 -From: Joakim Zhang -Date: Tue, 20 Oct 2020 23:53:57 +0800 -Subject: can: flexcan: add ECC initialization for VF610 - -From: Joakim Zhang - -commit 5fdf04a9fdc27fc6cd37bb2ae44a84a282323773 upstream. - -For SoCs with ECC supported, even use FLEXCAN_QUIRK_DISABLE_MECR quirk to -disable non-correctable errors interrupt and freeze mode, had better use -FLEXCAN_QUIRK_SUPPORT_ECC quirk to initialize all memory. - -Fixes: cdce844865bea ("can: flexcan: add vf610 support for FlexCAN") -Signed-off-by: Joakim Zhang -Link: https://lore.kernel.org/r/20201020155402.30318-6-qiangqing.zhang@nxp.com -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/can/flexcan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -298,7 +298,7 @@ static const struct flexcan_devtype_data - static const struct flexcan_devtype_data fsl_vf610_devtype_data = { - .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | - FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | -- FLEXCAN_QUIRK_BROKEN_PERR_STATE, -+ FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SUPPORT_ECC, - }; - - static const struct can_bittiming_const flexcan_bittiming_const = { diff --git a/queue-4.14/series b/queue-4.14/series index bd6ae076143..ec8530f38cc 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -13,6 +13,5 @@ powerpc-8xx-always-fault-when-_page_accessed-is-not-set.patch input-sunkbd-avoid-use-after-free-in-teardown-paths.patch mac80211-always-wind-down-sta-state.patch can-proc-can_remove_proc-silence-remove_proc_entry-warning.patch -can-flexcan-add-ecc-initialization-for-vf610.patch kvm-x86-clflushopt-should-be-treated-as-a-no-op-by-emulation.patch acpi-ged-fix-wformat.patch diff --git a/queue-4.19/can-flexcan-add-ecc-initialization-for-vf610.patch b/queue-4.19/can-flexcan-add-ecc-initialization-for-vf610.patch deleted file mode 100644 index a14ff354cb9..00000000000 --- a/queue-4.19/can-flexcan-add-ecc-initialization-for-vf610.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 5fdf04a9fdc27fc6cd37bb2ae44a84a282323773 Mon Sep 17 00:00:00 2001 -From: Joakim Zhang -Date: Tue, 20 Oct 2020 23:53:57 +0800 -Subject: can: flexcan: add ECC initialization for VF610 - -From: Joakim Zhang - -commit 5fdf04a9fdc27fc6cd37bb2ae44a84a282323773 upstream. - -For SoCs with ECC supported, even use FLEXCAN_QUIRK_DISABLE_MECR quirk to -disable non-correctable errors interrupt and freeze mode, had better use -FLEXCAN_QUIRK_SUPPORT_ECC quirk to initialize all memory. - -Fixes: cdce844865bea ("can: flexcan: add vf610 support for FlexCAN") -Signed-off-by: Joakim Zhang -Link: https://lore.kernel.org/r/20201020155402.30318-6-qiangqing.zhang@nxp.com -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/can/flexcan.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/net/can/flexcan.c -+++ b/drivers/net/can/flexcan.c -@@ -296,7 +296,7 @@ static const struct flexcan_devtype_data - static const struct flexcan_devtype_data fsl_vf610_devtype_data = { - .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS | - FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP | -- FLEXCAN_QUIRK_BROKEN_PERR_STATE, -+ FLEXCAN_QUIRK_BROKEN_PERR_STATE | FLEXCAN_QUIRK_SUPPORT_ECC, - }; - - static const struct flexcan_devtype_data fsl_ls1021a_r2_devtype_data = { diff --git a/queue-4.19/series b/queue-4.19/series index f34945d6cfa..d4ebae8b772 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -10,6 +10,5 @@ powerpc-8xx-always-fault-when-_page_accessed-is-not-set.patch input-sunkbd-avoid-use-after-free-in-teardown-paths.patch mac80211-always-wind-down-sta-state.patch can-proc-can_remove_proc-silence-remove_proc_entry-warning.patch -can-flexcan-add-ecc-initialization-for-vf610.patch kvm-x86-clflushopt-should-be-treated-as-a-no-op-by-emulation.patch acpi-ged-fix-wformat.patch