From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 495C4208D6137 for ; Mon, 11 Feb 2019 11:46:49 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id y185so612366wmd.1 for ; Mon, 11 Feb 2019 11:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=iSlhYMPjVhn9ohJqhmN5cagNoU+W4NzCr6fF34jaevE=; b=OpgCvWAbGtaUE3tg1dnjR8G/MlY31QRrheqvT0qsNM6OVqqtDMuV64Ww/xyUZ0w55g mC9lZbHh4+nSnbSa1uX2xjPmXCRMprLwHSnkzRjgYOZ8pdlfm4a6WoSLaC57yTYqwdYO mO0wTx3NjBm9ZPJ6DvagBcndKWN6XAjGX5crJNKk0ddiP5vemx12h2yxjITzyEhAqVVZ sRIGAhrG67em05FsjKU3takmdSfacyScXCK8R5/V80Ck+kp4cGXK3ZGEaBYXM1Wpjvmq B0AooAniDrzAM0En/gZ5a78udem2GjHVpy7pBo2Y8b/RS71UmPF4NfP0iMZf1kiIZeP4 f/0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=iSlhYMPjVhn9ohJqhmN5cagNoU+W4NzCr6fF34jaevE=; b=O5eZiHkZb2RpmyyDJcmQMJlFti5ApYbgLdCeHpjnaSWaTUGxSjvvqBVnF+IxzZ7Jh3 SrSfwQJhrm6vi5L3bMy9/gsV6+iTOxIadbIfeo/VjjVIrndwJ3bUlqBLDCl/AV85SvZ3 RFYHqJpZiL/Z8ZkJ6hEAScN0R5IWtnKQ8TLumsm5ijqZjcdhDgxLqhTadhX+aQfswR6X 1j1yf6SxJD3jQ5xtktrDFcUJilOeE8jacSFNYU6g8FLd1z4xjuJTRmA2LRfB47aeTM71 1Ij6k+/BBzadgYdWRV9Zp24e9QswLgyTKOMkrdln/EJUW1Ss49B/lIXEHDp7nKvLOWq6 MtiA== X-Gm-Message-State: AHQUAua5v1hc68yJx9EHlHQW6JJhTHPxgypBiczP4Ax2M1bhWgcm3flq B9q27uHUuxAZ5kNPB8RbrMQj+w== X-Google-Smtp-Source: AHgI3Ia6hponjSPAsbv7ozBuzYyWqMU5zWOHWd8a6H3VxiM2QeKhb6bBgkEuoxw0tK8srA/OVci9rA== X-Received: by 2002:a1c:2d08:: with SMTP id t8mr896143wmt.5.1549914408335; Mon, 11 Feb 2019 11:46:48 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id t18sm152722wmt.35.2019.02.11.11.46.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 11:46:47 -0800 (PST) Date: Mon, 11 Feb 2019 19:46:46 +0000 From: Leif Lindholm To: Ming Huang Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, michael.d.kinney@intel.com, lersek@redhat.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, john.garry@huawei.com, zhangfeng56@huawei.com Message-ID: <20190211194646.624grnmi34inexvd@bivouac.eciton.net> References: <20190201133436.10500-1-ming.huang@linaro.org> <20190201133436.10500-12-ming.huang@linaro.org> MIME-Version: 1.0 In-Reply-To: <20190201133436.10500-12-ming.huang@linaro.org> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [PATCH edk2-platforms v1 11/16] Hisilicon/D06: Add Setup Item "Support DPC" 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: , X-List-Received-Date: Mon, 11 Feb 2019 19:46:50 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Feb 01, 2019 at 09:34:31PM +0800, Ming Huang wrote: > Add setup item "Support DPC" to enable or disable PCIe DPC > (Downstream Port Containment). This patch also seems to disable the SRIOV configuration and delete a lot of ports. Can you explain how this is related? / Leif > 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(-) > > 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" > -- > 2.9.5 >