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: 28096 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f71.google.com (mail-pb0-f71.google.com [209.85.160.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CA3072145A for ; Wed, 9 Apr 2014 15:16:15 +0000 (UTC) Received: by mail-pb0-f71.google.com with SMTP id up15sf8179695pbc.10 for ; Wed, 09 Apr 2014 08:16:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=tUAS3dowT6ixn4HqKWrhUV6CYqR4hCBt/z0uvoArUGM=; b=CBwnukqxbXw/SoWN6QpUO43v6NVMFF/MSRec+h+3PdG1uJjPMqXHFcPPPFONZUT+O0 rFCVcSUApEhP4R/RD4xMpCjv1I6rYBCCLXCeZZF5v9fuxHSh7DFTBWwekEqUvMGec0uK bmL/8X1QO1FFjcMrWq2+SdMZqhtv3F+hj4dx9xLbNmCwEbNUfn0bRCDItLgeVXHOCoBs 82biWN4g70bOo27hYgl9N7hI49FDsQo1ci7WsXPjuMLcvEp/l9IKCiN1yEwygkfKWw6D NGN/k6LzOawCw998pBhb4laE4wDVbCJvaZD5Na9IdNRTpeIevyZmoP+bzxcrKoRTCy8c IwVg== X-Gm-Message-State: ALoCoQmLj7nxdwKyb6NfQI39x7L4hbGzfLT2Q0AHcMLXv/NmnMRMLdJ+7ltxbmkuehEQwMy483x5 X-Received: by 10.66.189.228 with SMTP id gl4mr5548558pac.26.1397056575016; Wed, 09 Apr 2014 08:16:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.136 with SMTP id v8ls743445qgd.13.gmail; Wed, 09 Apr 2014 08:16:14 -0700 (PDT) X-Received: by 10.52.78.231 with SMTP id e7mr1332098vdx.28.1397056574836; Wed, 09 Apr 2014 08:16:14 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id sc7si188669vdc.13.2014.04.09.08.16.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Apr 2014 08:16:14 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so2164205veb.23 for ; Wed, 09 Apr 2014 08:16:14 -0700 (PDT) X-Received: by 10.220.109.138 with SMTP id j10mr863102vcp.54.1397056574741; Wed, 09 Apr 2014 08:16:14 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp338259vcv; Wed, 9 Apr 2014 08:16:14 -0700 (PDT) X-Received: by 10.66.192.41 with SMTP id hd9mr12787778pac.87.1397056573890; Wed, 09 Apr 2014 08:16:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tv5si627909pbc.158.2014.04.09.08.16.10; Wed, 09 Apr 2014 08:16:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964864AbaDIPPS (ORCPT + 27 others); Wed, 9 Apr 2014 11:15:18 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:44142 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964826AbaDIPOb (ORCPT ); Wed, 9 Apr 2014 11:14:31 -0400 Received: by mail-ee0-f41.google.com with SMTP id t10so2038243eei.0 for ; Wed, 09 Apr 2014 08:14:30 -0700 (PDT) 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-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tomasz.nowicki@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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) {