summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/arch/x86/acpi_device.c22
-rw-r--r--src/arch/x86/include/arch/acpi_device.h2
-rw-r--r--src/drivers/crb/tis.c2
-rw-r--r--src/drivers/net/r8168.c3
-rw-r--r--src/drivers/pc80/tpm/tis.c2
-rw-r--r--src/drivers/wifi/generic.c3
-rw-r--r--src/superio/common/ssdt.c3
7 files changed, 32 insertions, 5 deletions
diff --git a/src/arch/x86/acpi_device.c b/src/arch/x86/acpi_device.c
index 5c77953bc2..1d79170487 100644
--- a/src/arch/x86/acpi_device.c
+++ b/src/arch/x86/acpi_device.c
@@ -18,6 +18,8 @@
#include <device/device.h>
#include <device/path.h>
#include <stdlib.h>
+#include <crc_byte.h>
+
#if CONFIG(GENERIC_GPIO_LIB)
#include <gpio.h>
#endif
@@ -98,6 +100,19 @@ const char *acpi_device_hid(const struct device *dev)
return NULL;
}
+/*
+ * Generate unique ID based on the ACPI path.
+ * Collisions on the same _HID are possible but very unlikely.
+ */
+uint32_t acpi_device_uid(struct device *dev)
+{
+ const char *path = acpi_device_path(dev);
+ if (!path)
+ return 0;
+
+ return CRC(path, strlen(path), crc32_byte);
+}
+
/* Recursive function to find the root device and print a path from there */
static ssize_t acpi_device_path_fill(const struct device *dev, char *buf,
size_t buf_len, size_t cur)
@@ -192,6 +207,13 @@ int acpi_device_status(const struct device *dev)
return ACPI_STATUS_DEVICE_ALL_ON;
}
+
+/* Write the unique _UID based on ACPI device path. */
+void acpi_device_write_uid(struct device *dev)
+{
+ acpigen_write_name_integer("_UID", acpi_device_uid(dev));
+}
+
/* ACPI 6.1 section 6.4.3.6: Extended Interrupt Descriptor */
void acpi_device_write_interrupt(const struct acpi_irq *irq)
{
diff --git a/src/arch/x86/include/arch/acpi_device.h b/src/arch/x86/include/arch/acpi_device.h
index 382ef1546b..0a702c9329 100644
--- a/src/arch/x86/include/arch/acpi_device.h
+++ b/src/arch/x86/include/arch/acpi_device.h
@@ -62,10 +62,12 @@ struct acpi_dp {
struct device;
const char *acpi_device_name(const struct device *dev);
const char *acpi_device_hid(const struct device *dev);
+uint32_t acpi_device_uid(struct device *dev);
const char *acpi_device_path(const struct device *dev);
const char *acpi_device_scope(const struct device *dev);
const char *acpi_device_path_join(const struct device *dev, const char *name);
int acpi_device_status(const struct device *dev);
+void acpi_device_write_uid(struct device *dev);
/*
* ACPI Descriptor for extended Interrupt()
diff --git a/src/drivers/crb/tis.c b/src/drivers/crb/tis.c
index f2aba48297..b1fbad01eb 100644
--- a/src/drivers/crb/tis.c
+++ b/src/drivers/crb/tis.c
@@ -117,7 +117,7 @@ static void crb_tpm_fill_ssdt(struct device *dev)
acpigen_write_name_string("_HID", "MSFT0101");
acpigen_write_name_string("_CID", "MSFT0101");
- acpigen_write_name_integer("_UID", 1);
+ acpi_device_write_uid(dev);
acpigen_write_STA(ACPI_STATUS_DEVICE_ALL_ON);
diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index bc0132fc13..1bca8799aa 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -312,7 +312,8 @@ static void r8168_net_fill_ssdt(struct device *dev)
acpigen_write_scope(path);
acpigen_write_device(acpi_device_name(dev));
acpigen_write_name_string("_HID", R8168_ACPI_HID);
- acpigen_write_name_integer("_UID", 0);
+ acpi_device_write_uid(dev);
+
if (dev->chip_ops)
acpigen_write_name_string("_DDN", dev->chip_ops->name);
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index e9f14854c4..a35ef83d2c 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -902,7 +902,7 @@ static void lpc_tpm_fill_ssdt(struct device *dev)
acpigen_write_name("_CID");
acpigen_emit_eisaid("PNP0C31");
- acpigen_write_name_integer("_UID", 1);
+ acpi_device_write_uid(dev);
u32 did_vid = tpm_read_did_vid(0);
if (did_vid > 0 && did_vid < 0xffffffff)
diff --git a/src/drivers/wifi/generic.c b/src/drivers/wifi/generic.c
index 9f9f4faae7..fe2e39d29d 100644
--- a/src/drivers/wifi/generic.c
+++ b/src/drivers/wifi/generic.c
@@ -187,7 +187,8 @@ void generic_wifi_fill_ssdt(struct device *dev,
/* Device */
acpigen_write_scope(path);
acpigen_write_device(acpi_device_name(dev));
- acpigen_write_name_integer("_UID", 0);
+ acpi_device_write_uid(dev);
+
if (dev->chip_ops)
acpigen_write_name_string("_DDN", dev->chip_ops->name);
diff --git a/src/superio/common/ssdt.c b/src/superio/common/ssdt.c
index 41cafdfb0e..541fa9922c 100644
--- a/src/superio/common/ssdt.c
+++ b/src/superio/common/ssdt.c
@@ -196,7 +196,8 @@ void superio_common_fill_ssdt_generator(struct device *dev)
/* Device */
acpigen_write_device(name);
- acpigen_write_name_byte("_UID", 0);
+ acpi_device_write_uid(dev);
+
acpigen_write_name_byte("LDN", ldn);
acpigen_write_name_byte("VLDN", vldn);