6.14.3-rc1 review
Subsystems (10)
Greg Kroah-Hartman
maintainerPATCH 426/449 PCI: pciehp: Avoid unnecessary device replacement check
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lukas Wunner <[email protected]>
commit e3260237aaadc9799107ccb940c6688195c4518d upstream.
Hot-removal of nested PCI hotplug ports suffers from a long-standing race condition which can lead to a deadlock: A parent hotplug port acquires pci_lock_rescan_remove(), then waits for pciehp to unbind from a child hotplug port. Meanwhile that child hotplug port tries to acquire pci_lock_rescan_remove() as well in order to remove its own children.
The deadlock only occurs if the parent acquires pci_lock_rescan_remove() first, not if the child happens to acquire it first.
Several workarounds to avoid the issue have been proposed and discarded over the years, e.g.:
https://lore.kernel.org/r/4c882e25194ba8282b78fe963fec8faae7cf23eb.1529173804.git.lukas@wunner.de/
A proper fix is being worked on, but needs more time as it is nontrivial and necessarily intrusive.
Recent commit 9d573d19547b ("PCI: pciehp: Detect device replacement during system sleep") provokes more frequent occurrence of the deadlock when removing more than one Thunderbolt device during system sleep. The commit sought to detect device replacement, but also triggered on device removal. Differentiating reliably between replacement and removal is impossible because pci_get_dsn() returns 0 both if the device was removed, as well as if it was replaced with one lacking a Device Serial Number.
Avoid the more frequent occurrence of the deadlock by checking whether the hotplug port itself was hot-removed. If so, there's no sense in checking whether its child device was replaced.
This works because the ->resume_noirq() callback is invoked in top-down order for the entire hierarchy: A parent hotplug port detecting device replacement (or removal) marks all children as removed using pci_dev_set_disconnected() and a child hotplug port can then reliably detect being removed.
--- drivers/pci/hotplug/pciehp_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/hotplug/pciehp_core.c +4 -1
@@ -286,9 +286,12 @@ static int pciehp_suspend(struct pcie_destatic bool pciehp_device_replaced (struct controller *ctrl) { - struct pci_dev *pdev __free(pci_dev_put); + struct pci_dev *pdev __free(pci_dev_put) = NULL;u32 reg; +if (pci_dev_is_disconnected (ctrl->pcie->port)) +return false; + pdev =pci_get_slot (ctrl->pcie->port->subordinate,PCI_DEVFN (0 ,0 ));if (!pdev)return true;
Greg Kroah-Hartman
maintainerPATCH 427/449 PCI: Fix reference leak in pci_alloc_child_bus()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
commit 1f2768b6a3ee77a295106e3a5d68458064923ede upstream.
If device_register(&child->dev) fails, call put_device() to explicitly release child->dev, per the comment at device_register().
Found by code review.
--- drivers/pci/probe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/pci/probe.c +4 -1
@@ -1217,7 +1217,10 @@ static struct pci_bus *pci_alloc_child_b add_dev:pci_set_bus_msi_domain (child); ret =device_register (&child->dev); -WARN_ON (ret <0 ); +if (WARN_ON (ret <0 )) { +put_device (&child->dev); +return NULL ; + }pcibios_add_bus (child);
Greg Kroah-Hartman
maintainerPATCH 428/449 PCI: Fix reference leak in pci_register_host_bridge()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ma Ke <[email protected]>
commit 804443c1f27883926de94c849d91f5b7d7d696e9 upstream.
If device_register() fails, call put_device() to give up the reference to avoid a memory leak, per the comment at device_register().
Found by code review.
[bhelgaas: squash Dan Carpenter's double free fix from
https://lore.kernel.org/r/[email protected]]
--- drivers/pci/probe.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pci/probe.c +7 -2
@@ -954,6 +954,7 @@ static int pci_register_host_bridge(struresource_size_t offset, next_offset;LIST_HEAD (resources);struct resource *res, *next_res; +bool bus_registered = false;char addr[64 ], *fmt;const char *name;int err;
@@ -1017,6 +1018,7 @@ static int pci_register_host_bridge(stru name =dev_name (&bus->dev); err =device_register (&bus->dev); + bus_registered = true;if (err) goto unregister;
@@ -1103,12 +1105,15 @@ static int pci_register_host_bridge(stru unregister:put_device (&bridge->dev);device_del (&bridge->dev); - free:#ifdef CONFIG_PCI_DOMAINS_GENERIC pci_bus_release_domain_nr (parent, bus->domain_nr);#endif -kfree (bus); +if (bus_registered) +put_device (&bus->dev); +else +kfree (bus); +return err; }
Greg Kroah-Hartman
maintainerPATCH 429/449 PCI: Fix wrong length of devres array
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Philipp Stanner <[email protected]>
commit f09d3937d400433080d17982bd1a540da53a156d upstream.
The array for the iomapping cookie addresses has a length of PCI_STD_NUM_BARS. This constant, however, only describes standard BARs; while PCI can allow for additional, special BARs.
The total number of PCI resources is described by constant PCI_NUM_RESOURCES, which is also used in, e.g., pci_select_bars().
Thus, the devres array has so far been too small.
Change the length of the devres array to PCI_NUM_RESOURCES.
--- drivers/pci/devres.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/devres.c +1 -1
@@ -40,7 +40,7 @@* Legacy struct storing addresses to whole mapped BARs. */ struct pcim_iomap_devres { -void __iomem *table[PCI_STD_NUM_BARS ]; +void __iomem *table[PCI_NUM_RESOURCES ]; };/* Used to restore the old INTx state on driver detach. */
Greg Kroah-Hartman
maintainerPATCH 430/449 phy: freescale: imx8m-pcie: assert phy reset and perst in power off
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Eichenberger <[email protected]>
commit aecb63e88c5e5fb9afb782a1577264c76f179af9 upstream.
Ensure the PHY reset and perst is asserted during power-off to guarantee it is in a reset state upon repeated power-on calls. This resolves an issue where the PHY may not properly initialize during subsequent power-on cycles. Power-on will deassert the reset at the appropriate time after tuning the PHY parameters.
During suspend/resume cycles, we observed that the PHY PLL failed to
lock during resume when the CPU temperature increased from 65C to 75C.
The observed errors were:
phy phy-32f00000.pcie-phy.3: phy poweron failed --> -110
imx6q-pcie 33800000.pcie: waiting for PHY ready timeout!
imx6q-pcie 33800000.pcie: PM: dpm_run_callback(): genpd_resume_noirq+0x0/0x80 returns -110 imx6q-pcie 33800000.pcie: PM: failed to resume noirq: error -110
This resulted in a complete CPU freeze, which is resolved by ensuring the PHY is in reset during power-on, thus preventing PHY PLL failures.
--- drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/phy/freescale/phy-fsl-imx8m-pcie.c +11 -0
@@ -162,6 +162,16 @@ static int imx8_pcie_phy_power_on(structreturn ret; } +static int imx8_pcie_phy_power_off (struct phy *phy) +{ +struct imx8_pcie_phy *imx8_phy =phy_get_drvdata (phy); + +reset_control_assert (imx8_phy->reset); +reset_control_assert (imx8_phy->perst); + +return 0 ; +} +static int imx8_pcie_phy_init (struct phy *phy) {struct imx8_pcie_phy *imx8_phy =phy_get_drvdata (phy);
@@ -182,6 +192,7 @@ static const struct phy_ops imx8_pcie_ph .init = imx8_pcie_phy_init, .exit = imx8_pcie_phy_exit, .power_on = imx8_pcie_phy_power_on, + .power_off = imx8_pcie_phy_power_off, .owner = THIS_MODULE, };
Greg Kroah-Hartman
maintainerPATCH 431/449 pinctrl: qcom: Clear latched interrupt status when changing IRQ type
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephan Gerhold <[email protected]>
commit e225128c3f8be879e7d4eb71a25949e188b420ae upstream.
When submitting the TLMM test driver, Bjorn reported that some of the test cases are failing for GPIOs that not are backed by PDC (i.e. "non-wakeup" GPIOs that are handled directly in pinctrl-msm). Basically, lingering latched interrupt state is still being delivered at IRQ request time, e.g.:
ok 1 tlmm_test_silent_rising
tlmm_test_silent_falling: ASSERTION FAILED at drivers/pinctrl/qcom/tlmm-test.c:178 Expected atomic_read(&priv->intr_count) == 0, but
atomic_read(&priv->intr_count) == 1 (0x1)
not ok 2 tlmm_test_silent_falling
tlmm_test_silent_low: ASSERTION FAILED at drivers/pinctrl/qcom/tlmm-test.c:178
Expected atomic_read(&priv->intr_count) == 0, but
atomic_read(&priv->intr_count) == 1 (0x1) not ok 3 tlmm_test_silent_low
ok 4 tlmm_test_silent_high
Whether to report interrupts that came in while the IRQ was unclaimed doesn't seem to be well-defined in the Linux IRQ API. However, looking closer at these specific cases, we're actually reporting events that do not match the interrupt type requested by the driver:
1. After "ok 1 tlmm_test_silent_rising", the GPIO is in low state and configured for IRQF_TRIGGER_RISING.
2. (a) In preparation for "tlmm_test_silent_falling", the GPIO is switched to high state. The rising interrupt gets latched.
(b) The GPIO is re-configured for IRQF_TRIGGER_FALLING, but the latched interrupt isn't cleared.
(c) The IRQ handler is called for the latched interrupt, but there wasn't any falling edge.
3. (a) For "tlmm_test_silent_low", the GPIO remains in high state.
(b) The GPIO is re-configured for IRQF_TRIGGER_LOW. This seems to result in a phantom interrupt that gets latched.
(c) The IRQ handler is called for the latched interrupt, but the GPIO isn't in low state.
4. (a) For "tlmm_test_silent_high", the GPIO is switched to low state.
(b) This doesn't result in a latched interrupt, because RAW_STATUS_EN was cleared when masking the level-triggered interrupt.
Fix this by clearing the interrupt state whenever making any changes to the interrupt configuration. This includes previously disabled interrupts, but also any changes to interrupt polarity or detection type.
With this change, all 16 test cases are now passing for the non-wakeup GPIOs in the TLMM.
--- drivers/pinctrl/qcom/pinctrl-msm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/pinctrl/qcom/pinctrl-msm.c +6 -6
@@ -1045,8 +1045,7 @@ static int msm_gpio_irq_set_type(structconst struct msm_pingroup *g;u32 intr_target_mask =GENMASK (2 ,0 );unsigned long flags; -bool was_enabled; -u32 val; +u32 val, oldval;if (msm_gpio_needs_dual_edge_parent_workaround (d, type)) {set_bit (d->hwirq, pctrl->dual_edge_irqs);
@@ -1108,8 +1107,7 @@ static int msm_gpio_irq_set_type(struct* internal circuitry of TLMM, toggling the RAW_STATUS * could cause the INTR_STATUS to be set for EDGE interrupts. */ - val =msm_readl_intr_cfg (pctrl, g); - was_enabled = val &BIT (g->intr_raw_status_bit); + val = oldval =msm_readl_intr_cfg (pctrl, g); val |=BIT (g->intr_raw_status_bit);if (g->intr_detection_width ==2 ) { val &= ~(3 << g->intr_detection_bit);
@@ -1162,9 +1160,11 @@ static int msm_gpio_irq_set_type(struct/* * The first time we set RAW_STATUS_EN it could trigger an interrupt. * Clear the interrupt. This is safe because we have -* IRQCHIP_SET_TYPE_MASKED. +* IRQCHIP_SET_TYPE_MASKED. When changing the interrupt type, we could +* also still have a non-matching interrupt latched, so clear whenever +* making changes to the interrupt configuration. */ -if (!was_enabled) +if (val != oldval)msm_ack_intr_status (pctrl, g);if (test_bit (d->hwirq, pctrl->dual_edge_irqs))
Greg Kroah-Hartman
maintainerPATCH 432/449 pinctrl: samsung: add support for eint_fltcon_offset
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
commit 701d0e910955627734917c3587258aa7e73068bb upstream.
On gs101 SoC the fltcon0 (filter configuration 0) offset isn't at a fixed offset like previous SoCs as the fltcon1 register only exists when there are more than 4 pins in the bank.
Add a eint_fltcon_offset and new GS101_PIN_BANK_EINT* macros that take an additional fltcon_offs variable.
This can then be used in suspend/resume callbacks to save and restore the fltcon0 and fltcon1 registers.
--- drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 98 ++++++++++++------------- drivers/pinctrl/samsung/pinctrl-exynos.h | 22 +++++ drivers/pinctrl/samsung/pinctrl-samsung.c | 1 drivers/pinctrl/samsung/pinctrl-samsung.h | 4 + 4 files changed, 76 insertions(+), 49 deletions(-)
drivers/pinctrl/samsung/pinctrl-exynos-arm64.c +49 -49
@@ -1370,83 +1370,83 @@ const struct samsung_pinctrl_of_match_da/* pin banks of gs101 pin-controller (ALIVE) */ static const struct samsung_pin_bank_data gs101_pin_alive[] = { -EXYNOS850_PIN_BANK_EINTW (8 ,0x0 ,"gpa0" ,0x00 ), -EXYNOS850_PIN_BANK_EINTW (7 ,0x20 ,"gpa1" ,0x04 ), -EXYNOS850_PIN_BANK_EINTW (5 ,0x40 ,"gpa2" ,0x08 ), -EXYNOS850_PIN_BANK_EINTW (4 ,0x60 ,"gpa3" ,0x0c ), -EXYNOS850_PIN_BANK_EINTW (4 ,0x80 ,"gpa4" ,0x10 ), -EXYNOS850_PIN_BANK_EINTW (7 ,0xa0 ,"gpa5" ,0x14 ), -EXYNOS850_PIN_BANK_EINTW (8 ,0xc0 ,"gpa9" ,0x18 ), -EXYNOS850_PIN_BANK_EINTW (2 ,0xe0 ,"gpa10" ,0x1c ), +GS101_PIN_BANK_EINTW (8 ,0x0 ,"gpa0" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTW (7 ,0x20 ,"gpa1" ,0x04 ,0x08 ), +GS101_PIN_BANK_EINTW (5 ,0x40 ,"gpa2" ,0x08 ,0x10 ), +GS101_PIN_BANK_EINTW (4 ,0x60 ,"gpa3" ,0x0c ,0x18 ), +GS101_PIN_BANK_EINTW (4 ,0x80 ,"gpa4" ,0x10 ,0x1c ), +GS101_PIN_BANK_EINTW (7 ,0xa0 ,"gpa5" ,0x14 ,0x20 ), +GS101_PIN_BANK_EINTW (8 ,0xc0 ,"gpa9" ,0x18 ,0x28 ), +GS101_PIN_BANK_EINTW (2 ,0xe0 ,"gpa10" ,0x1c ,0x30 ), };/* pin banks of gs101 pin-controller (FAR_ALIVE) */ static const struct samsung_pin_bank_data gs101_pin_far_alive[] = { -EXYNOS850_PIN_BANK_EINTW (8 ,0x0 ,"gpa6" ,0x00 ), -EXYNOS850_PIN_BANK_EINTW (4 ,0x20 ,"gpa7" ,0x04 ), -EXYNOS850_PIN_BANK_EINTW (8 ,0x40 ,"gpa8" ,0x08 ), -EXYNOS850_PIN_BANK_EINTW (2 ,0x60 ,"gpa11" ,0x0c ), +GS101_PIN_BANK_EINTW (8 ,0x0 ,"gpa6" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTW (4 ,0x20 ,"gpa7" ,0x04 ,0x08 ), +GS101_PIN_BANK_EINTW (8 ,0x40 ,"gpa8" ,0x08 ,0x0c ), +GS101_PIN_BANK_EINTW (2 ,0x60 ,"gpa11" ,0x0c ,0x14 ), };/* pin banks of gs101 pin-controller (GSACORE) */ static const struct samsung_pin_bank_data gs101_pin_gsacore[] = { -EXYNOS850_PIN_BANK_EINTG (2 ,0x0 ,"gps0" ,0x00 ), -EXYNOS850_PIN_BANK_EINTG (8 ,0x20 ,"gps1" ,0x04 ), -EXYNOS850_PIN_BANK_EINTG (3 ,0x40 ,"gps2" ,0x08 ), +GS101_PIN_BANK_EINTG (2 ,0x0 ,"gps0" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTG (8 ,0x20 ,"gps1" ,0x04 ,0x04 ), +GS101_PIN_BANK_EINTG (3 ,0x40 ,"gps2" ,0x08 ,0x0c ), };/* pin banks of gs101 pin-controller (GSACTRL) */ static const struct samsung_pin_bank_data gs101_pin_gsactrl[] = { -EXYNOS850_PIN_BANK_EINTW (6 ,0x0 ,"gps3" ,0x00 ), +GS101_PIN_BANK_EINTW (6 ,0x0 ,"gps3" ,0x00 ,0x00 ), };/* pin banks of gs101 pin-controller (PERIC0) */ static const struct samsung_pin_bank_data gs101_pin_peric0[] = { -EXYNOS850_PIN_BANK_EINTG (5 ,0x0 ,"gpp0" ,0x00 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x20 ,"gpp1" ,0x04 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x40 ,"gpp2" ,0x08 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x60 ,"gpp3" ,0x0c ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x80 ,"gpp4" ,0x10 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0xa0 ,"gpp5" ,0x14 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0xc0 ,"gpp6" ,0x18 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0xe0 ,"gpp7" ,0x1c ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x100 ,"gpp8" ,0x20 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x120 ,"gpp9" ,0x24 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x140 ,"gpp10" ,0x28 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x160 ,"gpp11" ,0x2c ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x180 ,"gpp12" ,0x30 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x1a0 ,"gpp13" ,0x34 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x1c0 ,"gpp14" ,0x38 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x1e0 ,"gpp15" ,0x3c ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x200 ,"gpp16" ,0x40 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x220 ,"gpp17" ,0x44 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x240 ,"gpp18" ,0x48 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x260 ,"gpp19" ,0x4c ), +GS101_PIN_BANK_EINTG (5 ,0x0 ,"gpp0" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTG (4 ,0x20 ,"gpp1" ,0x04 ,0x08 ), +GS101_PIN_BANK_EINTG (4 ,0x40 ,"gpp2" ,0x08 ,0x0c ), +GS101_PIN_BANK_EINTG (2 ,0x60 ,"gpp3" ,0x0c ,0x10 ), +GS101_PIN_BANK_EINTG (4 ,0x80 ,"gpp4" ,0x10 ,0x14 ), +GS101_PIN_BANK_EINTG (2 ,0xa0 ,"gpp5" ,0x14 ,0x18 ), +GS101_PIN_BANK_EINTG (4 ,0xc0 ,"gpp6" ,0x18 ,0x1c ), +GS101_PIN_BANK_EINTG (2 ,0xe0 ,"gpp7" ,0x1c ,0x20 ), +GS101_PIN_BANK_EINTG (4 ,0x100 ,"gpp8" ,0x20 ,0x24 ), +GS101_PIN_BANK_EINTG (2 ,0x120 ,"gpp9" ,0x24 ,0x28 ), +GS101_PIN_BANK_EINTG (4 ,0x140 ,"gpp10" ,0x28 ,0x2c ), +GS101_PIN_BANK_EINTG (2 ,0x160 ,"gpp11" ,0x2c ,0x30 ), +GS101_PIN_BANK_EINTG (4 ,0x180 ,"gpp12" ,0x30 ,0x34 ), +GS101_PIN_BANK_EINTG (2 ,0x1a0 ,"gpp13" ,0x34 ,0x38 ), +GS101_PIN_BANK_EINTG (4 ,0x1c0 ,"gpp14" ,0x38 ,0x3c ), +GS101_PIN_BANK_EINTG (2 ,0x1e0 ,"gpp15" ,0x3c ,0x40 ), +GS101_PIN_BANK_EINTG (4 ,0x200 ,"gpp16" ,0x40 ,0x44 ), +GS101_PIN_BANK_EINTG (2 ,0x220 ,"gpp17" ,0x44 ,0x48 ), +GS101_PIN_BANK_EINTG (4 ,0x240 ,"gpp18" ,0x48 ,0x4c ), +GS101_PIN_BANK_EINTG (4 ,0x260 ,"gpp19" ,0x4c ,0x50 ), };/* pin banks of gs101 pin-controller (PERIC1) */ static const struct samsung_pin_bank_data gs101_pin_peric1[] = { -EXYNOS850_PIN_BANK_EINTG (8 ,0x0 ,"gpp20" ,0x00 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x20 ,"gpp21" ,0x04 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x40 ,"gpp22" ,0x08 ), -EXYNOS850_PIN_BANK_EINTG (8 ,0x60 ,"gpp23" ,0x0c ), -EXYNOS850_PIN_BANK_EINTG (4 ,0x80 ,"gpp24" ,0x10 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0xa0 ,"gpp25" ,0x14 ), -EXYNOS850_PIN_BANK_EINTG (5 ,0xc0 ,"gpp26" ,0x18 ), -EXYNOS850_PIN_BANK_EINTG (4 ,0xe0 ,"gpp27" ,0x1c ), +GS101_PIN_BANK_EINTG (8 ,0x0 ,"gpp20" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTG (4 ,0x20 ,"gpp21" ,0x04 ,0x08 ), +GS101_PIN_BANK_EINTG (2 ,0x40 ,"gpp22" ,0x08 ,0x0c ), +GS101_PIN_BANK_EINTG (8 ,0x60 ,"gpp23" ,0x0c ,0x10 ), +GS101_PIN_BANK_EINTG (4 ,0x80 ,"gpp24" ,0x10 ,0x18 ), +GS101_PIN_BANK_EINTG (4 ,0xa0 ,"gpp25" ,0x14 ,0x1c ), +GS101_PIN_BANK_EINTG (5 ,0xc0 ,"gpp26" ,0x18 ,0x20 ), +GS101_PIN_BANK_EINTG (4 ,0xe0 ,"gpp27" ,0x1c ,0x28 ), };/* pin banks of gs101 pin-controller (HSI1) */ static const struct samsung_pin_bank_data gs101_pin_hsi1[] = { -EXYNOS850_PIN_BANK_EINTG (6 ,0x0 ,"gph0" ,0x00 ), -EXYNOS850_PIN_BANK_EINTG (7 ,0x20 ,"gph1" ,0x04 ), +GS101_PIN_BANK_EINTG (6 ,0x0 ,"gph0" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTG (7 ,0x20 ,"gph1" ,0x04 ,0x08 ), };/* pin banks of gs101 pin-controller (HSI2) */ static const struct samsung_pin_bank_data gs101_pin_hsi2[] = { -EXYNOS850_PIN_BANK_EINTG (6 ,0x0 ,"gph2" ,0x00 ), -EXYNOS850_PIN_BANK_EINTG (2 ,0x20 ,"gph3" ,0x04 ), -EXYNOS850_PIN_BANK_EINTG (6 ,0x40 ,"gph4" ,0x08 ), +GS101_PIN_BANK_EINTG (6 ,0x0 ,"gph2" ,0x00 ,0x00 ), +GS101_PIN_BANK_EINTG (2 ,0x20 ,"gph3" ,0x04 ,0x08 ), +GS101_PIN_BANK_EINTG (6 ,0x40 ,"gph4" ,0x08 ,0x0c ), };static const struct samsung_pin_ctrl gs101_pin_ctrl[]__initconst = {
drivers/pinctrl/samsung/pinctrl-exynos.h +22 -0
@@ -175,6 +175,28 @@ .name = id \ } +#define GS101_PIN_BANK_EINTG (pins, reg, id, offs, fltcon_offs) \ + { \ + .type = &exynos850_bank_type_off, \ + .pctl_offset = reg, \ + .nr_pins = pins, \ + .eint_type = EINT_TYPE_GPIO, \ + .eint_offset = offs, \ + .eint_fltcon_offset = fltcon_offs, \ + .name = id \ + } + +#define GS101_PIN_BANK_EINTW (pins, reg, id, offs, fltcon_offs) \ + { \ + .type = &exynos850_bank_type_alive, \ + .pctl_offset = reg, \ + .nr_pins = pins, \ + .eint_type = EINT_TYPE_WKUP, \ + .eint_offset = offs, \ + .eint_fltcon_offset = fltcon_offs, \ + .name = id \ + } +/** * struct exynos_weint_data: irq specific data for all the wakeup interrupts * generated by the external wakeup interrupt controller.
drivers/pinctrl/samsung/pinctrl-samsung.c +1 -0
@@ -1230,6 +1230,7 @@ samsung_pinctrl_get_soc_data(struct sams bank->eint_con_offset = bdata->eint_con_offset; bank->eint_mask_offset = bdata->eint_mask_offset; bank->eint_pend_offset = bdata->eint_pend_offset; + bank->eint_fltcon_offset = bdata->eint_fltcon_offset; bank->name = bdata->name;raw_spin_lock_init (&bank->slock);
drivers/pinctrl/samsung/pinctrl-samsung.h +4 -0
@@ -144,6 +144,7 @@ struct samsung_pin_bank_type {* @eint_con_offset: ExynosAuto SoC-specific EINT control register offset of bank. * @eint_mask_offset: ExynosAuto SoC-specific EINT mask register offset of bank. * @eint_pend_offset: ExynosAuto SoC-specific EINT pend register offset of bank. +* @eint_fltcon_offset: GS101 SoC-specific EINT filter config register offset. * @name: name to be prefixed for each pin in this pin bank. */ struct samsung_pin_bank_data {
@@ -158,6 +159,7 @@ struct samsung_pin_bank_data {u32 eint_con_offset;u32 eint_mask_offset;u32 eint_pend_offset; +u32 eint_fltcon_offset;const char *name; };
@@ -175,6 +177,7 @@ struct samsung_pin_bank_data {* @eint_con_offset: ExynosAuto SoC-specific EINT register or interrupt offset of bank. * @eint_mask_offset: ExynosAuto SoC-specific EINT mask register offset of bank. * @eint_pend_offset: ExynosAuto SoC-specific EINT pend register offset of bank. +* @eint_fltcon_offset: GS101 SoC-specific EINT filter config register offset. * @name: name to be prefixed for each pin in this pin bank. * @id: id of the bank, propagated to the pin range. * @pin_base: starting pin number of the bank.
@@ -201,6 +204,7 @@ struct samsung_pin_bank {u32 eint_con_offset;u32 eint_mask_offset;u32 eint_pend_offset; +u32 eint_fltcon_offset;const char *name;u32 id;
Greg Kroah-Hartman
maintainerPATCH 433/449 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
commit e4d4b8670c44cdd22212cab3c576e2d317efa67c upstream.
Some architectures do not have data cache coherency between user and kernel space. For these architectures, the cache needs to be flushed on both the kernel and user addresses so that user space can see the updates the kernel has made.
Instead of using flush_dcache_folio() and playing with virt_to_folio() within the call to that function, use flush_kernel_vmap_range() which takes the virtual address and does the work for those architectures that need it.
This also fixes a bug where the flush of the reader page only flushed one page. If the sub-buffer order is 1 or more, where the sub-buffer size would be greater than a page, it would miss the rest of the sub-buffer content, as the "reader page" is not just a page, but the size of a sub-buffer.
--- kernel/trace/ring_buffer.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/trace/ring_buffer.c +3 -2
@@ -5963,7 +5963,7 @@ static void rb_update_meta_page(struct r meta->read = cpu_buffer->read;/* Some archs do not have data cache coherency between kernel and user-space */ -flush_dcache_folio (virt_to_folio (cpu_buffer->meta_page)); +flush_kernel_vmap_range (cpu_buffer->meta_page,PAGE_SIZE ); } static void
@@ -7278,7 +7278,8 @@ consume: out:/* Some archs do not have data cache coherency between kernel and user-space */ -flush_dcache_folio (virt_to_folio (cpu_buffer->reader_page->page)); +flush_kernel_vmap_range (cpu_buffer->reader_page->page, + buffer->subbuf_size +BUF_PAGE_HDR_SIZE );rb_update_meta_page (cpu_buffer);
Greg Kroah-Hartman
maintainerPATCH 434/449 s390/pci: Fix zpci_bus_is_isolated_vf() for non-VFs
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
commit 8691abd3afaadd816a298503ec1a759df1305d2e upstream.
For non-VFs, zpci_bus_is_isolated_vf() should return false because they aren't VFs. While zpci_iov_find_parent_pf() specifically checks if a function is a VF, it then simply returns that there is no parent. The simplistic check for a parent then leads to these functions being confused with isolated VFs and isolating them on their own domain even if sibling PFs should share the domain.
Fix this by explicitly checking if a function is not a VF. Note also that at this point the case where RIDs are ignored is already handled and in this case all PCI functions get isolated by being detected in zpci_bus_is_multifunction_root().
--- arch/s390/pci/pci_bus.c | 3 +++ 1 file changed, 3 insertions(+)
arch/s390/pci/pci_bus.c +3 -0
@@ -335,6 +335,9 @@ static bool zpci_bus_is_isolated_vf(stru {struct pci_dev *pdev; +if (!zdev->vfn) +return false; + pdev =zpci_iov_find_parent_pf (zbus, zdev);if (!pdev)return true;
Greg Kroah-Hartman
maintainerPATCH 435/449 s390/virtio_ccw: Dont allocate/assign airqs for non-existing queues
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Hildenbrand <[email protected]>
commit 2ccd42b959aaf490333dbd3b9b102eaf295c036a upstream.
If we finds a vq without a name in our input array in virtio_ccw_find_vqs(), we treat it as "non-existing" and set the vq pointer to NULL; we will not call virtio_ccw_setup_vq() to allocate/setup a vq.
Consequently, we create only a queue if it actually exists (name != NULL) and assign an incremental queue index to each such existing queue.
However, in virtio_ccw_register_adapter_ind()->get_airq_indicator() we will not ignore these "non-existing queues", but instead assign an airq indicator to them.
Besides never releasing them in virtio_ccw_drop_indicators() (because there is no virtqueue), the bigger issue seems to be that there will be a disagreement between the device and the Linux guest about the airq indicator to be used for notifying a queue, because the indicator bit for adapter I/O interrupt is derived from the queue index.
The virtio spec states under "Setting Up Two-Stage Queue Indicators":
... indicator contains the guest address of an area wherein the indicators for the devices are contained, starting at bit_nr, one bit per virtqueue of the device.
And further in "Notification via Adapter I/O Interrupts":
For notifying the driver of virtqueue buffers, the device sets the bit in the guest-provided indicator area at the corresponding offset.
For example, QEMU uses in virtio_ccw_notify() the queue index (passed as "vector") to select the relevant indicator bit. If a queue does not exist, it does not have a corresponding indicator bit assigned, because it effectively doesn't have a queue index.
Using a virtio-balloon-ccw device under QEMU with free-page-hinting disabled ("free-page-hint=off") but free-page-reporting enabled ("free-page-reporting=on") will result in free page reporting not working as expected: in the virtio_balloon driver, we'll be stuck forever in virtballoon_free_page_report()->wait_event(), because the waitqueue will not be woken up as the notification from the device is
lost: it would use the wrong indicator bit.
Free page reporting stops working and we get splats (when configured to detect hung wqs) like:
INFO: task kworker/1:3:463 blocked for more than 61 seconds.
Not tainted 6.14.0 #4
"echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
task:kworker/1:3 [...]
Workqueue: events page_reporting_process
Call Trace:
[<000002f404e6dfb2>] __schedule+0x402/0x1640
[<000002f404e6f22e>] schedule+0x3e/0xe0
[<000002f3846a88fa>] virtballoon_free_page_report+0xaa/0x110 [virtio_balloon]
[<000002f40435c8a4>] page_reporting_process+0x2e4/0x740
[<000002f403fd3ee2>] process_one_work+0x1c2/0x400
[<000002f403fd4b96>] worker_thread+0x296/0x420
[<000002f403fe10b4>] kthread+0x124/0x290
[<000002f403f4e0dc>] __ret_from_fork+0x3c/0x60
[<000002f404e77272>] ret_from_fork+0xa/0x38There was recently a discussion [1] whether the "holes" should be treated differently again, effectively assigning also non-existing queues a queue index: that should also fix the issue, but requires other workarounds to not break existing setups.
Let's fix it without affecting existing setups for now by properly ignoring the non-existing queues, so the indicator bits will match the queue indexes.
[1] https://lore.kernel.org/all/[email protected]/
--- drivers/s390/virtio/virtio_ccw.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/s390/virtio/virtio_ccw.c +12 -4
@@ -302,11 +302,17 @@ static struct airq_info *new_airq_info(istatic unsigned long *get_airq_indicator (struct virtqueue *vqs[],int nvqs,u64 *first,void **airq_info) { -int i, j; +int i, j, queue_idx, highest_queue_idx =-1 ;struct airq_info *info;unsigned long *indicator_addr =NULL ;unsigned long bit, flags; +/* Array entries without an actual queue pointer must be ignored. */ +for (i =0 ; i < nvqs; i++) { +if (vqs[i]) + highest_queue_idx++; + } +for (i =0 ; i <MAX_AIRQ_AREAS && !indicator_addr; i++) {mutex_lock (&airq_areas_lock);if (!airq_areas[i])
@@ -316,7 +322,7 @@ static unsigned long *get_airq_indicatorif (!info)return NULL ;write_lock_irqsave (&info->lock, flags); - bit =airq_iv_alloc (info->aiv, nvqs); + bit =airq_iv_alloc (info->aiv, highest_queue_idx +1 );if (bit ==-1UL ) {/* Not enough vacancies. */ write_unlock_irqrestore (&info->lock, flags);
@@ -325,8 +331,10 @@ static unsigned long *get_airq_indicator *first = bit; *airq_info = info; indicator_addr = info->aiv->vector; -for (j =0 ; j < nvqs; j++) { -airq_iv_set_ptr (info->aiv, bit + j, +for (j =0 , queue_idx =0 ; j < nvqs; j++) { +if (!vqs[j]) +continue ; +airq_iv_set_ptr (info->aiv, bit + queue_idx++, (unsigned long )vqs[j]); }write_unlock_irqrestore (&info->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 436/449 s390: Fix linker error when -no-pie option is unavailable
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sumanth Korikkar <[email protected]>
commit 991a20173a1fbafd9fc0df0c7e17bb62d44a4deb upstream.
The kernel build may fail if the linker does not support -no-pie option, as it always included in LDFLAGS_vmlinux.
Error log:
s390-linux-ld: unable to disambiguate: -no-pie (did you mean --no-pie ?)
Although the GNU linker defaults to -no-pie, the ability to explicitly specify this option was introduced in binutils 2.36.
Hence, fix it by adding -no-pie to LDFLAGS_vmlinux only when it is available.
--- arch/s390/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/Makefile +1 -1
@@ -15,7 +15,7 @@ KBUILD_CFLAGS_MODULE += -fPIC KBUILD_AFLAGS += -m64 KBUILD_CFLAGS += -m64 KBUILD_CFLAGS += -fPIC -LDFLAGS_vmlinux := -no-pie --emit-relocs --discard-none +LDFLAGS_vmlinux := $(call ld-option,-no-pie) --emit-relocs --discard-none extra_tools := relocs aflags_dwarf := -Wa,-gdwarf-2 KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__
Greg Kroah-Hartman
maintainerPATCH 437/449 sched_ext: create_dsq: Return -EEXIST on duplicate request
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jake Hillion <[email protected]>
commit a8897ed8523d4c9d782e282b18005a3779c92714 upstream.
create_dsq and therefore the scx_bpf_create_dsq kfunc currently silently ignore duplicate entries. As a sched_ext scheduler is creating each DSQ for a different purpose this is surprising behaviour.
Replace rhashtable_insert_fast which ignores duplicates with rhashtable_lookup_insert_fast that reports duplicates (though doesn't return their value). The rest of the code is structured correctly and this now returns -EEXIST.
Tested by adding an extra scx_bpf_create_dsq to scx_simple. Previously this was ignored, now init fails with a -17 code. Also ran scx_lavd which continued to work well.
--- kernel/sched/ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/ext.c +2 -2
@@ -4523,8 +4523,8 @@ static struct scx_dispatch_q *create_dsqinit_dsq (dsq, dsq_id); - ret =rhashtable_insert_fast (&dsq_hash, &dsq->hash_node, - dsq_hash_params); + ret =rhashtable_lookup_insert_fast (&dsq_hash, &dsq->hash_node, + dsq_hash_params);if (ret) {kfree (dsq);return ERR_PTR (ret);
Greg Kroah-Hartman
maintainerPATCH 438/449 selftests: mptcp: close fd_in before returning in main_loop
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Geliang Tang <[email protected]>
commit c183165f87a486d5879f782c05a23c179c3794ab upstream.
The file descriptor 'fd_in' is opened when cfg_input is configured, but not closed in main_loop(), this patch fixes it.
--- tools/testing/selftests/net/mptcp/mptcp_connect.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +5 -2
@@ -1299,7 +1299,7 @@ again: ret =copyfd_io (fd_in, fd,1 ,0 , &winfo);if (ret) -return ret; + goto out;if (cfg_truncate >0 ) {shutdown (fd,SHUT_WR );
@@ -1320,7 +1320,10 @@ again:close (fd); } -return 0 ; +out: +if (cfg_input) +close (fd_in); +return ret; }int parse_proto (const char *proto)
Greg Kroah-Hartman
maintainerPATCH 439/449 selftests: mptcp: fix incorrect fd checks in main_loop
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Liu <[email protected]>
commit 7335d4ac812917c16e04958775826d12d481c92d upstream.
Fix a bug where the code was checking the wrong file descriptors when opening the input files. The code was checking 'fd' instead of 'fd_in', which could lead to incorrect error handling.
--- tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/net/mptcp/mptcp_connect.c +2 -2
@@ -1270,7 +1270,7 @@ int main_loop(void)if (cfg_input && cfg_sockopt_types.mptfo) { fd_in =open (cfg_input,O_RDONLY ); -if (fd <0 ) +if (fd_in <0 )xerror ("can't open %s:%d" , cfg_input, errno); }
@@ -1293,7 +1293,7 @@ again:if (cfg_input && !cfg_sockopt_types.mptfo) { fd_in =open (cfg_input,O_RDONLY ); -if (fd <0 ) +if (fd_in <0 )xerror ("can't open %s:%d" , cfg_input, errno); }
Greg Kroah-Hartman
maintainerPATCH 440/449 spi: fsl-qspi: use devm function instead of driver remove
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Han Xu <[email protected]>
commit 40369bfe717e96e26650eeecfa5a6363563df6e4 upstream.
Driver use devm APIs to manage clk/irq/resources and register the spi controller, but the legacy remove function will be called first during device detach and trigger kernel panic. Drop the remove function and use devm_add_action_or_reset() for driver cleanup to ensure the release sequence.
Trigger kernel panic on i.MX8MQ by
echo 30bb0000.spi >/sys/bus/platform/drivers/fsl-quadspi/unbind
--- drivers/spi/spi-fsl-qspi.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-)
drivers/spi/spi-fsl-qspi.c +17 -14
@@ -844,6 +844,19 @@ static const struct spi_controller_mem_c .per_op_freq = true, }; +static void fsl_qspi_cleanup (void *data) +{ +struct fsl_qspi *q = data; + +/* disable the hardware */ +qspi_writel (q,QUADSPI_MCR_MDIS_MASK , q->iobase +QUADSPI_MCR ); +qspi_writel (q,0x0 , q->iobase +QUADSPI_RSER ); + +fsl_qspi_clk_disable_unprep (q); + +mutex_destroy (&q->lock); +} +static int fsl_qspi_probe (struct platform_device *pdev) {struct spi_controller *ctlr;
@@ -934,6 +947,10 @@ static int fsl_qspi_probe(struct platfor ctlr->dev.of_node = np; + ret =devm_add_action_or_reset (dev, fsl_qspi_cleanup, q); +if (ret) + goto err_destroy_mutex; + ret =devm_spi_register_controller (dev, ctlr);if (ret) goto err_destroy_mutex;
@@ -953,19 +970,6 @@ err_put_ctrl:return ret; } -static void fsl_qspi_remove (struct platform_device *pdev) -{ -struct fsl_qspi *q =platform_get_drvdata (pdev); - -/* disable the hardware */ -qspi_writel (q,QUADSPI_MCR_MDIS_MASK , q->iobase +QUADSPI_MCR ); -qspi_writel (q,0x0 , q->iobase +QUADSPI_RSER ); - -fsl_qspi_clk_disable_unprep (q); - -mutex_destroy (&q->lock); -} -static int fsl_qspi_suspend (struct device *dev) {return 0 ;
@@ -1003,7 +1007,6 @@ static struct platform_driver fsl_qspi_d .pm = &fsl_qspi_pm_ops, }, .probe = fsl_qspi_probe, - .remove = fsl_qspi_remove, };module_platform_driver (fsl_qspi_driver);
Greg Kroah-Hartman
maintainerPATCH 441/449 spi: fsl-qspi: Fix double cleanup in probe error path
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kevin Hao <[email protected]>
commit 5d07ab2a7fa1305e429d9221716582f290b58078 upstream.
Commit 40369bfe717e ("spi: fsl-qspi: use devm function instead of driver remove") introduced managed cleanup via fsl_qspi_cleanup(), but incorrectly retain manual cleanup in two scenarios:
- On devm_add_action_or_reset() failure, the function automatically call fsl_qspi_cleanup(). However, the current code still jumps to err_destroy_mutex, repeating cleanup.
- After the fsl_qspi_cleanup() action is added successfully, there is no need to manually perform the cleanup in the subsequent error path. However, the current code still jumps to err_destroy_mutex on spi controller failure, repeating cleanup.
Skip redundant manual cleanup calls to fix these issues.
--- drivers/spi/spi-fsl-qspi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/spi/spi-fsl-qspi.c +2 -5
@@ -949,17 +949,14 @@ static int fsl_qspi_probe(struct platfor ret =devm_add_action_or_reset (dev, fsl_qspi_cleanup, q);if (ret) - goto err_destroy_mutex; + goto err_put_ctrl; ret =devm_spi_register_controller (dev, ctlr);if (ret) - goto err_destroy_mutex; + goto err_put_ctrl;return 0 ; -err_destroy_mutex: -mutex_destroy (&q->lock); - err_disable_clk:fsl_qspi_clk_disable_unprep (q);
Greg Kroah-Hartman
maintainerPATCH 442/449 thermal/drivers/mediatek/lvts: Disable monitor mode during suspend
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nícolas F. R. A. Prado <[email protected]>
commit 65594b3745024857f812145a58db3601d733676c upstream.
When configured in filtered mode, the LVTS thermal controller will monitor the temperature from the sensors and trigger an interrupt once a thermal threshold is crossed.
Currently this is true even during suspend and resume. The problem with that is that when enabling the internal clock of the LVTS controller in lvts_ctrl_set_enable() during resume, the temperature reading can glitch and appear much higher than the real one, resulting in a spurious interrupt getting generated.
Disable the temperature monitoring and give some time for the signals to stabilize during suspend in order to prevent such spurious interrupts.
--- drivers/thermal/mediatek/lvts_thermal.c | 36 ++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-)
drivers/thermal/mediatek/lvts_thermal.c +34 -2
@@ -860,6 +860,32 @@ static int lvts_ctrl_init(struct devicereturn 0 ; } +static void lvts_ctrl_monitor_enable (struct device *dev,struct lvts_ctrl *lvts_ctrl,bool enable) +{ +/* +* Bitmaps to enable each sensor on filtered mode in the MONCTL0 +* register. +*/ +static const u8 sensor_filt_bitmap[] = {BIT (0 ),BIT (1 ),BIT (2 ),BIT (3 ) }; +u32 sensor_map =0 ; +int i; + +if (lvts_ctrl->mode !=LVTS_MSR_FILTERED_MODE ) +return ; + +if (enable) { +lvts_for_each_valid_sensor (i, lvts_ctrl) + sensor_map |= sensor_filt_bitmap[i]; + } + +/* +* Bits: +* 9: Single point access flow +* 0-3: Enable sensing point 0-3 +*/ +writel (sensor_map |BIT (9 ),LVTS_MONCTL0 (lvts_ctrl->base)); +} +/* * At this point the configuration register is the only place in the * driver where we write multiple values. Per hardware constraint,
@@ -1381,8 +1407,11 @@ static int lvts_suspend(struct device *d lvts_td =dev_get_drvdata (dev); -for (i =0 ; i < lvts_td->num_lvts_ctrl; i++) +for (i =0 ; i < lvts_td->num_lvts_ctrl; i++) { +lvts_ctrl_monitor_enable (dev, &lvts_td->lvts_ctrl[i], false); +usleep_range (100 ,200 );lvts_ctrl_set_enable (&lvts_td->lvts_ctrl[i], false); + }clk_disable_unprepare (lvts_td->clk);
@@ -1400,8 +1429,11 @@ static int lvts_resume(struct device *deif (ret)return ret; -for (i =0 ; i < lvts_td->num_lvts_ctrl; i++) +for (i =0 ; i < lvts_td->num_lvts_ctrl; i++) {lvts_ctrl_set_enable (&lvts_td->lvts_ctrl[i], true); +usleep_range (100 ,200 ); +lvts_ctrl_monitor_enable (dev, &lvts_td->lvts_ctrl[i], true); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 443/449 thermal/drivers/mediatek/lvts: Disable Stage 3 thermal threshold
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nícolas F. R. A. Prado <[email protected]>
commit c612cbcdf603aefb3358b2e3964dcd5aa3f827a0 upstream.
The Stage 3 thermal threshold is currently configured during the controller initialization to 105 Celsius. From the kernel perspective, this configuration is harmful because:
* The stage 3 interrupt that gets triggered when the threshold is crossed is not handled in any way by the IRQ handler, it just gets cleared. Besides, the temperature used for stage 3 comes from the sensors, and the critical thermal trip points described in the Devicetree will already cause a shutdown when crossed (at a lower temperature, of 100 Celsius, for all SoCs currently using this driver).
* The only effect of crossing the stage 3 threshold that has been observed is that it causes the machine to no longer be able to enter suspend. Even if that was a result of a momentary glitch in the temperature reading of a sensor (as has been observed on the MT8192-based Chromebooks).
For those reasons, disable the Stage 3 thermal threshold configuration.
--- drivers/thermal/mediatek/lvts_thermal.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/thermal/mediatek/lvts_thermal.c +2 -14
@@ -65,7 +65,7 @@#define LVTS_HW_FILTER 0x0#define LVTS_TSSEL_CONF 0x13121110#define LVTS_CALSCALE_CONF 0x300 -#define LVTS_MONINT_CONF 0x8300318C +#define LVTS_MONINT_CONF 0x0300318C#define LVTS_MONINT_OFFSET_SENSOR0 0xC#define LVTS_MONINT_OFFSET_SENSOR1 0x180
@@ -91,8 +91,6 @@#define LVTS_MSR_READ_TIMEOUT_US 400#define LVTS_MSR_READ_WAIT_US (LVTS_MSR_READ_TIMEOUT_US / 2) -#define LVTS_HW_TSHUT_TEMP 105000 -#define LVTS_MINIMUM_THRESHOLD 20000static int golden_temp =LVTS_GOLDEN_TEMP_DEFAULT ;
@@ -145,7 +143,6 @@ struct lvts_ctrl {struct lvts_sensor sensors[LVTS_SENSOR_MAX ];const struct lvts_data *lvts_data;u32 calibration[LVTS_SENSOR_MAX ]; -u32 hw_tshut_raw_temp;u8 valid_sensor_mask;int mode;void __iomem *base;
@@ -837,14 +834,6 @@ static int lvts_ctrl_init(struct device*/ lvts_ctrl[i].mode = lvts_data->lvts_ctrl[i].mode; -/* -* The temperature to raw temperature must be done -* after initializing the calibration. -*/ - lvts_ctrl[i].hw_tshut_raw_temp = -lvts_temp_to_raw (LVTS_HW_TSHUT_TEMP , - lvts_data->temp_factor); - lvts_ctrl[i].low_thresh =INT_MIN ; lvts_ctrl[i].high_thresh =INT_MIN ; }
@@ -919,7 +908,6 @@ static int lvts_irq_init(struct lvts_ctr* 10 : Selected sensor with bits 19-18 * 11 : Reserved */ -writel (BIT (16 ),LVTS_PROTCTL (lvts_ctrl->base));/* * LVTS_PROTTA : Stage 1 temperature threshold
@@ -932,8 +920,8 @@ static int lvts_irq_init(struct lvts_ctr* * writel(0x0, LVTS_PROTTA(lvts_ctrl->base)); * writel(0x0, LVTS_PROTTB(lvts_ctrl->base)); +* writel(0x0, LVTS_PROTTC(lvts_ctrl->base)); */ -writel (lvts_ctrl->hw_tshut_raw_temp,LVTS_PROTTC (lvts_ctrl->base));/* * LVTS_MONINT : Interrupt configuration register
Greg Kroah-Hartman
maintainerPATCH 444/449 wifi: ath11k: update channel list in worker when wait flag is set
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wen Gong <[email protected]>
commit 02aae8e2f957adc1b15b6b8055316f8a154ac3f5 upstream.
With previous patch "wifi: ath11k: move update channel list from update reg worker to reg notifier", ath11k_reg_update_chan_list() will be called during reg_process_self_managed_hint().
reg_process_self_managed_hint() will hold rtnl_lock all the time. But ath11k_reg_update_chan_list() may increase the occupation time of rtnl_lock, because when wait flag is set, wait_for_completion_timeout() will be called during 11d/hw scan.
Should minimize the occupation time of rtnl_lock as much as possible to avoid interfering with rest of the system. So move the update channel list operation to a new worker, so that wait_for_completion_timeout() won't be called and will not increase the occupation time of rtnl_lock.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
--- drivers/net/wireless/ath/ath11k/core.c | 1 drivers/net/wireless/ath/ath11k/core.h | 5 + drivers/net/wireless/ath/ath11k/mac.c | 14 +++++ drivers/net/wireless/ath/ath11k/reg.c | 85 ++++++++++++++++++++++----------- drivers/net/wireless/ath/ath11k/reg.h | 3 - drivers/net/wireless/ath/ath11k/wmi.h | 1 6 files changed, 81 insertions(+), 28 deletions(-)
drivers/net/wireless/ath/ath11k/core.c +1 -0
@@ -2056,6 +2056,7 @@ void ath11k_core_halt(struct ath11k *ar)ath11k_mac_scan_finish (ar);ath11k_mac_peer_cleanup_all (ar);cancel_delayed_work_sync (&ar->scan.timeout); +cancel_work_sync (&ar->channel_update_work);cancel_work_sync (&ar->regd_update_work);cancel_work_sync (&ab->update_11d_work);
drivers/net/wireless/ath/ath11k/core.h +4 -1
@@ -685,7 +685,7 @@ struct ath11k {struct mutex conf_mutex;/* protects the radio specific data like debug stats, ppdu_stats_info stats, * vdev_stop_status info, scan data, ath11k_sta info, ath11k_vif info, -* channel context data, survey info, test mode data. +* channel context data, survey info, test mode data, channel_update_queue. */ spinlock_t data_lock;
@@ -743,6 +743,9 @@ struct ath11k {struct completion bss_survey_done;struct work_struct regd_update_work; +struct work_struct channel_update_work; +/* protected with data_lock */ +struct list_head channel_update_queue;struct work_struct wmi_mgmt_tx_work;struct sk_buff_head wmi_mgmt_tx_queue;
drivers/net/wireless/ath/ath11k/mac.c +14 -0
@@ -6283,6 +6283,7 @@ static void ath11k_mac_op_stop(struct ie {struct ath11k *ar = hw->priv;struct htt_ppdu_stats_info *ppdu_stats, *tmp; +struct scan_chan_list_params *params;int ret;ath11k_mac_drain_tx (ar);
@@ -6298,6 +6299,7 @@ static void ath11k_mac_op_stop(struct iemutex_unlock (&ar->conf_mutex);cancel_delayed_work_sync (&ar->scan.timeout); +cancel_work_sync (&ar->channel_update_work);cancel_work_sync (&ar->regd_update_work);cancel_work_sync (&ar->ab->update_11d_work);
@@ -6307,10 +6309,19 @@ static void ath11k_mac_op_stop(struct ie }spin_lock_bh (&ar->data_lock); +list_for_each_entry_safe (ppdu_stats, tmp, &ar->ppdu_stats_info, list) {list_del (&ppdu_stats->list);kfree (ppdu_stats); } + +while ((params =list_first_entry_or_null (&ar->channel_update_queue, + struct scan_chan_list_params, + list))) { +list_del (¶ms->list); +kfree (params); + } +spin_unlock_bh (&ar->data_lock);rcu_assign_pointer (ar->ab->pdevs_active[ar->pdev_idx],NULL );
@@ -10014,6 +10025,7 @@ static const struct wiphy_iftype_ext_capstatic void __ath11k_mac_unregister (struct ath11k *ar) { +cancel_work_sync (&ar->channel_update_work);cancel_work_sync (&ar->regd_update_work);ieee80211_unregister_hw (ar->hw);
@@ -10413,6 +10425,8 @@ int ath11k_mac_allocate(struct ath11k_bainit_completion (&ar->thermal.wmi_sync);INIT_DELAYED_WORK (&ar->scan.timeout, ath11k_scan_timeout_work); +INIT_WORK (&ar->channel_update_work, ath11k_regd_update_chan_list_work); +INIT_LIST_HEAD (&ar->channel_update_queue);INIT_WORK (&ar->regd_update_work, ath11k_regd_update_work);INIT_WORK (&ar->wmi_mgmt_tx_work, ath11k_mgmt_over_wmi_tx_work);
drivers/net/wireless/ath/ath11k/reg.c +59 -26
103 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/reg.h +2 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. -* Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. +* Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_REG_H
@@ -33,6 +33,7 @@ void ath11k_reg_init(struct ath11k *ar);void ath11k_reg_reset_info (struct cur_regulatory_info *reg_info);void ath11k_reg_free (struct ath11k_base *ab);void ath11k_regd_update_work (struct work_struct *work); +void ath11k_regd_update_chan_list_work (struct work_struct *work);struct ieee80211_regdomain * ath11k_reg_build_regd(struct ath11k_base *ab, struct cur_regulatory_info *reg_info, bool intersect,
drivers/net/wireless/ath/ath11k/wmi.h +1 -0
@@ -3817,6 +3817,7 @@ struct wmi_stop_scan_cmd { };struct scan_chan_list_params { +struct list_head list;u32 pdev_id;u16 nallchans;struct channel_param ch_param[];
Greg Kroah-Hartman
maintainerPATCH 445/449 arm64: errata: Add newer ARM cores to the spectre_bhb_loop_affected() lists
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Douglas Anderson <[email protected]>
commit a5951389e58d2e816eed3dbec5877de9327fd881 upstream.
When comparing to the ARM list [1], it appears that several ARM cores were missing from the lists in spectre_bhb_loop_affected(). Add them.
NOTE: for some of these cores it may not matter since other ways of clearing the BHB may be used (like the CLRBHB instruction or ECBHB), but it still seems good to have all the info from ARM's whitepaper included.
[1] https://developer.arm.com/Arm%20Security%20Center/Spectre-BHB
--- arch/arm64/kernel/proton-pack.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)
arch/arm64/kernel/proton-pack.c +14 -1
@@ -876,6 +876,14 @@ static u8 spectre_bhb_loop_affected(void {u8 k =0 ; +static const struct midr_range spectre_bhb_k132_list[] = { +MIDR_ALL_VERSIONS (MIDR_CORTEX_X3 ), +MIDR_ALL_VERSIONS (MIDR_NEOVERSE_V2 ), + }; +static const struct midr_range spectre_bhb_k38_list[] = { +MIDR_ALL_VERSIONS (MIDR_CORTEX_A715 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A720 ), + };static const struct midr_range spectre_bhb_k32_list[] = {MIDR_ALL_VERSIONS (MIDR_CORTEX_A78 ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A78AE ),
@@ -889,6 +897,7 @@ static u8 spectre_bhb_loop_affected(void };static const struct midr_range spectre_bhb_k24_list[] = {MIDR_ALL_VERSIONS (MIDR_CORTEX_A76 ), +MIDR_ALL_VERSIONS (MIDR_CORTEX_A76AE ),MIDR_ALL_VERSIONS (MIDR_CORTEX_A77 ),MIDR_ALL_VERSIONS (MIDR_NEOVERSE_N1 ),MIDR_ALL_VERSIONS (MIDR_QCOM_KRYO_4XX_GOLD ),
@@ -904,7 +913,11 @@ static u8 spectre_bhb_loop_affected(void {}, }; -if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k32_list)) +if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k132_list)) + k =132 ; +else if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k38_list)) + k =38 ; +else if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k32_list)) k =32 ;else if (is_midr_in_range_list (read_cpuid_id (), spectre_bhb_k24_list)) k =24 ;
Greg Kroah-Hartman
maintainerPATCH 446/449 iommufd: Make attach_handle generic than fault specific
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicolin Chen <[email protected]>
commit fb21b1568adaa76af7a8c853f37c60fba8b28661 upstream.
"attach_handle" was added exclusively for the iommufd_fault_iopf_handler() used by IOPF/PRI use cases. Now, both the MSI and PASID series require to reuse the attach_handle for non-fault cases.
Add a set of new attach/detach/replace helpers that does the attach_handle allocation/releasing/replacement in the common path and also handles those fault specific routines such as iopf enabling/disabling and auto response.
This covers both non-fault and fault cases in a clean way, replacing those inline helpers in the header. The following patch will clean up those old helpers in the fault.c file.
--- drivers/iommu/iommufd/device.c | 105 ++++++++++++++++++++++++++++++++ drivers/iommu/iommufd/fault.c | 8 +- drivers/iommu/iommufd/iommufd_private.h | 33 +--------- 3 files changed, 113 insertions(+), 33 deletions(-)
drivers/iommu/iommufd/device.c +105 -0
@@ -352,6 +352,111 @@ iommufd_device_attach_reserved_iova(strureturn 0 ; } +/* The device attach/detach/replace helpers for attach_handle */ + +static int iommufd_hwpt_attach_device (struct iommufd_hw_pagetable *hwpt, +struct iommufd_device *idev) +{ +struct iommufd_attach_handle *handle; +int rc; + +lockdep_assert_held (&idev->igroup->lock); + + handle =kzalloc (sizeof (*handle),GFP_KERNEL ); +if (!handle) +return -ENOMEM ; + +if (hwpt->fault) { + rc =iommufd_fault_iopf_enable (idev); +if (rc) + goto out_free_handle; + } + + handle->idev = idev; + rc =iommu_attach_group_handle (hwpt->domain, idev->igroup->group, + &handle->handle); +if (rc) + goto out_disable_iopf; + +return 0 ; + +out_disable_iopf: +if (hwpt->fault) +iommufd_fault_iopf_disable (idev); +out_free_handle: +kfree (handle); +return rc; +} + +static struct iommufd_attach_handle * +iommufd_device_get_attach_handle (struct iommufd_device *idev) +{ +struct iommu_attach_handle *handle; + +lockdep_assert_held (&idev->igroup->lock); + + handle = +iommu_attach_handle_get (idev->igroup->group,IOMMU_NO_PASID ,0 ); +if (IS_ERR (handle)) +return NULL ; +return to_iommufd_handle (handle); +} + +static void iommufd_hwpt_detach_device (struct iommufd_hw_pagetable *hwpt, +struct iommufd_device *idev) +{ +struct iommufd_attach_handle *handle; + + handle =iommufd_device_get_attach_handle (idev); +iommu_detach_group_handle (hwpt->domain, idev->igroup->group); +if (hwpt->fault) { +iommufd_auto_response_faults (hwpt, handle); +iommufd_fault_iopf_disable (idev); + } +kfree (handle); +} + +static int iommufd_hwpt_replace_device (struct iommufd_device *idev, +struct iommufd_hw_pagetable *hwpt, +struct iommufd_hw_pagetable *old) +{ +struct iommufd_attach_handle *handle, *old_handle = +iommufd_device_get_attach_handle (idev); +int rc; + + handle =kzalloc (sizeof (*handle),GFP_KERNEL ); +if (!handle) +return -ENOMEM ; + +if (hwpt->fault && !old->fault) { + rc =iommufd_fault_iopf_enable (idev); +if (rc) + goto out_free_handle; + } + + handle->idev = idev; + rc =iommu_replace_group_handle (idev->igroup->group, hwpt->domain, + &handle->handle); +if (rc) + goto out_disable_iopf; + +if (old->fault) { +iommufd_auto_response_faults (hwpt, old_handle); +if (!hwpt->fault) +iommufd_fault_iopf_disable (idev); + } +kfree (old_handle); + +return 0 ; + +out_disable_iopf: +if (hwpt->fault && !old->fault) +iommufd_fault_iopf_disable (idev); +out_free_handle: +kfree (handle); +return rc; +} +int iommufd_hw_pagetable_attach (struct iommufd_hw_pagetable *hwpt,struct iommufd_device *idev) {
drivers/iommu/iommufd/fault.c +4 -4
@@ -17,7 +17,7 @@#include "../iommu-priv.h" #include "iommufd_private.h" -static int iommufd_fault_iopf_enable (struct iommufd_device *idev) +int iommufd_fault_iopf_enable (struct iommufd_device *idev) {struct device *dev = idev->dev;int ret;
@@ -50,7 +50,7 @@ static int iommufd_fault_iopf_enable(strreturn ret; } -static void iommufd_fault_iopf_disable (struct iommufd_device *idev) +void iommufd_fault_iopf_disable (struct iommufd_device *idev) {mutex_lock (&idev->iopf_lock);if (!WARN_ON (idev->iopf_enabled ==0 )) {
@@ -98,8 +98,8 @@ int iommufd_fault_domain_attach_dev(strureturn ret; } -static void iommufd_auto_response_faults (struct iommufd_hw_pagetable *hwpt, -struct iommufd_attach_handle *handle) +void iommufd_auto_response_faults (struct iommufd_hw_pagetable *hwpt, +struct iommufd_attach_handle *handle) {struct iommufd_fault *fault = hwpt->fault;struct iopf_group *group, *next;
drivers/iommu/iommufd/iommufd_private.h +4 -29
@@ -504,35 +504,10 @@ int iommufd_fault_domain_replace_dev(strstruct iommufd_hw_pagetable *hwpt, struct iommufd_hw_pagetable *old); -static inline int iommufd_hwpt_attach_device (struct iommufd_hw_pagetable *hwpt, -struct iommufd_device *idev) -{ -if (hwpt->fault) -return iommufd_fault_domain_attach_dev (hwpt, idev); - -return iommu_attach_group (hwpt->domain, idev->igroup->group); -} - -static inline void iommufd_hwpt_detach_device (struct iommufd_hw_pagetable *hwpt, -struct iommufd_device *idev) -{ -if (hwpt->fault) { -iommufd_fault_domain_detach_dev (hwpt, idev); -return ; - } - -iommu_detach_group (hwpt->domain, idev->igroup->group); -} - -static inline int iommufd_hwpt_replace_device (struct iommufd_device *idev, -struct iommufd_hw_pagetable *hwpt, -struct iommufd_hw_pagetable *old) -{ -if (old->fault || hwpt->fault) -return iommufd_fault_domain_replace_dev (idev, hwpt, old); - -return iommu_group_replace_domain (idev->igroup->group, hwpt->domain); -} +int iommufd_fault_iopf_enable (struct iommufd_device *idev); +void iommufd_fault_iopf_disable (struct iommufd_device *idev); +void iommufd_auto_response_faults (struct iommufd_hw_pagetable *hwpt, +struct iommufd_attach_handle *handle);static inline struct iommufd_viommu *iommufd_get_viommu (struct iommufd_ucmd *ucmd,u32 id)
Greg Kroah-Hartman
maintainerPATCH 447/449 iommufd: Fail replace if device has not been attached
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yi Liu <[email protected]>
commit 55c85fa7579dc2e3f5399ef5bad67a44257c1a48 upstream.
The current implementation of iommufd_device_do_replace() implicitly assumes that the input device has already been attached. However, there is no explicit check to verify this assumption. If another device within the same group has been attached, the replace operation might succeed, but the input device itself may not have been attached yet.
As a result, the input device might not be tracked in the igroup->device_list, and its reserved IOVA might not be added. Despite this, the caller might incorrectly assume that the device has been successfully replaced, which could lead to unexpected behavior or errors.
To address this issue, add a check to ensure that the input device has been attached before proceeding with the replace operation. This check will help maintain the integrity of the device tracking system and prevent potential issues arising from incorrect assumptions about the device's attachment status.
--- drivers/iommu/iommufd/device.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/iommu/iommufd/device.c +16 -0
@@ -354,6 +354,17 @@ iommufd_device_attach_reserved_iova(stru/* The device attach/detach/replace helpers for attach_handle */ +/* Check if idev is attached to igroup->hwpt */ +static bool iommufd_device_is_attached (struct iommufd_device *idev) +{ +struct iommufd_device *cur; + +list_for_each_entry (cur, &idev->igroup->device_list, group_item) +if (cur == idev) +return true; +return false; +} +static int iommufd_hwpt_attach_device (struct iommufd_hw_pagetable *hwpt,struct iommufd_device *idev) {
@@ -592,6 +603,11 @@ iommufd_device_do_replace(struct iommufd rc = -EINVAL ; goto err_unlock; } + +if (!iommufd_device_is_attached (idev)) { + rc = -EINVAL ; + goto err_unlock; + }if (hwpt == igroup->hwpt) {mutex_unlock (&idev->igroup->lock);
Greg Kroah-Hartman
maintainerPATCH 448/449 x86/e820: Fix handling of subpage regions when calculating nosave ranges in e820__register_nosave_regions()
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Myrrh Periwinkle <[email protected]>
commit f2f29da9f0d4367f6ff35e0d9d021257bb53e273 upstream.
While debugging kexec/hibernation hangs and crashes, it turned out that the current implementation of e820__register_nosave_regions() suffers from multiple serious issues:
- The end of last region is tracked by PFN, causing it to find holes that aren't there if two consecutive subpage regions are present
- The nosave PFN ranges derived from holes are rounded out (instead of rounded in) which makes it inconsistent with how explicitly reserved regions are handled
Fix this by:
- Treating reserved regions as if they were holes, to ensure consistent handling (rounding out nosave PFN ranges is more correct as the kernel does not use partial pages)
- Tracking the end of the last RAM region by address instead of pages to detect holes more precisely
These bugs appear to have been introduced about ~18 years ago with the very first version of e820_mark_nosave_regions(), and its flawed assumptions were carried forward uninterrupted through various waves of rewrites and renames.
[ mingo: Added Git archeology details, for kicks and giggles. ]
--- arch/x86/kernel/e820.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
arch/x86/kernel/e820.c +8 -9
@@ -754,22 +754,21 @@ void __init e820__memory_setup_extended(void __init e820__register_nosave_regions (unsigned long limit_pfn) {int i; -unsigned long pfn =0 ; +u64 last_addr =0 ;for (i =0 ; i < e820_table->nr_entries; i++) {struct e820_entry *entry = &e820_table->entries[i]; -if (pfn <PFN_UP (entry->addr)) -register_nosave_region (pfn,PFN_UP (entry->addr)); - - pfn =PFN_DOWN (entry->addr + entry->size); -if (entry->type !=E820_TYPE_RAM && entry->type !=E820_TYPE_RESERVED_KERN ) -register_nosave_region (PFN_UP (entry->addr), pfn); +continue ; -if (pfn >= limit_pfn) -break ; +if (last_addr < entry->addr) +register_nosave_region (PFN_DOWN (last_addr),PFN_UP (entry->addr)); + + last_addr = entry->addr + entry->size; } + +register_nosave_region (PFN_DOWN (last_addr), limit_pfn); }#ifdef CONFIG_ACPI
Greg Kroah-Hartman
maintainerPATCH 449/449 Bluetooth: hci_uart: Fix another race during initialization
In reply to Greg Kroah-Hartman6.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arseniy Krasnov <[email protected]>
commit 5df5dafc171b90d0b8d51547a82657cd5a1986c7 upstream.
Do not set 'HCI_UART_PROTO_READY' before call 'hci_uart_register_dev()'. Possible race is when someone calls 'hci_tty_uart_close()' after this bit is set, but 'hci_uart_register_dev()' wasn't done. This leads to access to uninitialized fields. To fix it let's set this bit after device was registered (as before patch c411c62cc133) and to fix previous problem let's add one more bit in addition to 'HCI_UART_PROTO_READY' which allows to perform power up without original bit set (pls see commit c411c62cc133).
Crash backtrace from syzbot report:
RIP: 0010:skb_queue_empty_lockless include/linux/skbuff.h:1887 [inline] RIP: 0010:skb_queue_purge_reason+0x6d/0x140 net/core/skbuff.c:3936 Call Trace: <TASK> skb_queue_purge include/linux/skbuff.h:3364 [inline] mrvl_close+0x2f/0x90 drivers/bluetooth/hci_mrvl.c:100 hci_uart_tty_close+0xb6/0x120 drivers/bluetooth/hci_ldisc.c:557 tty_ldisc_close drivers/tty/tty_ldisc.c:455 [inline] tty_ldisc_kill+0x66/0xc0 drivers/tty/tty_ldisc.c:613 tty_ldisc_release+0xc9/0x120 drivers/tty/tty_ldisc.c:781 tty_release_struct+0x10/0x80 drivers/tty/tty_io.c:1690 tty_release+0x4ef/0x640 drivers/tty/tty_io.c:1861 __fput+0x86/0x2a0 fs/file_table.c:450 task_work_run+0x82/0xb0 kernel/task_work.c:239 resume_user_mode_work include/linux/resume_user_mode.h:50 [inline] exit_to_user_mode_loop kernel/entry/common.c:114 [inline] exit_to_user_mode_prepare include/linux/entry-common.h:329 [inline] __syscall_exit_to_user_mode_work kernel/entry/common.c:207 [inline] syscall_exit_to_user_mode+0xa3/0x1b0 kernel/entry/common.c:218 do_syscall_64+0x9a/0x190 arch/x86/entry/common.c:89 entry_SYSCALL_64_after_hwframe+0x77/0x7f
--- drivers/bluetooth/hci_ldisc.c | 20 ++++++++++++++------ drivers/bluetooth/hci_uart.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-)
drivers/bluetooth/hci_ldisc.c +14 -6
@@ -102,7 +102,8 @@ static inline struct sk_buff *hci_uart_dif (!skb) {percpu_down_read (&hu->proto_lock); -if (test_bit (HCI_UART_PROTO_READY , &hu->flags)) +if (test_bit (HCI_UART_PROTO_READY , &hu->flags) || +test_bit (HCI_UART_PROTO_INIT , &hu->flags)) skb = hu->proto->dequeue (hu);percpu_up_read (&hu->proto_lock);
@@ -124,7 +125,8 @@ int hci_uart_tx_wakeup(struct hci_uart *if (!percpu_down_read_trylock (&hu->proto_lock))return 0 ; -if (!test_bit (HCI_UART_PROTO_READY , &hu->flags)) +if (!test_bit (HCI_UART_PROTO_READY , &hu->flags) && + !test_bit (HCI_UART_PROTO_INIT , &hu->flags)) goto no_schedule;set_bit (HCI_UART_TX_WAKEUP , &hu->tx_state);
@@ -278,7 +280,8 @@ static int hci_uart_send_frame(struct hcpercpu_down_read (&hu->proto_lock); -if (!test_bit (HCI_UART_PROTO_READY , &hu->flags)) { +if (!test_bit (HCI_UART_PROTO_READY , &hu->flags) && + !test_bit (HCI_UART_PROTO_INIT , &hu->flags)) {percpu_up_read (&hu->proto_lock);return -EUNATCH ; }
@@ -585,7 +588,8 @@ static void hci_uart_tty_wakeup(struct tif (tty != hu->tty)return ; -if (test_bit (HCI_UART_PROTO_READY , &hu->flags)) +if (test_bit (HCI_UART_PROTO_READY , &hu->flags) || +test_bit (HCI_UART_PROTO_INIT , &hu->flags))hci_uart_tx_wakeup (hu); }
@@ -611,7 +615,8 @@ static void hci_uart_tty_receive(structpercpu_down_read (&hu->proto_lock); -if (!test_bit (HCI_UART_PROTO_READY , &hu->flags)) { +if (!test_bit (HCI_UART_PROTO_READY , &hu->flags) && + !test_bit (HCI_UART_PROTO_INIT , &hu->flags)) {percpu_up_read (&hu->proto_lock);return ; }
@@ -707,13 +712,16 @@ static int hci_uart_set_proto(struct hci hu->proto = p; -set_bit (HCI_UART_PROTO_READY , &hu->flags); +set_bit (HCI_UART_PROTO_INIT , &hu->flags); err =hci_uart_register_dev (hu);if (err) {return err; } +set_bit (HCI_UART_PROTO_READY , &hu->flags); +clear_bit (HCI_UART_PROTO_INIT , &hu->flags); +return 0 ; }
drivers/bluetooth/hci_uart.h +1 -0
@@ -90,6 +90,7 @@ struct hci_uart {#define HCI_UART_REGISTERED 1#define HCI_UART_PROTO_READY 2#define HCI_UART_NO_SUSPEND_NOTIFIER 3 +#define HCI_UART_PROTO_INIT 4/* TX states */ #define HCI_UART_SENDING 1
Hi Greg
no regressions here on x86_64 (RKL, Intel 11th Gen. CPU)
Thanks
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Am 17.04.2025 um 19:44 schrieb Greg Kroah-Hartman:
Quoted 4 lines
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Builds, boots and works on my 2-socket Ivy Bridge Xeon E5-2697 v2 server. No dmesg oddities or regressions found.
Beste Grüße,
Peter Schneider
Signature · 8 lines
Climb the mountain not to plant your flag, but to embrace the challenge, enjoy the air and behold the view. Climb it so you can see the world, not so the world can see you. -- David McCullough Jr. OpenPGP: 0xA3828BD796CCE11A8CADE8866E3A92C92C3FF244 Download: https://www.peters-netzplatz.de/download/pschneider1968_pub.asc https://keys.mailvelope.com/pks/lookup?op=get&[email protected] https://keys.mailvelope.com/pks/lookup?op=get&[email protected]
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on arm64 and s390 allmodconfig and allyesconfig builds failed on the stable rc 6.14.3-rc1 with gcc-13 and clang-20.
There are two different types of build errors on arm64 and s390. These regressions on arm64 are also found on stable-rc 6.13 and 6.12.
First seen on the 6.14.3-rc1
Good: v6.14.2
Bad: v6.14.2-450-g0e7f2bba84c1
Regressions found on arm64 s390:
- build/gcc-13-allmodconfig
- build/gcc-13-allyesconfig
- build/clang-20-allmodconfig
- build/clang-20-allyesconfig
Regression Analysis:
- New regression? Yes
- Reproducibility? Yes
Build regression: arm64 s390 ufs-qcom.c implicit declaration 'devm_of_qcom_ice_get'
## Build log arm64drivers/ufs/host/ufs-qcom.c: In function 'ufs_qcom_ice_init':drivers/ufs/host/ufs-qcom.c:128:15: error: implicit declaration of function 'devm_of_qcom_ice_get'; did you mean 'of_qcom_ice_get'? [-Werror=implicit-function-declaration]
128 | ice = devm_of_qcom_ice_get(dev);
| ^~~~~~~~~~~~~~~~~~~~
| of_qcom_ice_getdrivers/ufs/host/ufs-qcom.c:128:13: error: assignment to 'struct qcom_ice *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
128 | ice = devm_of_qcom_ice_get(dev);
| ^
cc1: all warnings being treated as errors
## Build log s390arch/s390/pci/pci_fixup.c: In function 'zpci_ism_bar_no_mmap':arch/s390/pci/pci_fixup.c:19:13: error: 'struct pci_dev' has no member named 'non_mappable_bars'
19 | pdev->non_mappable_bars = 1;
| ^~
## Source
* Kernel version: 6.14.3-rc1
* Git tree: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* Git sha: 0e7f2bba84c1f492e15812fade27cc0a697f3cb6
* Git describe: v6.14.2-450-g0e7f2bba84c1
* Project details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/
* Architectures: arm64, s390
* Toolchains: clang-20, gcc-13
* Kconfigs: allmodconfig, allyesconfig
## Build arm64
* Build log: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28150920/suite/build/test/gcc-13-allmodconfig/log
* Build history:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28150920/suite/build/test/gcc-13-allmodconfig/history/
* Build details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28150920/suite/build/test/gcc-13-allmodconfig/
* Build link: https://storage.tuxsuite.com/public/linaro/lkft/builds/2vrqIAiN9QWCPEV6FWrOWIRos2j/
* Kernel config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2vrqIAiN9QWCPEV6FWrOWIRos2j/config
## Build s390
* Build log: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28148516/suite/build/test/gcc-13-allmodconfig/log
* Build history:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28148516/suite/build/test/gcc-13-allmodconfig/history/
* Build details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28148516/suite/build/test/gcc-13-allmodconfig/
* Build link: https://storage.tuxsuite.com/public/linaro/lkft/builds/2vrqI5I7Rtlnhj4xhKXAwkGJ27o/
* Kernel config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2vrqI5I7Rtlnhj4xhKXAwkGJ27o/config
## Steps to reproduce on arm64
- tuxmake --runtime podman --target-arch arm64 --toolchain gcc-13
--kconfig allmodconfig
## Steps to reproduce on s390
- tuxmake --runtime podman --target-arch s390 --toolchain gcc-13
--kconfig allmodconfig
--
Linaro LKFT
https://lkft.linaro.org
Greg Kroah-Hartman
maintainerQuoted 54 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on arm64 and s390 allmodconfig and allyesconfig builds failed on the stable rc 6.14.3-rc1 with gcc-13 and clang-20.
There are two different types of build errors on arm64 and s390. These regressions on arm64 are also found on stable-rc 6.13 and 6.12.
First seen on the 6.14.3-rc1
Good: v6.14.2
Bad: v6.14.2-450-g0e7f2bba84c1Regressions found on arm64 s390:
- build/gcc-13-allmodconfig
- build/gcc-13-allyesconfig
- build/clang-20-allmodconfig
- build/clang-20-allyesconfigRegression Analysis:
- New regression? Yes
- Reproducibility? YesBuild regression: arm64 s390
ufs-qcom.cimplicit declaration 'devm_of_qcom_ice_get'## Build log arm64
drivers/ufs/host/ufs-qcom.c: In function 'ufs_qcom_ice_init':drivers/ufs/host/ufs-qcom.c:128:15: error: implicit declaration of function 'devm_of_qcom_ice_get'; did you mean 'of_qcom_ice_get'? [-Werror=implicit-function-declaration]128 | ice = devm_of_qcom_ice_get(dev); | ^~~~~~~~~~~~~~~~~~~~ | of_qcom_ice_get
Quoted 6 lines
drivers/ufs/host/ufs-qcom.c:128:13: error: assignment to 'structqcom_ice*' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
128 | ice =devm_of_qcom_ice_get(dev);
| ^
cc1: all warnings being treated as errors
Offending commit now dropped from everywhere, I'll push out new -rcs soon.
Quoted 7 lines
## Build log s390
arch/s390/pci/pci_fixup.c: In function 'zpci_ism_bar_no_mmap':arch/s390/pci/pci_fixup.c:19:13: error: 'structpci_dev' has no member named 'non_mappable_bars'
19 |pdev->non_mappable_bars= 1;
| ^~
Will go drop the offending commit now too, thanks!
greg k-h
Quoted 42 lines · Greg Kroah-Hartman
Quoted 41 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on arm64 and s390 allmodconfig and allyesconfig builds failed on the stable rc 6.14.3-rc1 with gcc-13 and clang-20.
There are two different types of build errors on arm64 and s390. These regressions on arm64 are also found on stable-rc 6.13 and 6.12.
First seen on the 6.14.3-rc1
Good: v6.14.2
Bad: v6.14.2-450-g0e7f2bba84c1Regressions found on arm64 s390:
- build/gcc-13-allmodconfig
- build/gcc-13-allyesconfig
- build/clang-20-allmodconfig
- build/clang-20-allyesconfigRegression Analysis:
- New regression? Yes
- Reproducibility? Yes
Quoted 6 lines
Quoted 6 lines
Build regression: arm64 s390
ufs-qcom.cimplicit declaration 'devm_of_qcom_ice_get'
--- snip ---
Quoted 9 lines
Quoted 8 lines
## Build log s390
arch/s390/pci/pci_fixup.c: In function 'zpci_ism_bar_no_mmap':arch/s390/pci/pci_fixup.c:19:13: error: 'structpci_dev' has no member named 'non_mappable_bars'
19 |pdev->non_mappable_bars= 1;
| ^~
Quoted 3 lines
Will go drop the offending commit now too, thanks!
greg k-h
Hi Greg,
This looks like we're missing commit 888bd8322dfc ("s390/pci: Introduce pdev->non_mappable_bars and replace VFIO_PCI_MMAP") which is a prerequisite. I wonder if you might want that anyway to keep struct pci_dev consistent when other backports might touch it. The original commit aa9f168d55dc ("s390/pci: Support mmap() of PCI resources except for ISM devices") isn't strictly a fix but it adds quirk support so could be relevant for future backports. There is also a chance that we may backport it for RHEL/SLES/Ubuntu in the medium term.
Thanks,
Niklas
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on arm64 dragonboard 410c boot failed with lkftconfig on the stable rc
6.14.3-rc1. While booting, the following kernel warnings were noticed and boot failed.
First seen on the 6.14.3-rc1
Good: v6.14.2 Bad: v6.14.2-450-g0e7f2bba84c1
Regressions found on arm64 dragonboard 410c:
- Boot/clang-20-lkftconfig
Regression Analysis:
- New regression? Yes
- Reproducibility? Yes
Boot regression: arm64 dragonboard 410c WARNING regulator core.c regulator_put
## Boot log arm64 dragonboard 410c
[ 3.924339] remoteproc:smd-edge: failed to parse smd edge
[ 4.051490] msm_hsusb 78d9000.usb: Failed to create device link
(0x180) with supplier remoteproc for /soc@0/usb@78d9000/ulpi/phy
[ 4.055155] qcom-clk-smd-rpm
remoteproc:smd-edge:rpm-requests:clock-controller: Error registering
SMD clock driver (-1431655766)
[ 4.062274] qcom-clk-smd-rpm
remoteproc:smd-edge:rpm-requests:clock-controller: probe with driver
qcom-clk-smd-rpm failed with error -1431655766
[ 4.091319] sdhci_msm 7864900.mmc: Got CD GPIO
[ 4.101827] s3: Bringing 0uV into 1250000-1250000uV
[ 4.101935] s3: failed to enable: (____ptrval____)
[ 4.105657] ------------[ cut here ]------------
[ 4.110395] WARNING: CPU: 3 PID: 14 at
drivers/regulator/core.c:2450 regulator_put
(drivers/regulator/core.c:2473 drivers/regulator/core.c:2471)
[ 4.115181] Modules linked in:
[ 4.116774] input: gpio-keys as /devices/platform/gpio-keys/input/input0
[ 4.123575] CPU: 3 UID: 0 PID: 14 Comm: kworker/u16:1 Not tainted
6.14.3-rc1 #1
[ 4.123587] Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT)
[ 4.123593] Workqueue: async async_run_entry_fn
[ 4.123608] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 4.123619] pc : regulator_put (drivers/regulator/core.c:2473
drivers/regulator/core.c:2471)
[ 4.124148] sdhci_msm 7864900.mmc: Got CD GPIO
[ 4.128587] clk: Disabling unused clocks
[ 4.133299] lr : regulator_put (drivers/regulator/core.c:2444
drivers/regulator/core.c:2471)
[ 4.133312] sp : ffff80008300ba40
[ 4.133317] x29: ffff80008300ba40 x28: 0000000000000000 x27: ffff800081b850f8
[ 4.141083] PM: genpd: Disabling unused power domains
[ 4.147271]
[ 4.147274] x26: ffff800081b850b8 x25: 0000000000000001 x24: 00000000aaaaaaaa
[ 4.147288] x23: ffff000009d64480 x22: ffff000005b10000
[ 4.151676] qcom-rpmpd
remoteproc:smd-edge:rpm-requests:power-controller: failed to sync cx:
-1431655766
[ 4.158467] x21: ffff000005b10000
[ 4.158474] x20: ffff0000044e41c0 x19: ffff0000055f00c0 x18: 0000000000000002
[ 4.158488] x17: 0000000000000000
[ 4.162763] qcom-rpmpd
remoteproc:smd-edge:rpm-requests:power-controller: failed to sync
cx_ao: -1431655766
[ 4.166888] x16: 0000000000000001 x15: 0000000000000003
[ 4.166898] x14: ffff8000828ad200 x13: 0000000000000003 x12: 0000000000000003
[ 4.171011] qcom-rpmpd
remoteproc:smd-edge:rpm-requests:power-controller: failed to sync
cx_vfc: -1431655766
[ 4.174872]
[ 4.174876] x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000
[ 4.174889] x8 : 0000000000000001
[ 4.178116] qcom-rpmpd
remoteproc:smd-edge:rpm-requests:power-controller: failed to sync mx:
-1431655766
[ 4.185205] x7 : 0720072007200720 x6 : 0720072007200720
[ 4.185216] x5 : ffff000003201f00 x4 : 0000000000000000 x3 : 0000000000000000
[ 4.190259] qcom-rpmpd
remoteproc:smd-edge:rpm-requests:power-controller: failed to sync
mx_ao: -1431655766
[ 4.191806]
[ 4.191809] x2 : 0000000000000000
[ 4.198858] ALSA device list:
[ 4.203876] x1 : ffff800080201224 x0 : ffff0000055f00c0
[ 4.203888] Call trace:
[ 4.203893] regulator_put (drivers/regulator/core.c:2473
drivers/regulator/core.c:2471) (P)
[ 4.213658] No soundcards found.
[ 4.216808] regulator_register (drivers/regulator/core.c:5964)
[ 4.216819] devm_regulator_register (drivers/regulator/devres.c:477)
[ 4.329706] rpm_reg_probe
(drivers/regulator/qcom_smd-regulator.c:1425
drivers/regulator/qcom_smd-regulator.c:1462)
[ 4.329719] platform_probe (drivers/base/platform.c:1405)
[ 4.329730] really_probe (drivers/base/dd.c:581 drivers/base/dd.c:658)
[ 4.329743] __driver_probe_device (drivers/base/dd.c:0)
[ 4.329755] driver_probe_device (drivers/base/dd.c:830)
[ 4.329768] __device_attach_driver (drivers/base/dd.c:959)
[ 4.329780] bus_for_each_drv (drivers/base/bus.c:462)
[ 4.329791] __device_attach_async_helper
(arch/arm64/include/asm/jump_label.h:36 drivers/base/dd.c:988)
[ 4.329804] async_run_entry_fn
(arch/arm64/include/asm/jump_label.h:36 kernel/async.c:131)
[ 4.329814] process_scheduled_works (kernel/workqueue.c:3243
kernel/workqueue.c:3319)
[ 4.329827] worker_thread (include/linux/list.h:373
kernel/workqueue.c:946 kernel/workqueue.c:3401)
[ 4.375850] kthread (kernel/kthread.c:466)
[ 4.379397] ret_from_fork (arch/arm64/kernel/entry.S:863)
[�+HH��4.387392] s4: Bringing 0uV into 1850000-1850000uV
[ 4.387486] s4: failed to enable: (____ptrval____)
[ 4.391254] ------------[ cut here ]------------
[ 4.395957] WARNING: CPU: 2 PID: 14 at
drivers/regulator/core.c:2450 regulator_put
(drivers/regulator/core.c:2473 drivers/regulator/core.c:2471)
[ 4.400742] Modules linked in:
[ 4.409148] CPU: 2 UID: 0 PID: 14 Comm: kworker/u16:1 Tainted: G
W 6.14.3-rc1 #1
[ 4.412028] Tainted: [W]=WARN
[ 4.420949] Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT)
[ 4.421397] sdhci_msm 7864900.mmc: Got CD GPIO
[ 4.423810] Workqueue: async async_run_entry_fn
[ 4.434842] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 4.439274] pc : regulator_put (drivers/regulator/core.c:2473
drivers/regulator/core.c:2471)
[ 4.446210] lr : regulator_put (drivers/regulator/core.c:2444
drivers/regulator/core.c:2471)
[ 4.450376] sp : ffff80008300ba40
[ 4.454281] x29: ffff80008300ba40 x28: 0000000000000000 x27: ffff800081b85118
[ 4.457503] x26: ffff800081b850b8 x25: 0000000000000001 x24: 00000000aaaaaaaa
[ 4.464622] x23: ffff00000459ae80 x22: ffff000004510800 x21: ffff000004510800
[ 4.471739] x20: ffff0000038e3180 x19: ffff0000055f1000 x18: 0000000000000068
[ 4.478857] x17: 0000000000000000 x16: 0000000000000024 x15: 0000000000000301
[ 4.485976] x14: 0000000000000024 x13: 00000000150d0cc9 x12: fffffffffffffff0
[ 4.493093] x11: 0000000000000000 x10: 0000000000000000 x9 : 0000000000000000
[ 4.500211] x8 : 0000000000000001 x7 : 0720072007200720 x6 : 0720072007200720
[ 4.507328] x5 : ffff000003201f00 x4 : 0000000000000000 x3 : 0000000000000010
[ 4.514446] x2 : ffff80008300b6d0 x1 : ffff800080201224 x0 : ffff0000055f1000
[ 4.521566] Call trace:
[ 4.528671] regulator_put (drivers/regulator/core.c:2473
drivers/regulator/core.c:2471) (P)
[ 4.530931] regulator_register (drivers/regulator/core.c:5964)
[ 4.535099] devm_regulator_register (drivers/regulator/devres.c:477)
[ 4.539006] rpm_reg_probe
(drivers/regulator/qcom_smd-regulator.c:1425
drivers/regulator/qcom_smd-regulator.c:1462)
[ 4.543518] platform_probe (drivers/base/platform.c:1405)
[ 4.547249] really_probe (drivers/base/dd.c:581 drivers/base/dd.c:658)
[ 4.550983] __driver_probe_device (drivers/base/dd.c:0)
[ 4.554630] driver_probe_device (drivers/base/dd.c:830)
[ 4.558970] __device_attach_driver (drivers/base/dd.c:959)
[ 4.562965] bus_for_each_drv (drivers/base/bus.c:462)
[ 4.567477] __device_attach_async_helper
(arch/arm64/include/asm/jump_label.h:36 drivers/base/dd.c:988)
[ 4.571646] async_run_entry_fn
(arch/arm64/include/asm/jump_label.h:36 kernel/async.c:131)
[ 4.576679] process_scheduled_works (kernel/workqueue.c:3243
kernel/workqueue.c:3319)
[ 4.580586] worker_thread (include/linux/list.h:373
kernel/workqueue.c:946 kernel/workqueue.c:3401)
[ 4.585358] kthread (kernel/kthread.c:466)
[ 4.588915] ret_from_fork (arch/arm64/kernel/entry.S:863)
[ 4.592304] ---[ end trace 0000000000000000 ]---
[ 4.597057] l2: Bringing 0uV into 1200000-1200000uV
[ 4.600531] qcom_rpm_smd_regulator
remoteproc:smd-edge:rpm-requests:regulators: l2:
devm_regulator_register() failed, ret=-517
[ 4.605612] Unable to handle kernel paging request at virtual
address ffffffffaaaaae6a
[ 4.616566] Mem abort info:
[ 4.624438] ESR = 0x0000000096000005
[ 4.627130] EC = 0x25: DABT (current EL), IL = 32 bits
[ 4.630953] SET = 0, FnV = 0
[ 4.636417] EA = 0, S1PTW = 0
[ 4.639281] FSC = 0x05: level 1 translation fault
[ 4.642325] Data abort info:
[ 4.647183] ISV = 0, ISS = 0x00000005, ISS2 = 0x00000000
[ 4.650313] CM = 0, WnR = 0, TnD = 0, TagAccess = 0
[ 4.655606] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
[ 4.660730] swapper pgtable: 4k pages, 48-bit VAs, pgdp=00000000824f1000
[ 4.666115] [ffffffffaaaaae6a] pgd=0000000000000000,
p4d=0000000082f1c403, pud=0000000000000000
[ 4.672816] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP
[ 4.681201] Modules linked in:
[ 4.687443] CPU: 2 UID: 0 PID: 14 Comm: kworker/u16:1 Tainted: G
W 6.14.3-rc1 #1
[ 4.690584] Tainted: [W]=WARN
[ 4.699505] Hardware name: Qualcomm Technologies, Inc. APQ 8016 SBC (DT)
[ 4.702381] Workqueue: async async_run_entry_fn
[ 4.709147] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 4.713405] pc : regulator_unregister (drivers/regulator/core.c:5991)
[ 4.720342] lr : devm_rdev_release (drivers/regulator/devres.c:453)
[ 4.725203] sp : ffff80008300bae0
[ 4.729454] x29: ffff80008300bb00 x28: ffff000003301340 x27: 00000000000001c8
[ 4.732683] x26: ffff000003231a00 x25: ffff00000459ae00 x24: ffff000003301340
[ 4.739794] x23: ffff80008286ed00 x22: ffff8000823fc4a1 x21: ffff0000033aac00
[ 4.746913] x20: ffff000005ac7410 x19: ffff80008300bba8 x18: 0000000000000002
[ 4.754030] x17: 6f74616c75676572 x16: 3a73747365757165 x15: 00000ff00003fd36
[ 4.761148] x14: 000000000000ffff x13: 0000000000000020 x12: 0000000000000003
[ 4.768267] x11: 0000000000000000 x10: 0000000000000000 x9 : ffff800080b59fe0
[ 4.775384] x8 : 06678d1f10cf8900 x7 : 3d4e5f454c424954 x6 : 000000004e514553
[ 4.782502] x5 : 0000000000000008 x4 : ffff800082276255 x3 : 0000000000000010
[ 4.789620] x2 : ffff80008300ba60 x1 : ffff0000033aac80 x0 : ffffffffaaaaaaaa
[ 4.796740] Call trace:
[ 4.803845] regulator_unregister (drivers/regulator/core.c:5991) (P)
[ 4.806108] devm_rdev_release (drivers/regulator/devres.c:453)
[ 4.810966] release_nodes (drivers/base/devres.c:506)
[ 4.814872] devres_release_all (drivers/base/devres.c:0)
[ 4.818432] really_probe (drivers/base/dd.c:551 drivers/base/dd.c:724)
[ 4.822423] __driver_probe_device (drivers/base/dd.c:0)
[ 4.826072] driver_probe_device (drivers/base/dd.c:830)
[ 4.830324] __device_attach_driver (drivers/base/dd.c:959)
[ 4.834317] bus_for_each_drv (drivers/base/bus.c:462)
[ 4.838831] __device_attach_async_helper
(arch/arm64/include/asm/jump_label.h:36 drivers/base/dd.c:988)
[ 4.843001] async_run_entry_fn
(arch/arm64/include/asm/jump_label.h:36 kernel/async.c:131)
[ 4.848032] process_scheduled_works (kernel/workqueue.c:3243
kernel/workqueue.c:3319)
[ 4.851941] worker_thread (include/linux/list.h:373
kernel/workqueue.c:946 kernel/workqueue.c:3401)
[ 4.856713] kthread (kernel/kthread.c:466)
[ 4.860270] ret_from_fork (arch/arm64/kernel/entry.S:863)
[ 4.863661] Code: d5384108 f9430d08 f81f83a8 b4000bc0 (f941e014)All code
========
Code starting with the faulting instruction
===========================================
[ 4.867227] ---[ end trace 0000000000000000 ]--- [ 14.238655] sdhci_msm 7864900.mmc: Got CD GPIO
## Source
* Kernel version: 6.14.3-rc1
* Git tree: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* Git sha: 0e7f2bba84c1f492e15812fade27cc0a697f3cb6
* Git describe: v6.14.2-450-g0e7f2bba84c1
* Project details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/Boot/v6.14.2-450-g0e7f2bba84c1/
* Architectures: arm64 dragonboard 410c
* Toolchains: clang-20
* Kconfigs: lkftconfig
## Boot
* Boot log: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28150326/suite/boot/test/clang-20-lkftconfig/log
* Boot history:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28150326/suite/boot/test/clang-20-lkftconfig/
* Boot details:
https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-6.14.y/build/v6.14.2-450-g0e7f2bba84c1/testrun/28150326/suite/boot/test/clang-20-lkftconfig/details/
* Build link: https://storage.tuxsuite.com/public/linaro/lkft/builds/2vrqGz3vUNvc2w9PJfCD1r7ChKx/
* Kernel config:
https://storage.tuxsuite.com/public/linaro/lkft/builds/2vrqGz3vUNvc2w9PJfCD1r7ChKx/config
--
Linaro LKFT
https://lkft.linaro.org
Quoted 49 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Regressions on arm64 dragonboard 410c boot failed with lkftconfig on the stable rc
6.14.3-rc1. While booting, the following kernel warnings were noticed and boot failed.First seen on the 6.14.3-rc1
Good: v6.14.2 Bad: v6.14.2-450-g0e7f2bba84c1Regressions found on arm64 dragonboard 410c:
- Boot/clang-20-lkftconfigRegression Analysis:
- New regression? Yes
- Reproducibility? YesBoot regression: arm64 dragonboard 410c WARNING regulator
core.cregulator_put## Boot log arm64 dragonboard 410c
[ 3.924339] remoteproc:smd-edge: failed to parse smd edge [ 4.051490] msm_hsusb 78d9000.usb: Failed to create device link (0x180) with supplier remoteproc for /soc@0/usb@78d9000/ulpi/phy [ 4.055155] qcom-clk-smd-rpm remoteproc:smd-edge:rpm-requests:clock-controller: Error registering SMD clock driver (-1431655766) [ 4.062274] qcom-clk-smd-rpm
Quoted 2 lines
remoteproc:smd-edge:rpm-requests:clock-controller: probe with driver qcom-clk-smd-rpm failed with error -1431655766
^^^^^^^^^^^
This is 0xaaaaaaaa which is very suspicious.
We recently changed out test configs to use CONFIG_INIT_STACK_ALL_PATTERN=y (my fault) and the documentation says that 0xaaaaaaaa is the default uninitialized variable pattern for Clang 64bit. So it's possible that this is not a regression but an older bug which is only detected with that config change. Could you try again with CONFIG_INIT_STACK_ALL_ZERO=y instead?
However, I don't see how this can be stack data.
This error code is from qcom_rpm_smd_write() and I'm pretty sure it's from the ret = rpm->ack_status; assignment and it's supposed to be zero.
regards,
dan carpenter
PATCH 1/1 rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
In reply to Naresh KambojuThe "ret" variable isn't initialized if we don't enter the loop. For example, if "channel->state" is not SMD_CHANNEL_OPENED.
---
Naresh, could you test this patch and see if it fixes the boot problems you saw?
drivers/rpmsg/qcom_smd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rpmsg/qcom_smd.c +1 -1
@@ -746,7 +746,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,__le32 hdr[5 ] = {cpu_to_le32 (len), };int tlen =sizeof (hdr) + len;unsigned long flags; -int ret; +int ret =0 ;/* Word aligned channels only accept word size aligned data */ if (channel->info_word && len %4 )
Signature · 1 line
2.47.2
kernel test robot
build botRe: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
FYI: kernel test robot notices the stable kernel rule is not satisfied.
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-1
Rule: add the tag "Cc: [email protected]" in the sign-off area to have the patch automatically included in the stable tree.
Subject: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Re: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
In reply to Dan CarpenterQuoted 5 lines · Dan Carpenter
The "ret" variable isn't initialized if we don't enter the loop. For example, if "
channel->state" is notSMD_CHANNEL_OPENED.Fixes 33e3820dda88 ("rpmsg: smd: Use spinlock in tx path")Signed-off-by Dan Carpenter <[email protected]>
Re: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
In reply to Dan CarpenterQuoted 9 lines · Dan Carpenter
The "ret" variable isn't initialized if we don't enter the loop. For example, if "
channel->state" is notSMD_CHANNEL_OPENED.Fixes 33e3820dda88 ("rpmsg: smd: Use spinlock in tx path")Signed-off-by Dan Carpenter <[email protected]>---
Naresh, could you test this patch and see if it fixes the boot problems you saw?
Dan, This patch fixes the reported problem.
Links:
- https://lkft.validation.linaro.org/scheduler/job/8244118#L2441
Quoted 20 lines
drivers/rpmsg/qcom_smd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/rpmsg/qcom_smd.c +1
-2@@ -746,7 +746,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,__le32 hdr[5 ] = {cpu_to_le32 (len), };int tlen =sizeof (hdr) + len;unsigned long flags; -int ret; +int ret =0 ;/* Word aligned channels only accept word size aligned data */ if (channel->info_word && len %4 ) --2.47.2
Re: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
Quoted 11 lines · Naresh Kamboju
Quoted 9 lines · Dan Carpenter
The "ret" variable isn't initialized if we don't enter the loop. For example, if "
channel->state" is notSMD_CHANNEL_OPENED.Fixes 33e3820dda88 ("rpmsg: smd: Use spinlock in tx path")Signed-off-by Dan Carpenter <[email protected]>---
Naresh, could you test this patch and see if it fixes the boot problems you saw?
Quoted 4 lines
Dan, This patch fixes the reported problem.
Tested-by Naresh Kamboju <[email protected]>
Thanks Naresh,
I left off your reported by tag as well.
regards,
dan carpenter
Re: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
In reply to Dan CarpenterHi Greg,
I'm sorry I forgot to add the:
to this patch. Could we backport it to stable, please?
regards,
dan carpenter
Quoted 27 lines · Dan Carpenter
The "ret" variable isn't initialized if we don't enter the loop. For example, if "
channel->state" is notSMD_CHANNEL_OPENED.Fixes 33e3820dda88 ("rpmsg: smd: Use spinlock in tx path")Signed-off-by Dan Carpenter <[email protected]>---
Naresh, could you test this patch and see if it fixes the boot problems you saw?drivers/rpmsg/qcom_smd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/rpmsg/qcom_smd.c +1
-1@@ -746,7 +746,7 @@ static int __qcom_smd_send(struct qcom_smd_channel *channel, const void *data,__le32 hdr[5 ] = {cpu_to_le32 (len), };int tlen =sizeof (hdr) + len;unsigned long flags; -int ret; +int ret =0 ;/* Word aligned channels only accept word size aligned data */ if (channel->info_word && len %4 )Signature · 1 line
2.47.2
Greg Kroah-Hartman
maintainerRe: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
Quoted 7 lines · Dan Carpenter
Hi Greg,
I'm sorry I forgot to add the:
to this patch. Could we backport it to stable, please?
What is the git id of it in Linus's tree?
thanks,
greg k-h
Re: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
Quoted 11 lines · Greg Kroah-Hartman
Quoted 7 lines · Dan Carpenter
Hi Greg,
I'm sorry I forgot to add the:
to this patch. Could we backport it to stable, please?
What is the git id of it in Linus's tree?
77feb17c950e ("rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()")
regards,
dan carpenter
Re: [PATCH] rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send()
Quoted 6 lines · Dan Carpenter
Quoted 5 lines · Greg Kroah-Hartman
Quoted 4 lines · Dan Carpenter
Hi Greg,
I'm sorry I forgot to add the:
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
to this patch. Could we backport it to stable, please?
What is the git id of it in Linus's tree?
77feb17c950e("rpmsg:qcom_smd: Fix uninitialized return variable in__qcom_smd_send()")
Ugh. Nope. It hasn't hit Linus's tree yet.
regards,
dan carpenter
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
CIP testing did not find any problems here:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.14.y
6.12 and 6.13 pass our testing, too:
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.12.y
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-6.13.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.14.3 release. There are 449 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 19 Apr 2025 17:49:48 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.14.3-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.14.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah