From 9e1530b2a35e051664ed243efd1eac942883494a Mon Sep 17 00:00:00 2001 From: Stijn Segers Date: Sat, 4 Aug 2018 18:08:25 +0200 Subject: kernel: bump 4.9 to 4.9.117 for 18.06 * Refreshed patches. * Removed patches: - target/linux/ar71xx/patches-4.9/103-MIPS-ath79-fix-register-address-in-ath79_ddr_wb_flus.patch superseded by upstream - target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch superseded by upstream - target/linux/brcm63xx/patches-4.9/001-4.11-01-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch accepted upstream - target/linux/brcm63xx/patches-4.9/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch accepted upstream - target/linux/brcm63xx/patches-4.9/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch accepted upstream - target/linux/generic/pending-4.9/900-gen_stats-fix-netlink-stats-padding.patch * New backported patch to address ext4 breakage, introduced in 4.9.112: - backport-4.9/500-ext4-fix-check-to-prevent-initializing-reserved-inod.patch Also add ARM64_SSBD symbol to ARM64 targets still running kernel 4.9 Thanks to Koen Vandeputte for pointing out the need to add the ARM64_SSBD symbol, and the ext4 patch. Compile-tested on: ar71xx Run-tested on: ar71xx Signed-off-by: Stijn Segers --- .../patches-4.9/202-core-linux-support-layerscape.patch | 6 +++--- .../layerscape/patches-4.9/402-mtd-support-layerscape.patch | 2 +- .../layerscape/patches-4.9/703-phy-support-layerscape.patch | 2 +- .../layerscape/patches-4.9/810-iommu-support-layerscape.patch | 8 ++++---- .../layerscape/patches-4.9/817-usb-support-layerscape.patch | 10 +++++----- 5 files changed, 14 insertions(+), 14 deletions(-) (limited to 'target/linux/layerscape/patches-4.9') diff --git a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch index dd71b826fd..3484fc398e 100644 --- a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch @@ -384,7 +384,7 @@ Signed-off-by: Yangbo Lu void __kfree_skb(struct sk_buff *skb); extern struct kmem_cache *skbuff_head_cache; -@@ -3057,6 +3058,7 @@ static inline void skb_free_datagram_loc +@@ -3059,6 +3060,7 @@ static inline void skb_free_datagram_loc } int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); @@ -477,7 +477,7 @@ Signed-off-by: Yangbo Lu /* Make sure a field is enclosed inside headers_start/headers_end section */ #define CHECK_SKB_FIELD(field) \ BUILD_BUG_ON(offsetof(struct sk_buff, field) < \ -@@ -1074,7 +1100,7 @@ static void skb_headers_offset_update(st +@@ -1075,7 +1101,7 @@ static void skb_headers_offset_update(st skb->inner_mac_header += off; } @@ -486,7 +486,7 @@ Signed-off-by: Yangbo Lu { __copy_skb_header(new, old); -@@ -1082,6 +1108,7 @@ static void copy_skb_header(struct sk_bu +@@ -1083,6 +1109,7 @@ static void copy_skb_header(struct sk_bu skb_shinfo(new)->gso_segs = skb_shinfo(old)->gso_segs; skb_shinfo(new)->gso_type = skb_shinfo(old)->gso_type; } diff --git a/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch b/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch index 6b3485700a..9f44e9e723 100644 --- a/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch @@ -358,7 +358,7 @@ Signed-off-by: Yangbo Lu help --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c -@@ -898,7 +898,7 @@ static int fsl_ifc_chip_init(struct fsl_ +@@ -901,7 +901,7 @@ static int fsl_ifc_chip_init(struct fsl_ chip->ecc.algo = NAND_ECC_HAMMING; } 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 acc75cdc2c..4327a26648 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 @@ -1724,7 +1724,7 @@ Signed-off-by: Yangbo Lu ret = phydrv->resume(phydev); if (ret) -@@ -1726,7 +1726,7 @@ static int phy_remove(struct device *dev +@@ -1723,7 +1723,7 @@ static int phy_remove(struct device *dev phydev->state = PHY_DOWN; mutex_unlock(&phydev->lock); 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 b9faa504b6..050092905c 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 @@ -1472,7 +1472,7 @@ Signed-off-by: Yangbo Lu } --- a/include/linux/dma-iommu.h +++ b/include/linux/dma-iommu.h -@@ -27,6 +27,7 @@ int iommu_dma_init(void); +@@ -28,6 +28,7 @@ int iommu_dma_init(void); /* Domain management interface for IOMMU drivers */ int iommu_get_dma_cookie(struct iommu_domain *domain); @@ -1480,7 +1480,7 @@ Signed-off-by: Yangbo Lu void iommu_put_dma_cookie(struct iommu_domain *domain); /* Setup call for arch DMA mapping code */ -@@ -66,6 +67,7 @@ int iommu_dma_mapping_error(struct devic +@@ -67,6 +68,7 @@ int iommu_dma_mapping_error(struct devic /* The DMA API isn't _quite_ the whole story, though... */ void iommu_dma_map_msi_msg(int irq, struct msi_msg *msg); @@ -1488,7 +1488,7 @@ Signed-off-by: Yangbo Lu #else -@@ -82,6 +84,11 @@ static inline int iommu_get_dma_cookie(s +@@ -83,6 +85,11 @@ static inline int iommu_get_dma_cookie(s return -ENODEV; } @@ -1500,7 +1500,7 @@ Signed-off-by: Yangbo Lu static inline void iommu_put_dma_cookie(struct iommu_domain *domain) { } -@@ -90,6 +97,10 @@ static inline void iommu_dma_map_msi_msg +@@ -91,6 +98,10 @@ static inline void iommu_dma_map_msi_msg { } 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 3ec91b4982..5af0b088a8 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 pkt_len = le32_to_cpu(rx_desc->opts1) & RX_LEN_MASK; if (pkt_len < ETH_ZLEN) break; -@@ -4509,6 +4514,7 @@ static struct usb_device_id rtl8152_tabl +@@ -4510,6 +4515,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 int ret; --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -4423,6 +4423,14 @@ hub_port_init(struct usb_hub *hub, struc +@@ -4431,6 +4431,14 @@ hub_port_init(struct usb_hub *hub, struc else speed = usb_speed_string(udev->speed); @@ -1494,7 +1494,7 @@ Signed-off-by: Yangbo Lu while (ep_ring->dequeue != td->last_trb) --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1570,14 +1570,38 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1604,14 +1604,38 @@ int xhci_urb_dequeue(struct usb_hcd *hcd ret = -ENOMEM; goto done; } @@ -1542,7 +1542,7 @@ Signed-off-by: Yangbo Lu spin_unlock_irqrestore(&xhci->lock, flags); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1621,7 +1621,7 @@ struct xhci_hcd { +@@ -1625,7 +1625,7 @@ struct xhci_hcd { #define XHCI_STATE_REMOVING (1 << 2) /* Statistics */ int error_bitmask; @@ -1551,7 +1551,7 @@ Signed-off-by: Yangbo Lu #define XHCI_LINK_TRB_QUIRK (1 << 0) #define XHCI_RESET_EP_QUIRK (1 << 1) #define XHCI_NEC_HOST (1 << 2) -@@ -1657,6 +1657,9 @@ struct xhci_hcd { +@@ -1661,6 +1661,9 @@ struct xhci_hcd { #define XHCI_SSIC_PORT_UNUSED (1 << 22) #define XHCI_NO_64BIT_SUPPORT (1 << 23) #define XHCI_MISSING_CAS (1 << 24) -- cgit v1.2.3