kernel: bump 5.15 to 5.15.34
authorRui Salvaterra <rsalvaterra@gmail.com>
Thu, 14 Apr 2022 08:28:11 +0000 (09:28 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 16 Apr 2022 12:02:13 +0000 (14:02 +0200)
Deleted (upstreamed):
generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch [1]

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.34&id=60eabd66d17fa2cbc31f670b2f201f0bc54090a2

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
15 files changed:
include/kernel-5.15
target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch
target/linux/generic/backport-5.15/850-v5.17-0004-PCI-aardvark-Clear-all-MSIs-at-setup.patch
target/linux/generic/backport-5.15/850-v5.17-0005-PCI-aardvark-Comment-actions-in-driver-remove-method.patch
target/linux/generic/backport-5.15/850-v5.17-0006-PCI-aardvark-Disable-bus-mastering-when-unbinding-dr.patch
target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch
target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch
target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch
target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch
target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch
target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
target/linux/generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch [deleted file]
target/linux/generic/pending-5.15/920-mangle_bootargs.patch
target/linux/ipq806x/patches-5.15/0067-generic-Mangle-bootloader-s-kernel-arguments.patch

index cb830e39db87ca5c430bb0d91b0b7c74acc9ff68..31ee3119eb5123291adfdecfe62ecb0c3739e867 100644 (file)
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.15 = .33
-LINUX_KERNEL_HASH-5.15.33 = c30a17e6090f9ebf2d8ff58cd6c92c7324b1f4a8b3aa6a7f68850310af05a9c4
+LINUX_VERSION-5.15 = .34
+LINUX_KERNEL_HASH-5.15.34 = a7514685392f0f89b337fa252a10a004c6a97d23e8d1126059c8e373398fdb69
index 7196d28fb2d025567fa6ad14617bfe794d96a9d1..46f5be3d4e4c75992ba5fa44a2d337f0bc82f014 100644 (file)
  #define UDP_CORK      1       /* Never send partially complete segments */
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -292,8 +292,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
+@@ -305,8 +305,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
  
        switch (l3num) {
        case NFPROTO_IPV4:
index 9967f46639e36808c12b86a79a94d990d1e87ceb..61dd8b8733e4744f40f15d6dcbf7c3dad28b0132 100644 (file)
@@ -48,7 +48,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  
        /* Enable summary interrupt for GIC SPI source */
        reg = PCIE_IRQ_ALL_MASK & (~PCIE_IRQ_ENABLE_INTS_MASK);
-@@ -1393,7 +1395,7 @@ static void advk_pcie_handle_msi(struct
+@@ -1389,7 +1391,7 @@ static void advk_pcie_handle_msi(struct
  
        msi_mask = advk_readl(pcie, PCIE_MSI_MASK_REG);
        msi_val = advk_readl(pcie, PCIE_MSI_STATUS_REG);
index e60fbd0ceae56587b80bd783caa6143fd986513e..a022f3ec6c5760f07c55e42016e96adf23760ba7 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1685,11 +1685,13 @@ static int advk_pcie_remove(struct platf
+@@ -1681,11 +1681,13 @@ static int advk_pcie_remove(struct platf
        struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
        int i;
  
index 7ac7db2ed38ed98fd3f540c1c7e3debbe69354a0..9b8ae26dfebc82a3015ad2d584790447256da616 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1683,6 +1683,7 @@ static int advk_pcie_remove(struct platf
+@@ -1679,6 +1679,7 @@ static int advk_pcie_remove(struct platf
  {
        struct advk_pcie *pcie = platform_get_drvdata(pdev);
        struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
@@ -27,7 +27,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
        int i;
  
        /* Remove PCI bus with all devices */
-@@ -1691,6 +1692,11 @@ static int advk_pcie_remove(struct platf
+@@ -1687,6 +1688,11 @@ static int advk_pcie_remove(struct platf
        pci_remove_root_bus(bridge->bus);
        pci_unlock_rescan_remove();
  
index 85c8b7059d84a7d820529369fe4367af2e8b4521..97173ee2813d3d7b2e9c5faf5fb12f97ec24aab2 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1697,6 +1697,27 @@ static int advk_pcie_remove(struct platf
+@@ -1693,6 +1693,27 @@ static int advk_pcie_remove(struct platf
        val &= ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
        advk_writel(pcie, val, PCIE_CORE_CMD_STATUS_REG);
  
index d24bd8227368372990a2788edeab19b959adac73..e8611c82fe62513ae3acb72fef6df1a658d8629a 100644 (file)
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1722,6 +1722,9 @@ static int advk_pcie_remove(struct platf
+@@ -1718,6 +1718,9 @@ static int advk_pcie_remove(struct platf
        advk_pcie_remove_msi_irq_domain(pcie);
        advk_pcie_remove_irq_domain(pcie);
  
index 1928a3c6f1069208cef2dec2aa0944f3406f4ccd..3e309159d03086872b1ec7be82e2ec3174bbf8ef 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1725,6 +1725,10 @@ static int advk_pcie_remove(struct platf
+@@ -1721,6 +1721,10 @@ static int advk_pcie_remove(struct platf
        /* Free config space for emulated root bridge */
        pci_bridge_emul_cleanup(&pcie->bridge);
  
index f66635aaefc47f2fba2453deee0a1eaf1d2b496b..1a5725121bf3e38a91a5740f5704a47dbe0c2f88 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1729,6 +1729,11 @@ static int advk_pcie_remove(struct platf
+@@ -1725,6 +1725,11 @@ static int advk_pcie_remove(struct platf
        if (pcie->reset_gpio)
                gpiod_set_value_cansleep(pcie->reset_gpio, 1);
  
index 263e81f354fdf3d1b1e08b38719e1965c846bbcd..4a4af186fdff1d214d00a69232525cb07ed26913 100644 (file)
@@ -18,7 +18,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1738,6 +1738,9 @@ static int advk_pcie_remove(struct platf
+@@ -1734,6 +1734,9 @@ static int advk_pcie_remove(struct platf
        for (i = 0; i < OB_WIN_COUNT; i++)
                advk_pcie_disable_ob_win(pcie, i);
  
index a003fc2944759042b9102dab3d5b87d17c5b4d4c..134e2100c84d416dd8ae0eaf919c1fb25e6068f2 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
 
 --- a/net/netfilter/nf_conntrack_core.c
 +++ b/net/netfilter/nf_conntrack_core.c
-@@ -2676,7 +2676,7 @@ int nf_conntrack_init_start(void)
+@@ -2727,7 +2727,7 @@ int nf_conntrack_init_start(void)
  
        if (!nf_conntrack_htable_size) {
                nf_conntrack_htable_size
index f30887fccb8df059854f4cc55071629ee39e457a..84a3ee8e607674f67a84b5e4bd51a24a040cc207 100644 (file)
@@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
  struct rtnl_link {
        rtnl_doit_func          doit;
-@@ -4689,7 +4689,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -4700,7 +4700,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
            brport_nla_put_flag(skb, flags, mask,
                                IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
            brport_nla_put_flag(skb, flags, mask,
diff --git a/target/linux/generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch b/target/linux/generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch
deleted file mode 100644 (file)
index 950f3a8..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-From bb03b126ea6c9e57177b537dd022246fa5dbef16 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>
-Date: Fri, 12 Feb 2021 16:24:07 +0100
-Subject: [PATCH] PCI: aardvark: Fix support for MSI interrupts
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Aardvark hardware supports Multi-MSI and MSI_FLAG_MULTI_PCI_MSI is already
-set for the MSI chip. But when allocating MSI interrupt numbers for
-Multi-MSI, the numbers need to be properly aligned, otherwise endpoint
-devices send MSI interrupt with incorrect numbers.
-
-Fix this issue by using function bitmap_find_free_region() instead of
-bitmap_find_next_zero_area().
-
-To ensure that aligned MSI interrupt numbers are used by endpoint devices,
-we cannot use Linux virtual irq numbers (as they are random and not
-properly aligned). Instead we need to use the aligned hwirq numbers.
-
-This change fixes receiving MSI interrupts on Armada 3720 boards and
-allows using NVMe disks which use Multi-MSI feature with 3 interrupts.
-
-Without this NVMe disks freeze booting as linux nvme-core.c is waiting
-60s for an interrupt.
-
-Signed-off-by: Pali Rohár <pali@kernel.org>
-Signed-off-by: Marek Behún <kabel@kernel.org>
----
- drivers/pci/controller/pci-aardvark.c | 16 ++++++----------
- 1 file changed, 6 insertions(+), 10 deletions(-)
-
---- a/drivers/pci/controller/pci-aardvark.c
-+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1184,7 +1184,7 @@ static void advk_msi_irq_compose_msi_msg
-       msg->address_lo = lower_32_bits(msi_msg);
-       msg->address_hi = upper_32_bits(msi_msg);
--      msg->data = data->irq;
-+      msg->data = data->hwirq;
- }
- static int advk_msi_set_affinity(struct irq_data *irq_data,
-@@ -1201,15 +1201,11 @@ static int advk_msi_irq_domain_alloc(str
-       int hwirq, i;
-       mutex_lock(&pcie->msi_used_lock);
--      hwirq = bitmap_find_next_zero_area(pcie->msi_used, MSI_IRQ_NUM,
--                                         0, nr_irqs, 0);
--      if (hwirq >= MSI_IRQ_NUM) {
--              mutex_unlock(&pcie->msi_used_lock);
--              return -ENOSPC;
--      }
--
--      bitmap_set(pcie->msi_used, hwirq, nr_irqs);
-+      hwirq = bitmap_find_free_region(pcie->msi_used, MSI_IRQ_NUM,
-+                                      order_base_2(nr_irqs));
-       mutex_unlock(&pcie->msi_used_lock);
-+      if (hwirq < 0)
-+              return -ENOSPC;
-       for (i = 0; i < nr_irqs; i++)
-               irq_domain_set_info(domain, virq + i, hwirq + i,
-@@ -1227,7 +1223,7 @@ static void advk_msi_irq_domain_free(str
-       struct advk_pcie *pcie = domain->host_data;
-       mutex_lock(&pcie->msi_used_lock);
--      bitmap_clear(pcie->msi_used, d->hwirq, nr_irqs);
-+      bitmap_release_region(pcie->msi_used, d->hwirq, order_base_2(nr_irqs));
-       mutex_unlock(&pcie->msi_used_lock);
- }
index d3f3a1c6393791389e19b6b8ea4e10ae9d9f0b90..1fb0182f1eae50f66179106210a4cf562512526a 100644 (file)
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
        help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -614,6 +614,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -615,6 +615,29 @@ static inline void setup_nr_cpu_ids(void
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  #endif
  
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -954,6 +977,7 @@ asmlinkage __visible void __init __no_sa
+@@ -955,6 +978,7 @@ asmlinkage __visible void __init __no_sa
        pr_notice("%s", linux_banner);
        early_security_init();
        setup_arch(&command_line);
index 9cc5719078c2c4846e786623d5bfdb2de1bf5376..39ec7b80283911ccad0011de359a5920878c7726 100644 (file)
@@ -178,7 +178,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  }
 --- a/init/main.c
 +++ b/init/main.c
-@@ -112,6 +112,10 @@
+@@ -113,6 +113,10 @@
  
  #include <kunit/test.h>
  
@@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
  static int kernel_init(void *);
  
  extern void init_IRQ(void);
-@@ -991,6 +995,18 @@ asmlinkage __visible void __init __no_sa
+@@ -992,6 +996,18 @@ asmlinkage __visible void __init __no_sa
        pr_notice("Kernel command line: %s\n", saved_command_line);
        /* parameters may set static keys */
        jump_label_init();