Felix Held submitted this change.

View Change

soc/amd: use expected function signature for soc_acpi_write_tables

A pointer to soc_acpi_write_tables gets assigned to the
write_acpi_tables element of the device_operations struct, so make sure
that the function has the expected function signature which in this case
means using unsigned long as type for both the 'current' parameter and
the return value.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Iee45badb904fa20c6db146edbc00c40ca09361d1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80218
Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/soc/amd/cezanne/agesa_acpi.c
M src/soc/amd/cezanne/include/soc/acpi.h
M src/soc/amd/glinda/agesa_acpi.c
M src/soc/amd/glinda/include/soc/acpi.h
M src/soc/amd/mendocino/agesa_acpi.c
M src/soc/amd/mendocino/include/soc/acpi.h
M src/soc/amd/phoenix/agesa_acpi.c
M src/soc/amd/phoenix/include/soc/acpi.h
M src/soc/amd/picasso/agesa_acpi.c
M src/soc/amd/picasso/include/soc/acpi.h
10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/soc/amd/cezanne/agesa_acpi.c b/src/soc/amd/cezanne/agesa_acpi.c
index 5dfc59d..e22cc08 100644
--- a/src/soc/amd/cezanne/agesa_acpi.c
+++ b/src/soc/amd/cezanne/agesa_acpi.c
@@ -7,8 +7,8 @@
 #include <soc/acpi.h>
 #include <types.h>
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp)
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp)
 {
 	/* TODO: look into adding CRAT */
 
diff --git a/src/soc/amd/cezanne/include/soc/acpi.h b/src/soc/amd/cezanne/include/soc/acpi.h
index 5c8b5d2..37655a9 100644
--- a/src/soc/amd/cezanne/include/soc/acpi.h
+++ b/src/soc/amd/cezanne/include/soc/acpi.h
@@ -10,7 +10,7 @@
 
 #define ACPI_SCI_IRQ 9
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp);
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp);
 
 #endif /* AMD_CEZANNE_ACPI_H */
diff --git a/src/soc/amd/glinda/agesa_acpi.c b/src/soc/amd/glinda/agesa_acpi.c
index e55431b..e04f7cb 100644
--- a/src/soc/amd/glinda/agesa_acpi.c
+++ b/src/soc/amd/glinda/agesa_acpi.c
@@ -9,8 +9,8 @@
 #include <soc/acpi.h>
 #include <types.h>
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp)
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp)
 {
 	/* TODO: look into adding CRAT */
 
diff --git a/src/soc/amd/glinda/include/soc/acpi.h b/src/soc/amd/glinda/include/soc/acpi.h
index 6f8e06c..d47ff002 100644
--- a/src/soc/amd/glinda/include/soc/acpi.h
+++ b/src/soc/amd/glinda/include/soc/acpi.h
@@ -12,7 +12,7 @@
 
 #define ACPI_SCI_IRQ 9
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp);
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp);
 
 #endif /* AMD_GLINDA_ACPI_H */
diff --git a/src/soc/amd/mendocino/agesa_acpi.c b/src/soc/amd/mendocino/agesa_acpi.c
index 55267ec..8866fc4 100644
--- a/src/soc/amd/mendocino/agesa_acpi.c
+++ b/src/soc/amd/mendocino/agesa_acpi.c
@@ -9,8 +9,8 @@
 #include <soc/acpi.h>
 #include <types.h>
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp)
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp)
 {
 	/* TODO: look into adding CRAT */
 
diff --git a/src/soc/amd/mendocino/include/soc/acpi.h b/src/soc/amd/mendocino/include/soc/acpi.h
index e1994aa..5b72492 100644
--- a/src/soc/amd/mendocino/include/soc/acpi.h
+++ b/src/soc/amd/mendocino/include/soc/acpi.h
@@ -10,7 +10,7 @@
 
 #define ACPI_SCI_IRQ 9
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp);
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp);
 
 #endif /* AMD_MENDOCINO_ACPI_H */
diff --git a/src/soc/amd/phoenix/agesa_acpi.c b/src/soc/amd/phoenix/agesa_acpi.c
index 98e25f6..e4fa2bf 100644
--- a/src/soc/amd/phoenix/agesa_acpi.c
+++ b/src/soc/amd/phoenix/agesa_acpi.c
@@ -10,8 +10,8 @@
 #include <soc/acpi.h>
 #include <types.h>
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp)
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp)
 {
 	/* TODO: look into adding CRAT */
 
diff --git a/src/soc/amd/phoenix/include/soc/acpi.h b/src/soc/amd/phoenix/include/soc/acpi.h
index 39687219..b3f7adc 100644
--- a/src/soc/amd/phoenix/include/soc/acpi.h
+++ b/src/soc/amd/phoenix/include/soc/acpi.h
@@ -12,7 +12,7 @@
 
 #define ACPI_SCI_IRQ 9
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp);
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp);
 
 #endif /* AMD_PHOENIX_ACPI_H */
diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c
index 5604faa..bde9543 100644
--- a/src/soc/amd/picasso/agesa_acpi.c
+++ b/src/soc/amd/picasso/agesa_acpi.c
@@ -539,8 +539,8 @@
 	return current;
 }
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp)
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp)
 {
 	struct acpi_crat_header *crat;
 
diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h
index 7a0f749..5f7e748 100644
--- a/src/soc/amd/picasso/include/soc/acpi.h
+++ b/src/soc/amd/picasso/include/soc/acpi.h
@@ -10,7 +10,7 @@
 
 #define ACPI_SCI_IRQ 9
 
-uintptr_t soc_acpi_write_tables(const struct device *device, uintptr_t current,
-				acpi_rsdp_t *rsdp);
+unsigned long soc_acpi_write_tables(const struct device *device, unsigned long current,
+				    acpi_rsdp_t *rsdp);
 
 #endif /* AMD_PICASSO_ACPI_H */

To view, visit change 80218. To unsubscribe, or for help writing mail filters, visit settings.