From patchwork Mon Jan 14 17:01:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155563 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883530jaa; Mon, 14 Jan 2019 09:02:14 -0800 (PST) X-Google-Smtp-Source: ALg8bN7awHRNdY54ml3cuqjbAkGtbW+SwePdfoYxG3zhCWcqg9KNXO4V+bo3sduVjvnF4a34AkdO X-Received: by 2002:a17:902:e18c:: with SMTP id cd12mr24941707plb.279.1547485334066; Mon, 14 Jan 2019 09:02:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485334; cv=none; d=google.com; s=arc-20160816; b=s6wD5wv6y2V79/qHhJizRCaZOkta7gs6ZPS08e1dVKb2c0YAjio85j22QNyrXM9atW W6SJawHv3os4Fi+cU10rsQV/JxBcttdr/X+6hS+t2S582Z3rt0vlH4L7MCq/KFTBmtWL jNcOy8ge52wmaWAvAP5YQCmFS34Czq9uj136m9uDgeXKAKTF6TBOBLGy4EfSisEzV0UT csf4okOnrWFO2nVFrsRskw7FH6zsdiewYhVRhYHBqnPbozJWapMd6uevlDcZIECNJAs3 7sBHbPkhx6jKxncudP7ogKcwjsjMw+A3OYIQenDzHA516xmnLNaAtQOcH7KhBgZtufN6 vsHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=A0wO7zc0ecbth3/67ydmEZ872xlHcG6fBEObL6+grls=; b=inrot58O62jgBAZj7hJQ6LohNhnS9sV/CD23ro+uSau5rcA7iBc616ugS200U/tCdx j1+DZpwsZhBfRabC1EAsyN7MI+IXRbNB8lFZfatDJ26w5Ff+XmdPK7LZ6iF0MEKk0hdU Kt0evwTfqtG0Znyp46A61X6gxQBGseOjXEnnaYtYJ1LLjDh/p+bIoYmNwflgyXeCmJuA cXMTbVLPbgX6fW7TEZWWVnL04iNDxMW2gTN6lpO7AgyaHN2ul//1ygb3HYnNonnM41kg 3ENZdc5EjXHJ8EWoUjB9uBp7RRQf2rPqiCCa2frwGK7p5ZivNo1ft7slu8La3WimzS1W SDLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=c4G7UmTE; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id o1si731273pld.79.2019.01.14.09.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=c4G7UmTE; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 99801211B5A30; Mon, 14 Jan 2019 09:02:13 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8709E211B5A2A for ; Mon, 14 Jan 2019 09:02:11 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id p6so306274wmc.1 for ; Mon, 14 Jan 2019 09:02:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CAEbCSBYzLyiJ5uTwT94EvfFH9eK/WOOr2Yws8aC7jo=; b=c4G7UmTEbE9dxFT3a6+e2Pdw0UnKo/0jNV+uUVld3ZIq3wph/wGr0uUFbpbhqnCens vQEIPWriepW0lVjsr9qGxWXIeW1FcGUEJeUtRpe2zawQ3VntQv73Jln/P5VLPFW20xUN L2kmXRmZTFVIwiiWm8d3qHQ9Q2O7WEZogl3ng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CAEbCSBYzLyiJ5uTwT94EvfFH9eK/WOOr2Yws8aC7jo=; b=N9fs8W7bVdYpzV3MttGtl5/QG15NVmjv43jXmQiFxOvVuuuxyCmRZGhh1x2TUBLqFm VrdrN9fDl7K0Kvragw8hleYhoZPqGzgZ5FlkVPvltTrJSfoKTGw/wasZkPebnNH+GcQZ QvNIAHxxnK0Vz6Wx1Ffj0wnvWZLuWZc8WIpLqOVnIaUxvTWN4eKombAVKnU/Mua1TfZz 96QCrof4P7u5DyFDq9MftBkAmE4I6Rx1P0NUk3oqKN/oc6zBoub0TGpTuulNZa4YlVt5 8PapfcQpaarwQtULa0QbvYrbFOSVCGx1rCBFJLB2N09GyxF3EP0LjsI5osX0QFNQtu3Y /6AQ== X-Gm-Message-State: AJcUukf4ymSd6/wf6cMbDRqVgo7vaeJyCSnAlS4SzNBD/KIHbvlmgiXM fYc8Bp6NtCB0vBStz/K5jWG6fd5dX/GcDg== X-Received: by 2002:a1c:2856:: with SMTP id o83mr64169wmo.45.1547485329613; Mon, 14 Jan 2019 09:02:09 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:08 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:01:58 +0100 Message-Id: <20190114170205.9748-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 1/8] Silicon/SynQuacer/NetsecDxe: fix 32-bit build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Tweak the definition of pfdep_cpu_addr_t and add some intermediate UINTN casts so that the NETSEC driver builds cleanly in 32-bit mode. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c | 6 +++--- Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c index fa8ae79da28e..1bf1b3cb8f05 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c +++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.c @@ -103,9 +103,9 @@ Probe ( ogma_err = ogma_init ( (VOID *)(UINTN)LanDriver->Dev->Resources[0].AddrRangeMin, Handle, &Param, - (VOID *)dmac_hm_cmd_base, dmac_hm_cmd_size, - (VOID *)dmac_mh_cmd_base, dmac_mh_cmd_size, - (VOID *)core_cmd_base, core_cmd_size, + (VOID *)(UINTN)dmac_hm_cmd_base, dmac_hm_cmd_size, + (VOID *)(UINTN)dmac_mh_cmd_base, dmac_mh_cmd_size, + (VOID *)(UINTN)core_cmd_base, core_cmd_size, &LanDriver->Handle); if (ogma_err != OGMA_ERR_OK) { DEBUG ((DEBUG_ERROR, "NETSEC: ogma_init() failed with error code %d\n", diff --git a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h index d31a9c48bafc..95796b4cfe6a 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h +++ b/Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/netsec_for_uefi/pfdep.h @@ -71,7 +71,7 @@ typedef struct { typedef VOID *pfdep_dev_handle_t; typedef PACKET_HANDLE *pfdep_pkt_handle_t; typedef EFI_PHYSICAL_ADDRESS pfdep_phys_addr_t; -typedef UINT64 pfdep_cpu_addr_t; +typedef UINTN pfdep_cpu_addr_t; typedef int pfdep_hard_lock_t; typedef int pfdep_soft_lock_t; From patchwork Mon Jan 14 17:01:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155564 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883593jaa; Mon, 14 Jan 2019 09:02:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN47GV55TYJ5JpP1VTt9n/5hSJGOBHzt0i/oxyxPqhPEqrGfeNAVpXFnHJps/80JWkB/mH6S X-Received: by 2002:a62:3141:: with SMTP id x62mr26080489pfx.12.1547485337048; Mon, 14 Jan 2019 09:02:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485337; cv=none; d=google.com; s=arc-20160816; b=kDJv+EE2jR2qmARhKr+S2QQwm09a/sHL5pykcmsUZkMbpei7TPl6fVokh1uz8/Tkdd 1srtJZ+ufITnH4ZmxM3izC0nSMajM0Am3tIObwba4vETF3jNvlZVpPgQUXS7jSBfcbTF JrGausBZ551s/iLBJZg8rqgfxea9wB3pqu0MkJMCqUeLS7uUph1Ip2m1xK63dyiRj+iH MqJClQEiZe7pXNFavBmYXnnQIlbc1p3gyrMfE0IJVEwYMslrrASt/wFQh92SMR3HjHbw 4yNPJdygdiGJnhI8BPNCesPid+FF0H9rTw0lWWstudX84iMpjo/TngH/TIzM4bTCjmu1 MCWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=75uyGw3+FKcJrJjv2lKcDu4uu9dgTUkK7ov7edqvP1s=; b=nCy54mW81zMvTeRe2Yp6xphXfmoBQDVtkSWlwCi28Rg/t7Cb247KJWSsn8e/y5b4j7 yK34gat1i51TWRSTSjBkT3REs6V6CYM/ULhtHwBU/Uw+SDInOP8q+fjaHHV7m1q0UwbS 3MO2lgExE2X1hXFzNP8ETRlci5neqvKaChFd7w0a9zqVJGXYOkt7KBtMEQ1j6ibFkWbX 73PiOcSF9026irQGNq+nagivZZK5bK0Djkgwde69RIpZ7hUd0oY0yr9nUQ005dp7/63E XZku4CD9ZpTnLtXW8+HJJBw0hXDlO1x3SBvYmZ/GLJkf26rnvaAPMozzUvho7aTN17x8 GVPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Lk0ZOiRG; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id y10si677153plt.406.2019.01.14.09.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Lk0ZOiRG; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D00AA211B5A41; Mon, 14 Jan 2019 09:02:14 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 93D7A2194D3B3 for ; Mon, 14 Jan 2019 09:02:12 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id y139so287690wmc.5 for ; Mon, 14 Jan 2019 09:02:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7SM2wxRac9IwHNjKL6HG84LwJctrTDYYQdc+7nt90cY=; b=Lk0ZOiRG6im35nWVtn3tuqL6H11jCrC19qH77BsWE8dQfYu6qEcJdHvC7lH1RVosX8 yQdzlt35l4a3++VlHt+qKJSNci52jbk2WJxGkuvVMQCS87Y6YYOB82euV/1bzYOszdMb VJZb6NW5C8yvdJXPDb9LCl8Fyfvqx1BIiKMDQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7SM2wxRac9IwHNjKL6HG84LwJctrTDYYQdc+7nt90cY=; b=ftZY7kXOgniCzhwGYRnf6FCxiItHpN4P47FW5rioCxpthZ9ONzo69KdbPjtHj8WtKE raykAbAm7HW9pm+Cqr0IFZYnYRD3h7icVujKwZfnihMZAvvew1ttxMBet+VloLuOyN8o ZWGyYlvAqMX5W5dwLbdry8S3NTR45OQRvRfAdVyqu5ex3rMWQy41KphgRpWfSLbe0t7E j09Y6AoDr6XYhStpxra8rQfkjfK3O1DEDpEltjPk6lP2Hoc0H9V8oDb0aMNBFozJ63U8 JMJT/cI4C1vvjMsYO3SFilHjg0mkyGCfhVIyQqGYYTafwIUA/aCPDHg/VAi46rk2+aN5 iKDQ== X-Gm-Message-State: AJcUuke4U0mOfJ+eKHQYaL9iEv3kFRelDkmhfSmVaid1TKx2GJtELo1S cvkUAHWtvxXfYR2gWzDNBLpDrXtmPs2l/Q== X-Received: by 2002:a1c:c60e:: with SMTP id w14mr106765wmf.18.1547485330756; Mon, 14 Jan 2019 09:02:10 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:09 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:01:59 +0100 Message-Id: <20190114170205.9748-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 2/8] Silicon/SynQuacer/OpteeRngDxe: fix 32-bit build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Replace a UINT64 cast of a virtual address with a UINTN cast so that this driver can be built for 32-bit ARM as well. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c index 089fad8b5ce5..e55d87ea4299 100644 --- a/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c +++ b/Silicon/Socionext/SynQuacer/Drivers/OpteeRngDxe/OpteeRng.c @@ -159,7 +159,7 @@ GetRNG ( InvokeFunctionArg.Params[0].Attribute = OPTEE_MESSAGE_ATTRIBUTE_TYPE_MEMORY_INOUT; InvokeFunctionArg.Params[0].Union.Memory.BufferAddress = - (UINT64) OutPointer; + (UINTN) OutPointer; InvokeFunctionArg.Params[0].Union.Memory.Size = ValueLength; Status = OpteeInvokeFunction (&InvokeFunctionArg); From patchwork Mon Jan 14 17:02:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155565 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883667jaa; Mon, 14 Jan 2019 09:02:21 -0800 (PST) X-Google-Smtp-Source: ALg8bN6M+lyOlzwc3BM8Q2BCBO25mIK8yA6Qhk3xgItDNnQbU9JzV6iSKtUKd/aLGpG8qAV0oDp9 X-Received: by 2002:a63:2586:: with SMTP id l128mr24168592pgl.104.1547485341276; Mon, 14 Jan 2019 09:02:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485341; cv=none; d=google.com; s=arc-20160816; b=BdVWqLB1NLnmkIT9kupbZilLdndcYGQbEXIvqlp9tN3CE2FQMt0amiSrZbDFDCdm+I GXqEi1hlKPVsfhWoLJg9uRxJTSLeJ6XFsxbGGrNRx9snfDJ77Z6LjaaIfYR6moTLVha+ iL0EaFPqS1q6MvUsOrMKK0yoRS8c/UM84/2TAelr7TliT4KuHNic7TBM9WqjqXw1bv4r 0JkZT1tkkwuNXZAEq8pqRuZYsVSallYXKVAOvD+OJ44u6ZJ3yNXn6J34gSqcCZzYksvh d+IQ3D2NpPJXw2sfYgJt527BVxgAmGl7kLsrtJwjpFFu0ygCGtpnuuh6TwGVEEGJ0DIb 9/EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Fvt5LC5InpMpS0EbMKTWRZ5y9J4pcfb9DrX+qoT4t5U=; b=qFeswXv/7QxepFfwO8Do/Pt0bk8OLY0hdCNhvSSNJGx7k+69bQlTdCkI0D2q/dlR0S 6Y7V8AunCbG/+CVBV7owVOImLIYtba3SnFE++j14GR68jo5GKtFEHQWYUQID2h/8ekG3 Bgs/aRtrllpP+bZKi7d52Tunn4xHrx3VBSEg7IDLVmfhcecfbh8kyNtgqlVl2VAqF+3f 1hHaZ//INaqf2nqt22fFC4m9BFqI1kmQvTLLBp701IGwdf6x5lBo09fahZxxa5b8K9BM hZts1DF1VZF4vZU0fTKe3PqNepF2JLiOYjYMqwpPcBH7l/Qndi710g8/smVJ7WEB0ueZ gbAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bVo3Pczl; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id 127si726485pfg.173.2019.01.14.09.02.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=bVo3Pczl; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 111FA211B6C1D; Mon, 14 Jan 2019 09:02:15 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B1611211B5A34 for ; Mon, 14 Jan 2019 09:02:13 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id t27so23745020wra.6 for ; Mon, 14 Jan 2019 09:02:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m00ekdIu5hEbjbOrJ1OkviusdoFKBw0MjXgOowFPnwo=; b=bVo3PczlXKVKu9sMkeQ1BgcI36XEKGrsnc1lycS1bsv2BZN4oqFbB+UMQOmgMIJ1pG VaCom32J0w2xKXSJAKvQBCYZkvDa8aENkuC0veR/gf0ifYMFklC4UYcsiHFljBYvApUm USlkpBU6UpLRXBSoboRsOsr3HxZdCMXOt3KGs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m00ekdIu5hEbjbOrJ1OkviusdoFKBw0MjXgOowFPnwo=; b=q949MEhS932KO0H/G9mgH/MU7TKwHsGrhuwsLAKzTFw2Xc35xJZi+QfPpTX0WWTh2a bmsq0+shlDe/EVqDWl77Zc73d7bwPKJIz9ctdO6W2A5JARHOTo2z/iqoG3NKF7DHi5Hh GWMAPHeT4Ciz4LdNxqrPH/y4guy1NW2MH/CKIyvMfmLCkRN1SlQ/gzZKb0z9xWIM1PCy HJ40H2P4q92ZdYb1wT1lH+pPyAuX3jUe5veZTrnz01mZw07fkQ7OVZxwXOmUuyDCBgEb KCHv0Wn1qWCLtazMoF9o/r+twBuVnlCT9X3cVy7Gq6VONWP14FXJsNAsRde+IFanEXL7 XPCw== X-Gm-Message-State: AJcUukd/L7xuxiv/7opzWt0MLaKlhkx1rvTP0yc89OorWSjxUOakPVct DGRpherm6BIo47PvkVR0JGL+idT4vhddlA== X-Received: by 2002:a5d:4046:: with SMTP id w6mr26256461wrp.92.1547485331904; Mon, 14 Jan 2019 09:02:11 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:11 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:02:00 +0100 Message-Id: <20190114170205.9748-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 3/8] Silicon/SynQuacerPciHostBridgeLib: fix MMIO32-only configuration X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When running on 32-bit ARM, we cannot decode the MMIO64 region, and so we don't set the EFI_PCI_HOST_BRIDGE_MEM64_DECODE flag in this case. However, with that flag cleared, it is no longer permitted to include a definition for the placement of the MMIO64 region either, so remove those as well if MDE_CPU_ARM is set (which is the same condition under which EFI_PCI_HOST_BRIDGE_MEM64_DECODE is cleared) Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c index 7c096f0801dd..117cf6cfd81b 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPciHostBridgeLib/SynQuacerPciHostBridgeLib.c @@ -109,8 +109,12 @@ PCI_ROOT_BRIDGE mPciRootBridges[] = { { SYNQUACER_PCI_SEG0_MMIO32_MIN, SYNQUACER_PCI_SEG0_MMIO32_MAX, MAX_UINT64 - SYNQUACER_PCI_SEG0_MMIO32_XLATE + 1 }, // Mem +#ifndef MDE_CPU_ARM { SYNQUACER_PCI_SEG0_MMIO64_MIN, SYNQUACER_PCI_SEG0_MMIO64_MAX }, // MemAbove4G +#else + { MAX_UINT64, 0x0 }, // MemAbove4G +#endif { MAX_UINT64, 0x0 }, // PMem { MAX_UINT64, 0x0 }, // PMemAbove4G (EFI_DEVICE_PATH_PROTOCOL *)&mEfiPciRootBridgeDevicePath[0] @@ -130,8 +134,12 @@ PCI_ROOT_BRIDGE mPciRootBridges[] = { { SYNQUACER_PCI_SEG1_MMIO32_MIN, SYNQUACER_PCI_SEG1_MMIO32_MAX, MAX_UINT64 - SYNQUACER_PCI_SEG1_MMIO32_XLATE + 1 }, // Mem +#ifndef MDE_CPU_ARM { SYNQUACER_PCI_SEG1_MMIO64_MIN, SYNQUACER_PCI_SEG1_MMIO64_MAX }, // MemAbove4G +#else + { MAX_UINT64, 0x0 }, // MemAbove4G +#endif { MAX_UINT64, 0x0 }, // PMem { MAX_UINT64, 0x0 }, // PMemAbove4G (EFI_DEVICE_PATH_PROTOCOL *)&mEfiPciRootBridgeDevicePath[1] From patchwork Mon Jan 14 17:02:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155566 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883781jaa; Mon, 14 Jan 2019 09:02:26 -0800 (PST) X-Google-Smtp-Source: ALg8bN7Q2U9FX5Mdc7miOSnk0MhgbVOBEsPIOiu2Mg56SuMgTcxEQqUOeo84lFspTSOpjGpvM96f X-Received: by 2002:a63:4e41:: with SMTP id o1mr24223389pgl.282.1547485346729; Mon, 14 Jan 2019 09:02:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485346; cv=none; d=google.com; s=arc-20160816; b=oOJXYmKF6P6yl5ZTPnQ5xASpThiTOjaTWcRHpfA4Gy6JgzpeHe88R0y+RujPyokV9b 8mrygUSE7lEcEZStWbA7KsGSrBgqwaRGe0ivD69mPBntHOOdH7SRfNFwLoKHgkO/gSV0 QdINhW/FGwnsjwG0GriAxwStNrQEd/Ei3LqjJV9jyI4YCB1uGIMzhflh39NqEQYY9G4o kUAe6QcbhblunPN1OY2Y7eixRGtawBTb9wvUq5n1AVH/VrLm0cY98tJQsCB+q63Mmx4G o+Xu1IQ2JF+ARqA4ExxuD+qoZkp2lzcJmI0GUEes6bTc8cFbScJVsVsrE2TO8f8WBfjp 7s7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Brg4JkOiXDTCTq1HcVfrkxIdCXXh3NKXSjun5RELPhA=; b=O0QdX9fsEc6t5f3802nqQ2KyVaSiMHeQp5bQCWJW6gzNi8RoAd/hCX39Ms58CDRrJ8 SkfCUiIEq5LFI3vVlmwwfJXkr2N/fMYz7t7+i9J0Z9mggukIhHGLsEonNwD9bkap0AAZ F6AZBwt2keyrG6IRMWISOlk9T+1fJlRY6Th7NhqkLO0ns4BjimL/JWblT9UP4TFrOZJW jc0NIOsfF5lB9NqoPnohQkphkJqyZEn9HZ0OH6in1rYQkfEf7coJXKGtad9hslqKndpC 3EL56rQZ5p7jLiXe+xfIcYdHXolQFkpmcxcpLySIhBEjOla2oHuTy20i3oPQjY+E0L6t WMYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fnK2KzAD; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id y13si747562pgj.157.2019.01.14.09.02.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fnK2KzAD; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 60501211B736D; Mon, 14 Jan 2019 09:02:17 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 15F37211B6C33 for ; Mon, 14 Jan 2019 09:02:15 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id d15so304490wmb.3 for ; Mon, 14 Jan 2019 09:02:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XdQ5sklo+Qz80Ae4y52qxp7E/lOGURYTmKjPIcTjcjY=; b=fnK2KzAD8RO2pk1jyat0xNdFXoepJ6zaju8s5+evqdlEOoJg89O9Fc+1om6Ekryn0a 2RJAcfyMVSVWoXryTx5Zn+WtI+ExZHBFjrVEc51ynKT9WcdMgLe9vW/vaVUButSKHINN vhIqBBlinvpLSWpErFxULj1MZlqYH0QOSc/6I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XdQ5sklo+Qz80Ae4y52qxp7E/lOGURYTmKjPIcTjcjY=; b=ihtotBQYHzhwq7wt6DEZ5uk0Q5uQbHS4f33SnyIEjg8P8E77HziRfqOfLbzcapMYSU JDCvencAnUKa+36q1jdTy7V2mRSWf/mlCJrgk92gv95vkH2/SWL0x9PUe9q0XVjt4qeV pB8F8ILLT0VzEozlyv2/LKHHvEkuoIwS+Jxb33oD9SbZUJfmYSQVFgj3eJveusKTD5Uf tFWO4rlyZxzykM/3wztcqjNRjv3XZhqoB6cktq4YwRver4zK6GmugQ/DBzvi2uDumS4f 5A+rHQxZyodG8eXEzOred8HiGwvNyNU03XNbhOCGOrvq9DSvZKneii37SPE0Y2tIdshq dmgw== X-Gm-Message-State: AJcUukdZYqaGEKNzCZKZTrSYVatzFth/XjhVq6/znTkWkRAvmgGBPlA+ UspIg7BFWTd9RcR57J6R0ZSUOYoCYpwMtw== X-Received: by 2002:a1c:e18a:: with SMTP id y132mr97077wmg.48.1547485333205; Mon, 14 Jan 2019 09:02:13 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:12 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:02:01 +0100 Message-Id: <20190114170205.9748-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 4/8] Silicon/SynQuacerMemoryInitPeiLib: don't map memory above MAX_ALLOC_ADDRESS X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When encountering memory that is above the threshold of what we can map, don't add it to the virtual memory table. This table is only used by the early MMU code that creates the 1:1 mapping, and since it cannot be mapped in the first place, there is no point. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c index 1402ecafce4a..3955b6df84a0 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c @@ -156,17 +156,22 @@ DeclareDram ( DramDescriptor = *VirtualMemoryTable + ARRAY_SIZE (mVirtualMemoryTable); - for (Idx = 0; Idx < RegionCount; Idx++, DramDescriptor++) { + for (Idx = 0; Idx < RegionCount; Idx++) { Status = DramInfo->GetRegion (Idx, &Base, &Size); ASSERT_EFI_ERROR (Status); BuildResourceDescriptorHob (EFI_RESOURCE_SYSTEM_MEMORY, mDramResourceAttributes, Base, Size); + if (Base > MAX_ALLOC_ADDRESS - Size + 1) { + continue; + } + DramDescriptor->PhysicalBase = Base; DramDescriptor->VirtualBase = Base; - DramDescriptor->Length = Size; + DramDescriptor->Length = MIN (Size, MAX_ALLOC_ADDRESS - Base + 1); DramDescriptor->Attributes = ARM_MEMORY_REGION_ATTRIBUTE_WRITE_BACK; + DramDescriptor++; } DramDescriptor->PhysicalBase = 0; From patchwork Mon Jan 14 17:02:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155567 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883897jaa; Mon, 14 Jan 2019 09:02:32 -0800 (PST) X-Google-Smtp-Source: ALg8bN4ac0wDjh2dOTwckdlTxO5e5jh5S2kvupwrrOp+7rDj4e8Cx7bwIEuOlYq4YMutG/YmdXSm X-Received: by 2002:a17:902:9a04:: with SMTP id v4mr26745779plp.34.1547485352281; Mon, 14 Jan 2019 09:02:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485352; cv=none; d=google.com; s=arc-20160816; b=sqdStw9tZIaHvAky4WmmqE0qIX6pbCykiRAIEyd/sDJ6qPEPh9sGySu3DUYWkc9n4+ gKNlvTc/K+mIsYUDchZpq5Mlf4L/y5z/mka97dDkMN2Zd84rRmECCQWbz/DPOMJYhkcI i9ffk9PGn0R29mnebEpPSgdCWCcsYH+ZrC+8m/u27kI/F1tdWenpSVqS2oNYtfQyLheK bCp4arWBH+8JeIZku9X6b7SAgQ6PC1v+qVeNQeZD/IQU9DU2WViYOkOzBMNPUhIvpPy3 /wqbILLEKS0BoFMze/3Da7YhqQJZpCltC1Cj6yCQxz+iHnjD+4EV7UIUn6AhDZzJskYZ Mnfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=HBB/UvbQH4EUh42zsP0BicKb+GX80iiXMVHNMoGL9jA=; b=T+vSBI+5jkBZPBlHHpGCmYNewvKnkYueLs9/5zDYKl8FIylU9n7Prw9SrBZLCt/0L0 5suMmXZzj0R+BcN3iHHNZDdbPV+bd3FNwbEwj9r4fU3SGkNG974/HPV3Jq2C2ClSvukF Mz6VlTsYO8oNg5/dAT6llIgmCF3GWrlWFtrZYo2cESGzeioLdO4dREX72kJIrWjO85sN C5RWyk38iFOTLAUGqXzWhzmc6JKpTM+WqwcxXcaRjsSHyqmeY6XTXrZM+z/ejuVUzMaI Wm+4G68Cj9+/brDrOqoL+s3295t6UiHCDk7OU/7roQGFpu90/uInIBSpP7Xp6sz3c3zu ngCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CFdCWSX1; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id k5si710428pfi.176.2019.01.14.09.02.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CFdCWSX1; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 98060211B5A23; Mon, 14 Jan 2019 09:02:17 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3D532211B5A23 for ; Mon, 14 Jan 2019 09:02:16 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id y8so284903wmi.4 for ; Mon, 14 Jan 2019 09:02:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NIcCJ6CXaBAfFlxAnQHuGfOd7hyxoWV5HIol5HWwRK8=; b=CFdCWSX1N18APfc2vthPNW1OHXOSp24ao+EJtx/6Hp7wsN2di8lwqM7y1FqHrO4U7z Vpwt+oHx/morrmkft1XBwKUxIe96dDebQEVULwsuEifsoGIFPygtX72ucTuCBjULotqo Rc70q8aw/zBZ2NcDioL52nnjuI35rlM6hUjhA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NIcCJ6CXaBAfFlxAnQHuGfOd7hyxoWV5HIol5HWwRK8=; b=uRQ48bw3uXCT8XVhyAFxGb3thxgDVRhrTld/4DHnegIh8TnlSRz8t1F1rpYPjP/bN2 Az9fgTAftjiR0x1ZZqBATBKk8uSSXdHvtVHlzb0KoAJAdFfeYSngIOmHt09GXW4Q5xsa 0Wg+bP4YsXhNed3rv/d2ebbf6DOrIO7yqAwg0y9izX+wovVeBMRATRv+PCec/LadhhCJ ljtTq1AqVj6A2lPXgCbJbIXR/Hnxxzhivb2mMqlYHPtlAOxDXT4PZwBw8VQqtJPnin/Q YMPo0joaZLOtKGKZSahprrLqJIQqdpghPzkXlN0GAFNhZMN1OWOCrV2lBdWaMDSvUJI5 blMA== X-Gm-Message-State: AJcUukfN/m1+bPMg+ximqzQGXfY0oEI2JMDiTEfRdxHbnFpxNAH/Outr oV1CFgT15ZN/BRL/Nd5Xf4l6d9+vLZCJIA== X-Received: by 2002:a1c:8d12:: with SMTP id p18mr65912wmd.31.1547485334511; Mon, 14 Jan 2019 09:02:14 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:13 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:02:02 +0100 Message-Id: <20190114170205.9748-6-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 5/8] Silicon/SynQuacerMemoryInitPeiLib: fix 32-bit build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add a missing intermediate UINTN case to fix the 32-bit build. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c index 3955b6df84a0..19151b93d571 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerMemoryInitPeiLib/SynQuacerMemoryInitPeiLib.c @@ -201,7 +201,7 @@ CheckCapsule ( // Coalesce the capsule into unused memory. CreateState() below will copy // it to a properly allocated buffer. // - *CapsuleBuffer = (VOID *)PcdGet64 (PcdSystemMemoryBase); + *CapsuleBuffer = (VOID *)(UINTN)PcdGet64 (PcdSystemMemoryBase); *CapsuleBufferLength = UefiMemoryBase - PcdGet64 (PcdSystemMemoryBase); PeiServicesSetBootMode (BOOT_ON_FLASH_UPDATE); From patchwork Mon Jan 14 17:02:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155568 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3883969jaa; Mon, 14 Jan 2019 09:02:36 -0800 (PST) X-Google-Smtp-Source: ALg8bN4UZBBBXjITHCFvkQGdTF2sUySf7S+T3vSX14xU/OyE2HBdiPtGvlcLDSVXwKIyqCdfU1Sh X-Received: by 2002:a63:8043:: with SMTP id j64mr24193142pgd.405.1547485355984; Mon, 14 Jan 2019 09:02:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485355; cv=none; d=google.com; s=arc-20160816; b=LU/4WqA2EDwE37eV8t83KWZ8wvtP8qotZCIPjHja/IixErnYIVrmgwGXwudwBW8M88 k//YIpFA+5SxrowLg00bvchLLPJypBX4DDsSZGcMPhRNOjSvSQ48xMrLasq9B1oKTckV ev8fN1I254qlg959GdaF+qWZ/pYDOVRq2v1awe1A5dCMOau7yfsKO7Ismv5ArtuCnwpr XRXILQ4l6g8CCD6hrD9i14JB0X2P04zmx9TEC+e/EbSqVUTS1LwSaPJxZDdCc9lmXKrg aNbx3P6JSVlmE5CuOYxQPSCd+Xy/0Nbn2OFcYrELukyVvfLR2xxGye16DbNJkrWkp9Zh 7SGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=h/+8i2vjCSAIg/WGVry8TZ/9lTW+MLTGI+VzMMAWiF0=; b=NfPJ0Uw5CTyH8N92Y9mOGWFCJVXrXMLgy+CeujdE13BAPWRlxgRBqIdn89wg6vipkf KlrLUKwE+Mg7WHc1UuTtwkSV6Lxm1X576OEJ90MFOUZ8EfXIcJVqteuIPWgh8FZcmD1m Dvr5QH5YcjfOw+0dRGhkBBiZhzKpkPHxFgHoofG/UTkD9TZhqPLSXyWoj5mR/hu8inGn hQZFz+KnVQQCCoqWt9+cndoeog/TBwqoa/HOG+mQMnrH2ga4cRdny+WpjoVzNlF4bSGF jXgWaFOgKZdnzVt4dY0voYxsWxTQ/VOiLpbkZJNzeCuLKeUBqPBl19vr94metW9Z0zwi OCjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=isQ8AsAZ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id b12si748199pls.32.2019.01.14.09.02.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:35 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=isQ8AsAZ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id D67EE211B699C; Mon, 14 Jan 2019 09:02:18 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::443; helo=mail-wr1-x443.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 944D4211B7374 for ; Mon, 14 Jan 2019 09:02:17 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id 96so23772611wrb.2 for ; Mon, 14 Jan 2019 09:02:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nzmx2pfWtP9mJ1hDXsn8VHtXLJrZZWVh8ZVeglPLbfc=; b=isQ8AsAZLOg9OpN0jLwUwz7wibu8F4g81TTnAIr4Ps7ylQcHotiY424Vhh1l6pwbBT BbnaxxpppZ6uVw/XF8ST81jnAb7O6jcFRvPW60uKrKTh9djtb1awgRFN5zM+nfr4ad69 FGnydEr9no4JrJes/Nr5gXnByi5RBgkvDSlmk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nzmx2pfWtP9mJ1hDXsn8VHtXLJrZZWVh8ZVeglPLbfc=; b=A9jmj2LNp6zS6CRVNva/OR3Z+gt2diBHDwXAveISnucZGu9PgDsnL6LdKLnp+xsVVc XRb66cH7vceqDTSTpmq6+2YHjG2aioYCpgN73clVKkOwSZGxb0C74a2FgPyAq7X+i2HU 77jC7OemWrnhMIl5lKJ/WLSE3tTud/b5TMrz5kqXudLsp8GKL4b5suX4nuLVaxQ1MIWD FFB9DaVzCXBC0tGyw7ESWqT83oRVXpDHRjGEuytUm9ZbFjb1uzbCn8sbSTVfWaGRqXA4 FXp/EM4M58VLu/jmeG33LOUbdLeofByib9+stRwWhJv9gxreN4hz0Vj710AJiK3Q7EvK +9zw== X-Gm-Message-State: AJcUukfzex6QsJvcQ6+FIYmd5rCpHqmMVq8lRgGLqN09s0FytEIFjICH zQ8bKockqUMNE89WMIDquFOa3eh6HLQ0jg== X-Received: by 2002:adf:8544:: with SMTP id 62mr26365318wrh.1.1547485335799; Mon, 14 Jan 2019 09:02:15 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:14 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:02:03 +0100 Message-Id: <20190114170205.9748-7-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 6/8] Silicon/SynQuacer/Stage2Tables: fix 32-bit build X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The static stage2 page tables don't contain any code, but we are relying on the linker to resolve the references to the next level tables, so we can only use native word size quantities. So add a CPP macro to emit the same quantity in different ways. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S index af55f27bca47..28c7a6ac970f 100644 --- a/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S +++ b/Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.S @@ -32,6 +32,12 @@ #define TT_S2_L3_PAGE (0x1 << 1) #define TT_S2_VALID (0x1 << 0) +#ifdef __aarch64__ +#define QWORD(x) .quad (x) +#else +#define QWORD(x) .long (x), 0 +#endif + .altmacro .macro for, start, count, do, arg2, arg3, arg4 .if \count == 1 @@ -69,7 +75,7 @@ .section ".rodata", "a", %progbits /* level 1 */ s2_mem_entry 0 /* 0x0000_0000 - 0x3fff_ffff */ - .quad 1f + TT_S2_TABLE /* 0x4000_0000 - 0x7fff_ffff */ + QWORD (1f + TT_S2_TABLE) /* 0x4000_0000 - 0x7fff_ffff */ for 2, 246, s2_mem_entry /* 0x8000_0000 - 0x3d_ffff_ffff */ for 248, 8, s2_dev_entry /* PCIe MMIO64 */ for 256, 768, s2_mem_entry /* 0x40_0000_0000 - 0xff_ffff_ffff */ @@ -77,12 +83,12 @@ /* level 2 */ 1:for 0, 256, s2_mem_entry, 21, 0x40000000, 1 - .quad 2f + TT_S2_TABLE /* 0x6000_0000 -> RC #0 bus 0 */ + QWORD (2f + TT_S2_TABLE) /* 0x6000_0000 -> RC #0 bus 0 */ for 1, 15, s2_mem_entry, 21, 0x60000000 for 0, 48, s2_mem_entry, 21, 0x62000000, 1 for 0, 64, s2_dev_entry, 21, 0x68000000, 1 /* PCIe MMIO32 */ - .quad 3f + TT_S2_TABLE /* 0x7000_0000 -> RC #1 bus 0 */ + QWORD (3f + TT_S2_TABLE) /* 0x7000_0000 -> RC #1 bus 0 */ for 1, 15, s2_mem_entry, 21, 0x70000000 for 0, 48, s2_mem_entry, 21, 0x72000000, 1 for 0, 64, s2_dev_entry, 21, 0x78000000, 1 /* PCIe MMIO32 */ From patchwork Mon Jan 14 17:02:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155569 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3884059jaa; Mon, 14 Jan 2019 09:02:40 -0800 (PST) X-Google-Smtp-Source: ALg8bN6Wh04fFEEoa+eV1vMIwC22KBZgH5teAk15tRovGcr/1H4MCezNf+pyW6qGzQ8kRBt2KB4M X-Received: by 2002:a17:902:8f83:: with SMTP id z3mr25612987plo.328.1547485360209; Mon, 14 Jan 2019 09:02:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485360; cv=none; d=google.com; s=arc-20160816; b=C011Ll6TvMwT+fQsKqzI3otOtEXdjVeQ+7YQs9HVomXjzYAl/GQt+4YPC06Tszgl4t xpWDJpqgx1Dd6XvVJtGhNxMratRQ+OA4Rnd4x2O8AeiSK/WhzwGN0/CyvpuetPOdl++3 2fyLozY0inYMfUbbZs6Ynp1pdt56Iqs7ws2+gxlvFVmEWIMpv+CdHwbKi4JefZ6cBPrf k7d7oMJ8h6cKdOGNLje/Aq3rU08C4+u3gfhMOy81YvqSwmHxnUU6gqyX00WthsEmUKLT zmMnjS0I4PhVprqyuvROg4ehu+NHDm891LLKFVExmSI+4+7XOoA13VXGbPMXd2p0WtWv kUuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=v2fSurjQl0lpdRKmhG6WQq5oOwERNTCO2qt8NjBjY4c=; b=lbH6IDQacijnlMfvUOvqPH9QzizcPZKUIfHLHv9oiYBTDb/yEY4sKoXuHUyrK6kwBN tw4aD1EtsGXTcOK1L5PGUY1CD18Yt6eimqX9DSPnFMiqedVL1Eu1Eh7C0rcqrT6hsVaQ CeW9cfZ5QXRPlD/L+4A3pKyJzNgfJe7b8a7sKoWiXT7axQIzVGy1Vg3GgOXE/bcVW2KS BG8dUjv+mgiqKDUdAFMQsmzN5oIkWePL+2Dtj9cWr1o90DTXQG0DPGcafeHjY3LQP7E2 mAbzSO0ZDvyEpxRDuJyGBmVc61sVbfBNsti4bL1RBw9dujig2rSVpqct20BDzAY5i0LM iSFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XX92HmIJ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id c10si726942pgj.416.2019.01.14.09.02.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XX92HmIJ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1538B211B736C; Mon, 14 Jan 2019 09:02:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::442; helo=mail-wr1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BEF99211B5A2A for ; Mon, 14 Jan 2019 09:02:18 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id u4so23773981wrp.3 for ; Mon, 14 Jan 2019 09:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y7/JAV4dMdn1eJf2BEQwOYZMQEKkcwQf1drp+mBaQJo=; b=XX92HmIJsSd5KooHk9Z5vTuB+Xio2yTvNfg4z06IaTlcIeBW4b+z7ygao1IL/Gm7YI a//9tAVI5tj17myPwPY9LynuS6NZGWXGCxyKazuB6n2dONTHRJIdTrj5Tmp/2gBH2DkF NUj1E398eQntCyfyLlI9F/RmvIr7qYpPep7qw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y7/JAV4dMdn1eJf2BEQwOYZMQEKkcwQf1drp+mBaQJo=; b=MlLH0i5onxh6j7RB1KQMiykqYgzxE7aEFROOAe0MKZ0u1eXw+hPNQAPeSwBjav4kWC JCDEeGfYfpQJHmzGH9+/0SrW5PWLXJ7WfOFea0jbXrSeHeG0Bn6FQnKOFdolsuAMroii cIj4f1Y5W5zh3DIArs77AiaN58FYDsKfzVzjYqA3OUC9wAErZMUG/pVEA32uF4ptymKI jL4pE9I9Xtpo17CPIa/TbZNA7Humpjb+0gTJcM+X/s2EENyOEWozapHeKmarGBaJHHlT /0KzyYPNFiCsdhiGil1c0sLRGpS3j04EDhXR4JNJtvXK5rbnBMxky6P+csYA0dmtGGNh bm+w== X-Gm-Message-State: AJcUukdZH3e1FkQmJwaMtlIAqeVC2oy/TMloIga2Fh9sfg4Ktpl57RF7 Vh5doZGcRi4LLGZZjO9A2wLXJJ2oumpqpQ== X-Received: by 2002:a5d:6a42:: with SMTP id t2mr5897907wrw.50.1547485336986; Mon, 14 Jan 2019 09:02:16 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:16 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:02:04 +0100 Message-Id: <20190114170205.9748-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 7/8] Platform/Socionext/DeveloperBox: disable EbcDxe for ARM builds X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" EBC and 32-bit ARM are fundamentally incompatible, so only enable it on AArch64 builds. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 4 +++- Platform/Socionext/DeveloperBox/DeveloperBox.fdf | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index e6922fa3880b..beacd02adcc6 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -333,7 +333,6 @@ [Components.common] } MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf Silicon/Socionext/SynQuacer/Stage2Tables/Stage2Tables.inf MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf @@ -462,3 +461,6 @@ [Components.common] } Platform/Socionext/DeveloperBox/OsInstallerMenuDxe/OsInstallerMenuDxe.inf + +[Components.AARCH64] + MdeModulePkg/Universal/EbcDxe/EbcDxe.inf diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf index f52bec60b928..bc9ed30fb0d2 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf @@ -157,7 +157,9 @@ [FV.FvMain] INF MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf INF MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf +!if $(ARCH) == AARCH64 INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf +!endif INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF MdeModulePkg/Bus/Pci/PciSioSerialDxe/PciSioSerialDxe.inf From patchwork Mon Jan 14 17:02:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 155570 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3884140jaa; Mon, 14 Jan 2019 09:02:44 -0800 (PST) X-Google-Smtp-Source: ALg8bN66TWsYdT8fZgnFlQ5rB4mm0zpot/yRccEvL6Xmdv/sHCLyB5sDuUmH3TtQPDiioKg8MVnn X-Received: by 2002:a63:fb15:: with SMTP id o21mr23603669pgh.211.1547485364690; Mon, 14 Jan 2019 09:02:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547485364; cv=none; d=google.com; s=arc-20160816; b=QsJpxdEAF9gyz7rcbh/4SejJCTnYUo9y9Iv3BHZ2bxxJ3KtnOXizEL9LPSWCXcFePS TsnP2vgONSvmEn1Kxw99AtYKK4A0/CXrCkijpMxNLtg8VN2A63v8jnDJ21ufgOmSttL6 zOW5me3JuLa6zwZDvgaAjhy0rmquLZA1JpeOXBvMbwYxsv2zI2uHw5+RqwQf5TdYI4VI mdDieC/HIDb4Xzc16V4+N1ZW054PjkN+4GWxio8u8Ak+XGOtFVNAflg92msC+th2n4tt ctF0oREgFbd9vLYn1i5DD8gVpA9HLzvBqyzRCc1Pz1KHreZpIie5dJD156unCnU3iAKx hAdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Dmwzzq22gUwjt+JsG1+5cj262vRliJdGRWcI5+lqL9o=; b=EE+8hYBFTLbsmBsg/zU2S8ZMUaJE9GStDefkBsjUCADqx30uC3BGqD5YDaNcWPT9Jq 1XRciR3ZrprkBqTCzvTeiBkS8Pk19o9Y9UOQYXMQGVCMO7wkz0yPEhmen5gV4F5eUp7d rIIsgmA2PcZrN4x8QIJIsBU/y1foL6hfTXi5xer/u4YKkzDIZlpt/8C604mXoRzU+pG9 dKt+Pzt/hdRopS0nJNO4fzO62hRoGHMmzknpNEufAklxrzUmQe9vHLFVuukqSSOugBVF Y/suqfdG7iL9iOawR83KQIO4zj7+odWkl6MDxETkE0w116byOt9HHzVucac4iPnbu1Wy uP2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=inR3wHDA; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id o21si708257pgj.415.2019.01.14.09.02.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=inR3wHDA; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 43272211B737C; Mon, 14 Jan 2019 09:02:21 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::444; helo=mail-wr1-x444.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id EEF612119F075 for ; Mon, 14 Jan 2019 09:02:19 -0800 (PST) Received: by mail-wr1-x444.google.com with SMTP id l9so23700250wrt.13 for ; Mon, 14 Jan 2019 09:02:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RlbSkurKZ6KDSsWOihrWLg6Uhiu19T2Il7V4hx5Ttts=; b=inR3wHDASXl/laoPFSfQtrGPpBHqyqqPL/te38Y7hZqf1KElDG5PmKNo81yibPwAq2 oVTAPA+VvNSwn5Z+TWh4F0E2pI8llbtyh0ytvz++Ew0SpVhif+niBzn3og7are8y8F0V Kd1/UXeofR87GVIDsnc1ZNSl1B3W5dvGULibc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RlbSkurKZ6KDSsWOihrWLg6Uhiu19T2Il7V4hx5Ttts=; b=WjpziC1ZvH8O/w8s6veZGchxgvGbJJ9BEyeY65zsbJJHlXrvTGyMZ+wv4EY/ZArXOx b5VdhJhfIvnXNoXAy6msMNN9FDpiNMelqPwEeENUWphNCKmrldyFYEqyqq46dGT/r1YR d6aueI1EsXZOdAiiYtlgeYw7VPIQhJ8VDK7+FJtuEVczocK33peLOnbk8HPZ/8fqnm21 y2LHfTUiMlUi4arLz7wA5kAls+TcYGkmZSrhS9urIas+KtRImSMyhtP5gc6YG0Sq/xgm QU3ZDDoD4JgxvaNjbDPd2wbu/Jwjf7MzC7N8H2F4g5lal9SLcrSvazszkomDiqGQGzKg +kdA== X-Gm-Message-State: AJcUukfcYMOaWW0H0yhId+6GV4MOGWdA/f8At+RuZhDYfwo/IqYdiSNJ KOqiwJtXJWR5MkmyoDxJBXhZDt482I4z+w== X-Received: by 2002:adf:e149:: with SMTP id f9mr27262372wri.42.1547485338186; Mon, 14 Jan 2019 09:02:18 -0800 (PST) Received: from dogfood.home ([2a01:cb1d:112:6f00:2ced:5cd0:34f4:7bab]) by smtp.gmail.com with ESMTPSA id h184sm17224319wmf.0.2019.01.14.09.02.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 09:02:17 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Mon, 14 Jan 2019 18:02:05 +0100 Message-Id: <20190114170205.9748-9-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114170205.9748-1-ard.biesheuvel@linaro.org> References: <20190114170205.9748-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms 8/8] Platform/Socionext/DeveloperBox: add resolution for ArmSoftFloatLib X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" OpensslLib depends on ArmSoftFloatLib when built for 32-bit ARM, so add the required resolution for it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc index beacd02adcc6..e09c58d2dffa 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -40,6 +40,9 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] GCC:*_*_ARM_DLINK_FLAGS = -z common-page-size=0x1000 GCC:*_*_AARCH64_DLINK_FLAGS = -z common-page-size=0x10000 +[LibraryClasses.ARM] + ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf + [LibraryClasses.common.SEC] PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf