From patchwork Tue Feb 9 13:53:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 61531 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2057337lbl; Tue, 9 Feb 2016 05:57:06 -0800 (PST) X-Received: by 10.66.255.97 with SMTP id ap1mr50635947pad.135.1455026226214; Tue, 09 Feb 2016 05:57:06 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id zd6si54209439pac.222.2016.02.09.05.57.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 05:57:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aT8lp-0006Q9-88; Tue, 09 Feb 2016 13:55:57 +0000 Received: from mail-bn1on0669.outbound.protection.outlook.com ([2a01:111:f400:fc10::669] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aT8ks-0004gt-PE for linux-arm-kernel@lists.infradead.org; Tue, 09 Feb 2016 13:55:02 +0000 Authentication-Results: linaro.org; dkim=none (message not signed) header.d=none;linaro.org; dmarc=none action=none header.from=caviumnetworks.com; Received: from rric.localdomain (92.224.192.127) by CY1PR0701MB1614.namprd07.prod.outlook.com (10.163.20.151) with Microsoft SMTP Server (TLS) id 15.1.403.16; Tue, 9 Feb 2016 13:54:41 +0000 From: Robert Richter To: Ard Biesheuvel , Will Deacon , Matt Fleming , Catalin Marinas Subject: [PATCH v4 4/6] arm64/efi: move EFI /chosen node parsing before early FDT processing Date: Tue, 9 Feb 2016 14:53:44 +0100 Message-ID: <1455026026-11571-5-git-send-email-rrichter@caviumnetworks.com> X-Mailer: git-send-email 2.7.0.rc3 In-Reply-To: <1455026026-11571-1-git-send-email-rrichter@caviumnetworks.com> References: <1455026026-11571-1-git-send-email-rrichter@caviumnetworks.com> MIME-Version: 1.0 X-Originating-IP: [92.224.192.127] X-ClientProxiedBy: AM2PR09CA0006.eurprd09.prod.outlook.com (25.161.22.144) To CY1PR0701MB1614.namprd07.prod.outlook.com (25.163.20.151) X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 2:6xcqeZ23GZWLLNTYF4dYTuYkQG1F//BJntdvuDwVRp/mh/sZEGFMzG0Pmlv2ASGz4Kx4AzJhZtFBnzcRChe3OD3MCI6EY3tsAKSDjUsPzOGHu1JoDbJ6GQEFja6+IPdtXw9CausNdeq2XfEJC3QcFw==; 3:J9t/r67FtqBgUm0wz+Mg3Q35S20UtKBdgeKseF7m8bTCJ9e3QymuteozDkpZ8BusqxtrAvUAuP+zd7Nh8Co2NeCqnq+2E3suGiHnMfoy+Nc7kGQg+0rp7Fr+kIrNrU0F; 25:VvjEw7slBCsU3EkBt3snX283swmVr7VPqWuu+Jgixfx9+y514Zec8FK329KWTUAjL3Cqp8xqQTwiJtevV6Q2jXQmBWUL8ujNvWB6h+jSJinHR2x69R+5h+667p6pD78vXQZBwA4nmTlNfar8QyAsZPWPex0Lyl3jwW4Bz2a+/9wYEpycfjy43yfRXvpiw9o0YphVBM9zIuUewEMwfXgn+FCRvP8oI/uioTtB/bwNrqYhGS8p2ZABvi8Z2OglxplopGuBBWu5FOT3wqDHSLCSAZpLAdF7aJKu9Y2DqpFXa5whG+dwk1cS4joSoIANpemt X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0701MB1614; X-MS-Office365-Filtering-Correlation-Id: 24edb7e9-887e-4233-cdaf-08d33158909e X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 20:wy3UsGcEvjh0u+k6klqUi0wzJNb3M/9tu4PCglPbLuN8BEzWr9GuMs31eS/+0JNj0P8JXNS8f5dP2oOW5Czw22NTG8Ma6nJxKlLc0/uCXQBcP4us2JRuWKddr+ji/sZ58FbGHTnpDV2qllWkDMt7gxfYeNAWC+eoPjWVI71bXRlpdH216K/71u3MsqdrZ77c1K6QzY1M/eVD+nzYWXGnCSKTK6e1bYABd2/YzXr+JaI4lXYPd4ru/i4WeqR7c8zEXsXUBhRYuTLsR5da0yWD++lUERtOpCGvdSifc0O4A2aQ6h3atoa2oU6Zm7/6USvqpK1TjRzJ7HxLXUjI548Y9Bn+aVHwdTTRZFvavbnGCODSskmAAyD2rSMieuWvVclijGpz4B/BIGhqZt4GDKk6sRXa9+Tg4eFTEfS9a/Y/JS1JmlUCmtbGCxnK7jb3FpYdaW+PIZBVhvfFDoqSJ9pj97Eam/oMfS6AMDU3GS71ciRoFmHNH1VhEpdGwFbeUvOMt/ZqZE7DbOEdB5zMmvGBzaJ3Nsrx4nT5USPZ7/v43E9M1SucYycPTC4G9L+ubFDgYFodN1cYucpeEHyMkLuEOEsWEtrXVlNtIGb49vmhyuc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046); SRVR:CY1PR0701MB1614; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0701MB1614; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 4:TvMvRwXw3kn3xSJ+YWg/vqiBEhqWOzBKxQOUqf9ZiWeOmdOXvR2oJFkf66mYE1a+N1RVj8m/CFPOUKBL7osd7aRm5pe3t5tymFuWOUtJ7nP6g/mieK7V9QE+bd+IhioG3Xc/6LOAR+3S5FV8/n62s7lcX5I9J55vmct+lmfY/gQ3vxzM0i4JMCY6a2JpmU1LQIoNIocJorlv9UYVumk3gCwCH7Db4b9f6R4L783lyWBaIT7wPAHJgJY6yX/JiW8vAWqerU199gUxKwLbmKhSjUy0PUPc9AREbJGkOoDQcMeGxVZ9+wTb9JIemd2QN4gguAje5ZOZGPy/Z+miRVTf68lnXt4j0ffYVUjFUZpApTupfy6VY+Xptj1Ev61GmJOt X-Forefront-PRVS: 08476BC6EF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(40100003)(229853001)(48376002)(33646002)(5001770100001)(5001960100002)(5003940100001)(36756003)(122386002)(76176999)(50986999)(42186005)(50466002)(92566002)(50226001)(2950100001)(4326007)(2906002)(189998001)(5008740100001)(5004730100002)(19580395003)(77096005)(66066001)(19580405001)(1096002)(47776003)(6116002)(87976001)(586003)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0701MB1614; H:rric.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 23:8z4nD/hx6FHJwH3zvsazqY8UafhtkT3mlrDTK0SjofjfksCfkCTGIbonvfRaWJwJpFxSLgK8TPIXk00hHpPzl+UILdist56yEnbzopDaw0q/WB1P2n2/vtut1tJMSd0y2l/ard2psP6sg5PPVt18C9Fk61OJVJ2WI/6PvNtyvNr8oZC6nxusPxUjCc+keCTa4Eptaa+oLeTmSnQfAwHD72bi1+dZcWa42HfwhjCSPmPQZNAE/pr+A0PD0p30CKNe7q8PZ5QQiKFrr1OsrtYkxlktxcLXCMgw3YIb3Lucs1lKlllWmz/MLLKxSzYd+ocutH4YeK4FFH8EDpSmVMDKP3jWSZ3pXd9KDqZAlZyuexHBa5+zDwGRs0BbmMnHu2ZvAKssUfUOx8rPdb+f50wFf5kUecNTu7WAJKed0J6EYV/7QRXnxWb4olZaBlH3QAC8WSL/c8OJfzQ0znmKaQN93BEvByVOfeI71BzsVJenFws3VvSed8uC4xzvXyNy6/3Vq3yhwDWCjTfTTx4+nn6TZZMkVhzk5VRBO7gVbwZ2XgABcDzyNWal+hMj/vyaWpJp5Ix4q6/2rF/wyplhLU8Et3vDK7F0ZN/q57NRXoBwkf+nYHUAkFfuwiWy0o4ceVE4+Kgj84YjTfzY/CoDLmjdZ6dZsozrcBLRlHQnGE/+yjCUimfUWLrH5Y4YEEVX5b+IM+vytJZ+5AnACKeJzonKz71EHCqydFI6oi+j/xGiaVUwfKWf7S3PD0sBaRt2B//y+xqE+18bQW9Usjxpa5226/NVw7tttVZWonUyew1HoU/BvnvdSocYTr8rECc0xkCceNJzAupduYfFl1fpsVG+BJlmebl+/LDzpeV8EpZGHqq888eDJ09573AKkOPv1NMj2l0/7FGefl9BHf8gOogfkw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0701MB1614; 5:qHBrS6CuYbpR8Tmxc7l3n50GOWjgSwYg1E6aLdLfQv78kpMalp+zFkIhKhTqIeXMeB/vk3lTpLImCWCMchcN9ydDtJsHF94+XVE4UHeE2WKlsuOGmJGwYUAm/vz5kJz/sYFEwq6NoH1K7DlSL9FclQ==; 24:yRgTQb5C0Ql9g8EKH7XCeedAyyWRY0QhSNlFclMc3zsrBdjT+SZfmNJg/SAEOQLXAXXfHfw6nvrNK4sJJME5QLL6MYZS7gQAPU4rK707m58= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2016 13:54:41.7423 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0701MB1614 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160209_055459_097224_864F05E7 X-CRM114-Status: GOOD ( 17.95 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a01:111:f400:fc10:0:0:0:669 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Leif Lindholm , Robert Richter , Mark Salter , Ganapatrao Kulkarni , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org From: Ard Biesheuvel The early FDT processing is responsible for enumerating the DT memory nodes and installing them as memblocks. This should only be done if we are not booting via EFI, but at this point, we don't know yet if that is the case or not. So move part of the EFI init to before the early FDT processing. This involves making some changes to the way EFI discovers the locations of the EFI system table and the memory map, since those values are retrieved from the FDT as well. Instead the of_scan infrastructure, it now uses libfdt directly to access the /chosen node. Signed-off-by: Ard Biesheuvel Message-Id: <1442881288-13962-5-git-send-email-ard.biesheuvel@linaro.org> [ rric: Ported to v4.5-rc1 ] Signed-off-by: Robert Richter --- arch/arm64/include/asm/efi.h | 2 ++ arch/arm64/kernel/setup.c | 3 ++ drivers/firmware/efi/arm-init.c | 34 ++++++++++++------- drivers/firmware/efi/efi-fdt.c | 72 ++++++++++++++++------------------------- include/linux/efi.h | 2 +- 5 files changed, 55 insertions(+), 58 deletions(-) -- 2.7.0.rc3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 8e88a696c9cb..acc7f65cef47 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -8,8 +8,10 @@ #ifdef CONFIG_EFI extern void efi_init(void); +extern void efi_parse_fdt(void *fdt); #else #define efi_init() +#define efi_parse_fdt(x) #endif int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 8119479147db..3f5723329173 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -181,6 +181,9 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) { void *dt_virt = fixmap_remap_fdt(dt_phys); + if (dt_virt) + efi_parse_fdt(dt_virt); + if (!dt_virt || !early_init_dt_scan(dt_virt)) { pr_crit("\n" "Error: invalid device tree blob at physical address %pa (virtual address 0x%p)\n" diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 9e15d571b53c..9fe04648d4d3 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -170,22 +170,35 @@ static __init void reserve_regions(void) if (efi_enabled(EFI_DBG)) pr_cont("\n"); } - - set_bit(EFI_MEMMAP, &efi.flags); } -void __init efi_init(void) +void __init efi_parse_fdt(void *fdt) { struct efi_fdt_params params; /* Grab UEFI information placed in FDT by stub */ - if (!efi_get_fdt_params(¶ms)) + if (!efi_get_fdt_params(fdt, ¶ms)) return; efi_system_table = params.system_table; memmap.phys_map = params.mmap; - memmap.map = early_memremap(params.mmap, params.mmap_size); + memmap.desc_size = params.desc_size; + memmap.desc_version = params.desc_ver; + memmap.nr_map = params.mmap_size / params.desc_size; + + set_bit(EFI_MEMMAP, &efi.flags); +} + +void __init efi_init(void) +{ + int mmap_size = memmap.nr_map * memmap.desc_size; + u64 phys_map = memmap.phys_map; + + if (!efi_enabled(EFI_MEMMAP)) + return; + + memmap.map = early_memremap(phys_map, mmap_size); if (memmap.map == NULL) { /* * If we are booting via UEFI, the UEFI memory map is the only @@ -194,16 +207,13 @@ void __init efi_init(void) */ panic("Unable to map EFI memory map.\n"); } - memmap.map_end = memmap.map + params.mmap_size; - memmap.desc_size = params.desc_size; - memmap.desc_version = params.desc_ver; + memmap.map_end = memmap.map + mmap_size; if (uefi_init() < 0) return; reserve_regions(); - early_memunmap(memmap.map, params.mmap_size); - memblock_mark_nomap(params.mmap & PAGE_MASK, - PAGE_ALIGN(params.mmap_size + - (params.mmap & ~PAGE_MASK))); + early_memunmap(memmap.map, mmap_size); + memblock_mark_nomap(phys_map & PAGE_MASK, + PAGE_ALIGN(mmap_size + (phys_map & ~PAGE_MASK))); } diff --git a/drivers/firmware/efi/efi-fdt.c b/drivers/firmware/efi/efi-fdt.c index 8f3ce66e2b02..e6622d3182ae 100644 --- a/drivers/firmware/efi/efi-fdt.c +++ b/drivers/firmware/efi/efi-fdt.c @@ -8,8 +8,7 @@ #include #include -#include -#include +#include #define UEFI_PARAM(name, prop, field) \ { \ @@ -32,60 +31,43 @@ static __initdata struct { UEFI_PARAM("MemMap Desc. Version", "linux,uefi-mmap-desc-ver", desc_ver) }; -struct param_info { - int found; - void *params; -}; - -static int __init fdt_find_uefi_params(unsigned long node, const char *uname, - int depth, void *data) +int __init efi_get_fdt_params(void *fdt, struct efi_fdt_params *params) { - struct param_info *info = data; const void *prop; - void *dest; - u64 val; - int i, len; + int node, i; + + pr_info("Getting EFI parameters from FDT:\n"); - if (depth != 1 || strcmp(uname, "chosen") != 0) - return 0; + node = fdt_path_offset(fdt, "/chosen"); + if (node < 0) { + pr_err("/chosen node not found!\n"); + return false; + } for (i = 0; i < ARRAY_SIZE(dt_params); i++) { - prop = of_get_flat_dt_prop(node, dt_params[i].propname, &len); - if (!prop) - return 0; - dest = info->params + dt_params[i].offset; - info->found++; + void *dest; + int len; + u64 val; - val = of_read_number(prop, len / sizeof(u32)); + prop = fdt_getprop(fdt, node, dt_params[i].propname, &len); + if (!prop || len != dt_params[i].size) + goto not_found; + dest = (void *)params + dt_params[i].offset; if (dt_params[i].size == sizeof(u32)) - *(u32 *)dest = val; + val = *(u32 *)dest = be32_to_cpup(prop); else - *(u64 *)dest = val; + val = *(u64 *)dest = be64_to_cpup(prop); - if (efi_enabled(EFI_DBG)) - pr_info(" %s: 0x%0*llx\n", dt_params[i].name, - dt_params[i].size * 2, val); + pr_info(" %s: 0x%0*llx\n", dt_params[i].name, + dt_params[i].size * 2, val); } - return 1; -} + return true; -int __init efi_get_fdt_params(struct efi_fdt_params *params) -{ - struct param_info info; - int ret; - - pr_info("Getting EFI parameters from FDT:\n"); - - info.found = 0; - info.params = params; - - ret = of_scan_flat_dt(fdt_find_uefi_params, &info); - if (!info.found) +not_found: + if (i == 0) pr_info("UEFI not found.\n"); - else if (!ret) - pr_err("Can't find '%s' in device tree!\n", - dt_params[info.found].name); - - return ret; + else + pr_err("Can't find '%s' in device tree!\n", dt_params[i].name); + return false; } diff --git a/include/linux/efi.h b/include/linux/efi.h index 569b5a866bb1..ede2c21c651b 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -915,7 +915,7 @@ extern void efi_initialize_iomem_resources(struct resource *code_resource, struct resource *data_resource, struct resource *bss_resource); extern void efi_get_time(struct timespec *now); extern void efi_reserve_boot_services(void); -extern int efi_get_fdt_params(struct efi_fdt_params *params); +extern int efi_get_fdt_params(void *fdt, struct efi_fdt_params *params); extern struct efi_memory_map memmap; extern struct kobject *efi_kobj;