From: James Morse <james.morse@arm.com>
To: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, x86@kernel.org,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, "H . Peter Anvin" <hpa@zytor.com>,
Borislav Petkov <bp@suse.de>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>, Tony Luck <tony.luck@intel.com>,
Tyler Baicar <tbaicar@codeaurora.org>,
Dongjiu Geng <gengdongjiu@huawei.com>,
Xie XiuQi <xiexiuqi@huawei.com>,
torvalds@linux-foundation.org, James Morse <james.morse@arm.com>
Subject: [RFC/RFT PATCH 4/6] ACPI / APEI: Remove ghes_ioremap_area
Date: Tue, 31 Oct 2017 15:38:30 +0000 [thread overview]
Message-ID: <20171031153832.17746-5-james.morse@arm.com> (raw)
In-Reply-To: <20171031153832.17746-1-james.morse@arm.com>
Now that nothing is using the ghes_ioremap_area pages, rip them out.
Signed-off-by: James Morse <james.morse@arm.com>
---
drivers/acpi/apei/ghes.c | 39 ++-------------------------------------
1 file changed, 2 insertions(+), 37 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index f3269816b997..1a4f16b10052 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -114,19 +114,7 @@ static DEFINE_MUTEX(ghes_list_mutex);
* from BIOS to Linux can be determined only in NMI, IRQ or timer
* handler, but general ioremap can not be used in atomic context, so
* the fixmap is used instead.
- */
-
-/*
- * Two virtual pages are used, one for IRQ/PROCESS context, the other for
- * NMI context (optionally).
- */
-#define GHES_IOREMAP_PAGES 2
-#define GHES_IOREMAP_IRQ_PAGE(base) (base)
-#define GHES_IOREMAP_NMI_PAGE(base) ((base) + PAGE_SIZE)
-
-/* virtual memory area for atomic ioremap */
-static struct vm_struct *ghes_ioremap_area;
-/*
+ *
* These 2 spinlocks are used to prevent the fixmap entries from being used
* simultaneously.
*/
@@ -141,23 +129,6 @@ static atomic_t ghes_estatus_cache_alloced;
static int ghes_panic_timeout __read_mostly = 30;
-static int ghes_ioremap_init(void)
-{
- ghes_ioremap_area = __get_vm_area(PAGE_SIZE * GHES_IOREMAP_PAGES,
- VM_IOREMAP, VMALLOC_START, VMALLOC_END);
- if (!ghes_ioremap_area) {
- pr_err(GHES_PFX "Failed to allocate virtual memory area for atomic ioremap.\n");
- return -ENOMEM;
- }
-
- return 0;
-}
-
-static void ghes_ioremap_exit(void)
-{
- free_vm_area(ghes_ioremap_area);
-}
-
static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
{
phys_addr_t paddr;
@@ -1270,13 +1241,9 @@ static int __init ghes_init(void)
ghes_nmi_init_cxt();
- rc = ghes_ioremap_init();
- if (rc)
- goto err;
-
rc = ghes_estatus_pool_init();
if (rc)
- goto err_ioremap_exit;
+ goto err;
rc = ghes_estatus_pool_expand(GHES_ESTATUS_CACHE_AVG_SIZE *
GHES_ESTATUS_CACHE_ALLOCED_MAX);
@@ -1300,8 +1267,6 @@ static int __init ghes_init(void)
return 0;
err_pool_exit:
ghes_estatus_pool_exit();
-err_ioremap_exit:
- ghes_ioremap_exit();
err:
return rc;
}
--
2.15.0.rc2
next prev parent reply other threads:[~2017-10-31 15:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 15:38 [RFC/RFT PATCH 0/6] Switch GHES ioremap_page_range() to use fixmap James Morse
2017-10-31 15:38 ` [RFC/RFT PATCH 1/6] arm64: fixmap: Add GHES fixmap entries James Morse
2017-10-31 15:38 ` [RFC/RFT PATCH 2/6] x86/mm/fixmap: " James Morse
2017-10-31 19:04 ` Ingo Molnar
2017-10-31 19:09 ` Borislav Petkov
2017-10-31 15:38 ` [RFC/RFT PATCH 3/6] ACPI / APEI: Replace ioremap_page_range() with fixmap James Morse
2017-11-01 4:13 ` gengdongjiu
2017-11-01 14:57 ` James Morse
2017-11-02 12:01 ` gengdongjiu
2017-11-06 18:41 ` James Morse
2017-11-01 13:34 ` Borislav Petkov
2017-10-31 15:38 ` James Morse [this message]
2017-11-01 13:47 ` [RFC/RFT PATCH 4/6] ACPI / APEI: Remove ghes_ioremap_area Borislav Petkov
2017-10-31 15:38 ` [RFC/RFT PATCH 5/6] arm64: mm: Remove arch_apei_flush_tlb_one() James Morse
2017-10-31 15:38 ` [RFC/RFT PATCH 6/6] ACPI / APEI: " James Morse
2017-11-01 13:50 ` Borislav Petkov
2017-10-31 15:52 ` [RFC/RFT PATCH 0/6] Switch GHES ioremap_page_range() to use fixmap Linus Torvalds
2017-10-31 16:05 ` Linus Torvalds
2017-11-01 14:58 ` James Morse
2017-10-31 18:46 ` Tyler Baicar
2017-11-01 14:58 ` James Morse
2017-11-01 15:30 ` Borislav Petkov
2017-11-01 18:20 ` Kani, Toshimitsu
2017-11-06 18:43 ` James Morse
2017-11-02 10:19 ` Will Deacon
2017-11-09 12:22 ` Zhengqiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171031153832.17746-5-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=bp@suse.de \
--cc=catalin.marinas@arm.com \
--cc=gengdongjiu@huawei.com \
--cc=hpa@zytor.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rjw@rjwysocki.net \
--cc=tbaicar@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=will.deacon@arm.com \
--cc=x86@kernel.org \
--cc=xiexiuqi@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome