From nobody Tue Feb 10 12:59:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+64617+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+64617+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1598362882; cv=none; d=zohomail.com; s=zohoarc; b=m5YwXrmlyB5IskkGvYUb8Qbu1ScMfJLEc4bI4xhEHNtzx64XAl7WFMBZICuALU1Ki/BCDv3oAYhK6oZuKGdnmVE1tI/N+ibyljRLzfj05rxJR3aP0Qdz8ltHNMyJNHKtR7RUgHulqNhv4vVujiE58ecYrcj4jKoBvSTLmYZGzLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598362882; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=2Xfa2ZkQ4Vn9IGS04ccSH8f2iJyAVK4/HGQ0NG9eEfQ=; b=OtMpMEFnBNknCefkPRvpOhntnskj9JyTV9hbOPzAaKsxjL2JBHSYwZTmquQ+ajb75YCrIEWh3X5MX1Y5/3qk+5Qrw8voHnqh11YDq+ciRFAcWtO8a2cz0qgDJQ9T/3RIUI1USXJMXUC/3iDZvNf+ipSWII3AkBmUyGyjrkeVFF0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+64617+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1598362882940300.1184562494592; Tue, 25 Aug 2020 06:41:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id uDe6YY1788612xWKV31DzesL; Tue, 25 Aug 2020 06:41:22 -0700 X-Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by mx.groups.io with SMTP id smtpd.web10.13855.1598362880286344222 for ; Tue, 25 Aug 2020 06:41:20 -0700 X-Received: by mail-pj1-f66.google.com with SMTP id mt12so1265579pjb.4 for ; Tue, 25 Aug 2020 06:41:20 -0700 (PDT) X-Gm-Message-State: kEI0PlYE0wuLKK2sw8FaQ9xox1787277AA= X-Google-Smtp-Source: ABdhPJwnzHlj0m3AZERIFSyLetuRlWhmzI7ztXUZEM4mjBMwuQNYSde4x6+QdiEM+9W6fmfmirTQTA== X-Received: by 2002:a17:90b:509:: with SMTP id r9mr1734452pjz.228.1598362879818; Tue, 25 Aug 2020 06:41:19 -0700 (PDT) X-Received: from bean-canyon.localdomain ([106.51.140.68]) by smtp.googlemail.com with ESMTPSA id z186sm3913768pfb.199.2020.08.25.06.41.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 06:41:19 -0700 (PDT) From: "Tanmay Jagdale" To: leif@nuviainc.com, graeme@nuviainc.com, devel@edk2.groups.io Cc: shashi.mallela@linaro.org, Tanmay Jagdale Subject: [edk2-devel] [PATCH v3 edk2-platforms 6/8] SbsaQemu: AcpiDxe: Create SSDT table at runtime Date: Tue, 25 Aug 2020 19:09:56 +0530 Message-Id: <20200825133958.17372-7-tanmay.jagdale@linaro.org> In-Reply-To: <20200825133958.17372-1-tanmay.jagdale@linaro.org> References: <20200825133958.17372-1-tanmay.jagdale@linaro.org> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,tanmay.jagdale@linaro.org Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1598362882; bh=B8cPOwL50AM8Is/Ry4eEWR9oCnIudaQhBGDEzlXMWMA=; h=Cc:Date:From:Reply-To:Subject:To; b=VhFfWUbSVoIz878QTbM9IsxQ45hYcX9wgsKZXag44dESbGOtXrND6hiyaD9YlgC/gZ+ kErmJ8/bqB60hEpxovYkdknc7wRhY57Zh9EZLZA9pcg5Fx8GrN1Evm5xTBIIQL6kQLiTf E+q8/Eja0NCIqNJFasWIiir3ITd+aZVtF+s= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" - Add support to create SSDT table at runtime. Since SSDT table is a data table, added a few helper macros to create the AML entries. - Also added a function to calculate the length of Packages. Signed-off-by: Tanmay Jagdale --- Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h | 29 ++++ Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 144 ++++= ++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h = b/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h index 7a9a0061675f..00c7c68256fd 100644 --- a/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h +++ b/Silicon/Qemu/SbsaQemu/Include/IndustryStandard/SbsaQemuAcpi.h @@ -43,4 +43,33 @@ #define SBSAQEMU_PCI_SEG0_BUSNUM_MIN 0x00 #define SBSAQEMU_PCI_SEG0_BUSNUM_MAX 0xFF =20 +#define SBSAQEMU_ACPI_SCOPE_OP_MAX_LENGTH 5 + +#define SBSAQEMU_ACPI_SCOPE_NAME { '_', 'S', 'B', '_' } + +#define SBSAQEMU_ACPI_CPU_DEV_LEN 0x1C +#define SBSAQEMU_ACPI_CPU_DEV_NAME { 'C', '0', '0', '0' } + +// Macro to convert Integer to Character +#define SBSAQEMU_ACPI_ITOA(Byte) (0x30 + (Byte > 9 ? (Byte + 1) : = Byte)) + +#define SBSAQEMU_ACPI_CPU_HID { = \ + AML_NAME_OP, AML_NAME_CHAR__, 'H', 'I', 'D', = \ + AML_STRING_PREFIX, 'A', 'C', 'P', 'I', '0', '0', '0', '7', = \ + AML_ZERO_OP = \ + } + +#define SBSAQEMU_ACPI_CPU_UID { = \ + AML_NAME_OP, AML_NAME_CHAR__, 'U', 'I', 'D', AML_BYTE_PREFIX, = \ + AML_ZERO_OP, AML_ZERO_OP = \ + } + +typedef struct { + UINT8 device_header[2]; + UINT8 length; + UINT8 dev_name[4]; + UINT8 hid[15]; + UINT8 uid[8]; +} SBSAQEMU_ACPI_CPU_DEVICE; + #endif diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.= c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c index 16cb4e904e6f..06e7a5310810 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c @@ -7,6 +7,7 @@ * **/ #include +#include #include #include #include @@ -198,6 +199,144 @@ AddMadtTable ( return Status; } =20 +/* + * Function to calculate the PkgLength field in ACPI tables + */ +STATIC +UINT32 +SetPkgLength ( + IN UINT8 *TablePtr, + IN UINT32 Length +) +{ + UINT8 ByteCount; + UINT8 *PkgLeadByte =3D TablePtr; + + if (Length < 64) { + *TablePtr =3D Length; + return 1; + } + + // Set the LSB of Length in PkgLeadByte and advance Length + *PkgLeadByte =3D Length & 0xF; + Length =3D Length >> 4; + + while (Length) { + TablePtr++; + *TablePtr =3D (Length & 0xFF); + Length =3D (Length >> 8); + } + + // Calculate the number of bytes the Length field uses + // and set the ByteCount field in PkgLeadByte. + ByteCount =3D (TablePtr - PkgLeadByte) & 0xF; + *PkgLeadByte |=3D (ByteCount << 6); + + return ByteCount + 1; +} + +/* + * A function that adds SSDT ACPI table. + */ +EFI_STATUS +AddSsdtTable ( + IN EFI_ACPI_TABLE_PROTOCOL *AcpiTable + ) +{ + EFI_STATUS Status; + UINTN TableHandle; + UINT32 TableSize; + EFI_PHYSICAL_ADDRESS PageAddress; + UINT8 *New; + UINT32 CpuId; + UINT32 Offset; + UINT8 ScopeOpName[] =3D SBSAQEMU_ACPI_SCOPE_NAME; + UINT32 NumCores =3D PcdGet32 (PcdCoreCount); + + EFI_ACPI_DESCRIPTION_HEADER Header =3D + SBSAQEMU_ACPI_HEADER ( + EFI_ACPI_6_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE, + EFI_ACPI_DESCRIPTION_HEADER, + EFI_ACPI_6_0_SECONDARY_SYSTEM_DESCRIPTION_TABLE_REVISION); + + SBSAQEMU_ACPI_CPU_DEVICE CpuDevice =3D { + { AML_EXT_OP, AML_EXT_DEVICE_OP }, /* Device () */ + SBSAQEMU_ACPI_CPU_DEV_LEN, /* Length */ + SBSAQEMU_ACPI_CPU_DEV_NAME, /* Device Name "C000" */ + SBSAQEMU_ACPI_CPU_HID, /* Name (HID, "ACPI0007") */ + SBSAQEMU_ACPI_CPU_UID, /* Name (UID, 0) */ + }; + + // Calculate the new table size based on the number of cores + TableSize =3D sizeof (EFI_ACPI_DESCRIPTION_HEADER) + + SBSAQEMU_ACPI_SCOPE_OP_MAX_LENGTH + sizeof (ScopeOpName) + + (sizeof (CpuDevice) * NumCores); + + Status =3D gBS->AllocatePages ( + AllocateAnyPages, + EfiACPIReclaimMemory, + EFI_SIZE_TO_PAGES (TableSize), + &PageAddress + ); + if (EFI_ERROR(Status)) { + DEBUG ((DEBUG_ERROR, "Failed to allocate pages for SSDT table\n")); + return EFI_OUT_OF_RESOURCES; + } + + New =3D (UINT8 *)(UINTN) PageAddress; + ZeroMem (New, TableSize); + + // Add the ACPI Description table header + CopyMem (New, &Header, sizeof (EFI_ACPI_DESCRIPTION_HEADER)); + ((EFI_ACPI_DESCRIPTION_HEADER*) New)->Length =3D TableSize; + New +=3D sizeof (EFI_ACPI_DESCRIPTION_HEADER); + + // Insert the top level ScopeOp + *New =3D AML_SCOPE_OP; + New++; + Offset =3D SetPkgLength (New, + (TableSize - sizeof (EFI_ACPI_DESCRIPTION_HEADER) - 1)); + New +=3D Offset; + CopyMem (New, &ScopeOpName, sizeof (ScopeOpName)); + New +=3D sizeof (ScopeOpName); + + // Add new Device structures for the Cores + for (CpuId =3D 0; CpuId < NumCores; CpuId++) { + SBSAQEMU_ACPI_CPU_DEVICE *CpuDevicePtr; + UINT8 CpuIdByte1, CpuIdByte2, CpuIdByte3; + + CopyMem (New, &CpuDevice, sizeof (SBSAQEMU_ACPI_CPU_DEVICE)); + CpuDevicePtr =3D (SBSAQEMU_ACPI_CPU_DEVICE *) New; + + CpuIdByte1 =3D CpuId & 0xF; + CpuIdByte2 =3D (CpuId >> 4) & 0xF; + CpuIdByte3 =3D (CpuId >> 8) & 0xF; + + CpuDevicePtr->dev_name[1] =3D SBSAQEMU_ACPI_ITOA(CpuIdByte3); + CpuDevicePtr->dev_name[2] =3D SBSAQEMU_ACPI_ITOA(CpuIdByte2); + CpuDevicePtr->dev_name[3] =3D SBSAQEMU_ACPI_ITOA(CpuIdByte1); + + CpuDevicePtr->uid[6] =3D CpuIdByte1 | CpuIdByte2; + CpuDevicePtr->uid[7] =3D CpuIdByte3; + New +=3D sizeof (SBSAQEMU_ACPI_CPU_DEVICE); + } + + // Perform Checksum + AcpiPlatformChecksum ((UINT8*) PageAddress, TableSize); + + Status =3D AcpiTable->InstallAcpiTable ( + AcpiTable, + (EFI_ACPI_COMMON_HEADER *)PageAddress, + TableSize, + &TableHandle + ); + if (EFI_ERROR(Status)) { + DEBUG ((DEBUG_ERROR, "Failed to install SSDT table\n")); + } + + return Status; +} + EFI_STATUS EFIAPI InitializeSbsaQemuAcpiDxe ( @@ -227,5 +366,10 @@ InitializeSbsaQemuAcpiDxe ( DEBUG ((DEBUG_ERROR, "Failed to add MADT table\n")); } =20 + Status =3D AddSsdtTable (AcpiTable); + if (EFI_ERROR(Status)) { + DEBUG ((DEBUG_ERROR, "Failed to add SSDT table\n")); + } + return EFI_SUCCESS; } --=20 2.28.0 -=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 (#64617): https://edk2.groups.io/g/devel/message/64617 Mute This Topic: https://groups.io/mt/76406693/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-