-LINUX_VERSION-5.10 = .110
-LINUX_KERNEL_HASH-5.10.110 = dbef6a06325433481551cb8cfca9254d908d0ae950bc809f3da8ade00c485693
+LINUX_VERSION-5.10 = .111
+LINUX_KERNEL_HASH-5.10.111 = 1831b3d8765592ce91e51441bb179d908f6bcfe8c78d03c2bec8c675c4a0ab1a
+++ /dev/null
-From ba068938e629eb1a8b423a54405233e685cedb78 Mon Sep 17 00:00:00 2001
-Message-Id: <ba068938e629eb1a8b423a54405233e685cedb78.1647594132.git.chunkeey@gmail.com>
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Thu, 17 Mar 2022 21:29:28 +0100
-Subject: [PATCH v1 1/2] ata: sata_dwc_460ex: Fix crash due to OOB write
-To: linux-ide@vger.kernel.org
-Cc: Damien Le Moal <damien.lemoal@opensource.wdc.com>,
- Jens Axboe <axboe@kernel.dk>,
- Tejun Heo <tj@kernel.org>,
- Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-
-the driver uses libata's "tag" values from in various arrays.
-Since the mentioned patch bumped the ATA_TAG_INTERNAL to 32,
-the value of the SATA_DWC_QCMD_MAX needs to be bumped to 33.
-
-Otherwise ATA_TAG_INTERNAL cause a crash like this:
-
-| BUG: Kernel NULL pointer dereference at 0x00000000
-| Faulting instruction address: 0xc03ed4b8
-| Oops: Kernel access of bad area, sig: 11 [#1]
-| BE PAGE_SIZE=4K PowerPC 44x Platform
-| CPU: 0 PID: 362 Comm: scsi_eh_1 Not tainted 5.4.163 #0
-| NIP: c03ed4b8 LR: c03d27e8 CTR: c03ed36c
-| REGS: cfa59950 TRAP: 0300 Not tainted (5.4.163)
-| MSR: 00021000 <CE,ME> CR: 42000222 XER: 00000000
-| DEAR: 00000000 ESR: 00000000
-| GPR00: c03d27e8 cfa59a08 cfa55fe0 00000000 0fa46bc0 [...]
-| [..]
-| NIP [c03ed4b8] sata_dwc_qc_issue+0x14c/0x254
-| LR [c03d27e8] ata_qc_issue+0x1c8/0x2dc
-| Call Trace:
-| [cfa59a08] [c003f4e0] __cancel_work_timer+0x124/0x194 (unreliable)
-| [cfa59a78] [c03d27e8] ata_qc_issue+0x1c8/0x2dc
-| [cfa59a98] [c03d2b3c] ata_exec_internal_sg+0x240/0x524
-| [cfa59b08] [c03d2e98] ata_exec_internal+0x78/0xe0
-| [cfa59b58] [c03d30fc] ata_read_log_page.part.38+0x1dc/0x204
-| [cfa59bc8] [c03d324c] ata_identify_page_supported+0x68/0x130
-| [...]
-
-this is because sata_dwc_dma_xfer_complete() NULLs the
-dma_pending's next neighbour "chan" (a *dma_chan struct) in
-this '32' case right here (line ~735):
-> hsdevp->dma_pending[tag] = SATA_DWC_DMA_PENDING_NONE;
-
-Then the next time, a dma gets issued; dma_dwc_xfer_setup() passes
-the NULL'd hsdevp->chan to the dmaengine_slave_config() which then
-causes the crash.
-
-Reported-by: ticerex (OpenWrt Forum)
-Fixes: 28361c403683c ("libata: add extra internal command")
-Cc: stable@kernel.org # 4.18+
-Link: https://forum.openwrt.org/t/my-book-live-duo-reboot-loop/122464
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
----
---- a/drivers/ata/sata_dwc_460ex.c
-+++ b/drivers/ata/sata_dwc_460ex.c
-@@ -145,7 +145,7 @@ struct sata_dwc_device {
- #endif
- };
-
--#define SATA_DWC_QCMD_MAX 32
-+#define SATA_DWC_QCMD_MAX 33
-
- struct sata_dwc_device_port {
- struct sata_dwc_device *hsdev;
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
-@@ -3082,7 +3082,10 @@ static int clk_rate_get(void *data, u64
+@@ -3106,7 +3106,10 @@ static int clk_rate_get(void *data, u64
{
struct clk_core *core = data;
/* Device and char device-related information */
static DEFINE_IDA(gpio_ida);
static dev_t gpio_devt;
-@@ -2444,8 +2446,8 @@ int gpiod_direction_output(struct gpio_d
+@@ -2463,8 +2465,8 @@ int gpiod_direction_output(struct gpio_d
value = !!value;
/* GPIOs used for enabled IRQs shall not be set as output */
gpiod_err(desc,
"%s: tried to set a GPIO tied to an IRQ as output\n",
__func__);
-@@ -3260,8 +3262,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
+@@ -3279,8 +3281,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
}
/* To be valid for IRQ the line needs to be input or open drain */
/*** runtime pm ***/
static int clk_pm_runtime_get(struct clk_core *core)
{
-@@ -1413,10 +1421,14 @@ unsigned long clk_hw_round_rate(struct c
+@@ -1431,10 +1439,14 @@ unsigned long clk_hw_round_rate(struct c
{
int ret;
struct clk_rate_request req;
ret = clk_core_round_rate_nolock(hw->core, &req);
if (ret)
return 0;
-@@ -1437,6 +1449,7 @@ EXPORT_SYMBOL_GPL(clk_hw_round_rate);
+@@ -1455,6 +1467,7 @@ EXPORT_SYMBOL_GPL(clk_hw_round_rate);
long clk_round_rate(struct clk *clk, unsigned long rate)
{
struct clk_rate_request req;
int ret;
if (!clk)
-@@ -1450,6 +1463,9 @@ long clk_round_rate(struct clk *clk, uns
+@@ -1468,6 +1481,9 @@ long clk_round_rate(struct clk *clk, uns
clk_core_get_boundaries(clk->core, &req.min_rate, &req.max_rate);
req.rate = rate;
ret = clk_core_round_rate_nolock(clk->core, &req);
if (clk->exclusive_count)
-@@ -1917,6 +1933,7 @@ static struct clk_core *clk_calc_new_rat
+@@ -1935,6 +1951,7 @@ static struct clk_core *clk_calc_new_rat
unsigned long new_rate;
unsigned long min_rate;
unsigned long max_rate;
int p_index = 0;
long ret;
-@@ -1931,6 +1948,9 @@ static struct clk_core *clk_calc_new_rat
+@@ -1949,6 +1966,9 @@ static struct clk_core *clk_calc_new_rat
clk_core_get_boundaries(core, &min_rate, &max_rate);
/* find the closest rate and parent clk/rate */
if (clk_core_can_round(core)) {
struct clk_rate_request req;
-@@ -2135,6 +2155,7 @@ static unsigned long clk_core_req_round_
+@@ -2153,6 +2173,7 @@ static unsigned long clk_core_req_round_
{
int ret, cnt;
struct clk_rate_request req;
lockdep_assert_held(&prepare_lock);
-@@ -2149,6 +2170,9 @@ static unsigned long clk_core_req_round_
+@@ -2167,6 +2188,9 @@ static unsigned long clk_core_req_round_
clk_core_get_boundaries(core, &req.min_rate, &req.max_rate);
req.rate = req_rate;
ret = clk_core_round_rate_nolock(core, &req);
/* restore the protection */
-@@ -2242,6 +2266,9 @@ int clk_set_rate(struct clk *clk, unsign
+@@ -2260,6 +2284,9 @@ int clk_set_rate(struct clk *clk, unsign
ret = clk_core_set_rate_nolock(clk->core, rate);
if (clk->exclusive_count)
clk_core_rate_protect(clk->core);
-@@ -2402,6 +2429,99 @@ int clk_set_max_rate(struct clk *clk, un
+@@ -2426,6 +2453,99 @@ int clk_set_max_rate(struct clk *clk, un
EXPORT_SYMBOL_GPL(clk_set_max_rate);
/**
* clk_get_parent - return the parent of a clk
* @clk: the clk whose parent gets returned
*
-@@ -3851,6 +3971,7 @@ __clk_register(struct device *dev, struc
+@@ -3875,6 +3995,7 @@ __clk_register(struct device *dev, struc
goto fail_parents;
INIT_HLIST_HEAD(&core->clks);
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
-@@ -2498,6 +2498,9 @@ void clk_request_done(struct clk_request
+@@ -2522,6 +2522,9 @@ void clk_request_done(struct clk_request
{
struct clk_core *core = req->clk->core;
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
-@@ -2496,10 +2496,11 @@ EXPORT_SYMBOL_GPL(clk_request_start);
+@@ -2520,10 +2520,11 @@ EXPORT_SYMBOL_GPL(clk_request_start);
*/
void clk_request_done(struct clk_request *req)
{
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
-@@ -1316,6 +1316,8 @@ static int clk_core_determine_round_nolo
+@@ -1334,6 +1334,8 @@ static int clk_core_determine_round_nolo
if (!core)
return 0;
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
-@@ -5720,6 +5720,9 @@ int __init cgroup_init_early(void)
+@@ -5735,6 +5735,9 @@ int __init cgroup_init_early(void)
return 0;
}
/**
* cgroup_init - cgroup initialization
*
-@@ -5758,6 +5761,12 @@ int __init cgroup_init(void)
+@@ -5773,6 +5776,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex);
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
-@@ -6296,6 +6305,10 @@ static int __init cgroup_disable(char *s
+@@ -6311,6 +6320,10 @@ static int __init cgroup_disable(char *s
strcmp(token, ss->legacy_name))
continue;
static_branch_disable(cgroup_subsys_enabled_key[i]);
pr_info("Disabling %s control group subsystem\n",
ss->name);
-@@ -6305,6 +6318,31 @@ static int __init cgroup_disable(char *s
+@@ -6320,6 +6333,31 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);
}
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
-@@ -1893,7 +1893,8 @@ int gpiochip_add_pingroup_range(struct g
+@@ -1912,7 +1912,8 @@ int gpiochip_add_pingroup_range(struct g
list_add_tail(&pin_range->node, &gdev->pin_ranges);
}
EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range);
-@@ -1950,7 +1951,7 @@ int gpiochip_add_pin_range(struct gpio_c
+@@ -1969,7 +1970,7 @@ int gpiochip_add_pin_range(struct gpio_c
list_add_tail(&pin_range->node, &gdev->pin_ranges);
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
-@@ -280,6 +280,12 @@ void sfp_parse_support(struct sfp_bus *b
+@@ -286,6 +286,12 @@ void sfp_parse_support(struct sfp_bus *b
br_min <= 1300 && br_max >= 1200)
phylink_set(modes, 1000baseX_Full);
/* For active or passive cables, select the link modes
* based on the bit rates and the cable compliance bytes.
*/
-@@ -399,6 +405,9 @@ phy_interface_t sfp_select_interface(str
+@@ -405,6 +411,9 @@ phy_interface_t sfp_select_interface(str
if (phylink_test(link_modes, 1000baseX_Full))
return PHY_INTERFACE_MODE_1000BASEX;
}
phy_mode = device_get_phy_mode(&pdev->dev);
-@@ -644,7 +644,7 @@ void stmmac_remove_config_dt(struct plat
+@@ -643,7 +643,7 @@ void stmmac_remove_config_dt(struct plat
}
#else
struct plat_stmmacenet_data *
/*
--- a/drivers/staging/wfx/main.c
+++ b/drivers/staging/wfx/main.c
-@@ -334,7 +334,6 @@ int wfx_probe(struct wfx_dev *wdev)
+@@ -339,7 +339,6 @@ int wfx_probe(struct wfx_dev *wdev)
{
int i;
int err;
struct gpio_desc *gpio_saved;
// During first part of boot, gpio_wakeup cannot yet been used. So
-@@ -423,9 +422,9 @@ int wfx_probe(struct wfx_dev *wdev)
+@@ -428,9 +427,9 @@ int wfx_probe(struct wfx_dev *wdev)
for (i = 0; i < ARRAY_SIZE(wdev->addresses); i++) {
eth_zero_addr(wdev->addresses[i].addr);
/* Enable summary interrupt for GIC SPI source */
reg = PCIE_IRQ_ALL_MASK & (~PCIE_IRQ_ENABLE_INTS_MASK);
-@@ -1401,7 +1403,7 @@ static void advk_pcie_handle_msi(struct
+@@ -1397,7 +1399,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);
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1700,11 +1700,13 @@ static int advk_pcie_remove(struct platf
+@@ -1696,11 +1696,13 @@ static int advk_pcie_remove(struct platf
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
int i;
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1698,6 +1698,7 @@ static int advk_pcie_remove(struct platf
+@@ -1694,6 +1694,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);
int i;
/* Remove PCI bus with all devices */
-@@ -1706,6 +1707,11 @@ static int advk_pcie_remove(struct platf
+@@ -1702,6 +1703,11 @@ static int advk_pcie_remove(struct platf
pci_remove_root_bus(bridge->bus);
pci_unlock_rescan_remove();
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1712,6 +1712,27 @@ static int advk_pcie_remove(struct platf
+@@ -1708,6 +1708,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);
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1737,6 +1737,9 @@ static int advk_pcie_remove(struct platf
+@@ -1733,6 +1733,9 @@ static int advk_pcie_remove(struct platf
advk_pcie_remove_msi_irq_domain(pcie);
advk_pcie_remove_irq_domain(pcie);
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1740,6 +1740,10 @@ static int advk_pcie_remove(struct platf
+@@ -1736,6 +1736,10 @@ static int advk_pcie_remove(struct platf
/* Free config space for emulated root bridge */
pci_bridge_emul_cleanup(&pcie->bridge);
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1744,6 +1744,11 @@ static int advk_pcie_remove(struct platf
+@@ -1740,6 +1740,11 @@ static int advk_pcie_remove(struct platf
if (pcie->reset_gpio)
gpiod_set_value_cansleep(pcie->reset_gpio, 1);
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1753,6 +1753,9 @@ static int advk_pcie_remove(struct platf
+@@ -1749,6 +1749,9 @@ static int advk_pcie_remove(struct platf
for (i = 0; i < OB_WIN_COUNT; i++)
advk_pcie_disable_ob_win(pcie, i);
struct rtnl_link {
rtnl_doit_func doit;
-@@ -4684,7 +4684,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
+@@ -4695,7 +4695,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,
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1395,7 +1395,7 @@ static void advk_pcie_remove_irq_domain(
+@@ -1391,7 +1391,7 @@ static void advk_pcie_remove_irq_domain(
static void advk_pcie_handle_msi(struct advk_pcie *pcie)
{
u32 msi_val, msi_mask, msi_status, msi_idx;
msi_mask = advk_readl(pcie, PCIE_MSI_MASK_REG);
msi_val = advk_readl(pcie, PCIE_MSI_STATUS_REG);
-@@ -1405,13 +1405,12 @@ static void advk_pcie_handle_msi(struct
+@@ -1401,13 +1401,12 @@ static void advk_pcie_handle_msi(struct
if (!(BIT(msi_idx) & msi_status))
continue;
+++ /dev/null
-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
-@@ -1191,7 +1191,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,
-@@ -1208,15 +1208,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,
-@@ -1234,7 +1230,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);
- }
-
if (priv->hw->pcs != STMMAC_PCS_TBI &&
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-@@ -617,6 +617,12 @@ stmmac_probe_config_dt(struct platform_d
+@@ -616,6 +616,12 @@ stmmac_probe_config_dt(struct platform_d
plat->stmmac_rst = NULL;
}
projects / openwrt / staging / hauke.git / commitdiff