From nobody Mon Sep 16 19:16:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+104809+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104809+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1683914289; cv=none; d=zohomail.com; s=zohoarc; b=jznBzslDM4Q78fyHvaBN/oNmcf25Ujhy+EDgtPmDvTGXv8v2+9u5Atji8KrajAmGmP5V1EjPrmrEw8yFtxgpfL5wLrTZ3KULL7ZT77QJ5ZOVISHNYPX/TyC55yViLZqDpwqloEKzNbUg+NsaEWkSaQLUAo1dA2S8v/URfO9BkyI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683914289; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=vym6yXqcgzRZO5xZAIvw8ojCsJTmFJUdwwA98EvrNAk=; b=aoNpxGHv8s0o8uzTgDhQnlmXk7+rLymnK4S1LqhtigvpZoDrk6UTkirFX0ZgO00wewjrZyEES82LCOl64/XRIpm2JXibdlm98zVR+DvlCXxqFwCWjHltV5hRUBhX7uQrhzO/IGcscTy0UM1Exy71ZYCzI6IfLOdCOh9+eZvcFgA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+104809+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1683914289485990.0050342886246; Fri, 12 May 2023 10:58:09 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id omLkYY1788612x8fzqVOcLQa; Fri, 12 May 2023 10:58:09 -0700 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.31508.1683914288448563833 for ; Fri, 12 May 2023 10:58:08 -0700 X-Received: from pps.filterd (m0279870.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34CHcJ3O026032; Fri, 12 May 2023 17:58:07 GMT X-Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3qhh391b3p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 May 2023 17:58:07 +0000 X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 34CHw6Pb008017 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 May 2023 17:58:06 GMT X-Received: from qc-i7.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Fri, 12 May 2023 10:58:04 -0700 From: "Leif Lindholm" To: CC: Ard Biesheuvel , Graeme Gregory , Radoslaw Biernacki , Marcin Juszkiewicz Subject: [edk2-devel] [PATCH edk2-platforms 2/2] Silicon/Qemu: use dynamic Pcds for SbsaQemu GIC addresses Date: Fri, 12 May 2023 18:57:53 +0100 Message-ID: <20230512175753.13318-3-quic_llindhol@quicinc.com> In-Reply-To: <20230512175753.13318-1-quic_llindhol@quicinc.com> References: <20230512175753.13318-1-quic_llindhol@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-GUID: erRzFdyv0uMDo3-fBQCmwkDfxgwybFyQ X-Proofpoint-ORIG-GUID: erRzFdyv0uMDo3-fBQCmwkDfxgwybFyQ Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,quic_llindhol@quicinc.com X-Gm-Message-State: I9EytRxeTRATVRav8TOXkYwVx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1683914289; bh=LAtQfxYUHnjncNvz0o8HJLQzQW29tqsUrc2kG4lUD+4=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=Dbne23ge4wv6Xl6ko7uij1diKS4674b1S0ODGDcFNAA3x21fm5pfW7ziuQWyjmaMBdc l4+L8zDRDOXp4bYKkRNKWqXeEIkTbuuFW6AjkjzUYt/gcunNtZ45ve+YoTkDUi4e9wmMP ITCaUlKs17S7whp5JCBoJGsy72vAfzeOrco= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1683914290356100010 Content-Type: text/plain; charset="utf-8" The GIC addresses as currently declared as FixedPcd for SbsaQemu. Change them to dynamic, to enable future patches to support these being determined at runtime. Signed-off-by: Leif Lindholm Cc: Ard Biesheuvel Cc: Graeme Gregory Cc: Radoslaw Biernacki Cc: Marcin Juszkiewicz Reviewed-by: Sami Mujawar --- Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 12 ++++++------ Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf | 7 ++++--- .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf | 5 +++-- .../SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h | 2 +- .../Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/S= bsaQemu.dsc index 9ca030cfe9a7..0bd0df4f0239 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -406,12 +406,6 @@ [PcdsFixedAtBuild.common] # Size of the region used by UEFI in permanent memory (Reserved 64MB) gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 =20 - # - # ARM General Interrupt Controller - # - gArmTokenSpaceGuid.PcdGicDistributorBase|0x40060000 - gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x40080000 - ## Default Terminal Type ## 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8, 4-TTYTERM gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|4 @@ -523,6 +517,12 @@ [PcdsDynamicDefault.common] # TODO as no DT will be used we should pass this by some other method gArmTokenSpaceGuid.PcdSystemMemorySize|0x08000000 =20 + # + # ARM General Interrupt Controller + # + gArmTokenSpaceGuid.PcdGicDistributorBase|0x40060000 + gArmTokenSpaceGuid.PcdGicRedistributorsBase|0x40080000 + # # Set video resolution for boot options # PlatformDxe can set the former at runtime. diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf b/Silicon/Qemu= /SbsaQemu/AcpiTables/AcpiTables.inf index 176d8fab835b..0501c670d565 100644 --- a/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTables.inf @@ -32,9 +32,6 @@ [Packages] Silicon/Qemu/SbsaQemu/SbsaQemu.dec =20 [FixedPcd] - gArmTokenSpaceGuid.PcdGicDistributorBase - gArmTokenSpaceGuid.PcdGicRedistributorsBase - gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum gArmTokenSpaceGuid.PcdArmArchTimerIntrNum gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum @@ -74,3 +71,7 @@ [FixedPcd] gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformAhciSize gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciBase gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdPlatformEhciSize + +[Pcd] + gArmTokenSpaceGuid.PcdGicDistributorBase + gArmTokenSpaceGuid.PcdGicRedistributorsBase diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.= inf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf index c6de685bd2c4..c1c33788567d 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf @@ -46,6 +46,9 @@ [Pcd] gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdCoreCount gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdClusterCount =20 + gArmTokenSpaceGuid.PcdGicDistributorBase + gArmTokenSpaceGuid.PcdGicRedistributorsBase + [Depex] gEfiAcpiTableProtocolGuid ## CONSUMES =20 @@ -57,8 +60,6 @@ [Protocols] =20 [FixedPcd] gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision - gArmTokenSpaceGuid.PcdGicDistributorBase - gArmTokenSpaceGuid.PcdGicRedistributorsBase =20 gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision diff --git a/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h = b/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h index dcafcbca5a48..853b81b34df5 100644 --- a/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h +++ b/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h @@ -33,7 +33,7 @@ EFI_ACPI_6_0_GICR, /* Type */ = \ sizeof (EFI_ACPI_6_0_GICR_STRUCTURE), /* Length */ = \ EFI_ACPI_RESERVED_WORD, /* Reserved */ = \ - FixedPcdGet64 (PcdGicRedistributorsBase), /* DiscoveryRangeBaseAddress = */ \ + PcdGet64 (PcdGicRedistributorsBase), /* DiscoveryRangeBaseAddress = */ \ SBSAQEMU_MADT_GICR_SIZE /* DiscoveryRangeLength */ = \ } =20 diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.= c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c index 58330a3e7005..ae5397bab768 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c @@ -83,7 +83,7 @@ AddMadtTable ( EFI_ACPI_6_0_GIC_DISTRIBUTOR_STRUCTURE Gicd =3D EFI_ACPI_6_0_GIC_DISTRIBUTOR_INIT ( 0, - FixedPcdGet64 (PcdGicDistributorBase), + PcdGet64 (PcdGicDistributorBase), 0, 3 /* GicVersion */ ); --=20 2.30.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#104809): https://edk2.groups.io/g/devel/message/104809 Mute This Topic: https://groups.io/mt/98854532/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-