aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.15
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-04-14 09:28:11 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-16 14:02:13 +0200
commitde7535a6ac4467dbc2981fbd5b0aa785d286c9a0 (patch)
treee445551904ef73d74f66d689d0ea896bfe06e451 /target/linux/generic/pending-5.15
parent0085dd6cb5e3c57dd22994c22ce893575711b6f7 (diff)
downloadupstream-de7535a6ac4467dbc2981fbd5b0aa785d286c9a0.tar.gz
upstream-de7535a6ac4467dbc2981fbd5b0aa785d286c9a0.tar.bz2
upstream-de7535a6ac4467dbc2981fbd5b0aa785d286c9a0.zip
kernel: bump 5.15 to 5.15.34
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>
Diffstat (limited to 'target/linux/generic/pending-5.15')
-rw-r--r--target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch2
-rw-r--r--target/linux/generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch72
-rw-r--r--target/linux/generic/pending-5.15/920-mangle_bootargs.patch4
3 files changed, 3 insertions, 75 deletions
diff --git a/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch b/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
index f30887fccb..84a3ee8e60 100644
--- a/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
+++ b/target/linux/generic/pending-5.15/710-bridge-add-knob-for-filtering-rx-tx-BPDU-pack.patch
@@ -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
index 950f3a8abf..0000000000
--- a/target/linux/generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch
+++ /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);
- }
-
diff --git a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
index d3f3a1c639..1fb0182f1e 100644
--- a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
+++ b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch
@@ -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);