Преглед на файлове

Platform/Raspberrypi: Update DMA constants based on SOC revision

The newer BCM2711 SoC's don't have a DMA constraint on the emmc2
controller. So we don't need to do the 1G translation. Lets
allow the AML to detect the SoC revision and return a different
_DMA resource.

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
Reviewed-by: Pete Batard <pete@akeo.ie>
Jeremy Linton преди 3 години
родител
ревизия
bad0b9134b
променени са 2 файла, в които са добавени 40 реда и са изтрити 1 реда
  1. 38 1
      Platform/RaspberryPi/AcpiTables/Emmc.asl
  2. 2 0
      Silicon/Broadcom/Bcm27xx/Include/IndustryStandard/Bcm2711.h

+ 38 - 1
Platform/RaspberryPi/AcpiTables/Emmc.asl

@@ -8,6 +8,7 @@
 
 #include <IndustryStandard/Bcm2836SdHost.h>
 #include <IndustryStandard/Bcm2836Sdio.h>
+#include <IndustryStandard/Bcm2711.h>
 
 #include "AcpiTables.h"
 
@@ -31,7 +32,8 @@ DefinitionBlock (__FILE__, "SSDT", 2, "RPIFDN", "RPI4EMMC", 2)
         Return (^RBUF)
       }
 
-      Name (_DMA, ResourceTemplate() {
+      // Translated DMA region for BCM2711 silicon revisions older than C0
+      Name (DMTR, ResourceTemplate() {
         QWordMemory (ResourceProducer,
           ,
           MinFixed,
@@ -48,6 +50,41 @@ DefinitionBlock (__FILE__, "SSDT", 2, "RPIFDN", "RPI4EMMC", 2)
         )
       })
 
+      // Non translated DMA region for BCM2711 revisions C0 and newer
+      Name (DMNT, ResourceTemplate() {
+        QWordMemory (ResourceProducer,
+          ,
+          MinFixed,
+          MaxFixed,
+          NonCacheable,
+          ReadWrite,
+          0x0,
+          0x0000000000000000, // MIN
+          0x000000FFFFFFFFFF, // MAX
+          0x0000000000000000, // TRA
+          0x0000010000000000, // LEN
+          ,
+          ,
+        )
+      })
+
+      Method (_DMA, 0x0, Serialized)
+      {
+        OperationRegion (CHPR, SystemMemory, ID_CHIPREV, 0x4)
+          Field (CHPR, DWordAcc, NoLock, Preserve) {
+            SOCI, 32
+        }
+
+        if ((SOCI & 0xFF) >= 0x20)
+        {
+          return (^DMNT);
+        }
+        else
+        {
+          return (^DMTR);
+        }
+      }
+
       // emmc2 Host Controller. (brcm,bcm2711-emmc2)
       Device (SDC3)
       {

+ 2 - 0
Silicon/Broadcom/Bcm27xx/Include/IndustryStandard/Bcm2711.h

@@ -88,4 +88,6 @@
 
 #define THERM_SENSOR               0xfd5d2200
 
+#define ID_CHIPREV                 0xfc404000
+
 #endif /* BCM2711_H__ */