From patchwork Wed Feb 20 07:28:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158776 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602064jaa; Tue, 19 Feb 2019 23:28:53 -0800 (PST) X-Google-Smtp-Source: AHgI3IYwfdPh0P51Rax5gCFNhf4KSNYgLJpmjjarjFjemc5CiBI7I1yFWu+1porfuuALvL4jigPH X-Received: by 2002:a62:6dc7:: with SMTP id i190mr33406428pfc.166.1550647733254; Tue, 19 Feb 2019 23:28:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647733; cv=none; d=google.com; s=arc-20160816; b=u82hcfAJhz3mmHWd/a3PxwHTfe6z3XdcKDCQzl9vdLyauELXE/laLzcJlRHqjR92fE OffLCr6bYxVWFgrNO91LymjawglRCzJlSNcwmUh8x2oLPEJtrnrAWtCjwqPO3b/ZS95j wMbsixhqzRR/8Tt6dDdhBLiCGukJhDJuEJf3q7hdK/bo4Zbq9hP/NHtaUoW4dfEBDSA0 Hp7xZYIrab60i4XzaqcDQlikZIR7U5ICjOURXWbZC8FZbYdCZzK0IXSmh3wHz0r3DTRG lXZSKXgO1UW6Az6bgiBB9dSf9esyD6dz8JAbXv/OD4F0f71kC0nOJb/C8avoYAStKiBE T5NA== 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=s56DwPnb35mrXDkoNUxsqO6U0qvo0Bw5LGFG7LWNTDM=; b=Ly5/RxtZ8GRVjaY+vFJYAWDiNOw0U9iM2GyhLKMP8/A229rGBXGBlff6JMsfyBrbT3 LCYwOAIrBiUvv5T3TD79pPEFWRgdRSM2+xVHmCOt7EiqTlEv57kqbtWw/MIJpiDb74t6 6wJoRHCtKBr1f8AcZWWDptKqwIrBuEpQ/FEsnzapxg54e1XOkjJ9dnADWHr7bIJUEoPP r2OqwqTgHXAe5Cy/CE3vi/jnd7ZIjXK35hjpIGvQ9IKJJaScvFHCFbMf5Oik3tCy0CcJ D8eU6maJAW4Enk03j2x6Kr/zpzl+G5SabTt3OrKirhvavyAsLsrZcgYneErtt1cfev5S 1NZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=m7LvW5ZI; 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 h17si17948362pgh.495.2019.02.19.23.28.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:28:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=m7LvW5ZI; 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 BD030211CAC8A; Tue, 19 Feb 2019 23:28:52 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (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 655B4211BD5E6 for ; Tue, 19 Feb 2019 23:28:51 -0800 (PST) Received: by mail-pg1-x542.google.com with SMTP id r11so11419547pgp.6 for ; Tue, 19 Feb 2019 23:28:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5ya02E/Gn6Ahh5Zs25SSjnsdWUtDfMBLswWn/1KrjEw=; b=m7LvW5ZImItP7Vm4QmQTbN+2y1EZIvUaJgYYEWyGGfQ6hytW00uFBpsGalEe8p7kRm YhEcM94tnZ9frS8bBaM9jvjnoFaNge0kH9p6Fxu/tXrykohXWvdeJP/j7qhitPWbz38Q qy2BotWC7sGl71amI7eY7HCA4MLpgKrEvvkbbxL7V4EaNWxKz4BR0TvwnhAjwKv6sfdC AeVvSRi5dm7f6dC+h20eCpq/JlR7aRnMn2ZQeKL1MndnsLmYkYATdL+gdI3SXVY7ixBP BA+Y1TOd496CWyUXwhkVASLbTenYOWopRQEpJgKT+U8r/3igsI4FwLBzJhCeUMjIalhk MmzQ== 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=5ya02E/Gn6Ahh5Zs25SSjnsdWUtDfMBLswWn/1KrjEw=; b=k3k5Z10PAGf2oceK1qwZu/tFR5/knf61rmgEJLFDfz1dTdWy1p59QSBsaqsPzBgAil +5tD3+8ATS6FCQ8TDN6gfUYgXqHHQIiEIkglNbuBKN8V+zJPojMBxCiKAaN8vnXXPGLj L5nkIMA53veKwNNKggBnw/kYc3EnW7PM5ozSEBtB0dRV3h8/6Iymp9I+c28L1HV+w89V CPKmb8Jjo1DQgJ27JLOfWoKcV5gxbXuA4JvYS7/D/B3WgpgoTqcGt+RTOj0iEctshm7t kQEAOLhH1XRWYAbQBJ8AR6MxsXbSXHACURn6yx4vIKOwtKyfZAtmbKD9y/0e/hmlJO8w 098w== X-Gm-Message-State: AHQUAuanJvm0zrjhalfp7GUZ+y3eplbqNG3eEVw/Xveu3oFRo0QCLDm/ 4GMI0aLXGSWLfLF9B4JE+U1D5Q== X-Received: by 2002:a63:9c1a:: with SMTP id f26mr28226256pge.381.1550647731020; Tue, 19 Feb 2019 23:28:51 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.28.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:28:50 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:21 +0800 Message-Id: <20190220072837.35058-3-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 02/18] Hisilicon/D06: Optimize SAS driver for reducing boot time 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, john.garry@huawei.com, xiaojun2@hisilicon.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" SAS controller is always existed, so accessing SAS register don't depend on PciBusDxe (pci enumeration). Move the SAS module early in D06.fdf for dispatching SAS driver early. This can avoid wait in BDS normally and reduce boot time. This change is only valid after the update to SasDriverDxe in edk2-non-osi has been applied. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D06/D06.fdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf index a937660a09e2..d495ad7f264c 100644 --- a/Platform/Hisilicon/D06/D06.fdf +++ b/Platform/Hisilicon/D06/D06.fdf @@ -165,6 +165,7 @@ [FV.FvMain] INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF Platform/Hisilicon/D06/Drivers/IoInitDxe/IoInitDxe.inf + INF Platform/Hisilicon/D06/Drivers/Sas/SasDxeDriver.inf # # PI DXE Drivers producing Architectural Protocols (EFI Services) # @@ -296,7 +297,6 @@ [FV.FvMain] # INF Platform/Hisilicon/D06/Drivers/Sm750Dxe/UefiSmi.inf INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf - INF Platform/Hisilicon/D06/Drivers/Sas/SasDxeDriver.inf INF MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf From patchwork Wed Feb 20 07:28:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158777 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602090jaa; Tue, 19 Feb 2019 23:28:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IZRzKM4gGDlJrPiOPc95F2qxjE52kE6Qvrejxo5ICM1RaF3XFlzyo6D0/+4FL/B9xl7AMfl X-Received: by 2002:a17:902:6b47:: with SMTP id g7mr2212622plt.100.1550647736333; Tue, 19 Feb 2019 23:28:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647736; cv=none; d=google.com; s=arc-20160816; b=cblh8NXDhXQAY+kaBp2vy8G7HOPM0ul/gA0/l7wBc1vlI+cIYgyyI99Ho9FHmgBuyN LqG44up/PnJkpunPsWCGktlKfkRBFBCXTDcUMhnUcpzaM5RItl//6+qcvwzW6E5NdkVo Au8PWq9l6Z9TQH3NZWbtVrHJaog85Xa8LgXHZ6TkCAuleeKA+xUlw9U07r7EdqTV5IcZ TK90m8+Qr9jFJUqxc+1XeRV2BQ8aYSL2NboTdO+PM/zz8OPcRXVhPw35U4gLNLZ6vMUn yg0mVt8C7T0MdGKpXTeR16CZ6XKg5ejtdEL2G+uqfC3Hdg4F2oQXuVRjrIWPk7xq1Vh7 3kRw== 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=kXK4dq/s5CWX01sq4C5Q0jsLxWDNSgZJLcQcIZJhoFw=; b=uBdy4teJ8W0wsPCDe7jc0tW1WoeDwBsAWmgKJAKGMk6qj4KwEqRqcxSDzbFpn9blHO I6OJysTl06ee3YfKxtC0OQdylwiL3XWKt3SW9aBbg9ExyZgCteW3diI5+B2nY4PVj5Y8 ck47XgzhgGB2yEud4vuiWfOj97O/twzMzR1BS3DNZPRKz8SbqYMFJnmsJyjzNSnOeBX9 PFAsFyoWv2m17C2mdWZGv9k0z/drfTVwEjSrGkBYoLFA5lM5fqvU290o046DQ74iqqt2 hySIC0ejmctbWcau3VFr92hDA9G/r28zbLEqgCR9J11nKmUjBEA+pjhl028jIhKzbLGl KIVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=rCIDAOAD; 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 y27si17644880pgk.490.2019.02.19.23.28.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:28:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=rCIDAOAD; 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 EE3C3211CACA7; Tue, 19 Feb 2019 23:28:55 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=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 B11CE2194EB7D for ; Tue, 19 Feb 2019 23:28:54 -0800 (PST) Received: by mail-pf1-x443.google.com with SMTP id i20so1058528pfo.6 for ; Tue, 19 Feb 2019 23:28:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gBXux4YRyeug1FQsy49UL8fkYFxf65Ylb9nEP5bVTtg=; b=rCIDAOADQoAuSjTmlr49oItW5OAO5oFB5vnlZ+ohzY7pVMlkHZ1lqmjwUgJmxUbtD1 B/UBX9cn0zmaHVMSZV3bPGGPoxyd5S1amFLgGJqNjRb8xjEBfEDjQ6ze5W3vmxofDB6R FhZrqjdOUGGcN0NpMfmmPOLQUxHaB1d+fnIVSil8uOGO/zbvqzoTNcTzhb4p/N8glEg7 KWbCJUUxTZ/qmI8WZ43BJs2YZOSZBusjpYZtHLrDHRx5TF9G3IpI2a9Lamv/CzHB7seW bBx58GyAou7I4W+lbOe4qeQdNSvmljU1ZrTDJKVMvqTIbIoqmJqG/rwOYYJYtsjBbCgl MzEw== 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=gBXux4YRyeug1FQsy49UL8fkYFxf65Ylb9nEP5bVTtg=; b=bhhhsRrUb2ti9Vt0oGXYpFQNEXKCCGxuKqAahiFPCG72gGATLvl4Hs99UGZrrjhS0m cVzvYcmk7rzWZrBP5Zie+WJtilFZOM4z2fVSWwrBoaN1HOn1cPkaw64w8DX51FMKVOH4 n1jDSeW32SzBfm89TU2HszwvA+mxfqWebxVcUnQP8iUx8Zx5jUBozPzDsgD7YAeELqNM ej3G+f1jBsYeAPYbUKqhJUy4lc3T16ZksARL8lIvxp0C0ZV7bQgEeyfs/HKwEUZ2eBkt pAnxK90X1kD6qwkAJoQWLiAmH4ERT2kXmlol8dHe6tdBXbUo7xnQ+NWWbdikFsLHiCTD 5TYg== X-Gm-Message-State: AHQUAuY8MG4y2wooG9R6U3HmfVnSnXtP8DE96GpguvNAHs2PgrOtLJuu MKjGz9Mn9Buwp8fX7zV5BMiqwbJIFIU= X-Received: by 2002:a62:4389:: with SMTP id l9mr34853713pfi.170.1550647734404; Tue, 19 Feb 2019 23:28:54 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.28.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:28:53 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:22 +0800 Message-Id: <20190220072837.35058-4-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 03/18] Hisilicon/D06: Fix access variable fail 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, john.garry@huawei.com, xiaojun2@hisilicon.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" From: Jason Zhang BmcWdtEnable is a field of OemConfigData structure, need have runtime service attribution if use it during exit boot service Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr | 2 +- Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr index 470e9ace3dcf..08236704fbfe 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr @@ -23,7 +23,7 @@ formset help = STRING_TOKEN(STR_OEM_CONFIG), classguid = gEfiIfrFrontPageGuid, // for MdeModule Bds. efivarstore OEM_CONFIG_DATA, - attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE, + attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_RUNTIME_ACCESS, name = OemConfig, guid = gOemConfigGuid; diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c index 012d45bc0214..6668103af027 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c @@ -316,7 +316,7 @@ OemConfigUiLibConstructor ( Status = gRT->SetVariable ( OEM_CONFIG_NAME, &gOemConfigGuid, - EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, sizeof (OEM_CONFIG_DATA), &Configuration ); From patchwork Wed Feb 20 07:28:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158778 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602134jaa; Tue, 19 Feb 2019 23:28:59 -0800 (PST) X-Google-Smtp-Source: AHgI3IbYavxXjfYnjuL78rb4NuYfA3IOyirj1a/Bdm20p3v1w1SBZhxvwMYSjOXliWOhGTt1trXC X-Received: by 2002:aa7:8286:: with SMTP id s6mr32994423pfm.63.1550647739549; Tue, 19 Feb 2019 23:28:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647739; cv=none; d=google.com; s=arc-20160816; b=v/+1xQoRbsQQ3VqfjjHyt/6ccQdC+0+lvzOTixvC06ek8d8ygPfankwycgd1zFtnnO Xn4Pdqcp56fzDZWFe6DAtolUsTBOwI6ZXZSGOsP1mx6xMoGyu1iwgVVx/H94HoRIptuR kBMGXOe1iclV5OBQEzXn0uQAEmZtNpBBN4FPdpeAoA6abiH2TPcmAkGMSij7LqNEu1yg sKdfSFNE1MFYkyOgDRZxjbhUbAMKW2FdhUGbEHe8aXJvH3Pc9pyoVgFNHuBOjBYy298j gCm0SfQm03IGkIVaf+QQYebnBiqhOt3Qessmv8Gcz4CuBi6ej0W6F/MWmnQIQWoHYnwJ Pu/Q== 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=uduQn02is7P7nd6rjLkv/S5L42CKrdWG8cv8eumkCyE=; b=qh+sW+E9v5EbrXfxT+gcDjSbXjNatECm7rItYApnPDrGH/qK7+4TYKbEKLOOrEscqa +H6Wl73wcOR5ftn/cHZTEWnEmQ6TD3zs0jKBgfUpN7BBzGqoxBFrTmSOr30jY2Rmr/vr 65CjoBgyIfmrL44RO4t1/WdJl0mdK5nOUiMq6U9+c5zSzjQv6fmNPIs0SpTPA3XrmGEV Fk5tW4PSUCuvg+9H/AmMEug+jV+RoZZ0lMnGfL0B1oO48jIO5PiYbAQ3JCfzqi1ZbIO7 M0nE4qPbqnr4pXx0+RrTyKxxA1vC6SJ1vNf3Hgnj/RlJDqcZ0RZykuzHVMPGMmT2eqjU ESqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JQXwGUyA; 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 u11si13217093plr.227.2019.02.19.23.28.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:28:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=JQXwGUyA; 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 31AEC211CACB4; Tue, 19 Feb 2019 23:28:59 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=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 05B73211BD5E6 for ; Tue, 19 Feb 2019 23:28:57 -0800 (PST) Received: by mail-pl1-x643.google.com with SMTP id k2so2417157plt.3 for ; Tue, 19 Feb 2019 23:28:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HtJDTggfUMtYvXm43lYAIY6Fx4VrkmK1waIUgygO03E=; b=JQXwGUyAmuzsx/i6pTW1fqtkt74sYj3jaF+gXZ2mxdOjws++vRNH4sw2nibvgwiCNc RS/3EyU9wpD8I5UK+oxqf1RwHUcDqUmPz7sXquOGFGCij+w8mmZxIl8i1a6xawbfVpbI Lg9u70hnJqhrjljQ3xu4m6XSdy+3757LCAeYUcOamSSaskacMO/XvxP5s0GTzbbEtZia ZRrEKv2hS8j3RWjmo/zT/JePmp4JAxIZUOC+n8xFXTZzkBvFcYCQuaa2DXVH79DkYfkw WeYkAglW+sw9VHpYeSwEa3mrUPQV37+J8HfPNt3MrMIsoY7vR9FK6kQNNb71GchHfEga duhg== 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=HtJDTggfUMtYvXm43lYAIY6Fx4VrkmK1waIUgygO03E=; b=A59R74HElT0dZ8VAvwkWHFFkhNpfXU+j7h1FQhrwEdzkZ/T47Utru5d9nOwWMf7aLB BfY6PfK8ntbGI1UqLcHk768+aV2MjzBPXduP7nOKWpg4qm0LMnVjDwV8A11i+WtR8ST9 zNfarFyFocG4HyLJ6/KhzNfJ9l85cavJGllpg/hnUC/2zSVQsAWZydyywNKYSN+ugR6p wwWUDZQOJWj4VCl4rK1b8tdW89GrUs2Wk7vdausN/HAFDR92rnjcJSnrjnARKxXZYE+m O41tciJV1KOSlwAHl3YjV9tPZ97KnhihCZz4M1ix8HT4DDsVMIjdwcSYvNEJH0XdrIU4 qOYw== X-Gm-Message-State: AHQUAuaJ38bI3pU7bm3ua9eS5IXsJda1XcEeDIskE/Y7Fn5GDoCB91da FoAbN3CMSd2iENKiqT+xDYTHNQ== X-Received: by 2002:a17:902:b784:: with SMTP id e4mr23717306pls.308.1550647737644; Tue, 19 Feb 2019 23:28:57 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.28.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:28:57 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:23 +0800 Message-Id: <20190220072837.35058-5-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 04/18] Hisilicon/D06: Drop the leading 0 (0x0 -> 0x) 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, john.garry@huawei.com, xiaojun2@hisilicon.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" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.9.5 _______________________________________________ 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 27fde2e09bfe..0f2d11bb952b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl @@ -759,20 +759,20 @@ Device (PCI6) // adding RPx INTx configure deponds on hardware board topology, // if UEFI enables RPx, RPy, RPz... related INTx configure // should be added - Package () {0x04FFFF,0,0,640}, // INT_A - Package () {0x04FFFF,1,0,641}, // INT_B - Package () {0x04FFFF,2,0,642}, // INT_C - Package () {0x04FFFF,3,0,643}, // INT_D + Package () {0x4FFFF,0,0,640}, // INT_A + Package () {0x4FFFF,1,0,641}, // INT_B + Package () {0x4FFFF,2,0,642}, // INT_C + Package () {0x4FFFF,3,0,643}, // INT_D - Package () {0x08FFFF,0,0,640}, // INT_A - Package () {0x08FFFF,1,0,641}, // INT_B - Package () {0x08FFFF,2,0,642}, // INT_C - Package () {0x08FFFF,3,0,643}, // INT_D + Package () {0x8FFFF,0,0,640}, // INT_A + Package () {0x8FFFF,1,0,641}, // INT_B + Package () {0x8FFFF,2,0,642}, // INT_C + Package () {0x8FFFF,3,0,643}, // INT_D - Package () {0x0CFFFF,0,0,640}, // INT_A - Package () {0x0CFFFF,1,0,641}, // INT_B - Package () {0x0CFFFF,2,0,642}, // INT_C - Package () {0x0CFFFF,3,0,643}, // INT_D + Package () {0xCFFFF,0,0,640}, // INT_A + Package () {0xCFFFF,1,0,641}, // INT_B + Package () {0xCFFFF,2,0,642}, // INT_C + Package () {0xCFFFF,3,0,643}, // INT_D Package () {0x10FFFF,0,0,640}, // INT_A Package () {0x10FFFF,1,0,641}, // INT_B From patchwork Wed Feb 20 07:28:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158779 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602425jaa; Tue, 19 Feb 2019 23:29:17 -0800 (PST) X-Google-Smtp-Source: AHgI3IageONNBLuHcRIpwqgnNTteKew//8MmXdKzGV5Ufx5B+B5n/xcVIsoxY+mugYBQVD1IRjA4 X-Received: by 2002:a17:902:264:: with SMTP id 91mr35680503plc.108.1550647757722; Tue, 19 Feb 2019 23:29:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647757; cv=none; d=google.com; s=arc-20160816; b=w+nx7jq6lDM+lLLtpBHhCCT8leSIgrpiwQ0qjEWIoPfRvTDKoZJbgFeSotIygXuH5B 0lpyoIUiSotUvfl+S67+stXH7CWMS4vDz5vVg+Eul2WMSmWdi6hAydJvfcNo5zo3Xzk0 dsYiN7uFS45hh4GgJeFFPpCp2lcrrDJffIqw73Y34PaeAof6+MAFjEvm4tygBUeuTNkP CCF5W2An8X2+COsUZy3UNNZrubTjkOckHCYSkCd6uCSEGR4Z6rmbkBZ9CYd76zLMTaU0 kqh/7t71PcgINZmujoVPLWw1lwBWooZL2s6QUcGnYVlopt0NXe8j2FyEQd08VZI8rHPT DH3A== 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=nwwpNqmDtwlbXaDw6m2HtBsxuBjdlMFz2XL4DfkHDsg=; b=NqbPxDdOH0nsaq15UP3iNZyWFNqSnZdnMVGvMo2rCc48PbJHQ9A3hJm6BW8PwvJM1o dNtl1Ob4NYXfmjvXnq2CtG2TQ7Y/hcdz4nyoV5mSpPnVEqdH6Z2e4C88bASgDSYnkZMe k85iNzn9463/0MJwxFYsz+1cvpEJOeNA53IkcKku+0WIu18YYLOw7p51rfS+PAogRH34 D/g2ETAhWINP44NMUTXuEvnNJDwmgEbcFV+tMuFFrOipSGOEnrC+n6mit6UBwSRWoB2J GREXLophMmYu14AhgT8M6mXJ/J1/VVvAXHOBthivsKAZSTvDpV3rM6etjudRScVPWbPq zpbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=uHgnamwS; 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 b5si17410694pfi.286.2019.02.19.23.29.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:29:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=uHgnamwS; 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 2E17F211CBCFE; Tue, 19 Feb 2019 23:29:16 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=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 BEC06211CAF52 for ; Tue, 19 Feb 2019 23:29:14 -0800 (PST) Received: by mail-pg1-x543.google.com with SMTP id r124so11430454pgr.3 for ; Tue, 19 Feb 2019 23:29:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=V3ItXfFJZwQwpwUZXFKJWc489lp1ta/w32zRZrrsbR4=; b=uHgnamwSVwTBUXmesFLL4f/d87a+wQiEwQBNoVyCAD8ZOX1aXkjmOTi8M1Yg9Otv48 65T7zfuSEnQ8mQurqT7iNVXaZiOwi8EdR6GRMXPESekm++8KW4DlrE7o8M6+E4OV3ey+ 6oNAB0ZOMCRd3LkdZ+ha9rFHcSNB3vQEG/b6GsG3m1vsKB4TdijnU6/MCdb9jkTYLGBd 0Uni1AscD6ZQ7Mto+nQXEvBWyxoQrf/s5JtnAI5hzRKsYMWrLB8qrmqzlj2rQu8USUn+ Nzwzzi72r5y9d6EJvXB9LvZTHzysS+wloDeyMfWC8U1r1xPqw/ZTw7J/d9LCp4EpzczQ Zwxg== 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=V3ItXfFJZwQwpwUZXFKJWc489lp1ta/w32zRZrrsbR4=; b=OWERgBjR9TGRcA0hs56ItA/7Nko8d7U9D063gkYSZc8fvVrGvAWuZ+aPMLOwwWT0W3 3Jd1hRVs36znSiGOrmmuXHb3igWEY7G0IES/AZAxTzHWqtnL5PsukyO4SLjsucncVLAr hCEQIuueDhS+kJUa79DkAgQfMgrRrwrMUHJ9H/zlFE+DlPP8o/LLMILxm2QzlsegfT74 MTiONyw/CBBrrnv394Tx3avmigFGWOOJI7cpYgclDzAYknr6Q3i0qIf6ZHxAGBrG/jYg N3kajT7eJQfje0sTm/X42VR+bd3htC96Rd8ay2HEVJ/E1WAkhqMdxXzp6zEJC+p6vaBl pRIw== X-Gm-Message-State: AHQUAuZf32UblThokCcPgTuZlF3TVUfhbIaJaIGFiXqKcz5CXNQ0wkQa l8ygHmW5co6itxGpPhWOM3BFpQ== X-Received: by 2002:a63:1723:: with SMTP id x35mr27311604pgl.364.1550647754389; Tue, 19 Feb 2019 23:29:14 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:13 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:28 +0800 Message-Id: <20190220072837.35058-10-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 09/18] Hisilicon/D06: Add PCI_OSC_SUPPORT 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, john.garry@huawei.com, xiaojun2@hisilicon.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 PCI_OSC_SUPPORT for remaining host bridges to remove fail output in kernel: [ 103.478893] acpi PNP0A08:01: _OSC failed (AE_NOT_FOUND); Add PCI_OSC_SUPPORT_HOTPLUG to rewrite _OSC of PCI0 and PCI6. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 200 +++++++++++--------- 1 file changed, 106 insertions(+), 94 deletions(-) -- 2.9.5 _______________________________________________ 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 4d9d9d95be68..6dc380f27fa2 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl @@ -17,6 +17,90 @@ **/ //#include "ArmPlatform.h" + +/* + See ACPI 6.1 Spec, 6.2.11, PCI Firmware Spec 3.0, 4.5 +*/ +#define PCI_OSC_SUPPORT() \ + Name(SUPP, Zero) /* PCI _OSC Support Field value */ \ + Name(CTRL, Zero) /* PCI _OSC Control Field value */ \ + Method(_OSC,4) { \ + If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { \ + /* Create DWord-adressable fields from the Capabilities Buffer */ \ + CreateDWordField(Arg3,0,CDW1) \ + CreateDWordField(Arg3,4,CDW2) \ + CreateDWordField(Arg3,8,CDW3) \ + /* Save Capabilities DWord2 & 3 */ \ + Store(CDW2,SUPP) \ + Store(CDW3,CTRL) \ + /* Only allow native hot plug control if OS supports: */ \ + /* ASPM */ \ + /* Clock PM */ \ + /* MSI/MSI-X */ \ + If(LNotEqual(And(SUPP, 0x16), 0x16)) { \ + And(CTRL,0x1E,CTRL) \ + }\ + \ + /* Do not allow native PME, AER */ \ + /* Never allow SHPC (no SHPC controller in this system)*/ \ + And(CTRL,0x10,CTRL) \ + If(LNotEqual(Arg1,One)) { /* Unknown revision */ \ + Or(CDW1,0x08,CDW1) \ + } \ + \ + If(LNotEqual(CDW3,CTRL)) { /* Capabilities bits were masked */ \ + Or(CDW1,0x10,CDW1) \ + } \ + \ + /* Update DWORD3 in the buffer */ \ + Store(CTRL,CDW3) \ + Return(Arg3) \ + } Else { \ + Or(CDW1,4,CDW1) /* Unrecognized UUID */ \ + Return(Arg3) \ + } \ + } // End _OSC + +#define PCI_OSC_SUPPORT_HOTPLUG() \ + Name(SUPP, Zero) /* PCI _OSC Support Field value */ \ + Name(CTRL, Zero) /* PCI _OSC Control Field value */ \ + Method(_OSC,4) { \ + If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { \ + /* Create DWord-adressable fields from the Capabilities Buffer */ \ + CreateDWordField(Arg3,0,CDW1) \ + CreateDWordField(Arg3,4,CDW2) \ + CreateDWordField(Arg3,8,CDW3) \ + /* Save Capabilities DWord2 & 3 */ \ + Store(CDW2,SUPP) \ + Store(CDW3,CTRL) \ + /* Only allow native hot plug control if OS supports: */ \ + /* ASPM */ \ + /* Clock PM */ \ + /* MSI/MSI-X */ \ + If(LNotEqual(And(SUPP, 0x16), 0x16)) { \ + And(CTRL,0x1E,CTRL) \ + }\ + \ + /* Always allow native PME, AER (no dependencies) */ \ + /* Never allow SHPC (no SHPC controller in this system)*/ \ + And(CTRL,0x1D,CTRL) \ + If(LNotEqual(Arg1,One)) { /* Unknown revision */ \ + Or(CDW1,0x08,CDW1) \ + } \ + \ + If(LNotEqual(CDW3,CTRL)) { /* Capabilities bits were masked */ \ + Or(CDW1,0x10,CDW1) \ + } \ + \ + /* Update DWORD3 in the buffer */ \ + Store(CTRL,CDW3) \ + Return(Arg3) \ + } Else { \ + Or(CDW1,4,CDW1) /* Unrecognized UUID */ \ + Return(Arg3) \ + } \ + } // End _OSC + Scope(_SB) { Device (PCI0) @@ -139,53 +223,7 @@ Scope(_SB) Return (RBUF) } // Method(_CRS), this method return RBUF! - // - // OS Control Handoff - // - Name(SUPP, Zero) // PCI _OSC Support Field value - Name(CTRL, Zero) // PCI _OSC Control Field value - - Method(_OSC,4) { - // Check for proper UUID - If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { - // Create DWord-adressable fields from the Capabilities Buffer - CreateDWordField(Arg3,0,CDW1) - CreateDWordField(Arg3,4,CDW2) - CreateDWordField(Arg3,8,CDW3) - - // Save Capabilities DWord2 & 3 - Store(CDW2,SUPP) - Store(CDW3,CTRL) - - // Only allow native hot plug control if OS supports: - // ASPM - // Clock PM - // MSI/MSI-X - If(LNotEqual(And(SUPP, 0x16), 0x16)) { - And(CTRL,0x1E,CTRL) // Mask bit 0 (and undefined bits) - } - - // Always allow native PME, AER (no dependencies) - - // Never allow SHPC (no SHPC controller in this system) - And(CTRL,0x1D,CTRL) - - If(LNotEqual(Arg1,One)) { // Unknown revision - Or(CDW1,0x08,CDW1) - } - - If(LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked - Or(CDW1,0x10,CDW1) - } - - // Update DWORD3 in the buffer - Store(CTRL,CDW3) - Return(Arg3) - } Else { - Or(CDW1,4,CDW1) // Unrecognized UUID - Return(Arg3) - } - } // End _OSC + PCI_OSC_SUPPORT_HOTPLUG () Method (_HPX, 0) { Return (Package(2) { @@ -270,6 +308,8 @@ Device (PCI1) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -333,6 +373,8 @@ Device (PCI2) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -382,6 +424,8 @@ Device (PCI3) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -431,6 +475,8 @@ Device (PCI4) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0x0F) @@ -505,6 +551,8 @@ Device (PCI5) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -870,53 +918,7 @@ Device (PCI6) Return (RBUF) } // Method(_CRS), this method return RBUF! - // - // OS Control Handoff - // - Name(SUPP, Zero) // PCI _OSC Support Field value - Name(CTRL, Zero) // PCI _OSC Control Field value - - Method(_OSC,4) { - // Check for proper UUID - If(LEqual(Arg0,ToUUID("33DB4D5B-1FF7-401C-9657-7441C03DD766"))) { - // Create DWord-adressable fields from the Capabilities Buffer - CreateDWordField(Arg3,0,CDW1) - CreateDWordField(Arg3,4,CDW2) - CreateDWordField(Arg3,8,CDW3) - - // Save Capabilities DWord2 & 3 - Store(CDW2,SUPP) - Store(CDW3,CTRL) - - // Only allow native hot plug control if OS supports: - // ASPM - // Clock PM - // MSI/MSI-X - If(LNotEqual(And(SUPP, 0x16), 0x16)) { - And(CTRL,0x1E,CTRL) // Mask bit 0 (and undefined bits) - } - - // Always allow native PME, AER (no dependencies) - - // Never allow SHPC (no SHPC controller in this system) - And(CTRL,0x1D,CTRL) - - If(LNotEqual(Arg1,One)) { // Unknown revision - Or(CDW1,0x08,CDW1) - } - - If(LNotEqual(CDW3,CTRL)) { // Capabilities bits were masked - Or(CDW1,0x10,CDW1) - } - - // Update DWORD3 in the buffer - Store(CTRL,CDW3) - Return(Arg3) - } Else { - Or(CDW1,4,CDW1) // Unrecognized UUID - Return(Arg3) - } - } // End _OSC + PCI_OSC_SUPPORT_HOTPLUG () Method (_HPX, 0) { Return (Package(2) { @@ -1002,6 +1004,8 @@ Device (PCI7) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -1066,6 +1070,8 @@ Device (PCI8) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -1115,6 +1121,8 @@ Device (PCI9) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -1164,6 +1172,8 @@ Device (PCIA) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0x0F) @@ -1238,6 +1248,8 @@ Device (PCIB) Return (RBUF) } // Method(_CRS), this method return RBUF! + PCI_OSC_SUPPORT () + Method (_STA, 0x0, NotSerialized) { Return (0xf) From patchwork Wed Feb 20 07:28:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158781 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602529jaa; Tue, 19 Feb 2019 23:29:25 -0800 (PST) X-Google-Smtp-Source: AHgI3IbtgB+18LtPKVlYNDmVtLMiE5xrvLc+I1pNs2zzm1z2M+cCd2mf5+Q65jH9nrC8LILBtTyV X-Received: by 2002:a17:902:6b49:: with SMTP id g9mr35776541plt.291.1550647765862; Tue, 19 Feb 2019 23:29:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647765; cv=none; d=google.com; s=arc-20160816; b=NSvVOv4NzVBIP/yFm2+fK5/P3TCgrFWc8FhnBuX2uW9uVPw8syRw7UKIOBdVzv4YWl Xgzf3YUCtLs34oBpiggMw76nyEWQBo7I1VqzkDmpx22ThsghLa0b/Hvz1aoB+voFeG05 7jd3dTN4sLTURQ1Fgsen99lfBUjmdoj/FiguL9nAVpEr4LoxGe4dRtoglM/hkS3b7Onl UEcLMyKvkavfJ1Mrxml1FA1s+uUN/To06j/izj1UYjWgJGwt6LU/Pfeq8ObwygN9MCMj TGXhd4xDr7p7riXF9XFLKxdA2DOeXb+Bw1AwrgqL0ZjAXE7KifeIRxM7AAi/Fmh9bNHs Y/qw== 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=ka0rNDgKhwsFPf+PwM9K4xmwK3OtP4pH+PRKDYJileA=; b=lyl+t+4f5bCk/eyqOb/TM/1T8dva2vRT30admV1O6L+ISIQLJMezPqqwN4ITNrRbrU TcZTM9rT4soLuVJdoDsmqd+Dt9N+UkQ4DO1FCxHdHH/j4CEH7qfOVQBlSwd2U6jbCj47 Ul7NAVm4gCFsh3lsPrCXa6Hp0WNTcFdmQlCFaz+3CuLULUa8dncMAqOAO8BFWT76YvRq pdhfmx8nmR6YPGjPHRKzRToJ7OIHnpam5jl02t8ynE+Bkz69o7yY56/+VofTvhBDk28X f9J+McuX+EyvucfrgOsr6qPCeV1lx3zIAlKq1RSwtPhmstFmNkQn41TJLI1bE6KLRBiq SfEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cDaHcY0I; 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 c65si18293281pfe.202.2019.02.19.23.29.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:29:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=cDaHcY0I; 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 9EAFD211CBD06; Tue, 19 Feb 2019 23:29:22 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=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 55D1D211CBD06 for ; Tue, 19 Feb 2019 23:29:21 -0800 (PST) Received: by mail-pf1-x444.google.com with SMTP id u9so4225134pfn.1 for ; Tue, 19 Feb 2019 23:29:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7O72LbCauLQv6X2A/KQ179vLdajE3FuigezLDUyWdVc=; b=cDaHcY0INklmFSeRu9WbAtyMB9MowxrBmmvnxaYxtn+efGRIgKNRi/r2KtmsCTTrIe YRacUR3SlS7Pfqx7Y0B3rWc97zszZVAdMIqvHfHNnZiCk0BkUxT/2qv+Z4EXPvnRtgc+ 3BLRsdHUC9iIiLbkup9FPzUdoIsJq0tnKZNAuRTUxqU28MUUb3EV/8fwONhaB5uaJUKT UVNpmUpob32YK0yYmH36jIB3zY2gYlK0ie0DjYsy042ifcxce4dVUvzVKI0AmGVL1aWN Lgjfb2N3eW2aL7/MPbjsOZ7L7I4E96E8gaBRKL8AzKPi5mzaMqru+SjxSKWTbGx7JdKk wdSg== 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=7O72LbCauLQv6X2A/KQ179vLdajE3FuigezLDUyWdVc=; b=M1dagkxvrSn3T3Vyd/rXvLzcgY/iYpYQOWhddwfzumGvpDdMUCxc3ozyW7VXT1xnuI GaF/ufO5pGZhRuM7HUU9bUaTvJOd36Oxtf8jbiHHUDmOnkma30xtjGhu53h+gmZkvr+q pBOlNWC46gJdo1dTGwt/J5askUT9lsYBUpRdN8waHJCLxnA1AIZvneu/xXTOQg0WaT5k 1j03nlljaVj+XCQLgFBTaG8Y+Y9bovZYQHsMe7GAvCBKOFXearhn+DGgGg2nyOVjcAuc wGhWwRW0dX3fuImLXC2vfYvg78EmvXN0cKcXBPmzTHiiTcGlRa+cZrZYFTWnHulo7xzC GHJg== X-Gm-Message-State: AHQUAubypxPdoCw8Qb8wvgeY0biRxastG55mbtP+0SZe+7p517Yc5ZDG EFFB9Fs1nnmUGluVXS8GtJg9CA== X-Received: by 2002:a63:c0e:: with SMTP id b14mr31830691pgl.236.1550647760984; Tue, 19 Feb 2019 23:29:20 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:20 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:30 +0800 Message-Id: <20190220072837.35058-12-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 11/18] Hisilicon/D06: Add Setup Item "Support DPC" and delete some PCIe menus 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, john.garry@huawei.com, xiaojun2@hisilicon.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 setup item "Support DPC" to enable or disable PCIe DPC (Downstream Port Containment). The pcie menu is suppressed for original code as these menus are not ready. This patch remove the suppression for pcie menu, so delete these menus for now. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Include/Library/OemConfigData.h | 1 + Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr | 2 - Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 4 + Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr | 197 +------------------- Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni | 3 +- 5 files changed, 10 insertions(+), 197 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Include/Library/OemConfigData.h b/Silicon/Hisilicon/Include/Library/OemConfigData.h index f120e3123c83..c0097d0829f0 100644 --- a/Silicon/Hisilicon/Include/Library/OemConfigData.h +++ b/Silicon/Hisilicon/Include/Library/OemConfigData.h @@ -49,6 +49,7 @@ typedef struct { UINT8 OSWdtAction; /*PCIe Config*/ UINT8 PcieSRIOVSupport; + UINT8 PcieDPCSupport; UINT8 PciePort[PCIE_MAX_TOTAL_PORTS]; UINT8 PcieLinkSpeedPort[PCIE_MAX_TOTAL_PORTS]; UINT8 PcieLinkDeEmphasisPort[PCIE_MAX_TOTAL_PORTS]; diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr index 08236704fbfe..93ccb99bdc67 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfigVfr.vfr @@ -62,11 +62,9 @@ formset prompt = STRING_TOKEN(STR_IBMC_CONFIG_FORM_TITLE), help = STRING_TOKEN(STR_IBMC_CONFIG_FORM_HELP); - suppressif TRUE; goto PCIE_CONFIG_FORM_ID, prompt = STRING_TOKEN(STR_PCIE_CONFIG_FORM_TITLE), help = STRING_TOKEN(STR_PCIE_CONFIG_FORM_HELP); - endif; goto MISC_CONFIG_FORM_ID, prompt = STRING_TOKEN(STR_MISC_CONFIG_FORM_TITLE), diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c index 6668103af027..be4ce8820f73 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c @@ -290,6 +290,10 @@ OemConfigUiLibConstructor ( Configuration.OSWdtTimeout = 5; Configuration.OSWdtAction = 1; // + //Set the default value of the PCIe option + // + Configuration.PcieDPCSupport = 0; + // //Set the default value of the Misc option // Configuration.EnableSmmu = 1; diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr index 7cf7cdd29ba2..c65907fe846e 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr @@ -17,203 +17,12 @@ form formid = PCIE_CONFIG_FORM_ID, title = STRING_TOKEN (STR_PCIE_CONFIG_FORM_TITLE); - goto VFR_FORMID_PCIE_SOCKET0, - prompt = STRING_TOKEN (STR_PCIE_CPU_0_PROMPT), - help = STRING_TOKEN (STR_PCIE_CPU_PROMPT_HELP); - - goto VFR_FORMID_PCIE_SOCKET1, - prompt = STRING_TOKEN (STR_PCIE_CPU_1_PROMPT), - help = STRING_TOKEN (STR_PCIE_CPU_PROMPT_HELP); - - oneof varid = OEM_CONFIG_DATA.PcieSRIOVSupport, - prompt = STRING_TOKEN (STR_SRIOV_SUPPORT_PROMPT), - help = STRING_TOKEN (STR_SRIOV_SUPPORT_HELP), + oneof varid = OEM_CONFIG_DATA.PcieDPCSupport, + prompt = STRING_TOKEN (STR_DPC_SUPPORT_PROMPT), + help = STRING_TOKEN (STR_DPC_SUPPORT_HELP), option text = STRING_TOKEN (STR_DISABLE), value = 0, flags = MANUFACTURING | DEFAULT | RESET_REQUIRED; option text = STRING_TOKEN (STR_ENABLE), value = 1, flags = RESET_REQUIRED; endoneof; endform; -form formid = VFR_FORMID_PCIE_SOCKET0, - title = STRING_TOKEN(STR_PCIE_CPU_0_PROMPT); - - goto VFR_FORMID_PCIE_PORT2, - prompt = STRING_TOKEN(STR_PCIE_PORT_2_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - - goto VFR_FORMID_PCIE_PORT4, - prompt = STRING_TOKEN(STR_PCIE_PORT_4_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - - goto VFR_FORMID_PCIE_PORT5, - prompt = STRING_TOKEN(STR_PCIE_PORT_5_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - - goto VFR_FORMID_PCIE_PORT6, - prompt = STRING_TOKEN(STR_PCIE_PORT_6_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - - goto VFR_FORMID_PCIE_PORT7, - prompt = STRING_TOKEN(STR_PCIE_PORT_7_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - -endform; - -form formid = VFR_FORMID_PCIE_SOCKET1, - title = STRING_TOKEN(STR_PCIE_CPU_1_PROMPT); - goto VFR_FORMID_PCIE_PORT10, - prompt = STRING_TOKEN(STR_PCIE_PORT_10_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - - goto VFR_FORMID_PCIE_PORT12, - prompt = STRING_TOKEN(STR_PCIE_PORT_12_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); - - goto VFR_FORMID_PCIE_PORT13, - prompt = STRING_TOKEN(STR_PCIE_PORT_13_PROMPT), - help = STRING_TOKEN(STR_PCIE_PORT_PROMPT_HELP); -endform; - -form formid = VFR_FORMID_PCIE_PORT0, - title = STRING_TOKEN(STR_PCIE_PORT_0_PROMPT); - #undef INDEX - #define INDEX 0 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT1, - title = STRING_TOKEN(STR_PCIE_PORT_1_PROMPT); - - #undef INDEX - #define INDEX 1 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT2, - title = STRING_TOKEN(STR_PCIE_PORT_2_PROMPT); - - #undef INDEX - #define INDEX 2 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT3, - title = STRING_TOKEN(STR_PCIE_PORT_3_PROMPT); - - #undef INDEX - #define INDEX 3 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT4, - title = STRING_TOKEN(STR_PCIE_PORT_4_PROMPT); - - #undef INDEX - #define INDEX 4 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT5, - title = STRING_TOKEN(STR_PCIE_PORT_5_PROMPT); - - #undef INDEX - #define INDEX 5 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT6, - title = STRING_TOKEN(STR_PCIE_PORT_6_PROMPT); - - #undef INDEX - #define INDEX 6 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT7, - title = STRING_TOKEN(STR_PCIE_PORT_7_PROMPT); - - #undef INDEX - #define INDEX 7 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT8, - title = STRING_TOKEN(STR_PCIE_PORT_8_PROMPT); - - #undef INDEX - #define INDEX 8 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT9, - title = STRING_TOKEN(STR_PCIE_PORT_9_PROMPT); - - #undef INDEX - #define INDEX 9 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT10, - title = STRING_TOKEN(STR_PCIE_PORT_10_PROMPT); - - #undef INDEX - #define INDEX 10 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT11, - title = STRING_TOKEN(STR_PCIE_PORT_11_PROMPT); - - #undef INDEX - #define INDEX 11 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT12, - title = STRING_TOKEN(STR_PCIE_PORT_12_PROMPT); - - #undef INDEX - #define INDEX 12 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT13, - title = STRING_TOKEN(STR_PCIE_PORT_13_PROMPT); - - #undef INDEX - #define INDEX 13 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT14, - title = STRING_TOKEN(STR_PCIE_PORT_14_PROMPT); - - #undef INDEX - #define INDEX 14 - #include "PciePortConfig.hfr" - -endform; - -form formid = VFR_FORMID_PCIE_PORT15, - title = STRING_TOKEN(STR_PCIE_PORT_15_PROMPT); - - #undef INDEX - #define INDEX 15 - #include "PciePortConfig.hfr" - -endform; - diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni index d87d30f975b8..0127ea952dee 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni @@ -26,7 +26,8 @@ #string STR_PCIE_CPU_1_PROMPT #language en-US "CPU 1 PCIE Configuration" #string STR_SRIOV_SUPPORT_PROMPT #language en-US "SRIOV" #string STR_SRIOV_SUPPORT_HELP #language en-US "This option enables / disables the SRIOV function" - +#string STR_DPC_SUPPORT_PROMPT #language en-US "Support DPC" +#string STR_DPC_SUPPORT_HELP #language en-US "This option enables / disables the DPC function" #string STR_PCIE_PORT_PROMPT_HELP #language en-US "Press to config this port." #string STR_PCIE_PORT_0_NULL_PROMPT #language en-US "" #string STR_PCIE_PORT_0_PROMPT #language en-US "CPU 0 Pcie - Port 0" From patchwork Wed Feb 20 07:28:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158782 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602579jaa; Tue, 19 Feb 2019 23:29:30 -0800 (PST) X-Google-Smtp-Source: AHgI3IYMEGDx2cM4KrtDbaaryX+Mr0vOHyblTnf6+IoGRVQ/VKtzZgEAGlXw9b35kX9mcGPFP6J3 X-Received: by 2002:a62:fb10:: with SMTP id x16mr19686356pfm.5.1550647770119; Tue, 19 Feb 2019 23:29:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647770; cv=none; d=google.com; s=arc-20160816; b=NvC6c/tPQAPmA1VSv8RtpYx4FXNo8u5qWF/RK6fOC6Gzn4K7mrVXMTVK7yEF1CoGYs 3ksitHngb4O/s0Z4LtAh/u5LbHipVH2En/8RCffjaGuAn0sxgNfmdWxisz/xosyqQuSA IUgeIncGHmHaInq6X2sKYB7rRXCMQfyVtByg7r58tx0jqAYnkse1C4fSoHpUqaHOmgP6 pAwT7ClDn6RkUUSb4fqWaTUKajezXqZJnfsgqHQXTIbExsJZNuDpxeYIBPndoSrVNaBy aw80c/F/+NGj64e96Rrcr2McpKgyz9rMUFZqRsxsmMv4fMa+YKDRIc2aTs0TMrwomRix FTnA== 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=A+9rGRM3eATvBaGyJr8qGL8eEED1mNtEmbANaYbulpY=; b=ujninqngxpJK3bKDSWFtKys+4QEYG/d42jvHr2621CaT5PB7dp8YRo/Qh47F7ljaxF gfktTbgDeUCp5OBby0PHFXEQ9O1k1IXUveaImrmLba0ZVOo6Bdj0KJR4G937/7lC8ZMA Yxbg3rQoe7vNcCWmt6zKp1URw5F6J/v0QRLdCMaUTVHYF4aAHSrE0uXmhkFpRSSVybY5 w9J+4+SQKuoYhFAfuNk9eEyUtnV59ntfgf4SyGafJyXmjfjq+4EhDiMp98zPdieCXrsF uP/+EKf3IsYHCbX+2ZWLHJGgBfKL43p0R371e0VZ802ztSWVhHbNqTyOztSDqbUYrrXE EGGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eMI5qmZl; 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 m1si1369566plt.28.2019.02.19.23.29.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:29:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eMI5qmZl; 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 DB27E211CBD08; Tue, 19 Feb 2019 23:29:25 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=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 8ACC1211CAF43 for ; Tue, 19 Feb 2019 23:29:24 -0800 (PST) Received: by mail-pg1-x543.google.com with SMTP id q206so11432983pgq.4 for ; Tue, 19 Feb 2019 23:29:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ip0V/JyUxL0WXiEF06KmBbPN/FjAEZTo8CxpaLVHztg=; b=eMI5qmZl7kpI4qkxnEu4SceoWQaUmAtow34nD/06sQzltdVsSLoXtS+OMnpnWfymHs EEALl0CgrBYff57I9mWewF/HUFDFUOg5Kq8tW20Ps85r8JSrSkBdnojnhT2EgyD4I+8U LctYHuOdZeuuFi+h0YpXjT2Q199P6nxtLrPW794UmG7604TpGj2ymzTWOqFz6W8n/W/q lMrVVYjDgSWdcpWa5/kXWQsf8AwW4TYt/oRDIdAr4Xs+YFTjqkgqfpnQSAfB/+5yCcUV Gt6q6gPiKd99jQ40wCRh+rVByAqpAbSFbyHUy7Z4KuOURzYzuuLlnAsmjfrjtOQPLISP 1q7Q== 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=ip0V/JyUxL0WXiEF06KmBbPN/FjAEZTo8CxpaLVHztg=; b=OAX3dBr56IL5jtkcnr16OKNhXbShe4CZ7Htenfbb2qjJuZ/xqEx58j0QRGBSwRCQnl cZ/ctFKyBgo8CbaZ7nOqRei2hY99Ou5YAM5T3KjTlAFjHd6GJcztOFVaZ9QZg7BVi2Gp s2ii40OIH3bTZoVTQflgJYCJZWs06fIVswIQgWiDFfOaRA5gtb7brf2Z4nUnUE3CQFlV TANZRJ7zLz+X3AddIjBiJaxY5QABwi2hDKW1rBEZ37+Ma+g8AmtD4aMUbMjk0+e+GR0j +gY4ymF3F1nA5V7oHkc5EFVu17VNgoaKymY1AXp/pMsqG7ZRgrtYVt33/KilONkxmf0c TavA== X-Gm-Message-State: AHQUAuatysTQpPx86MXs65RU9cWa0djCyNpuDJF1nO9HeO3HyfH+8/U2 IFBvGFwXhQp1+Ufdhkm/azMhrg== X-Received: by 2002:a62:e910:: with SMTP id j16mr19912146pfh.44.1550647764277; Tue, 19 Feb 2019 23:29:24 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:23 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:31 +0800 Message-Id: <20190220072837.35058-13-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 12/18] Hisilicon/D06: Use new flash layout 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, john.garry@huawei.com, xiaojun2@hisilicon.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" In new flash layout, BIOS fd change from offset 1M to 8M in 16M spi flash. Use the new CustomData.Fv which indicate the offset of fd and which flash area can be updated for BMC. This patch is relative with patch "Use new flash layout" in edk2-non-osi. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D06/D06.fdf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf index d495ad7f264c..f72b513352fb 100644 --- a/Platform/Hisilicon/D06/D06.fdf +++ b/Platform/Hisilicon/D06/D06.fdf @@ -29,7 +29,7 @@ [DEFINES] ################################################################################ [FD.D06] -BaseAddress = 0x204100000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. +BaseAddress = 0x204800000|gArmTokenSpaceGuid.PcdFdBaseAddress # The base address of the Firmware in NOR Flash. Size = 0x00400000|gArmTokenSpaceGuid.PcdFdSize # The size in bytes of the FLASH Device ErasePolarity = 1 @@ -124,7 +124,7 @@ [FD.D06] 0x003E0000|0x00010000 0x003F0000|0x00010000 -FILE = Platform/Hisilicon/D0x-CustomData.Fv +FILE = Platform/Hisilicon/D06/CustomData.Fv ################################################################################ # From patchwork Wed Feb 20 07:28:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158783 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602720jaa; Tue, 19 Feb 2019 23:29:39 -0800 (PST) X-Google-Smtp-Source: AHgI3Ib3fKCWADJ+NJdy0Y5m1L+W7yFaNvCVRUCclasG1Ul8oJc6gLzfMGAMgdG/46/RasZMDYK6 X-Received: by 2002:a62:e005:: with SMTP id f5mr34469871pfh.64.1550647779351; Tue, 19 Feb 2019 23:29:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647779; cv=none; d=google.com; s=arc-20160816; b=OvnvLyNiKjDorPhULqmL65ExRQZeHnCVC0QVmwXpo6FzigfEvb8EtC4B14QW4ycIBi 4KPDGbZYKMVH9dTwVeXWacaPOFOKkrNdoJJL0J4zuGxBMSKKSKk8BjXN9P0KTq2cLw0S KH3qvcSGY+o+j7roMK1TZAJ7B9hclh7YyOhp6XztvKwUijw/4KPC5ln4rzgI7iTU4/FB LR0DvOQmvKkBnacpDnxoEvz0J6MUNXtQB7YSBHlweZq0QubjS6pCS0FscYTlIgDCFLc1 /duX6vMNS+93sbutv3ljwxt6mjrslR+SAaA3kuKB4vhC08shey9d/ck2PW/Gb0nteRea Mmkg== 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=uKKCcgMzlsmgyw9hri52o3QJaQADHRuEdsEI1MVF1q4=; b=pe+W1jFrok74/PhegeUPAiWUil9LnofzJD2QTSjfKwxnPEUrVzUwseNZSHct9NILeo dRH9v8bySh5t+OjYOTLKi/EE1GoXMWRR3SS+qXXgi2u4CCNEp2TOutbMTH9GrLEiO+e8 NqojvFPP+CUK2WojuNWTVUQ+XTkcwit9pgogqiCMZZ+m/0nkzb77nahVh0pI+UeSJRst 0Sycgg+VNK3Ecn1B8LVZccPo0gd+b6tGXESNKZTfOCQt216LH9fPiFeIR1jXCaz53nQf 12hiYfGCJOQKjCQMBWNKsGZUXQoSqRR6FgUkXi63jOWspGwAzcNWNHCLH5U3pUMSRHej MuyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=x8uWp6JY; 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 9si19135741plf.398.2019.02.19.23.29.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:29:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=x8uWp6JY; 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 54D5F211CBD14; Tue, 19 Feb 2019 23:29:32 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=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 2C8F3211CBD0F for ; Tue, 19 Feb 2019 23:29:31 -0800 (PST) Received: by mail-pl1-x644.google.com with SMTP id q3so4389924pll.4 for ; Tue, 19 Feb 2019 23:29:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KPvaOhlQIrNttpd1zHkY7VkO3sW9z9lwAOQ0UmqlufM=; b=x8uWp6JYCd31w8ZuQqc4UbZATi9gsZPg+zHBZDaO6hxEcQO4klCZPXsTp8YMDL+aET 5CPbIAQ12y6GV5bdi9rhe0wb3ZpB46q2OUIc4BVZYWneaNa8CtzSW2tE3GvSe7oqiut/ C7ycntBDuL50neutHiDCCTRHQOyDdkiUQYLOKeXfswJJLlf3gL2gkzgM7jtNZJsOZTnl 3j4GEpcWlEGXrra67NhsnlDsFEduyHDNUnN8PwC+1SpI9hFuUQkO5ACu8+/Y4Q4JXp52 64z6MMz0KDCkRD+fUDfpmiUA2CFUmkPiYWoddoCrTuXH52FGjZvA7U0WNCBTRC8mhIhX 7YLA== 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=KPvaOhlQIrNttpd1zHkY7VkO3sW9z9lwAOQ0UmqlufM=; b=Kus+BcrgXxFm7iCxY7OXD43mQoQvoLLEmdXg4a+fZIssQS/i16yRt7Uloc5L2dCBBA ryPml8xuMHNiTASunJwWeEFzX9NuCKVwOH6/60MTkp6ipWSNMdHCLtbs77oD8pIV5Ptc ZG7YvEUHPhfDSHpHX6RFycLkoRY/gHEJEsI8v/V/oV6iATSydAASkPV8kHgFqNRu9iJM zNnKnfZdAhJ79PHfXMOlBk3D5JyrlSelLCsB3v6jZXTBOqmY8mCkiKmAHKO7skCM6ZeC bavs5abaZP5/ED8jpm8A4Y+M/Tn416Al9PQJEvBWVZDW+7TBO1aYzYkOYYyT/v81jHJJ BTfg== X-Gm-Message-State: AHQUAuZUWZCGc0sUmyVz1tkfPijGYHYmk0ywCl8JJU0tU2zMccG1M4iv QXngyIH7mtGtWGqHDOAtorKmOg== X-Received: by 2002:a17:902:7b85:: with SMTP id w5mr30871361pll.288.1550647770788; Tue, 19 Feb 2019 23:29:30 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:30 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:33 +0800 Message-Id: <20190220072837.35058-15-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 14/18] Hisilicon/D0x: Remove SP805 watchdog pcd 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, john.garry@huawei.com, xiaojun2@hisilicon.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" SP805 watchdog is no used for D0x, so remove it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/D03/D03.dsc | 3 --- Platform/Hisilicon/D05/D05.dsc | 3 --- Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf | 1 - 3 files changed, 7 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index fe443dd929ad..35b54f8c83be 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -149,9 +149,6 @@ [PcdsFixedAtBuild.common] gHisiTokenSpaceGuid.PcdPcieRootBridgeMask|0x7 # bit0:HB0RB0,bit1:HB0RB1,bit2:HB0RB2,bit3:HB0RB3,bit4:HB1RB0,bit5:HB1RB1,bit6:HB1RB2,bit7:HB1RB3 - ## SP805 Watchdog - Motherboard Watchdog - gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase|0x601e0000 - ## Serial Terminal gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x2F8 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 0c4f21fbe056..49bd5b37ea34 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -163,9 +163,6 @@ [PcdsFixedAtBuild.common] gHisiTokenSpaceGuid.PcdPcieRootBridgeMask2P|0x34F4 # bit0:HB0RB0,bit1:HB0RB1,bit2:HB0RB2,bit3:HB0RB3,bit4:HB0RB4,bit5:HB0RB5,bit6:HB0RB6,bit7:HB0RB7 # bit8:HB1RB0,bit9:HB1RB1,bit10:HB1RB2,bit11:HB1RB3,bit12:HB1RB4,bit13:HB1RB5,bit14:HB1RB6,bit14:HB1RB15 - ## SP805 Watchdog - Motherboard Watchdog - gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase|0x601e0000 - ## Serial Terminal gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x602B0000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200 diff --git a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf index 3563df6e10d1..4ce5f5fea1f3 100644 --- a/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf +++ b/Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlatformLib.inf @@ -61,5 +61,4 @@ [FixedPcd] gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gHisiTokenSpaceGuid.PcdSysControlBaseAddress gHisiTokenSpaceGuid.PcdPeriSubctrlAddress - gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase From patchwork Wed Feb 20 07:28:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158784 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602793jaa; Tue, 19 Feb 2019 23:29:44 -0800 (PST) X-Google-Smtp-Source: AHgI3IaEGK1NZruFxXiDrtn9bvvaxfc84u7QebSQKYun7CfMgz1cjw4QHOUxkge4wN0o1jQUE3uL X-Received: by 2002:a62:1346:: with SMTP id b67mr34596602pfj.195.1550647784803; Tue, 19 Feb 2019 23:29:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647784; cv=none; d=google.com; s=arc-20160816; b=lIFRCt6Cfv9E7ed7URVwfDC6So8fKR61lwnDQmt/yq9sMa/GcVFbSxrHaXGBkygcnn AYazEANyTnt2GcUTrKAvmXq1pdX90FeRUB6MM+KFkN/KaEjGsMh9zViTPYFFLCNQlFbK EmG0rLtexsiDDtyChMX5BL5dnIPM2vIeSz3Y9MOpBCuQZhLxQLL7Br+/0tf/O42SxIzq xaKqiQGu7RJ3mt4cmyeoU08LWLbFBQEFi3cf9+ixZDGBMN+v4tWtujHPfHHdtxvZEsx3 wkXSLa9lvQYG9hlOsSoTdq4QzWhJMEIrmMgpRn/alt43S9lth0jeXy7Sq+wi1O4/XFKC 7oig== 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=pj09kqIMCY8u+oPkSDPJF5MDuY4qeGNRNwPL/gqOZ1k=; b=VaKhSS7AtzaLwn6NT6CWVDkj8OtaeKaB8IDAdj54DXzlBwepUDNwQh8T2DQVRGjq3j xMuq7UwiOJvha+cqSNZgDUqeP8zZDJMZF2etmW8VvaMJQFYs3AkH5M6XNX64ciH/R6KE 0VofDS4mzZF1S4jV7xapdBAbXkZjU1dOzkz2JLvl6RY5EFVs2QPvbJxKocVKi6X2/kIV 95ixfC6wmtbZeYHOcpWbn1Y93V2o9F3Et/dV4CbrtjS+68ISE3Ou3GgycxTWW9PeWu4U Pk43DR3S695nfyVJtx/VE0Iw/bi1FdLBmcLF5ook2j9GWzMrVLXkbIcc4OsTYkSYwM1b 4Kwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HdA18iVS; 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 y40si19674528pla.251.2019.02.19.23.29.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:29:44 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=HdA18iVS; 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 86674211CBD1A; Tue, 19 Feb 2019 23:29:35 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5A2D6211CBD17 for ; Tue, 19 Feb 2019 23:29:34 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id q17so11478164pfh.10 for ; Tue, 19 Feb 2019 23:29:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=D2GO8YDi/c7moPsk5SNIntPWbx5jh74iUOgZv5Kf+Lc=; b=HdA18iVSqJh/btFAP42GaeeUDTCc1CIG27RQBLWWmdyqeCbk3LBNgWKinc/NCPLj/m ZaSGbOvu71JgGX/kssmfG6MgJ/A9Hh2R7R4NaQ10hbQAlqa9IkWbPNQMiKLmfRFr1Wi9 oUgETndUoluduRFzcWMB/l4wekH7naRdBVKKDvaxgasew8UYY7RKD3m/+2BTB14M60DI N1vNBrc3Zy6JVsr5eDf/djNKQNvLDv7Cf0LiOJ6DzGSArrR8A8+Rp5hINfG+oUqWGE2t VPU3wN29ICiPiTMDrb+jy/UYJVZ8KXBsipm0rLmrf7Xv4nck1OozOiKJMqKddCKtjz6D ntfA== 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=D2GO8YDi/c7moPsk5SNIntPWbx5jh74iUOgZv5Kf+Lc=; b=jqVHfCVe9OUB0q6vAl8rL5+/uqOOrj2wAK23Aw7rVrff/9p/14hiCUkjochG87WNC0 8d+6G4la9UCQYWmQMB2RP4YY4hsJel3YkSWDsuE8pijtxHTLuZ1brg+QbEuSfGBjhMjR 3xSBPxQQcZRK3YlcMtkSJNVhlB/WDM2ml6VdZ+oNeaNVw3/LmFGMdKaTW+z3bHF9+Lt2 HfXnzhxrGGUC/A54cUhUWTmSqZNItrtlyJF9gkOat78rnT0J+q32FeV4TjBDvNxtVpPN m/1+pQ9/gsxvZOGvQyHJGIyo5wKq5E8Fdlwd952gZkJwr9hpbC3c7FDMLBsdlDn2L0yv Z33Q== X-Gm-Message-State: AHQUAuaDw7uIyWDTjO9XzqFxF/3ErcIs6bXbDZIpYOP3PrQKDles23rk JQL05K4s++DugISqAD9Q5XLOgg== X-Received: by 2002:a63:2004:: with SMTP id g4mr162554pgg.337.1550647774048; Tue, 19 Feb 2019 23:29:34 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:33 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:34 +0800 Message-Id: <20190220072837.35058-16-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 15/18] Hisilicon/D06: Fix USB crash issue(4079) 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, john.garry@huawei.com, xiaojun2@hisilicon.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" Last patch "Modify IORT" change revision id of node type 2 to 1, and 4.19 later kernel will judge the revision id to get root pci bridge DMA informations from IORT. As Hi1620 USB 2.0 don't support 64 bit DMA, but the DMA attribute get from IORT node type 2 is 64 bit. So add _DMA method in USB pci bridge 3 and pci bridge 8 to fix usb crash when usb device is present issue. https://bugs.linaro.org/show_bug.cgi?id=4079 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+) -- 2.9.5 _______________________________________________ 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 6dc380f27fa2..c1083dc16a2a 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Dsdt/Hi1620Pci.asl @@ -375,6 +375,29 @@ Device (PCI2) PCI_OSC_SUPPORT () + Method(_DMA, 0, Serialized) + { + Return (ResourceTemplate() + { + QWORDMemory( + ResourceConsumer, + PosDecode, // _DEC + MinFixed, // _MIF + MaxFixed, // _MAF + Prefetchable, // _MEM + ReadWrite, // _RW + 0, // _GRA + 0x00000000, // _MIN + 0xFFFFFFFF, // _MAX + 0x00000000, // _TRA + 0x100000000, // _LEN + , + , + , + ) + }) + } + Method (_STA, 0x0, NotSerialized) { Return (0xf) @@ -1077,6 +1100,29 @@ Device (PCI8) Return (0xf) } + Method(_DMA, 0, Serialized) + { + Return (ResourceTemplate() + { + QWORDMemory( + ResourceConsumer, + PosDecode, // _DEC + MinFixed, // _MIF + MaxFixed, // _MAF + Prefetchable, // _MEM + ReadWrite, // _RW + 0, // _GRA + 0x00000000, // _MIN + 0xFFFFFFFF, // _MAX + 0x00000000, // _TRA + 0x100000000, // _LEN + , + , + , + ) + }) + } + Method (_PXM, 0, NotSerialized) { Return(0x02) From patchwork Wed Feb 20 07:28:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158785 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4602922jaa; Tue, 19 Feb 2019 23:29:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IYoSUO8p7tMlytcWRJTI7jx30bt7F1NzKSCHIeGgpkBRn5F9Exf8vURqFe6Y0EoZo7Aws6V X-Received: by 2002:a17:902:7d95:: with SMTP id a21mr24891854plm.248.1550647796334; Tue, 19 Feb 2019 23:29:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647796; cv=none; d=google.com; s=arc-20160816; b=NMzMLcVwrRBdASO5I3UBH4fbkiZkqJ+WuTMzzsWTK/end38OYfvI+F09LOXJqU5P5m 1Nzen29R+cn7+j9t0PmiE3LAEuv1235NZ2wmZuw2zKaWbzJK0jA32cHNqah/ozaW5i1b bsCi2q38yOYwz5NY32LBleYY2iA6SrMS4TSwNupIwV3/dflmD+ROg5ATr5dOPPOdSShG kKr3wX+JatrkV8fwmL9e3rLddBG9wLWJ8zyRsrN7DuM4e8dQCX48DjOuP2xwAeZ+vjJb q/gLOrB2TzVrOlXBGtChICCv44qDfbNkcE7gxiTgZzcExgUoUxdYLEmIjZuPYLJ5d1ii Kwsg== 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=/R91AkjbEnJa5kP4/WpybDjv0S7YZ9c+//zFRT5ihRo=; b=Fb/mSDCBGL4F92u8R2jzSALxVeaE4IHVSWVxhyjoUX6gVnbfDP6z0cNDQnjeQkJPcA UFc3vz/XoSwJgNNHgG8k8TyQn7xlplbnjebKqFPSiVF2FOm/eALcC04BdB0zuHLI/FdW 3ER7iDba0jAd3EHqtU935SQS1U8FVh5XMXYjpB3k23/0tnVb4UOMGpKcUowobBg1j2Dm O76MJ8EeCwQ95rarlAf8oxtfOhM/GgAEzqXfiGdx6rbsCYYCwgo5BUZv2GFZZ1ofWNC9 zdI6JYmEh5gun9D2ZbXAUlv55BHMQJ0VAdcGnhXjHCq2qHSgMAEGczBgKLzSpX3ilhF4 d9/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="B/PDWBTV"; 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 31si19209453plg.291.2019.02.19.23.29.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:29:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="B/PDWBTV"; 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 04133211CC3A1; Tue, 19 Feb 2019 23:29:44 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 9DB25211CACB4 for ; Tue, 19 Feb 2019 23:29:41 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id m10so2103312plt.10 for ; Tue, 19 Feb 2019 23:29:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+XJ2U7cSfY0a9W5bG87+/f8HkC4wfI7jW2PQ8qAwzFA=; b=B/PDWBTV2yTH89ZyQsESJ/xkOgkKHtoBsjtLHt7naIHCx6Fh0lLtvT8BO/p76nYVD4 8fFTuQgRz4mLq8BQbw92xkB/UGliupr1WoL4T3QASufd/awBSV4CoqXRgNW21FIwVtW0 6cAyBz8uCc4NWHhicYyyi2j1P4gU1CIq4qP3ON7ZadmTclcc7JJOUOcT/4Vd3TROJAZS prPJIVXNft/K7ZDmZqL3eb+AMslXsFd744ADfS2QJEOzMg8fBHMAF7BVDNaxpsQK2+B8 1wR1xMNiLQ/q1COYhGy/nS9ldD11x0ktg8cBUU4MKhxXGm3+b3LP8XkSOsvCBkagNvde OaGQ== 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=+XJ2U7cSfY0a9W5bG87+/f8HkC4wfI7jW2PQ8qAwzFA=; b=KGbxi8eA15XozTOWgPlOYMj7r3pA7xjkha+xWzoy9YJrx5Hv2iPNSGnRrOcIuz74Tu 8IriMKmfJdVq+K7LldGWMK+5bycqG0B1a02lCqzsxGqU+Oeqyh2XirK3MZ6OiGcJy31F MYnUA22Pan+w3NhrLkMs77WQwetsO1e1tuE1SPbDPbzdTJFnWLKh++pYkzAj7righXbi DnaFj7J9bhZTM45aUGs0tacKSqIC907QdfSfAxjggE+0VWvmfFgzJoZ3DXAJNnF7X7IA xs1Oy+3VUZczwtxxAKGIR/03FM0W30Cjc9l938q7VY5pGKm9zipZzVQcUvsl45mLnx4k wW0w== X-Gm-Message-State: AHQUAubfX/w3Gpi8vKN7niQ/9vXyvW3a6LjU13QazEIq1tG+rB1F4ZZe f5CvlFPHk+Bc8Nv9ecbRP5cTlA== X-Received: by 2002:a17:902:700c:: with SMTP id y12mr20675070plk.71.1550647780800; Tue, 19 Feb 2019 23:29:40 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:40 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:36 +0800 Message-Id: <20190220072837.35058-18-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 17/18] Hisilicon/D0x: Delete some header files 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, john.garry@huawei.com, xiaojun2@hisilicon.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 some interfaces exposed only by implementations in edk2-non-osi, so delete corresponding header files and modify code to make build. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf | 1 + Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf | 2 +- Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf | 1 + Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf | 1 + Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf | 1 + Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf | 1 + Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf | 1 + Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf | 1 + Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 2 +- Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf | 1 + Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf | 1 + Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf | 1 + Silicon/Hisilicon/Library/I2CLib/I2CLib.inf | 1 + Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf | 1 + Silicon/Hisilicon/Hi1610/Include/Library/SerdesLib.h | 22 ---- Silicon/Hisilicon/Hi1616/Include/Library/SerdesLib.h | 22 ---- Silicon/Hisilicon/Include/Library/IpmiCmdLib.h | 110 ------------------- Silicon/Hisilicon/Include/Library/LpcLib.h | 113 -------------------- Silicon/Hisilicon/Include/Library/OemAddressMapLib.h | 45 -------- Silicon/Hisilicon/Include/Library/PlatformSysCtrlLib.h | 112 ------------------- 20 files changed, 14 insertions(+), 426 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf index c65cf7b6dd9f..90e40ae2b393 100644 --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf @@ -30,6 +30,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf index 0fa7fdf80fa8..c0195b2fa9cf 100644 --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf @@ -30,7 +30,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec - + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf index 0f6b68d4c88d..e82c9204d5d6 100644 --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf @@ -29,6 +29,7 @@ [Packages] ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf index 022c3e940a31..7ec577530610 100644 --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf @@ -30,6 +30,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf index 8296ee02de4e..715a4efadde8 100644 --- a/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf +++ b/Platform/Hisilicon/D06/EarlyConfigPeim/EarlyConfigPeimD06.inf @@ -29,6 +29,7 @@ [Packages] ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf index 75c5054bbfd1..9bc6eb549c41 100644 --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf @@ -31,6 +31,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Platform/Hisilicon/D06/D06.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf index 93a2bcac3726..94f6fe404c6d 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf @@ -31,6 +31,7 @@ [Packages] IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf index 2275586ff324..808da65cd429 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf @@ -32,6 +32,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf index 669e6a2d52cc..0c37b53af987 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf @@ -58,7 +58,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec IntelFrameworkPkg/IntelFrameworkPkg.dec IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec - + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf b/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf index c07a5b8aa250..5b917fd3fdea 100644 --- a/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf +++ b/Silicon/Hisilicon/Drivers/VirtualEhciPciIo/VirtualEhciPciIo.inf @@ -30,6 +30,7 @@ [Sources] [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf index 89447cc52d76..aa8e3c9c0b63 100644 --- a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf +++ b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf @@ -35,6 +35,7 @@ [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf b/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf index b603523100ae..d6b5248fcdbf 100644 --- a/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf +++ b/Silicon/Hisilicon/Library/BmcConfigBootLib/BmcConfigBootLib.inf @@ -27,6 +27,7 @@ [Sources.common] [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf b/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf index 9bca88fe8702..e9520b39530e 100644 --- a/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf +++ b/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf @@ -31,6 +31,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf index 1bb4f5c703bb..6211373ce7ba 100644 --- a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf +++ b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf @@ -31,6 +31,7 @@ [Packages] MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec ArmPlatformPkg/ArmPlatformPkg.dec + Silicon/Hisilicon/HisiliconNonOsi.dec Silicon/Hisilicon/HisiPkg.dec diff --git a/Silicon/Hisilicon/Hi1610/Include/Library/SerdesLib.h b/Silicon/Hisilicon/Hi1610/Include/Library/SerdesLib.h deleted file mode 100755 index b493dd9ac090..000000000000 --- a/Silicon/Hisilicon/Hi1610/Include/Library/SerdesLib.h +++ /dev/null @@ -1,22 +0,0 @@ -/** @file -* -* Copyright (c) 2016, Hisilicon Limited. All rights reserved. -* Copyright (c) 2016, Linaro Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _SERDES_LIB_H_ -#define _SERDES_LIB_H_ - -EFI_STATUS -EfiSerdesInitWrap (VOID); - -#endif diff --git a/Silicon/Hisilicon/Hi1616/Include/Library/SerdesLib.h b/Silicon/Hisilicon/Hi1616/Include/Library/SerdesLib.h deleted file mode 100644 index b493dd9ac090..000000000000 --- a/Silicon/Hisilicon/Hi1616/Include/Library/SerdesLib.h +++ /dev/null @@ -1,22 +0,0 @@ -/** @file -* -* Copyright (c) 2016, Hisilicon Limited. All rights reserved. -* Copyright (c) 2016, Linaro Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _SERDES_LIB_H_ -#define _SERDES_LIB_H_ - -EFI_STATUS -EfiSerdesInitWrap (VOID); - -#endif diff --git a/Silicon/Hisilicon/Include/Library/IpmiCmdLib.h b/Silicon/Hisilicon/Include/Library/IpmiCmdLib.h deleted file mode 100644 index b956ee6d072a..000000000000 --- a/Silicon/Hisilicon/Include/Library/IpmiCmdLib.h +++ /dev/null @@ -1,110 +0,0 @@ -/** @file -* -* Copyright (c) 2017, Hisilicon Limited. All rights reserved. -* Copyright (c) 2017, Linaro Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _IPMI_CMD_LIB_H_ -#define _IPMI_CMD_LIB_H_ - -#define BOOT_OPTION_BOOT_FLAG_VALID 1 -#define BOOT_OPTION_BOOT_FLAG_INVALID 0 - -typedef enum { - EfiReserved, - EfiBiosFrb2, - EfiBiosPost, - EfiOsLoad, - EfiSmsOs, - EfiOem, - EfiFrbReserved1, - EfiFrbReserved2 -} EFI_WDT_USER_TYPE; - -typedef enum { - NoOverride = 0x0, - ForcePxe, - ForceDefaultHardDisk, - ForceDefaultHardDiskSafeMode, - ForceDefaultDiagnosticPartition, - ForceDefaultCD, - ForceSetupUtility, - ForceRemoteRemovableMedia, - ForceRemoteCD, - ForcePrimaryRemoteMedia, - ForceRemoteHardDisk = 0xB, - ForcePrimaryRemovableMedia = 0xF -} BOOT_DEVICE_SELECTOR; - -// -// Get System Boot Option data structure -// -typedef struct { - UINT8 ParameterVersion :4; - UINT8 Reserved1 :4; - UINT8 ParameterSelector :7; - UINT8 ParameterValid :1; - // - // Boot Flags Data 1 - // - UINT8 Reserved2 :5; - UINT8 BiosBootType :1; - UINT8 Persistent :1; - UINT8 BootFlagsValid :1; - // - // Boot Flags Data 2 - // - UINT8 LockResetBtn :1; - UINT8 ScreenBlank :1; - UINT8 BootDeviceSelector :4; - UINT8 LockKeyboard :1; - UINT8 ClearCmos :1; - // - // Boot Flags Data 3 - // - UINT8 ConsoleRedirectionControl :2; - UINT8 LockSleepBtn :1; - UINT8 UserPasswordByPass :1; - UINT8 Reserved3 :1; - UINT8 FirmwareVerbosity :2; - UINT8 LockPowerBtn :1; - // - // Boot Flags Data 4 - // - UINT8 MuxControlOverride :3; - UINT8 ShareModeOverride :1; - UINT8 Reserved4 :4; - // - // Boot Flags Data 5 - // - UINT8 DeviceInstanceSelector :5; - UINT8 Reserved5 :3; -} IPMI_GET_BOOT_OPTION; - -EFI_STATUS -EFIAPI -IpmiCmdSetSysBootOptions ( - OUT IPMI_GET_BOOT_OPTION *BootOption - ); - -EFI_STATUS -EFIAPI -IpmiCmdGetSysBootOptions ( - IN IPMI_GET_BOOT_OPTION *BootOption - ); - -EFI_STATUS -IpmiCmdStopWatchdogTimer ( - IN EFI_WDT_USER_TYPE UserType - ); - -#endif diff --git a/Silicon/Hisilicon/Include/Library/LpcLib.h b/Silicon/Hisilicon/Include/Library/LpcLib.h deleted file mode 100755 index 236a52ba45a7..000000000000 --- a/Silicon/Hisilicon/Include/Library/LpcLib.h +++ /dev/null @@ -1,113 +0,0 @@ -/** @file -* -* Copyright (c) 2016, Hisilicon Limited. All rights reserved. -* Copyright (c) 2016, Linaro Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _LPC_LIB_H_ -#define _LPC_LIB_H_ - -#include - -#define PCIE_SUBSYS_IO_MUX 0xA0170000 -#define PCIE_SUBSYS_IOMG033 (PCIE_SUBSYS_IO_MUX + 0x84) -#define PCIE_SUBSYS_IOMG035 (PCIE_SUBSYS_IO_MUX + 0x8C) -#define PCIE_SUBSYS_IOMG036 (PCIE_SUBSYS_IO_MUX + 0x90) -#define PCIE_SUBSYS_IOMG045 (PCIE_SUBSYS_IO_MUX + 0xB4) -#define PCIE_SUBSYS_IOMG046 (PCIE_SUBSYS_IO_MUX + 0xB8) -#define PCIE_SUBSYS_IOMG047 (PCIE_SUBSYS_IO_MUX + 0xBC) -#define PCIE_SUBSYS_IOMG048 (PCIE_SUBSYS_IO_MUX + 0xC0) -#define PCIE_SUBSYS_IOMG049 (PCIE_SUBSYS_IO_MUX + 0xC4) -#define PCIE_SUBSYS_IOMG050 (PCIE_SUBSYS_IO_MUX + 0xC8) - -#define IO_WRAP_CTRL_BASE 0xA0100000 -#define SC_LPC_CLK_EN_REG (IO_WRAP_CTRL_BASE + 0x03a0) -#define SC_LPC_CLK_DIS_REG (IO_WRAP_CTRL_BASE + 0x03a4) -#define SC_LPC_BUS_CLK_EN_REG (IO_WRAP_CTRL_BASE + 0x03a8) -#define SC_LPC_BUS_CLK_DIS_REG (IO_WRAP_CTRL_BASE + 0x03ac) -#define SC_LPC_RESET_REQ (IO_WRAP_CTRL_BASE + 0x0ad8) -#define SC_LPC_RESET_DREQ (IO_WRAP_CTRL_BASE + 0x0adc) -#define SC_LPC_BUS_RESET_REQ (IO_WRAP_CTRL_BASE + 0x0ae0) -#define SC_LPC_BUS_RESET_DREQ (IO_WRAP_CTRL_BASE + 0x0ae4) -#define SC_LPC_CTRL_REG (IO_WRAP_CTRL_BASE + 0x2028) - - -#define LPC_BASE 0xA01B0000 -#define LPC_START_REG (LPC_BASE + 0x00) -#define LPC_OP_STATUS_REG (LPC_BASE + 0x04) -#define LPC_IRQ_ST_REG (LPC_BASE + 0x08) -#define LPC_OP_LEN_REG (LPC_BASE + 0x10) -#define LPC_CMD_REG (LPC_BASE + 0x14) -#define LPC_FWH_ID_MSIZE_REG (LPC_BASE + 0x18) -#define LPC_ADDR_REG (LPC_BASE + 0x20) -#define LPC_WDATA_REG (LPC_BASE + 0x24) -#define LPC_RDATA_REG (LPC_BASE + 0x28) -#define LPC_LONG_CNT_REG (LPC_BASE + 0x30) -#define LPC_TX_FIFO_ST_REG (LPC_BASE + 0x50) -#define LPC_RX_FIFO_ST_REG (LPC_BASE + 0x54) -#define LPC_TIME_OUT_REG (LPC_BASE + 0x58) -#define LPC_SIRQ_CTRL0_REG (LPC_BASE + 0x80) -#define LPC_SIRQ_CTRL1_REG (LPC_BASE + 0x84) -#define LPC_SIRQ_INT_REG (LPC_BASE + 0x90) -#define LPC_SIRQ_INT_MASK_REG (LPC_BASE + 0x94) -#define LPC_SIRQ_STAT_REG (LPC_BASE + 0xA0) - -#define LPC_FIFO_LEN (16) - -typedef enum{ - LPC_ADDR_MODE_INCREASE, - LPC_ADDR_MODE_SINGLE -}LPC_ADDR_MODE; - -typedef enum{ - LPC_TYPE_IO, - LPC_TYPE_MEM, - LPC_TYPE_FWH -}LPC_TYPE; - - -typedef union { - struct{ - UINT32 lpc_wr:1; - UINT32 lpc_type:2; - UINT32 same_addr:1; - UINT32 resv:28; - }bits; - UINT32 u32; -}LPC_CMD_STRUCT; - -typedef union { - struct{ - UINT32 op_len:5; - UINT32 resv:27; - }bits; - UINT32 u32; -}LPC_OP_LEN_STRUCT; - - -VOID LpcInit(VOID); -BOOLEAN LpcIdle(VOID); -EFI_STATUS LpcByteWrite( - IN UINT32 Addr, - IN UINT8 Data); -EFI_STATUS LpcByteRead( - IN UINT32 Addr, - IN OUT UINT8 *Data); - -EFI_STATUS LpcWrite( - IN UINT32 Addr, - IN UINT8 *Data, - IN UINT8 Len); - -#endif - - diff --git a/Silicon/Hisilicon/Include/Library/OemAddressMapLib.h b/Silicon/Hisilicon/Include/Library/OemAddressMapLib.h deleted file mode 100644 index b5de34f5facb..000000000000 --- a/Silicon/Hisilicon/Include/Library/OemAddressMapLib.h +++ /dev/null @@ -1,45 +0,0 @@ -/** @file -* -* Copyright (c) 2015, Hisilicon Limited. All rights reserved. -* Copyright (c) 2015, Linaro Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _OEM_ADDRESS_MAP_LIB_H_ -#define _OEM_ADDRESS_MAP_LIB_H_ - -#include - -typedef struct _DDRC_BASE_ID{ - UINTN Base; - UINTN Id; -}DDRC_BASE_ID; - -// Invalid address, will cause exception when accessed by bug code -#define ADDRESS_MAP_INVALID ((UINTN)(-1)) - -UINTN OemGetPoeSubBase (UINT32 NodeId); -UINTN OemGetPeriSubBase (UINT32 NodeId); -UINTN OemGetAlgSubBase (UINT32 NodeId); -UINTN OemGetCfgbusBase (UINT32 NodeId); -UINTN OemGetGicSubBase (UINT32 NodeId); -UINTN OemGetHACSubBase (UINT32 NodeId); -UINTN OemGetIOMGMTSubBase (UINT32 NodeId); -UINTN OemGetNetworkSubBase (UINT32 NodeId); -UINTN OemGetM3SubBase (UINT32 NodeId); -UINTN OemGetPCIeSubBase (UINT32 NodeId); - -VOID OemAddressMapInit(VOID); - -extern DDRC_BASE_ID DdrcBaseId[MAX_SOCKET][MAX_CHANNEL]; - -#endif - diff --git a/Silicon/Hisilicon/Include/Library/PlatformSysCtrlLib.h b/Silicon/Hisilicon/Include/Library/PlatformSysCtrlLib.h deleted file mode 100644 index 712b77c44fc8..000000000000 --- a/Silicon/Hisilicon/Include/Library/PlatformSysCtrlLib.h +++ /dev/null @@ -1,112 +0,0 @@ -/** @file -* -* Copyright (c) 2015, Hisilicon Limited. All rights reserved. -* Copyright (c) 2015, Linaro Limited. All rights reserved. -* -* This program and the accompanying materials -* are licensed and made available under the terms and conditions of the BSD License -* which accompanies this distribution. The full text of the license may be found at -* http://opensource.org/licenses/bsd-license.php -* -* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. -* -**/ - -#ifndef _PLATFORM_SYS_CTRL_LIB_H_ -#define _PLATFORM_SYS_CTRL_LIB_H_ - -#define PACKAGE_16CORE 0 -#define PACKAGE_32CORE 1 -#define PACKAGE_RESERVED 2 -#define PACKAGE_TYPE_NUM 3 - -UINT32 PlatformGetPackageType (VOID); - -VOID DisplayCpuInfo (VOID); -UINT32 CheckChipIsEc(VOID); - -UINTN PlatformGetPll (UINT32 NodeId, UINTN Pll); - -#define DJTAG_READ_INVALID_VALUE 0xFFFFFFFF -#define DJTAG_CHAIN_ID_AA 1 -#define DJTAG_CHAIN_ID_LLC 4 - - -#define SC_DJTAG_MSTR_EN_OFFSET 0x6800 -#define SC_DJTAG_MSTR_START_EN_OFFSET 0x6804 -#define SC_DJTAG_SEC_ACC_EN_OFFSET 0x6808 -#define SC_DJTAG_DEBUG_MODULE_SEL_OFFSET 0x680C -#define SC_DJTAG_MSTR_WR_OFFSET 0x6810 -#define SC_DJTAG_CHAIN_UNIT_CFG_EN_OFFSET 0x6814 -#define SC_DJTAG_MSTR_ADDR_OFFSET 0x6818 -#define SC_DJTAG_MSTR_DATA_OFFSET 0x681C -#define SC_DJTAG_TMOUT_OFFSET 0x6820 -#define SC_TDRE_OP_ADDR_OFFSET 0x6824 -#define SC_TDRE_WDATA_OFFSET 0x6828 -#define SC_TDRE_REPAIR_EN_OFFSET 0x682C -#define SC_DJTAG_RD_DATA0_OFFSET 0xE800 -#define SC_TDRE_RDATA0_OFFSET 0xE830 - - -UINTN PlatformGetI2cBase(UINT32 Socket,UINT8 Port); - -VOID PlatformAddressMapCleanUp (VOID); -VOID PlatformDisableDdrWindow (VOID); - -VOID PlatformEnableArchTimer (VOID); - -EFI_STATUS -DawFindFreeWindow (UINTN Socket, UINTN *DawIndex); - -VOID DawSetWindow (UINTN Socket, UINTN WindowIndex, UINT32 Value); - -VOID DJTAG_TDRE_WRITE(UINT32 Offset, UINT32 Value, UINT32 ChainID, UINT32 NodeId, BOOLEAN Repair); - -UINT32 DJTAG_TDRE_READ(UINT32 Offset, UINT32 ChainID, UINT32 NodeId, BOOLEAN Repair); - -VOID RemoveRoceReset(VOID); - -UINTN PlatformGetDdrChannel (VOID); - -VOID ITSCONFIG (VOID); - -VOID MN_CONFIG (VOID); - -VOID SmmuConfigForOS (VOID); -VOID SmmuConfigForBios (VOID); - -VOID StartUpBSP (VOID); - -VOID LlcCleanInvalidate (VOID); - -UINTN PlatformGetCpuFreq (UINT8 Socket); -VOID ClearInterruptStatus(VOID); - -UINTN PlatformGetCoreCount (VOID); -VOID DAWConfigEn(UINT32 socket); - -VOID DResetUsb (); -UINT32 PlatformGetEhciBase (); -UINT32 PlatformGetOhciBase (); -VOID PlatformPllInit(); -// PLL initialization for super IO clusters. -VOID SiclPllInit(UINT32 SclId); -VOID PlatformDeviceDReset(); -VOID PlatformGicdInit(); -VOID PlatformLpcInit(); -// Synchronize architecture timer counter between different super computing -// clusters. -VOID PlatformArchTimerSynchronize(VOID); -VOID PlatformEventBroadcastConfig(VOID); -UINTN GetDjtagRegBase(UINT32 NodeId); -VOID LlcCleanInvalidateAsm(VOID); -VOID PlatformMdioInit(VOID); -VOID DisableClusterClock(UINTN CpuClusterBase); -VOID EnableClusterClock(UINTN CpuClusterBase); -VOID DisableSocketClock (UINT8 Skt); - -EFI_STATUS EFIAPI HandleI2CException (UINT32 Socket, UINT32 Port); -EFI_STATUS EFIAPI HandleI2CExceptionBySocket (UINT32 Socket); - -#endif From patchwork Wed Feb 20 07:28:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 158786 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4603035jaa; Tue, 19 Feb 2019 23:30:03 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ4w450KWqs03TlAgDsbEm5J1bVtqwQszNy9+lg9jlq0qNzeYvoHzC3Tua5JtY0IPKedA6x X-Received: by 2002:a63:545f:: with SMTP id e31mr21873095pgm.409.1550647803900; Tue, 19 Feb 2019 23:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550647803; cv=none; d=google.com; s=arc-20160816; b=FUZSPk2UUjClHHyWkfgmnhwjXQc0p96e4szOeUm2oUPrT2TouBytC8hJjkRbsJO2/S GvHXnaMV42aGyEiYUHAyj4eIPkknwh5nCFbWLeBMpn9YaNwXBL745zY9E7UtO1fEF+IW MJ4h+9RxZC83YxSIv9/rd5EOAk/kOoAK8U3ejS7ijGX0XcXt910uVroWlG95oyJezhKh p6YcnO+GjooFFk3U19VQ26B/beNmR3ivLjU3xa+/R6sDB3iHBfqQTF6a3r1tWrpdqNDj 40+Uc0OFxpkMMsMop2zMfm2Ag0TdUXRThUmAyc3WatMFzwy0+Sn2RqG1/d84BLzdkIv+ dNSA== 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=0Y045TQ/n3FW+4pqC3RN/CK878XOkSwsDLAImOhKZDc=; b=NFrXxL9DMTOXj8/K1BWB1BOVmsprcpTl9OGXd3yR6VOd7HNxbMmvz0+ysFUqopYmL/ TiD3snGddudn2baLYo5Hsj9WHxIhfisFwOy5yEPv1cq+97hlBuUwQHnx0D1EI832XHgU w4OB8BULNFLouALKl2KHP3CdMnVLT0NIlTOSabe86Orl4e8FGVgP/aVz8aSc9L9YAgnb bnIo7aw6efEnKfeJt9NHDjkXu92WKgV8VoxO+cA2yPY58GR725eYpO6tQSvXj9ZFuK60 doI2j6rBZ+tH9w89r980V0La1fv5/xeBp0ec1votnLXbgZX9ygSSahPVRVqr6dYPQwof CuVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BwVRzdnh; 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 124si15074193pfg.218.2019.02.19.23.30.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Feb 2019 23:30:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=BwVRzdnh; 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 61719211CC3A8; Tue, 19 Feb 2019 23:29:46 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::642; helo=mail-pl1-x642.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 46CA22194EB7E for ; Tue, 19 Feb 2019 23:29:44 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id s1so11757867plp.9 for ; Tue, 19 Feb 2019 23:29:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r39TMzXSDjlUIt7IVFBUPd1kT91PEtsUJg6H09OtzvM=; b=BwVRzdnhVNOodQPa6VfawH5VvHvxQHhKF3XjYZHYU/Cg1ZfR4ONj4a2gjm6RvLP2I6 nlaz2/uzqgJ/+jd7KoDee4rMjut4Uk878RFpfh+Hz9Ux9I2UQlkA7fJiNi3OJRyjfYkV XnACjnUgK9s3/KamvZlTO885v4frppkZj82bj7YmiJEaVbV0Dlw++vANs37Zylp3eTN/ Te2Y/29NhQdn+vOewC99fMrAx3/nAOuMvELnufYD3ml/q93Y9kTrLNpXl0T+05M/MOdE +RSlroE64YyqMnpjcI5JdKCrIdFER7Ys1CtAnMmMl20b7GnTL4HHgKw8aGdR3shK1Ix2 GQkw== 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=r39TMzXSDjlUIt7IVFBUPd1kT91PEtsUJg6H09OtzvM=; b=Ja6+8aS2T4+gVYKVhlb1k1u+yZ5KLJEzFzLB+LvfWcRokSIQqgAFA5I2vUlTt++wHl +9W6S++NL1jsQv/cWtlyyJ20rz/7NZBLm75+0J/PUgLmdMYDG4qAp0PQnB6LIfD4MfkO SHP64KHu2bUv4U20J3bliuWuxUA00z9Mnj3faMyeFmKoKsQHMIGvM20r2wdQJRgFyDhs U74aU8MWG+PjA46zCgUsWxZtRD/XplgRhNFowG+RpGzrtO4Dz/nazuVva0qyOnZV7ye8 TggxJT5QGBbEf7nak1rHJBK1VF20dX0kqFSldcFm00YSX7XJwoXSmdO/HVSkRWX+baXh oWEQ== X-Gm-Message-State: AHQUAuZQ5v/y7VJMyWVk0uH2ZdNEeYxHlgc7TpGp+0djvClEAFv+QDrP bulYg79c92mMmcojKAGdBjqgrQ== X-Received: by 2002:a17:902:8b8b:: with SMTP id ay11mr4851534plb.162.1550647784038; Tue, 19 Feb 2019 23:29:44 -0800 (PST) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id 23sm19152969pft.187.2019.02.19.23.29.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Feb 2019 23:29:43 -0800 (PST) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Wed, 20 Feb 2019 15:28:37 +0800 Message-Id: <20190220072837.35058-19-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190220072837.35058-1-ming.huang@linaro.org> References: <20190220072837.35058-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 18/18] Hisilicon/D0x: Modify version to 19.02 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, john.garry@huawei.com, xiaojun2@hisilicon.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" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/D03/D03.dsc | 4 ++-- Platform/Hisilicon/D05/D05.dsc | 4 ++-- Platform/Hisilicon/D06/D06.dsc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.5 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 35b54f8c83be..07ff461277df 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -171,12 +171,12 @@ [PcdsFixedAtBuild.common] !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" !else - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build 18.08 for Hisilicon D03" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build 19.02 for Hisilicon D03" !endif gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" - gHisiTokenSpaceGuid.PcdBiosVersionForBmc|L"1.12" + gHisiTokenSpaceGuid.PcdBiosVersionForBmc|L"19.02" gHisiTokenSpaceGuid.PcdSystemProductName|L"D03" gHisiTokenSpaceGuid.PcdSystemVersion|L"Estuary" diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 49bd5b37ea34..70b044c7e33a 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -187,12 +187,12 @@ [PcdsFixedAtBuild.common] !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" !else - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build 18.08 for Hisilicon D05" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build 19.02 for Hisilicon D05" !endif gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" - gHisiTokenSpaceGuid.PcdBiosVersionForBmc|L"1.12" + gHisiTokenSpaceGuid.PcdBiosVersionForBmc|L"19.02" gHisiTokenSpaceGuid.PcdSystemProductName|L"D05" gHisiTokenSpaceGuid.PcdSystemVersion|L"Estuary" diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index a3a01bfb1e23..73bea728b0f6 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -156,12 +156,12 @@ [PcdsFixedAtBuild.common] !ifdef $(FIRMWARE_VER) gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" !else - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build 18.08 for Hisilicon D06" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build 19.02 for Hisilicon D06" !endif gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" - gHisiTokenSpaceGuid.PcdBiosVersionForBmc|L"0.42" + gHisiTokenSpaceGuid.PcdBiosVersionForBmc|L"19.02" gHisiTokenSpaceGuid.PcdSystemProductName|L"D06" gHisiTokenSpaceGuid.PcdSystemVersion|L"VER.A"