diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-28 12:14:03 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-06-03 12:40:53 +0200 |
| commit | 8f6fd53db9abc347467ace5696353ceebe1d76cb (patch) | |
| tree | 521dd6b5527c19e2c3076a1d721778185a68ec7f /target/linux/layerscape | |
| parent | a0f7bdfc71dfa773039c03818fcba7afc4bf1988 (diff) | |
| download | upstream-8f6fd53db9abc347467ace5696353ceebe1d76cb.tar.gz upstream-8f6fd53db9abc347467ace5696353ceebe1d76cb.tar.bz2 upstream-8f6fd53db9abc347467ace5696353ceebe1d76cb.zip | |
kernel: bump 4.14 to 4.14.122
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6, x86_64
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch | 2 | ||||
| -rw-r--r-- | target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index a5b51a7cfb..e8de78413b 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -241,7 +241,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> void __kfree_skb(struct sk_buff *skb); extern struct kmem_cache *skbuff_head_cache; -@@ -3294,6 +3295,7 @@ static inline void skb_free_datagram_loc +@@ -3297,6 +3298,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); diff --git a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch index 5f055891d6..d6e1e3afb4 100644 --- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch @@ -558,9 +558,9 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> * them, we have to fall back to INTx or other interrupts, e.g., a --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3376,6 +3376,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset); +@@ -3394,6 +3394,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset); + DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset); +/* + * NXP (Freescale Vendor ID) LS1088 chips do not behave correctly after @@ -572,9 +572,9 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> static void quirk_no_pm_reset(struct pci_dev *dev) { /* -@@ -4859,3 +4866,11 @@ static void quirk_no_ats(struct pci_dev - /* AMD Stoney platform GPU */ +@@ -4878,3 +4885,11 @@ static void quirk_no_ats(struct pci_dev DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x98e4, quirk_no_ats); + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x6900, quirk_no_ats); #endif /* CONFIG_PCI_ATS */ + +/* Freescale PCIe doesn't support MSI in RC mode */ @@ -586,7 +586,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com> +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, quirk_fsl_no_msi); --- a/include/linux/pci.h +++ b/include/linux/pci.h -@@ -1944,6 +1944,7 @@ void pcibios_release_device(struct pci_d +@@ -1946,6 +1946,7 @@ void pcibios_release_device(struct pci_d void pcibios_penalize_isa_irq(int irq, int active); int pcibios_alloc_irq(struct pci_dev *dev); void pcibios_free_irq(struct pci_dev *dev); |