From ac5297340e647c63f98278eadc2f189608d4cd62 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Tue, 10 Nov 2020 15:33:17 +0100 Subject: kernel: bump 4.14 to 4.14.206 Refreshed all patches. Altered patches: - 210-dwc2_defaults.patch - 708-mc-bus-support-layerscape.patch Fixes: - CVE-2020-25656 Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte --- .../patches-4.14/708-mc-bus-support-layerscape.patch | 9 +++++++-- .../layerscape/patches-4.14/807-usb-support-layerscape.patch | 4 ++-- .../patches-4.14/809-flexcan-support-layerscape.patch | 10 +++++----- 3 files changed, 14 insertions(+), 9 deletions(-) (limited to 'target/linux/layerscape/patches-4.14') diff --git a/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch b/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch index 129b8ecc64..7c6e25b038 100644 --- a/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/708-mc-bus-support-layerscape.patch @@ -8611,7 +8611,7 @@ Signed-off-by: Stuart Yoder +} --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ /dev/null -@@ -1,292 +0,0 @@ +@@ -1,297 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) -/* - * Copyright 2013-2016 Freescale Semiconductor Inc. @@ -8754,7 +8754,12 @@ Signed-off-by: Stuart Yoder - */ -void fsl_destroy_mc_io(struct fsl_mc_io *mc_io) -{ -- struct fsl_mc_device *dpmcp_dev = mc_io->dpmcp_dev; +- struct fsl_mc_device *dpmcp_dev; +- +- if (!mc_io) +- return; +- +- dpmcp_dev = mc_io->dpmcp_dev; - - if (dpmcp_dev) - fsl_mc_io_unset_dpmcp(mc_io); diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index a986278c40..449165dca1 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -382,7 +382,7 @@ Signed-off-by: Zhao Chenhui dwc->lpm_nyet_threshold = lpm_nyet_threshold; dwc->tx_de_emphasis = tx_de_emphasis; -@@ -1376,12 +1541,14 @@ static int dwc3_resume_common(struct dwc +@@ -1387,12 +1552,14 @@ static int dwc3_resume_common(struct dwc switch (dwc->dr_mode) { case USB_DR_MODE_PERIPHERAL: @@ -1206,7 +1206,7 @@ Signed-off-by: Zhao Chenhui struct list_head cached_itd_list; --- a/drivers/usb/host/fsl-mph-dr-of.c +++ b/drivers/usb/host/fsl-mph-dr-of.c -@@ -229,6 +229,17 @@ static int fsl_usb2_mph_dr_of_probe(stru +@@ -232,6 +232,17 @@ static int fsl_usb2_mph_dr_of_probe(stru pdata->has_fsl_erratum_a005697 = of_property_read_bool(np, "fsl,usb_erratum-a005697"); diff --git a/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch b/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch index 75a6d97adb..d1849a5699 100644 --- a/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/809-flexcan-support-layerscape.patch @@ -512,8 +512,8 @@ Signed-off-by: Biwen Li return 0; -@@ -1069,10 +1086,10 @@ static void flexcan_chip_stop(struct net - flexcan_chip_disable(priv); +@@ -1074,10 +1091,10 @@ static int __flexcan_chip_stop(struct ne + goto out_chip_unfreeze; /* Disable all interrupts */ - flexcan_write(0, ®s->imask2); @@ -527,7 +527,7 @@ Signed-off-by: Biwen Li flexcan_transceiver_disable(priv); priv->can.state = CAN_STATE_STOPPED; -@@ -1187,26 +1204,26 @@ static int register_flexcandev(struct ne +@@ -1209,26 +1226,26 @@ static int register_flexcandev(struct ne err = flexcan_chip_disable(priv); if (err) goto out_disable_per; @@ -559,7 +559,7 @@ Signed-off-by: Biwen Li if (!(reg & FLEXCAN_MCR_FEN)) { netdev_err(dev, "Could not enable RX FIFO, unsupported core\n"); err = -ENODEV; -@@ -1234,8 +1251,12 @@ static void unregister_flexcandev(struct +@@ -1256,8 +1273,12 @@ static void unregister_flexcandev(struct static const struct of_device_id flexcan_of_match[] = { { .compatible = "fsl,imx6q-flexcan", .data = &fsl_imx6q_devtype_data, }, { .compatible = "fsl,imx28-flexcan", .data = &fsl_imx28_devtype_data, }, @@ -572,7 +572,7 @@ Signed-off-by: Biwen Li { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, flexcan_of_match); -@@ -1315,6 +1336,21 @@ static int flexcan_probe(struct platform +@@ -1337,6 +1358,21 @@ static int flexcan_probe(struct platform dev->flags |= IFF_ECHO; priv = netdev_priv(dev); -- cgit v1.2.3