kernel: bump 4.14 to 4.14.241

Refreshed all patches

Compile-tested: ath79-generic brcm2708-bcm2708
Run-tested: ath79-generic brcm2708-bcm2708

Signed-off-by: David Bauer <mail@david-bauer.net>

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index b56bdce480028c5f14e55bbe578536a769d6dc23..8e4032874612add2f9ba1d8adf6e4cc9005f0232 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 

-LINUX_VERSION-4.14 = .236
+LINUX_VERSION-4.14 = .241

 
 

-LINUX_KERNEL_HASH-4.14.236 = e4eae297a6fefefd8ce4781d98178a7c1ee51ca0a4c8a7e46e61b121fbab8b2a
+LINUX_KERNEL_HASH-4.14.241 = b5bb04bb70154ba27a08bc1c067eb7c08fc3d513da58e6a33d6645b3a1889f7d

 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

diff --git a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch
index a9ce750e80c46302c1a8b7c73201e319825e9c77..c8eb2b420ba562de884d0ee3addbfd7d90cc1252 100644 (file)
--- a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch
+++ b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch
@@ -44,7 +44,7 @@ produce a noisy warning.
                hcd->msi_enabled = 1;
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
                hcd->msi_enabled = 1;
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h

-@@ -1858,6 +1858,7 @@ struct xhci_hcd {
+@@ -1859,6 +1859,7 @@ struct xhci_hcd {

        /* support xHCI 0.96 spec USB2 software LPM */
        unsigned                sw_lpm_support:1;
        /* support xHCI 1.0 spec USB2 hardware LPM */
        /* support xHCI 0.96 spec USB2 software LPM */
        unsigned                sw_lpm_support:1;
        /* support xHCI 1.0 spec USB2 hardware LPM */

diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
index 6eee38df5799f1f5375cb347ae29308a6058d251..833b516a46857362ff211bb390a7fab7650bca16 100644 (file)
--- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch
@@ -223,7 +223,7 @@
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>

-@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s
+@@ -835,10 +836,10 @@ static void tcp_v6_send_response(const s

        topt = (__be32 *)(t1 + 1);
  
        if (tsecr) {
        topt = (__be32 *)(t1 + 1);
  
        if (tsecr) {


@@ -325,7 +325,7 @@
        for (p = *head; p; p = p->next) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
        for (p = *head; p; p = p->next) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c

-@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look
+@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look

        else if (skb)
                pkey = &ip_hdr(skb)->daddr;
  
        else if (skb)
                pkey = &ip_hdr(skb)->daddr;
  


@@ -850,7 +850,7 @@
                *sum = csum_fold(csum_partial(diff, sizeof(diff),
 --- a/drivers/net/vxlan.c
 +++ b/drivers/net/vxlan.c
                *sum = csum_fold(csum_partial(diff, sizeof(diff),
 --- a/drivers/net/vxlan.c
 +++ b/drivers/net/vxlan.c

-@@ -1876,15 +1876,15 @@ static int vxlan_build_skb(struct sk_buf
+@@ -1878,15 +1878,15 @@ static int vxlan_build_skb(struct sk_buf

                return err;
  
        vxh = __skb_push(skb, sizeof(*vxh));
                return err;
  
        vxh = __skb_push(skb, sizeof(*vxh));

diff --git a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
index edeac838d90f88a2267036428b441c19e106f361..6b0d30002337756e80bd11f1b40cd6efcc0c0c65 100644 (file)
--- a/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
+++ b/target/linux/ar71xx/patches-4.14/950-add-boardinfo-platform-data.patch
@@ -26,7 +26,7 @@
  #endif /* __MDIO_BOARD_INFO_H */
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c
  #endif /* __MDIO_BOARD_INFO_H */
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c

-@@ -455,6 +455,17 @@ void mdiobus_free(struct mii_bus *bus)
+@@ -456,6 +456,17 @@ void mdiobus_free(struct mii_bus *bus)

  }
  EXPORT_SYMBOL(mdiobus_free);
  
  }
  EXPORT_SYMBOL(mdiobus_free);
  


@@ -44,7 +44,7 @@
  /**
   * mdiobus_scan - scan a bus for MDIO devices.
   * @bus: mii_bus to scan
  /**
   * mdiobus_scan - scan a bus for MDIO devices.
   * @bus: mii_bus to scan

-@@ -470,6 +481,7 @@ EXPORT_SYMBOL(mdiobus_free);
+@@ -471,6 +482,7 @@ EXPORT_SYMBOL(mdiobus_free);

  struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
  {
        struct phy_device *phydev;
  struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr)
  {
        struct phy_device *phydev;


@@ -52,7 +52,7 @@
        int err;
  
        phydev = get_phy_device(bus, addr, false);
        int err;
  
        phydev = get_phy_device(bus, addr, false);

-@@ -482,6 +494,12 @@ struct phy_device *mdiobus_scan(struct m
+@@ -483,6 +495,12 @@ struct phy_device *mdiobus_scan(struct m

         */
        of_mdiobus_link_mdiodev(bus, &phydev->mdio);
  
         */
        of_mdiobus_link_mdiodev(bus, &phydev->mdio);
  

diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
index 89cca72eb3885aec45d2f7459da236ab2cd77141..16ccda9132dcf953967319bfab614d450c400520 100644 (file)
--- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
+++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch
@@ -214,7 +214,7 @@
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>

-@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s
+@@ -835,10 +836,10 @@ static void tcp_v6_send_response(const s

        topt = (__be32 *)(t1 + 1);
  
        if (tsecr) {
        topt = (__be32 *)(t1 + 1);
  
        if (tsecr) {


@@ -316,7 +316,7 @@
        for (p = *head; p; p = p->next) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
        for (p = *head; p; p = p->next) {
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c

-@@ -465,7 +465,7 @@ static struct neighbour *ipv4_neigh_look
+@@ -466,7 +466,7 @@ static struct neighbour *ipv4_neigh_look

        else if (skb)
                pkey = &ip_hdr(skb)->daddr;
  
        else if (skb)
                pkey = &ip_hdr(skb)->daddr;
  

diff --git a/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
index 5784f5e5abf10a92fbc76f62d50d3badf3810943..4cddcb1d4b71f0fe2e1fde8ff8b0d0ac8d9c2d9a 100644 (file)
--- a/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
+++ b/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
@@ -127,7 +127,7 @@ it on BCM4708 family.
  /*
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
  /*
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h

-@@ -1840,6 +1840,7 @@ struct xhci_hcd {
+@@ -1841,6 +1841,7 @@ struct xhci_hcd {

  #define XHCI_INTEL_USB_ROLE_SW        BIT_ULL(31)
  #define XHCI_RESET_PLL_ON_DISCONNECT  BIT_ULL(34)
  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)
  #define XHCI_INTEL_USB_ROLE_SW        BIT_ULL(31)
  #define XHCI_RESET_PLL_ON_DISCONNECT  BIT_ULL(34)
  #define XHCI_SNPS_BROKEN_SUSPEND    BIT_ULL(35)

diff --git a/target/linux/brcm2708/patches-4.14/950-0016-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch b/target/linux/brcm2708/patches-4.14/950-0016-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
index a24a957ab1f62ccba7983e947ec2b181a3a17267..afb42fad44fb79cf89b1272bfc158cfc2a4b84c8 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0016-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0016-dmaengine-bcm2835-Load-driver-early-and-support-lega.patch
@@ -20,7 +20,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig

-@@ -131,7 +131,7 @@ config COH901318
+@@ -132,7 +132,7 @@ config COH901318

  
  config DMA_BCM2835
        tristate "BCM2835 DMA engine support"
  
  config DMA_BCM2835
        tristate "BCM2835 DMA engine support"

diff --git a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
index ee5c34cd554d8668861d256cf0fe06fe90301bb2..ef19837e2f518b3e7c9594f53304f4a3ec176f08 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
@@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com>
  }
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
  }
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c

-@@ -5131,7 +5131,7 @@ static void port_event(struct usb_hub *h
+@@ -5177,7 +5177,7 @@ static void port_event(struct usb_hub *h

        if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
                u16 status = 0, unused;
  
        if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
                u16 status = 0, unused;
  

diff --git a/target/linux/brcm2708/patches-4.14/950-0039-dmaengine-Add-support-for-BCM2708.patch b/target/linux/brcm2708/patches-4.14/950-0039-dmaengine-Add-support-for-BCM2708.patch
index 2c6373ac29895552b38c1cb8fe847c98a0a79620..931b27375f12f323e844b2aeb90d7cb8a8d47a92 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0039-dmaengine-Add-support-for-BCM2708.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0039-dmaengine-Add-support-for-BCM2708.patch
@@ -161,7 +161,7 @@ bcm2708-dmaengine - Fix arm64 portability/build issues
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig

-@@ -131,7 +131,7 @@ config COH901318
+@@ -132,7 +132,7 @@ config COH901318

  
  config DMA_BCM2835
        tristate "BCM2835 DMA engine support"
  
  config DMA_BCM2835
        tristate "BCM2835 DMA engine support"


@@ -170,7 +170,7 @@ bcm2708-dmaengine - Fix arm64 portability/build issues
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
  
        select DMA_ENGINE
        select DMA_VIRTUAL_CHANNELS
  

-@@ -535,6 +535,10 @@ config TIMB_DMA
+@@ -536,6 +536,10 @@ config TIMB_DMA

        help
          Enable support for the Timberdale FPGA DMA engine.
  
        help
          Enable support for the Timberdale FPGA DMA engine.
  

diff --git a/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch b/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch
index 450b97ba3b0adb19c4a791f330d07b55cf60bbbf..5b77eda043a4e27b447d18250c4f5c900d7ded9f 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0040-MMC-added-alternative-MMC-driver.patch
@@ -156,7 +156,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
                goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
                goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c

-@@ -2210,7 +2210,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -2213,7 +2213,8 @@ EXPORT_SYMBOL(mmc_erase);

  int mmc_can_erase(struct mmc_card *card)
  {
        if ((card->host->caps & MMC_CAP_ERASE) &&
  int mmc_can_erase(struct mmc_card *card)
  {
        if ((card->host->caps & MMC_CAP_ERASE) &&

diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
index ec964531cbbb834f1dc9a4b3705fb685d1bde425..758d8f81c28db2d5149186d9fff5a10b158dac63 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
@@ -1,7 +1,7 @@
-From 584bc4a6093ceb9aea07673185ee0084edc8690b Mon Sep 17 00:00:00 2001
+From 66b3e537b50cd2b46b71edb6ffeef633d1224d10 Mon Sep 17 00:00:00 2001

 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 27 Nov 2017 17:14:54 +0000
 From: Phil Elwell <phil@raspberrypi.org>
 Date: Mon, 27 Nov 2017 17:14:54 +0000

-Subject: [PATCH 136/454] cgroup: Disable cgroup "memory" by default
+Subject: [PATCH] cgroup: Disable cgroup "memory" by default

 
 Some Raspberry Pis have limited RAM and most users won't use the
 cgroup memory support so it is disabled by default. Enable with:
 
 Some Raspberry Pis have limited RAM and most users won't use the
 cgroup memory support so it is disabled by default. Enable with:


@@ -12,34 +12,46 @@ See: https://github.com/raspberrypi/linux/issues/1950
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---

- kernel/cgroup/cgroup.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)

 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
 
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c

-@@ -5220,6 +5220,8 @@ int __init cgroup_init_early(void)
+@@ -5219,6 +5219,9 @@ int __init cgroup_init_early(void)
+       return 0;

  }
  
  }
  

- static u16 cgroup_disable_mask __initdata;

 +static u16 cgroup_enable_mask __initdata;
 +static int __init cgroup_disable(char *str);
 +static u16 cgroup_enable_mask __initdata;
 +static int __init cgroup_disable(char *str);

- 
++

  /**
   * cgroup_init - cgroup initialization
  /**
   * cgroup_init - cgroup initialization

-@@ -5258,6 +5260,12 @@ int __init cgroup_init(void)
+  *
+@@ -5256,6 +5259,12 @@ int __init cgroup_init(void)

  
        mutex_unlock(&cgroup_mutex);
  
  
        mutex_unlock(&cgroup_mutex);
  

-+      /* Apply an implicit disable... */
++      /*
++       * Apply an implicit disable, knowing that an explicit enable will
++       * prevent if from doing anything.
++       */

 +      cgroup_disable("memory");
 +      cgroup_disable("memory");

-+
-+      /* ...knowing that an explicit enable will override it. */
-+      cgroup_disable_mask &= ~cgroup_enable_mask;

 +
        for_each_subsys(ss, ssid) {
                if (ss->early_init) {
                        struct cgroup_subsys_state *css =
 +
        for_each_subsys(ss, ssid) {
                if (ss->early_init) {
                        struct cgroup_subsys_state *css =

-@@ -5649,6 +5657,28 @@ static int __init cgroup_disable(char *s
+@@ -5637,6 +5646,10 @@ static int __init cgroup_disable(char *s
+                           strcmp(token, ss->legacy_name))
+                               continue;
+ 
++                      /* An explicit cgroup_enable overrides a disable */
++                      if (cgroup_enable_mask & (1 << i))
++                              continue;
++
+                       static_branch_disable(cgroup_subsys_enabled_key[i]);
+                       pr_info("Disabling %s control group subsystem\n",
+                               ss->name);
+@@ -5646,6 +5659,31 @@ static int __init cgroup_disable(char *s

  }
  __setup("cgroup_disable=", cgroup_disable);
  
  }
  __setup("cgroup_disable=", cgroup_disable);
  


@@ -59,6 +71,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 +                              continue;
 +
 +                      cgroup_enable_mask |= 1 << i;
 +                              continue;
 +
 +                      cgroup_enable_mask |= 1 << i;

++                      static_branch_enable(cgroup_subsys_enabled_key[i]);
++                      pr_info("Enabling %s control group subsystem\n",
++                              ss->name);

 +              }
 +      }
 +      return 1;
 +              }
 +      }
 +      return 1;

diff --git a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch
index 5aec47e6042484266e684042996136f1cf020385..3bf86f612e86a2a2f6b3fed4e728261c7d3e9b6c 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0292-net-mdiobus-add-unlocked-accessors.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c
 
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c

-@@ -493,6 +493,55 @@ struct phy_device *mdiobus_scan(struct m
+@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m

  EXPORT_SYMBOL(mdiobus_scan);
  
  /**
  EXPORT_SYMBOL(mdiobus_scan);
  
  /**


@@ -75,7 +75,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   * mdiobus_read_nested - Nested version of the mdiobus_read function
   * @bus: the mii_bus struct
   * @addr: the phy address
   * mdiobus_read_nested - Nested version of the mdiobus_read function
   * @bus: the mii_bus struct
   * @addr: the phy address

-@@ -512,11 +561,9 @@ int mdiobus_read_nested(struct mii_bus *
+@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus *

        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);


@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read_nested);
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read_nested);

-@@ -538,11 +585,9 @@ int mdiobus_read(struct mii_bus *bus, in
+@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in

        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);
        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);


@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read);
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read);

-@@ -568,11 +613,9 @@ int mdiobus_write_nested(struct mii_bus
+@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus

        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);


@@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return err;
  }
  EXPORT_SYMBOL(mdiobus_write_nested);
        return err;
  }
  EXPORT_SYMBOL(mdiobus_write_nested);

-@@ -595,11 +638,9 @@ int mdiobus_write(struct mii_bus *bus, i
+@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i

        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);
        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);

diff --git a/target/linux/brcm2708/patches-4.14/950-0326-tc358743-fix-connected-active-CSI-2-lane-reporting.patch b/target/linux/brcm2708/patches-4.14/950-0326-tc358743-fix-connected-active-CSI-2-lane-reporting.patch
index cd27a17ce07d6eefc7ef7d17a75d680d84f47f67..7844f6aa01a58d8041e5c823172811409577756f 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0326-tc358743-fix-connected-active-CSI-2-lane-reporting.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0326-tc358743-fix-connected-active-CSI-2-lane-reporting.patch
@@ -67,7 +67,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  
        return 0;
  }
  
        return 0;
  }

-@@ -1885,6 +1886,7 @@ static int tc358743_probe(struct i2c_cli
+@@ -1886,6 +1887,7 @@ static int tc358743_probe(struct i2c_cli

        if (pdata) {
                state->pdata = *pdata;
                state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
        if (pdata) {
                state->pdata = *pdata;
                state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;

diff --git a/target/linux/brcm2708/patches-4.14/950-0327-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/target/linux/brcm2708/patches-4.14/950-0327-tc358743-Add-support-for-972Mbit-s-link-freq.patch
index c257befd725ab797d2c0895c00f8894153d1b043..e86962571edb1bb08b3217df31f42d1ea4dafbc8 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0327-tc358743-Add-support-for-972Mbit-s-link-freq.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0327-tc358743-Add-support-for-972Mbit-s-link-freq.patch
@@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
         */
        bps_pr_lane = 2 * endpoint->link_frequencies[0];
        if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) {
         */
        bps_pr_lane = 2 * endpoint->link_frequencies[0];
        if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) {

-@@ -1815,23 +1816,41 @@ static int tc358743_probe_of(struct tc35
+@@ -1816,23 +1817,41 @@ static int tc358743_probe_of(struct tc35

                               state->pdata.refclk_hz * state->pdata.pll_prd;
  
        /*
                               state->pdata.refclk_hz * state->pdata.pll_prd;
  
        /*

diff --git a/target/linux/brcm2708/patches-4.14/950-0328-media-tc358743-Check-I2C-succeeded-during-probe.patch b/target/linux/brcm2708/patches-4.14/950-0328-media-tc358743-Check-I2C-succeeded-during-probe.patch
index 87d0966f2b7abb7f91a94604da67aa0ec4e5d39e..849b52973514f320638db4976582b7786bb754d1 100644 (file)
--- a/target/linux/brcm2708/patches-4.14/950-0328-media-tc358743-Check-I2C-succeeded-during-probe.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0328-media-tc358743-Check-I2C-succeeded-during-probe.patch
@@ -78,7 +78,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val)
  {
        i2c_wrreg(sd, reg, val, 2);
  static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val)
  {
        i2c_wrreg(sd, reg, val, 2);

-@@ -1887,6 +1904,7 @@ static int tc358743_probe(struct i2c_cli
+@@ -1888,6 +1905,7 @@ static int tc358743_probe(struct i2c_cli

        struct tc358743_state *state;
        struct tc358743_platform_data *pdata = client->dev.platform_data;
        struct v4l2_subdev *sd;
        struct tc358743_state *state;
        struct tc358743_platform_data *pdata = client->dev.platform_data;
        struct v4l2_subdev *sd;


@@ -86,7 +86,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
        int err;
  
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
        int err;
  
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))

-@@ -1919,7 +1937,8 @@ static int tc358743_probe(struct i2c_cli
+@@ -1920,7 +1938,8 @@ static int tc358743_probe(struct i2c_cli

        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
  
        /* i2c access */
        sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS;
  
        /* i2c access */

diff --git a/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch b/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch
index 81d9788af0bf2b998df2dfaf70c9548c17cd1e7d..459b0155b02b15eeaa20708a4984f8a245c8d1ae 100644 (file)
--- a/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch
+++ b/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch
@@ -28,7 +28,7 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
                        };
                };
  
                        };
                };
  

-@@ -348,5 +354,20 @@
+@@ -349,5 +355,20 @@

                        memcpy-bus-width = <32>;
                        #dma-cells = <2>;
                };
                        memcpy-bus-width = <32>;
                        #dma-cells = <2>;
                };

diff --git a/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch b/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch
index 0960f6bfddafb105ace92b4ed452fdca6f39e12d..3893c58f908263f71ec8ed4e4f6b855da76ae654 100644 (file)
--- a/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch
+++ b/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch
@@ -30,7 +30,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
                                        };
                                };
                                pci_default_pins: pinctrl-pci {
                                        };
                                };
                                pci_default_pins: pinctrl-pci {

-@@ -316,6 +323,41 @@
+@@ -317,6 +324,41 @@

                        };
                };
  
                        };
                };
  

diff --git a/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch b/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch
index 5b2c4139c17ac8e8b73d2fb20d2678f3ba3f68a2..f371ec3f29fcf7a8aed5c396f72bcdcb018bbb31 100644 (file)
--- a/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch
+++ b/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch
@@ -115,7 +115,7 @@ the patch is only included in the series for context.
  };
 --- a/arch/arm/boot/dts/gemini.dtsi
 +++ b/arch/arm/boot/dts/gemini.dtsi
  };
 --- a/arch/arm/boot/dts/gemini.dtsi
 +++ b/arch/arm/boot/dts/gemini.dtsi

-@@ -411,5 +411,31 @@
+@@ -412,5 +412,31 @@

                        #size-cells = <0>;
                        status = "disabled";
                };
                        #size-cells = <0>;
                        status = "disabled";
                };

diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
index 39a3964af73e85d8ffaa1c7206d2dfd25b6f19b8..6f018b9e4a85c618b9f2ec972808066f49f9d4c6 100644 (file)
--- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
+++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch
@@ -65,7 +65,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
         * Before updating sk_refcnt, we must commit prior changes to memory
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
         * Before updating sk_refcnt, we must commit prior changes to memory
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c

-@@ -1700,7 +1700,7 @@ u32 tcp_tso_autosize(const struct sock *
+@@ -1701,7 +1701,7 @@ u32 tcp_tso_autosize(const struct sock *

  {
        u32 bytes, segs;
  
  {
        u32 bytes, segs;
  


@@ -74,7 +74,7 @@ Cc: Kir Kolyshkin <kir@openvz.org>
                    sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
  
        /* Goal is to send at least one packet per ms,
                    sk->sk_gso_max_size - 1 - MAX_TCP_HEADER);
  
        /* Goal is to send at least one packet per ms,

-@@ -2218,7 +2218,7 @@ static bool tcp_small_queue_check(struct
+@@ -2219,7 +2219,7 @@ static bool tcp_small_queue_check(struct

  {
        unsigned int limit;
  
  {
        unsigned int limit;
  

diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
index 84874d3d937d043e621ec1ca6d67efe3ddfd552a..4ebcc115cd2f0a4dd6c56d5ea0cd10d9d170624b 100644 (file)
--- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
+++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch
@@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold <johan@kernel.org>
 
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c
 
 --- a/drivers/usb/serial/option.c
 +++ b/drivers/usb/serial/option.c

-@@ -2028,7 +2028,8 @@ static const struct usb_device_id option
+@@ -2031,7 +2031,8 @@ static const struct usb_device_id option

        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },                   /* D-Link DWM-156 (variant) */
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },                   /* D-Link DWM-156 (variant) */
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
        { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) },

diff --git a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
index 1a4321cb960075ca67240946f631fff2f4410692..03c1deec707b226c9ed4571976a0012b2cc77301 100644 (file)
--- a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
+++ b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
@@ -90,7 +90,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                                expired_count++;
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c
                                expired_count++;
 --- a/net/netfilter/nf_conntrack_netlink.c
 +++ b/net/netfilter/nf_conntrack_netlink.c

-@@ -1125,6 +1125,14 @@ static const struct nla_policy ct_nla_po
+@@ -1128,6 +1128,14 @@ static const struct nla_policy ct_nla_po

                                    .len = NF_CT_LABELS_MAX_SIZE },
  };
  
                                    .len = NF_CT_LABELS_MAX_SIZE },
  };
  


@@ -105,7 +105,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  static int ctnetlink_flush_conntrack(struct net *net,
                                     const struct nlattr * const cda[],
                                     u32 portid, int report)
  static int ctnetlink_flush_conntrack(struct net *net,
                                     const struct nlattr * const cda[],
                                     u32 portid, int report)

-@@ -1137,7 +1145,7 @@ static int ctnetlink_flush_conntrack(str
+@@ -1140,7 +1148,7 @@ static int ctnetlink_flush_conntrack(str

                        return PTR_ERR(filter);
        }
  
                        return PTR_ERR(filter);
        }
  


@@ -114,7 +114,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
                                  portid, report);
        kfree(filter);
  
                                  portid, report);
        kfree(filter);
  

-@@ -1183,6 +1191,11 @@ static int ctnetlink_del_conntrack(struc
+@@ -1186,6 +1194,11 @@ static int ctnetlink_del_conntrack(struc

  
        ct = nf_ct_tuplehash_to_ctrack(h);
  
  
        ct = nf_ct_tuplehash_to_ctrack(h);
  

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index d54ede9efda0a3ffd84e9a0c49dc410a01737d82..de8dd8bb8ad05ec1992800b2c8abb2dec2492649 100644 (file)
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -449,6 +449,7 @@ CONFIG_BASE_SMALL=0
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set

+# CONFIG_BATTERY_RT5033 is not set

 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BAYCOM_EPP is not set
 # CONFIG_BAYCOM_PAR is not set

diff --git a/target/linux/generic/hack-4.14/207-disable-modorder.patch b/target/linux/generic/hack-4.14/207-disable-modorder.patch
index 8ac07d23777d230fc6957d837fb1bd4394d56284..0cfb4d33eca3196ac750949da26a83425a5f08e9 100644 (file)
--- a/target/linux/generic/hack-4.14/207-disable-modorder.patch
+++ b/target/linux/generic/hack-4.14/207-disable-modorder.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/Makefile
 +++ b/Makefile
 
 --- a/Makefile
 +++ b/Makefile

-@@ -1261,7 +1261,6 @@ endif
+@@ -1260,7 +1260,6 @@ endif

  
  PHONY += modules
  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
  
  PHONY += modules
  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin


@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        @$(kecho) '  Building modules, stage 2.';
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  
        @$(kecho) '  Building modules, stage 2.';
        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
  

-@@ -1290,7 +1289,6 @@ _modinst_:
+@@ -1289,7 +1288,6 @@ _modinst_:

                rm -f $(MODLIB)/build ; \
                ln -s $(CURDIR) $(MODLIB)/build ; \
        fi
                rm -f $(MODLIB)/build ; \
                ln -s $(CURDIR) $(MODLIB)/build ; \
        fi

diff --git a/target/linux/generic/hack-4.14/220-gc_sections.patch b/target/linux/generic/hack-4.14/220-gc_sections.patch
index fc60001ce42a8661651d1c81675d44711261d0d4..c91c25dab1870d1b72ac6582ee78ec036ce562fa 100644 (file)
--- a/target/linux/generic/hack-4.14/220-gc_sections.patch
+++ b/target/linux/generic/hack-4.14/220-gc_sections.patch
@@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
  KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)
  # Read KERNELRELEASE from include/config/kernel.release (if it exists)
  KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
  KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION)

-@@ -786,11 +791,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH
+@@ -785,11 +790,6 @@ ifdef CONFIG_DEBUG_SECTION_MISMATCH

  KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
  endif
  
  KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once)
  endif
  

diff --git a/target/linux/generic/hack-4.14/902-debloat_proc.patch b/target/linux/generic/hack-4.14/902-debloat_proc.patch
index b426b07573cdb54ed93ed37f7b0c76d66a2688ac..8d02402498537336f031a7d21dad3ebe05a7d2b9 100644 (file)
--- a/target/linux/generic/hack-4.14/902-debloat_proc.patch
+++ b/target/linux/generic/hack-4.14/902-debloat_proc.patch
@@ -393,7 +393,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
  
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c

-@@ -427,6 +427,9 @@ static struct pernet_operations ip_rt_pr
+@@ -428,6 +428,9 @@ static struct pernet_operations ip_rt_pr

  
  static int __init ip_rt_proc_init(void)
  {
  
  static int __init ip_rt_proc_init(void)
  {

diff --git a/target/linux/generic/pending-4.14/205-backtrace_module_info.patch b/target/linux/generic/pending-4.14/205-backtrace_module_info.patch
index 4040f91021de82df9bdcbd31338305ca50f86a23..974dc4e29c881584084bfa4c073aeaba2cb971c2 100644 (file)
--- a/target/linux/generic/pending-4.14/205-backtrace_module_info.patch
+++ b/target/linux/generic/pending-4.14/205-backtrace_module_info.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c
 
 --- a/lib/vsprintf.c
 +++ b/lib/vsprintf.c

-@@ -670,8 +670,10 @@ char *symbol_string(char *buf, char *end
+@@ -696,8 +696,10 @@ char *symbol_string(char *buf, char *end

                    struct printf_spec spec, const char *fmt)
  {
        unsigned long value;
                    struct printf_spec spec, const char *fmt)
  {
        unsigned long value;


@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif
  
        if (fmt[1] == 'R')
  #endif
  
        if (fmt[1] == 'R')

-@@ -685,11 +687,16 @@ char *symbol_string(char *buf, char *end
+@@ -711,11 +713,16 @@ char *symbol_string(char *buf, char *end

                sprint_symbol(sym, value);
        else
                sprint_symbol_no_offset(sym, value);
                sprint_symbol(sym, value);
        else
                sprint_symbol_no_offset(sym, value);

diff --git a/target/linux/generic/pending-4.14/630-packet_socket_type.patch b/target/linux/generic/pending-4.14/630-packet_socket_type.patch
index e9b40b18c62067923e7b50a96ab7658d6c8bd4a5..fa02d3f70651f01708ba168f98200ab64c48d3c9 100644 (file)
--- a/target/linux/generic/pending-4.14/630-packet_socket_type.patch
+++ b/target/linux/generic/pending-4.14/630-packet_socket_type.patch
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;
  
        if (sock->type == SOCK_PACKET)
                po->prot_hook.func = packet_rcv_spkt;

-@@ -3947,6 +3950,16 @@ packet_setsockopt(struct socket *sock, i
+@@ -3949,6 +3952,16 @@ packet_setsockopt(struct socket *sock, i

                po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
                return 0;
        }
                po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
                return 0;
        }


@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        default:
                return -ENOPROTOOPT;
        }
        default:
                return -ENOPROTOOPT;
        }

-@@ -3999,6 +4012,13 @@ static int packet_getsockopt(struct sock
+@@ -4001,6 +4014,13 @@ static int packet_getsockopt(struct sock

        case PACKET_VNET_HDR:
                val = po->has_vnet_hdr;
                break;
        case PACKET_VNET_HDR:
                val = po->has_vnet_hdr;
                break;

diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 7e7ba34695598392c289e94a2f087c19e8e0bd08..ab05eda4eba4c8d3d022e249d0d3b30f8e393ace 100644 (file)
--- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        if (netif_elide_gro(skb->dev))
                goto normal;
  
        if (netif_elide_gro(skb->dev))
                goto normal;
  

-@@ -6280,6 +6283,48 @@ static void __netdev_adjacent_dev_unlink
+@@ -6287,6 +6290,48 @@ static void __netdev_adjacent_dev_unlink

                                           &upper_dev->adj_list.lower);
  }
  
                                           &upper_dev->adj_list.lower);
  }
  


@@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static int __netdev_upper_dev_link(struct net_device *dev,
                                   struct net_device *upper_dev, bool master,
                                   void *upper_priv, void *upper_info)
  static int __netdev_upper_dev_link(struct net_device *dev,
                                   struct net_device *upper_dev, bool master,
                                   void *upper_priv, void *upper_info)

-@@ -6318,6 +6363,7 @@ static int __netdev_upper_dev_link(struc
+@@ -6325,6 +6370,7 @@ static int __netdev_upper_dev_link(struc

        if (ret)
                return ret;
  
        if (ret)
                return ret;
  


@@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);
        ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);

-@@ -6395,6 +6441,7 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6402,6 +6448,7 @@ void netdev_upper_dev_unlink(struct net_

  
        __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
  
  
        __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
  


@@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
                                      &changeupper_info.info);
  }
        call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
                                      &changeupper_info.info);
  }

-@@ -6959,6 +7006,7 @@ int dev_set_mac_address(struct net_devic
+@@ -6966,6 +7013,7 @@ int dev_set_mac_address(struct net_devic

        if (err)
                return err;
        dev->addr_assign_type = NET_ADDR_SET;
        if (err)
                return err;
        dev->addr_assign_type = NET_ADDR_SET;

diff --git a/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch b/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch
index fedb8ed79824fc9aea23b64bb1063f7aaf82012c..aa7d2e791ea36b3e1cd74410ab5b08f6cbdd64cd 100644 (file)
--- a/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch
+++ b/target/linux/ipq806x/patches-4.14/0002-dmaengine-Add-ADM-driver.patch
@@ -26,7 +26,7 @@ Signed-off-by: Thomas Pedersen <twp@codeaurora.org>
 
 --- a/drivers/dma/qcom/Kconfig
 +++ b/drivers/dma/qcom/Kconfig
 
 --- a/drivers/dma/qcom/Kconfig
 +++ b/drivers/dma/qcom/Kconfig

-@@ -27,3 +27,13 @@ config QCOM_HIDMA
+@@ -28,3 +28,13 @@ config QCOM_HIDMA

          (user to kernel, kernel to kernel, etc.).  It only supports
          memcpy interface. The core is not intended for general
          purpose slave DMA.
          (user to kernel, kernel to kernel, etc.).  It only supports
          memcpy interface. The core is not intended for general
          purpose slave DMA.

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 f54c29c324def2680d34df42b7fc395d970131f5..eb412af778a127d9c3d658d31f0253cf1db8da73 100644 (file)
--- 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
@@ -713,7 +713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
  }
  
  #ifdef CONFIG_NET_INGRESS
  }
  
  #ifdef CONFIG_NET_INGRESS

-@@ -6339,7 +6340,15 @@ static int __netdev_upper_dev_link(struc
+@@ -6346,7 +6347,15 @@ static int __netdev_upper_dev_link(struc

                                   struct net_device *upper_dev, bool master,
                                   void *upper_priv, void *upper_info)
  {
                                   struct net_device *upper_dev, bool master,
                                   void *upper_priv, void *upper_info)
  {


@@ -730,7 +730,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
        int ret = 0;
  
        ASSERT_RTNL();
        int ret = 0;
  
        ASSERT_RTNL();

-@@ -6357,12 +6366,7 @@ static int __netdev_upper_dev_link(struc
+@@ -6364,12 +6373,7 @@ static int __netdev_upper_dev_link(struc

        if (master && netdev_master_upper_dev_get(dev))
                return -EBUSY;
  
        if (master && netdev_master_upper_dev_get(dev))
                return -EBUSY;
  


@@ -744,7 +744,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);
        if (ret)
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);
        if (ret)

-@@ -6374,7 +6378,7 @@ static int __netdev_upper_dev_link(struc
+@@ -6381,7 +6385,7 @@ static int __netdev_upper_dev_link(struc

                return ret;
  
        netdev_update_addr_mask(dev);
                return ret;
  
        netdev_update_addr_mask(dev);


@@ -753,7 +753,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);
        if (ret)
                                            &changeupper_info.info);
        ret = notifier_to_errno(ret);
        if (ret)

-@@ -6438,21 +6442,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li
+@@ -6445,21 +6449,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li

  void netdev_upper_dev_unlink(struct net_device *dev,
                             struct net_device *upper_dev)
  {
  void netdev_upper_dev_unlink(struct net_device *dev,
                             struct net_device *upper_dev)
  {


@@ -784,7 +784,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                                      &changeupper_info.info);
  }
  EXPORT_SYMBOL(netdev_upper_dev_unlink);
                                      &changeupper_info.info);
  }
  EXPORT_SYMBOL(netdev_upper_dev_unlink);

-@@ -6468,11 +6476,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);
+@@ -6475,11 +6483,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);

  void netdev_bonding_info_change(struct net_device *dev,
                                struct netdev_bonding_info *bonding_info)
  {
  void netdev_bonding_info_change(struct net_device *dev,
                                struct netdev_bonding_info *bonding_info)
  {


@@ -800,7 +800,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                                      &info.info);
  }
  EXPORT_SYMBOL(netdev_bonding_info_change);
                                      &info.info);
  }
  EXPORT_SYMBOL(netdev_bonding_info_change);

-@@ -6598,11 +6608,13 @@ EXPORT_SYMBOL(dev_get_nest_level);
+@@ -6605,11 +6615,13 @@ EXPORT_SYMBOL(dev_get_nest_level);

  void netdev_lower_state_changed(struct net_device *lower_dev,
                                void *lower_state_info)
  {
  void netdev_lower_state_changed(struct net_device *lower_dev,
                                void *lower_state_info)
  {


@@ -816,7 +816,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
                                      &changelowerstate_info.info);
  }
  EXPORT_SYMBOL(netdev_lower_state_changed);
                                      &changelowerstate_info.info);
  }
  EXPORT_SYMBOL(netdev_lower_state_changed);

-@@ -6893,11 +6905,14 @@ void __dev_notify_flags(struct net_devic
+@@ -6900,11 +6912,14 @@ void __dev_notify_flags(struct net_devic

  
        if (dev->flags & IFF_UP &&
            (changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) {
  
        if (dev->flags & IFF_UP &&
            (changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) {

diff --git a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch
index 51797cc6dd401dfc3b0e642ae541b2275140157e..d0e1be32536c92525cc8c0a414a98dc570345707 100644 (file)
--- a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch
@@ -7318,7 +7318,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                dspi: dspi@2100000 {
                };
  
                dspi: dspi@2100000 {

-@@ -574,15 +494,126 @@
+@@ -573,15 +493,126 @@

                        #interrupt-cells = <2>;
                };
  
                        #interrupt-cells = <2>;
                };
  


@@ -7447,7 +7447,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                i2c1: i2c@2010000 {
                };
  
                i2c1: i2c@2010000 {

-@@ -593,7 +624,7 @@
+@@ -592,7 +623,7 @@

                        reg = <0x0 0x2010000 0x0 0x10000>;
                        interrupts = <0 34 0x4>; /* Level high type */
                        clock-names = "i2c";
                        reg = <0x0 0x2010000 0x0 0x10000>;
                        interrupts = <0 34 0x4>; /* Level high type */
                        clock-names = "i2c";


@@ -7456,7 +7456,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                i2c2: i2c@2020000 {
                };
  
                i2c2: i2c@2020000 {

-@@ -604,7 +635,7 @@
+@@ -603,7 +634,7 @@

                        reg = <0x0 0x2020000 0x0 0x10000>;
                        interrupts = <0 35 0x4>; /* Level high type */
                        clock-names = "i2c";
                        reg = <0x0 0x2020000 0x0 0x10000>;
                        interrupts = <0 35 0x4>; /* Level high type */
                        clock-names = "i2c";


@@ -7465,7 +7465,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                i2c3: i2c@2030000 {
                };
  
                i2c3: i2c@2030000 {

-@@ -615,7 +646,7 @@
+@@ -614,7 +645,7 @@

                        reg = <0x0 0x2030000 0x0 0x10000>;
                        interrupts = <0 35 0x4>; /* Level high type */
                        clock-names = "i2c";
                        reg = <0x0 0x2030000 0x0 0x10000>;
                        interrupts = <0 35 0x4>; /* Level high type */
                        clock-names = "i2c";


@@ -7474,7 +7474,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                ifc: ifc@2240000 {
                };
  
                ifc: ifc@2240000 {

-@@ -648,8 +679,8 @@
+@@ -647,8 +678,8 @@

                        compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
                                     "snps,dw-pcie";
                        reg-names = "regs", "config";
                        compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie",
                                     "snps,dw-pcie";
                        reg-names = "regs", "config";


@@ -7485,7 +7485,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";

-@@ -657,20 +688,22 @@
+@@ -656,20 +687,22 @@

                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;
                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;


@@ -7510,7 +7510,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";

-@@ -678,20 +711,22 @@
+@@ -677,20 +710,22 @@

                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;
                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;


@@ -7535,7 +7535,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";

-@@ -699,20 +734,22 @@
+@@ -698,20 +733,22 @@

                        num-lanes = <8>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;
                        num-lanes = <8>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;


@@ -7560,7 +7560,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";

-@@ -720,12 +757,14 @@
+@@ -719,12 +756,14 @@

                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;
                        num-lanes = <4>;
                        bus-range = <0x0 0xff>;
                        msi-parent = <&its>;


@@ -7575,7 +7575,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                sata0: sata@3200000 {
                };
  
                sata0: sata@3200000 {

-@@ -754,6 +793,8 @@
+@@ -753,6 +792,8 @@

                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;


@@ -7584,7 +7584,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                usb1: usb3@3110000 {
                };
  
                usb1: usb3@3110000 {

-@@ -764,6 +805,14 @@
+@@ -763,6 +804,14 @@

                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;
                        dr_mode = "host";
                        snps,quirk-frame-length-adjustment = <0x20>;
                        snps,dis_rxdet_inp3_quirk;


@@ -7599,7 +7599,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
                };
  
                ccn@4000000 {
                };
  
                ccn@4000000 {

-@@ -771,6 +820,14 @@
+@@ -770,6 +819,14 @@

                        reg = <0x0 0x04000000 0x0 0x01000000>;
                        interrupts = <0 12 4>;
                };
                        reg = <0x0 0x04000000 0x0 0x01000000>;
                        interrupts = <0 12 4>;
                };


@@ -7614,7 +7614,7 @@ Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
        };
  
        ddr1: memory-controller@1080000 {
        };
  
        ddr1: memory-controller@1080000 {

-@@ -786,4 +843,44 @@
+@@ -785,4 +842,44 @@

                interrupts = <0 18 0x4>;
                little-endian;
        };
                interrupts = <0 18 0x4>;
                little-endian;
        };

diff --git a/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch b/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch
index 0b75847281a6f26d5270ccee37b2644cf8fd3a4e..23f5ac4035c73e8c947cd2c6a7d30df375a351d3 100644 (file)
--- a/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/802-dma-support-layerscape.patch
@@ -47,7 +47,7 @@ Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig

-@@ -129,6 +129,24 @@ config COH901318
+@@ -130,6 +130,24 @@ config COH901318

        help
          Enable support for ST-Ericsson COH 901 318 DMA.
  
        help
          Enable support for ST-Ericsson COH 901 318 DMA.
  


@@ -72,7 +72,7 @@ Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
  config DMA_BCM2835
        tristate "BCM2835 DMA engine support"
        depends on ARCH_BCM2835
  config DMA_BCM2835
        tristate "BCM2835 DMA engine support"
        depends on ARCH_BCM2835

-@@ -215,6 +233,20 @@ config FSL_EDMA
+@@ -216,6 +234,20 @@ config FSL_EDMA

          multiplexing capability for DMA request sources(slot).
          This module can be found on Freescale Vybrid and LS-1 SoCs.
  
          multiplexing capability for DMA request sources(slot).
          This module can be found on Freescale Vybrid and LS-1 SoCs.
  


@@ -93,7 +93,7 @@ Signed-off-by: Yuan Yao <yao.yuan@nxp.com>
  config FSL_RAID
          tristate "Freescale RAID engine Support"
          depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH
  config FSL_RAID
          tristate "Freescale RAID engine Support"
          depends on FSL_SOC && !ASYNC_TX_ENABLE_CHANNEL_SWITCH

-@@ -600,7 +632,6 @@ config ZX_DMA
+@@ -601,7 +633,6 @@ config ZX_DMA

        help
          Support the DMA engine for ZTE ZX family platform devices.
  
        help
          Support the DMA engine for ZTE ZX family platform devices.
  

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 4ea197ed666c4a61b5bfeec69ac46b0983b9675b..43e680c5434377fc5785591819b65fe61e5bf7f5 100644 (file)
--- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch
@@ -508,7 +508,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
  
 --- a/drivers/usb/dwc3/ep0.c
 +++ b/drivers/usb/dwc3/ep0.c
  
 --- a/drivers/usb/dwc3/ep0.c
 +++ b/drivers/usb/dwc3/ep0.c

-@@ -391,7 +391,7 @@ static int dwc3_ep0_handle_u1(struct dwc
+@@ -394,7 +394,7 @@ static int dwc3_ep0_handle_u1(struct dwc

                return -EINVAL;
  
        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
                return -EINVAL;
  
        reg = dwc3_readl(dwc->regs, DWC3_DCTL);


@@ -517,7 +517,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
                reg |= DWC3_DCTL_INITU1ENA;
        else
                reg &= ~DWC3_DCTL_INITU1ENA;
                reg |= DWC3_DCTL_INITU1ENA;
        else
                reg &= ~DWC3_DCTL_INITU1ENA;

-@@ -413,7 +413,7 @@ static int dwc3_ep0_handle_u2(struct dwc
+@@ -416,7 +416,7 @@ static int dwc3_ep0_handle_u2(struct dwc

                return -EINVAL;
  
        reg = dwc3_readl(dwc->regs, DWC3_DCTL);
                return -EINVAL;
  
        reg = dwc3_readl(dwc->regs, DWC3_DCTL);


@@ -1289,7 +1289,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
                xhci->quirks |= XHCI_BROKEN_PORT_PED;
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
                xhci->quirks |= XHCI_BROKEN_PORT_PED;
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c

-@@ -1983,10 +1983,12 @@ static int finish_td(struct xhci_hcd *xh
+@@ -2016,10 +2016,12 @@ static int finish_td(struct xhci_hcd *xh

        union xhci_trb *ep_trb, struct xhci_transfer_event *event,
        struct xhci_virt_ep *ep, int *status)
  {
        union xhci_trb *ep_trb, struct xhci_transfer_event *event,
        struct xhci_virt_ep *ep, int *status)
  {


@@ -1302,7 +1302,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
        u32 trb_comp_code;
        int ep_index;
  
        u32 trb_comp_code;
        int ep_index;
  

-@@ -2009,14 +2011,30 @@ static int finish_td(struct xhci_hcd *xh
+@@ -2042,14 +2044,30 @@ static int finish_td(struct xhci_hcd *xh

        if (trb_comp_code == COMP_STALL_ERROR ||
                xhci_requires_manual_halt_cleanup(xhci, ep_ctx,
                                                trb_comp_code)) {
        if (trb_comp_code == COMP_STALL_ERROR ||
                xhci_requires_manual_halt_cleanup(xhci, ep_ctx,
                                                trb_comp_code)) {


@@ -1387,7 +1387,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
        spin_unlock_irqrestore(&xhci->lock, flags);
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
        spin_unlock_irqrestore(&xhci->lock, flags);
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h

-@@ -1794,7 +1794,7 @@ struct xhci_hcd {
+@@ -1795,7 +1795,7 @@ struct xhci_hcd {

  #define XHCI_STATE_DYING      (1 << 0)
  #define XHCI_STATE_HALTED     (1 << 1)
  #define XHCI_STATE_REMOVING   (1 << 2)
  #define XHCI_STATE_DYING      (1 << 0)
  #define XHCI_STATE_HALTED     (1 << 1)
  #define XHCI_STATE_REMOVING   (1 << 2)


@@ -1396,7 +1396,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
  #define       XHCI_LINK_TRB_QUIRK     BIT_ULL(0)
  #define XHCI_RESET_EP_QUIRK   BIT_ULL(1)
  #define XHCI_NEC_HOST         BIT_ULL(2)
  #define       XHCI_LINK_TRB_QUIRK     BIT_ULL(0)
  #define XHCI_RESET_EP_QUIRK   BIT_ULL(1)
  #define XHCI_NEC_HOST         BIT_ULL(2)

-@@ -1830,6 +1830,9 @@ struct xhci_hcd {
+@@ -1831,6 +1831,9 @@ struct xhci_hcd {

  #define XHCI_SSIC_PORT_UNUSED BIT_ULL(22)
  #define XHCI_NO_64BIT_SUPPORT BIT_ULL(23)
  #define XHCI_MISSING_CAS      BIT_ULL(24)
  #define XHCI_SSIC_PORT_UNUSED BIT_ULL(22)
  #define XHCI_NO_64BIT_SUPPORT BIT_ULL(23)
  #define XHCI_MISSING_CAS      BIT_ULL(24)


@@ -1406,7 +1406,7 @@ Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
  /* For controller with a broken Port Disable implementation */
  #define XHCI_BROKEN_PORT_PED  BIT_ULL(25)
  #define XHCI_LIMIT_ENDPOINT_INTERVAL_7        BIT_ULL(26)
  /* For controller with a broken Port Disable implementation */
  #define XHCI_BROKEN_PORT_PED  BIT_ULL(25)
  #define XHCI_LIMIT_ENDPOINT_INTERVAL_7        BIT_ULL(26)

-@@ -1838,8 +1841,9 @@ struct xhci_hcd {
+@@ -1839,8 +1842,9 @@ struct xhci_hcd {

  #define XHCI_HW_LPM_DISABLE   BIT_ULL(29)
  #define XHCI_SUSPEND_DELAY    BIT_ULL(30)
  #define XHCI_INTEL_USB_ROLE_SW        BIT_ULL(31)
  #define XHCI_HW_LPM_DISABLE   BIT_ULL(29)
  #define XHCI_SUSPEND_DELAY    BIT_ULL(30)
  #define XHCI_INTEL_USB_ROLE_SW        BIT_ULL(31)

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 e7c42d8d9b10fec2f027d6024a72224fd2a3b59b..38a308e9d415c054e24705080e6d013cde23aaf7 100644 (file)
--- a/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/816-pcie-support-layerscape.patch
@@ -5604,9 +5604,9 @@ Signed-off-by: Yangbo Lu <yangbo.lu@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
         * them, we have to fall back to INTx or other interrupts, e.g., a
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c

-@@ -3408,6 +3408,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);
+@@ -3430,6 +3430,13 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_A
+  */
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TI, 0xb005, quirk_no_bus_reset);

  
 +/*
 + * NXP (Freescale Vendor ID) LS1088 chips do not behave correctly after
  
 +/*
 + * NXP (Freescale Vendor ID) LS1088 chips do not behave correctly after

diff --git a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
index b89916b55d0488e2f993dd66c723c480a40b54bd..583ca11751c2aa6c2c7f1b5ee7a596317b0c4eaa 100644 (file)
--- a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch
@@ -497,7 +497,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
                .name = "sdhci-esdhc",
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c
                .name = "sdhci-esdhc",
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c

-@@ -2148,7 +2148,7 @@ static void sdhci_send_tuning(struct sdh
+@@ -2152,7 +2152,7 @@ static void sdhci_send_tuning(struct sdh

  
  }
  
  
  }
  


@@ -506,7 +506,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
  {
        int i;
  
  {
        int i;
  

-@@ -2165,13 +2165,13 @@ static void __sdhci_execute_tuning(struc
+@@ -2169,13 +2169,13 @@ static void __sdhci_execute_tuning(struc

                        pr_debug("%s: Tuning timeout, falling back to fixed sampling clock\n",
                                 mmc_hostname(host->mmc));
                        sdhci_abort_tuning(host, opcode);
                        pr_debug("%s: Tuning timeout, falling back to fixed sampling clock\n",
                                 mmc_hostname(host->mmc));
                        sdhci_abort_tuning(host, opcode);


@@ -522,7 +522,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
                        break;
                }
  
                        break;
                }
  

-@@ -2183,6 +2183,7 @@ static void __sdhci_execute_tuning(struc
+@@ -2187,6 +2187,7 @@ static void __sdhci_execute_tuning(struc

        pr_info("%s: Tuning failed, falling back to fixed sampling clock\n",
                mmc_hostname(host->mmc));
        sdhci_reset_tuning(host);
        pr_info("%s: Tuning failed, falling back to fixed sampling clock\n",
                mmc_hostname(host->mmc));
        sdhci_reset_tuning(host);


@@ -530,7 +530,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
  }
  
  int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
  }
  
  int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)

-@@ -2244,7 +2245,7 @@ int sdhci_execute_tuning(struct mmc_host
+@@ -2248,7 +2249,7 @@ int sdhci_execute_tuning(struct mmc_host

  
        sdhci_start_tuning(host);
  
  
        sdhci_start_tuning(host);
  


@@ -541,7 +541,7 @@ Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
  out:
 --- a/drivers/mmc/host/sdhci.h
 +++ b/drivers/mmc/host/sdhci.h
  out:
 --- a/drivers/mmc/host/sdhci.h
 +++ b/drivers/mmc/host/sdhci.h

-@@ -545,6 +545,7 @@ struct sdhci_host {
+@@ -546,6 +546,7 @@ struct sdhci_host {

  
        unsigned int            tuning_count;   /* Timer count for re-tuning */
        unsigned int            tuning_mode;    /* Re-tuning mode supported by host */
  
        unsigned int            tuning_count;   /* Timer count for re-tuning */
        unsigned int            tuning_mode;    /* Re-tuning mode supported by host */

diff --git a/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch b/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
index f8d893ceebf8ebc2654c5e203c896dde963d1c5c..0781704d9bf8b41b500e0ea1bb47d512a6d21f50 100644 (file)
--- a/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch
@@ -22,7 +22,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
  struct lpuart_port {
        struct uart_port        port;
        struct clk              *clk;
  struct lpuart_port {
        struct uart_port        port;
        struct clk              *clk;

-@@ -2153,13 +2155,13 @@ static int lpuart_probe(struct platform_
+@@ -2156,13 +2158,13 @@ static int lpuart_probe(struct platform_

  
        ret = of_alias_get_id(np, "serial");
        if (ret < 0) {
  
        ret = of_alias_get_id(np, "serial");
        if (ret < 0) {


@@ -42,7 +42,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
        sport->port.line = ret;
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        sport->port.membase = devm_ioremap_resource(&pdev->dev, res);
        sport->port.line = ret;
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        sport->port.membase = devm_ioremap_resource(&pdev->dev, res);

-@@ -2250,6 +2252,7 @@ static int lpuart_remove(struct platform
+@@ -2253,6 +2255,7 @@ static int lpuart_remove(struct platform

        struct lpuart_port *sport = platform_get_drvdata(pdev);
  
        uart_remove_one_port(&lpuart_reg, &sport->port);
        struct lpuart_port *sport = platform_get_drvdata(pdev);
  
        uart_remove_one_port(&lpuart_reg, &sport->port);

diff --git a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
index 84ffc5f2713d9ff73209083d2b7658049bf35a6e..884c5008d5318f2e3c60491db25831f2efe6d7e5 100644 (file)
--- a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
+++ b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
@@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /* Set the HCD state before we enable the irqs */
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
        /* Set the HCD state before we enable the irqs */
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h

-@@ -1730,6 +1730,8 @@ struct xhci_hcd {
+@@ -1731,6 +1731,8 @@ struct xhci_hcd {

        u8              max_interrupters;
        u8              max_ports;
        u8              isoc_threshold;
        u8              max_interrupters;
        u8              max_ports;
        u8              isoc_threshold;

diff --git a/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch b/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch
index 6fd4cdef488dfb6315a4af4ab4b3ca217db773a5..7398229502b1f01caed24ca779eeb94dcaf17734 100644 (file)
--- a/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch
+++ b/target/linux/mediatek/patches-4.14/0205-dmaengine-mediatek-Add-MediaTek-High-Speed-DMA-contr.patch
@@ -29,7 +29,7 @@ Cc: Julia Lawall <julia.lawall@lip6.fr>
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
 
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig

-@@ -604,6 +604,8 @@ config ZX_DMA
+@@ -605,6 +605,8 @@ config ZX_DMA

  # driver files
  source "drivers/dma/bestcomm/Kconfig"
  
  # driver files
  source "drivers/dma/bestcomm/Kconfig"
  

diff --git a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
index beea6a55bac32a4d05ea73c58007ecdec88937c8..aa5bfe7d066272e499c57fe7a4ed338e4f7e33b6 100644 (file)
--- a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
+++ b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
@@ -57,7 +57,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  #define PCIE_CORE_LINK_CTRL_STAT_REG                          0xd0
  #define     PCIE_CORE_LINK_L0S_ENTRY                          BIT(0)
  #define     PCIE_CORE_LINK_TRAINING                           BIT(5)
  #define PCIE_CORE_LINK_CTRL_STAT_REG                          0xd0
  #define     PCIE_CORE_LINK_L0S_ENTRY                          BIT(0)
  #define     PCIE_CORE_LINK_TRAINING                           BIT(5)

-@@ -297,7 +299,8 @@ static void advk_pcie_setup_hw(struct ad
+@@ -298,7 +300,8 @@ static void advk_pcie_setup_hw(struct ad

  
        /* Set PCIe Device Control and Status 1 PF0 register */
        reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
  
        /* Set PCIe Device Control and Status 1 PF0 register */
        reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |


@@ -67,7 +67,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
                PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE |
                (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ <<
                 PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT);
                PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE |
                (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ <<
                 PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT);

-@@ -882,6 +885,58 @@ out_release_res:
+@@ -913,6 +916,58 @@ out_release_res:

        return err;
  }
  
        return err;
  }
  


@@ -126,7 +126,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  static int advk_pcie_probe(struct platform_device *pdev)
  {
        struct device *dev = &pdev->dev;
  static int advk_pcie_probe(struct platform_device *pdev)
  {
        struct device *dev = &pdev->dev;

-@@ -956,6 +1011,9 @@ static int advk_pcie_probe(struct platfo
+@@ -987,6 +1042,9 @@ static int advk_pcie_probe(struct platfo

        list_for_each_entry(child, &bus->children, node)
                pcie_bus_configure_settings(child);
  
        list_for_each_entry(child, &bus->children, node)
                pcie_bus_configure_settings(child);
  

diff --git a/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch b/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
index fb57f4112a4f5cdbee068d3814254d406ebc1e37..d9ebf2e498edce762d73c820585b107e8fb0aff1 100644 (file)
--- a/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
+++ b/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
@@ -14,7 +14,7 @@ Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
 
 --- a/drivers/pci/host/pci-aardvark.c
 +++ b/drivers/pci/host/pci-aardvark.c
 
 --- a/drivers/pci/host/pci-aardvark.c
 +++ b/drivers/pci/host/pci-aardvark.c

-@@ -272,6 +272,8 @@ static void advk_pcie_set_ob_win(struct
+@@ -273,6 +273,8 @@ static void advk_pcie_set_ob_win(struct

  
  static void advk_pcie_setup_hw(struct advk_pcie *pcie)
  {
  
  static void advk_pcie_setup_hw(struct advk_pcie *pcie)
  {


@@ -23,7 +23,7 @@ Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com>
        u32 reg;
        int i;
  
        u32 reg;
        int i;
  

-@@ -311,10 +313,15 @@ static void advk_pcie_setup_hw(struct ad
+@@ -312,10 +314,15 @@ static void advk_pcie_setup_hw(struct ad

                PCIE_CORE_CTRL2_TD_ENABLE;
        advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
  
                PCIE_CORE_CTRL2_TD_ENABLE;
        advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
  

diff --git a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
index 77ec3f111c8e47da4fd45e32230366c008345a4a..7304936b6c518d7db786b60f0c6b291344cec90b 100644 (file)
--- a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch
@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include <media/v4l2-common.h>
  
  
  #include <media/v4l2-common.h>
  

-@@ -1101,9 +1106,149 @@ static void uvc_video_decode_data(struct
+@@ -1128,9 +1133,149 @@ static void uvc_video_decode_data(struct

        }
  }
  
        }
  }
  


@@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        /* Mark the buffer as done if the EOF marker is set. */
        if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
                uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");
        /* Mark the buffer as done if the EOF marker is set. */
        if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
                uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n");

-@@ -1518,6 +1663,8 @@ static int uvc_init_video_isoc(struct uv
+@@ -1545,6 +1690,8 @@ static int uvc_init_video_isoc(struct uv

        if (npackets == 0)
                return -ENOMEM;
  
        if (npackets == 0)
                return -ENOMEM;
  

diff --git a/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch b/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch
index 4880c49b1360b433a2111ab17810fe36fcdd783a..c777a0fffee14aa71debdee11c44b301c3e67151 100644 (file)
--- a/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch
+++ b/target/linux/ramips/patches-4.14/700-net-mdiobus-add-unlocked-accessors.patch
@@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c
 
 --- a/drivers/net/phy/mdio_bus.c
 +++ b/drivers/net/phy/mdio_bus.c

-@@ -493,6 +493,55 @@ struct phy_device *mdiobus_scan(struct m
+@@ -494,6 +494,55 @@ struct phy_device *mdiobus_scan(struct m

  EXPORT_SYMBOL(mdiobus_scan);
  
  /**
  EXPORT_SYMBOL(mdiobus_scan);
  
  /**


@@ -75,7 +75,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
   * mdiobus_read_nested - Nested version of the mdiobus_read function
   * @bus: the mii_bus struct
   * @addr: the phy address
   * mdiobus_read_nested - Nested version of the mdiobus_read function
   * @bus: the mii_bus struct
   * @addr: the phy address

-@@ -512,11 +561,9 @@ int mdiobus_read_nested(struct mii_bus *
+@@ -513,11 +562,9 @@ int mdiobus_read_nested(struct mii_bus *

        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);


@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read_nested);
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read_nested);

-@@ -538,11 +585,9 @@ int mdiobus_read(struct mii_bus *bus, in
+@@ -539,11 +586,9 @@ int mdiobus_read(struct mii_bus *bus, in

        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);
        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);


@@ -101,7 +101,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read);
        return retval;
  }
  EXPORT_SYMBOL(mdiobus_read);

-@@ -568,11 +613,9 @@ int mdiobus_write_nested(struct mii_bus
+@@ -569,11 +614,9 @@ int mdiobus_write_nested(struct mii_bus

        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);
        BUG_ON(in_interrupt());
  
        mutex_lock_nested(&bus->mdio_lock, MDIO_MUTEX_NESTED);


@@ -114,7 +114,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        return err;
  }
  EXPORT_SYMBOL(mdiobus_write_nested);
        return err;
  }
  EXPORT_SYMBOL(mdiobus_write_nested);

-@@ -595,11 +638,9 @@ int mdiobus_write(struct mii_bus *bus, i
+@@ -596,11 +639,9 @@ int mdiobus_write(struct mii_bus *bus, i

        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);
        BUG_ON(in_interrupt());
  
        mutex_lock(&bus->mdio_lock);