From patchwork Mon Sep 1 00:53:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 36332 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f197.google.com (mail-yk0-f197.google.com [209.85.160.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D57FC2054F for ; Mon, 1 Sep 2014 00:54:52 +0000 (UTC) Received: by mail-yk0-f197.google.com with SMTP id 142sf17465552ykq.0 for ; Sun, 31 Aug 2014 17:54:52 -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: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=0mmCm0HTxaTwX7mXKMMErLLOILsSJFkRWE7jWOIcG60=; b=ZMrIoFbGm0+XVmMDRLrH4xHZKHgroiQa4P6zGqD7WpyIaeGbOonIOorm3cxhA7UzKc x5susSwioLnJ54g9HJ+C1ZGQp5I+Xuhu9Lj6P1u86mHTfCB61hFnFQc/T70IJsaLV3Xh N7hQr5Of3x32po5Na3Gt7hXmz1V8fAcyVgARSLqgCydQQ/5AlhRorJK9CjLebeRlC0Zj EAMBC4MvIeHD5x1vRqPEa15ir0sdJsQnHYGrzf4WeQCjaqY84ZaFZ6gZgHaNLHmR3oav VNxKYs4MTFfMS45vxprxytOCNNpUBoCv6bikDxFefT22KZqUPrL3mhYUuvwejgXef55J Qo8A== X-Gm-Message-State: ALoCoQl30TxB8/JwsUc/EOEF66RonDrWVsCl8Qeo2uK0IAb5DrAtGHIWRM/hKdOgw//tz1pDvyH6 X-Received: by 10.236.148.2 with SMTP id u2mr1416869yhj.55.1409532892675; Sun, 31 Aug 2014 17:54:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.161 with SMTP id f30ls1780992qgf.39.gmail; Sun, 31 Aug 2014 17:54:52 -0700 (PDT) X-Received: by 10.220.95.132 with SMTP id d4mr20907107vcn.33.1409532892604; Sun, 31 Aug 2014 17:54:52 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id yv8si3518869vcb.5.2014.08.31.17.54.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 31 Aug 2014 17:54:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id ij19so4814668vcb.31 for ; Sun, 31 Aug 2014 17:54:52 -0700 (PDT) X-Received: by 10.220.44.80 with SMTP id z16mr22815736vce.7.1409532892502; Sun, 31 Aug 2014 17:54:52 -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.221.45.67 with SMTP id uj3csp316299vcb; Sun, 31 Aug 2014 17:54:52 -0700 (PDT) X-Received: by 10.70.137.37 with SMTP id qf5mr28585568pdb.56.1409532891630; Sun, 31 Aug 2014 17:54:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zz2si11370460pac.62.2014.08.31.17.54.51 for ; Sun, 31 Aug 2014 17:54:51 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752535AbaIAAyb (ORCPT + 25 others); Sun, 31 Aug 2014 20:54:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1391 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752270AbaIAAyT (ORCPT ); Sun, 31 Aug 2014 20:54:19 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s810rvw0022857 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Sun, 31 Aug 2014 20:53:57 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s810rgqa013160; Sun, 31 Aug 2014 20:53:55 -0400 From: Laszlo Ersek To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, linux-ia64@vger.kernel.org, matt.fleming@intel.com, msalter@redhat.com, lersek@redhat.com Subject: [PATCH 5/5] arm64: efi: format EFI memory type & attrs with efi_md_typeattr_format() Date: Mon, 1 Sep 2014 02:53:40 +0200 Message-Id: <1409532820-5027-6-git-send-email-lersek@redhat.com> In-Reply-To: <1409532820-5027-1-git-send-email-lersek@redhat.com> References: <1409532820-5027-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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: lersek@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) 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: , Signed-off-by: Laszlo Ersek --- arch/arm64/kernel/efi.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 03aaa99..3b1f23c 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -119,23 +119,6 @@ static int __init uefi_init(void) return retval; } -static __initdata char memory_type_name[][32] = { - {"Reserved"}, - {"Loader Code"}, - {"Loader Data"}, - {"Boot Code"}, - {"Boot Data"}, - {"Runtime Code"}, - {"Runtime Data"}, - {"Conventional Memory"}, - {"Unusable Memory"}, - {"ACPI Reclaim Memory"}, - {"ACPI Memory NVS"}, - {"Memory Mapped I/O"}, - {"MMIO Port Space"}, - {"PAL Code"}, -}; - /* * Return true for RAM regions we want to permanently reserve. */ @@ -166,10 +149,13 @@ static __init void reserve_regions(void) paddr = md->phys_addr; npages = md->num_pages; - if (uefi_debug) - pr_info(" 0x%012llx-0x%012llx [%s]", + if (uefi_debug) { + char buf[64]; + + pr_info(" 0x%012llx-0x%012llx %s", paddr, paddr + (npages << EFI_PAGE_SHIFT) - 1, - memory_type_name[md->type]); + efi_md_typeattr_format(buf, sizeof(buf), md)); + } memrange_efi_to_native(&paddr, &npages); size = npages << PAGE_SHIFT;