From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-002e3701.pphosted.com (mx0a-002e3701.pphosted.com [148.163.147.86]) by mx.groups.io with SMTP id smtpd.web09.6577.1634284699636452402 for ; Fri, 15 Oct 2021 00:58:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@hpe.com header.s=pps0720 header.b=FQyNr+0a; spf=temperror, err=temporary DNS error (domain: hpe.com, ip: 148.163.147.86, mailfrom: prvs=0922d4c8eb=abner.chang@hpe.com) Received: from pps.filterd (m0134420.ppops.net [127.0.0.1]) by mx0b-002e3701.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19F3VsUC027713; Fri, 15 Oct 2021 07:58:19 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hpe.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version; s=pps0720; bh=MXZhgtz8yxdXUP0kBvAnMdC7Xyy6StMmFxF7kl/cw/U=; b=FQyNr+0aXvXwbwlvj5Hizm02k4I0mR+RYBiUAgXXlKXuDDJiSTkKX+DAlD1gO8jYASS5 Aqw2OzVbWuzGdNWHXyl5JuiVh5GTkAc67XMJPRxLAsxw0qyYfXaLHvCBHJnrP1+tM2Aa ahSL6kOXaOL3ZsNT+f8xowi+S7C+M3JI9AtaCp4ESgn/1A+1su9WrvTsND56Know2omW lNsaZq9OF3GbrusV8jTCKmgGBjAQJgYp1AqsdKdw6QH9izi4llX/lxHhhgyP4Cw00y2p 6fmlSbH4r1UmDSLvIX3WASnyxAJCKX3WA0LSL6kCY81JrmND6vd+yqJtvohp9C/ek1v+ JA== Received: from g2t2353.austin.hpe.com (g2t2353.austin.hpe.com [15.233.44.26]) by mx0b-002e3701.pphosted.com with ESMTP id 3bpwcsk87m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Oct 2021 07:58:19 +0000 Received: from g2t2360.austin.hpecorp.net (g2t2360.austin.hpecorp.net [16.196.225.135]) by g2t2353.austin.hpe.com (Postfix) with ESMTP id 7F5C877; Fri, 15 Oct 2021 07:58:18 +0000 (UTC) Received: from abner-virtual-machine.asiapacific.hpqcorp.net (abner-virtual-machine.asiapacific.hpqcorp.net [15.119.210.153]) by g2t2360.austin.hpecorp.net (Postfix) with ESMTP id 271B73B; Fri, 15 Oct 2021 07:58:16 +0000 (UTC) From: "Abner Chang" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Leif Lindholm , Graeme Gregory , Radoslaw Biernacki , Daniel Schaefer Subject: [edk2-platforms][PATCH 7/9] Silicon/SabaQemu: Use PcdPciMmio(32)64Translation PCD from MdePkg Date: Fri, 15 Oct 2021 15:00:06 +0800 Message-Id: <20211015070008.28192-8-abner.chang@hpe.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211015070008.28192-1-abner.chang@hpe.com> References: <20211015070008.28192-1-abner.chang@hpe.com> X-Proofpoint-GUID: mhSXy12IeoW0ginDxUIfLLlA_Vw-Mb24 X-Proofpoint-ORIG-GUID: mhSXy12IeoW0ginDxUIfLLlA_Vw-Mb24 X-Proofpoint-UnRewURL: 0 URL was un-rewritten MIME-Version: 1.0 X-HPE-SCL: -1 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-15_02,2021-10-14_02,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 lowpriorityscore=0 mlxscore=0 clxscore=1015 mlxlogscore=798 phishscore=0 priorityscore=1501 spamscore=0 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110150050 Compliant with BZ: #3665 https://bugzilla.tianocore.org/show_bug.cgi?id=3665 PcdPciMmio(32)64Translation PCD is relocated to MdePkg that leveraged by both ARM and RISC-V arch. This patch uses the one from MdePkg instead the one under ArmVirtPkg. Signed-off-by: Abner Chang Cc: Ard Biesheuvel Cc: Leif Lindholm Cc: Graeme Gregory Cc: Radoslaw Biernacki Cc: Daniel Schaefer --- Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 4 ++-- .../SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf index 0ad9cc7ce4..176d8fab83 100644 --- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf @@ -56,12 +56,12 @@ gArmTokenSpaceGuid.PcdPciMmio32Base gArmTokenSpaceGuid.PcdPciMmio32Size - gArmTokenSpaceGuid.PcdPciMmio32Translation + gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciMmio32Limit gArmTokenSpaceGuid.PcdPciMmio64Base gArmTokenSpaceGuid.PcdPciMmio64Size - gArmTokenSpaceGuid.PcdPciMmio64Translation + gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPciMmio64Limit gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c index 5021b096f7..9739c7500d 100644 --- a/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c +++ b/Silicon/Qemu/SbsaQemu/Library/SbsaQemuPciHostBridgeLib/SbsaQemuPciHostBridgeLib.c @@ -96,7 +96,7 @@ STATIC PCI_ROOT_BRIDGE mRootBridge = { /* PCI_ROOT_BRIDGE_APERTURE Mem; MMIO aperture below 4GB which can be used by the root bridge - (gArmTokenSpaceGuid.PcdPciMmio32Translation as 0x0) */ + (gEfiMdePkgTokenSpaceGuid.PcdPciMmio32Translation as 0x0) */ { FixedPcdGet32 (PcdPciMmio32Base), FixedPcdGet32 (PcdPciMmio32Base) + FixedPcdGet32 (PcdPciMmio32Size) - 1, @@ -104,7 +104,7 @@ STATIC PCI_ROOT_BRIDGE mRootBridge = { /* PCI_ROOT_BRIDGE_APERTURE MemAbove4G; MMIO aperture above 4GB which can be used by the root bridge. - (gArmTokenSpaceGuid.PcdPciMmio64Translation as 0x0) */ + (gEfiMdePkgTokenSpaceGuid.PcdPciMmio64Translation as 0x0) */ { FixedPcdGet64 (PcdPciMmio64Base), FixedPcdGet64 (PcdPciMmio64Base) + FixedPcdGet64 (PcdPciMmio64Size) - 1 -- 2.17.1