From patchwork Thu Sep 21 10:59:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113217 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1877178qgf; Thu, 21 Sep 2017 04:06:55 -0700 (PDT) X-Received: by 10.84.130.67 with SMTP id 61mr5306605plc.131.1505992015144; Thu, 21 Sep 2017 04:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992015; cv=none; d=google.com; s=arc-20160816; b=fP6juKPsjvn7s4ly7RBB/F9WR+IKzNAAUKgxqIEF1uPhBODbq+Nfwx6QtMVmp+6FWB wehEIpIy5CqMXPaI7SZGSM3VONXehqomZSpluAHI/gzu9nSLJJUR8ZSFsqTut0wtd67u eE+iuhuNzW1sAKEPVWQ6/gnZp4wKL7Df3J9Xv4LGkKvPUaiYDAargcWUr2apuCJiUkXJ 82+B7SC5sj7xVtWujrSrhGA4BdmWqCVhXwrXAeJfEKrktaTEiAw6CTRnrzzDkEHj3K49 NZDbK7PVaG26SMD+hscvfKeQWUQRqLJWosOXdY6kRalTag2oD/o8gnBoXhP0rO3xN5ev MQ1g== 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:arc-authentication-results; bh=FBy+NtPC2d/KrR/1XyJpOM3PL5iKIaA1JYonr8h8zC0=; b=adOvNTzU5786Bej2fs7fXe7cZ0nmeEtO3RO6Z2uDbL2s3beEJf6HxA49DrTUwH9tms yl3xg9rU9UVMnXR6NZvptKRlB6v4hye2XYxa54GxHGsRqY2u9vAvr2VIthSQjzKbKoJH NShM841WnlYAFS+x7pikTHFe/BbRBQYZyqPRZPD6tqNKXrri+y7pNEBlpp98xVTO7E23 dwvGjv6y5aC+euQWuAhQ/+e/wrcSKe1nKtD5F8ZrUbLQQDDGHcvoQqG9BBx8mTZWTVYk g0VmL7ZbXymcWFVFVx5KayZy8Yibk3tAVLow7jA3MCSsHaWh9s8LG8PLfwmLfcAhOAX9 nhnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QMlaBffy; 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 f69si826782pfj.623.2017.09.21.04.06.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:06:55 -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=QMlaBffy; 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 C0E6821E1B77D; Thu, 21 Sep 2017 04:03:47 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pf0-x22f.google.com (mail-pf0-x22f.google.com [IPv6:2607:f8b0:400e:c00::22f]) (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 82E3121E1B75A for ; Thu, 21 Sep 2017 04:03:46 -0700 (PDT) Received: by mail-pf0-x22f.google.com with SMTP id r71so3041779pfe.12 for ; Thu, 21 Sep 2017 04:06:53 -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=yyibe1siiCiBSbE2lxgpl6jLBufV1EncFGgiUze24UE=; b=QMlaBffyJiYxwjCImaQrj4Lqk7E8fg3mePJSZtgbR6DQe41mHuy/z+6hOwxwdYvVV7 pfBOiyTnxqqDdXLHDAXKJ3dsd/zPtxIwIxfkzcA+LHf54JpGc5f8n0HyqGp+Kll5xC2t Io4VNkKVHQHIG92wEKWPdJrqMq+aQoK5Nj/ho= 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=yyibe1siiCiBSbE2lxgpl6jLBufV1EncFGgiUze24UE=; b=gcdeyiZwuRmkOosWLev1v813Tat/2RyKJVs3Zlv4+PWDS4f5NtfXr15CXBPXZTFfYI l+Wv5cvtH2ut/VVhzji+6hKbwOWk7EW4/C43fC1eNCpPK0iBTjvmI+lAYHiizXiTbahM Lz4PUctDEi2s+xZ4kaF1oZHq28fR0BllbE5mrFIsyXPBZgci1n/BmGNXi0qp6n5LnL1r SxZ2fXM6xBvT879JNPId43Ga9MEtlFMogDmMYaEXGtnjmYkZ8azkmAvoaE38+asJkQwE WMNuOOpmdhXiP2NluFlt8T8t5YTGUORj4wTmddX9x/7qnpXoBAxmRjDO1P0NH7GFr+qz 63NQ== X-Gm-Message-State: AHPjjUgbEBvII6vFQYns1FObGujwoAYkHlBN+DCEnTC4Dpc39N7cxsTO rhsw+KtK2L8mvuqNVUSJ+nppkg== X-Google-Smtp-Source: AOwi7QC9w9/SEfadFL5k1u90eeyUO0GRsjfBfW8+ryolPRH5gv34XN43Sevh7WOXzxFvb4ClZSYWkg== X-Received: by 10.99.181.23 with SMTP id y23mr5292342pge.165.1505992013023; Thu, 21 Sep 2017 04:06:53 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.06.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:06:52 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:40 +0800 Message-Id: <1505991597-52989-2-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-non-osi v3 1/7] Hisilicon/D03/Net: Update Snp driver X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Heyi Guo , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 1. Replace SnpPV660Dxe with SnpPV600Dxe; 2. Add SnpPlatform: Install protocol to enable nic port which are using. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi | Bin 0 -> 26688 bytes Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf | 24 +++++++++++++++++ Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.efi | Bin 56832 -> 0 bytes Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.inf | 27 -------------------- Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi | Bin 0 -> 3040 bytes Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf | 24 +++++++++++++++++ 6 files changed, 48 insertions(+), 27 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi b/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi new file mode 100644 index 0000000..8ce6a6d Binary files /dev/null and b/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.efi differ diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf b/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf new file mode 100644 index 0000000..cd7c724 --- /dev/null +++ b/Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf @@ -0,0 +1,24 @@ +#/** @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. +# +#**/ + +[Defines] + INF_VERSION = 0x00010019 + BASE_NAME = SnpPV600Dxe + FILE_GUID = 3247F15F-3612-4803-BD4E-4104D7EF944A + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + +[Binaries] + PE32|SnpPV600Dxe.efi|* diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.efi b/Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.efi deleted file mode 100644 index eb69403..0000000 Binary files a/Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.efi and /dev/null differ diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.inf b/Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.inf deleted file mode 100644 index 204ef17..0000000 --- a/Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.inf +++ /dev/null @@ -1,27 +0,0 @@ -#/** @file -# -# Copyright (c) 2016, Hisilicon Limited. All rights reserved. -# Copyright (c) 2016-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. -# -#**/ - -[Defines] - INF_VERSION = 0x00010005 - BASE_NAME = SnpPV600Dxe - FILE_GUID = 92D37768-571C-48d9-BEF5-9744AE2FDAF4 - MODULE_TYPE = UEFI_DRIVER - VERSION_STRING = 1.0 - - ENTRY_POINT = InitializeSnpPV600Driver - UNLOAD_IMAGE = SnpPV600Unload - -[Binaries] - PE32|SnpPV600Dxe.efi|* diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi b/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi new file mode 100644 index 0000000..5e7d8bd Binary files /dev/null and b/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.efi differ diff --git a/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf b/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf new file mode 100644 index 0000000..fd53a79 --- /dev/null +++ b/Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf @@ -0,0 +1,24 @@ +#/** @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. +# +#**/ + +[Defines] + INF_VERSION = 0x00010019 + BASE_NAME = SnpPlatform + FILE_GUID = 102D8FC9-20A4-42EB-AC14-1C98BA5B17A8 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + +[Binaries] + PE32|SnpPlatform.efi|* From patchwork Thu Sep 21 10:59:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113220 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1877318qgf; Thu, 21 Sep 2017 04:07:01 -0700 (PDT) X-Received: by 10.101.64.139 with SMTP id t11mr5230414pgp.299.1505992020977; Thu, 21 Sep 2017 04:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992020; cv=none; d=google.com; s=arc-20160816; b=srWC2kjEmWFUcapFQHqAGHXYPHrhaIHUjqo7Bf2EtRkPU5BgxUhUmhLVlrkKpTTU5K euS2ZHSFXIi0BNqJX7crJ2C8BQk7pr3NilTVI/KacRoZpuLSLvfSgoV83Cfv8z+kJi/N jG5KVqVQoKsuax5n9hF0MQWrsTj4gD2cOTIPDvq00GKd2dQNyk5NYX/C3j8zRP6jha1N GI1jsWjWuNighJx+YwWTWAMlPaPCwyIM2WhedwLTMVmx6gEVrAHPbMeBQJb+c32Ak0s/ H6HISLXIFWEuPUG7zFGtdH5w3hAvqD3FSKKdVttDsP0TDC+mH4hLiJDd9q61O4R0cW7S FQ9A== 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:arc-authentication-results; bh=q9QfWDvtus2WmHEUoy7twen50GwMEMjHw/G0M+ZIO3M=; b=Tip5Lb7x8Jo4tlMe+GtqCAyKfh1zvT4TvsrfL/sAaP94TnYxe1R/rBwIddXjkuzsMv sUnU70GEDoXgbdgZerK5kNqSNAfUqcQxJNNG76PClijag1+b1Hi0zm056lyzch7zPZXi hJYnx5ZqlrL4KOuoOovAsXD7XaFKNZd3h/etsfMSZLTMdNrsgnXxla/PWBhGlAfudREt JQ/Nb6h2JKpN4vfdSscIjXgEtvaVeoQzt2KvqaDvAEUvSDDDGQoBN/xd0CpTCXKE5Q/e E/qKmteo3yQfNHz6nuDCjtN9/65Cl+9v8nW4C2Vkxp6yJtueLMFlIeKHsKhR452NBtpy OvDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=abPvMTRU; 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 t2si902122plj.334.2017.09.21.04.07.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:00 -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=abPvMTRU; 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 43DA420945B6C; Thu, 21 Sep 2017 04:03:53 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x232.google.com (mail-pg0-x232.google.com [IPv6:2607:f8b0:400e:c05::232]) (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 1249B20945B6C for ; Thu, 21 Sep 2017 04:03:52 -0700 (PDT) Received: by mail-pg0-x232.google.com with SMTP id c137so3327653pga.11 for ; Thu, 21 Sep 2017 04:06:58 -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=iPRcs3OHfV72L45b42zNqK5B8akNoTf2U4Zu7yffHus=; b=abPvMTRUZC+yLKaFyuyIrV3q3XCjhEt9cTpG57HOe6oxnmMMMF/sc6CsZly+biVc0H gUuBlQSO/7Njvfp2qaqm2a5NN5JjgnrBbHFY2h5onN3H6uvpyhfeBd4p56nF3sp6/zXY MB7MLmPPy9ycoNz8n0pajdufmQkQxxBbYxlHc= 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=iPRcs3OHfV72L45b42zNqK5B8akNoTf2U4Zu7yffHus=; b=bbEeCVEUVZbyKuhs0cGVTXtdSzrORj6K94Y9T3FVsMEebhNxBPfAIRAQjMyGBSF0FR HOo4DGXuVWHdgeWvEtg/iLO8vkD96ermHLkWBnKJnkA5n3w/JESeYOsaF44xEGfkS4CL dcweoA020EtOEh4A7bpc1QFwvip1dhd1PNXcGjQHBdskP2CuXoZ7f7yMe1a0UsuMq12j /3lYT7Nfht606gzzONpyV7xWwxh83xLP/X8VsluuIDofUSa3PsBLYLD02PLB4NPY70om bJNM3qDHFYdUnqSNO8xB03X9q/sm1g8v77WOywCICfV73rCh+dFwGiLzClOjM5Byw1SE 08Ww== X-Gm-Message-State: AHPjjUhKKVJ2a5QpSFDDxErs4HCpcTloOhsCY+IcH6R0M02Q1uR7xfiv uKHpTtjJftePbU/HiVuCbIesuw== X-Google-Smtp-Source: AOwi7QAn6v181BVJQ7MrYzG+unMalKhvQVrldLbYxYS2aOG2GvZeKS5uEOS0UPoDDrfdIotnzqiDXA== X-Received: by 10.101.85.4 with SMTP id f4mr5347197pgr.10.1505992018511; Thu, 21 Sep 2017 04:06:58 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.06.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:06:57 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:42 +0800 Message-Id: <1505991597-52989-4-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 02/11] Hisilicon/D03: Modify dsc and fdf file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Heyi Guo , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 1. Add Drivers/SasPlatform; 2. Add Drivers/Net/SnpPlatform; Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D03/D03.dsc | 5 ----- Platform/Hisilicon/D03/D03.fdf | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) -- 1.9.1 _______________________________________________ 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 afea162..7e25ffb 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -418,11 +418,6 @@ Platform/Hisilicon/D03/Drivers/Ipmi/ipmiInterfaceDxe/IpmiInterfaceDxe.inf - # - #network - # - Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf index b62b908..b53bdca 100644 --- a/Platform/Hisilicon/D03/D03.fdf +++ b/Platform/Hisilicon/D03/D03.fdf @@ -242,7 +242,8 @@ READ_LOCK_STATUS = TRUE #Network # - INF Platform/Hisilicon/D03/Drivers/Net/SnpPV660Dxe/SnpPV600Dxe.inf + INF Platform/Hisilicon/D03/Drivers/Net/SnpPlatform/SnpPlatform.inf + INF Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf @@ -271,6 +272,7 @@ READ_LOCK_STATUS = TRUE # INF Platform/Hisilicon/D03/Drivers/Sm750Dxe/UefiSmi.inf + INF Platform/Hisilicon/D03/Drivers/SasPlatform/SasPlatform.inf INF Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf # @@ -278,6 +280,7 @@ READ_LOCK_STATUS = TRUE # INF ShellPkg/Application/Shell/Shell.inf + # # Bds # From patchwork Thu Sep 21 10:59:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113222 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1877545qgf; Thu, 21 Sep 2017 04:07:11 -0700 (PDT) X-Received: by 10.98.33.134 with SMTP id o6mr5394840pfj.103.1505992031230; Thu, 21 Sep 2017 04:07:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992031; cv=none; d=google.com; s=arc-20160816; b=0i7MeB1h07WFO1IRTud3HxEugfmOtR3C/wdfF3md6ML4P3Qa7PmROdd8vflbTDgmwb dkXAG5MD5i2U6se/DPO+fwQ5KsLvAb8WQap9DKtULQ62W1ovWraefjunMYZxHTHNWGy9 3zHBQhKD2nG0yJ7KF6tRSpl0d8KeZJb9FcGSICzYZ0OuNY9KckpnPN+2v3AepnK8K06w srwQE4sMWYXrJxy+e+L+3vOlw7HEn7fxhWmx8fJDYZ+Z403PwkxAeGIT/xnReO3mpYzD SBRt9xugWNL+J2DgpsEPpJ9ETd7dj6u/VBzIc3bCsuz4gPKDNbpaDyX79n04dAU8j8Cz +SJA== 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:arc-authentication-results; bh=/t60J+0+5uPNhNfvx92mkOCPis00e4dfuAHXKCtiFAE=; b=ImBdWkPHHZdvzqEcGLiHrU3ZnvpApW5pPbfuqFKhLOR7xGkOHDkPnUZib+zMeTyJ4h iOE2U95Z/fiqSPbA7m4b2BKArRPdeyDb27r2M24TQDYhaQE630VUzk8dH33ayNv11ogZ 3R21Jw28EXc7R8dTagLpm5qOWDY6nHP9ZQpBzyFT0tj13MUlxrji1UqSruTK10vuUKhF B4m5U+ATdsATHMZ+kuAuLjFNP4pnTn7CRM0eDu6vv86msL5u3czkGFvNFbIXY5iE3IeL Zf9ExKcQptq31g3w0meqw65dPiHhNUK6Q9XLYiP3PFQlMWqKTGlCOKpqH2OtaWb8f5ct FguQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=fr/JRt5H; 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 g4si862869plb.756.2017.09.21.04.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:11 -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=fr/JRt5H; 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 F402420945B9D; Thu, 21 Sep 2017 04:04:01 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pf0-x234.google.com (mail-pf0-x234.google.com [IPv6:2607:f8b0:400e:c00::234]) (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 46B6421E1B76D for ; Thu, 21 Sep 2017 04:04:00 -0700 (PDT) Received: by mail-pf0-x234.google.com with SMTP id y29so3063120pff.0 for ; Thu, 21 Sep 2017 04:07:07 -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=WEV+hrb4bbm4u6fweFmJ/lTQeqC8UWXcZhGGSfcIQbo=; b=fr/JRt5Hngy9n7JXNiQABOhx76zY093GUcy/ezYFqSfnNCNnhrtypXPWvSYQhwI7bq ucdAt4dvdW5wDfYkBu9RQzTQfOQoS9cvCifALa2eDnZp2CN27Ik29O4cqUcbdQzAO/C3 28qY59MYAqkUBXw1teran+vrjZs83+jKNn4FE= 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=WEV+hrb4bbm4u6fweFmJ/lTQeqC8UWXcZhGGSfcIQbo=; b=EBzhaIoRRbTd86e62TJwee0NWuC2yuvg6XBBhxa+TnpiPZ9Xnl3IdehBu6f+h/D1pD qVxpRxiXNlWWl8LAui0XHIvqe8asu9UpTmyWvFACtxfQIivC0MQFvmYzVAd2uin2/9KW kTFgTgVq3EQbsUW9ZqOuDZpUmYBdl5zfaEhpfUmO98tXRoVh5azrSUvnsp+Gw1A6H+W1 2xeAOJWVcowstQ707zxq7jYrwxclVYYNCA2+Rhn5kaPfXbXI17k4vU7CGyJI9XddXNb7 zhGUIigEd0uvMMci8BqAhAARaLZtqfyTK+hseIzsyGOwyVyV8Cp5Nqz1VszLCdLHICfF rPtg== X-Gm-Message-State: AHPjjUghRgPjk3LFPUsyX8Z1RiqJr0ttTz7z72lHfe7Ryr1DK2MmvG4U UmTGB9NNMamdrOBN1hB+V0Sjzg== X-Google-Smtp-Source: AOwi7QCLF1GFEvj7Sv2+q72iaugHy9Kn/31t+LYUJTCvIAmhbhOKhxIWjy6Yyfvuus//RYU3LT8D9A== X-Received: by 10.98.213.69 with SMTP id d66mr5310493pfg.17.1505992026691; Thu, 21 Sep 2017 04:07:06 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:06 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:45 +0800 Message-Id: <1505991597-52989-7-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 03/11] Hisilicon: Fix the drivers use the same GUID issue X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Heyi Guo , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The drivers build from separate sources, their GUID should be different. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Heyi Guo Reviewed-by: Leif Lindholm --- Platform/Hisilicon/D02/EarlyConfigPeim/EarlyConfigPeim.inf | 2 +- Platform/Hisilicon/D02/FdtUpdateLibD02/FdtUpdateLib.inf | 2 +- Platform/Hisilicon/D02/Library/PlatformPciLib/PlatformPciLib.inf | 2 +- Platform/Hisilicon/D02/OemNicConfigD02/OemNicConfigD02.inf | 2 +- Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf | 2 +- Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf | 2 +- Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf | 2 +- Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf | 2 +- Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf | 2 +- Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf | 2 +- Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf | 2 +- Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf | 2 +- Silicon/Hisilicon/Library/I2CLib/I2CLib.inf | 2 +- Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D02/EarlyConfigPeim/EarlyConfigPeim.inf b/Platform/Hisilicon/D02/EarlyConfigPeim/EarlyConfigPeim.inf index 5506a58..3f3f81c 100644 --- a/Platform/Hisilicon/D02/EarlyConfigPeim/EarlyConfigPeim.inf +++ b/Platform/Hisilicon/D02/EarlyConfigPeim/EarlyConfigPeim.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = EarlyConfigPeim - FILE_GUID = A181AD33-E64A-4084-A54A-A69DF1FB0ABF + FILE_GUID = ECAE8400-9CCE-4BA5-9B44-74CAABE4DA79 MODULE_TYPE = PEIM VERSION_STRING = 1.0 ENTRY_POINT = EarlyConfigEntry diff --git a/Platform/Hisilicon/D02/FdtUpdateLibD02/FdtUpdateLib.inf b/Platform/Hisilicon/D02/FdtUpdateLibD02/FdtUpdateLib.inf index c952414..e881899 100644 --- a/Platform/Hisilicon/D02/FdtUpdateLibD02/FdtUpdateLib.inf +++ b/Platform/Hisilicon/D02/FdtUpdateLibD02/FdtUpdateLib.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = FdtUpdateLib - FILE_GUID = 02CF1727-E697-47fc-8CC2-5DCB81B26DD9 + FILE_GUID = 0F9ADE24-46B4-4506-8802-60C519B56133 MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = FdtUpdateLib diff --git a/Platform/Hisilicon/D02/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D02/Library/PlatformPciLib/PlatformPciLib.inf index 4d2dbba..ab3b62b 100644 --- a/Platform/Hisilicon/D02/Library/PlatformPciLib/PlatformPciLib.inf +++ b/Platform/Hisilicon/D02/Library/PlatformPciLib/PlatformPciLib.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PlatformPciLib - FILE_GUID = 61b7276a-fc67-11e5-82fd-47ea9896dd5d + FILE_GUID = 128F1E1E-A921-4277-A796-A4A47B96B7D2 MODULE_TYPE = BASE VERSION_STRING = 1.0 diff --git a/Platform/Hisilicon/D02/OemNicConfigD02/OemNicConfigD02.inf b/Platform/Hisilicon/D02/OemNicConfigD02/OemNicConfigD02.inf index df5adf1..4c5955f 100644 --- a/Platform/Hisilicon/D02/OemNicConfigD02/OemNicConfigD02.inf +++ b/Platform/Hisilicon/D02/OemNicConfigD02/OemNicConfigD02.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = OemNicConfig - FILE_GUID = 3A23A929-1F38-4d04-8A01-38AD993EB2CE + FILE_GUID = BF422A22-CA90-4C34-95B9-3D147AF09E70 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 ENTRY_POINT = OemNicConfigEntry diff --git a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf index 9569b91..2d9d53d 100755 --- a/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf +++ b/Platform/Hisilicon/D03/Library/FdtUpdateLib/FdtUpdateLib.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = FdtUpdateLib - FILE_GUID = 02CF1727-E697-47fc-8CC2-5DCB81B26DD9 + FILE_GUID = B80B9FF1-FAB9-4BE5-B602-5ABAA6B7A3D4 MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = FdtUpdateLib diff --git a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf index 9d8ea7e..0f6b68d 100644 --- a/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf +++ b/Platform/Hisilicon/D05/EarlyConfigPeim/EarlyConfigPeimD05.inf @@ -17,7 +17,7 @@ [Defines] INF_VERSION = 0x00010019 BASE_NAME = EarlyConfigPeimD05 - FILE_GUID = A181AD33-E64A-4084-A54A-A69DF1FB0ABF + FILE_GUID = 13525B94-06F0-41AC-8CAF-724B149FD259 MODULE_TYPE = PEIM VERSION_STRING = 1.0 ENTRY_POINT = EarlyConfigEntry diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf index 4fe7ac6..bf44ff7 100644 --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010019 BASE_NAME = OemMiscLibHi1616Evb - FILE_GUID = B9CE7465-21A2-4ecd-B347-BBDDBD098CEE + FILE_GUID = 751C7627-D5F8-499C-AEEEE-C87858759612 MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = OemMiscLib diff --git a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf index cd64193..21bb33a 100644 --- a/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf +++ b/Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010019 BASE_NAME = PlatformPciLib - FILE_GUID = 61b7276a-fc67-11e5-82fd-47ea9896dd5d + FILE_GUID = B94B8A3A-AD7D-4F26-B140-1E699682176B MODULE_TYPE = BASE VERSION_STRING = 1.0 diff --git a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf index 174e967..89447cc 100644 --- a/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf +++ b/Silicon/Hisilicon/Hi1610/Drivers/IoInitDxe/IoInitDxe.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = IoInitDxe - FILE_GUID = e99c606a-5626-11e5-b09e-bb93f4e4c400 + FILE_GUID = 28C9B7DE-AAD6-4E9B-811B-050AD3DAB9A3 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf index 686d041..ee9dbed 100644 --- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf +++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf @@ -17,7 +17,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = PcieInitDxe - FILE_GUID = 2D53A704-A544-4A82-83DF-FFECF4B4AA97 + FILE_GUID = 8EB6E216-BA47-4B30-B68A-2B371F7232A6 MODULE_TYPE = DXE_DRIVER VERSION_STRING = 1.0 ENTRY_POINT = PcieInitEntry diff --git a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf index 6faefb1..17d59ee 100644 --- a/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf +++ b/Silicon/Hisilicon/Library/DS3231RealTimeClockLib/DS3231RealTimeClockLib.inf @@ -20,7 +20,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = DS3231RealTimeClockLib - FILE_GUID = 470DFB96-E205-4515-A75E-2E60F853E79D + FILE_GUID = 5FD8127D-11E1-488F-8CF1-A143157D6BF0 MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = RealTimeClockLib diff --git a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf index d7957ea..df65d4b 100644 --- a/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf +++ b/Silicon/Hisilicon/Library/Dw8250SerialPortLib/Dw8250SerialPortLib.inf @@ -17,7 +17,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = Dw8250SerialPortLib - FILE_GUID = 16D53E86-7EA6-47bd-861F-511ED9B8ABE0 + FILE_GUID = 78337705-D2A8-4EA7-9C18-27FC4A8A2C6E MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = SerialPortLib diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf b/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf index 7f95124..9bca88f 100644 --- a/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf +++ b/Silicon/Hisilicon/Library/I2CLib/I2CLib.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = I2CLib - FILE_GUID = FC5651CA-55D8-4fd2-B6D3-A284D993ABA2 + FILE_GUID = 162F2DF1-DBF8-41E6-9792-92A96ADEAB40 MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = I2CLib diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf index 4990072..1bb4f5c 100644 --- a/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf +++ b/Silicon/Hisilicon/Library/I2CLib/I2CLibRuntime.inf @@ -16,7 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = I2CLibRuntime - FILE_GUID = FC5651CA-55D8-4fd2-B6D3-A284D993ABA2 + FILE_GUID = 2E602B32-9203-44A4-BF28-1FF98BD89523 MODULE_TYPE = DXE_RUNTIME_DRIVER VERSION_STRING = 1.0 LIBRARY_CLASS = I2CLib From patchwork Thu Sep 21 10:59:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113223 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1877634qgf; Thu, 21 Sep 2017 04:07:14 -0700 (PDT) X-Received: by 10.98.70.221 with SMTP id o90mr5399433pfi.277.1505992034763; Thu, 21 Sep 2017 04:07:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992034; cv=none; d=google.com; s=arc-20160816; b=WFv1MAJ9H710pv2PsLuTWKrehBVBt3/8lRoYX6YUtUtT19KGVpzzhQUCdSCCMuNKO4 a57/lBUKJr4IhJPDnHIidLTzubdWWAARrT24JoHDAAc2IK0btiv2q/nznMN8LKE054ep qp+Qp1FS3C1zQebrETqce7akFFn8ik6n3XqEFRaYB3DoTM536QQow4lalia87U1VMkKE 6sGTHV4JMAGapOn5XS0EKWjlm1PAAdUm75Ay5G7c+9Nb/Mw5CGAjeG1LUX12KQSqAH/b /AEII8RoHqnwKRMeIwVnU4J7FyOww/fAetU2VSuNMdpbYzalMCDouVmot/zldWwPoYkX Lsxg== 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:arc-authentication-results; bh=WzMtuQRukEO0ITliCJzRDMSRJFeyHwHZ6PskDy1C4FU=; b=OrG3ysrWfIg4N0Ejo6P4ovMgou5eZFFMhFwiZe1QmpvRjgFY8h84U54pIdLHcSEx2x 6QA98YjeR7xmuv67TGiJ99TAE/PYaNZ/OWLrbzd4H0NEavrRc3R9k9RuU6VE179Fkn5V 2YTPG6XFbvj1z983B1gRx2yt/kuNBo+ILcAoxTeNECNIOVjYOIWcqeCxisFSUhZKPI/Y UCzLrFRnnuGkle45GQLI/wctQpOWncFksuwtAdk6DcEufq+0vYGG3JkF3NJGtpRaXhjO CXpsWkQKbbKIUY0q3658HayzihDFmvH4bDOp3xeR1sLfNn4z0GFuqG4OpyMhVtT+X65N 00Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Trr19+AO; 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 c2si859246pli.812.2017.09.21.04.07.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:14 -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=Trr19+AO; 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 3CB6F2095BB78; Thu, 21 Sep 2017 04:04:04 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x231.google.com (mail-pg0-x231.google.com [IPv6:2607:f8b0:400e:c05::231]) (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 E421021E1B76D for ; Thu, 21 Sep 2017 04:04:02 -0700 (PDT) Received: by mail-pg0-x231.google.com with SMTP id 7so3328002pgd.13 for ; Thu, 21 Sep 2017 04:07:09 -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=IHHgaXMWs3he51p2OHrY9W45aCFcWl3+2hQ424RuhmA=; b=Trr19+AOhWKs7rSBRK47HLv2e/NceMa+D/iThgYBV2Eoo5GVeX9BLO5bxy8xufiiie Ra82C/z3gNauiERDd9IeizEEyWmyi/H83lbfnH6/J59zA4cN7EwIquGgTyFrTybxvDxY ii8qHXBCya+ccsKpreX5lYMQBBhMvBnN4I3bU= 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=IHHgaXMWs3he51p2OHrY9W45aCFcWl3+2hQ424RuhmA=; b=V6nIcTIb8NdlfHblpaN5CYnuzHtfH7/b31ygGKjT80EU8NBmshf+Qt/0UXGWrke2Oq 6z94SKQJsLCxX9qjVGisZVwty7l6Fndg9DUna2fe+ymeVuXuJjkl8ko+qfkz6rqj6L/J /iF1D6c6Zz4CFqUaID55ZcIJBV7vM1eliR76Rx+mhVB3TAjJRYb+I/B1VPW0R1NPBMly c/Q+hij1LGYJcjryvSzd7RvtLIePtPfLg/lIaC10sJM3AezqJDw/7oyNHzrbkO+L7iFX xxHT7pW8Nj4/nW4la3WBZibrmFE5ZUqtqPUHyB66pMjjvkvPMjaYrXbPSnxocPtbXO8G I5Vg== X-Gm-Message-State: AHPjjUiMh9l5+ytLp1gv63V7o7hzKCpNOnDTtmkvs5ClyuNDs3EGNh3v rqV/Iiv4EvNxsHGEkCbs9CtUNw== X-Google-Smtp-Source: AOwi7QAHyLSds1FRzMzVLmvmwLB0uQbIMd5cJ1LbXce5ZFwDYvL+OjkY13X6HbzC0Z6f75t36SHUig== X-Received: by 10.98.178.66 with SMTP id x63mr5333239pfe.332.1505992029447; Thu, 21 Sep 2017 04:07:09 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:08 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:46 +0800 Message-Id: <1505991597-52989-8-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 04/11] Hisilicon D03/D05: get firmware version from FIRMWARE_VER X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Ming Huang , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Ming Huang Value of the environment variable FIRMWARE_VER is GIT SHA by default, and you can add the environment variable FIRMWARE_VER to EXTRA_OPTIONS at build time to specify something else, eg. "16.12-". Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D03/D03.dsc | 6 +++++- Platform/Hisilicon/D05/D05.dsc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 7e25ffb..fca6781 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -170,7 +170,11 @@ gHisiTokenSpaceGuid.PcdAlgSmmuBaseAddress|0xd0040000 - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Hisilicon D03 UEFI 16.12 Release" + !ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" + !else + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D03 UEFI 17.10 Release" + !endif gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 7cd5758..aa61c0e 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -188,7 +188,11 @@ gHisiTokenSpaceGuid.PcdIsMPBoot|1 gHisiTokenSpaceGuid.PcdSocketMask|0x3 - gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Hisilicon D05 UEFI 16.12 Release" + !ifdef $(FIRMWARE_VER) + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"$(FIRMWARE_VER)" + !else + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"Development build base on Hisilicon D05 UEFI 17.10 Release" + !endif gHisiTokenSpaceGuid.PcdBiosVersionString|L"10.01.01T18" From patchwork Thu Sep 21 10:59:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113225 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1877854qgf; Thu, 21 Sep 2017 04:07:23 -0700 (PDT) X-Received: by 10.99.111.9 with SMTP id k9mr5297704pgc.439.1505992043394; Thu, 21 Sep 2017 04:07:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992043; cv=none; d=google.com; s=arc-20160816; b=nKvYPSkeTxumhwabAjZTAToC8SevzLCrBILLpL4G2XSGx5g6es825HyOM/VZdcxtgD B9o0SHJdsf4forSryr4W5AlXIBe2o/e50/F+ypszbDKRIt0BtZYiS/ZVO/E6maICaH90 L81bLA+rrsGeag6T4T9Cg+hnVUtnjpNdiZl0pd3/KWmlb5+aEM85D1CRxuD7uegWLFYL skILFH7t21F0OAYJnmSCq4rxm5XWsBEYhtcZ/GLtu7cfPwAoH4IBUkv2TgNYDf1VQaq2 GQI0Xy5ZVZKSIqY1ILf2f0GXwRoYrzBLtEx14yXaVSBcez+ruhJ9ftCfaSvnQiRQYXcV kGfA== 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:arc-authentication-results; bh=ZGprjKUiqcpbAR+XqOFnlP0i0YL4OSK5GrtsWKw3/OQ=; b=fP7fVxOYF7TNRZNpD+Ons95eiKz6pwdwCTQ0jfW0Q2WCR1OZ+3C8PMo9qdk3izDStX uM0brQvJcbH5FSnavIY4nVVE9aKbZUHf5nhYMyF5IURfr1+MaIR5Zb6uKUpRSGMZ5n0o LYx6AqYOhNYhIFFP25K06VQrdjg63ihMK9QmztksCjf6AoReDn5rH6JwGnTO4PT7twLp yPtGrUZ0fcKtoGUIH7+3J91ZVcYM/R3BW+64rpZnCdci3ag9px2rL5xBxSLhIDSLubuF TAIx2AWCyysmkgbGsLynqABWljbvzBIBrWxWfO03XC5jhVHRCgehIlVJVOEJfVLwM9tM zBNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=DEOqdr9M; 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 w2si872425pgb.564.2017.09.21.04.07.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:23 -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=DEOqdr9M; 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 B355A21D492E4; Thu, 21 Sep 2017 04:04:09 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x22a.google.com (mail-pg0-x22a.google.com [IPv6:2607:f8b0:400e:c05::22a]) (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 7AFCF21E1B76D for ; Thu, 21 Sep 2017 04:04:08 -0700 (PDT) Received: by mail-pg0-x22a.google.com with SMTP id i130so3340674pgc.3 for ; Thu, 21 Sep 2017 04:07:15 -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=MvCaV8auKjL8rA4EyReUbLy/wqRhAx8zHLH8rmkjwxc=; b=DEOqdr9Mf4vScNgUqQiYxqV4J5blzsL1FC34qOyf1BEuAp8rxOq6omNFcQlMmL4qfH gk9www4Xm9vZ4fFZt6huS/NIwTbDx5DmoSQNDAsGHOfE5ZOlYwwc0X5/S2m2vOdrZ6U5 yFBh0eVIkHvtqEU6qpcJMc3idmdv7THbHcwvs= 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=MvCaV8auKjL8rA4EyReUbLy/wqRhAx8zHLH8rmkjwxc=; b=dPIWZe9Evc8JFWrN3Fky1GB94Gh5DTZSD866WnwOo34PrL4PIMQOmhDe3ROzTObp8r FRTEDGG2oPoFcve6uUiY63MSK1lHg+Qiw6MhQosOzYDsk6DKmjSVQf6RL4ldo1pZV8Cs NHUryBfix5yVstaKEt0wxsdn8qbGAZ92JGFqr6STDwog/HbObeoka1DQNl4bEHAjzPsA IE0w8l0W2/EyEeHqv+zhqCsNvS1OUmLng8pWaO+gLPsHPz067jUGJXRILoMB9JWHpRKh uXoxB7CXm52yOWSmjMQ6eDiKReRfiMDxGjjXXN9tIZfLJBLx/iLKtitmenR7XmOuvq6r 1mxg== X-Gm-Message-State: AHPjjUimm56fnP7xqDnXesxquF15Hy3qoECfXwWTZeQTE7RcKTDg2A4t W3Ikar7nPguMTkBo1R8HDCWkDg== X-Google-Smtp-Source: AOwi7QBuf0CJmHRK1vgc07yKTiUl6bycb5N9yfuiVQQEyOD3AzF12HwMcBinsCqPRRo7g33JllYVaQ== X-Received: by 10.99.126.84 with SMTP id o20mr5348117pgn.129.1505992034957; Thu, 21 Sep 2017 04:07:14 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:14 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:48 +0800 Message-Id: <1505991597-52989-10-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-non-osi v3 5/7] Hisilicon/D05/Sas: Add SasPlatform X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Heyi Guo , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Install protocol to enable sas port which is using and transmit base address info of sas port to SasDriverDxe. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi | Bin 0 -> 3424 bytes Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf | 24 ++++++++++++++++++++ 2 files changed, 24 insertions(+) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi b/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi new file mode 100644 index 0000000..d2685ab Binary files /dev/null and b/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.efi differ diff --git a/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf b/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf new file mode 100644 index 0000000..636be19 --- /dev/null +++ b/Platform/Hisilicon/D05/Drivers/SasPlatform/SasPlatform.inf @@ -0,0 +1,24 @@ +#/** @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. +# +#**/ + +[Defines] + INF_VERSION = 0x00010019 + BASE_NAME = SasPlatform + FILE_GUID = 102D8FC9-20a4-42EB-aC14-1C98BA5b26A4 + MODULE_TYPE = DXE_DRIVER + VERSION_STRING = 1.0 + +[Binaries] + PE32|SasPlatform.efi|* From patchwork Thu Sep 21 10:59:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113227 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1878084qgf; Thu, 21 Sep 2017 04:07:32 -0700 (PDT) X-Received: by 10.99.146.24 with SMTP id o24mr5389226pgd.217.1505992052734; Thu, 21 Sep 2017 04:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992052; cv=none; d=google.com; s=arc-20160816; b=ZJaqLBZquUTdvtOJg3grIcKNJG5zdlh/Khb8ngggNNW8qlA+dM6T4cowQ6xI3tCA/W n4feRcA0H3+Q7sH51kqdqAvbYHwM7oP7DRnWMFiqzQORwbaQ5J7ihly1TNUyBc9Y3zfQ AhmDxMw77XXCpNBk0/rU7i/S7KYClNAe66vs/pdIwApCQMeQ+h4gmMkEX0RXS19EEJoh un4d0xpY9/a3EPAWDJqj1DSomLAyVvZxzDTGmaIV1VeDo52GRTAo6CB0hBViBoptRYN2 0CMrhL4NeKTt80s6OTktYv1geSXspNkxKeByp6n24Mv7huoctk7cbHbQlf11zbErzFaX MqUg== 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:arc-authentication-results; bh=GdXZidLYWlCkpaAIiwphmPv+OuPcK5q8+mVH3Gbi2xY=; b=ccrkHYUnurpEWC2KdereU6mnGKrmlMFmQvcapouIk2cP8Pk2heh8fown/993B6zTWm WY8+qSAraszCoZdbBY6jLuXPmFNLCRyDXRH46HgL9QiqGXp9LJX7dUom0FHvNAWMm7SL ZjfdlzdeNAMQnlNLN4ERoaJsZ30EDsB/dbiNPVGK3VWCofjR/qIfRQ96fxbmPr5WviFH 7SpR1oLSDb571Y4vdjS+43g32UL+nyGmk7XZlAPMcy9XdAZELdzCG6QVgTrcf7mbfI4K MFREWoCTb1C699jOgGYqd+5Y6iunCnuHFrE/WBmSEOXKqlhhkeFLcv5D6gFUu6U49WmP LBTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=iVavPawm; 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 27si846835pfr.408.2017.09.21.04.07.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:32 -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=iVavPawm; 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 3910521E87986; Thu, 21 Sep 2017 04:04:15 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x233.google.com (mail-pg0-x233.google.com [IPv6:2607:f8b0:400e:c05::233]) (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 DE3A421E1B76D for ; Thu, 21 Sep 2017 04:04:13 -0700 (PDT) Received: by mail-pg0-x233.google.com with SMTP id i195so3328856pgd.9 for ; Thu, 21 Sep 2017 04:07:20 -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=HOf4gXBHFv49ZHuvCcZzcipUFOz3WDDuIe87W5fJkZE=; b=iVavPawmMi4mFm2YR5NNwEgPinsgWhBnBEkCOCqmj4G5ANYpuux5iahIlxezJEVozM B2CqPz1X8dJgwdHB6zCLe3Q24r186WeNHAmaPS1JUXy+RzZwWVCHv+0A4yyhWo510xz7 gmI5LSyDQMTzSEMNZJosTzdu+SMT1F53mGzxM= 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=HOf4gXBHFv49ZHuvCcZzcipUFOz3WDDuIe87W5fJkZE=; b=fIEiCBYGwNzt+3JgqhPZl3Gau74QFn2xY+bYPZIiQ6ZhjAf/Bso1iFf7NtJZoFUNP2 6e87+b4Vt+QNQsvLwt5EkFvivY4xN/6BpVc5e+7HcGU3hkNUdCzkxPtB9iQZTN7kLYKt rRlFd7vlsSXrVdg9INIpHceJVdbIwpEYaubAh/AOHNJbxonuxaMJJfJzNYHSh5WDrVnB eGGb10v6vhBPaudHiLQjl7sR9n9Hta0MoDlGWgiLurH469E0PxjMn60IKhmKelJaxZJr ltY7scWGe6cDMuZ06l8z18vOgrYtGpUTaGy3Aixl9U6qvaOOo2b1uOSzi0lMgNmD8/Es YnQw== X-Gm-Message-State: AHPjjUjFaLBKPpsnZOIfzw7gJ8OIo/s3rYgPCnkIkLFcX3u6sHsx/7K1 qCnBRD8HzpWF5mqUznkyQeFBXg== X-Google-Smtp-Source: AOwi7QDM0mz6WBckqca+vrP+LiUh5MMhSzKvFmGY35CxezLKCQKtwmvb4M2EcJPKRywAWHkj1mmRCw== X-Received: by 10.99.109.202 with SMTP id i193mr5260056pgc.399.1505992040359; Thu, 21 Sep 2017 04:07:20 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:19 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:50 +0800 Message-Id: <1505991597-52989-12-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 06/11] Hisilicon/D05/Pcie: fix bug of size definition X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: huangming Fix bug of PcieRegion size definition and IO size definition. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D05/D05.dsc | 64 ++++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index aa61c0e..01defe0 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -310,37 +310,37 @@ gHisiTokenSpaceGuid.PciHb1Rb7Base|0x700a00b0000 gHisiTokenSpaceGuid.PcdHb0Rb0PciRegionBaseAddress|0xa8400000 - gHisiTokenSpaceGuid.PcdHb0Rb0PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb0Rb0PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb0Rb1PciRegionBaseAddress|0xa9400000 - gHisiTokenSpaceGuid.PcdHb0Rb1PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb0Rb1PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb0Rb2PciRegionBaseAddress|0xa8800000 - gHisiTokenSpaceGuid.PcdHb0Rb2PciRegionSize|0x77effff + gHisiTokenSpaceGuid.PcdHb0Rb2PciRegionSize|0x77f0000 gHisiTokenSpaceGuid.PcdHb0Rb3PciRegionBaseAddress|0xab400000 - gHisiTokenSpaceGuid.PcdHb0Rb3PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb0Rb3PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb0Rb4PciRegionBaseAddress|0xa9000000 - gHisiTokenSpaceGuid.PcdHb0Rb4PciRegionSize|0x2feffff + gHisiTokenSpaceGuid.PcdHb0Rb4PciRegionSize|0x2ff0000 gHisiTokenSpaceGuid.PcdHb0Rb5PciRegionBaseAddress|0xb0800000 - gHisiTokenSpaceGuid.PcdHb0Rb5PciRegionSize|0x77effff + gHisiTokenSpaceGuid.PcdHb0Rb5PciRegionSize|0x77f0000 gHisiTokenSpaceGuid.PcdHb0Rb6PciRegionBaseAddress|0xac900000 - gHisiTokenSpaceGuid.PcdHb0Rb6PciRegionSize|0x36effff + gHisiTokenSpaceGuid.PcdHb0Rb6PciRegionSize|0x36f0000 gHisiTokenSpaceGuid.PcdHb0Rb7PciRegionBaseAddress|0xb9800000 - gHisiTokenSpaceGuid.PcdHb0Rb7PciRegionSize|0x67effff + gHisiTokenSpaceGuid.PcdHb0Rb7PciRegionSize|0x67f0000 gHisiTokenSpaceGuid.PcdHb1Rb0PciRegionBaseAddress|0x400a8400000 - gHisiTokenSpaceGuid.PcdHb1Rb0PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb1Rb0PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb1Rb1PciRegionBaseAddress|0x400a9400000 - gHisiTokenSpaceGuid.PcdHb1Rb1PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb1Rb1PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionBaseAddress|0x20000000 - gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionSize|0xcfffffff + gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionSize|0xd0000000 gHisiTokenSpaceGuid.PcdHb1Rb3PciRegionBaseAddress|0x400ab400000 - gHisiTokenSpaceGuid.PcdHb1Rb3PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb1Rb3PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionBaseAddress|0x30000000 - gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionSize|0xbfffffff + gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionSize|0xc0000000 gHisiTokenSpaceGuid.PcdHb1Rb5PciRegionBaseAddress|0x40000000 - gHisiTokenSpaceGuid.PcdHb1Rb5PciRegionSize|0xafffffff + gHisiTokenSpaceGuid.PcdHb1Rb5PciRegionSize|0xb0000000 gHisiTokenSpaceGuid.PcdHb1Rb6PciRegionBaseAddress|0x408aa400000 - gHisiTokenSpaceGuid.PcdHb1Rb6PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb1Rb6PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb1Rb7PciRegionBaseAddress|0x408ab400000 - gHisiTokenSpaceGuid.PcdHb1Rb7PciRegionSize|0xbeffff + gHisiTokenSpaceGuid.PcdHb1Rb7PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb0Rb0CpuMemRegionBase|0xA8400000 gHisiTokenSpaceGuid.PcdHb0Rb1CpuMemRegionBase|0xA9400000 @@ -377,52 +377,52 @@ gHisiTokenSpaceGuid.PcdHb1Rb7CpuIoRegionBase|0x408abff0000 gHisiTokenSpaceGuid.PcdHb0Rb0IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb0IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb0IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb1IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb1IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb1IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb2IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb2IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb2IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb3IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb3IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb3IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb4IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb4IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb4IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb5IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb5IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb5IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb6IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb6IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb6IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb0Rb7IoBase|0 - gHisiTokenSpaceGuid.PcdHb0Rb7IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb0Rb7IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb0IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb0IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb0IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb1IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb1IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb1IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb2IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb2IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb2IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb3IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb3IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb3IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb4IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb4IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb4IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb5IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb5IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb5IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb6IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb6IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb6IoSize|0x10000 #64K gHisiTokenSpaceGuid.PcdHb1Rb7IoBase|0 - gHisiTokenSpaceGuid.PcdHb1Rb7IoSize|0xffff #64K + gHisiTokenSpaceGuid.PcdHb1Rb7IoSize|0x10000 #64K gHisiTokenSpaceGuid.Pcdsoctype|0x1610 From patchwork Thu Sep 21 10:59:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113228 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1878372qgf; Thu, 21 Sep 2017 04:07:44 -0700 (PDT) X-Received: by 10.84.238.194 with SMTP id l2mr5239296pln.319.1505992064641; Thu, 21 Sep 2017 04:07:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992064; cv=none; d=google.com; s=arc-20160816; b=xzMcbiG+GJUZA/iaEbSQN1TKtDhQHaXDTqfBd+fdZjFiVoap3GHvhRygo2qFcgBrxy lTOC/uWfCw5GEZq8X8IgJJpE3XlD7NtTS1lBFPSxMFCyYAeMJyf2t3OS+URF6WA9C9ub 5oDNpBi0vJRkDmWSQj29cvNrcPJlwHxxfaT1voaCWcFeuTe4ktRmQRXvi1uYIbpT03j9 0QgokTByeNeRkYJEJ2uaUMczYtZkdKNEcm214oZAuKGarxn8+kvFFJk/0lJluly8D/61 Q9WK0XYCxGrL7f/yaUHx07QohEr+4uz/aqP5xQkvnQlWR9noEs3wTcVo1D/1oYrgoJ0w jW6g== 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:arc-authentication-results; bh=iW5smh9HJmiQRsR+FY54HYdFBOhuyzpmZ4WNPQ/O2Ok=; b=xwmPi+wu4pPh3SaLVP+IExpOM+HT34pAiU8MXQmaxtf4fSeGuqqq0I/n5cAh0Lf4zQ Q+XawjjiOPRe23nSpy/XIeKutycbqMQoJzh0q994gDGfEZyEXzW+O8r6jzUwQXLHXoLd xxPoMtCRw3Enlv9NN/lKsacg5RW5IiVHZ43a32uYwdMg6hzsssEumGza95iZdan6AuGx 8++jNi4SsOJoD6RWgcutj9wUTWtzcP9LSeuStnkTKq6vfjLOayTaswyAQwTKuS/dkQde FXqlyIp3qOOZeejVm9iiYwxShKxCCjDkkkwF9ng+VXLhXJ1xR9zmDFIFfQs8v6wDkvo+ WHpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=gQJgw2cR; 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 u62si851875pgd.634.2017.09.21.04.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:44 -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=gQJgw2cR; 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 B5F0B21E94615; Thu, 21 Sep 2017 04:04:20 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pf0-x235.google.com (mail-pf0-x235.google.com [IPv6:2607:f8b0:400e:c00::235]) (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 5109F21E1B76D for ; Thu, 21 Sep 2017 04:04:19 -0700 (PDT) Received: by mail-pf0-x235.google.com with SMTP id g65so3046156pfe.13 for ; Thu, 21 Sep 2017 04:07:26 -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=ywMvyfRsnBRKbX1Stzg36amkLTumLotSxj7XV7C+m5E=; b=gQJgw2cRqgHtTxq6bKp5uYHgOImuQRFFQTAkXKgi3ijk6KjAOhdnM9o2xliXWniwZS 7z5+y8UC68clKBIeYAgQD2+8ejUL+5W2ESv917F5mMW86KWfDZKKIcxJ+ucFOSQwI8g6 Q3B9mV8c1eTw5AB62Oo8Vvrd7/MCIEDq1lvjs= 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=ywMvyfRsnBRKbX1Stzg36amkLTumLotSxj7XV7C+m5E=; b=LYyZsLAzF8JI/4HIS5QiD6/Ei1kYVyyQkqgOEtDQ4SpGESwTq51e0CKG+Z0LnruFsb MJGS06ManDqdOhd8XAtZBN6dE7X0rkt95ZPNy1+gIYTDctUCMvgv12piw43eH2X5eJvA Vr4KUL4n8CA4I5V4eToCk39AYl36va1WWTBnzSeq5q1DabdjNs7Cf7zYCCFPABvYqdfc blcf/Y04s1/hfwgiugbxT3d5K8U3ktl8fFM+A01IJG6Cb/Y0VehR23cQaf+KQAcjUQjf wH8HNVv5yZrXrr7+w8fY6PdDW82svqKylOlk/y1wrH8KSkktLIYzF9KrkwPs/RGz1AOX pegQ== X-Gm-Message-State: AHPjjUjI+mqKATVZzh/VXpVhkWqgIKUdBiXEZvO3uiPdTsN51+I3kkJ+ zABuWtWskgZl/fusUJvRhGVGRg== X-Google-Smtp-Source: AOwi7QCz/FP7JNTOCKyHsZ646m+b2sFIQ4y0ga625MRsiFY5M58jSdmhOqbtE1aGirlry1/PMcn4ew== X-Received: by 10.101.78.201 with SMTP id w9mr5520028pgq.24.1505992045862; Thu, 21 Sep 2017 04:07:25 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:24 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:52 +0800 Message-Id: <1505991597-52989-14-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 07/11] D05/PCIe: Modify PcieRegionBase of secondary chip X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: huangming On D05 PCIe now, 2p NA PCIe2 and 2p NB PCIe0's pci domain addresses are 0x20000000 and 0x30000000 based. These addresses overlap with the DDR memory range 0-1G. In this situation, on the inbound direction, our pcie will drop the DDR address access that are located in the pci range window and lead to a dataflow error. Modify 2p NA PCIe2 and 2p NB PCIe0's pci domain addresses to 0x40000000 and decrease PciRegion Size accordingly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D05/D05.dsc | 12 ++++++------ Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Leif Lindholm diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index 01defe0..64101a7 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -329,12 +329,12 @@ gHisiTokenSpaceGuid.PcdHb1Rb0PciRegionSize|0xbf0000 gHisiTokenSpaceGuid.PcdHb1Rb1PciRegionBaseAddress|0x400a9400000 gHisiTokenSpaceGuid.PcdHb1Rb1PciRegionSize|0xbf0000 - gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionBaseAddress|0x20000000 - gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionSize|0xd0000000 + gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionBaseAddress|0x40000000 + gHisiTokenSpaceGuid.PcdHb1Rb2PciRegionSize|0xb0000000 gHisiTokenSpaceGuid.PcdHb1Rb3PciRegionBaseAddress|0x400ab400000 gHisiTokenSpaceGuid.PcdHb1Rb3PciRegionSize|0xbf0000 - gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionBaseAddress|0x30000000 - gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionSize|0xc0000000 + gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionBaseAddress|0x40000000 + gHisiTokenSpaceGuid.PcdHb1Rb4PciRegionSize|0xb0000000 gHisiTokenSpaceGuid.PcdHb1Rb5PciRegionBaseAddress|0x40000000 gHisiTokenSpaceGuid.PcdHb1Rb5PciRegionSize|0xb0000000 gHisiTokenSpaceGuid.PcdHb1Rb6PciRegionBaseAddress|0x408aa400000 @@ -352,9 +352,9 @@ gHisiTokenSpaceGuid.PcdHb0Rb7CpuMemRegionBase|0x8B9800000 gHisiTokenSpaceGuid.PcdHb1Rb0CpuMemRegionBase|0x400A8400000 gHisiTokenSpaceGuid.PcdHb1Rb1CpuMemRegionBase|0x400A9400000 - gHisiTokenSpaceGuid.PcdHb1Rb2CpuMemRegionBase|0x65020000000 + gHisiTokenSpaceGuid.PcdHb1Rb2CpuMemRegionBase|0x65040000000 gHisiTokenSpaceGuid.PcdHb1Rb3CpuMemRegionBase|0x400AB400000 - gHisiTokenSpaceGuid.PcdHb1Rb4CpuMemRegionBase|0x75030000000 + gHisiTokenSpaceGuid.PcdHb1Rb4CpuMemRegionBase|0x75040000000 gHisiTokenSpaceGuid.PcdHb1Rb5CpuMemRegionBase|0x79040000000 gHisiTokenSpaceGuid.PcdHb1Rb6CpuMemRegionBase|0x408AA400000 gHisiTokenSpaceGuid.PcdHb1Rb7CpuMemRegionBase|0x408AB400000 diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl index 79267e5..55c7f50 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Pci.asl @@ -646,10 +646,10 @@ Scope(_SB) Cacheable, ReadWrite, 0x0, // Granularity - 0x20000000, // Min Base Address + 0x40000000, // Min Base Address 0xefffffff, // Max Base Address 0x65000000000, // Translate - 0xd0000000 // Length + 0xb0000000 // Length ) QWordIO ( ResourceProducer, @@ -766,10 +766,10 @@ Scope(_SB) Cacheable, ReadWrite, 0x0, // Granularity - 0x30000000, // Min Base Address + 0x40000000, // Min Base Address 0xefffffff, // Max Base Address 0x75000000000, // Translate - 0xc0000000 // Length + 0xb0000000 // Length ) QWordIO ( ResourceProducer, From patchwork Thu Sep 21 10:59:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113230 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1878627qgf; Thu, 21 Sep 2017 04:07:58 -0700 (PDT) X-Received: by 10.101.86.133 with SMTP id v5mr5441315pgs.249.1505992078065; Thu, 21 Sep 2017 04:07:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992078; cv=none; d=google.com; s=arc-20160816; b=FePaj5SOXbDByYtY0VC/2e+63ghThV6fIKHnYFdzfk+cuYE/9CPw5huSEQktFRNeoH jhAWgLK7SDbJdPPZGwwXGnUlrvcyXd3Dp6BAUhSfg+zZp7m6pId+H8ar9bu0BiFU7qlO anyM1mV47hBQE/TiPGesAjoyP+/3f/fBMgRXUOzS7KV9OdVZliLbKgySh5tPAQyF0nNX H2UtNDoqhhITJaitA9x77h1IZZKuyC5VNBxt7NkxI+hHd13smZNDMAUfsP5KmBlisr+z fqQlnTfI/zD7jdJAgQsG/2tYAUkGTwDpxHElpG1LWV2VKCgF05pO2tJZUpH12o3gRnMO GFyA== 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:arc-authentication-results; bh=lTLBntmqfneA59Jy6ja19SykXwWcpt4gzlX5EU5GcZs=; b=EwjpQk1kchPbAzD5AzFQDVIIYPK0C6PLTvT/ycW0lCin+EMeogj1yg5ZjVqT8LU4mT E5XUAUWlixHc5oMWqeK/17ttgBfDf2yG0MHnXEjd5Y9om3PNGnbyaXR8dUzkeLnS4Ksw bTdswzCwHw5Ua9D21fs7t+bMaJInhkUgEFi9v8hTfjwaYtJHn0X4raQe4axj2QRnVzKe /5p9VzzFTEsavUtFI+pBDI11hZSNalzbeNCy7rqW3P7A2+FdSsNjCP5fofDdrDGbvO+Q 0YKiccKc4VGSNnjEsoJWlW72+7xOjoAdcwwAsmazHp69fbRPa4pFnuUs5fyRicvXbK9K BO3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=FWz1DgHJ; 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 o30si881105pgc.544.2017.09.21.04.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:07:58 -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=FWz1DgHJ; 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 3733121E9461F; Thu, 21 Sep 2017 04:04:26 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x230.google.com (mail-pg0-x230.google.com [IPv6:2607:f8b0:400e:c05::230]) (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 AA1BD21E1B76D for ; Thu, 21 Sep 2017 04:04:24 -0700 (PDT) Received: by mail-pg0-x230.google.com with SMTP id d8so3338198pgt.4 for ; Thu, 21 Sep 2017 04:07:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Pehf7vUdmxolG3sVT2chwk8DpZT7XyEY3adACvyQ2Cw=; b=FWz1DgHJBdoZ8dGxGF3qVUMWFuyQbQaEvmg3IidCE1fqbnz4x7USv91F7lIRryvevT kFyE/sjUgARXOuIOKKcanNiDmGOsyEjOou1wXjVGBY5I++YBUBO27StjrzpEYmqDuLqP p4eeu06LYtAfQjzDTjxxy4acZUmelg+31PaCA= 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=Pehf7vUdmxolG3sVT2chwk8DpZT7XyEY3adACvyQ2Cw=; b=e0W/vGCiYeDEme4JayGbkzp1QCunOuWdBEjlrKi+djsQJZ6DbCyMT04AXFal/uf1rC UqNFIe6hU35psd6Gf0oy6hF6c9o3OLkFu/T+fjMdO0cA5LfIr51WFq6aV3uax0Nw3Jvk 9MBauE3e1PEfu6G/QZO0ftkZy3TDQesL7VHu5FiQLxkWyZV0ff0PkUx8xw88dTBmsLD4 qaLIQ9VTkU19mSDpMi6gVSsKM8jQUIossZghRqNMVPq31KZ8zjWYlhpw+kFm3o9iIBY1 HY8dHjFqKBc+t0aX4wwBwkZOOkyV1z1el+gIdrelfu6eUIUWhRjwmNjphIjWdVUPURUu JrBw== X-Gm-Message-State: AHPjjUiUFjlxee7GF/yqzULqWG9EwSrqNC9sHXECjZwcm/jL6XCZjUUr RkGPCi3p9oJV/D/nWuJa9MsQ0qCpMD0= X-Google-Smtp-Source: AOwi7QAro65yLhXEyFA3jaSmE4cpyRi0i9FcMh30MbThMX/EUqmMSLc/peHbqnv3ATEtxE3thY4jIA== X-Received: by 10.84.136.1 with SMTP id 1mr5160939plk.101.1505992051355; Thu, 21 Sep 2017 04:07:31 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:30 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:54 +0800 Message-Id: <1505991597-52989-16-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 08/11] Hisilicon/D03: Disable the function of PerfTuning X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, Chenhui Sun , zhangjinsong2@huawei.com, guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Chenhui Sun The PerTuning function is not stable, it will cause the 3008/3108 crash, disable this function first. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chenhui Sun --- Platform/Hisilicon/D03/D03.dsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 _______________________________________________ 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 fca6781..ac880d9 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -112,7 +112,7 @@ # It could be set FALSE to save size. gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gHisiTokenSpaceGuid.PcdIsItsSupported|TRUE - gHisiTokenSpaceGuid.PcdIsPciPerfTuningEnable|TRUE + gHisiTokenSpaceGuid.PcdIsPciPerfTuningEnable|FALSE [PcdsFixedAtBuild.common] gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"D03" From patchwork Thu Sep 21 10:59:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113231 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1878741qgf; Thu, 21 Sep 2017 04:08:04 -0700 (PDT) X-Received: by 10.84.210.12 with SMTP id z12mr5216007plh.433.1505992084028; Thu, 21 Sep 2017 04:08:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992084; cv=none; d=google.com; s=arc-20160816; b=inmowLyCUzo1W1eiLTfwDwtDQQpJeVmkmQRFGE70hVnPmRY8Q0Zv8TMkBXaF/k9VEy rmM1DZ7Kgf+Pwc2oiqSvLOEP2e4pdJmOQCHmKAPTTfz6Ojfyb6HNPs6nYLYPrluJWT7c ss3e+MNwmXCEYawEesXpqj1kB4a4A/OJeXxQmFFBWymOyySO4rcDtHG2DSwz9INTvAht oIm9iZEexz5dkS3UVxAKwONsKl312I3kcEoj+2Ks5z8ieGVvRSPenM2FvimmsfIX0xGu WbMQ0D05DEKIiFyPTKp3tWy0WNNTiNJEs+oBn0hVSmjNSnLuLAW+2XOq1mOgcx6CF46H TI7Q== 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:arc-authentication-results; bh=1qj23hG5ngc0NzD0Ud0BJHUIzTGhMbLcAQ67fQfpvgA=; b=ghBCJYq9KmuwXbZ1OKUjkN1qS9xTWAT+Fx40zLzfs5iz4yTCwDLVroZMLSKc/ZSyDd FOzCIm84dKMia2pqKNO9UxRK7OE2o98anIuF7k86jBoMsjQ6khXhHaIKoqBih4pDJxs0 Zq1O77z49vA/HWd0OpS/h27RPflW8kmxyIqaT7JKf2KHtY5I1wm60RVtlXxYlK17+6lo 6nhIGPRLZvqYc2kWdUxT9R4MtJfUuyDW/Z0k+YeQT3ATS6XloMZICBBwuvoz/Q6ihg17 EPVz8LbAw+/qewt8rkBlrJq+sxSMC+RsmPITj04oJLumVzzHmaXu/iSGYApUy/W72zrf oEGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=XWaktFpA; 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 f130si855819pfc.397.2017.09.21.04.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:08:04 -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=XWaktFpA; 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 70C6E21D046D6; Thu, 21 Sep 2017 04:04:29 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x22d.google.com (mail-pg0-x22d.google.com [IPv6:2607:f8b0:400e:c05::22d]) (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 8CD3621E1B76D for ; Thu, 21 Sep 2017 04:04:27 -0700 (PDT) Received: by mail-pg0-x22d.google.com with SMTP id c137so3328294pga.11 for ; Thu, 21 Sep 2017 04:07:34 -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=/P2dF6PiBOgnIKmswxbaT01mE0W1c+kzX5YrFnwLVY8=; b=XWaktFpAMT0oYKn3dbh8bPhDpSTQR85aQt3WCSWEBk3Q4nKblwJdI76QaeoWv/DE1J Q4gnNJzY+Znj7W9uk1uj2r5phnuiIQ+pfRTrRtx/ODTrTDrndHsUCDcjvYqnVJOssDi1 VL9rGnzrHmwpzW/hHG57C+srl3dYBO4xH+rXA= 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=/P2dF6PiBOgnIKmswxbaT01mE0W1c+kzX5YrFnwLVY8=; b=uKgkBGD30c0eSW4C69lGDNqhw+7HqjLeb2uzBCs3g4EPxhjINA5TybIRZrI/XYwOHf xmp2fdvOLSBaEyL+mJLiVJCJ4TYY5xTuVM3vJ07yZp1N1US9YOfh884EDAxL8SSKltwz EV2idqcd7aU3VQRAl/BVzTrGCRiOO4CzMPsiXhiyEq5VgWedwrkvUu331DOIcW8aXkcq ZqIQZ8p/+D+1ab+FV97v8l4VUCXpB1D9dRZPg7MwyO5L7KYboZ6/r+SDUHhaMhaeO14O 7mjfE+XSqHFdyr6IYUbgJI3tgGWRsZw5BwRvWfwfu8WZxo/8UXkcYW+LjzBpptySoTcQ EYYA== X-Gm-Message-State: AHPjjUjjZjPc8DbIaxfxZ4VnfbTC4vnb0mv33h7nMFnh8yMU5vsfFuqr iB6yeQaeLm3f4zVMAxQ6A0lMDQ== X-Google-Smtp-Source: AOwi7QBjuzbSdasko4aaZBzT6HSfSJVjAPDuGxXjMEWPN/xtFwcp49oxCpcgnXpc+d3RYFjicp3gSg== X-Received: by 10.84.234.196 with SMTP id i4mr5143179plt.432.1505992054203; Thu, 21 Sep 2017 04:07:34 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:33 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:55 +0800 Message-Id: <1505991597-52989-17-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 09/11] D05/ACPI: Disable D05 SAS0 and SAS2 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Ming Huang , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Ming Huang There are no interface from SAS0 and SAS2 controller on D05, so SAS0 and SAS2 can't be use. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl index 93beb95..6455130 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05Sas.asl @@ -88,6 +88,11 @@ Scope(_SB) Store(0x7ffff, CLK) Sleep(1) } + + Method (_STA, 0, NotSerialized) + { + Return (0x0) + } } Device(SAS1) { @@ -239,6 +244,11 @@ Scope(_SB) Store(0x7ffff, CLK) Sleep(1) } + + Method (_STA, 0, NotSerialized) + { + Return (0x0) + } } } From patchwork Thu Sep 21 10:59:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113232 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1878867qgf; Thu, 21 Sep 2017 04:08:09 -0700 (PDT) X-Received: by 10.98.159.76 with SMTP id g73mr5286416pfe.293.1505992089248; Thu, 21 Sep 2017 04:08:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992089; cv=none; d=google.com; s=arc-20160816; b=E5j5PUdQE+P/xVY3F8bKdyb9vJZd61WJ7vSAw0Yr/TpQaF0GU9IaUWY+tIgE4fu9Mk teat+Rvp5E98v9b2o/tU5x0c2VNdfEzMyMFg5D6op8jXpVDk2ujcVAcvgpsdAGUyBMYu hTud1DtCm2K817U0J6JPuMHU2mVoFJfw9o9ga4lEVrkkG7twQgWpKVfWN6uDgNyvt2Sv K+DuEly9kR3O9zEBxvEEZBUoKX1cENC6cZGLgUtXum0AVtTIoydYCqEi8q92Qx861sR2 my7EXs2nkKQziuIOeiaQIDR3XDycOJBegK1Wc1eow7F8zzAKPle3NRrFaoaN8fAZrkOx JY9g== 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:arc-authentication-results; bh=h6Ie7inJWWe74c+IkN5/gmKzHNVprfw7ql97ji85vDA=; b=dL7DiPmm74jbzJdiAfhChmEa/KgjVFyo2W01DO80fKPdgv/Q0xPsYHvgBPEhO6aPnZ uN8/IGOcC7Vnw1QQBExTpkwOlDQltuqTUsQJxLCG7m9xe60nacg+zbSO6elBLFZ25tn4 TZwbtVR2AzQXXbaztRNxZniaOCPRYv/Hb+5eWQUucgRCGvl6hzGHBWdpi8RpnBVT3D6t ZapXXR9RLu5B+f0aEkwsGeZYazajycVngHo5KglpiwF7dfeUgQa1IzIrzqvva5CI674e r8QglrZd1KxGYgHcZsvKJNgmSmaXp8B4Qa+L65VmPH4xMkBy8CRTqOjwB+bZIBdt9JLq rvPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CM7EerFp; 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 l4si881539pgu.396.2017.09.21.04.08.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:08:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CM7EerFp; 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 A9DBF21ECCB15; Thu, 21 Sep 2017 04:04:30 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x22e.google.com (mail-pg0-x22e.google.com [IPv6:2607:f8b0:400e:c05::22e]) (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 64C1A21E1B76D for ; Thu, 21 Sep 2017 04:04:30 -0700 (PDT) Received: by mail-pg0-x22e.google.com with SMTP id b11so3324094pgn.12 for ; Thu, 21 Sep 2017 04:07:37 -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=/lG3Ol0OoI11jtBHOMSmpNqUBTWOk56eOf5b7ZGDVbo=; b=CM7EerFp1Ytq2an5STr1EQkC4O5FxQ/CfvckklIwB9n53MQbardlqTv5NGdaFs4hZe 3jrKFUOe0WHmCyDovLDm5+lvQHD9dP0cJRNqDT03V1nTq9/Ogq8ZG4Y7D0qmnNhxicJc qllb8+OfnSTnjZCr1mkD2Xb/k8KJTU2Ljq7Ts= 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=/lG3Ol0OoI11jtBHOMSmpNqUBTWOk56eOf5b7ZGDVbo=; b=EFaoyYPV1s628WdQjp5OpKCEApqcI9kTpz2glP1f12gJ1pdNh2Cn33NKiR+nS73c13 epxa+cU4+2JRopxxr5DriD/YhlZ4tjNIyCpQtgLnjSZhgx0TFcf92g2IIg64C3V4FHIq t8/v4o7EA7v4Y189A9icNPILwyAjKSeCtHyG7ST993YFU1nBKIuX39LfKMEqxmCTnSNY emqvJX1v0Tdadb5qdVWDKHzkTL61Njd/rtlsz2VLB9vIb7vGWMl8gnuFjVn1ATPUOGY3 w3xcRaNQ7LyjpIgAa0z61GRk1gyeniEkx0mB/rxQ2cALavaf1vwr6nOazLQPTvuaWrqr JaSA== X-Gm-Message-State: AHPjjUha8zYBLqyGHfiQd1bZ/k9nkCFxrhcbaHQyLciXKdwH8rzhnD4I 5F/3uVFVUuPtMv6hJj8JZdnGWA== X-Google-Smtp-Source: AOwi7QCjFM1c0C76YA3KVspARz/ErHC0oAgZ7oNgPfb4/CPXQBdBivyJHx1Yz9R7A72cGL4uZO7q0A== X-Received: by 10.98.215.18 with SMTP id b18mr5360139pfh.147.1505992056981; Thu, 21 Sep 2017 04:07:36 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:36 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:56 +0800 Message-Id: <1505991597-52989-18-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 10/11] D05/ACPI: Modify I2C device X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Ming Huang , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Ming Huang 1. Disable I2C0 device avoiding access conflict in OS; 2. Modify _HID of I2C2 for matching the string in OS driver; Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl index eb906ef..3cc60d1 100644 --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Dsdt/D05I2c.asl @@ -18,26 +18,8 @@ Scope(_SB) { - Device(I2C0) { - Name(_HID, "APMC0D0F") - Name(_CID, "APMC0D0F") - Name(_CRS, ResourceTemplate() { - Memory32Fixed(ReadWrite, 0xd00e0000, 0x10000) - Interrupt(ResourceConsumer, Level, ActiveHigh, Exclusive, 0, "\\_SB.MBI6") { 705 } - }) - Name (_DSD, Package () { - ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package () { - Package () {"clock-frequency", 100000}, - Package () {"i2c-sda-falling-time-ns", 913}, - Package () {"i2c-scl-falling-time-ns", 303}, - Package () {"i2c-sda-hold-time-ns", 0x9c2}, - } - }) - } - Device(I2C2) { - Name(_HID, "APMC0D0F") + Name(_HID, "HISI02A1") Name(_CID, "APMC0D0F") Name(_CRS, ResourceTemplate() { Memory32Fixed(ReadWrite, 0xd0100000, 0x10000) From patchwork Thu Sep 21 10:59:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 113233 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1878988qgf; Thu, 21 Sep 2017 04:08:14 -0700 (PDT) X-Received: by 10.84.132.34 with SMTP id 31mr5123620ple.225.1505992094760; Thu, 21 Sep 2017 04:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505992094; cv=none; d=google.com; s=arc-20160816; b=aIXaHpI0jdO1EwSCC2ZyK5HFmbLaVQL54ui8DEEkdvQvg1dJ+PywU+8kEDnydToSSl UvW4qGm5OSFG2M8rInB0L/AFj7eLoBtU8trp3707Xzpn377o7icE1xMX5y2WeBBgsY+6 zwLKXQknCx5CWOFHcOm6U1LaFuy7/E5HO4R/64w2XuQNlSPB5hNI3HJeEtPXCP3HpOhf nXuVoDnKORjg3Pw1igql3q9P5AHQjsbURlD+NkR7X5/YKgoNb5JrFy2zpBY8LkMQK4W4 PJn2VRaLehV8fVHzuI6pEFAaXhdSZ014rwqq4rb3vOZ0IjyeGF+1be8p659dr3gRNuIw qCZA== 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:arc-authentication-results; bh=8Jg71aBoWiW8Ig8cntFoJpjC+FHnbZKSMm/wzR0Mg7g=; b=JDaVj3YJDFCw8z1EsCMh8Zs8pmRA/THsV0Rj1n84dLCJatinU3hd2pVKiQSvN2cByX l4KFMyYJOAnKhPUHaEDyZ7o4gnLQGEJ6/EUakMA+azZG9XfRoJWqJKVcROx+CtSBxLYJ 4qWluvWmk0w57D/fWeq/iaxLWL8W0U1f7nnv6RddyduApFbGZU0Cv7CuzTDRr/YiE0ef kZLvd1qdS54ysSGjsR+X0Y8E4g4PaP0hbBXvV9zTX5QR+Gqp6Y4T99F5XKDU+vGVVRJY Deo0M1VUGq+jkZqVEyflGCveMgBLAKa9vgnL8AaTo7WCZq2H/91rOKBaq030dWG0uWZ2 esZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=X2+ORCIW; 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 j69si839376pgd.601.2017.09.21.04.08.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 04:08:14 -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=X2+ORCIW; 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 E073D21E1B77C; Thu, 21 Sep 2017 04:04:33 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pg0-x22a.google.com (mail-pg0-x22a.google.com [IPv6:2607:f8b0:400e:c05::22a]) (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 5294321E1B76D for ; Thu, 21 Sep 2017 04:04:33 -0700 (PDT) Received: by mail-pg0-x22a.google.com with SMTP id j70so3331169pgc.10 for ; Thu, 21 Sep 2017 04:07:40 -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=8e46iXc6ep15mZMjZv2wcRGzw4WwWoRRZvWIldeYr3A=; b=X2+ORCIWv7rn62evCpjuXhahojbUo/hNeBOPQcZQ1dO/QeJAyCgz7cahvltMXUBMpM 030/8Xsm8mjfwBG77qVY1EF08l0MfcIHEtZ9FTrV+Ku+MQ+q5Y7II7p5aKOXwb5yAQr6 UgrZRRaEmy1cadAi9eHX///5DTRRRqff0m3TI= 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=8e46iXc6ep15mZMjZv2wcRGzw4WwWoRRZvWIldeYr3A=; b=qfcuk/GgaJnMcJf8TTh/6qNPtgreYnLY+QQcp9c5QguBLIp8dQjjGePmQLowjPF+P8 yef43lXMFcmhdpgE7ZfmpS2q2PsYewBYV5LeXqgvT2QeRWvrE3Cmv/q+I6cjavuxhIyE Ic0nC0CyNve3v3kAfoQIVgn4VoQBjhCLf82lMSG5s9MFrRyk2fS8gakbYb9/dusHB9er JF8uR8jz517d+bznH5nYGTRtKkKXMysUYxf6flHyDhQAGZUl48rjMmLA5MdBRLHLq9tC 1s8eyrl4m9ogVbntcmbZYJ+0R3pkMswI+adNKHEMDMZg4ByQd6QjYiSxRGdcI0xYQ61r oIkw== X-Gm-Message-State: AHPjjUibisDnNnoQfQ7rZYZ60n+yZ8PACw7Ax4Uknllqdqrv7Hq0DbWH u3l+ib0ucNBuv3qUAE8G3YzwZw== X-Google-Smtp-Source: AOwi7QCeLP918sy2rnLjrL5hWwC2K+rjoJ0v2PJXJXfYSyOW1Nt0SQd6S9ehmd3Mk/PhPUBESYD9fQ== X-Received: by 10.98.33.134 with SMTP id o6mr5340249pfj.91.1505992059906; Thu, 21 Sep 2017 04:07:39 -0700 (PDT) Received: from localhost.localdomain ([119.145.15.121]) by smtp.gmail.com with ESMTPSA id x124sm2090762pfx.56.2017.09.21.04.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 04:07:39 -0700 (PDT) From: Heyi Guo To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Thu, 21 Sep 2017 18:59:57 +0800 Message-Id: <1505991597-52989-19-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> References: <1505991597-52989-1-git-send-email-heyi.guo@linaro.org> Subject: [edk2] [PATCH edk2-platforms v3 11/11] Hisilicon D03/D05: Enlarge iATU for RP with ARI capable device. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, ard.biesheuvel@linaro.org, zhangjinsong2@huawei.com, Ming Huang , guoheyi@huawei.com, waip23@126.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" From: Ming Huang 1. Because Hi161x chip doesn't support "ARI Forwarding Enable" function, BIOS will enumerate 32 same devices (Device Number 0~31) when attach a Non-ARI capable device in the RP. Hi161x chip will not fix it, need BIOS patch. 2. Just enlarge iatu for those root port with ARI capable device attached, Non-ARI capable device's RP, keep iatu limitation. 3. Remove previous temporary solution as below commit id: "7d157da88852cc91df2b11b10ade2edbbfbe77da" Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jason zhang --- Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.c | 1 + Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.h | 7 ++ Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c | 79 ++++++++++++++++++++ 3 files changed, 87 insertions(+) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.c b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.c index e3d3988..9fa3f84 100644 --- a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.c +++ b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.c @@ -839,6 +839,7 @@ NotifyPhase( case EfiPciHostBridgeEndEnumeration: PCIE_DEBUG("Case EfiPciHostBridgeEndEnumeration\n"); + EnlargeAtuConfig0 (This); break; case EfiPciHostBridgeBeginBusAllocation: diff --git a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.h b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.h index cddda6b..c04361f 100644 --- a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.h +++ b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciHostBridge.h @@ -401,6 +401,9 @@ PreprocessController ( #define EFI_RESOURCE_NONEXISTENT 0xFFFFFFFFFFFFFFFFULL #define EFI_RESOURCE_LESS 0xFFFFFFFFFFFFFFFEULL +#define INVALID_CAPABILITY_00 0x00 +#define INVALID_CAPABILITY_FF 0xFF +#define PCI_CAPABILITY_POINTER_MASK 0xFC // // Driver Instance Data Prototypes @@ -518,4 +521,8 @@ RootBridgeConstructor ( IN UINT32 Seg ); +VOID +EnlargeAtuConfig0 ( + IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *This + ); #endif diff --git a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c index 10d766a..b57bd51 100644 --- a/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c +++ b/Silicon/Hisilicon/Drivers/PciHostBridgeDxe/PciRootBridgeIo.c @@ -14,6 +14,7 @@ **/ #include "PciHostBridge.h" +#include #include #include #include @@ -2322,3 +2323,81 @@ RootBridgeIoConfiguration ( return EFI_SUCCESS; } +BOOLEAN +PcieCheckAriFwdEn ( + UINTN PciBaseAddr + ) +{ + UINT8 PciPrimaryStatus; + UINT8 CapabilityOffset; + UINT8 CapId; + UINT8 TempData; + + PciPrimaryStatus = MmioRead16 (PciBaseAddr + PCI_PRIMARY_STATUS_OFFSET); + + if (PciPrimaryStatus & EFI_PCI_STATUS_CAPABILITY) { + CapabilityOffset = MmioRead8 (PciBaseAddr + PCI_CAPBILITY_POINTER_OFFSET); + CapabilityOffset &= PCI_CAPABILITY_POINTER_MASK; + + while ((CapabilityOffset != INVALID_CAPABILITY_00) && (CapabilityOffset != INVALID_CAPABILITY_FF)) { + CapId = MmioRead8 (PciBaseAddr + CapabilityOffset); + if (CapId == EFI_PCI_CAPABILITY_ID_PCIEXP) { + break; + } + CapabilityOffset = MmioRead8 (PciBaseAddr + CapabilityOffset + 1); + CapabilityOffset &= PCI_CAPABILITY_POINTER_MASK; + } + } else { + PCIE_DEBUG ("[%a:%d] - No PCIE Capability.\n", __FUNCTION__, __LINE__); + return FALSE; + } + + if ((CapabilityOffset == INVALID_CAPABILITY_FF) || (CapabilityOffset == INVALID_CAPABILITY_00)) { + PCIE_DEBUG ("[%a:%d] - No PCIE Capability.\n", __FUNCTION__, __LINE__); + return FALSE; + } + + TempData = MmioRead16 (PciBaseAddr + CapabilityOffset + + EFI_PCIE_CAPABILITY_DEVICE_CONTROL_2_OFFSET); + TempData &= EFI_PCIE_CAPABILITY_DEVICE_CAPABILITIES_2_ARI_FORWARDING; + + if (TempData == EFI_PCIE_CAPABILITY_DEVICE_CAPABILITIES_2_ARI_FORWARDING) { + return TRUE; + } else { + return FALSE; + } +} + +VOID +EnlargeAtuConfig0 ( + IN EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL *This + ) +{ + UINTN RbPciBase; + UINT64 MemLimit; + LIST_ENTRY *List; + PCI_HOST_BRIDGE_INSTANCE *HostBridgeInstance; + PCI_ROOT_BRIDGE_INSTANCE *RootBridgeInstance; + + PCIE_DEBUG ("In Enlarge RP iatu Config 0.\n"); + + HostBridgeInstance = INSTANCE_FROM_RESOURCE_ALLOCATION_THIS (This); + List = HostBridgeInstance->Head.ForwardLink; + + while (List != &HostBridgeInstance->Head) { + PCIE_DEBUG ("HostBridge has data.\n"); + RootBridgeInstance = DRIVER_INSTANCE_FROM_LIST_ENTRY (List); + + RbPciBase = RootBridgeInstance->RbPciBar; + + // Those ARI FWD Enable Root Bridge, need enlarge iatu window. + if (PcieCheckAriFwdEn (RbPciBase)) { + MemLimit = GetPcieCfgAddress (RootBridgeInstance->Ecam, + RootBridgeInstance->BusBase + 2, 0, 0, 0) + - 1; + MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_VIEW_POINT, 1); + MmioWrite32 (RbPciBase + IATU_OFFSET + IATU_REGION_BASE_LIMIT, (UINT32) MemLimit); + } + List = List->ForwardLink; + } +}