Platform/RPi3: Move ACPI interrupts definitions to AcpiTables.h

The ACPI interrupts are not the same across different Raspberry Pi
platforms therefore moving them into AcpiTables.h will help with ACPI
code factorization.

Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

5 files changed, 49 insertions, 23 deletions

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
index c860b788..be97fc4c 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
@@ -97,4 +97,30 @@ typedef struct
   UINT32 UID;                     // 4 bytes

 } EFI_ACPI_5_1_CSRT_RESOURCE_DESCRIPTOR_HEADER;

 

+//------------------------------------------------------------------------

+// Interrupts. These are specific to each platform

+//------------------------------------------------------------------------

+#define BCM2836_USB_INTERRUPT                   0x29

+#define BCM2836_V3D_BUS_INTERRUPT               0x2A

+#define BCM2836_DMA_INTERRUPT                   0x3B

+#define BCM2836_SPI1_INTERRUPT                  0x3D

+#define BCM2836_SPI2_INTERRUPT                  0x3D

+#define BCM2836_HVS_INTERRUPT                   0x41

+#define BCM2836_HDMI0_INTERRUPT                 0x48

+#define BCM2836_HDMI1_INTERRUPT                 0x49

+#define BCM2836_PV2_INTERRUPT                   0x4A

+#define BCM2836_PV0_INTERRUPT                   0x4D

+#define BCM2836_PV1_INTERRUPT                   0x4E

+#define BCM2836_MBOX_INTERRUPT                  0x61

+#define BCM2836_VCHIQ_INTERRUPT                 0x62

+#define BCM2386_GPIO_INTERRUPT0                 0x51

+#define BCM2386_GPIO_INTERRUPT1                 0x53

+#define BCM2836_I2C1_INTERRUPT                  0x55

+#define BCM2836_I2C2_INTERRUPT                  0x55

+#define BCM2836_SPI0_INTERRUPT                  0x56

+#define BCM2836_SDHOST_INTERRUPT                0x58

+#define BCM2836_MMCHS1_INTERRUPT                0x5E

+#define BCM2836_MINI_UART_INTERRUPT             0x3D

+#define BCM2836_PL011_UART_INTERRUPT            0x59

+

 #endif // __ACPITABLES_H__

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
index 693e4b15..1e17ec90 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
@@ -85,7 +85,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_USB_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x29 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_USB_INTERRUPT }

       })

       Method (_CRS, 0x0, Serialized)

       {

@@ -109,32 +109,32 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       {

         // Memory and interrupt for the GPU

         MEMORY32FIXED (ReadWrite, 0, BCM2836_V3D_BUS_LENGTH, RM01)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x2A }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_V3D_BUS_INTERRUPT }

 

         // HVS - Hardware Video Scalar

         MEMORY32FIXED (ReadWrite, 0, BCM2836_HVS_LENGTH, RM02)

         // The HVS interrupt is reserved by the VPU

-        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x41 }

+        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_HVS_INTERRUPT }

 

         // PixelValve0 - DSI0 or DPI

         // MEMORY32FIXED (ReadWrite, BCM2836_PV0_BASE_ADDRESS, BCM2836_PV0_LENGTH, RM03)

-        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x4D }

+        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_PV0_INTERRUPT }

 

         // PixelValve1 - DS1 or SMI

         // MEMORY32FIXED (ReadWrite, BCM2836_PV1_BASE_ADDRESS, BCM2836_PV1_LENGTH, RM04)

-        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x4E }

+        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_PV1_INTERRUPT }

 

         // PixelValve2 - HDMI output - connected to HVS display FIFO 1

         MEMORY32FIXED (ReadWrite, 0, BCM2836_PV2_LENGTH, RM05)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x4A }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_PV2_INTERRUPT }

 

         // HDMI registers

         MEMORY32FIXED (ReadWrite, 0, BCM2836_HDMI0_LENGTH, RM06)

         MEMORY32FIXED (ReadWrite, 0, BCM2836_HDMI1_LENGTH, RM07)

         // hdmi_int[0]

-        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x48 }

+        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_HDMI0_INTERRUPT }

         // hdmi_int[1]

-        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x49 }

+        // Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_HDMI1_INTERRUPT }

 

         // HDMI DDC connection

         I2CSerialBus (0x50,, 100000,, "\\_SB.I2C2",,,,)  // EDID

@@ -212,7 +212,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_MBOX_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x61 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_MBOX_INTERRUPT }

       })

 

       Method (_CRS, 0x0, Serialized)

@@ -237,7 +237,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_VCHIQ_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x62 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_VCHIQ_INTERRUPT }

       })

 

       Method (_CRS, 0x0, Serialized)

@@ -275,7 +275,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, GPIO_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { 0x51, 0x53 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2386_GPIO_INTERRUPT0, BCM2386_GPIO_INTERRUPT1 }

       })

       Method (_CRS, 0x0, Serialized)

       {

@@ -298,7 +298,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_I2C1_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { 0x55 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_I2C1_INTERRUPT }

 

         //

         // MsftFunctionConfig is encoded as the VendorLong.

@@ -337,7 +337,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_I2C2_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { 0x55 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_I2C2_INTERRUPT }

       })

 

       Method (_CRS, 0x0, Serialized)

@@ -361,7 +361,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_SPI0_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { 0x56 }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_SPI0_INTERRUPT }

 

         //

         // MsftFunctionConfig is encoded as the VendorLong.

@@ -428,7 +428,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
       Name (RBUF, ResourceTemplate ()

       {

         MEMORY32FIXED (ReadWrite, 0, BCM2836_SPI1_LENGTH, RMEM)

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared,) { 0x3D }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Shared,) { BCM2836_SPI1_INTERRUPT }

 

         //

         // MsftFunctionConfig is encoded as the VendorLong.

@@ -484,7 +484,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
     //     Name (RBUF, ResourceTemplate ()

     //     {

     //       MEMORY32FIXED (ReadWrite, BCM2836_SPI2_BASE_ADDRESS, BCM2836_SPI2_LENGTH, RMEM)

-    //       Interrupt (ResourceConsumer, Level, ActiveHigh, Shared,) { 0x3D }

+    //       Interrupt (ResourceConsumer, Level, ActiveHigh, Shared,) { BCM2836_SPI2_INTERRUPT }

     //     })

     //     Return (RBUF)

     //   }

@@ -514,7 +514,7 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 5, "MSFT", "EDK2", 2)
         // PWM clock control

         MEMORY32FIXED (ReadWrite, 0, BCM2836_PWM_CLK_LENGTH, RM03)

         // Interrupt DMA channel 11

-        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x3B }

+        Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_DMA_INTERRUPT }

         // DMA channel 11, DREQ 5 for PWM

         FixedDMA (5, 11, Width32Bit, )

       })

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
index f7553280..0ab1ba27 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
@@ -37,7 +37,7 @@ Device (SDC1)
   Name (RBUF, ResourceTemplate ()

   {

     MEMORY32FIXED (ReadWrite, 0, MMCHS1_LENGTH, RMEM)

-    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x5E }

+    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_MMCHS1_INTERRUPT }

   })

   Method (_CRS, 0x0, Serialized)

   {

@@ -81,7 +81,7 @@ Device (SDC2)
   Name (RBUF, ResourceTemplate ()

   {

     MEMORY32FIXED (ReadWrite, 0, SDHOST_LENGTH, RMEM)

-    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x58 }

+    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_SDHOST_INTERRUPT }

   })

   Method (_CRS, 0x0, Serialized)

   {

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.aslc
index cfa1734a..cb17fbe0 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.aslc
@@ -21,11 +21,11 @@
 #ifdef PL011_ENABLE

 #define RPI_UART_INTERFACE_TYPE              EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERFACE_TYPE_ARM_PL011_UART

 #define RPI_UART_BASE_ADDRESS                BCM2836_PL011_UART_BASE_ADDRESS

-#define RPI_UART_INTERRUPT                   0x59

+#define RPI_UART_INTERRUPT                   BCM2836_PL011_UART_INTERRUPT

 #else

 #define RPI_UART_INTERFACE_TYPE              EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERFACE_TYPE_BCM2835_UART

 #define RPI_UART_BASE_ADDRESS                BCM2836_MINI_UART_BASE_ADDRESS

-#define RPI_UART_INTERRUPT                   0x3D

+#define RPI_UART_INTERRUPT                   BCM2836_MINI_UART_INTERRUPT

 #endif

 STATIC EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE Spcr = {

   ACPI_HEADER (

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
index ddab63f1..edd8bcc3 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
@@ -28,7 +28,7 @@ Device (URT0)
   Name (RBUF, ResourceTemplate ()

   {

     MEMORY32FIXED (ReadWrite, 0, BCM2836_PL011_UART_LENGTH, RMEM)

-    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 0x59 }

+    Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { BCM2836_PL011_UART_INTERRUPT }

   })

   Method (_CRS, 0x0, Serialized)

   {

@@ -68,7 +68,7 @@ Device (URTM)
   Name (RBUF, ResourceTemplate ()

   {

     MEMORY32FIXED (ReadWrite, 0, BCM2836_MINI_UART_LENGTH, RMEM)

-    Interrupt(ResourceConsumer, Level, ActiveHigh, Shared) { 0x3D }

+    Interrupt(ResourceConsumer, Level, ActiveHigh, Shared) { BCM2836_MINI_UART_INTERRUPT }

 

     // NTRAID#MSFT-7141401-2016/04/7-jordanrh - disable UART muxing

     // until a proper solution can be created for the dmap conflict.