Change in coreboot[master]: src/soc: Use macro

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42718 )

Change subject: src/soc: Use macro
......................................................................

src/soc: Use macro

Use defined macro for space_id.

Change-Id: I5be96a420a204050e065b36efecffc7cb5e3a560
Signed-off-by: Elyes HAOUAS 
---
M src/soc/intel/apollolake/acpi.c
M src/soc/intel/baytrail/acpi.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/acpi.c
M src/soc/intel/cannonlake/acpi.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/icelake/acpi.c
M src/soc/intel/jasperlake/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/tigerlake/acpi.c
M src/soc/intel/xeon_sp/cpx/acpi.c
M src/soc/intel/xeon_sp/skx/acpi.c
12 files changed, 59 insertions(+), 59 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/42718/1

diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index 595e6a2..5bdaf2c 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -150,7 +150,7 @@

fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042;

-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.addrl = ACPI_BASE_ADDRESS + PM1_TMR;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index 13acf86..6fbe17f 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -169,7 +169,7 @@
    		ACPI_FADT_RESET_REGISTER | ACPI_FADT_SEALED_CASE |
    		ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.bit_offset = 0;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
@@ -177,42 +177,42 @@
    fadt->reset_reg.addrh = 0;
    fadt->reset_value = 6;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.bit_offset = 0;
    fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
    fadt->x_pm1a_evt_blk.addrh = 0x0;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_evt_blk.bit_width = 0;
    fadt->x_pm1b_evt_blk.bit_offset = 0;
    fadt->x_pm1b_evt_blk.access_size = 0;
    fadt->x_pm1b_evt_blk.addrl = 0x0;
    fadt->x_pm1b_evt_blk.addrh = 0x0;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.bit_offset = 0;
    fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
    fadt->x_pm1a_cnt_blk.addrh = 0x0;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_cnt_blk.bit_width = 0;
    fadt->x_pm1b_cnt_blk.bit_offset = 0;
    fadt->x_pm1b_cnt_blk.access_size = 0;
    fadt->x_pm1b_cnt_blk.addrl = 0x0;
    fadt->x_pm1b_cnt_blk.addrh = 0x0;

-	fadt->x_pm2_cnt_blk.space_id = 1;
+	fadt->x_pm2_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm2_cnt_blk.bit_width = fadt->pm2_cnt_len * 8;
    fadt->x_pm2_cnt_blk.bit_offset = 0;
    fadt->x_pm2_cnt_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_pm2_cnt_blk.addrl = pmbase + PM2A_CNT_BLK;
    fadt->x_pm2_cnt_blk.addrh = 0x0;

-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
@@ -225,14 +225,14 @@
     * The OSPM can instead use the values in `fadt->gpe0_blk{,_len}`, which
     * seems to work fine on Linux 5.0 and Windows 10.
     */
-	fadt->x_gpe0_blk.space_id = 1;
+	fadt->x_gpe0_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe0_blk.bit_width = fadt->gpe0_blk_len * 8;
    fadt->x_gpe0_blk.bit_offset = 0;
    fadt->x_gpe0_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_gpe0_blk.addrl = pmbase + GPE0_STS;
    fadt->x_gpe0_blk.addrh = 0x0;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe1_blk.bit_width = 0;
    fadt->x_gpe1_blk.bit_offset = 0;
    fadt->x_gpe1_blk.access_size = 0;
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 53379a0..43b9735 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -173,7 +173,7 @@
    		ACPI_FADT_RESET_REGISTER | ACPI_FADT_SEALED_CASE |
    		ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.bit_offset = 0;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
@@ -181,42 +181,42 @@
    fadt->reset_reg.addrh = 0;
    fadt->reset_value = 6;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.bit_offset = 0;
    fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
    fadt->x_pm1a_evt_blk.addrh = 0x0;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_evt_blk.bit_width = 0;
    fadt->x_pm1b_evt_blk.bit_offset = 0;
    fadt->x_pm1b_evt_blk.access_size = 0;
    fadt->x_pm1b_evt_blk.addrl = 0x0;
    fadt->x_pm1b_evt_blk.addrh = 0x0;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.bit_offset = 0;
    fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
    fadt->x_pm1a_cnt_blk.addrh = 0x0;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_cnt_blk.bit_width = 0;
    fadt->x_pm1b_cnt_blk.bit_offset = 0;
    fadt->x_pm1b_cnt_blk.access_size = 0;
    fadt->x_pm1b_cnt_blk.addrl = 0x0;
    fadt->x_pm1b_cnt_blk.addrh = 0x0;

-	fadt->x_pm2_cnt_blk.space_id = 1;
+	fadt->x_pm2_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm2_cnt_blk.bit_width = fadt->pm2_cnt_len * 8;
    fadt->x_pm2_cnt_blk.bit_offset = 0;
    fadt->x_pm2_cnt_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_pm2_cnt_blk.addrl = pmbase + PM2A_CNT_BLK;
    fadt->x_pm2_cnt_blk.addrh = 0x0;

-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
@@ -229,14 +229,14 @@
     * The OSPM can instead use the values in `fadt->gpe0_blk{,_len}`, which
     * seems to work fine on Linux 5.0 and Windows 10.
     */
-	fadt->x_gpe0_blk.space_id = 1;
+	fadt->x_gpe0_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe0_blk.bit_width = fadt->gpe0_blk_len * 8;
    fadt->x_gpe0_blk.bit_offset = 0;
    fadt->x_gpe0_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_gpe0_blk.addrl = pmbase + GPE0_STS;
    fadt->x_gpe0_blk.addrh = 0x0;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe1_blk.bit_width = 0;
    fadt->x_gpe1_blk.bit_offset = 0;
    fadt->x_gpe1_blk.access_size = 0;
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index 0d83c01..cd15aa9 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -224,7 +224,7 @@
    		ACPI_FADT_RESET_REGISTER | ACPI_FADT_SEALED_CASE |
    		ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.bit_offset = 0;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
@@ -232,42 +232,42 @@
    fadt->reset_reg.addrh = 0;
    fadt->reset_value = 6;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.bit_offset = 0;
    fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
    fadt->x_pm1a_evt_blk.addrh = 0x0;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_evt_blk.bit_width = 0;
    fadt->x_pm1b_evt_blk.bit_offset = 0;
    fadt->x_pm1b_evt_blk.access_size = 0;
    fadt->x_pm1b_evt_blk.addrl = 0x0;
    fadt->x_pm1b_evt_blk.addrh = 0x0;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.bit_offset = 0;
    fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
    fadt->x_pm1a_cnt_blk.addrh = 0x0;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_cnt_blk.bit_width = 0;
    fadt->x_pm1b_cnt_blk.bit_offset = 0;
    fadt->x_pm1b_cnt_blk.access_size = 0;
    fadt->x_pm1b_cnt_blk.addrl = 0x0;
    fadt->x_pm1b_cnt_blk.addrh = 0x0;

-	fadt->x_pm2_cnt_blk.space_id = 1;
+	fadt->x_pm2_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm2_cnt_blk.bit_width = fadt->pm2_cnt_len * 8;
    fadt->x_pm2_cnt_blk.bit_offset = 0;
    fadt->x_pm2_cnt_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_pm2_cnt_blk.addrl = pmbase + PM2_CNT;
    fadt->x_pm2_cnt_blk.addrh = 0x0;

-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
@@ -288,7 +288,7 @@
    fadt->x_gpe0_blk.addrh = 0;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe1_blk.bit_width = 0;
    fadt->x_gpe1_blk.bit_offset = 0;
    fadt->x_gpe1_blk.access_size = 0;
diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c
index c041eb0..d14130f 100644
--- a/src/soc/intel/cannonlake/acpi.c
+++ b/src/soc/intel/cannonlake/acpi.c
@@ -166,7 +166,7 @@

fadt->pm_tmr_blk = pmbase + PM1_TMR;
    fadt->pm_tmr_len = 4;
-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
diff --git a/src/soc/intel/common/block/acpi/acpi.c b/src/soc/intel/common/block/acpi/acpi.c
index 4e4906c..58dbcda 100644
--- a/src/soc/intel/common/block/acpi/acpi.c
+++ b/src/soc/intel/common/block/acpi/acpi.c
@@ -126,26 +126,26 @@
        ACPI_FADT_RESET_REGISTER | ACPI_FADT_SEALED_CASE |
        ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.addrl = RST_CNT;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->reset_value = RST_CPU | SYS_RST;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
    fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
    fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;

/*
     * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5.
@@ -160,7 +160,7 @@
    fadt->x_gpe0_blk.addrl = fadt->gpe0_blk;
    fadt->x_gpe0_blk.addrh = 0;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;
 }

unsigned long southbridge_write_acpi_tables(const struct device *device,
diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c
index 796e770..e14a5aa 100644
--- a/src/soc/intel/icelake/acpi.c
+++ b/src/soc/intel/icelake/acpi.c
@@ -162,7 +162,7 @@

fadt->pm_tmr_blk = pmbase + PM1_TMR;
    fadt->pm_tmr_len = 4;
-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
diff --git a/src/soc/intel/jasperlake/acpi.c b/src/soc/intel/jasperlake/acpi.c
index 88ec5fe..63c8fb0 100644
--- a/src/soc/intel/jasperlake/acpi.c
+++ b/src/soc/intel/jasperlake/acpi.c
@@ -163,7 +163,7 @@

fadt->pm_tmr_blk = pmbase + PM1_TMR;
    fadt->pm_tmr_len = 4;
-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = 0;
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 6ff836a..3636d45 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -271,7 +271,7 @@
    if (config->s0ix_enable)
    	fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.bit_offset = 0;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
@@ -279,42 +279,42 @@
    fadt->reset_reg.addrh = 0;
    fadt->reset_value = 6;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.bit_offset = 0;
    fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
    fadt->x_pm1a_evt_blk.addrh = 0x0;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_evt_blk.bit_width = 0;
    fadt->x_pm1b_evt_blk.bit_offset = 0;
    fadt->x_pm1b_evt_blk.access_size = 0;
    fadt->x_pm1b_evt_blk.addrl = 0x0;
    fadt->x_pm1b_evt_blk.addrh = 0x0;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.bit_offset = 0;
    fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
    fadt->x_pm1a_cnt_blk.addrh = 0x0;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_cnt_blk.bit_width = 0;
    fadt->x_pm1b_cnt_blk.bit_offset = 0;
    fadt->x_pm1b_cnt_blk.access_size = 0;
    fadt->x_pm1b_cnt_blk.addrl = 0x0;
    fadt->x_pm1b_cnt_blk.addrh = 0x0;

-	fadt->x_pm2_cnt_blk.space_id = 1;
+	fadt->x_pm2_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm2_cnt_blk.bit_width = fadt->pm2_cnt_len * 8;
    fadt->x_pm2_cnt_blk.bit_offset = 0;
    fadt->x_pm2_cnt_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_pm2_cnt_blk.addrl = pmbase + PM2_CNT;
    fadt->x_pm2_cnt_blk.addrh = 0x0;

-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
@@ -334,7 +334,7 @@
    fadt->x_gpe0_blk.addrl = fadt->gpe0_blk;
    fadt->x_gpe0_blk.addrh = 0;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe1_blk.bit_width = 0;
    fadt->x_gpe1_blk.bit_offset = 0;
    fadt->x_gpe1_blk.access_size = 0;
diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c
index 0991134..edeb55e 100644
--- a/src/soc/intel/tigerlake/acpi.c
+++ b/src/soc/intel/tigerlake/acpi.c
@@ -163,7 +163,7 @@

fadt->pm_tmr_blk = pmbase + PM1_TMR;
    fadt->pm_tmr_len = 4;
-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c
index abaa453..99c58e7 100644
--- a/src/soc/intel/xeon_sp/cpx/acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/acpi.c
@@ -302,25 +302,25 @@
    fadt->flags = ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | ACPI_FADT_C2_MP_SUPPORTED |
    		ACPI_FADT_RESET_REGISTER | ACPI_FADT_PLATFORM_CLOCK;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.addrl = RST_CNT;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->reset_value = RST_CPU | SYS_RST;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;

if (permanent_smi_handler()) {
    	fadt->smi_cmd = APM_CNT;
diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c
index 3da2025..128122c 100644
--- a/src/soc/intel/xeon_sp/skx/acpi.c
+++ b/src/soc/intel/xeon_sp/skx/acpi.c
@@ -375,7 +375,7 @@
    		ACPI_FADT_RESET_REGISTER | ACPI_FADT_SEALED_CASE |
    		ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK;

-	fadt->reset_reg.space_id = 1;
+	fadt->reset_reg.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->reset_reg.bit_width = 8;
    fadt->reset_reg.bit_offset = 0;
    fadt->reset_reg.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
@@ -383,42 +383,42 @@
    fadt->reset_reg.addrh = 0;
    fadt->reset_value = 6;

-	fadt->x_pm1a_evt_blk.space_id = 1;
+	fadt->x_pm1a_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_evt_blk.bit_width = fadt->pm1_evt_len * 8;
    fadt->x_pm1a_evt_blk.bit_offset = 0;
    fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
    fadt->x_pm1a_evt_blk.addrl = pmbase + PM1_STS;
    fadt->x_pm1a_evt_blk.addrh = 0x0;

-	fadt->x_pm1b_evt_blk.space_id = 1;
+	fadt->x_pm1b_evt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_evt_blk.bit_width = 0;
    fadt->x_pm1b_evt_blk.bit_offset = 0;
    fadt->x_pm1b_evt_blk.access_size = 0;
    fadt->x_pm1b_evt_blk.addrl = 0x0;
    fadt->x_pm1b_evt_blk.addrh = 0x0;

-	fadt->x_pm1a_cnt_blk.space_id = 1;
+	fadt->x_pm1a_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1a_cnt_blk.bit_width = fadt->pm1_cnt_len * 8;
    fadt->x_pm1a_cnt_blk.bit_offset = 0;
    fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS;
    fadt->x_pm1a_cnt_blk.addrl = pmbase + PM1_CNT;
    fadt->x_pm1a_cnt_blk.addrh = 0x0;

-	fadt->x_pm1b_cnt_blk.space_id = 1;
+	fadt->x_pm1b_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm1b_cnt_blk.bit_width = 0;
    fadt->x_pm1b_cnt_blk.bit_offset = 0;
    fadt->x_pm1b_cnt_blk.access_size = 0;
    fadt->x_pm1b_cnt_blk.addrl = 0x0;
    fadt->x_pm1b_cnt_blk.addrh = 0x0;

-	fadt->x_pm2_cnt_blk.space_id = 1;
+	fadt->x_pm2_cnt_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm2_cnt_blk.bit_width = fadt->pm2_cnt_len * 8;
    fadt->x_pm2_cnt_blk.bit_offset = 0;
    fadt->x_pm2_cnt_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS;
    fadt->x_pm2_cnt_blk.addrl = pmbase + PM2_CNT;
    fadt->x_pm2_cnt_blk.addrh = 0x0;

-	fadt->x_pm_tmr_blk.space_id = 1;
+	fadt->x_pm_tmr_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_pm_tmr_blk.bit_width = fadt->pm_tmr_len * 8;
    fadt->x_pm_tmr_blk.bit_offset = 0;
    fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS;
@@ -432,7 +432,7 @@
    fadt->x_gpe0_blk.addrl = fadt->gpe0_blk;
    fadt->x_gpe0_blk.addrh = 0;

-	fadt->x_gpe1_blk.space_id = 1;
+	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO;
    fadt->x_gpe1_blk.bit_width = 0;
    fadt->x_gpe1_blk.bit_offset = 0;
    fadt->x_gpe1_blk.access_size = 0;

Change in coreboot[master]: src/soc: Use macro for space_id

[HAOUAS Elyes (Code Review)]

Hello Andrey Petrov, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42718

to look at the new patch set (#2).

Change subject: src/soc: Use macro for space_id
......................................................................

src/soc: Use macro for space_id

Change-Id: I5be96a420a204050e065b36efecffc7cb5e3a560
Signed-off-by: Elyes HAOUAS 
---
M src/soc/intel/apollolake/acpi.c
M src/soc/intel/baytrail/acpi.c
M src/soc/intel/braswell/acpi.c
M src/soc/intel/broadwell/acpi.c
M src/soc/intel/cannonlake/acpi.c
M src/soc/intel/common/block/acpi/acpi.c
M src/soc/intel/icelake/acpi.c
M src/soc/intel/jasperlake/acpi.c
M src/soc/intel/skylake/acpi.c
M src/soc/intel/tigerlake/acpi.c
M src/soc/intel/xeon_sp/cpx/acpi.c
M src/soc/intel/xeon_sp/skx/acpi.c
12 files changed, 59 insertions(+), 59 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/42718/2

Change in coreboot[master]: src/soc: Use macro for space_id

[HAOUAS Elyes (Code Review)]

Hello build bot (Jenkins), Andrey Petrov, Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/42718

to look at the new patch set (#3).

Change subject: src/soc: Use macro for space_id
......................................................................

src/soc: Use macro for space_id

Change-Id: I5be96a420a204050e065b36efecffc7cb5e3a560
Signed-off-by: Elyes HAOUAS 
---
M src/soc/intel/apollolake/acpi.c
M src/soc/intel/cannonlake/acpi.c
M src/soc/intel/icelake/acpi.c
M src/soc/intel/jasperlake/acpi.c
M src/soc/intel/tigerlake/acpi.c
5 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/42718/3

Change in coreboot[master]: src/soc: Use macro for space_id

[HAOUAS Elyes (Code Review)]

HAOUAS Elyes has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42718 )

Change subject: src/soc: Use macro for space_id
......................................................................

Abandoned