Silicon/SynQuacer/PlatformDxe: add ACPI description of eMMC

Expose a separate ACPI description of the SynQuacer eMMC controller
when both ACPI and eMMC support have been enabled in the HII menu.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Graeme Gregory <graeme.gregory@linaro.org>

6 files changed, 106 insertions, 0 deletions

diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
index 27c6594177..0b52ff3470 100644
--- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
+++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf
@@ -441,6 +441,7 @@ CAPSULE_HEADER_INIT_VERSION = 0x1
     PE32         PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi

     UI           STRING="$(MODULE_NAME)" Optional

     RAW          BIN                    Optional    |.dtb

+    RAW          ASL                    Optional    |.aml

   }

 

 [Rule.Common.DXE_RUNTIME_DRIVER]

diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
index 20d19120d1..3f47781fe9 100644
--- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
+++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf
@@ -419,6 +419,7 @@ FMP_PAYLOAD = FmpPayloadSystemFirmwarePkcs7
     DXE_DEPEX    DXE_DEPEX              Optional $(INF_OUTPUT)/$(MODULE_NAME).depex

     PE32         PE32                   $(INF_OUTPUT)/$(MODULE_NAME).efi

     UI           STRING="$(MODULE_NAME)" Optional

+    RAW          ASL                    Optional    |.aml

   }

 

 [Rule.Common.DXE_RUNTIME_DRIVER]

diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl
new file mode 100644
index 0000000000..4e371befc7
--- /dev/null
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.asl
@@ -0,0 +1,41 @@
+/** @file

+  SSDT describing the SynQuacer eMMC controller

+

+  Copyright (c) 2018, Linaro Ltd. All rights reserved.<BR>

+

+  This program and the accompanying materials are licensed and made available

+  under the terms and conditions of the BSD License which accompanies this

+  distribution.  The full text of the license may be found at

+  http://opensource.org/licenses/bsd-license.php

+

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+

+**/

+

+#include <Platform/MemoryMap.h>

+

+DefinitionBlock ("SsdtEmmc.aml", "SSDT", 1, "SNI", "SynQeMMC",

+                 FixedPcdGet32 (PcdAcpiDefaultOemRevision)) {

+  Scope (_SB) {

+    Device (MMC0) {

+      Name (_HID, "SCX0002")

+      Name (_UID, Zero)

+      Name (_CCA, 1)

+      Name (_CRS, ResourceTemplate () {

+        Memory32Fixed (ReadWrite, SYNQUACER_EMMC_BASE, SYNQUACER_EMMC_BASE_SZ)

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

+      })

+

+      Name (_DSD, Package ()  // _DSD: Device-Specific Data

+      {

+        ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),

+        Package () {

+          Package (2) { "bus-width", 8 },

+          Package (2) { "cap-mmc-highspeed", 0x1 },

+          Package (2) { "fujitsu,cmd-dat-delay-select", 0x1 },

+        }

+      })

+    }

+  } // Scope (_SB)

+}

diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c
index 7284ea6a7c..e0987c954c 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/Emmc.c
@@ -59,6 +59,10 @@
 

 STATIC EFI_HANDLE mSdMmcControllerHandle;

 

+STATIC EFI_ACPI_DESCRIPTION_HEADER      *mSsdt;

+STATIC UINTN                            mSsdtSize;

+STATIC VOID                             *mEventRegistration;

+

 /**

 

   Override function for SDHCI capability bits

@@ -182,6 +186,31 @@ STATIC EDKII_SD_MMC_OVERRIDE mSdMmcOverride = {
   SynQuacerSdMmcNotifyPhase,

 };

 

+STATIC

+VOID

+EFIAPI

+InstallAcpiTable (

+  IN EFI_EVENT                      Event,

+  IN VOID*                          Context

+  )

+{

+  UINTN                             TableKey;

+  EFI_STATUS                        Status;

+  EFI_ACPI_TABLE_PROTOCOL           *AcpiTable;

+

+  Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL,

+                  (VOID **)&AcpiTable);

+  if (EFI_ERROR (Status)) {

+    return;

+  }

+

+  Status = AcpiTable->InstallAcpiTable (AcpiTable, mSsdt, mSsdtSize, &TableKey);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_WARN, "%a: failed to install SSDT table for eMMC - %r\n",

+      __FUNCTION__, Status));

+  }

+}

+

 EFI_STATUS

 EFIAPI

 RegisterEmmc (

@@ -190,6 +219,32 @@ RegisterEmmc (
 {

   EFI_STATUS                      Status;

   EFI_HANDLE                      Handle;

+  UINTN                           Index;

+

+  if (mHiiSettings->AcpiPref == ACPIPREF_ACPI) {

+    //

+    // Load the SSDT table from a raw section in this FFS file.

+    //

+    for (Index = 0;; Index++) {

+      Status = GetSectionFromFv (&gEfiCallerIdGuid, EFI_SECTION_RAW, Index,

+                 (VOID **)&mSsdt, &mSsdtSize);

+      if (EFI_ERROR (Status)) {

+        break;

+      }

+

+      if (mSsdt->OemTableId != EMMC_TABLE_ID) {

+        continue;

+      }

+

+      //

+      // Register for the ACPI table protocol

+      //

+      EfiCreateProtocolNotifyEvent (&gEfiAcpiTableProtocolGuid, TPL_CALLBACK,

+        InstallAcpiTable, NULL, &mEventRegistration);

+

+      break;

+    }

+  }

 

   Status = RegisterNonDiscoverableMmioDevice (

              NonDiscoverableDeviceTypeSdhci,

diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h
index a391d2f67c..c25b7f168a 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.h
@@ -24,6 +24,7 @@
 #include <Library/DebugLib.h>

 #include <Library/DevicePathLib.h>

 #include <Library/DtPlatformDtbLoaderLib.h>

+#include <Library/DxeServicesLib.h>

 #include <Library/HiiLib.h>

 #include <Library/IoLib.h>

 #include <Library/MemoryAllocationLib.h>

@@ -35,10 +36,13 @@
 #include <Platform/MemoryMap.h>

 #include <Platform/Pcie.h>

 #include <Platform/VarStore.h>

+#include <Protocol/AcpiTable.h>

 #include <Protocol/NonDiscoverableDevice.h>

 #include <Protocol/PciIo.h>

 #include <Protocol/SdMmcOverride.h>

 

+#define EMMC_TABLE_ID     SIGNATURE_64('S','y','n','Q','e','M','M','C')

+

 extern UINT8                             PlatformDxeHiiBin[];

 extern UINT8                             PlatformDxeStrings[];

 

diff --git a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf
index bef7feccd8..8df3073bf2 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Silicon/Socionext/SynQuacer/Drivers/PlatformDxe/PlatformDxe.inf
@@ -23,6 +23,7 @@
   ENTRY_POINT                    = PlatformDxeEntryPoint

 

 [Sources]

+  Emmc.asl

   Emmc.c

   Pci.c

   PlatformDxe.c

@@ -46,6 +47,7 @@
   DebugLib

   DevicePathLib

   DtPlatformDtbLoaderLib

+  DxeServicesLib

   HiiLib

   IoLib

   MemoryAllocationLib

@@ -69,10 +71,12 @@
 [Protocols]

   gEdkiiNonDiscoverableDeviceProtocolGuid         ## PRODUCES

   gEdkiiSdMmcOverrideProtocolGuid                 ## PRODUCES

+  gEfiAcpiTableProtocolGuid                       ## CONSUMES

   gEfiPciIoProtocolGuid                           ## CONSUMES

   gPcf8563RealTimeClockLibI2cMasterProtocolGuid   ## PRODUCES

 

 [FixedPcd]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision

   gSynQuacerTokenSpaceGuid.PcdNetsecEepromBase

   gSynQuacerTokenSpaceGuid.PcdNetsecPhyAddress