From patchwork Tue Jul 30 16:47:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 18673 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-gh0-f197.google.com (mail-gh0-f197.google.com [209.85.160.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 359AB248E6 for ; Tue, 30 Jul 2013 16:42:47 +0000 (UTC) Received: by mail-gh0-f197.google.com with SMTP id r20sf5869634ghr.4 for ; Tue, 30 Jul 2013 09:42:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=elDPrqytiB6N02n+WQN/YwXDEseUjKknXJMN86MYhxQ=; b=E4ztcGgzlW3VxUUW+z8ehUYq8bOTKpeVzWkmntuoxc2/xQvlLiNJJQmqGDk84pdyMz HjSbtPC9qMpYRda2XaDiSHJELE/kvOnJ1RqtBxl5BTzfZalOUsZkKXMoEwNLWdvKXfi4 1aBQxA1IAOnJ+9p4c7aSG8rZhUlk6OxG/RAYDLEeyP8uJ9hdiQrQgWFZWwry9jVtppWu SguoMlqgBdeRk8DyOpWHtqd2daLU12bBwYuANV+7q3LcsNtiWtH6974TmEkyo78Fiwfm crM+g8Bbw3GwBBXzPB1Sr3WhmVrKbhApGK9YX0yvJupEUHt9wJq+T2aZNgWspfEYm7hh mzNQ== X-Received: by 10.236.38.106 with SMTP id z70mr32096232yha.29.1375202565538; Tue, 30 Jul 2013 09:42:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.66 with SMTP id 2ls286331qec.47.gmail; Tue, 30 Jul 2013 09:42:45 -0700 (PDT) X-Received: by 10.221.4.4 with SMTP id oa4mr10286109vcb.70.1375202565418; Tue, 30 Jul 2013 09:42:45 -0700 (PDT) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by mx.google.com with ESMTPS id of1si6937564vcb.129.2013.07.30.09.42.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Jul 2013 09:42:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.41; Received: by mail-vb0-f41.google.com with SMTP id g17so4073458vbg.14 for ; Tue, 30 Jul 2013 09:42:45 -0700 (PDT) X-Received: by 10.58.211.227 with SMTP id nf3mr27778131vec.20.1375202565290; Tue, 30 Jul 2013 09:42:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.11.8 with SMTP id pc8csp185621vcb; Tue, 30 Jul 2013 09:42:44 -0700 (PDT) X-Received: by 10.194.178.138 with SMTP id cy10mr46921237wjc.61.1375202564229; Tue, 30 Jul 2013 09:42:44 -0700 (PDT) Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by mx.google.com with ESMTPS id m11si10617506wij.36.2013.07.30.09.42.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Jul 2013 09:42:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.175 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=209.85.212.175; Received: by mail-wi0-f175.google.com with SMTP id hq12so2998986wib.2 for ; Tue, 30 Jul 2013 09:42:43 -0700 (PDT) X-Received: by 10.180.73.68 with SMTP id j4mr1613786wiv.10.1375202563758; Tue, 30 Jul 2013 09:42:43 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginmedia.com. [86.14.224.72]) by mx.google.com with ESMTPSA id z2sm29652655wiv.11.2013.07.30.09.42.42 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Jul 2013 09:42:43 -0700 (PDT) From: Leif Lindholm To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, matt.fleming@intel.com, hpa@zytor.com, tglx@linutronix.de, patches@linaro.org, Leif Lindholm Subject: [PATCH 4/4] efi: x86: make efi_lookup_mapped_addr() a common function Date: Tue, 30 Jul 2013 17:47:38 +0100 Message-Id: <1375202858-28470-5-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375202858-28470-1-git-send-email-leif.lindholm@linaro.org> References: <1375202858-28470-1-git-send-email-leif.lindholm@linaro.org> X-Gm-Message-State: ALoCoQlMQPfOT9OEfJ5lFDqyB6+PL5QCQhAaXTtdNTsOa/sZgXUk/MLFqmdhK4lhtZuGHFqGx10V X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.41 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , efi_lookup_mapped_addr() is a handy utility for other platforms than x86. Move it from arch/x86 to drivers/firmware/efi. This function will be used by future ARM patches. Signed-off-by: Leif Lindholm --- arch/x86/platform/efi/efi.c | 28 ---------------------------- drivers/firmware/efi/efi.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index ed2be58..3af9d36 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -736,34 +736,6 @@ static void __init runtime_code_page_mkexec(void) } } -/* - * We can't ioremap data in EFI boot services RAM, because we've already mapped - * it as RAM. So, look it up in the existing EFI memory map instead. Only - * callable after efi_enter_virtual_mode and before efi_free_boot_services. - */ -void __iomem *efi_lookup_mapped_addr(u64 phys_addr) -{ - void *p; - if (WARN_ON(!memmap.map)) - return NULL; - for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { - efi_memory_desc_t *md = p; - u64 size = md->num_pages << EFI_PAGE_SHIFT; - u64 end = md->phys_addr + size; - if (!(md->attribute & EFI_MEMORY_RUNTIME) && - md->type != EFI_BOOT_SERVICES_CODE && - md->type != EFI_BOOT_SERVICES_DATA) - continue; - if (!md->virt_addr) - continue; - if (phys_addr >= md->phys_addr && phys_addr < end) { - phys_addr += md->virt_addr - md->phys_addr; - return (__force void __iomem *)(unsigned long)phys_addr; - } - } - return NULL; -} - void efi_memory_uc(u64 addr, unsigned long size) { unsigned long page_shift = 1UL << EFI_PAGE_SHIFT; diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 4fa944a..94f57c0 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -148,6 +148,36 @@ err_put: subsys_initcall(efisubsys_init); +#if defined(CONFIG_X86) +/* + * We can't ioremap data in EFI boot services RAM, because we've already mapped + * it as RAM. So, look it up in the existing EFI memory map instead. Only + * callable after efi_enter_virtual_mode and before efi_free_boot_services. + */ +void __iomem *efi_lookup_mapped_addr(u64 phys_addr) +{ + void *p; + if (WARN_ON(!memmap.map)) + return NULL; + for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { + efi_memory_desc_t *md = p; + u64 size = md->num_pages << EFI_PAGE_SHIFT; + u64 end = md->phys_addr + size; + if (!(md->attribute & EFI_MEMORY_RUNTIME) && + md->type != EFI_BOOT_SERVICES_CODE && + md->type != EFI_BOOT_SERVICES_DATA) + continue; + if (!md->virt_addr) + continue; + if (phys_addr >= md->phys_addr && phys_addr < end) { + phys_addr += md->virt_addr - md->phys_addr; + return (__force void __iomem *)(unsigned long)phys_addr; + } + } + return NULL; +} +#endif + static __initdata efi_config_table_type_t common_tables[] = { {ACPI_20_TABLE_GUID, "ACPI 2.0", &efi.acpi20}, {ACPI_TABLE_GUID, "ACPI", &efi.acpi},