From d9feb94de3db77667bf1c9a90ea9fd41af84325c Mon Sep 17 00:00:00 2001
From: Guo Dong <guo.dong@intel.com>
Date: Thu, 17 Sep 2020 22:16:54 -0700
Subject: [PATCH] Add SetDeviceAddr() for device table update

Currently SBL library has GetDeviceAddr() to get the device
address based on device type and instance. This patch adds
SetDeviceAddr() to update a given device type and address so
that platform could update the device table dynamically.

Signed-off-by: Guo Dong <guo.dong@intel.com>
---
 .../Include/Library/BootloaderCommonLib.h     | 23 ++++++++++
 .../BootloaderCommonLib/BootloaderCommonLib.c | 45 +++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/BootloaderCommonPkg/Include/Library/BootloaderCommonLib.h b/BootloaderCommonPkg/Include/Library/BootloaderCommonLib.h
index d9a5ec85..4fc9854a 100644
--- a/BootloaderCommonPkg/Include/Library/BootloaderCommonLib.h
+++ b/BootloaderCommonPkg/Include/Library/BootloaderCommonLib.h
@@ -559,6 +559,29 @@ GetDeviceAddr (
   IN  UINT8          DeviceInstance
   );
 
+/**
+  Set device address in device table
+
+  If the device is PCI device, the device address format is 0x00BBDDFF, where
+  BB, DD and FF are PCI bus, device and function number.
+  If the device is MMIO device, the device address format is 0xMMxxxxxx, where
+  MM should be non-zero value, xxxxxx could be any value.
+
+  @param[in]  DeviceType         The device type, refer OS_BOOT_MEDIUM_TYPE.
+  @param[in]  DeviceInstance     The device instance number starting from 0.
+  @param[in]  DeviceAddr         The device address.
+
+  @retval     EFI_SUCCESS        If the given device type and instance are found and set.
+              EFI_NOT_FOUND      The given device type and instance are not found.
+
+**/
+EFI_STATUS
+EFIAPI
+SetDeviceAddr (
+  IN  UINT8          DeviceType,
+  IN  UINT8          DeviceInstance,
+  IN  UINT32         DeviceAddr
+  );
 
 /**
   This function retrieves container list pointer.
diff --git a/BootloaderCommonPkg/Library/BootloaderCommonLib/BootloaderCommonLib.c b/BootloaderCommonPkg/Library/BootloaderCommonLib/BootloaderCommonLib.c
index 7dc8a487..e151c4b4 100644
--- a/BootloaderCommonPkg/Library/BootloaderCommonLib/BootloaderCommonLib.c
+++ b/BootloaderCommonPkg/Library/BootloaderCommonLib/BootloaderCommonLib.c
@@ -677,6 +677,51 @@ GetDeviceAddr (
   return DeviceBase;
 }
 
+/**
+  Set device address in the device table
+
+  If the device is PCI device, the device address format is 0x00BBDDFF, where
+  BB, DD and FF are PCI bus, device and function number.
+  If the device is MMIO device, the device address format is 0xMMxxxxxx, where
+  MM should be non-zero value, xxxxxx could be any value.
+
+  @param[in]  DeviceType         The device type, refer OS_BOOT_MEDIUM_TYPE.
+  @param[in]  DeviceInstance     The device instance number starting from 0.
+  @param[in]  DeviceAddr         The device address.
+
+  @retval     EFI_SUCCESS        If the given device type and instance are found and set.
+              EFI_NOT_FOUND      The given device type and instance are not found.
+
+**/
+EFI_STATUS
+EFIAPI
+SetDeviceAddr (
+  IN  UINT8          DeviceType,
+  IN  UINT8          DeviceInstance,
+  IN  UINT32         DeviceAddr
+  )
+{
+  PLT_DEVICE_TABLE   *DeviceTable;
+  PLT_DEVICE         *Device;
+  UINT32             Index;
+
+  Device = NULL;
+  DeviceTable = (PLT_DEVICE_TABLE *)GetDeviceTable();
+  for (Index = 0; Index < DeviceTable->DeviceNumber; Index++) {
+    Device = &DeviceTable->Device[Index];
+    if ((Device->Type == DeviceType) && (Device->Instance == DeviceInstance)){
+      if (Device->Dev.DevAddr != DeviceAddr) {
+        DEBUG ((DEBUG_INFO, "Update device table: type (0x%x) instance (%x) from 0x%x to 0x%x\n", \
+               DeviceType, DeviceInstance, Device->Dev.DevAddr, DeviceAddr));
+        Device->Dev.DevAddr = DeviceAddr;
+      }
+      return EFI_SUCCESS;
+    }
+  }
+
+  return EFI_NOT_FOUND;
+}
+
 /**
   Match a given hash with the ones in hash store.