From patchwork Mon Oct 29 03:32:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149616 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3597915ljp; Sun, 28 Oct 2018 20:33:05 -0700 (PDT) X-Google-Smtp-Source: AJdET5dWmCOmQmVtaviHOhH40/XanyjChQubnidPwv7HqbCATPzNc4sH4lWx2xnIp11Jnh/xrVDH X-Received: by 2002:ac8:36f3:: with SMTP id b48-v6mr11750158qtc.49.1540783985199; Sun, 28 Oct 2018 20:33:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540783985; cv=none; d=google.com; s=arc-20160816; b=gsaLWVabMTBWS0hOYvc8jOUyRi2sLfj8ehAv3ont5sRaB6xbx55xPKrnei5FawSCJG Qnm9o0TjSijetdpmVLhZM2vftBH5e9vkJyD1MpPH3FyBBb4K04+DOLAhAnfADEgTD5pI 3rWWLW927JYlbbg3zcEq+nclCp1gGFi1q+TgAPLwlVv2SM8X8PP0YJ31XE/yuLAcnd7k GfYMIH7BQMcBHHHIracnG2CBTvab8MnzJ55boEGoirgzPfUjlZHw8V4M8ok2mtVo2Fd5 /McwuFbWJmjyZtncw4LI90Tjpw+GhTnwS55kKGB/gtcUEfesKuZZSUlgAKw8LzI7zzEv i9iQ== 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:cc :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=2ltdALx86oKOcpEmJsra6JmJwmo1A4VXdLIC0vnbUio=; b=UuA0BhnpDw2yvpY11uYcC/E1Pvgf2ZtxCMAHiVoElDosCFHU7kde36kjOg9IkzEr/2 ScmWYuhvsg8fiDJBZGyrakHPcDhFG3JE4PIL8jmw0Zju70tdIZCp17lV2nvIcn82i1gY qa4KwLymMP2ppW8i9LbyNgMiXW2/l0JhMuqJNMaAA3Xw55RQJeReK1DWAxcayi66FHIK NPeSahqJ2M5kV1k/8MtU/GZPT9yNTs2zllBLx7KrUDSRFtZ2GGCOTwvYAdhW6PgT0Lfr tn97JIFZ96VIK50PIu8b9kuXJMvNgDYyY4nw7un0/Ui/1E/XBbufHiEkhEXGDi/TqZhe 24MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="fc/jOcAy"; 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 z13-v6si8097245qta.58.2018.10.28.20.33.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:05 -0700 (PDT) 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="fc/jOcAy"; 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 7728A21184ABC; Sun, 28 Oct 2018 20:33:02 -0700 (PDT) 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=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (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 2092221167459 for ; Sun, 28 Oct 2018 20:33:01 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id m9-v6so483104pgl.13 for ; Sun, 28 Oct 2018 20:33:01 -0700 (PDT) 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=kT1MhhBv6fAhVJMZydRP+BPio3V9jf6HRxcjwCth24M=; b=fc/jOcAyjGGj0ObIAQCULO0+A1G7cGsrI9RoiD6WNEQ0riU+jilFCq3Za5YgMp8jd4 4jwGEALec49UH1iXvRZHIDYQU3jy8qM25bJMSmGDzlDtxw+KzwWqrKizjW9Go3FAUA63 zjI8ASRP34J6YMJ/CyhoxVVDVYfEIhjNktSto= 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=kT1MhhBv6fAhVJMZydRP+BPio3V9jf6HRxcjwCth24M=; b=dhcL5QTHUAAe1ZMeeiI+vMwqyV3Cn6zPxqyIr8PgQLjLuYhrllmblDm+vzhkKlu1W+ iwyx7/xBhCF31qLD9YuIqCBwUrZXfli34ONgVXRywh/LRzKvOXRbaS9ANiADKjOaYnvX 89N+jCEmmsQwoO5Lt5M7Av3WxHLq3FUWUEWRJlRWlOX+YzmbCNxc3phmbkn6/9MuDikq ugNDjHgcBzie1UP4dvE1DzszRM+13ByP3+V0N6jqcU2m/iueg7aYQT2CDIggXaywWFuj 9Azzi0wXGLUW9lv4B6v5AyAQpEF0lQH5aQL18Spja33xuA60uC39CmTfr4/WsdzYesFZ GfJA== X-Gm-Message-State: AGRZ1gJTfEWhGizk1LD97PwczjRXm5z4I53jvdpXWOK6zT3/aMSW3Brx BqQdBLtkuztqir4JMFy0YA3tKQ== X-Received: by 2002:a63:8948:: with SMTP id v69mr12301740pgd.39.1540783980724; Sun, 28 Oct 2018 20:33:00 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.32.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:00 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:38 +0800 Message-Id: <20181029033249.45363-2-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 01/12] Silicon/Hisilicon/D06: Add watchdog to GTDT 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add watchdog to GTDT for SBSA test 41,42. Change-Id: I175ba59f160e4965c26df62e195e423e4e421e8b Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h | 2 +- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc | 31 ++++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h index faaeb83781..eaf3ff10e3 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h @@ -22,6 +22,6 @@ #include -#define HI1620_WATCHDOG_COUNT 2 +#define HI1620_WATCHDOG_COUNT 1 #endif diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc index 45f5d20704..d07070a912 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc @@ -30,6 +30,16 @@ #define SYSTEM_TIMER_BASE_ADDRESS 0xFFFFFFFFFFFFFFFF #define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) +#define GENERIC_WATCHDOG_CONTROL_BASE_CPU1_TOTEM_A 0x9C200000 +#define GENERIC_WATCHDOG_REFRESH_BASE_CPU1_TOTEM_A 0X9C210000 + +#define EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(RefreshFramePhysicalAddress, \ + ControlFramePhysicalAddress, WatchdogTimerGSIV, WatchdogTimerFlags) \ + { \ + EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG, sizeof(EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), \ + EFI_ACPI_RESERVED_BYTE, RefreshFramePhysicalAddress, ControlFramePhysicalAddress, \ + WatchdogTimerGSIV, WatchdogTimerFlags \ + } #pragma pack (1) @@ -44,7 +54,7 @@ EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { { ARM_ACPI_HEADER( EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE, - EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE, + EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES, EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION ), SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress @@ -58,25 +68,14 @@ EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = { FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress -#ifdef notyet - PV660_WATCHDOG_COUNT, // UINT32 PlatformTimerCount + HI1620_WATCHDOG_COUNT, // UINT32 PlatformTimerCount sizeof (EFI_ACPI_6_2_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32 PlatfromTimerOffset }, { - { - EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG, sizeof(EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), - EFI_ACPI_RESERVED_BYTE, 0, 0, 0, 0 - }, - { - EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG, sizeof(EFI_ACPI_6_2_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), - EFI_ACPI_RESERVED_BYTE, 0, 0, 0, 0 - } - } -#else /* !notyet */ - 0, 0 + EFI_ACPI_6_2_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( + GENERIC_WATCHDOG_REFRESH_BASE_CPU1_TOTEM_A, GENERIC_WATCHDOG_CONTROL_BASE_CPU1_TOTEM_A, 88, 1) } -#endif - }; +}; // // Reference the table being generated to prevent the optimizer from removing the From patchwork Mon Oct 29 03:32:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149617 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3597995ljp; Sun, 28 Oct 2018 20:33:09 -0700 (PDT) X-Google-Smtp-Source: AJdET5eNdXAWwnWfQz1U7a5NImDvNAChg9OGPP1eKDSb4vhAzmRvTTSNt/Wtbsdq3Cn/8SBYMoSn X-Received: by 2002:a37:2b5b:: with SMTP id r88mr11286966qkh.336.1540783989124; Sun, 28 Oct 2018 20:33:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540783989; cv=none; d=google.com; s=arc-20160816; b=dWrbGhQVQZRUxWAERilKk3naJdyH5JTWyvZFVT+DtzyF9HSkL+0BROrtihhBrMyyFB wyXvh3SdykvkYoplPr44RXMzUJUNtkNvk6mxIxkbsohfRp14o7ARHOrqlbUnfEt8f/rz 1ylmjl3qOGk9kEDrDH8fY6Kt+fsrxmDRToJ6NYkxDMA2MgjJVZpdtzzWYAXraQeeUH6J lC9K101Zw7Es1/9rLLq6SXObsnXTvS4easeXeMT3/lQoL7xWkvbpB/JkVizAiOrl1NlT 2wmmKwfySwFTYJeliBF8tZv1nBP/wy2IKwrMdIGQyFL0b85KBc3mkSXhK9zR6j2OK3Si elWw== 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:cc :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=4ARhFBfKgel4SkQSG7T+nhAaSJ+1/mYMa2fIAwIMDgE=; b=pZ4UYi9+cMzTOprW/Bv6e90iUdY+OZpXTTZWhC4uWfACvfvreGRCV9c7o7wv4i4kJV rF7atUQAG8E0i8qlUbeAcTeaKHKYn2MqTF6/cq40f5mtu8couWMyhbhRN6Cn/JnEU96D gyJ+TTjxu7iyzKZq+kTCsp1qMJprSsFlZsMoywMBZGe5no2wqFh/usbBUYU6K+cgnakk CD5DtZGxjMNznSJf1GY/EMCBUwFfL5905tQBt+tqvuYXnEDJEvbURHn6e2f1gHCEr1PC hKUAmwY6i+5Gr9B34L6UwsW9k9MJ6ggXqP2Bb1un0VPTYVFKtbzcBjOBt0Sm0Fy/ZSec xcwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=doWasHVX; 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 e15-v6si2539737qta.181.2018.10.28.20.33.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:09 -0700 (PDT) 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=doWasHVX; 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 A77F021184AC0; Sun, 28 Oct 2018 20:33:06 -0700 (PDT) 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=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0: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 D452521167459 for ; Sun, 28 Oct 2018 20:33:04 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id c25-v6so3294942pfe.6 for ; Sun, 28 Oct 2018 20:33:04 -0700 (PDT) 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=ZtMXaGRaKcrmcVqpUAXeluq5p0UkQipkXV6C+LLwt84=; b=doWasHVXEpl5DFdbN8RyJNm4Q3Z0NXM2vM6IlnVbrEBl7qhf9XKHCyPHnXlHuDxEjN 1wQ15bgPS38x+MZCEjXKqEDhbVxEtqNpYHkXWxWL25FqRSg5GmW3bm8acsa8FUVL5/x2 ktUUCON3upR0gDrYMPnLebEOfWspgj8ulzz1Y= 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=ZtMXaGRaKcrmcVqpUAXeluq5p0UkQipkXV6C+LLwt84=; b=Wev203WVQoK9tqTMYCnPiu8j4nbxWw7edUDj401A5pE/gNxlL2D6z6iPfNsk+m5pA0 h5tQvAj/yEiW1q/OKe0LfCwIDYGc4eNaNqRc8c/POd4baDDGgzCHiAN5Uik+j0dvGIDt CSLt+V3NTFHf1SfZAedWi5o+i3BVKJJO/v/bPVxEklS8/0bAS7xJOHys7UqbTTaPMyF0 ztE1StHY5eJWyCtXMQMM9aYrHOh4Jp4hl1LGgXUBuoclf58AamdsjMt3QiqYWiP6MrXF nCY2JuwFiqjTE0JQqBPusAvSBG9KjNsKUhRHrzLz+fQDm3pKH/xmktwowXE0eekp1UKC zzwA== X-Gm-Message-State: AGRZ1gJswM/03oXnkyuhDHSRh+XDm+l/IrdRLrpFTAmhhG7mSvP4pMup iWtnnCoyVcoXyR08H4npgKP9Sw== X-Received: by 2002:a63:2d46:: with SMTP id t67mr9409735pgt.140.1540783984152; Sun, 28 Oct 2018 20:33:04 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:03 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:39 +0800 Message-Id: <20181029033249.45363-3-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 02/12] Silicon/Hisilicon/D06: Drop _CID for fwts issue 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" As Linux kernel as we only match with HID, We can remove MBIGEN and PL011 CID in ACPI ASL code. The fwts issue: method: \_SB_.COM0._CID returned a string 'PL011' but it was not a valid PNP ID or a valid ACPI ID. method: \_SB_.MB30._CID returned a string 'MBIGEN' but it was not a valid PNP ID or a valid ACPI ID. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl | 1 - Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl | 48 -------------------- 2 files changed, 49 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl index 377d171abb..7b7f102b1b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Com.asl @@ -20,7 +20,6 @@ Scope(_SB) { Device(COM0) { Name(_HID, "ARMH0011") - Name(_CID, "PL011") Name(_UID, Zero) Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0x94080000, 0x1000) diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl index 6adf5973a6..b98cb2a01c 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Mbig.asl @@ -18,7 +18,6 @@ Scope(_SB) Device(MB30) { Name(_HID, "HISI0152") Name(_UID, 0x30) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -48,7 +47,6 @@ Scope(_SB) Device(MB31) { Name(_HID, "HISI0152") Name(_UID, 0x31) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -78,7 +76,6 @@ Scope(_SB) Device(MB32) { Name(_HID, "HISI0152") Name(_UID, 0x32) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -108,7 +105,6 @@ Scope(_SB) Device(MB33) { Name(_HID, "HISI0152") Name(_UID, 0x33) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -138,7 +134,6 @@ Scope(_SB) Device(MB34) { Name(_HID, "HISI0152") Name(_UID, 0x34) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -168,7 +163,6 @@ Scope(_SB) Device(MB35) { Name(_HID, "HISI0152") Name(_UID, 0x35) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -198,7 +192,6 @@ Scope(_SB) Device(MB38) { Name(_HID, "HISI0152") Name(_UID, 0x38) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -228,7 +221,6 @@ Scope(_SB) Device(MB39) { Name(_HID, "HISI0152") Name(_UID, 0x39) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -258,7 +250,6 @@ Scope(_SB) Device(MB3A) { Name(_HID, "HISI0152") Name(_UID, 0x3A) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -288,7 +279,6 @@ Scope(_SB) Device(MB3B) { Name(_HID, "HISI0152") Name(_UID, 0x3B) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -318,7 +308,6 @@ Scope(_SB) Device(MB3C) { Name(_HID, "HISI0152") Name(_UID, 0x3C) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -348,7 +337,6 @@ Scope(_SB) Device(MB3D) { Name(_HID, "HISI0152") Name(_UID, 0x3D) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -378,7 +366,6 @@ Scope(_SB) Device(MB10) { Name(_HID, "HISI0152") Name(_UID, 0x10) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -408,7 +395,6 @@ Scope(_SB) Device(MB11) { Name(_HID, "HISI0152") Name(_UID, 0x11) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -438,7 +424,6 @@ Scope(_SB) Device(MB12) { Name(_HID, "HISI0152") Name(_UID, 0x12) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -468,7 +453,6 @@ Scope(_SB) Device(MB13) { Name(_HID, "HISI0152") Name(_UID, 0x13) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -499,7 +483,6 @@ Scope(_SB) Device(MB14) { Name(_HID, "HISI0152") Name(_UID, 0x14) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -529,7 +512,6 @@ Scope(_SB) Device(MB15) { Name(_HID, "HISI0152") Name(_UID, 0x15) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -559,7 +541,6 @@ Scope(_SB) Device(MB18) { Name(_HID, "HISI0152") Name(_UID, 0x18) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -589,7 +570,6 @@ Scope(_SB) Device(MB19) { Name(_HID, "HISI0152") Name(_UID, 0x19) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -619,7 +599,6 @@ Scope(_SB) Device(MB1A) { Name(_HID, "HISI0152") Name(_UID, 0x1A) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -649,7 +628,6 @@ Scope(_SB) Device(MB1B) { Name(_HID, "HISI0152") Name(_UID, 0x1B) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -679,7 +657,6 @@ Scope(_SB) Device(MB1C) { Name(_HID, "HISI0152") Name(_UID, 0x1C) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -709,7 +686,6 @@ Scope(_SB) Device(MB1D) { Name(_HID, "HISI0152") Name(_UID, 0x1D) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -739,7 +715,6 @@ Scope(_SB) Device(MB70) { Name(_HID, "HISI0152") Name(_UID, 0x70) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -769,7 +744,6 @@ Scope(_SB) Device(MB71) { Name(_HID, "HISI0152") Name(_UID, 0x71) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -799,7 +773,6 @@ Scope(_SB) Device(MB72) { Name(_HID, "HISI0152") Name(_UID, 0x72) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -829,7 +802,6 @@ Scope(_SB) Device(MB73) { Name(_HID, "HISI0152") Name(_UID, 0x73) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -860,7 +832,6 @@ Scope(_SB) Device(MB74) { Name(_HID, "HISI0152") Name(_UID, 0x74) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -890,7 +861,6 @@ Scope(_SB) Device(MB75) { Name(_HID, "HISI0152") Name(_UID, 0x75) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -920,7 +890,6 @@ Scope(_SB) Device(MB78) { Name(_HID, "HISI0152") Name(_UID, 0x78) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -950,7 +919,6 @@ Scope(_SB) Device(MB79) { Name(_HID, "HISI0152") Name(_UID, 0x79) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -980,7 +948,6 @@ Scope(_SB) Device(MB7A) { Name(_HID, "HISI0152") Name(_UID, 0x7A) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1010,7 +977,6 @@ Scope(_SB) Device(MB7B) { Name(_HID, "HISI0152") Name(_UID, 0x7B) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1040,7 +1006,6 @@ Scope(_SB) Device(MB7C) { Name(_HID, "HISI0152") Name(_UID, 0x7C) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1070,7 +1035,6 @@ Scope(_SB) Device(MB7D) { Name(_HID, "HISI0152") Name(_UID, 0x7D) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1100,7 +1064,6 @@ Scope(_SB) Device(MB50) { Name(_HID, "HISI0152") Name(_UID, 0x50) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1130,7 +1093,6 @@ Scope(_SB) Device(MB51) { Name(_HID, "HISI0152") Name(_UID, 0x51) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1160,7 +1122,6 @@ Scope(_SB) Device(MB52) { Name(_HID, "HISI0152") Name(_UID, 0x52) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1190,7 +1151,6 @@ Scope(_SB) Device(MB53) { Name(_HID, "HISI0152") Name(_UID, 0x53) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1221,7 +1181,6 @@ Scope(_SB) Device(MB54) { Name(_HID, "HISI0152") Name(_UID, 0x54) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1251,7 +1210,6 @@ Scope(_SB) Device(MB55) { Name(_HID, "HISI0152") Name(_UID, 0x55) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1281,7 +1239,6 @@ Scope(_SB) Device(MB58) { Name(_HID, "HISI0152") Name(_UID, 0x58) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1311,7 +1268,6 @@ Scope(_SB) Device(MB59) { Name(_HID, "HISI0152") Name(_UID, 0x59) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1341,7 +1297,6 @@ Scope(_SB) Device(MB5A) { Name(_HID, "HISI0152") Name(_UID, 0x5A) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1371,7 +1326,6 @@ Scope(_SB) Device(MB5B) { Name(_HID, "HISI0152") Name(_UID, 0x5B) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1401,7 +1355,6 @@ Scope(_SB) Device(MB5C) { Name(_HID, "HISI0152") Name(_UID, 0x5C) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, @@ -1431,7 +1384,6 @@ Scope(_SB) Device(MB5D) { Name(_HID, "HISI0152") Name(_UID, 0x5D) - Name(_CID, "MBIGen") Name(_CRS, ResourceTemplate() { QWordMemory ( ResourceConsumer, From patchwork Mon Oct 29 03:32:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149618 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598004ljp; Sun, 28 Oct 2018 20:33:09 -0700 (PDT) X-Google-Smtp-Source: AJdET5cxCtzXPonRr7Qu30tOJICPUKt4KCJEOYeGpy3ofe31HAv+sbYcDy+WxRKUHTGWbpwO5a8Y X-Received: by 2002:a63:f444:: with SMTP id p4mr12200979pgk.124.1540783989571; Sun, 28 Oct 2018 20:33:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540783989; cv=none; d=google.com; s=arc-20160816; b=IgMyIwFFfavvdgAvmMkP+9wymCDrukq9O3QuoQ9wmVdrYHJKsjrANpcfyGU4ABFQ5i Mf/uXJbEDW4B/Qtb0PALRpMCS6r2GShiUG1918eDsE+s9qCtGwpyu0TLIaPpPWjW/ygx E9q4NEafr6P7EZq24aGQDL8T3fDNFrf5ZHuFSOGtVdO+AAyEVi6lJORcp/9MY/ZqV2Fs ngkmcjkmzcVZHYShkVV9WCeYHTD1Zw5mkqiXkZO9OsbO1hKpIW55GwTGeTz3AGUtIjcf /C54FUUBfQGHny0FZKyX/pG2c3Cwl3t0LdZv5kJLv3v6NQ8m8/yjfR4Xq9nng0hzNfMw 40RQ== 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:cc :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=Au5xrZpgBR7Ei+DZDAeCtjB6aWlrq99lS3FX46ac4Gc=; b=V5ccZeVfOcZryAMbrP7FTdfhboKYzAzSPvhTKda2IWgmA6C/n+jLlsyl6dhD8pqWx8 swZDwe2cjyBXOfGBsaaV7OaFu4Bsk0cmsWGglZzlG1mNGwoevusBvco5HHuzn1q67pPe K0iF2v+p7leQBa55kNmRxWXirruz8YoUqnatv0UiXllAjhlKCGPaDJgoOEfOYf/a8DQq YfOp42lfBnnhLY/u6UVdeUZrKLWaNMAx/6edu09DjEB6GzHlflnAL521pNeB6A9J+DqF tHsC88Iw8//j+6ugPr9RpWHkOfLn0fDRicc8Zga3exeG5uG79BUSNoLYnPmxKu4A9FwQ PLOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dW1BVoxY; 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 t7-v6si17536041pgn.270.2018.10.28.20.33.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:09 -0700 (PDT) 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=dW1BVoxY; 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 D62DF21184AC3; Sun, 28 Oct 2018 20:33:08 -0700 (PDT) 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=2607:f8b0:4864:20::543; helo=mail-pg1-x543.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) (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 08FD22117FD5E for ; Sun, 28 Oct 2018 20:33:08 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id k1-v6so1773015pgq.1 for ; Sun, 28 Oct 2018 20:33:08 -0700 (PDT) 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=NYLFBQr5VPp6HqJF6QvjRSbDvGiNvCSs68sypfmu/MU=; b=dW1BVoxYz0vhU89sjj+1f90zyo19D97IUmj0hjayn3My/TD5f/xkeK72nUG5hgK4w2 HumwMLJY66KNErltpQAU77P8igQNC5QJmeVldPmSjz5yelNbmu2KCDAmymq5vH83kcj3 74ZDV8y7eo/19C44p/EQsauAJbxnL6/FBt9rc= 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=NYLFBQr5VPp6HqJF6QvjRSbDvGiNvCSs68sypfmu/MU=; b=STB7HZ+lQkPzNKw0osAXAyqwfjmVQWvJp6sdkh6z717S6afgmsk6RAHTnemC46g+zN i+mYqLrOrqv8JSeUln6R+c2L+m/2yERFzLBTMWOnfs38QXSgYngJ8UppL6ot/ulrZM39 hVf1fKhgMp5WcpkT6zGeS88vhAkbKcLWupQ6OWBT7ZDLg7X51Sua3pANGvXOvy8t3OEq tFK9AeBiUbuKECnHlRjPVE8uUwLD4ljhjO48l3n5Pz7LJ448PqF6hX28WYBsDoehEh7I 9vSetj4urufpU+6NNfyoJ7fZAOu+quR5fbsWW3OtDRU82/+zaMAVe2XAQlAclPOZqbie jLsg== X-Gm-Message-State: AGRZ1gLsFnZzqSLEWSXl3TelUm9rCb+Kl3s6IARyi6l5eMRn6OShLuQ8 niwK4JopvfVluFjHUeAYRNGqRw== X-Received: by 2002:a62:a0e:: with SMTP id s14-v6mr13414361pfi.153.1540783987549; Sun, 28 Oct 2018 20:33:07 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:06 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:40 +0800 Message-Id: <20181029033249.45363-4-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 03/12] Silicon/Hisilicon/D06: Fix fwts issue in Dbg2 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Modify name COM1 as the name COM1 is not a integrated name. The fwts issue: dbg2: DBG2 Device 'COM1' not found in ACPI object name space. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc index 342ec33629..05c284186b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Dbg2.aslc @@ -17,7 +17,7 @@ #define NUMBER_DEBUG_DEVICE_INFO 1 #define NUMBER_OF_GENERIC_ADDRESS 1 -#define NAMESPACE_STRING_SIZE 8 +#define NAMESPACE_STRING_SIZE 12 #define UART_LENGTH 0x1000 #pragma pack(1) @@ -74,7 +74,7 @@ EFI_ACPI_DEBUG_PORT_2_TABLE Dbg2 = { { UART_LENGTH }, - "COM1" + "\\_SB.COM0" } } }; From patchwork Mon Oct 29 03:32:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149619 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598037ljp; Sun, 28 Oct 2018 20:33:13 -0700 (PDT) X-Google-Smtp-Source: AJdET5chlZzr6TPKtTvDu6jsFJyNCSQEuyz66ULzURBMfPIxN5+etTnspxOjlqxfK1Z7iM23fV7g X-Received: by 2002:a63:e40e:: with SMTP id a14-v6mr12310388pgi.28.1540783992886; Sun, 28 Oct 2018 20:33:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540783992; cv=none; d=google.com; s=arc-20160816; b=q+aWa9Hh2zvGFHggu2MV1W483cyu6WUDyr1q92xcKRmqbzSw62s2T6Di8IBjdQmF1o ej9liNCZG430XdPRNASOTq3Owcv/Ik9qAHpGo+NozAnXyLpnCzPgODGN25MvS821bzm0 ZYyzBtHPnHXe2FwMDGc2Bqxi+zXw0WahinjiAFMlsCHAWlhayvDImCL7m7e5Bo+w0tTk SRcyxtTEpeoX/mr1/yJ7XlxmtsfVlc7JDAQ/QRuxHZ8EtZi1BpQ0SBXydAAT6lf1Zd0d 0Ie72uPc8gAa6D3N6TI3SdwyZdPI+zkEU3PCqg+6TOVH+3PU1TH6X/lz8lSisGB7DdIq ITSw== 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:cc :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=0w+UTmBFzoIGSuJkOfwDYihGtw7l0KxoHnbAmm9lwec=; b=TZVT4hmhyKFKUMky+gy5TYmWd1cMRJkXABlnxZl1rjAozCKVaYWX8FO1Hc9LJVO1QS 3AITbFPLSUcJr0ZAjADJhxxzOLbgycyMBDtOzQTNDoVe7ZmBHCmmgQL+IhdIpYPhNRO7 hjCbo+6+1516bMPnn0sJxp7bGo07vLIByqyruqiD6vOdOXm3N5MKDhx/0crG59htRCAI 9x+o4hHjngkhYOziMx8pWzi+2u7tNdfcxukb/s9Q7BgEEEooBr9EiGXbA/AqNAprKuNy ULDTVkPxAtdxkOx12LJmYKc272yf3xdbd0njgYB8prMbC2+ng8Q9Cy+nExhPKW5nrsHU ubNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="SF/+47Sd"; 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 d4-v6si18474175pgj.341.2018.10.28.20.33.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:12 -0700 (PDT) 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="SF/+47Sd"; 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 1189F21184AC6; Sun, 28 Oct 2018 20:33:12 -0700 (PDT) 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=2607:f8b0:4864:20::643; helo=mail-pl1-x643.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (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 4F57A21167459 for ; Sun, 28 Oct 2018 20:33:11 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id o19-v6so3096567pll.12 for ; Sun, 28 Oct 2018 20:33:11 -0700 (PDT) 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=gFRyGTd0Omvrc9Gal0+xuv4xhIYc7IXUqYlcqT58cHs=; b=SF/+47Sd7EJiIwoNXR/geqzktJHIQAi+JC7U2WyT8/4Yjd8CuarIq3UzAq4t2qeP5s 4teiBRqYOG3WC1xAF5NcIMP3DuE5GqZ76qRMCEn7adB1DlHobA2h5JHOu5Fu+vgdzx2z ZClmaSIZMuHPCAiZnklu/hMUKIz7+M/AHN7hs= 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=gFRyGTd0Omvrc9Gal0+xuv4xhIYc7IXUqYlcqT58cHs=; b=V6G3NrYxpx+tcoOwDRdB+5PF8iE3Ln7/nzG7TymeykG0l5bIy//9qKkoX3LcLeUi8d uvuKnsp4sH8g+CuHRrMbjGVghlH449GAply5cs4DcAI9ooI60Yp3c7iZ7Lzh5lc+VV3f OOWnbbwjobRJZz7RZmdhIEeGYoAwTA3kloKZOh7rIg2xKrpswp5IeETI5DuRK1bPzKIC 86Kflz+TnOc1TmlcIgq5gO2gGvvMQ4Mnh9PQqt1l4PGxr0jZfn19bNOa0I4WbTNQ+fyh lGopGWWvFJwoVOiO+pwXovbPAmPl/PRPHAYVBLohLlMrn9f2LnUhgqqLZPv7UtmGJVl1 Mwmg== X-Gm-Message-State: AGRZ1gJwdOllQlZfnP+7j0+nZ6fK1blmOuDChQ9bxzm/upL1/GqHqCQc knVQ0vps88J6wKzeHlc2wkANXw== X-Received: by 2002:a17:902:7c84:: with SMTP id y4-v6mr12337823pll.221.1540783990974; Sun, 28 Oct 2018 20:33:10 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:10 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:41 +0800 Message-Id: <20181029033249.45363-5-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 04/12] Silicon/Hisilicon/D06: Fix fwts issue in FADT 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Fwts issue: fadt_sbbr: FADT preferred PM profile is not recommended. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc index e7ee6981ec..2ec860ad09 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Fadt.aslc @@ -31,7 +31,7 @@ EFI_ACPI_6_2_FIXED_ACPI_DESCRIPTION_TABLE Fadt = { 0, // UINT32 FirmwareCtrl 0, // UINT32 Dsdt EFI_ACPI_RESERVED_BYTE, // UINT8 Reserved0 - EFI_ACPI_6_2_PM_PROFILE_UNSPECIFIED, // UINT8 PreferredPmProfile + EFI_ACPI_6_2_PM_PROFILE_ENTERPRISE_SERVER, // UINT8 PreferredPmProfile 0, // UINT16 SciInt 0, // UINT32 SmiCmd 0, // UINT8 AcpiEnable From patchwork Mon Oct 29 03:32:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149620 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598066ljp; Sun, 28 Oct 2018 20:33:16 -0700 (PDT) X-Google-Smtp-Source: AJdET5ceOBIUT1Gy2KkXcv+Z/GW1psY8xe15BmVFwdrOadDWyKubaDWz6vMhCRzrtMbqqn1BsMEf X-Received: by 2002:a63:e943:: with SMTP id q3-v6mr12186912pgj.42.1540783996632; Sun, 28 Oct 2018 20:33:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540783996; cv=none; d=google.com; s=arc-20160816; b=HmbkEm73W95a/nA7Lw04zIWUQX/zx7uyLnqz5c3pc0Svs8X7ogEspfzHd6L41dV1b3 BwnilnVeorongRvQDjH+a0Kv6sPZQppKUE02Ke25/Zg38/dy2fpykw2Vc/Tvplhbmvt+ b4xgGpLCbhzURE9JHdJjdVpG6OgocXcMkK0iRD60t35MW8+HpViPUuNCUec+mXVmFZhH jUuonRKfc58eWRTWS9RoXHFxsd5fWm7w3IQmVtsfI1AS56nYIY+jk8Rx/AdKtLBu1As1 8dTcmQrqBbT+wYj4qHJLIWjs1eYCXILnx2VRxlJYuBPI2SrdJxyxT5Ji6xa7hXEOpzE7 fshw== 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:cc :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=Fav8jC6Dop6uAnntrWJCo4cXCR5NbaVc3Tl/PlvTE6U=; b=ACLu5id5SUvWSksGew1dhfIa+rEI6MvGhwkvETmtk1w4t9U9CoUC2j4eeJO1EGQbVz h/b7SGy2x1Vc1fypXA7VLfVF2MznlB14LLsaQUz54cybNuipIntUyk2y+Mw8P3qyWJ3r pTjITQDQ6KIqggFDuT4oSnIu2gNDn6ho1QR+x//3t3C4uHxW6/a3PXxiAu7yC8QrGG/+ dMFfJhXqiHJdZWDQNY1W3jUpqYcSB2MBeafdEHFUg+wyoqZT3hPuHM6mx0NWoHGRI5yG mfzz4Wh0YBEOoeqM35jhuDw+R0x3MnzZ/Mqm826IKGpwnBMcV1vFoOqz0M62AUB8lbtd MUNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TZVBbMgi; 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 193-v6si20700145pgc.264.2018.10.28.20.33.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:16 -0700 (PDT) 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=TZVBbMgi; 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 45ABA21184AC8; Sun, 28 Oct 2018 20:33:16 -0700 (PDT) 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=2607:f8b0:4864:20::644; helo=mail-pl1-x644.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (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 D9C362194D387 for ; Sun, 28 Oct 2018 20:33:14 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id bb7-v6so3094974plb.13 for ; Sun, 28 Oct 2018 20:33:14 -0700 (PDT) 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=pI+iUcM+fJ+vW5CV9w1NihKulRq6BHb4MIBgXeU7Fj0=; b=TZVBbMgiNwB7tIwTGttVqCQTFvvx8rLW+PfCMk6T43JL/73hc+v1yk0czGeKs+3KeU QGnfrnq84TeKwmmcaVXEIcibQtqgs0y75NsDhmRCt5z7k1pDbKrJFSmzZbc441j+jf9S nFnM6FLq42GhPNc2SqFGlnjZvCYpRzZcrj5sU= 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=pI+iUcM+fJ+vW5CV9w1NihKulRq6BHb4MIBgXeU7Fj0=; b=hlZj0SYQstfe00BxAt0cFgdETnxeKJYVRHdQ/a+wEL5gULvqN1i6Ou2oZyw3mZ6onQ KScLySsL9yfLC8E0DI0HZpTiyb3HwX73B+zK9pOMqSUBwHJO5RdWHz4opzU91QrjoDz3 Grj7ZwtC0mPqKf0imAgIKX+0EaITqLPFzDLUiih2x2VfM3cZcLljWNpwVsvh5YmYOW+z /T5CtDKUFXeF+n1VWtH0ykTkpBVUdaXI8op0j2Db/wqvXW0AnMokyhmc50GZtJv2XcGn hfixWaBunBhsXrcqsKz8jwzHc7IMlLxYvNSZP65sCtJ1orAskuiEID4D2eXRnz6KgIAv U9sQ== X-Gm-Message-State: AGRZ1gKtY2+MLNn72aQS2Z6o3RbqWxOjroK0gjWD1gkPEDQSA3/kAlFp Aybt6yU8VuibO1cXg9Dn+yog3A== X-Received: by 2002:a17:902:e101:: with SMTP id cc1-v6mr12761696plb.165.1540783994358; Sun, 28 Oct 2018 20:33:14 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:13 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:42 +0800 Message-Id: <20181029033249.45363-6-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 05/12] Hisilicon/D06: Move some functions to OemMiscLib 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" As M41T83RealTimeClockLib is common library, so move two cpld relative functions to OemMiscLib and rename this two functions. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf | 1 - Silicon/Hisilicon/Include/Library/OemMiscLib.h | 9 ++ Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h | 4 - Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c | 82 ++++++++++++++++++ Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c | 90 ++------------------ 5 files changed, 98 insertions(+), 88 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf index e0bf6b3f24..4e963fd453 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf @@ -27,7 +27,6 @@ [Packages] EmbeddedPkg/EmbeddedPkg.dec MdePkg/MdePkg.dec - Platform/Hisilicon/D06/D06.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Include/Library/OemMiscLib.h b/Silicon/Hisilicon/Include/Library/OemMiscLib.h index 86ea6a1b3d..0d7bf71b17 100644 --- a/Silicon/Hisilicon/Include/Library/OemMiscLib.h +++ b/Silicon/Hisilicon/Include/Library/OemMiscLib.h @@ -53,4 +53,13 @@ BOOLEAN OemIsNeedDisableExpanderBuffer(VOID); extern EFI_STRING_ID gDimmToDevLocator[MAX_SOCKET][MAX_CHANNEL][MAX_DIMM]; EFI_HII_HANDLE EFIAPI OemGetPackages (); + +VOID +OemReleaseOwnershipOfRtc ( + VOID + ); +EFI_STATUS +OemSwitchRtcI2cChannelAndLock ( + VOID + ); #endif diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h index d985055d9b..f329108858 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h @@ -16,12 +16,8 @@ #ifndef __M41T83_REAL_TIME_CLOCK_H__ #define __M41T83_REAL_TIME_CLOCK_H__ -// The delay is need for cpld and I2C. This is a empirical value. MemoryFence is no need. -#define RTC_DELAY_30_MS 30000 // The delay is need for cpld and I2C. This is a empirical value. MemoryFence is no need. #define RTC_DELAY_1000_MACROSECOND 1000 -// The delay is need for cpld and I2C. This is a empirical value. MemoryFence is no need. -#define RTC_DELAY_2_MACROSECOND 2 #define M41T83_REGADDR_DOTSECONDS 0x00 #define M41T83_REGADDR_SECONDS 0x01 diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c index 2a9db46d1f..64d167d18a 100644 --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -27,6 +28,12 @@ #include #include #include +#include + +// The delay is need for cpld and I2C. This is a empirical value. MemoryFence is no need. +#define RTC_DELAY_30_MS 30000 +// The delay is need for cpld and I2C. This is a empirical value. MemoryFence is no need. +#define RTC_DELAY_2_MACROSECOND 2 REPORT_PCIEDIDVID2BMC PcieDeviceToReport[PCIEDEVICE_REPORT_MAX] = { {67,0,0,0}, @@ -207,3 +214,78 @@ OemIsNeedDisableExpanderBuffer ( { return TRUE; } + +EFI_STATUS +OemSwitchRtcI2cChannelAndLock ( + VOID + ) +{ + UINT8 Temp; + UINT8 Count; + + for (Count = 0; Count < 100; Count++) { + // To get the other side's state is idle first + Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + if ((Temp & BIT3) != 0) { + (VOID) MicroSecondDelay (RTC_DELAY_30_MS); + // Try 100 times, if BMC has not released the bus, return preemption failed + if (Count == 99) { + if (!EfiAtRuntime ()) { + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state 100 times fail!\n", + __FUNCTION__, __LINE__)); + } + return EFI_DEVICE_ERROR; + } + continue; + } + + // if BMC free the bus, can be set 1 preemption + Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + Temp = Temp | CPU_GET_I2C_CONTROL; + // CPU occupied RTC I2C State + WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); + (VOID) MicroSecondDelay (RTC_DELAY_2_MACROSECOND); + Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + // Is preempt success + if(CPU_GET_I2C_CONTROL == (Temp & CPU_GET_I2C_CONTROL)) { + break; + } + if (Count == 99) { + if (!EfiAtRuntime ()) { + DEBUG((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state fail !!! \n", + __FUNCTION__, __LINE__)); + } + return EFI_DEVICE_ERROR; + } + (VOID) MicroSecondDelay (RTC_DELAY_30_MS); + } + + //Polling BMC RTC I2C status + for (Count = 0; Count < 100; Count++) { + Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + if ((Temp & BIT3) == 0) { + return EFI_SUCCESS; + } + (VOID) MicroSecondDelay (RTC_DELAY_30_MS); + } + + //If the BMC occupies the RTC I2C Channel, write back the CPU side is idle + // or the subsequent BMC will not preempt + Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + Temp = Temp & (~CPU_GET_I2C_CONTROL); + WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); + + return EFI_NOT_READY; +} + +VOID +OemReleaseOwnershipOfRtc ( + VOID + ) +{ + UINT8 Temp; + + Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + Temp = Temp & ~CPU_GET_I2C_CONTROL; + WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); +} diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c index 0670f9c5f4..1f50ad4b64 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c @@ -17,10 +17,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include @@ -32,70 +32,6 @@ extern I2C_DEVICE gRtcDevice; STATIC EFI_LOCK mRtcLock; -EFI_STATUS -SwitchRtcI2cChannelAndLock ( - VOID - ) -{ - UINT8 Temp; - UINT8 Count; - - for (Count = 0; Count < 100; Count++) { - // To get the other side's state is idle first - Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - if ((Temp & BIT3) != 0) { - (VOID) MicroSecondDelay (RTC_DELAY_30_MS); - // Try 100 times, if BMC has not released the bus, return preemption failed - if (Count == 99) { - if (!EfiAtRuntime ()) { - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state 100 times fail!\n", - __FUNCTION__, __LINE__)); - } - return EFI_DEVICE_ERROR; - } - continue; - } - - // if BMC free the bus, can be set 1 preemption - Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - Temp = Temp | CPU_GET_I2C_CONTROL; - // CPU occupied RTC I2C State - WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); - (VOID) MicroSecondDelay (RTC_DELAY_2_MACROSECOND); - Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - // Is preempt success - if(CPU_GET_I2C_CONTROL == (Temp & CPU_GET_I2C_CONTROL)) { - break; - } - if (Count == 99) { - if (!EfiAtRuntime ()) { - DEBUG((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state fail !!! \n", - __FUNCTION__, __LINE__)); - } - return EFI_DEVICE_ERROR; - } - (VOID) MicroSecondDelay (RTC_DELAY_30_MS); - } - - //Polling BMC RTC I2C status - for (Count = 0; Count < 100; Count++) { - Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - if ((Temp & BIT3) == 0) { - return EFI_SUCCESS; - } - (VOID) MicroSecondDelay (RTC_DELAY_30_MS); - } - - //If the BMC occupies the RTC I2C Channel, write back the CPU side is idle - // or the subsequent BMC will not preempt - Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - Temp = Temp & (~CPU_GET_I2C_CONTROL); - WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); - - return EFI_NOT_READY; -} - - /** Read RTC content through its registers. @@ -142,18 +78,6 @@ RtcWrite ( return Status; } -VOID -ReleaseOwnershipOfRtc ( - VOID - ) -{ - UINT8 Temp; - - Temp = ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - Temp = Temp & ~CPU_GET_I2C_CONTROL; - WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); -} - EFI_STATUS InitializeM41T83 ( @@ -178,7 +102,7 @@ InitializeM41T83 ( return Status; } - Status = SwitchRtcI2cChannelAndLock (); + Status = OemSwitchRtcI2cChannelAndLock (); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "Get i2c preemption failed: %r\n", Status)); if (!EfiAtRuntime ()) { @@ -231,7 +155,7 @@ InitializeM41T83 ( Exit: // Release RTC Lock. - ReleaseOwnershipOfRtc (); + OemReleaseOwnershipOfRtc (); if (!EfiAtRuntime ()) { EfiReleaseLock (&mRtcLock); } @@ -274,7 +198,7 @@ LibSetTime ( return EFI_INVALID_PARAMETER; } - Status = SwitchRtcI2cChannelAndLock (); + Status = OemSwitchRtcI2cChannelAndLock (); if (EFI_ERROR (Status)) { return Status; } @@ -332,7 +256,7 @@ LibSetTime ( } Exit: - ReleaseOwnershipOfRtc (); + OemReleaseOwnershipOfRtc (); // Release RTC Lock. if (!EfiAtRuntime ()) { if (EFI_ERROR (Status)) { @@ -377,7 +301,7 @@ LibGetTime ( return EFI_INVALID_PARAMETER; } - Status = SwitchRtcI2cChannelAndLock (); + Status = OemSwitchRtcI2cChannelAndLock (); if (EFI_ERROR (Status)) { return Status; } @@ -422,7 +346,7 @@ LibGetTime ( } Exit: - ReleaseOwnershipOfRtc (); + OemReleaseOwnershipOfRtc (); // Release RTC Lock. if (!EfiAtRuntime ()) { if (EFI_ERROR (Status)) { From patchwork Mon Oct 29 03:32:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149621 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598119ljp; Sun, 28 Oct 2018 20:33:22 -0700 (PDT) X-Google-Smtp-Source: AJdET5eGXatXMFcipq79EITI7d5mUwCNLWTu5OMYd2g5HffSHzvSQGSmyh0k4q15jU+fFut9mCwp X-Received: by 2002:ae9:f50d:: with SMTP id o13mr8150005qkg.137.1540784002423; Sun, 28 Oct 2018 20:33:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784002; cv=none; d=google.com; s=arc-20160816; b=OaEyvbBY2VRiPgCNRPFxD1NJZPq2mdd4Wlz+ED+MV5+GEySR5n2ERtcQFVFwQMOpD2 R2wF1cD4mDsGwHGcbye1ZJgreNCO94TnzOLR+0TKAckN6ArCs3Ff2dWx/I6LObVt6SXv jal5OPaQYkEBPauULA4TOKvi1OrEmodDRehGMuaBONmpUg+WlqI5dO1p9hxZjh5R98ww CJXloJODDi/fWFMgAm6PdZeRKWxcLMQbj7f2zpWaRrGQW3CsFN549A9ok2QKC60Lm70b EK1Y9xJ3KnA+Yq/YnyBWS+8FddnvUaiCd7VGzThyWyxOUnnN8U8avKrSNSFyksQP90zN P6+g== 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:cc :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=1ibsHPaCtfSYPgqdA9UgseoQZcVyLO7ZV31ScUoxXdk=; b=epEuHYEG0FKy5b4SPSLuKg/pNKufgOofmR72qL7CXhH+FXepLzVCmYGtQ71rhxPDr7 XIs4NP2lm4s0kX30C3mmUruTIdoiIcbCWrg5+ol511smcuDrpaOIpvuHUhpP9uRd0lZd qRt5dqPmRgJYOIedLknYbp+Id7AO+/l4pwX1xJii29WLC63YJqPE1qgAJeegQjqsFN9S 4TH6cAmhWHci/oZH7alaEMgU6n1BJ9oWglFlmNSnNW6ZHi6MnhDBsX56pt18had9VG9F Aoi+NgynIr8JijZ9fdohxGvLFpog/6RbasUIRM1OwKRQPV5DQxcKmpBLu5VfYkJswb15 ENAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Fj5QupSf; 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 b7si4170185qvi.27.2018.10.28.20.33.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:22 -0700 (PDT) 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=Fj5QupSf; 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 A5B9521184ACB; Sun, 28 Oct 2018 20:33:19 -0700 (PDT) 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=2607:f8b0:4864:20::62a; helo=mail-pl1-x62a.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) (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 302112117FD5E for ; Sun, 28 Oct 2018 20:33:18 -0700 (PDT) Received: by mail-pl1-x62a.google.com with SMTP id f10-v6so3120670plr.1 for ; Sun, 28 Oct 2018 20:33:18 -0700 (PDT) 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=KoDFckvlfV4+802VaAqbzUWmCBz2s00v/bCGJdzyEPo=; b=Fj5QupSf/Dp8YEVJBvobhEbafAMIXDN4NT59m2VLHN/s0M0ZmY58Kw99KMLjLtREhW VLipPZSksFF32AYVZKsT6rlqSHfABr4Rtlho5yN8JISXPfJRwHfLVtTA5Q3ugw/M/tfK j/mR2JqdIiLQOBWzoWMiEcsa8qgz5vv6sjBMs= 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=KoDFckvlfV4+802VaAqbzUWmCBz2s00v/bCGJdzyEPo=; b=QEJRB3wGVTFzXA+1gaDhJO3dE/g0n2uL4bIwA0+35Dc0W3sxqCdcz+3b3xHxVLxvSj xqUVw1CVlrFyXqd7rUAiPRGoyl/J9QZ4i2b3uqjrdP4TB/LPOfMLvJ2D47dj75/zHPAM 6VZu2jiSz0P5ULJuVTyAZ5XL26sTtCosVJ9o2cyXQPoSsUUqXohPEpQ2Ck15kArfMZpd KYtabpS88c1C4H74af/2On1hMkgCdTqPDdVytrJweoir7jqsA0wllnAe77h/7SM6KhK5 6UhxE199FhZnOopwH2DoUuYCuahA/RDHhdIgSlMmSormUei211kTfp6u8eCNP3g/3eDt MyHA== X-Gm-Message-State: AGRZ1gKOOk3O0OWMGjlHQ2c54gSQXstZRbfBnE+uHmaM6X+AuYdwXHxu YRKam60dUOW5KlXcNnvr4c6oVGjXDOY= X-Received: by 2002:a17:902:7108:: with SMTP id a8-v6mr4396666pll.290.1540783997768; Sun, 28 Oct 2018 20:33:17 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:17 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:43 +0800 Message-Id: <20181029033249.45363-7-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 06/12] Silicon/Hisilicon: Modify for SBBR fwts SetTime_Func test case 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" There is no variable to keep timezone and daylight, so read it from the hardware first and create a new variable to keep it for the next gettime process. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf | 2 +- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h | 4 + Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c | 175 +++++++++++++++++++- 3 files changed, 179 insertions(+), 2 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf index 4e963fd453..8e559d7b70 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.inf @@ -42,4 +42,4 @@ UefiRuntimeLib # Use EFiAtRuntime to check stage [Depex] - gEfiCpuArchProtocolGuid + gEfiCpuArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h index f329108858..b95ebc654a 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h @@ -41,6 +41,10 @@ #define M41T83_REGADDR_ALARM2DATE 0x15 #define M41T83_REGADDR_ALARM2MONTH 0x14 +//UEFI SPEC 2.7,page 295 +#define TIME_ZONE_MIN -1440 +#define TIME_ZONE_MAX 1440 + typedef union { struct { UINT8 TD0:1; diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c index 1f50ad4b64..a2063aff76 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c @@ -32,6 +32,9 @@ extern I2C_DEVICE gRtcDevice; STATIC EFI_LOCK mRtcLock; +STATIC CONST CHAR16 mTimeZoneVariableName[] = L"M41T83RtcTimeZone"; +STATIC CONST CHAR16 mDaylightVariableName[] = L"M41T83RtcDaylight"; + /** Read RTC content through its registers. @@ -182,6 +185,7 @@ LibSetTime ( RTC_M41T83_TIME BcdTime; UINT16 CenturyBase = 2000; UINTN LineNum = 0; + UINTN EpochSeconds; if (NULL == Time) { return EFI_INVALID_PARAMETER; @@ -206,6 +210,21 @@ LibSetTime ( SetMem (&BcdTime, sizeof (RTC_M41T83_TIME), 0); + EpochSeconds = EfiTimeToEpoch (Time); + + // Adjust for the correct time zone, i.e. convert to UTC time zone + if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) { + EpochSeconds -= Time->TimeZone * SEC_PER_MIN; + } + + // Adjust for the correct period + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { + // Convert to un-adjusted time, i.e. fall back one hour + EpochSeconds -= SEC_PER_HOUR; + } + + EpochToEfiTime (EpochSeconds, Time); + // Acquire RTC Lock to make access to RTC atomic if (!EfiAtRuntime ()) { EfiAcquireLock (&mRtcLock); @@ -254,6 +273,43 @@ LibSetTime ( LineNum = __LINE__; goto Exit; } + // Save the current time zone information into non-volatile storage + Status = EfiSetVariable ( + (CHAR16 *)mTimeZoneVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, + sizeof (Time->TimeZone), + (VOID *)&(Time->TimeZone) + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "LibSetTime: can not save %s variable to non-volatile storage, Status = %r\n", + mTimeZoneVariableName, + Status + )); + LineNum = __LINE__; + goto Exit; + } + + // Save the current daylight information into non-volatile storage + Status = EfiSetVariable ( + (CHAR16 *)mDaylightVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, + sizeof (Time->Daylight), + (VOID *)&(Time->Daylight) + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "LibSetTime: can not to save %s variable to non-volatile storage, Status = %r\n", + mDaylightVariableName, + Status + )); + LineNum = __LINE__; + goto Exit; + } Exit: OemReleaseOwnershipOfRtc (); @@ -295,6 +351,10 @@ LibGetTime ( UINTN LineNum = 0; BOOLEAN IsTimeInvalid = FALSE; UINT8 TimeTemp[7] = {0}; + UINTN EpochSeconds; + INT16 TimeZone; + UINT8 Daylight; + UINTN Size; // Ensure Time is a valid pointer if (Time == NULL) { @@ -336,7 +396,6 @@ LibGetTime ( Time->Hour = BcdToDecimal8 (BcdTime.Hour.Bits.Hours); Time->Minute = BcdToDecimal8 (BcdTime.Minute.Bits.Minutes); Time->Second = BcdToDecimal8 (BcdTime.Second.Bits.Seconds); - Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; if (!IsTimeValid (Time)) { Status = EFI_DEVICE_ERROR; @@ -345,6 +404,120 @@ LibGetTime ( goto Exit; } + EpochSeconds = EfiTimeToEpoch (Time); + + Size = sizeof (TimeZone); + Status = EfiGetVariable ( + (CHAR16 *)mTimeZoneVariableName, + &gEfiCallerIdGuid, + NULL, + &Size, + (VOID *)&TimeZone + ); + + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "LibGetTime: can not get %s variable, Status = %r\n", + mTimeZoneVariableName, + Status + )); + if (Status != EFI_NOT_FOUND) { + LineNum = __LINE__; + goto Exit; + } + + // The time zone variable does not exist in non-volatile storage, so create it. + Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; + // Store it + Status = EfiSetVariable ( + (CHAR16 *)mTimeZoneVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, + Size, + (VOID *)&(Time->TimeZone) + ); + + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "LibGetTime: can not save %s variable to non-volatile storage, Status = %r\n", + mTimeZoneVariableName, + Status + )); + LineNum = __LINE__; + goto Exit; + } + } else { + // Got the time zone + Time->TimeZone = TimeZone; + + // Check TimeZone bounds: -1440 to 1440 or 2047 + if (((Time->TimeZone < TIME_ZONE_MIN) || (Time->TimeZone > TIME_ZONE_MAX)) + && (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE)) { + Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; + } + + // Adjust for the correct time zone + if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) { + EpochSeconds += Time->TimeZone * SEC_PER_MIN; + } + } + + // Get the current daylight information from non-volatile storage + Size = sizeof (Daylight); + Status = EfiGetVariable ( + (CHAR16 *)mDaylightVariableName, + &gEfiCallerIdGuid, + NULL, + &Size, + (VOID *)&Daylight + ); + + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "LibGetTime: Failed to get %s variable, Status = %r\n", + mDaylightVariableName, + Status + )); + if (Status != EFI_NOT_FOUND) { + goto Exit; + } + // The daylight variable does not exist in non-volatile storage, so create it. + Time->Daylight = 0; + // Store it + Status = EfiSetVariable ( + (CHAR16 *)mDaylightVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, + Size, + (VOID *)&(Time->Daylight) + ); + if (EFI_ERROR (Status)) { + DEBUG (( + DEBUG_ERROR, + "LibGetTime: can not save %s variable to non-volatile storage, Status = %r\n", + mDaylightVariableName, + Status + )); + LineNum = __LINE__; + goto Exit; + } + } else { + // Got the daylight information + Time->Daylight = Daylight; + + // Adjust for the correct period + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { + // Convert to adjusted time, i.e. spring forwards one hour + EpochSeconds += SEC_PER_HOUR; + } + } + + // Convert from internal 32-bit time to UEFI time + EpochToEfiTime (EpochSeconds, Time); + Exit: OemReleaseOwnershipOfRtc (); // Release RTC Lock. From patchwork Mon Oct 29 03:32:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149622 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598163ljp; Sun, 28 Oct 2018 20:33:26 -0700 (PDT) X-Google-Smtp-Source: AJdET5fSskveAa0i9YLEuENFojRKGhiNWTxQejQhgvY9XvPg/aPNbNRQ37Psqfv66o4QEniDf7lx X-Received: by 2002:ac8:474e:: with SMTP id k14mr2057131qtp.117.1540784006637; Sun, 28 Oct 2018 20:33:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784006; cv=none; d=google.com; s=arc-20160816; b=kPH/otPnp156Mdzx1RTukocRgGRp8We5Cc7B5OPXswwTRRfUVTvjnkUaW9MKyq0RZo 87wNuSHF+YfFWupn3xHVhvX9r5rfnNEnxKi60iDW2SOzx22Io4BR+91Siy6W3ASabg/X /Do6U4YfxMq1CHoLS9eGjSbHfLyu949UBCaI3VOmlKR/1uQt2hxAGrDCo6bCbTYTTBMp 0grOmyCs8vIXDZg7w3hJGXbqhKzO0X+6pN7YUytjkFkPHQCu+ws/D9CGUZ3OR6wHXZ8Z CF7l+YU5s/Ur0ECegPt6toCsD+YweW2BVOF95oalzb7fDNbVl50tUMT9khubctKQnRIH RHww== 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:cc :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=Ne9CM7PlDy06QUmaYv01n6+rMPziV9mHEllMBskoF0Q=; b=KIAO+HkamuERaIgTW2d0ZaZVr663mnSTNSsuQgq1gRSscYKntgm5vI2B2XWh6Hr30G +PYY1+70Nk7qLF0ZwNomRLs3Da1biUt3MjoSbdYbXq1ZXQQWW3dcK6ZNvKT5CLHh6eSz 1/4B401sLx3j9Fh2mvGodffmUygYCJwvSIN2518pC9m7oGSbIA9Jm/lpSZZM8ETHDPGI sbpzH+oChFccl3Fw3tu9NzgVEXalfnBhmhGH5RqKaadx4fPY3gccL7myVezj4qwRkYal HyVjy9XnenduCSMyCC+myyXjJzA11oINNA90auwjaTAe1b0QUshM8aYL7qyawCyeIpND QWFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=KtQBvHtW; 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 k63si1553148qkk.82.2018.10.28.20.33.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:26 -0700 (PDT) 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=KtQBvHtW; 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 D246121184ACE; Sun, 28 Oct 2018 20:33:22 -0700 (PDT) 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=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0: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 9168F21184ABA for ; Sun, 28 Oct 2018 20:33:21 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id b11-v6so3299585pfi.5 for ; Sun, 28 Oct 2018 20:33:21 -0700 (PDT) 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=nUMtG2nFzRNzku5cr6RzOih/+ZsRA/8b9rCBBkL/WTE=; b=KtQBvHtW86Em9QqFGTps4PQ+RFm50WP06jO9rGPEUEuEhrfWBzUvj+ESR7pkpU/GJb 507qv7sqF2s/OD7022kpshD9ES9a9LclCn0RnrTLH7K830Kmn9xOzzW34PtsjJG0NPPh bt6fKPVIHMhvSSv8SfPPtctYAfiDlP9x8QlqQ= 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=nUMtG2nFzRNzku5cr6RzOih/+ZsRA/8b9rCBBkL/WTE=; b=a0oXZY4x4UAmQLWn1sCUiHlqz6Un8hw/foECMcD+tWcjbBNtkE53PxwJAsAeyXU3RP 3l93qQTCv3f6UTIEAwbGyjSJS3DO7wbzjFis8eMKE+ZhPTJKWVqCLoPxJwelTzLiFMF9 pcPx6Xqdwht9HEew9ceUQoB/MjP8PDDLbPewjy9esdxUueqbar5AEpHaGdu9uc7EDt38 suRMRnMaGurbXDbql1BKkEsB4V/Wm+HB6Lc1CGXPvPzFhamyzgT07BRn6f6JGvMCjI27 /ync6UbQ0pQfLj1g6iPGi+bMSNRlWejyzYFmi5ZFg4LOwzc7glC5S3KmO9PMyf7E/+mX lVRA== X-Gm-Message-State: AGRZ1gJYAp4wPnyyzKlhdzE0MZ5K9oEZYja7tjS/YCO7EzFkaUXvj1eb Q435KAyB1ZP+mqDVwQ+dReD4YA== X-Received: by 2002:a62:670f:: with SMTP id b15-v6mr13393269pfc.243.1540784001173; Sun, 28 Oct 2018 20:33:21 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:20 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:44 +0800 Message-Id: <20181029033249.45363-8-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 07/12] Hisilicon/D0x: Fix secure boot bug in FlashFvbDxe 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When SECURE_BOOT_ENABLE is TRUE, FlashFvbDxe should use gEfiAuthenticatedVariableGuid, When SECURE_BOOT_ENABLE is FALSE, gEfiVariableGuid should be used. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/HisiPkg.dec | 1 + Platform/Hisilicon/D03/D03.dsc | 5 +++++ Platform/Hisilicon/D05/D05.dsc | 5 +++++ Platform/Hisilicon/D06/D06.dsc | 5 +++++ Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf | 2 ++ Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c | 14 ++++++++++++-- 6 files changed, 30 insertions(+), 2 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/HisiPkg.dec b/Silicon/Hisilicon/HisiPkg.dec index 404a3ae4af..8c197fa3c1 100644 --- a/Silicon/Hisilicon/HisiPkg.dec +++ b/Silicon/Hisilicon/HisiPkg.dec @@ -278,6 +278,7 @@ gHisiTokenSpaceGuid.Pcdsoctype|0|UINT32|0x00000061 gHisiTokenSpaceGuid.PcdSerDesFlowCtrlFlag|0|UINT32|0x40000056 + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE|BOOLEAN|0x50000013 [PcdsFeatureFlag] gHisiTokenSpaceGuid.PcdIsItsSupported|FALSE|BOOLEAN|0x00000065 diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index aa1da5d61f..ba3096672d 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -281,6 +281,11 @@ gHisiTokenSpaceGuid.PcdHb0Rb2IoSize|0xffff #64K gHisiTokenSpaceGuid.Pcdsoctype|0x1610 + !if $(SECURE_BOOT_ENABLE) == TRUE + gHisiTokenSpaceGuid.PcdIsSecureBoot|TRUE + !else + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE + !endif ################################################################################ # diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 1040466633..b8500cef87 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -422,6 +422,11 @@ gHisiTokenSpaceGuid.PcdHb1Rb7IoSize|0x10000 #64K gHisiTokenSpaceGuid.Pcdsoctype|0x1610 + !if $(SECURE_BOOT_ENABLE) == TRUE + gHisiTokenSpaceGuid.PcdIsSecureBoot|TRUE + !else + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE + !endif ################################################################################ # diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index 1a479c160e..b6ef9fedf0 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -243,6 +243,11 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdSrIovSupport|FALSE gArmTokenSpaceGuid.PcdPciIoTranslation|0x0 + !if $(SECURE_BOOT_ENABLE) == TRUE + gHisiTokenSpaceGuid.PcdIsSecureBoot|TRUE + !else + gHisiTokenSpaceGuid.PcdIsSecureBoot|FALSE + !endif ################################################################################ # diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf index f8be4741ef..934c86c79b 100644 --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.inf @@ -46,6 +46,7 @@ [Guids] gEfiSystemNvDataFvGuid gEfiVariableGuid + gEfiAuthenticatedVariableGuid [Protocols] gEfiBlockIoProtocolGuid @@ -62,6 +63,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gArmPlatformTokenSpaceGuid.PcdNorFlashCheckBlockLocked + gHisiTokenSpaceGuid.PcdIsSecureBoot gHisiTokenSpaceGuid.PcdSFCMEM0BaseAddress [Depex] diff --git a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c index e18cc9e06e..309941d6fe 100644 --- a/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c +++ b/Silicon/Hisilicon/Drivers/FlashFvbDxe/FlashFvbDxe.c @@ -189,7 +189,11 @@ InitializeFvAndVariableStoreHeaders ( // VARIABLE_STORE_HEADER // VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)Headers + (UINTN)FirmwareVolumeHeader->HeaderLength); - CopyGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid); + if (PcdGetBool (PcdIsSecureBoot)) { + CopyGuid (&VariableStoreHeader->Signature, &gEfiAuthenticatedVariableGuid); + } else { + CopyGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid); + } VariableStoreHeader->Size = PcdGet32(PcdFlashNvStorageVariableSize) - FirmwareVolumeHeader->HeaderLength; VariableStoreHeader->Format = VARIABLE_STORE_FORMATTED; VariableStoreHeader->State = VARIABLE_STORE_HEALTHY; @@ -220,6 +224,7 @@ ValidateFvHeader ( VARIABLE_STORE_HEADER* VariableStoreHeader; UINTN VariableStoreLength; UINTN FvLength; + EFI_GUID *Guid; FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER*)Instance->RegionBaseAddress; @@ -258,7 +263,12 @@ ValidateFvHeader ( VariableStoreHeader = (VARIABLE_STORE_HEADER*)((UINTN)FwVolHeader + (UINTN)FwVolHeader->HeaderLength); // Check the Variable Store Guid - if ( CompareGuid (&VariableStoreHeader->Signature, &gEfiVariableGuid) == FALSE ) + if (PcdGetBool (PcdIsSecureBoot)) { + Guid = &gEfiAuthenticatedVariableGuid; + } else { + Guid = &gEfiVariableGuid; + } + if (CompareGuid (&VariableStoreHeader->Signature, Guid) == FALSE) { DEBUG ((EFI_D_ERROR, "ValidateFvHeader: Variable Store Guid non-compatible\n")); return EFI_NOT_FOUND; From patchwork Mon Oct 29 03:32:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149623 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598207ljp; Sun, 28 Oct 2018 20:33:31 -0700 (PDT) X-Google-Smtp-Source: AJdET5fygOBhV+W6vEClwNeKttyBpbgGsCQdbc74+uEZHYV8lMawRFN7bySBlPxV6utDv0mWqNAp X-Received: by 2002:aed:3422:: with SMTP id w31-v6mr9556722qtd.100.1540784011058; Sun, 28 Oct 2018 20:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784011; cv=none; d=google.com; s=arc-20160816; b=Fk2jNz3zPk7WkcN8hYKufta41F6oMDI3ijnC3vYKqmS0All9pub3j1z1MNH2CqE9lT pVEN6UbeBKnM7Y8/aHXOuOOh667SHRMPPVvIHOTfpqxke3WsrlE56ysWyp7d4Ksaaymd 5BFlk1a9lext3EOorZ5J08uzat2vPNh2UnbYHBFbF6Msi+v090rOFkSUYkbzPvOCQa/0 +z5P/3gAuWv4xZMNGI2rfE+2JSZMNliV3A5ZncfeBmGVGlXUu+CirMyDfEgQbR3cRbkz Eripywb+hPyVPshaRotqxOHSfvd0DCv2yiqStN7ZGISeWyH/Zvk85r/AFDZr+xzzjJXF GO/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=bVeCY5dLnmangu3KIg+JNwGcHZy4VfAongwdh4z9bnQ=; b=oEJMYCutfmwEAmxZFm//36GFuKy3hd18MZyOoZadhzHcStOjFZruDTu4LqG8zzJtWa Jg2vQZxxs5z1TnVNzBBEKM/uonRUsYXxJf/0RhXPu3+QFbCGuu96Zrx+uWSTtPpRskWo 0npP/iwMLcId8fvjY6d10h2bhma++zkDwH/q4I2iqB/zqlUQy+ZF2qhgTu8Y5VZ/jGCS RC20ldxmuoV0kC9K9mPMrCPOGa2kUwhK88uPD4x5aqlcBLBFmEPlUm9lpw9MP0WeSQ3v DbIBpIX2i68cN44GfL+VTkwTVmJg1W+vUwh8q9l/P+Viz0zZ7SPiKou0RoNHQm8P5pQr NHdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TmbmU62C; 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 m27-v6si523706qtg.248.2018.10.28.20.33.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:31 -0700 (PDT) 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=TmbmU62C; 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 0EF1621184AD1; Sun, 28 Oct 2018 20:33:26 -0700 (PDT) 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=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (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 0DE0B2117FD5E for ; Sun, 28 Oct 2018 20:33:25 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id k1-v6so1773339pgq.1 for ; Sun, 28 Oct 2018 20:33:25 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=AA98JXO+OUawNe1u11YZYyXS/sTerPOVa9LJCsx6hEc=; b=TmbmU62C1RnNDMnC0cVnVgHYGh9VgtDfkTzYu37wrz2xGNtt3FpmF6yrl7bA/gaFxA cdUqG0pBll1qerI2kkn5DeIJhxps8kUo77ei48e8BqMgSq/q/NObotuxkX5PHnwwHbGm HGPsHuWHmZODvfh4UTEggYY7+QoQb+JmcRTII= 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:mime-version:content-transfer-encoding; bh=AA98JXO+OUawNe1u11YZYyXS/sTerPOVa9LJCsx6hEc=; b=GmDfVSCul4DOBbqUn8n9ag/KoZgmvRs7eHeHG3AOfVduXH11oj20tHcc++8XEFwkAc Wva9n0lMWrUleGXxeTbOz3Y4rR4JvI0waBkAQvpEFXkUGdPVNRIYUHVAikWPb0dEX8jg 5tX4ZWnQ7qCfabFRG2PHJQNy/ikuKPTNeyLzOO0IY+gBHw4WlUz88TFUJR7v4MT9lwYb WjqeB5RGFxG/zWOfbb9bjb8y9qtfLIyC5nfvd6BJQgFqRzQa1/iRmR8MBVUvUX9oiRib L3cpXOFUDDcb+7+VBMYfGcewZJ8VFq68lDSWSEsyPFORTJ53sZSJBxSLy7sjjRD3qjg8 +YFQ== X-Gm-Message-State: AGRZ1gKJVqSXgfhFGbudrFsM62aF8Y8dtZ9CbFdUs9BERW4zWE5HtUsA D0P42LOBiq2mO4omXkPX7W8hfg== X-Received: by 2002:a62:cd47:: with SMTP id o68-v6mr13428875pfg.12.1540784004617; Sun, 28 Oct 2018 20:33:24 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:23 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:45 +0800 Message-Id: <20181029033249.45363-9-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-platforms v1 08/12] Hisilicon/D06: Fix SBBR-SCT AuthVar issue 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Enable secure boot to fix AuthVar issue: RT.SetVariable - Set Invalid Time Base Auth Variable – FAILURE; RT.SetVariable - Create one Time Base Auth Variable, the expect return status should be EFI_SUCCESS – FAILURE. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hisilicon.dsc.inc | 16 ++++++++++++++++ Platform/Hisilicon/D06/D06.dsc | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Silicon/Hisilicon/Hisilicon.dsc.inc b/Silicon/Hisilicon/Hisilicon.dsc.inc index 3ac8e20232..6515c0d703 100644 --- a/Silicon/Hisilicon/Hisilicon.dsc.inc +++ b/Silicon/Hisilicon/Hisilicon.dsc.inc @@ -89,8 +89,15 @@ SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf +!if $(SECURE_BOOT_ENABLE) == TRUE + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf + AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree + PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf +!else TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf +!endif # BDS Libraries FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf @@ -217,6 +224,9 @@ !if $(TARGET) != RELEASE DebugLib|MdePkg/Library/DxeRuntimeDebugLibSerialPort/DxeRuntimeDebugLibSerialPort.inf !endif +!if $(SECURE_BOOT_ENABLE) == TRUE + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +!endif [LibraryClasses.AARCH64] ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf @@ -326,6 +336,12 @@ gEmbeddedTokenSpaceGuid.PcdTimerPeriod|10000 gArmTokenSpaceGuid.PcdVFPEnabled|1 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|32 +!if $(SECURE_BOOT_ENABLE) == TRUE + # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot + gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04 + gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x04 + gEfiSecurityPkgTokenSpaceGuid.PcdRemovableMediaImageVerificationPolicy|0x04 +!endif [PcdsDynamicHii.common.DEFAULT] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 # Variable: L"Timeout" diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index b6ef9fedf0..8ee20342b1 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -30,7 +30,7 @@ FLASH_DEFINITION = Platform/Hisilicon/$(PLATFORM_NAME)/$(PLATFORM_NAME).fdf DEFINE NETWORK_IP6_ENABLE = FALSE DEFINE HTTP_BOOT_ENABLE = FALSE - DEFINE SECURE_BOOT_ENABLE = FALSE + DEFINE SECURE_BOOT_ENABLE = TRUE !include Silicon/Hisilicon/Hisilicon.dsc.inc From patchwork Mon Oct 29 03:32:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149624 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598235ljp; Sun, 28 Oct 2018 20:33:33 -0700 (PDT) X-Google-Smtp-Source: AJdET5entz7wE9ifjkRzdVSASvCTsr9YDTofcXnzsSi9QxqQ7llMUfAX1KeEA+Ok9442UN6wPc/E X-Received: by 2002:a63:e841:: with SMTP id a1-v6mr12140629pgk.4.1540784013664; Sun, 28 Oct 2018 20:33:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784013; cv=none; d=google.com; s=arc-20160816; b=wfhJcPNywVAWFfm0/EmIH+Bp+g5ZS3TRAYeANtO6yNMSSY16B77g2+C0JSi55yIj47 ufUC8+wRFlDk8uwjKwoGDKJ6SIgSuJ+I7w1OQWNRjB4eaKxNE3f6GSyEBahLrlGpi0gs 9S3mDa7LS1+j4Cj1+rcf+p/Y2hwP3W3qXOeugoDPOfCAEYY0LCrN7/yFWXoy1DErUzmK k/bSSAeXA2JVTrzxmxX1quSSql0qc11oL3fZSxCp2G4bjhb0AvpTErGVOC3B09Qfuh+K 4yEFYBzU3mhp/lRWd2/I9fRnfW3PUsoH3EaGz+D2mmvW2RQmmthfT1a98GzGykx+nwCG fZsw== 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:cc :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=gdi0V6R2i0QBysYRnnfSOM3VupoCb5JKpr/K15JxWVA=; b=qO3wat4TU4KzCDeIn6AAlKWgvbThOeXZLtu5p0T24866nl/b+cSVsZ3xn+fs+pb+q5 3Dncxz4Md5Lvx437GeJNFrBsa0Dcrp1nlp6cbcoI9sFwecbr+F65CIicWosnnk2yQSzU 0is24Zmvy3rOI74XJfxmokhcDoqmZzPe/p4cRJm3+1gKP46NL12kqV4jboDu81vwDtR2 i1sEm6VShhL+REEuAHfpKGO1LugvJOMAGpgPgEyJxTThsWVgZwPRHeHlNTPhu5zRRrSf DsFBdY56GsIFXdGAR+jfcm8vyMy0apeayDi6f96Uet7WD4whAn2FGgtd8szENuDLMgfU OHDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=h9gmtxJ9; 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 y6-v6si18325267plt.112.2018.10.28.20.33.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:33 -0700 (PDT) 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=h9gmtxJ9; 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 3EB3E21184AD5; Sun, 28 Oct 2018 20:33:29 -0700 (PDT) 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=2607:f8b0:4864:20::443; helo=mail-pf1-x443.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0: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 4B9AF2117FD5E for ; Sun, 28 Oct 2018 20:33:28 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id g21-v6so3294381pfi.7 for ; Sun, 28 Oct 2018 20:33:28 -0700 (PDT) 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=0/sBlHL1BdXeXKmvIyQ6GVQzOxIkNMswgRtDTqLfZ7o=; b=h9gmtxJ9ucT+S24vk4QcvTu89ZVPNJb8v+9lMfaKdtBFYBJ0oQUFsDcZ+c2wZXSyTc 2cBqB0ULHb518cUXGp/MoGqfLqWW1KqGfci5h3Gg/lWTcidLb6fgMiTrW0rz0NbBERZX hTR6+w3hd3fL7wTtJsF3wP2fFKhQDXNQT0TKA= 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=0/sBlHL1BdXeXKmvIyQ6GVQzOxIkNMswgRtDTqLfZ7o=; b=DhAB/oBiq0ktbGSto33jprCHVw9dwCM9MbiPKnyH5okio4+dIrVwhTxU3F1rMNNaO9 hLJYmpmQ8U66e3OEBFegiEksqQWyHgaeYjpYDHZxUBcUMK8Xi8zMwhvvbaVv0Ir3yzlq aPkppPGEpQqUzI9IH3Yo8HhN6B7YB9zPwezK21Sryb4E3j0cDR3NY20BWUQ3udOdCF5V Zun2vdyNSyN4pRhSBsdY15bV0vXnqdmUjjBEhBtlBOYyH6YsZHgO3L8URlfnffNWLLbi XyU7RIunmioB1pmIqJFaAD10UWfjlFOXwqYMiABiPfsAbu8bSrjSLbAqtIQFa0u3+/Wx 0VLg== X-Gm-Message-State: AGRZ1gKwk/gwOKa225NC/kCdKWwb+c3JgPlzVQoxcKoxr42JkED2nbJW W2zhNJ+w0J28pwBSUOtrXTyJFw== X-Received: by 2002:a62:7d10:: with SMTP id y16-v6mr8162548pfc.245.1540784007999; Sun, 28 Oct 2018 20:33:27 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:27 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:46 +0800 Message-Id: <20181029033249.45363-10-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 09/12] Silicon/Hisilicon/D06: Reserve ECAM resource in DSDT 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Reserve ECAM resource in DSDT for clearing off bug output in kernel dmesg: acpi PNP0A08:00: [Firmware Bug]: ECAM area [mem 0xd0000000-0xd3ffffff] not reserved in ACPI namespace. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 8 ++++++++ 1 file changed, 8 insertions(+) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl index 8e3547926a..87a2da8843 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl @@ -1213,4 +1213,12 @@ Device (PCIB) Return(0x03) } } + +Device (RESP) //reserve for ecam resource + { + Name (_HID, "PNP0C02") + Name (_CRS, ResourceTemplate (){ + Memory32Fixed (ReadWrite, 0xd0000000, 0x10000000) + }) + } } From patchwork Mon Oct 29 03:32:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149625 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598314ljp; Sun, 28 Oct 2018 20:33:40 -0700 (PDT) X-Google-Smtp-Source: AJdET5fdIweeewupsauWjG0pQsfmZJrEXL24WMjk973PCd3FFVIbSKdIn3BW0h5Uc1ykf/X7WB6T X-Received: by 2002:a0c:ec92:: with SMTP id u18mr3214476qvo.168.1540784020338; Sun, 28 Oct 2018 20:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784020; cv=none; d=google.com; s=arc-20160816; b=r2I97UIhKv1uHhne/yd7wOvO970UDh14aSBcLRBkgC132m8XAC7kh/0ZkFoMmxcili /upX0sB+rltIP6MlKdJKptWzXRQhdsygPbHt7rv+MmeoHWE3lG4xzsn2UwmsxC11Wy1k s1ZNB/5jh4wTZmOrTsumnRUAiCfmbfD9JYlMcMBSFqGOpGQcik2LHenw0MVcuy7y1xJn hVnOTfRGHgdARmqf48DKoS/e60lnH9LDneueq66rbv07k2+jwGnZMt7thN8q9KpBWLYu rvjOd/YsEiB5MDv830bx66jJLuh2H+54SEo8jRwx0UNH6wfhfXoknO2EijCrbtw+gLlT jMQA== 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:cc :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=fL5bOrqiu8ckkNexRt9PY59D/MJqoOYaeznLNqaAku8=; b=xOaNxu8XF5ahxs9jJgufhNEYsLsyt1+RoD/Fvuf+JYsIzJTmm/Pe1na9yPaj4zqp6D cvRhdJ0z1J9eh/U3WzMVr4+3G39mOl7rYSKw5wBLtxF3hQ5vPVq4mOudubJdNFG98oSB QD+zDI59WOgrdFQp5OPE+vQtH3dPcF6WJCU4rHPjmkjPor7opR1yyIs47eDzXuXHtVcX lxwDGoO/zux2CmccG7JAl8R92rKN7CaJ8DAbjGJfjngAA03Xx3DteVIAeKy5GLOZiR6a muqfj4UgNok5/DYlVsz1Sl791lXFRdBz6zN/jzVoQfxEMZxg/MHedFnzYkpd6g6G4NXW jKnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VhIV668T; 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 62-v6si12180094qta.371.2018.10.28.20.33.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:40 -0700 (PDT) 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=VhIV668T; 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 7240421184AD8; Sun, 28 Oct 2018 20:33:33 -0700 (PDT) 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=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0: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 BECBE2117FD5E for ; Sun, 28 Oct 2018 20:33:31 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id r64-v6so3281051pfb.13 for ; Sun, 28 Oct 2018 20:33:31 -0700 (PDT) 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=NjYv1YVhM32i0o2yxuxrHqq4Iyw2bKlTbUaKLoRH7NQ=; b=VhIV668T4DsYMWBCvnJJbi+6mAkgxFQtHbWp0Sq7ZawNOM88ZXtlCsUuUxCPJU4Cud vfXU26ta8D0q2z95d8GLEkfnul1oyRfbs/QH1duXoEn7Xd97g7uQlR42DHrSiUDlFAD1 TmVPgpCLCw932XrQY9yCyqUeU+M9FePKF7kME= 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=NjYv1YVhM32i0o2yxuxrHqq4Iyw2bKlTbUaKLoRH7NQ=; b=DIUkrUx6sPJEqB9K/jBl/ErADJ68Mz1UzoAHjLZNOR5XjS/1g/2l8GP5PKtZngEgI8 QtfK6Q4tvs/NLhba/uNCJXqnCXLwAVvj/TZHozbDI/NanA909/VZ2OMsD+5lccDMfRcg ysk4kKR8WU80okIQVSCWD50wPcf6RFRUpr52ZKHD9KqFVNtzLjWKXYCvRdIYpox9zE+c tVAqOCbsE/UrmfBvGDNdAGkx5FZylFVxucu2uy8ukCPy0MkIcQUFM6GHz3A39qrq46nU P+I6WicgL3IoHDOMlJcVMQDHcKRDbXiGHs9IkWXlfjZHBRBDsBSNdrWNxMpS0SCjMkda F7MQ== X-Gm-Message-State: AGRZ1gJ+6ZxP7GvIoqOzRkOomLNEtBSHBSrWoYmVKcZQigdLSotCxoJk eHMf53cW4MEqWOcNIE2mYmL0Kw== X-Received: by 2002:a62:1d92:: with SMTP id d140-v6mr13218284pfd.157.1540784011389; Sun, 28 Oct 2018 20:33:31 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:30 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:47 +0800 Message-Id: <20181029033249.45363-11-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 10/12] Silicon/Hisilicon/D06: Modify GTDT timer flag 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Add always on capibility to GTDT timer flag to fix SBSA 36 fail issue: 36 : SYS Timer if PE Timer not ON PE Timers are not always-on. Failed on PE - 0 for Level= 3 : Result: --FAIL-- 1 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc index d07070a912..5cab639cc5 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Gtdt.aslc @@ -28,8 +28,10 @@ #define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_6_2_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY #define GTDT_TIMER_ACTIVE_HIGH 0 #define SYSTEM_TIMER_BASE_ADDRESS 0xFFFFFFFFFFFFFFFF +#define GTDT_TIMER_ALWAYS_ON_CAPABILITY EFI_ACPI_6_2_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY + +#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ALWAYS_ON_CAPABILITY | GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) -#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED) #define GENERIC_WATCHDOG_CONTROL_BASE_CPU1_TOTEM_A 0x9C200000 #define GENERIC_WATCHDOG_REFRESH_BASE_CPU1_TOTEM_A 0X9C210000 From patchwork Mon Oct 29 03:32:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149626 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598368ljp; Sun, 28 Oct 2018 20:33:45 -0700 (PDT) X-Google-Smtp-Source: AJdET5cQtE5S35MtbRmK+AwQa602R3pdJ2zCEkPAc7ibP8Sfzv2Jv7riugvxSIKEyqT4++eoelxs X-Received: by 2002:a0c:df12:: with SMTP id g18mr2423853qvl.208.1540784025207; Sun, 28 Oct 2018 20:33:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784025; cv=none; d=google.com; s=arc-20160816; b=Zo/5jex8DYfg4lEcx3P67znAiNyvxiOixt4AGkaYFyQcmIn9LXVaGWPmGNEbFwm7rB DelAD6VkBkiktheauvhqFiaL7VJbpc9mN8+vCBYAoyTTv9PejNiVpSEpqCVbtDXECeof TItisaYjQQ/uSjbxFwJtey9id6AVwJNRhJxgNyHh6cAPQW6FTh7BckhLYm6p06QXcAQy WljhakNnB7Ru7oIcCw9hFqs+TxWS/6SjHnn29PQOZYQaJNgOub0yLHi+IKdTeEgivDy+ uco6fHVpKRv1QtKGGkwRD8bbSOO+GqViZ25EPpslUc4wcfzFtolFUP9e4TMuPfIzCeFY +Frw== 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:cc :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=fSbrYf/C7fnWq4J/koclkcO2DtFy3YazzPTe0mHTub4=; b=VmuxNz7/gX/wHLQU8xiUwROtYNa9tWnyC0ofHEfozF7W7wu7HjQYGMiVPBiL10Re5b wVh3mITEiVLfUvkR1XRxTXD9py8c+2iTtzmkJafBXISE657reNPa+9nTSUgUfAmnpWJK P2EynR3Wn+TLdSL0KlZUEEeLYHWA0NcMo9rDSwiI1ZqOpgNA0Xq9CHXofDBz5vYA3Hch BEoWVohY8lRSBfgFC0zNM7k6CY/WgjmUuFE4JgNf9An3WBE7ZQR+VXi26fv8GiG1slSW P3+asHUKmavk/vitpjFLPGK7+wGLkFIShi5lByyhh2Sg+9SKiJ+545LHwr3cg2BEf/ql 18tg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=J57kNEhg; 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 l21-v6si461346qtp.365.2018.10.28.20.33.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:45 -0700 (PDT) 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=J57kNEhg; 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 A30FF21184ADB; Sun, 28 Oct 2018 20:33:36 -0700 (PDT) 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=2607:f8b0:4864:20::441; helo=mail-pf1-x441.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0: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 3825321184ABA for ; Sun, 28 Oct 2018 20:33:35 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id e22-v6so264029pfn.8 for ; Sun, 28 Oct 2018 20:33:35 -0700 (PDT) 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=aeXqML/lFq1yw6CtN8txfd9kMoK5i1/IMbB2GERrAIY=; b=J57kNEhgJVhYXlSaJLyhXdaOTnbMvkwK43NvmNGEO9HYZir2/Txkv40MGttH8EnnX2 4AuzAONAqica7Ta7xjG5f7+Mf1kt3Y1ae8Fbvv+z9wr8JSMAtwd59kcqklGgcCdT8ZcV U9NOB4rbzbgsXFockr8K245ec9NDRrienZPhc= 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=aeXqML/lFq1yw6CtN8txfd9kMoK5i1/IMbB2GERrAIY=; b=MfLkhaEX/JrBEc1cN6paP5sbWiAFxivq0RM2jmanmtRr9qbOzYXiFvgiziTdNa+yTp PfSu+2Gpges/qrcOEzJ+nXzxoPsLrxl6PK8AmKB56+c5HvEcWmm7zbIOcQQ9XjZVl2xz wAbF/FNsaGKm/IHJ0tDL0+9O1vrChXFW4TjZdLEz178QqjFheHvquvQJDCoMrCVwbP8O rBVZ0FB/wWitvduAG+Yldxmb3wMjXzOC+YX/2bPbEE9/aGnPPCknME6NPpTvp73AtsCd IxmY8mt7PI37oY1tnaEiuD2IlmdBDj9oDUerv4oLMZmU51jq4hOBuzzZFegbIctBWO2L kRHA== X-Gm-Message-State: AGRZ1gJro9m2wi4A1rgx+exHhqOsbkgK74HgKjIaLV9qDGEGu853xrFP MOlPymLcDe4hB0v1qXC6252pQw== X-Received: by 2002:aa7:80cd:: with SMTP id a13-v6mr13292979pfn.86.1540784014771; Sun, 28 Oct 2018 20:33:34 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:34 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:48 +0800 Message-Id: <20181029033249.45363-12-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 11/12] Hisilicon/D06: Modify Gic base 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The values of PcdGicInterruptInterfaceBase and GICD are wrong, so modify it. Fix SBSA test case 21: 21 : Check GIC version GIC version is 0 Failed on PE - 0 for Level= 3 : Result: --FAIL-- 2 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D06/D06.dsc | 2 +- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index 8ee20342b1..6296fcd9ec 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -183,7 +183,7 @@ gHisiTokenSpaceGuid.PcdArmPrimaryCoreTemp|0x80010000 gArmTokenSpaceGuid.PcdGicDistributorBase|0xAE000000 gArmTokenSpaceGuid.PcdGicRedistributorsBase|0xAE100000 - gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0xFE000000 + gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x9B000000 diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc index 43b43142af..d3de69a3ef 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/MadtHi1620.aslc @@ -361,7 +361,7 @@ EFI_ACPI_MULTIPLE_APIC_DESCRIPTION_TABLE Madt = { 0x0, 0x0, 25, 0x4000AA000000 + 0x6C0000 /* GicRBase */, 0), }, - EFI_ACPI_6_1_GIC_DISTRIBUTOR_INIT(0, 0xAA000000, 0, 0x4), + EFI_ACPI_6_1_GIC_DISTRIBUTOR_INIT(0, 0xAE000000, 0, 0x4), { EFI_ACPI_6_1_GIC_ITS_INIT(0,0x202100000), //peri a // EFI_ACPI_6_1_GIC_ITS_INIT(1,0x400202100000), //peri a From patchwork Mon Oct 29 03:32:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 149627 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3598399ljp; Sun, 28 Oct 2018 20:33:48 -0700 (PDT) X-Google-Smtp-Source: AJdET5ddcpvQ/+fLtghfNwyt6PP9QFuUyRAoWVQ7SQxIXjWeoOtq30Gkd9v+0XEMNfA3FWe1x9iX X-Received: by 2002:a17:902:8c84:: with SMTP id t4-v6mr12842492plo.188.1540784027982; Sun, 28 Oct 2018 20:33:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540784027; cv=none; d=google.com; s=arc-20160816; b=UZ4ro1qTVBMwcX254lAdOLIopeOIy5eToRNCRMD5PrpcvWQ0W9YugUKPYVACc00dLt D48atYVDuHkjWkZw/6SEXsZ9hkBhootHE88cy0bp7nrP7ZNPsW07bTlO3xeeZZYCFDMc YWPeXslDR9DU84Ads9I66BLVf928NK+glWBTAts0LzWs66JVfvetIgYWxrieDb3ZCI4E zP+yqIY51LrmVgLkcqEFoMY27YYEKRkLtxdfp5eC6LlXqEKPFmkpy5iBpQJ+8j7jAagq dSEVqEqAYQtSsevmXNBWGZvlXbGHUrDpcz2GS5TM85uOeZ3UOca4JJmftHPZNXuDndMc ZEPg== 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:cc :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=oeoTg0hTzTZkiVKzmPnI0JbR2kNNXqrxpCfjN0rxrrg=; b=QfRHxrWv3wO2z4ik9anrfXFzI/vYwKXK4T3PpcDkiZTgoCJZKGbHJNf1Hkx7QqdY36 MRnGr4Bq2nLBUmqzxdrGDO1g7hFasPznr8EDEw7dY5PyJVjUMprgUfk9sly7dbCpSqy3 miVcXetJ+ZSIU+sbhpgcNiAMR14RMgIKs33NJDNO+dEedVqDzc9d07nGOa1BwVGcvAfE 2U103Z6FypUvR21efokz0eFrzWPUFepCRk0OcnaepCQ1wuIJkZPQvd6F/HB45RPvP/uJ KhW38xBET0AK53GOgbQk/zg5Q2qWkzeg0o6Mi8bZ2IxU0MMsQExIsrOtt01HCXvU1Gft qCbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=GRb0ibQm; 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 207-v6si1901627pfw.277.2018.10.28.20.33.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 20:33:47 -0700 (PDT) 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=GRb0ibQm; 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 D2F3921184E60; Sun, 28 Oct 2018 20:33:40 -0700 (PDT) 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=2607:f8b0:4864:20::444; helo=mail-pf1-x444.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0: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 1517421184ADF for ; Sun, 28 Oct 2018 20:33:39 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id u4-v6so920982pfh.12 for ; Sun, 28 Oct 2018 20:33:39 -0700 (PDT) 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=9DlQRxt0qgmjMexy+3zkO3maRb9YwSNFvMJrNOE+7Zk=; b=GRb0ibQmhIwK+pco1I5prJxAfK3BIO3ihXVBGLTc4Kc9d7TRwClBh+4hsxMPiUPb1i naB+8OmJmjI7/TfBYOH0t7g5bV8/4EXEcYuBS91RvgTe9zf/KF0qXwhByYPGQidCdSsr cWdrfU7hAbhHUDN9ObPDohBL+XGK1l11MxFgU= 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=9DlQRxt0qgmjMexy+3zkO3maRb9YwSNFvMJrNOE+7Zk=; b=pw9ms6w6WwkzwlMFzdXeCPCIYZs7FMtBz5kOj4AB2zSAAaJ9QEBBpxuLrPDBPEtEzi 94i3Z+R7pEIiAVFonxruinahpKX8w+p+nltTSoFKQYI+7KKVSyRdPRSbvsAgr5M2NG/G 10F0G/73lu7W0RLnP3pW17BrCR0dSZvMNj5dtg74zeZjfrTxfhz47KaJhM2EwLGgkVLJ Ur2eFRaCNGgnPzBXTiFLrKijGtVV/jriXBtja2khWM8qvCQ0n/thW+4zAFMaCQUjfg66 Gdyb8l3xELMnz+JqmxC42eSRBrdEBi3kc8+Iv0TRQmGiBG732AGTVE8/PgCFfyz9yWU5 gtGQ== X-Gm-Message-State: AGRZ1gJribN8To39Xy9Kj8sP6UbqHYviGHJTwtJ07MXjFyqlHXbuwPSg mIZdohe9HdPebvIvg6sgRwDc9Q== X-Received: by 2002:a62:6f43:: with SMTP id k64-v6mr13050544pfc.87.1540784018301; Sun, 28 Oct 2018 20:33:38 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id j5-v6sm22318872pgm.79.2018.10.28.20.33.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 28 Oct 2018 20:33:37 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 29 Oct 2018 11:32:49 +0800 Message-Id: <20181029033249.45363-13-ming.huang@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181029033249.45363-1-ming.huang@linaro.org> References: <20181029033249.45363-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 12/12] Silicon/Hisilicon/D06: Set TA as Node 0 for TA boot 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: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, zhangfeng56@huawei.com, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Linux kernel will recognize NUMA node by processor order, and the Node and PXM number will be not identical between BIOS and OS kernel after changing to TA boot, so adjust the NUMA node number to match. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 28 +-- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl | 18 +- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc | 194 ++++++++++---------- 3 files changed, 120 insertions(+), 120 deletions(-) -- 2.18.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl index 87a2da8843..27fde2e09b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl @@ -212,7 +212,7 @@ Scope(_SB) Method (_PXM, 0, NotSerialized) { - Return(0x01) + Return(0x00) } } // Device(PCI0) @@ -262,7 +262,7 @@ Device (PCI1) Method (_PXM, 0, NotSerialized) { - Return(0x01) + Return(0x00) } } // Device(PCI1) @@ -325,7 +325,7 @@ Device (PCI2) Method (_PXM, 0, NotSerialized) { - Return(0x01) + Return(0x00) } } @@ -374,7 +374,7 @@ Device (PCI3) Method (_PXM, 0, NotSerialized) { - Return(0x01) + Return(0x00) } } @@ -423,7 +423,7 @@ Device (PCI4) Method (_PXM, 0, NotSerialized) { - Return(0x01) + Return(0x00) } } @@ -733,7 +733,7 @@ Device (PCI5) Method (_PXM, 0, NotSerialized) { - Return(0x01) + Return(0x00) } } @@ -866,11 +866,11 @@ Device (PCI6) // Never allow SHPC (no SHPC controller in this system) And(CTRL,0x1D,CTRL) - If(LNotEqual(Arg1,One)) { // Unknown revision + If(LNotEqual(Arg1,One)) { // Unknown revision Or(CDW1,0x08,CDW1) } - If(LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked + If(LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked Or(CDW1,0x10,CDW1) } @@ -924,7 +924,7 @@ Device (PCI6) Method (_PXM, 0, NotSerialized) { - Return(0x03) + Return(0x02) } } // Device(PCI6) @@ -974,7 +974,7 @@ Device (PCI7) Method (_PXM, 0, NotSerialized) { - Return(0x03) + Return(0x02) } } // Device(PCI7) @@ -1038,7 +1038,7 @@ Device (PCI8) Method (_PXM, 0, NotSerialized) { - Return(0x03) + Return(0x02) } }// Device(PCI8) @@ -1087,7 +1087,7 @@ Device (PCI9) Method (_PXM, 0, NotSerialized) { - Return(0x03) + Return(0x02) } }// Device(PCI9) @@ -1136,7 +1136,7 @@ Device (PCIA) Method (_PXM, 0, NotSerialized) { - Return(0x03) + Return(0x02) } }// Device(PCIA) @@ -1210,7 +1210,7 @@ Device (PCIB) Method (_PXM, 0, NotSerialized) { - Return(0x03) + Return(0x02) } } diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl index 33b5d5250b..29536e6dff 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Iort.asl @@ -53,7 +53,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 01 +[0001] Proximity Domain : 00 [0001] Reserved : 00 [0002] Reserved : 0000 [0004] DeviceID mapping index : 00000002 @@ -99,7 +99,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 01 +[0001] Proximity Domain : 00 [0001] Reserved : 00 [0002] Reserved : 0000 [0004] DeviceID mapping index : 0001 @@ -139,7 +139,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 01 +[0001] Proximity Domain : 00 [0001] Reserved : 00 [0002] Reserved : 0000 [0004] DeviceID mapping index : 00000001 @@ -179,7 +179,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 03 +[0001] Proximity Domain : 02 [0001] Reserved : 00 [0002] Reserved : 0000 [0004] DeviceID mapping index : 00000002 @@ -225,7 +225,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 03 +[0001] Proximity Domain : 02 [0001] Reserved : 00 [0002] Reserved : 0000 [0004] DeviceID mapping index : 0001 @@ -265,7 +265,7 @@ [0004] PRI Interrupt : 00000000 [0004] GERR Interrupt : 00000000 [0004] Sync Interrupt : 00000000 -[0001] Proximity Domain : 03 +[0001] Proximity Domain : 02 [0001] Reserved : 00 [0002] Reserved : 0000 [0004] DeviceID mapping index : 00000001 @@ -300,8 +300,8 @@ Read Allocate : 0 Override : 0 [0002] Reserved : 0000 -[0001] Memory Flags (decoded below) : 00 - Coherency : 0 +[0001] Memory Flags (decoded below) : 01 + Coherency : 1 Device Attribute : 0 [0004] ATS Attribute : 00000000 [0004] PCI Segment Number : 00000000 // should match with above MCFG @@ -1921,7 +1921,7 @@ [34Ch 0844 4] Input base : 00000000 [350h 0848 4] ID Count : 00000001 [354h 0852 4] Output Base : 00000100 -[358h 0856 4] Output Reference : 00000100 +[358h 0856 4] Output Reference : 00000138 [35Ch 0860 4] Flags (decoded below) : 00000001 Single Mapping : 1 /* RDE device report++.*/ diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc index aea4c21858..d77bddefc8 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Srat.aslc @@ -55,106 +55,106 @@ EFI_ACPI_STATIC_RESOURCE_AFFINITY_TABLE Srat = { }, { - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000000,0x00000001,0x00000000), //GICC Affinity Processor 0 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000001,0x00000001,0x00000000), //GICC Affinity Processor 1 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000002,0x00000001,0x00000000), //GICC Affinity Processor 2 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000003,0x00000001,0x00000000), //GICC Affinity Processor 3 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000004,0x00000001,0x00000000), //GICC Affinity Processor 4 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000005,0x00000001,0x00000000), //GICC Affinity Processor 5 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000006,0x00000001,0x00000000), //GICC Affinity Processor 6 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000007,0x00000001,0x00000000), //GICC Affinity Processor 7 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000008,0x00000001,0x00000000), //GICC Affinity Processor 8 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000009,0x00000001,0x00000000), //GICC Affinity Processor 9 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000000A,0x00000001,0x00000000), //GICC Affinity Processor 10 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000000B,0x00000001,0x00000000), //GICC Affinity Processor 11 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000000C,0x00000001,0x00000000), //GICC Affinity Processor 12 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000000D,0x00000001,0x00000000), //GICC Affinity Processor 13 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000000E,0x00000001,0x00000000), //GICC Affinity Processor 14 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000000F,0x00000001,0x00000000), //GICC Affinity Processor 15 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000010,0x00000001,0x00000000), //GICC Affinity Processor 16 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000011,0x00000001,0x00000000), //GICC Affinity Processor 17 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000012,0x00000001,0x00000000), //GICC Affinity Processor 18 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000013,0x00000001,0x00000000), //GICC Affinity Processor 19 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000014,0x00000001,0x00000000), //GICC Affinity Processor 20 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000015,0x00000001,0x00000000), //GICC Affinity Processor 21 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000016,0x00000001,0x00000000), //GICC Affinity Processor 22 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000017,0x00000001,0x00000000), //GICC Affinity Processor 23 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000018,0x00000001,0x00000000), //GICC Affinity Processor 24 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000019,0x00000001,0x00000000), //GICC Affinity Processor 25 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000001A,0x00000001,0x00000000), //GICC Affinity Processor 26 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000001B,0x00000001,0x00000000), //GICC Affinity Processor 27 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000001C,0x00000001,0x00000000), //GICC Affinity Processor 28 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000001D,0x00000001,0x00000000), //GICC Affinity Processor 29 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000001E,0x00000001,0x00000000), //GICC Affinity Processor 30 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000001F,0x00000001,0x00000000), //GICC Affinity Processor 31 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000020,0x00000001,0x00000000), //GICC Affinity Processor 32 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000021,0x00000001,0x00000000), //GICC Affinity Processor 33 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000022,0x00000001,0x00000000), //GICC Affinity Processor 34 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000023,0x00000001,0x00000000), //GICC Affinity Processor 35 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000024,0x00000001,0x00000000), //GICC Affinity Processor 36 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000025,0x00000001,0x00000000), //GICC Affinity Processor 37 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000026,0x00000001,0x00000000), //GICC Affinity Processor 38 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000027,0x00000001,0x00000000), //GICC Affinity Processor 39 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000028,0x00000001,0x00000000), //GICC Affinity Processor 40 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000029,0x00000001,0x00000000), //GICC Affinity Processor 41 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000002A,0x00000001,0x00000000), //GICC Affinity Processor 42 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000002B,0x00000001,0x00000000), //GICC Affinity Processor 43 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000002C,0x00000001,0x00000000), //GICC Affinity Processor 44 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000002D,0x00000001,0x00000000), //GICC Affinity Processor 45 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000002E,0x00000001,0x00000000), //GICC Affinity Processor 46 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000002F,0x00000001,0x00000000), //GICC Affinity Processor 47 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000000,0x00000001,0x00000000), //GICC Affinity Processor 0 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000001,0x00000001,0x00000000), //GICC Affinity Processor 1 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000002,0x00000001,0x00000000), //GICC Affinity Processor 2 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000003,0x00000001,0x00000000), //GICC Affinity Processor 3 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000004,0x00000001,0x00000000), //GICC Affinity Processor 4 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000005,0x00000001,0x00000000), //GICC Affinity Processor 5 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000006,0x00000001,0x00000000), //GICC Affinity Processor 6 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000007,0x00000001,0x00000000), //GICC Affinity Processor 7 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000008,0x00000001,0x00000000), //GICC Affinity Processor 8 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000009,0x00000001,0x00000000), //GICC Affinity Processor 9 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000000A,0x00000001,0x00000000), //GICC Affinity Processor 10 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000000B,0x00000001,0x00000000), //GICC Affinity Processor 11 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000000C,0x00000001,0x00000000), //GICC Affinity Processor 12 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000000D,0x00000001,0x00000000), //GICC Affinity Processor 13 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000000E,0x00000001,0x00000000), //GICC Affinity Processor 14 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x0000000F,0x00000001,0x00000000), //GICC Affinity Processor 15 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000010,0x00000001,0x00000000), //GICC Affinity Processor 16 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000011,0x00000001,0x00000000), //GICC Affinity Processor 17 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000012,0x00000001,0x00000000), //GICC Affinity Processor 18 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000013,0x00000001,0x00000000), //GICC Affinity Processor 19 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000014,0x00000001,0x00000000), //GICC Affinity Processor 20 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000015,0x00000001,0x00000000), //GICC Affinity Processor 21 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000016,0x00000001,0x00000000), //GICC Affinity Processor 22 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000000,0x00000017,0x00000001,0x00000000), //GICC Affinity Processor 23 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000018,0x00000001,0x00000000), //GICC Affinity Processor 24 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000019,0x00000001,0x00000000), //GICC Affinity Processor 25 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000001A,0x00000001,0x00000000), //GICC Affinity Processor 26 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000001B,0x00000001,0x00000000), //GICC Affinity Processor 27 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000001C,0x00000001,0x00000000), //GICC Affinity Processor 28 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000001D,0x00000001,0x00000000), //GICC Affinity Processor 29 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000001E,0x00000001,0x00000000), //GICC Affinity Processor 30 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000001F,0x00000001,0x00000000), //GICC Affinity Processor 31 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000020,0x00000001,0x00000000), //GICC Affinity Processor 32 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000021,0x00000001,0x00000000), //GICC Affinity Processor 33 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000022,0x00000001,0x00000000), //GICC Affinity Processor 34 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000023,0x00000001,0x00000000), //GICC Affinity Processor 35 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000024,0x00000001,0x00000000), //GICC Affinity Processor 36 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000025,0x00000001,0x00000000), //GICC Affinity Processor 37 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000026,0x00000001,0x00000000), //GICC Affinity Processor 38 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000027,0x00000001,0x00000000), //GICC Affinity Processor 39 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000028,0x00000001,0x00000000), //GICC Affinity Processor 40 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x00000029,0x00000001,0x00000000), //GICC Affinity Processor 41 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000002A,0x00000001,0x00000000), //GICC Affinity Processor 42 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000002B,0x00000001,0x00000000), //GICC Affinity Processor 43 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000002C,0x00000001,0x00000000), //GICC Affinity Processor 44 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000002D,0x00000001,0x00000000), //GICC Affinity Processor 45 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000002E,0x00000001,0x00000000), //GICC Affinity Processor 46 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000001,0x0000002F,0x00000001,0x00000000), //GICC Affinity Processor 47 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000030,0x00000001,0x00000000), //GICC Affinity Processor 48 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000031,0x00000001,0x00000000), //GICC Affinity Processor 49 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000032,0x00000001,0x00000000), //GICC Affinity Processor 50 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000033,0x00000001,0x00000000), //GICC Affinity Processor 51 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000034,0x00000001,0x00000000), //GICC Affinity Processor 52 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000035,0x00000001,0x00000000), //GICC Affinity Processor 53 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000036,0x00000001,0x00000000), //GICC Affinity Processor 54 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000037,0x00000001,0x00000000), //GICC Affinity Processor 55 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000038,0x00000001,0x00000000), //GICC Affinity Processor 56 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000039,0x00000001,0x00000000), //GICC Affinity Processor 57 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003A,0x00000001,0x00000000), //GICC Affinity Processor 58 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003B,0x00000001,0x00000000), //GICC Affinity Processor 59 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003C,0x00000001,0x00000000), //GICC Affinity Processor 60 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003D,0x00000001,0x00000000), //GICC Affinity Processor 61 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003E,0x00000001,0x00000000), //GICC Affinity Processor 62 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000003F,0x00000001,0x00000000), //GICC Affinity Processor 63 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000040,0x00000001,0x00000000), //GICC Affinity Processor 64 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000041,0x00000001,0x00000000), //GICC Affinity Processor 65 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000042,0x00000001,0x00000000), //GICC Affinity Processor 66 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000043,0x00000001,0x00000000), //GICC Affinity Processor 67 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000044,0x00000001,0x00000000), //GICC Affinity Processor 68 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000045,0x00000001,0x00000000), //GICC Affinity Processor 69 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000046,0x00000001,0x00000000), //GICC Affinity Processor 70 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000047,0x00000001,0x00000000), //GICC Affinity Processor 71 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000048,0x00000001,0x00000000), //GICC Affinity Processor 72 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000049,0x00000001,0x00000000), //GICC Affinity Processor 73 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000004A,0x00000001,0x00000000), //GICC Affinity Processor 74 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000004B,0x00000001,0x00000000), //GICC Affinity Processor 75 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000004C,0x00000001,0x00000000), //GICC Affinity Processor 76 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000004D,0x00000001,0x00000000), //GICC Affinity Processor 77 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000004E,0x00000001,0x00000000), //GICC Affinity Processor 78 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000004F,0x00000001,0x00000000), //GICC Affinity Processor 79 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000050,0x00000001,0x00000000), //GICC Affinity Processor 80 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000051,0x00000001,0x00000000), //GICC Affinity Processor 81 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000052,0x00000001,0x00000000), //GICC Affinity Processor 82 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000053,0x00000001,0x00000000), //GICC Affinity Processor 83 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000054,0x00000001,0x00000000), //GICC Affinity Processor 84 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000055,0x00000001,0x00000000), //GICC Affinity Processor 85 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000056,0x00000001,0x00000000), //GICC Affinity Processor 86 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000057,0x00000001,0x00000000), //GICC Affinity Processor 87 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000058,0x00000001,0x00000000), //GICC Affinity Processor 88 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000059,0x00000001,0x00000000), //GICC Affinity Processor 89 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000005A,0x00000001,0x00000000), //GICC Affinity Processor 90 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000005B,0x00000001,0x00000000), //GICC Affinity Processor 91 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000005C,0x00000001,0x00000000), //GICC Affinity Processor 92 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000005D,0x00000001,0x00000000), //GICC Affinity Processor 93 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000005E,0x00000001,0x00000000), //GICC Affinity Processor 94 - EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000005F,0x00000001,0x00000000), //GICC Affinity Processor 95 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000030,0x00000001,0x00000000), //GICC Affinity Processor 48 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000031,0x00000001,0x00000000), //GICC Affinity Processor 49 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000032,0x00000001,0x00000000), //GICC Affinity Processor 50 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000033,0x00000001,0x00000000), //GICC Affinity Processor 51 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000034,0x00000001,0x00000000), //GICC Affinity Processor 52 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000035,0x00000001,0x00000000), //GICC Affinity Processor 53 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000036,0x00000001,0x00000000), //GICC Affinity Processor 54 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000037,0x00000001,0x00000000), //GICC Affinity Processor 55 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000038,0x00000001,0x00000000), //GICC Affinity Processor 56 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000039,0x00000001,0x00000000), //GICC Affinity Processor 57 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000003A,0x00000001,0x00000000), //GICC Affinity Processor 58 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000003B,0x00000001,0x00000000), //GICC Affinity Processor 59 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000003C,0x00000001,0x00000000), //GICC Affinity Processor 60 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000003D,0x00000001,0x00000000), //GICC Affinity Processor 61 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000003E,0x00000001,0x00000000), //GICC Affinity Processor 62 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x0000003F,0x00000001,0x00000000), //GICC Affinity Processor 63 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000040,0x00000001,0x00000000), //GICC Affinity Processor 64 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000041,0x00000001,0x00000000), //GICC Affinity Processor 65 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000042,0x00000001,0x00000000), //GICC Affinity Processor 66 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000043,0x00000001,0x00000000), //GICC Affinity Processor 67 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000044,0x00000001,0x00000000), //GICC Affinity Processor 68 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000045,0x00000001,0x00000000), //GICC Affinity Processor 69 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000046,0x00000001,0x00000000), //GICC Affinity Processor 70 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000002,0x00000047,0x00000001,0x00000000), //GICC Affinity Processor 71 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000048,0x00000001,0x00000000), //GICC Affinity Processor 72 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000049,0x00000001,0x00000000), //GICC Affinity Processor 73 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000004A,0x00000001,0x00000000), //GICC Affinity Processor 74 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000004B,0x00000001,0x00000000), //GICC Affinity Processor 75 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000004C,0x00000001,0x00000000), //GICC Affinity Processor 76 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000004D,0x00000001,0x00000000), //GICC Affinity Processor 77 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000004E,0x00000001,0x00000000), //GICC Affinity Processor 78 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000004F,0x00000001,0x00000000), //GICC Affinity Processor 79 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000050,0x00000001,0x00000000), //GICC Affinity Processor 80 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000051,0x00000001,0x00000000), //GICC Affinity Processor 81 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000052,0x00000001,0x00000000), //GICC Affinity Processor 82 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000053,0x00000001,0x00000000), //GICC Affinity Processor 83 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000054,0x00000001,0x00000000), //GICC Affinity Processor 84 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000055,0x00000001,0x00000000), //GICC Affinity Processor 85 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000056,0x00000001,0x00000000), //GICC Affinity Processor 86 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000057,0x00000001,0x00000000), //GICC Affinity Processor 87 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000058,0x00000001,0x00000000), //GICC Affinity Processor 88 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x00000059,0x00000001,0x00000000), //GICC Affinity Processor 89 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000005A,0x00000001,0x00000000), //GICC Affinity Processor 90 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000005B,0x00000001,0x00000000), //GICC Affinity Processor 91 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000005C,0x00000001,0x00000000), //GICC Affinity Processor 92 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000005D,0x00000001,0x00000000), //GICC Affinity Processor 93 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000005E,0x00000001,0x00000000), //GICC Affinity Processor 94 + EFI_ACPI_6_1_GICC_AFFINITY_STRUCTURE_INIT(0x00000003,0x0000005F,0x00000001,0x00000000), //GICC Affinity Processor 95 }, { - EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000001, 0x00000000), + EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000000, 0x00000000), // EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_INIT(0x00000003, 0x00000001), }, };