diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-04-15 14:36:05 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-04-16 13:24:54 +0200 |
commit | 82c8170cd086d17a08ab29cd7120fb7f94bd7424 (patch) | |
tree | c8e86fe41de64fb5bc07674a7028f05dab192eac /target/linux/layerscape | |
parent | 489fc2353559ac79b3aaeb35bd9224df713306af (diff) | |
download | upstream-82c8170cd086d17a08ab29cd7120fb7f94bd7424.tar.gz upstream-82c8170cd086d17a08ab29cd7120fb7f94bd7424.tar.bz2 upstream-82c8170cd086d17a08ab29cd7120fb7f94bd7424.zip |
kernel: bump 4.9 to 4.9.219
Refreshed all patches.
Altered patches:
- 0026-NET-multi-phy-support.patch
Fixes:
- CVE-2020-8647
- CVE-2020-8648 (Potentially)
- CVE-2020-8649
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
4 files changed, 12 insertions, 12 deletions
diff --git a/target/linux/layerscape/patches-4.9/201-config-support-layerscape.patch b/target/linux/layerscape/patches-4.9/201-config-support-layerscape.patch index 218421265a..264f6acb3b 100644 --- a/target/linux/layerscape/patches-4.9/201-config-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/201-config-support-layerscape.patch @@ -140,7 +140,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> depends on IXP4XX_ETH --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig -@@ -414,6 +414,14 @@ config RTC_DRV_PCF85063 +@@ -415,6 +415,14 @@ config RTC_DRV_PCF85063 This driver can also be built as a module. If so, the module will be called rtc-pcf85063. diff --git a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch index 99ffab1b90..a26b1b526d 100644 --- a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch @@ -1695,7 +1695,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> EXPORT_SYMBOL(phy_ethtool_get_wol); --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1050,7 +1050,7 @@ int phy_suspend(struct phy_device *phyde +@@ -1054,7 +1054,7 @@ int phy_suspend(struct phy_device *phyde if (wol.wolopts) return -EBUSY; @@ -1704,7 +1704,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> ret = phydrv->suspend(phydev); if (ret) -@@ -1067,7 +1067,7 @@ int phy_resume(struct phy_device *phydev +@@ -1071,7 +1071,7 @@ int phy_resume(struct phy_device *phydev struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver); int ret = 0; @@ -1713,7 +1713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> ret = phydrv->resume(phydev); if (ret) -@@ -1724,7 +1724,7 @@ static int phy_remove(struct device *dev +@@ -1728,7 +1728,7 @@ static int phy_remove(struct device *dev phydev->state = PHY_DOWN; mutex_unlock(&phydev->lock); @@ -1751,7 +1751,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> default: return "unknown"; } -@@ -791,6 +794,9 @@ int phy_stop_interrupts(struct phy_devic +@@ -793,6 +796,9 @@ int phy_stop_interrupts(struct phy_devic static inline int phy_read_status(struct phy_device *phydev) { diff --git a/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch b/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch index 59cf0e7ad2..fdea5450f6 100644 --- a/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/810-iommu-support-layerscape.patch @@ -995,7 +995,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> }; struct dmar_atsr_unit { -@@ -4271,27 +4272,40 @@ static inline void init_iommu_pm_ops(voi +@@ -4272,27 +4273,40 @@ static inline void init_iommu_pm_ops(voi int __init dmar_parse_one_rmrr(struct acpi_dmar_header *header, void *arg) { struct acpi_dmar_reserved_memory *rmrr; @@ -1041,7 +1041,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> } static struct dmar_atsr_unit *dmar_find_atsr(struct acpi_dmar_atsr *atsr) -@@ -4505,6 +4519,7 @@ static void intel_iommu_free_dmars(void) +@@ -4506,6 +4520,7 @@ static void intel_iommu_free_dmars(void) list_for_each_entry_safe(rmrru, rmrr_n, &dmar_rmrr_units, list) { list_del(&rmrru->list); dmar_free_dev_scope(&rmrru->devices, &rmrru->devices_cnt); @@ -1049,7 +1049,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> kfree(rmrru); } -@@ -5243,6 +5258,45 @@ static void intel_iommu_remove_device(st +@@ -5246,6 +5261,45 @@ static void intel_iommu_remove_device(st iommu_device_unlink(iommu->iommu_dev, dev); } @@ -1095,7 +1095,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> #ifdef CONFIG_INTEL_IOMMU_SVM #define MAX_NR_PASID_BITS (20) static inline unsigned long intel_iommu_get_pts(struct intel_iommu *iommu) -@@ -5373,19 +5427,21 @@ struct intel_iommu *intel_svm_device_to_ +@@ -5376,19 +5430,21 @@ struct intel_iommu *intel_svm_device_to_ #endif /* CONFIG_INTEL_IOMMU_SVM */ static const struct iommu_ops intel_iommu_ops = { diff --git a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch index 11b759e700..5e67c891c2 100644 --- a/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/817-usb-support-layerscape.patch @@ -87,7 +87,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; if (pkt_len < ETH_ZLEN) break; -@@ -4520,6 +4525,7 @@ static struct usb_device_id rtl8152_tabl +@@ -4526,6 +4531,7 @@ static struct usb_device_id rtl8152_tabl {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)}, {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)}, @@ -156,7 +156,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> int ret; --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4450,6 +4450,14 @@ hub_port_init(struct usb_hub *hub, struc +@@ -4454,6 +4454,14 @@ hub_port_init(struct usb_hub *hub, struc else speed = usb_speed_string(udev->speed); @@ -632,7 +632,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); irq = platform_get_irq_byname(dwc3_pdev, "peripheral"); -@@ -3042,6 +3043,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3041,6 +3042,12 @@ int dwc3_gadget_init(struct dwc3 *dwc) goto err5; } |