diff options
| author | Karel Kočí <cynerd@email.cz> | 2022-11-01 09:44:59 +0100 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2022-11-01 09:44:59 +0100 |
| commit | 955268e13f8f9422e7e89ee6350ec793dddd1e94 (patch) | |
| tree | 1714aa5f8383ddf5aaaf7826c8502f686bcd8a7a /nixos/modules/kernel-patches/0005-PCI-mvebu-Dispose-INTx-irqs-prior-to-removing-INTx-d.patch | |
| parent | 06293bfbb5082dc636358d49f3e6fea88c4f2a67 (diff) | |
| download | nixturris-955268e13f8f9422e7e89ee6350ec793dddd1e94.tar.gz nixturris-955268e13f8f9422e7e89ee6350ec793dddd1e94.tar.bz2 nixturris-955268e13f8f9422e7e89ee6350ec793dddd1e94.zip | |
nixos: try to fix Turris Omnia PCIe on Linux 6.0
Unfortunatelly this seems to not work.
Diffstat (limited to 'nixos/modules/kernel-patches/0005-PCI-mvebu-Dispose-INTx-irqs-prior-to-removing-INTx-d.patch')
| -rw-r--r-- | nixos/modules/kernel-patches/0005-PCI-mvebu-Dispose-INTx-irqs-prior-to-removing-INTx-d.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/nixos/modules/kernel-patches/0005-PCI-mvebu-Dispose-INTx-irqs-prior-to-removing-INTx-d.patch b/nixos/modules/kernel-patches/0005-PCI-mvebu-Dispose-INTx-irqs-prior-to-removing-INTx-d.patch deleted file mode 100644 index b5d1651..0000000 --- a/nixos/modules/kernel-patches/0005-PCI-mvebu-Dispose-INTx-irqs-prior-to-removing-INTx-d.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c9259b56b015aee9c5984cba54912e78d2abf74f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org> -Date: Sat, 9 Jul 2022 16:12:40 +0200 -Subject: [PATCH 05/96] PCI: mvebu: Dispose INTx irqs prior to removing INTx - domain -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Documentation for irq_domain_remove() says that all mapping within the -domain must be disposed prior to domain remove. - -Currently INTx irqs are not disposed in pci-mvebu.c device unbind callback -which cause that kernel crashes after unloading driver and trying to read -/sys/kernel/debug/irq/irqs/<num> or /proc/interrupts. - -Fixes: ec075262648f ("PCI: mvebu: Implement support for legacy INTx interrupts") -Reported-by: Hajo Noerenberg <hajo-linux-bugzilla@noerenberg.de> -Signed-off-by: Pali Rohár <pali@kernel.org> ---- - drivers/pci/controller/pci-mvebu.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c -index 73d8fb6952e6..159167ebb2de 100644 ---- a/drivers/pci/controller/pci-mvebu.c -+++ b/drivers/pci/controller/pci-mvebu.c -@@ -1706,8 +1706,15 @@ static int mvebu_pcie_remove(struct platform_device *pdev) - mvebu_writel(port, ~PCIE_INT_ALL_MASK, PCIE_INT_CAUSE_OFF); - - /* Remove IRQ domains. */ -- if (port->intx_irq_domain) -+ if (port->intx_irq_domain) { -+ int virq, j; -+ for (j = 0; j < PCI_NUM_INTX; j++) { -+ virq = irq_find_mapping(port->intx_irq_domain, j); -+ if (virq > 0) -+ irq_dispose_mapping(virq); -+ } - irq_domain_remove(port->intx_irq_domain); -+ } - - /* Free config space for emulated root bridge. */ - pci_bridge_emul_cleanup(&port->bridge); --- -2.37.2 - |