From patchwork Wed Apr 9 15:14:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Nowicki X-Patchwork-Id: 3956241 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 145C89F371 for ; Wed, 9 Apr 2014 15:16:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3CC1D205AA for ; Wed, 9 Apr 2014 15:16:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58F4B2055C for ; Wed, 9 Apr 2014 15:16:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933389AbaDIPPR (ORCPT ); Wed, 9 Apr 2014 11:15:17 -0400 Received: from mail-ee0-f47.google.com ([74.125.83.47]:50505 "EHLO mail-ee0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964825AbaDIPOb (ORCPT ); Wed, 9 Apr 2014 11:14:31 -0400 Received: by mail-ee0-f47.google.com with SMTP id b15so2021097eek.34 for ; Wed, 09 Apr 2014 08:14:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bu53V+u4tw5xHcXVDnqOcTbypM+HyWBSVSleTJ9ZmZo=; b=TroPUq4NIi58PKFH9QHLTtxJ+9D+HfoDP9/jzKmBTH/hQ/viQgNroh8f/tqJ4+YYCJ 8uC+mtnv3DcLZ18v6rSUo8vpRbVaFn+KRdylbFgJICI1jOlbQ7NAlkivSLETe0TgPo/6 ej4n1f3K69QcrhrDmGfKMdqdrei4GTEBlOrapcEvyXZxGZ+zFoeg8twn9Mzq2o9N7Bx8 l3HTCEjFHLaJkU95pBgd3bUe9jZbBLbqCa/2rcwjq81FtvM0aqkv+HOoiCOkXnkV5HC8 M3yDtFJcsCte/jiJBlkAr+AKnL+Dx/489ChqN9yR+ZLkYB7V9uzdMvmBinWaLkxHwWDj jOsA== X-Gm-Message-State: ALoCoQn//+skHhJlbl/xZB/1JWQ0ejaULSy0yv12g3JzR0EK58nfyh+o4vterMiNOZXszfy8hi6Z X-Received: by 10.14.224.6 with SMTP id w6mr3661128eep.60.1397056470343; Wed, 09 Apr 2014 08:14:30 -0700 (PDT) Received: from tn-HP3-PC.semihalf.com ([80.82.22.190]) by mx.google.com with ESMTPSA id x46sm2326082een.17.2014.04.09.08.14.28 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 08:14:29 -0700 (PDT) From: Tomasz Nowicki To: rjw@rjwysocki.net, lenb@kernel.org, tony.luck@intel.com, bp@alien8.de, bp@suse.de, m.chehab@samsung.com Cc: linux-edac@vger.kernel.org, x86@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Tomasz Nowicki Subject: [PATCH 7/7] acpi, apei, ghes: Factor out ioremap virtual memory for IRQ and NMI context. Date: Wed, 9 Apr 2014 17:14:35 +0200 Message-Id: <1397056476-9183-8-git-send-email-tomasz.nowicki@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397056476-9183-1-git-send-email-tomasz.nowicki@linaro.org> References: <1397056476-9183-1-git-send-email-tomasz.nowicki@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP GHES currently maps two pages with atomic_ioremap. From now on, NMI is optional so there is no need to allocate an NMI page for platforms without NMI support. To make it possible to not use a second page, swap the existing page order so that the IRQ context page is first, and the optional NMI context page is second. Then, use CONFIG_ACPI_APEI_NMI to decide at runtime how many pages are to be allocated. Finally, put in sanity checks to avoid accessing unallocated memory. Signed-off-by: Tomasz Nowicki --- drivers/acpi/apei/ghes.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 624878b..20377ac 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -109,12 +109,11 @@ static DEFINE_MUTEX(ghes_list_mutex); */ /* - * Two virtual pages are used, one for NMI context, the other for - * IRQ/PROCESS context + * Two virtual pages are used, one for IRQ/PROCESS context, the other for + * NMI context (optionally). */ -#define GHES_IOREMAP_PAGES 2 -#define GHES_IOREMAP_NMI_PAGE(base) (base) -#define GHES_IOREMAP_IRQ_PAGE(base) ((base) + PAGE_SIZE) +#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; @@ -141,7 +140,8 @@ static struct ghes_notify_setup ghes_notify_tab[]; static int ghes_ioremap_init(void) { - ghes_ioremap_area = __get_vm_area(PAGE_SIZE * GHES_IOREMAP_PAGES, + ghes_ioremap_area = __get_vm_area( + PAGE_SIZE * (IS_ENABLED(CONFIG_ACPI_APEI_NMI) ? 2 : 1), VM_IOREMAP, VMALLOC_START, VMALLOC_END); if (!ghes_ioremap_area) { pr_err(GHES_PFX "Failed to allocate virtual memory area for atomic ioremap.\n"); @@ -310,6 +310,8 @@ static void ghes_copy_tofrom_phys(void *buffer, u64 paddr, u32 len, u64 offset; u32 trunk; + BUG_ON(in_nmi && !IS_ENABLED(CONFIG_ACPI_APEI_NMI)); + while (len > 0) { offset = paddr - (paddr & PAGE_MASK); if (in_nmi) {