summaryrefslogtreecommitdiffstats
path: root/OvmfPkg
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2023-11-11 00:58:01 +0100
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-12-07 18:04:57 +0000
commit5161ba8ea04e79cf058cde49d6424a782640b421 (patch)
treeae12ece48f220f27baeffede5e85e8c36943bfac /OvmfPkg
parent0730f564ad3600a31ce8bbbb7dddd4cb526d4aa3 (diff)
downloadedk2-5161ba8ea04e79cf058cde49d6424a782640b421.tar.gz
edk2-5161ba8ea04e79cf058cde49d6424a782640b421.tar.bz2
edk2-5161ba8ea04e79cf058cde49d6424a782640b421.zip
OvmfPkg: remove gEfiIsaAcpiProtocolGuid
At this point, gEfiIsaAcpiProtocolGuid is unused; remove it. This shrinks the list of resources scheduled for removal to: - GUIDs (protocols or otherwise): - gEfiLegacy8259ProtocolGuid - gEfiLegacyBiosGuid - gEfiLegacyBiosPlatformProtocolGuid - gEfiLegacyBiosProtocolGuid - gEfiLegacyInterruptProtocolGuid - headers: - FrameworkDxe.h - Guid/LegacyBios.h - Protocol/Legacy8259.h - Protocol/LegacyBios.h - Protocol/LegacyBiosPlatform.h - Protocol/LegacyInterrupt.h - PCDs: - PcdEbdaReservedMemorySize - PcdEndOpromShadowAddress - PcdHighPmmMemorySize - PcdLegacyBiosCacheLegacyRegion - PcdLowPmmMemorySize - PcdOpromReservedMemoryBase - PcdOpromReservedMemorySize Cc: Ard Biesheuvel <ardb+tianocore@kernel.org> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Jiewen Yao <jiewen.yao@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4588 Signed-off-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20231110235820.644381-19-lersek@redhat.com> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com> Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Corvin Köhne <corvink@FreeBSD.org> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'OvmfPkg')
-rw-r--r--OvmfPkg/Csm/Include/Protocol/IsaAcpi.h298
-rw-r--r--OvmfPkg/OvmfPkg.dec1
2 files changed, 0 insertions, 299 deletions
diff --git a/OvmfPkg/Csm/Include/Protocol/IsaAcpi.h b/OvmfPkg/Csm/Include/Protocol/IsaAcpi.h
deleted file mode 100644
index afb415a388..0000000000
--- a/OvmfPkg/Csm/Include/Protocol/IsaAcpi.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/** @file
- EFI ISA ACPI Protocol is used to enumerate and manage all the ISA controllers on
- the platform's ISA Bus.
-
-Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef __ISA_ACPI_H_
-#define __ISA_ACPI_H_
-
-///
-/// Global ID for the EFI ISA ACPI Protocol.
-///
-#define EFI_ISA_ACPI_PROTOCOL_GUID \
- { \
- 0x64a892dc, 0x5561, 0x4536, { 0x92, 0xc7, 0x79, 0x9b, 0xfc, 0x18, 0x33, 0x55 } \
- }
-
-///
-/// Forward declaration fo the EFI ISA ACPI Protocol
-///
-typedef struct _EFI_ISA_ACPI_PROTOCOL EFI_ISA_ACPI_PROTOCOL;
-
-///
-/// ISA ACPI Protocol interrupt resource attributes.
-///
-#define EFI_ISA_ACPI_IRQ_TYPE_HIGH_TRUE_EDGE_SENSITIVE 0x01 ///< Edge triggered interrupt on a rising edge.
-#define EFI_ISA_ACPI_IRQ_TYPE_LOW_TRUE_EDGE_SENSITIVE 0x02 ///< Edge triggered interrupt on a falling edge.
-#define EFI_ISA_ACPI_IRQ_TYPE_HIGH_TRUE_LEVEL_SENSITIVE 0x04 ///< Level sensitive interrupt active high.
-#define EFI_ISA_ACPI_IRQ_TYPE_LOW_TRUE_LEVEL_SENSITIVE 0x08 ///< Level sensitive interrupt active low.
-
-///
-/// ISA ACPI Protocol DMA resource attributes.
-///
-#define EFI_ISA_ACPI_DMA_SPEED_TYPE_MASK 0x03 ///< Bit mask of supported DMA speed attributes.
-#define EFI_ISA_ACPI_DMA_SPEED_TYPE_COMPATIBILITY 0x00 ///< ISA controller supports compatibility mode DMA transfers.
-#define EFI_ISA_ACPI_DMA_SPEED_TYPE_A 0x01 ///< ISA controller supports type A DMA transfers.
-#define EFI_ISA_ACPI_DMA_SPEED_TYPE_B 0x02 ///< ISA controller supports type B DMA transfers.
-#define EFI_ISA_ACPI_DMA_SPEED_TYPE_F 0x03 ///< ISA controller supports type F DMA transfers.
-#define EFI_ISA_ACPI_DMA_COUNT_BY_BYTE 0x04 ///< ISA controller increments DMA address by bytes (8-bit).
-#define EFI_ISA_ACPI_DMA_COUNT_BY_WORD 0x08 ///< ISA controller increments DMA address by words (16-bit).
-#define EFI_ISA_ACPI_DMA_BUS_MASTER 0x10 ///< ISA controller is a DMA bus master.
-#define EFI_ISA_ACPI_DMA_TRANSFER_TYPE_8_BIT 0x20 ///< ISA controller only supports 8-bit DMA transfers.
-#define EFI_ISA_ACPI_DMA_TRANSFER_TYPE_8_BIT_AND_16_BIT 0x40 ///< ISA controller both 8-bit and 16-bit DMA transfers.
-#define EFI_ISA_ACPI_DMA_TRANSFER_TYPE_16_BIT 0x80 ///< ISA controller only supports 16-bit DMA transfers.
-
-///
-/// ISA ACPI Protocol MMIO resource attributes
-///
-#define EFI_ISA_ACPI_MEMORY_WIDTH_MASK 0x03 ///< Bit mask of supported ISA memory width attributes.
-#define EFI_ISA_ACPI_MEMORY_WIDTH_8_BIT 0x00 ///< ISA MMIO region only supports 8-bit access.
-#define EFI_ISA_ACPI_MEMORY_WIDTH_16_BIT 0x01 ///< ISA MMIO region only supports 16-bit access.
-#define EFI_ISA_ACPI_MEMORY_WIDTH_8_BIT_AND_16_BIT 0x02 ///< ISA MMIO region supports both 8-bit and 16-bit access.
-#define EFI_ISA_ACPI_MEMORY_WRITEABLE 0x04 ///< ISA MMIO region supports write transactions.
-#define EFI_ISA_ACPI_MEMORY_CACHEABLE 0x08 ///< ISA MMIO region supports being cached.
-#define EFI_ISA_ACPI_MEMORY_SHADOWABLE 0x10 ///< ISA MMIO region may be shadowed.
-#define EFI_ISA_ACPI_MEMORY_EXPANSION_ROM 0x20 ///< ISA MMIO region is an expansion ROM.
-
-///
-/// ISA ACPI Protocol I/O resource attributes
-///
-#define EFI_ISA_ACPI_IO_DECODE_10_BITS 0x01 ///< ISA controllers uses a 10-bit address decoder for I/O cycles.
-#define EFI_ISA_ACPI_IO_DECODE_16_BITS 0x02 ///< ISA controllers uses a 16-bit address decoder for I/O cycles.
-
-///
-/// EFI ISA ACPI resource type
-///
-typedef enum {
- EfiIsaAcpiResourceEndOfList, ///< Marks the end if a resource list.
- EfiIsaAcpiResourceIo, ///< ISA I/O port resource range.
- EfiIsaAcpiResourceMemory, ///< ISA MMIO resource range.
- EfiIsaAcpiResourceDma, ///< ISA DMA resource.
- EfiIsaAcpiResourceInterrupt ///< ISA interrupt resource.
-} EFI_ISA_ACPI_RESOURCE_TYPE;
-
-///
-/// EFI ISA ACPI generic resource structure
-///
-typedef struct {
- EFI_ISA_ACPI_RESOURCE_TYPE Type; ///< The type of resource (I/O, MMIO, DMA, Interrupt).
- UINT32 Attribute; ///< Bit mask of attributes associated with this resource. See EFI_ISA_ACPI_xxx macros for valid combinations.
- UINT32 StartRange; ///< The start of the resource range.
- UINT32 EndRange; ///< The end of the resource range.
-} EFI_ISA_ACPI_RESOURCE;
-
-///
-/// EFI ISA ACPI resource device identifier
-///
-typedef struct {
- UINT32 HID; ///< The ACPI Hardware Identifier value associated with an ISA controller. Matchs ACPI DSDT contents.
- UINT32 UID; ///< The ACPI Unique Identifier value associated with an ISA controller. Matches ACPI DSDT contents.
-} EFI_ISA_ACPI_DEVICE_ID;
-
-///
-/// EFI ISA ACPI resource list
-///
-typedef struct {
- EFI_ISA_ACPI_DEVICE_ID Device; ///< The ACPI HID/UID associated with an ISA controller.
- EFI_ISA_ACPI_RESOURCE *ResourceItem; ///< A pointer to the list of resources associated with an ISA controller.
-} EFI_ISA_ACPI_RESOURCE_LIST;
-
-/**
- Enumerates the ISA controllers on an ISA bus.
-
- This service allows all the ISA controllers on an ISA bus to be enumerated. If
- Device is a pointer to a NULL value, then the first ISA controller on the ISA
- bus is returned in Device and EFI_SUCCESS is returned. If Device is a pointer
- to a value that was returned on a prior call to DeviceEnumerate(), then the next
- ISA controller on the ISA bus is returned in Device and EFI_SUCCESS is returned.
- If Device is a pointer to the last ISA controller on the ISA bus, then
- EFI_NOT_FOUND is returned.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[out] Device The pointer to an ISA controller named by ACPI HID/UID.
-
- @retval EFI_SUCCESS The next ISA controller on the ISA bus was returned.
- @retval EFI_NOT_FOUND No device found.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_DEVICE_ENUMERATE)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- OUT EFI_ISA_ACPI_DEVICE_ID **Device
- );
-
-/**
- Sets the power state of an ISA controller.
-
- This services sets the power state of the ISA controller specified by Device to
- the power state specified by OnOff. TRUE denotes on, FALSE denotes off.
- If the power state is successfully set on the ISA Controller, then
- EFI_SUCCESS is returned.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[in] Device The pointer to an ISA controller named by ACPI HID/UID.
- @param[in] OnOff TRUE denotes on, FALSE denotes off.
-
- @retval EFI_SUCCESS Successfully set the power state of the ISA controller.
- @retval Other The ISA controller could not be placed in the requested power state.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_SET_DEVICE_POWER)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- IN EFI_ISA_ACPI_DEVICE_ID *Device,
- IN BOOLEAN OnOff
- );
-
-/**
- Retrieves the current set of resources associated with an ISA controller.
-
- Retrieves the set of I/O, MMIO, DMA, and interrupt resources currently
- assigned to the ISA controller specified by Device. These resources
- are returned in ResourceList.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[in] Device The pointer to an ISA controller named by ACPI HID/UID.
- @param[out] ResourceList The pointer to the current resource list for Device.
-
- @retval EFI_SUCCESS Successfully retrieved the current resource list.
- @retval EFI_NOT_FOUND The resource list could not be retrieved.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_GET_CUR_RESOURCE)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- IN EFI_ISA_ACPI_DEVICE_ID *Device,
- OUT EFI_ISA_ACPI_RESOURCE_LIST **ResourceList
- );
-
-/**
- Retrieves the set of possible resources that may be assigned to an ISA controller
- with SetResource().
-
- Retrieves the possible sets of I/O, MMIO, DMA, and interrupt resources for the
- ISA controller specified by Device. The sets are returned in ResourceList.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[in] Device The pointer to an ISA controller named by ACPI HID/UID.
- @param[out] ResourceList The pointer to the returned list of resource lists.
-
- @retval EFI_UNSUPPORTED This service is not supported.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_GET_POS_RESOURCE)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- IN EFI_ISA_ACPI_DEVICE_ID *Device,
- OUT EFI_ISA_ACPI_RESOURCE_LIST **ResourceList
- );
-
-/**
- Assigns resources to an ISA controller.
-
- Assigns the I/O, MMIO, DMA, and interrupt resources specified by ResourceList
- to the ISA controller specified by Device. ResourceList must match a resource list returned by GetPosResource() for the same ISA controller.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[in] Device The pointer to an ISA controller named by ACPI HID/UID.
- @param[in] ResourceList The pointer to a resources list that must be one of the
- resource lists returned by GetPosResource() for the
- ISA controller specified by Device.
-
- @retval EFI_SUCCESS Successfully set resources on the ISA controller.
- @retval Other The resources could not be set for the ISA controller.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_SET_RESOURCE)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- IN EFI_ISA_ACPI_DEVICE_ID *Device,
- IN EFI_ISA_ACPI_RESOURCE_LIST *ResourceList
- );
-
-/**
- Enables or disables an ISA controller.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[in] Device The pointer to the ISA controller to enable/disable.
- @param[in] Enable TRUE to enable the ISA controller. FALSE to disable the
- ISA controller.
-
- @retval EFI_SUCCESS Successfully enabled/disabled the ISA controller.
- @retval Other The ISA controller could not be placed in the requested state.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_ENABLE_DEVICE)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- IN EFI_ISA_ACPI_DEVICE_ID *Device,
- IN BOOLEAN Enable
- );
-
-/**
- Initializes an ISA controller, so that it can be used. This service must be called
- before SetResource(), EnableDevice(), or SetPower() will behave as expected.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
- @param[in] Device The pointer to an ISA controller named by ACPI HID/UID.
-
- @retval EFI_SUCCESS Successfully initialized an ISA controller.
- @retval Other The ISA controller could not be initialized.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_INIT_DEVICE)(
- IN EFI_ISA_ACPI_PROTOCOL *This,
- IN EFI_ISA_ACPI_DEVICE_ID *Device
- );
-
-/**
- Initializes all the HW states required for the ISA controllers on the ISA bus
- to be enumerated and managed by the rest of the services in this prorotol.
- This service must be called before any of the other services in this
- protocol will function as expected.
-
- @param[in] This The pointer to the EFI_ISA_ACPI_PROTOCOL instance.
-
- @retval EFI_SUCCESS Successfully initialized all required hardware states.
- @retval Other The ISA interface could not be initialized.
-
-**/
-typedef
-EFI_STATUS
-(EFIAPI *EFI_ISA_ACPI_INTERFACE_INIT)(
- IN EFI_ISA_ACPI_PROTOCOL *This
- );
-
-///
-/// The EFI_ISA_ACPI_PROTOCOL provides the services to enumerate and manage
-/// ISA controllers on an ISA bus. These services include the ability to initialize,
-/// enable, disable, and manage the power state of ISA controllers. It also
-/// includes services to query current resources, query possible resources,
-/// and assign resources to an ISA controller.
-///
-struct _EFI_ISA_ACPI_PROTOCOL {
- EFI_ISA_ACPI_DEVICE_ENUMERATE DeviceEnumerate;
- EFI_ISA_ACPI_SET_DEVICE_POWER SetPower;
- EFI_ISA_ACPI_GET_CUR_RESOURCE GetCurResource;
- EFI_ISA_ACPI_GET_POS_RESOURCE GetPosResource;
- EFI_ISA_ACPI_SET_RESOURCE SetResource;
- EFI_ISA_ACPI_ENABLE_DEVICE EnableDevice;
- EFI_ISA_ACPI_INIT_DEVICE InitDevice;
- EFI_ISA_ACPI_INTERFACE_INIT InterfaceInit;
-};
-
-extern EFI_GUID gEfiIsaAcpiProtocolGuid;
-
-#endif
diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index 0b616c30a4..de4b6fe5c0 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -185,7 +185,6 @@
gIoMmuAbsentProtocolGuid = {0xf8775d50, 0x8abd, 0x4adf, {0x92, 0xac, 0x85, 0x3e, 0x51, 0xf6, 0xc8, 0xdc}}
gEfiLegacy8259ProtocolGuid = {0x38321dba, 0x4fe0, 0x4e17, {0x8a, 0xec, 0x41, 0x30, 0x55, 0xea, 0xed, 0xc1}}
gEfiFirmwareVolumeProtocolGuid = {0x389F751F, 0x1838, 0x4388, {0x83, 0x90, 0xcd, 0x81, 0x54, 0xbd, 0x27, 0xf8}}
- gEfiIsaAcpiProtocolGuid = {0x64a892dc, 0x5561, 0x4536, {0x92, 0xc7, 0x79, 0x9b, 0xfc, 0x18, 0x33, 0x55}}
gEfiLegacyBiosProtocolGuid = {0xdb9a1e3d, 0x45cb, 0x4abb, {0x85, 0x3b, 0xe5, 0x38, 0x7f, 0xdb, 0x2e, 0x2d}}
gEfiLegacyBiosPlatformProtocolGuid = {0x783658a3, 0x4172, 0x4421, {0xa2, 0x99, 0xe0, 0x09, 0x07, 0x9c, 0x0c, 0xb4}}
gEfiLegacyInterruptProtocolGuid = {0x31ce593d, 0x108a, 0x485d, {0xad, 0xb2, 0x78, 0xf2, 0x1f, 0x29, 0x66, 0xbe}}