kernel: bump 4.14 to 4.14.90
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Sun, 23 Dec 2018 16:16:17 +0000 (16:16 +0000)
committerKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Mon, 24 Dec 2018 15:06:33 +0000 (15:06 +0000)
Refresh all patches

Remove upstream patch:
backport-4.14/424-v4.20-net-dsa-fix-88e6060-roaming.patch

Minor tweak to generic/hack-4.14/902-debloat_proc.patch to cleanly apply
after upstream changes.

Tested-on: ath79

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
include/kernel-version.mk
target/linux/brcm2708/patches-4.14/950-0120-cache-export-clean-and-invalidate.patch
target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch
target/linux/generic/backport-4.14/100-arm-cns3xxx-fix-writing-to-wrong-PCI-registers-after.patch
target/linux/generic/backport-4.14/424-v4.20-net-dsa-fix-88e6060-roaming.patch [deleted file]
target/linux/generic/hack-4.14/902-debloat_proc.patch
target/linux/generic/pending-4.14/834-ledtrig-libata.patch
target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
target/linux/layerscape/patches-4.14/812-flexspi-support-layerscape.patch
target/linux/oxnas/patches-4.14/999-libata-hacks.patch

index ed740ff..e809879 100644 (file)
@@ -4,12 +4,12 @@ LINUX_RELEASE?=1
 
 LINUX_VERSION-3.18 = .130
 LINUX_VERSION-4.9 = .146
-LINUX_VERSION-4.14 = .89
+LINUX_VERSION-4.14 = .90
 LINUX_VERSION-4.19 = .9
 
 LINUX_KERNEL_HASH-3.18.130 = d1bf85ed3fd0067b1134178ed5492ae0053cb3fdd5361986fe0b85234fc82723
 LINUX_KERNEL_HASH-4.9.146 = 58195a8be3085d117c83a2ed1caa3b46ea7c1614c75f951b9f13f7adb03f8e59
-LINUX_KERNEL_HASH-4.14.89 = ce6e16ac44dddd0d6a232bf2ce03e8bf8beca19f9b84503684466d140a1a0b25
+LINUX_KERNEL_HASH-4.14.90 = 0c1ed0c93085e44ad89cd279647b0e4617d06ce5a482213b5481b612ffa186ca
 LINUX_KERNEL_HASH-4.19.9 = fc116cc6829c73944215d3b3ac0fc368dde9e8235b456744afffde001269dbf2
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
index bbab89f..13f49e6 100644 (file)
@@ -39,7 +39,7 @@ Subject: [PATCH 120/454] cache: export clean and invalidate
        dcache_line_size r2, r3
        sub     r3, r2, #1
        tst     r0, r3
-@@ -377,7 +377,7 @@ ENDPROC(v7_dma_inv_range)
+@@ -379,7 +379,7 @@ ENDPROC(v7_dma_inv_range)
   *    - start   - virtual start address of region
   *    - end     - virtual end address of region
   */
index 7a3a8e4..b5f0350 100644 (file)
@@ -1,7 +1,7 @@
 --- a/arch/arm/mach-cns3xxx/pcie.c
 +++ b/arch/arm/mach-cns3xxx/pcie.c
 @@ -86,6 +86,79 @@ static void __iomem *cns3xxx_pci_map_bus
-       return base + (where & 0xffc) + (devfn << 12);
+       return base + where + (devfn << 12);
  }
  
 +static inline int check_master_abort(struct pci_bus *bus, unsigned int devfn, int where)
index 458515a..faeb3e4 100644 (file)
@@ -61,11 +61,9 @@ CC: stable@vger.kernel.org # v4.0+
  arch/arm/mach-cns3xxx/pcie.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c
-index 318394ed5c7a..5e11ad3164e0 100644
 --- a/arch/arm/mach-cns3xxx/pcie.c
 +++ b/arch/arm/mach-cns3xxx/pcie.c
-@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus,
+@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus
        } else /* remote PCI bus */
                base = cnspci->cfg1_regs + ((busno & 0xf) << 20);
  
@@ -74,6 +72,3 @@ index 318394ed5c7a..5e11ad3164e0 100644
  }
  
  static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
--- 
-2.17.1
-
diff --git a/target/linux/generic/backport-4.14/424-v4.20-net-dsa-fix-88e6060-roaming.patch b/target/linux/generic/backport-4.14/424-v4.20-net-dsa-fix-88e6060-roaming.patch
deleted file mode 100644 (file)
index c49cbe2..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-From a74515604a7b171f2702bdcbd1e231225fb456d0 Mon Sep 17 00:00:00 2001
-From: Anderson Luiz Alves <alacn1@gmail.com>
-Date: Fri, 30 Nov 2018 21:58:36 -0200
-Subject: [PATCH] mv88e6060: disable hardware level MAC learning
-
-Disable hardware level MAC learning because it breaks station roaming.
-When enabled it drops all frames that arrive from a MAC address
-that is on a different port at learning table.
-
-Signed-off-by: Anderson Luiz Alves <alacn1@gmail.com>
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/dsa/mv88e6060.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
---- a/drivers/net/dsa/mv88e6060.c
-+++ b/drivers/net/dsa/mv88e6060.c
-@@ -114,8 +114,7 @@ static int mv88e6060_switch_reset(struct
-       /* Reset the switch. */
-       REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,
-                 GLOBAL_ATU_CONTROL_SWRESET |
--                GLOBAL_ATU_CONTROL_ATUSIZE_1024 |
--                GLOBAL_ATU_CONTROL_ATE_AGE_5MIN);
-+                GLOBAL_ATU_CONTROL_LEARNDIS);
-       /* Wait up to one second for reset to complete. */
-       timeout = jiffies + 1 * HZ;
-@@ -140,13 +139,10 @@ static int mv88e6060_setup_global(struct
-        */
-       REG_WRITE(REG_GLOBAL, GLOBAL_CONTROL, GLOBAL_CONTROL_MAX_FRAME_1536);
--      /* Enable automatic address learning, set the address
--       * database size to 1024 entries, and set the default aging
--       * time to 5 minutes.
-+      /* Disable automatic address learning.
-        */
-       REG_WRITE(REG_GLOBAL, GLOBAL_ATU_CONTROL,
--                GLOBAL_ATU_CONTROL_ATUSIZE_1024 |
--                GLOBAL_ATU_CONTROL_ATE_AGE_5MIN);
-+                GLOBAL_ATU_CONTROL_LEARNDIS);
-       return 0;
- }
index cae6d66..98788cd 100644 (file)
@@ -227,7 +227,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
 +      if (IS_ENABLED(CONFIG_PROC_STRIPPED))
 +              return 0;
-       pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
+       pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
        if (!pe)
                return -ENOMEM;
 --- a/mm/vmalloc.c
index 2eec024..392d41c 100644 (file)
@@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  /**
   *    ata_build_rw_tf - Build ATA taskfile for given read/write request
   *    @tf: Target ATA taskfile
-@@ -5120,6 +5133,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5121,6 +5134,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
                if (tag < 0)
                        return NULL;
        }
@@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
        qc = __ata_qc_from_tag(ap, tag);
        qc->tag = tag;
-@@ -6021,6 +6037,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -6022,6 +6038,9 @@ struct ata_port *ata_port_alloc(struct a
        ap->stats.unhandled_irq = 1;
        ap->stats.idle_irq = 1;
  #endif
@@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        ata_sff_port_init(ap);
  
        return ap;
-@@ -6042,6 +6061,12 @@ static void ata_host_release(struct devi
+@@ -6043,6 +6062,12 @@ static void ata_host_release(struct devi
  
                kfree(ap->pmp_link);
                kfree(ap->slave_link);
@@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                kfree(ap);
                host->ports[i] = NULL;
        }
-@@ -6488,7 +6513,23 @@ int ata_host_register(struct ata_host *h
+@@ -6489,7 +6514,23 @@ int ata_host_register(struct ata_host *h
                host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
                host->ports[i]->local_port_no = i + 1;
        }
index ba2480a..14e8d73 100644 (file)
@@ -106,7 +106,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
        case '-':
 --- a/drivers/net/team/team.c
 +++ b/drivers/net/team/team.c
-@@ -1934,7 +1934,8 @@ static int team_netpoll_setup(struct net
+@@ -1932,7 +1932,8 @@ static int team_netpoll_setup(struct net
  }
  #endif
  
index c1594af..1c8ae25 100644 (file)
@@ -40,7 +40,7 @@ Signed-off-by: Biwen Li <biwen.li@nxp.com>
 
 --- a/drivers/md/dm-thin.c
 +++ b/drivers/md/dm-thin.c
-@@ -3643,6 +3643,19 @@ static int process_create_thin_mesg(unsi
+@@ -3645,6 +3645,19 @@ static int process_create_thin_mesg(unsi
                return r;
        }
  
index e490dbf..382a163 100644 (file)
@@ -15,7 +15,7 @@
        /* initialize internal qc */
  
        /* XXX: Tag 0 is used for drivers with legacy EH as some
-@@ -5127,6 +5135,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -5128,6 +5136,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
        if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
                return NULL;
  
@@ -25,7 +25,7 @@
        /* libsas case */
        if (ap->flags & ATA_FLAG_SAS_HOST) {
                tag = ata_sas_allocate_tag(ap);
-@@ -5172,6 +5183,8 @@ void ata_qc_free(struct ata_queued_cmd *
+@@ -5173,6 +5184,8 @@ void ata_qc_free(struct ata_queued_cmd *
                qc->tag = ATA_TAG_POISON;
                if (ap->flags & ATA_FLAG_SAS_HOST)
                        ata_sas_free_tag(tag, ap);