From patchwork Mon Mar 25 15:08:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 161131 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4081896jan; Mon, 25 Mar 2019 08:08:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqyztKxHdbeXKV9oq90E+LTa9Ky5acKqiK8WDRK7wbmV/ADm4JsFTmS3Mz+NnNzY3d/23JX2 X-Received: by 2002:a17:902:a9c8:: with SMTP id b8mr25837995plr.12.1553526523592; Mon, 25 Mar 2019 08:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553526523; cv=none; d=google.com; s=arc-20160816; b=gpHW9OpU3d9XbAJHZhvnwfuzwHB8IRxJ/lN+pfBYYa1ijd6Ci9CckV6LzB/UfJtV1G ZNrUUS9D2Ew+7i+avC49nWP9RLGke9D/p97IIeB+ALb1z/Wlkzix2RIDnhLsexWOpkcE kHTHKfSh/5CmsoYuDtT415XZsxW+P8x+nmvjR649+UHdm29KW3ddBP9KGx4pynX4IzsP aYt8Q4TLGCdTL+42TOtbFomnDmnzitR6zQ4ja2Yes7BAdcXw8/3GQK5j+XTnhie0aliI 5lpxMnTNChoZGezyRgxmCozQ86oRG4+9kJlE6cA5pJhqkxZu6d+ZXkXlZM5XshnWvLgr VAtA== 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=Bx9/3ZwoSxRFnqn/c+T/dXkqnx0ZcJK7gel+eTgavCM=; b=pt5w+li/hY6ikYiNzC8xuft3xALBXV9Ryf/NpPttxJZGqLti8IDWHiSx3eKbpXzfh3 WTLqBTqD7dbY4rPvxu/JI6jjmDLBcjgB5E4hOeaKLrmlBGbHX6yPsRUvHIDU3LrKctkv b/RHI+6Ca4f5jLJ4wZtKMBDMH86EomSSEnmzF+OkwXCqNLPVwP9HYZHvECR9bPNeR8zK PemM1Bc69mDHfy16BdlG2D6UW64LKb6hC/pRHSjQB6ZHoV9DA6uCzg5SmbDsJi8bhfek fIkTn0XnpglT6LdZ3Eba0PoccdiZIiTRYyFnGtCjYRKxM41c66dXna6wJ/+yQJWXZL0x zCcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aAXZcVui; 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 d125si13966318pfd.206.2019.03.25.08.08.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 08:08:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=aAXZcVui; 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 35374211EABB3; Mon, 25 Mar 2019 08:08:43 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::52c; helo=mail-pg1-x52c.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x52c.google.com (mail-pg1-x52c.google.com [IPv6:2607:f8b0:4864:20::52c]) (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 128F6211E742F for ; Mon, 25 Mar 2019 08:08:42 -0700 (PDT) Received: by mail-pg1-x52c.google.com with SMTP id r124so6737244pgr.3 for ; Mon, 25 Mar 2019 08:08:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2vFQhi5788uEsOlim8nWx5X3W6H4x+KhEsqrbLwC2p0=; b=aAXZcVuitqy8I/UpbgkrUhinspjXXIHKeQFg+/LXRc6F2Ru8zqckjXCZS4RvPcB1Ci E19aCXqN8OKPJ5JoIItxbfiOGRH4SGm7jwpi0TU0uCvmiFPlacjERJMNXC7h7UuUX4Ah OAFbAOAjckSaCCfOGpRGIC3x2jv+OdGJz8DRNKF9rJoq+2xwtAteR0LOUJqD1TAbvhFT XxZ4lzwi71TEB20WEukuyD8AzElhlv2cPCmpy8O+eIptj53k2iDzsxvj9tiswCgCyQiy UeK/JJ4spqRGgbJ3MZOFoAk+1iMIuGediLM2y1sywV3mZp8SdM7nfAYlCtj8nhxVeTCj pOXQ== 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=2vFQhi5788uEsOlim8nWx5X3W6H4x+KhEsqrbLwC2p0=; b=T4sAuhjFX+Uju6OvN1r8gv+bB2zoWWgHsBK2iENCdPS52BywGTZdlUO996AE6Lh3bv xQAqd4C3PDuNMayoPNbeEMHjOt1T68fkeYoPXuiQgBDD68K7pJVcnS+iPRjFS6t3KbEB 9018gfsaZuIa/7bzx55zjtuweRe8ljB2jNI1QsY1Mgftbi0OHsQoqzchD7Bm7sBfqkWa HY4e/fuvTKezT+f8KWcG/NUScPCaa2AhW69hB1IsG4FgKGD7AHKdrGSWYSJzLhTHgi3+ O0KIMOuoyypkq5dCx9v07prl6cN8HnTZB1/gJRE7hT55yRJ/2YTm3Ud0FkcuNgIDIvpc vgbw== X-Gm-Message-State: APjAAAVmWlGOBSAe1kqpNevVzENseGupu1+c/LxrhdgvtaUxSPzm58D/ QkUmR560LvmFswlt2Sc2uPa2XQ== X-Received: by 2002:a62:58c7:: with SMTP id m190mr24474651pfb.4.1553526521640; Mon, 25 Mar 2019 08:08:41 -0700 (PDT) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id j14sm21083283pfe.12.2019.03.25.08.08.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 08:08:41 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 25 Mar 2019 23:08:27 +0800 Message-Id: <20190325150829.24520-2-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190325150829.24520-1-ming.huang@linaro.org> References: <20190325150829.24520-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v4 1/3] Hisilicon/D06: Add runtime attribution to OemConfig variable 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" 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 Mon Mar 25 15:08: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: 161132 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4081962jan; Mon, 25 Mar 2019 08:08:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqzi6HoCM2ekvp5kz/hHeVxVR0o75anZ29RAT159chaIuIgHM9oAstzKgSLJ4YTuSdSngsIS X-Received: by 2002:a17:902:820c:: with SMTP id x12mr14181330pln.199.1553526526782; Mon, 25 Mar 2019 08:08:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553526526; cv=none; d=google.com; s=arc-20160816; b=JOlfJxBxU7nXgOoXTpl+iBfuV/qSj6iSu+0ltSuVXUc8YGsW4S+Rza00/Q0Q6X20Jn FPn+FuRM3WTkUfo06oaAla8CPX5rzJ054qvBuUTw+mdA+92o3xDweg3ccBc34UukoDEj IJqesPYlygKV3aVOwLDI0GbsYAZlSJ8AKvtywZiGyXESCZ9uomn2o6l3LFtmMF3Z9a51 ltqAYxjQ3Chu/TmP2vbzfnuwEzQFeNadGbFPQwwvmPTV7IQW3561APK5p/TWc7Bt5VMB WMeAxuexehUy4FerCFfcVy4jYOlHsszyKK7UVio+lhRHwErP3UapPBEL574mvnoMPC16 eY4w== 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=DVyb7UPwYPLrySGuRDzweKiSYXQI8hn4LexVucbhhDM=; b=FA/abR6KteI+9XS+9PDs6b1q++i0sJ9zGxeBmPBsr4SwijpQiTeG9lFtVk8RoxOo3D L0TmDFSnhOMOabyeLr7DWo8Wjclu4c2s08EolmBD9mtHhD49IndHNGa9yXqTFHFtE3Nb 2hDT2jYce04MoDi27sM0Mk4eNMRZyWuHT2omNQXOUFD+/vJzo9qanpqUQsCuAT2h9DGG GFpuLgQDeIujZCTrDGiUrs+DqiGmxV9p0Dii/gVVBBCI3C5ZbnsXZQO35AwqgzQEabza HKb4CvNmYwzkb3+8Jga+X4Ylw79cdnuDn4o1wqDU92SngY1C8gwFIT1NXO5ZFbksiIKP K0QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TaVsNYG+; 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 61si14662437plq.154.2019.03.25.08.08.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 08:08:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=TaVsNYG+; 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 69CE1211EABB0; Mon, 25 Mar 2019 08:08:46 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::541; helo=mail-pg1-x541.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 42112211E742F for ; Mon, 25 Mar 2019 08:08:45 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id v12so6759455pgq.1 for ; Mon, 25 Mar 2019 08:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jG49uqoZb43zoXymNqKD5xNcTs3oBdK2nbAUAUQaQJU=; b=TaVsNYG+RCkLRp9J5eI2JwN/KqaU5C5Nz3uXyBhnIsv50LyA/HTSS+1Pfo2mRcn8N5 fFjKSUPcRM+S6EzDLyCx3/uafSmCiQY6fpketnB145en97HYOhVduBKhg1HtDcLr/KFU 790T4IXREh0YNSXLrxBZcA3cIuw/dxTeV1AUCMnz+lXR4YLIsQPdl6r7IIr1uzmpW1Ai yr8KV7lMb2L49FZSqeoiv1n4x/LKebezJCyrcYkvAL3MHKysoFYvy6KXoCwgUJO29AdU tjEk/vT+wQef5/JdKjl4pBN5k+FV7vfRQamL/sgT17VS6qFhJYyo+GdAqgbaD+oyUSrx k3BQ== 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=jG49uqoZb43zoXymNqKD5xNcTs3oBdK2nbAUAUQaQJU=; b=c23Fj09G6xJArMuy6Gmyq/PSnKPu+KUDO5YpZgaJNPK+nk1guQ16Mtrug/3//p09ft GWrYKwMxzpAxm4/xG1qAU99y8M4W0k0EBwvI8VXbL5xXgozhI+HDd8jBrvSZ1Oef4JHr d5/4wya55zyZ17gqGa2knGQyj1rudBqBOiUe7RJ6yP+xBECLW4R+cDfN55SwY9NaTxUq fAJHP+XCjG6PNaG/9VCEiA/8r+3qA5jBqq6TPcYAS1bABMzBOJO1QpF7wVMVI9nWP1jf jS++MRuCBFn5oI0Wdqi+WbSVHyXot3bGs6BrWtouHqHCqIKhVCcq7CDk1T/+RNYfm1IU 6Y0w== X-Gm-Message-State: APjAAAU+Ew3ZU5oHXTduhNVvaPKHQ5nGEsZNhvY9/OjLV74I9vmCsV23 gGWGGj7PIvXcLq+gVuOZj12zxg== X-Received: by 2002:a63:5d04:: with SMTP id r4mr14083974pgb.117.1553526524900; Mon, 25 Mar 2019 08:08:44 -0700 (PDT) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id j14sm21083283pfe.12.2019.03.25.08.08.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 08:08:44 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 25 Mar 2019 23:08:28 +0800 Message-Id: <20190325150829.24520-3-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190325150829.24520-1-ming.huang@linaro.org> References: <20190325150829.24520-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v4 2/3] Hisilicon/D06: Drop 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" Drop some PCIe menus as these menus are not ready. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr | 194 -------------------- 1 file changed, 194 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/PcieConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr index 7cf7cdd29ba2..f700699b093b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr @@ -17,203 +17,9 @@ 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), 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; - From patchwork Mon Mar 25 15:08:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Huang X-Patchwork-Id: 161133 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4082065jan; Mon, 25 Mar 2019 08:08:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqwYwiRqMhuayW7YxNX4Ji2ncyddiWw0RJ7iVHme0m2HSS7fdYoahnVFHJWQt+GciLCfCKd0 X-Received: by 2002:a62:6f06:: with SMTP id k6mr24319921pfc.257.1553526531015; Mon, 25 Mar 2019 08:08:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553526531; cv=none; d=google.com; s=arc-20160816; b=bIVrv8WXGLKY8kCmoL6b3SD/Z0sqk/QzXi/V8WW2GmJDWmOct12WPLuGLNP9zTJHZW 4pqOOLZnP6XftG6xQD8nV+tsAylVYqYoznWuv5OFB5g1CAbvl/CIe2FrIjgsCJU7iZSz 0Wl5Pg7Z9lsbjFYqKxOAAaKUBmdW93EKO0GU2H/9BXIgLrhC/DFBIf4izlH33gyXrS/e OOVhL5U63B5K6amPD15CyijwpCCjH1McAI/Sq9EUltlBxK1RIhjadoLaDxQ5Xlf+Y3zX lkQ6woU0g2+28wo9N02588Z6gryjkj/dtcTOzQSv9/BzIPWAJYj66UvHicg1TwoyoCjx ufdA== 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=vAsD4hrgckHpbOTCImmgjSpeEDilyRGMOCQNP0i2MSE=; b=FNBZ5DKxfXmH10z6st6XtPPGc5TwIOyCAw9Nybqz4pIb2Dhs6RJuTiQkMt1U+IMEIS ujrg3r2vXI+RR9bc7LZHICn5LnEzW6F8fKC3zq6UQ0gOBRUMYUsqh9PsGZiizcySPGiU /2hWx23n86rOFnKFHE+hDB5GNtQQsERyfhkehbgE4kv9wT1tpWTH2uViseXwvYDEF3vd iO9rT/rB0euyJDqHh0d3p/uxvbyUqSuU37XlLexVmgaGW79gHpxW7UydbotDRS7UaiPI teUbUgvUOHfWeK4PyxcitYrhwb9FR2na5U/o6ddnyak0JcDvt1Q4MZuiyhLnotVh0hv3 D7Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E99mrsUd; 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 101si14933848pld.334.2019.03.25.08.08.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 08:08:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=E99mrsUd; 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 A038B211EABC3; Mon, 25 Mar 2019 08:08:50 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::641; helo=mail-pl1-x641.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) (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 08C62211E742F for ; Mon, 25 Mar 2019 08:08:48 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id b65so88101plb.6 for ; Mon, 25 Mar 2019 08:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U0oprTdprmy3XXFEDBq+vuudG9pSL7tA5BqvjSvlKhw=; b=E99mrsUd+e5xf7C4eqX4TXt5qcgEgv5a32AjkVVo51RHXGCZUj2Z5UPaqe+9fT/RR0 mPH//FIxHs8/CXOVQDF7I7feP3QWs2hpa0RLRGD8I9+thqfOMDwyCRWhSN6S0hOCcq6g xf9gZUFbad321ViJjvxKAMLPClpcWQEWeJqKC2vqUGrWLjFOrUwhUHVuyvgu4fv4jIc6 TV1o5HjSlSUaIeVXwYk/EJdFk+g1+qc5WqD6TP0cLqYqOTLWhRY/0ZTSQAZKaryYX1WY /GvCnVADhxF0Z0YFNUGaJ0bzX/9iV9GRm9XgRRUsBy+AQExq0VGzk7w4M5dleRTRgJNA yFzg== 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=U0oprTdprmy3XXFEDBq+vuudG9pSL7tA5BqvjSvlKhw=; b=t3RKUx7b8eEQfXTVycNgyEkZR6NS73zAGXz6+gHrVsfvEEXUTqaF2obgVDYTFBcHbn 2kGi70BzoOeIjBDciTV3os6RuaW+mzuSryM2YMYM6H2o232Ac0oJ/aMRwgY6282wOXMj BDf6u/s/bTRD8Gs/g1wr1jY2Q/HsQg0d0BJfdTagNzzLYpN0/ec9YBi2mlPnMrhyyCeE JrpxyT4gf5Dio+2BhDf1ZqHu/ibJVFL1cUNC6E52cCRcrhTmxBf0jUjjohrJeSwodAQ9 ROcFEWtx1GvMLEujBoo9aw7SHnlSXXLz/ZfTusgEseWuXKiyq8BhnxFQBDyZ/WC9yzG5 rYAw== X-Gm-Message-State: APjAAAUDoqtEdsDZduQC0RMHZSe4ZF0z1Kgmqo1tUp1zlqhZbIF0S+JA 7iTwcKgMugvasS3pE8d/8Clgmw== X-Received: by 2002:a17:902:2e83:: with SMTP id r3mr8197910plb.153.1553526528227; Mon, 25 Mar 2019 08:08:48 -0700 (PDT) Received: from localhost.localdomain ([203.160.91.226]) by smtp.gmail.com with ESMTPSA id j14sm21083283pfe.12.2019.03.25.08.08.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Mar 2019 08:08:47 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Mon, 25 Mar 2019 23:08:29 +0800 Message-Id: <20190325150829.24520-4-ming.huang@linaro.org> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190325150829.24520-1-ming.huang@linaro.org> References: <20190325150829.24520-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v4 3/3] 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: , 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). 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 | 3 +++ Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfigStrings.uni | 3 ++- 5 files changed, 10 insertions(+), 3 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 f700699b093b..c65907fe846e 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/PcieConfig.hfr @@ -17,6 +17,9 @@ form formid = PCIE_CONFIG_FORM_ID, title = STRING_TOKEN (STR_PCIE_CONFIG_FORM_TITLE); + 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; 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"