+++ /dev/null
-From 6061e65f95713b01f4313cda6637dfe3aa5412b4 Mon Sep 17 00:00:00 2001
-From: Huacai Chen <chenhuacai@loongson.cn>
-Date: Thu, 25 Jun 2026 13:03:47 +0800
-Subject: LoongArch: Add PIO for early access before ACPI PCI root register
-
-From: Huacai Chen <chenhuacai@loongson.cn>
-
-commit 6061e65f95713b01f4313cda6637dfe3aa5412b4 upstream.
-
-For ACPI system we suppose the ISA/LPC PIO range is registered together
-with PCI root bridge. But the fact is there may be some early access to
-the ISA/LPC PIO range before ACPI PCI root register (most of them are
-due to abnormal BIOS). Unconditionally register the ISA/LPC PIO range
-usually causes ACPI PCI root register fail because of the address range
-confliction. So we add a pair of helpers: acpi_add_early_pio() to add
-PIO for early access, and acpi_remove_early_pio() to remove PIO before
-PCI root register. Since acpi_remove_early_pio() may be called multiple
-times, we add an acpi_pio flag to ensure PIO be removed only once.
-
-Cc: <stable@vger.kernel.org>
-Tested-by: Yuanzhen Gan <elysia-best@simplelinux.cn.eu.org>
-Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/loongarch/include/asm/acpi.h | 2 ++
- arch/loongarch/kernel/acpi.c | 28 ++++++++++++++++++++++++++++
- arch/loongarch/kernel/setup.c | 2 ++
- arch/loongarch/pci/acpi.c | 2 ++
- 4 files changed, 34 insertions(+)
-
---- a/arch/loongarch/include/asm/acpi.h
-+++ b/arch/loongarch/include/asm/acpi.h
-@@ -37,6 +37,8 @@ static inline bool acpi_has_cpu_in_madt(
- extern struct list_head acpi_wakeup_device_list;
- extern struct acpi_madt_core_pic acpi_core_pic[MAX_CORE_PIC];
-
-+extern void acpi_add_early_pio(void);
-+extern void acpi_remove_early_pio(void);
- extern int __init parse_acpi_topology(void);
-
- static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
---- a/arch/loongarch/kernel/acpi.c
-+++ b/arch/loongarch/kernel/acpi.c
-@@ -14,6 +14,7 @@
- #include <linux/memblock.h>
- #include <linux/of_fdt.h>
- #include <linux/serial_core.h>
-+#include <linux/vmalloc.h>
- #include <asm/io.h>
- #include <asm/numa.h>
- #include <asm/loongson.h>
-@@ -57,6 +58,33 @@ void __iomem *acpi_os_ioremap(acpi_physi
- return ioremap_cache(phys, size);
- }
-
-+#define PIO_BASE (unsigned long)PCI_IOBASE
-+#define PIO_SIZE ALIGN(ISA_IOSIZE, PAGE_SIZE)
-+
-+static bool acpi_pio;
-+
-+/* Add PIO for early access */
-+void acpi_add_early_pio(void)
-+{
-+ if (!acpi_disabled) {
-+ acpi_pio = true;
-+ vmap_page_range(PIO_BASE, PIO_BASE + PIO_SIZE,
-+ LOONGSON_LIO_BASE, pgprot_device(PAGE_KERNEL));
-+ }
-+}
-+
-+/* Remove PIO for PCI register */
-+void acpi_remove_early_pio(void)
-+{
-+ if (!acpi_pio)
-+ return;
-+
-+ if (!acpi_disabled) {
-+ acpi_pio = false;
-+ vunmap_range(PIO_BASE, PIO_BASE + PIO_SIZE);
-+ }
-+}
-+
- #ifdef CONFIG_SMP
- static int set_processor_mask(u32 id, u32 flags)
- {
---- a/arch/loongarch/kernel/setup.c
-+++ b/arch/loongarch/kernel/setup.c
-@@ -530,6 +530,8 @@ static __init int arch_reserve_pio_range
- {
- struct device_node *np;
-
-+ acpi_add_early_pio();
-+
- for_each_node_by_name(np, "isa") {
- struct of_range range;
- struct of_range_parser parser;
---- a/arch/loongarch/pci/acpi.c
-+++ b/arch/loongarch/pci/acpi.c
-@@ -65,6 +65,8 @@ static int acpi_prepare_root_resources(s
- struct resource_entry *entry, *tmp;
- struct acpi_device *device = ci->bridge;
-
-+ acpi_remove_early_pio();
-+
- status = acpi_pci_probe_root_resources(ci);
- if (status > 0) {
- acpi_evaluate_integer(device->handle, "PCIH", NULL, &pci_h);
+++ /dev/null
-From 7ae162b72c0f0e84ec950564118408de781a7813 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 10 Jul 2026 12:56:04 -0400
-Subject: Revert "LoongArch: Add PIO for early access before ACPI PCI root
- register"
-
-This reverts commit e4c9b6d07a546969396aa7564a5c2938e4720c80.
-
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/loongarch/include/asm/acpi.h | 2 --
- arch/loongarch/kernel/acpi.c | 28 ----------------------------
- arch/loongarch/kernel/setup.c | 2 --
- arch/loongarch/pci/acpi.c | 2 --
- 4 files changed, 34 deletions(-)
-
-diff --git a/arch/loongarch/include/asm/acpi.h b/arch/loongarch/include/asm/acpi.h
-index 4f31109714c0ab..49e29b29996f0f 100644
---- a/arch/loongarch/include/asm/acpi.h
-+++ b/arch/loongarch/include/asm/acpi.h
-@@ -37,8 +37,6 @@ static inline bool acpi_has_cpu_in_madt(void)
- extern struct list_head acpi_wakeup_device_list;
- extern struct acpi_madt_core_pic acpi_core_pic[MAX_CORE_PIC];
-
--extern void acpi_add_early_pio(void);
--extern void acpi_remove_early_pio(void);
- extern int __init parse_acpi_topology(void);
-
- static inline u32 get_acpi_id_for_cpu(unsigned int cpu)
-diff --git a/arch/loongarch/kernel/acpi.c b/arch/loongarch/kernel/acpi.c
-index 4f4f8a9e7e3bb7..1f529b13490b3b 100644
---- a/arch/loongarch/kernel/acpi.c
-+++ b/arch/loongarch/kernel/acpi.c
-@@ -14,7 +14,6 @@
- #include <linux/memblock.h>
- #include <linux/of_fdt.h>
- #include <linux/serial_core.h>
--#include <linux/vmalloc.h>
- #include <asm/io.h>
- #include <asm/numa.h>
- #include <asm/loongson.h>
-@@ -58,33 +57,6 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size)
- return ioremap_cache(phys, size);
- }
-
--#define PIO_BASE (unsigned long)PCI_IOBASE
--#define PIO_SIZE ALIGN(ISA_IOSIZE, PAGE_SIZE)
--
--static bool acpi_pio;
--
--/* Add PIO for early access */
--void acpi_add_early_pio(void)
--{
-- if (!acpi_disabled) {
-- acpi_pio = true;
-- vmap_page_range(PIO_BASE, PIO_BASE + PIO_SIZE,
-- LOONGSON_LIO_BASE, pgprot_device(PAGE_KERNEL));
-- }
--}
--
--/* Remove PIO for PCI register */
--void acpi_remove_early_pio(void)
--{
-- if (!acpi_pio)
-- return;
--
-- if (!acpi_disabled) {
-- acpi_pio = false;
-- vunmap_range(PIO_BASE, PIO_BASE + PIO_SIZE);
-- }
--}
--
- #ifdef CONFIG_SMP
- static int set_processor_mask(u32 id, u32 flags)
- {
-diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setup.c
-index 729b0660b61c1a..2e34ece474eece 100644
---- a/arch/loongarch/kernel/setup.c
-+++ b/arch/loongarch/kernel/setup.c
-@@ -530,8 +530,6 @@ static __init int arch_reserve_pio_range(void)
- {
- struct device_node *np;
-
-- acpi_add_early_pio();
--
- for_each_node_by_name(np, "isa") {
- struct of_range range;
- struct of_range_parser parser;
-diff --git a/arch/loongarch/pci/acpi.c b/arch/loongarch/pci/acpi.c
-index b53dae9d57c899..2d584a59a2a049 100644
---- a/arch/loongarch/pci/acpi.c
-+++ b/arch/loongarch/pci/acpi.c
-@@ -65,8 +65,6 @@ static int acpi_prepare_root_resources(struct acpi_pci_root_info *ci)
- struct resource_entry *entry, *tmp;
- struct acpi_device *device = ci->bridge;
-
-- acpi_remove_early_pio();
--
- status = acpi_pci_probe_root_resources(ci);
- if (status > 0) {
- acpi_evaluate_integer(device->handle, "PCIH", NULL, &pci_h);
---
-2.53.0
-
perf-trace-beauty-fcntl-fix-build-with-older-kernel-headers.patch
acpi-cppc-suppress-ubsan-warning-caused-by-field-misuse.patch
acpi-nfit-core-fix-possible-null-pointer-dereference.patch
-loongarch-add-pio-for-early-access-before-acpi-pci-root-register.patch
rust-kbuild-set-frame-pointer-llvm-module-flag-for-config_frame_pointer.patch
perf-core-detach-event-groups-during-remove_on_exec.patch
revert-crypto-talitos-rename-first-last-to-first_des.patch
arm64-revamp-hcr_el2.e2h-res1-detection.patch
arm64-sysreg-correct-sign-definitions-for-eiesb-and-.patch
virtio_net-support-dynamic-rss-indirection-table-siz.patch
-revert-loongarch-add-pio-for-early-access-before-acp.patch
loongarch-add-pio-for-early-access-before-acpi-pci-r.patch
net-drop-the-lock-in-skb_may_tx_timestamp.patch
mips-smp-report-dying-cpu-to-rcu-in-stop_this_cpu.patch
projects / thirdparty / kernel / stable-queue.git / commitdiff
