8992: Fix 950 (MSM8992) PMIC reset (#83)

* 8992: add IMEM2 region MMU mapping * SPMI: Map 8992 IMEM2 memory at runtime * Reset: add 8992 support
WOA-Project · Mar 15, 2021 · 7c20479 · 7c20479
1 parent d6162d4
commit 7c20479
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/Include/Configuration/DeviceMemoryMap.h b/Include/Configuration/DeviceMemoryMap.h
@@ -178,6 +178,12 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0xFE87F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiConventionalMemory},
+    /* MSM8992 platform needs another section of IMEM */
+#if SILICON_PLATFORM == 8992
+    {0xFE80F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+     AddDev, EfiConventionalMemory},
+#endif
 
     /* Register regions */
     /* IMEM SMEM Base */
@@ -188,6 +194,12 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptorEx[] = {
     {0xFE87F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
+    /* MSM8992 platform needs another section of IMEM */
+#if SILICON_PLATFORM == 8992
+    {0xFE80F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+     AddDev, EfiMemoryMappedIO},
+#endif
     /* TERMINATOR */
     {0xF9000000, 0x00113000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
@@ -433,6 +445,12 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptor4GBEx[] = {
     {0xFE87F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiConventionalMemory},
+    /* MSM8992 platform needs another section of IMEM */
+#if SILICON_PLATFORM == 8992
+    {0xFE80F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_INITIALIZED, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+     AddDev, EfiConventionalMemory},
+#endif
 
     /* Register regions */
     /* IMEM SMEM Base */
@@ -443,6 +461,12 @@ static ARM_MEMORY_REGION_DESCRIPTOR_EX gDeviceMemoryDescriptor4GBEx[] = {
     {0xFE87F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
      AddDev, EfiMemoryMappedIO},
+     /* MSM8992 platform needs another section of IMEM */
+#if SILICON_PLATFORM == 8992
+    {0xFE80F000, 0x00001000, EFI_RESOURCE_MEMORY_MAPPED_IO,
+     EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,
+     AddDev, EfiMemoryMappedIO},
+#endif
     /* TERMINATOR */
     {0xF9000000, 0x00113000, EFI_RESOURCE_MEMORY_MAPPED_IO,
      EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE, ARM_MEMORY_REGION_ATTRIBUTE_DEVICE,

diff --git a/Library/QcomPmicResetSystemLib/QcomPmicResetSystemLib.c b/Library/QcomPmicResetSystemLib/QcomPmicResetSystemLib.c
@@ -210,7 +210,14 @@ LibInitializeResetSystem(
 
   // Set Address
   pPonPsHoldAddressVirtual   = MPM2_MPM_PS_HOLD;
+
+#if SILICON_PLATFORM == 8994
   pResetReasonAddressVirtual = RESTART_REASON_ADDR;
+#elif SILICON_PLATFORM == 8992
+  pResetReasonAddressVirtual = RESTART_REASON_ADDR2;
+#else
+#error "Not a valid MSM platform"
+#endif
 
   // Register Virtual Address Change event.
   Status = gBS->CreateEventEx(

diff --git a/Library/RuntimeSpmiMemoryConfiguratorLib/RuntimeSpmiMemoryConfig.c b/Library/RuntimeSpmiMemoryConfiguratorLib/RuntimeSpmiMemoryConfig.c
@@ -55,6 +55,23 @@ RtSpmiConfigMemory(VOID)
       goto exit;
   }
 
+#if SILICON_PLATFORM == 8992
+  Status = gDS->GetMemorySpaceDescriptor(
+      ROUND_TO_PAGE(MSM_SHARED_IMEM_BASE2), &imemRegionMemoryDescriptor);
+
+  if (EFI_ERROR(Status))
+    goto exit;
+
+  if (!(imemRegionMemoryDescriptor.Attributes & EFI_MEMORY_RUNTIME)) {
+    Status = gDS->SetMemorySpaceAttributes(
+        ROUND_TO_PAGE(MSM_SHARED_IMEM_BASE2), EFI_PAGE_SIZE,
+        imemRegionMemoryDescriptor.Attributes | EFI_MEMORY_RUNTIME);
+
+    if (EFI_ERROR(Status))
+      goto exit;
+  }
+#endif
+
   Status = gDS->GetMemorySpaceDescriptor(
       ROUND_TO_PAGE(SPMI_BASE), &spmiMemoryDescriptor);