ACPI: Add helper fill_fadt_extended_pm_io()
Once platform code has filled in the (legacy) ACPI PM register map, added function will fill in the extended entries in FADT. TEST=samsung/lumpy and amd/mandolin FADT stays unchanged. Change-Id: I90925fce35458cf5480bfefc7cdddebd41b42058 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/74913 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
		| @@ -14,6 +14,7 @@ ramstage-$(CONFIG_ACPI_SOC_NVS) += gnvs.c | ||||
| ramstage-y += pld.c | ||||
| ramstage-y += sata.c | ||||
| ramstage-y += soundwire.c | ||||
| ramstage-y += fadt_filler.c | ||||
|  | ||||
| all-y += acpi_pm.c | ||||
| smm-y += acpi_pm.c | ||||
|   | ||||
							
								
								
									
										72
									
								
								src/acpi/fadt_filler.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										72
									
								
								src/acpi/fadt_filler.c
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,72 @@ | ||||
| /* SPDX-License-Identifier: GPL-2.0-only */ | ||||
|  | ||||
| #include <acpi/acpi.h> | ||||
| #include <console/console.h> | ||||
| #include <stdint.h> | ||||
|  | ||||
| static void fill_x_pm_io(acpi_addr_t *x_pm_blk, int access_size, uint16_t ioport, uint8_t len) | ||||
| { | ||||
| 	x_pm_blk->space_id = ACPI_ADDRESS_SPACE_IO; | ||||
| 	x_pm_blk->bit_width = len * 8; | ||||
| 	x_pm_blk->bit_offset = 0; | ||||
| 	x_pm_blk->access_size = access_size; | ||||
| 	x_pm_blk->addrl = ioport; | ||||
| 	x_pm_blk->addrh = 0x0; | ||||
| } | ||||
|  | ||||
| static void do_sanity_error(const char *func, const int line) | ||||
| { | ||||
| 	printk(BIOS_ERR, "ACPI: FADT error detected, %s line %d.\n", func, line); | ||||
| } | ||||
|  | ||||
| #define fadt_sanity(x)	do { if (!(x)) do_sanity_error(__func__, __LINE__); } while (0) | ||||
|  | ||||
| void fill_fadt_extended_pm_io(acpi_fadt_t *fadt) | ||||
| { | ||||
| 	fadt_sanity(fadt->pm1a_evt_blk && (fadt->pm1_evt_len >= 4)); | ||||
|  | ||||
| 	/* Upper word is reserved and Linux complains about 32 bit. */ | ||||
| 	fadt_sanity(fadt->pm1a_cnt_blk && (fadt->pm1_cnt_len == 2)); | ||||
|  | ||||
| 	fill_x_pm_io(&fadt->x_pm1a_evt_blk, ACPI_ACCESS_SIZE_WORD_ACCESS, | ||||
| 		     fadt->pm1a_evt_blk, fadt->pm1_evt_len); | ||||
|  | ||||
| 	fill_x_pm_io(&fadt->x_pm1a_cnt_blk, ACPI_ACCESS_SIZE_WORD_ACCESS, | ||||
| 		     fadt->pm1a_cnt_blk, fadt->pm1_cnt_len); | ||||
|  | ||||
| 	if (fadt->pm1b_evt_blk) | ||||
| 		fill_x_pm_io(&fadt->x_pm1b_evt_blk, ACPI_ACCESS_SIZE_WORD_ACCESS, | ||||
| 			     fadt->pm1b_evt_blk, fadt->pm1_evt_len); | ||||
|  | ||||
| 	if (fadt->pm1b_cnt_blk) | ||||
| 		fill_x_pm_io(&fadt->x_pm1b_cnt_blk, ACPI_ACCESS_SIZE_WORD_ACCESS, | ||||
| 			     fadt->pm1b_cnt_blk, fadt->pm1_cnt_len); | ||||
|  | ||||
| 	if (fadt->pm_tmr_blk) { | ||||
| 		fadt_sanity(fadt->pm_tmr_len == 4); | ||||
| 		fill_x_pm_io(&fadt->x_pm_tmr_blk, ACPI_ACCESS_SIZE_DWORD_ACCESS, | ||||
| 			     fadt->pm_tmr_blk, fadt->pm_tmr_len); | ||||
| 	} | ||||
|  | ||||
| 	if (fadt->pm2_cnt_blk) | ||||
| 		fill_x_pm_io(&fadt->x_pm2_cnt_blk, ACPI_ACCESS_SIZE_BYTE_ACCESS, | ||||
| 			     fadt->pm2_cnt_blk, fadt->pm2_cnt_len); | ||||
|  | ||||
| 	/* | ||||
| 	 * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5. | ||||
| 	 * The bit_width field intentionally overflows here. | ||||
| 	 * The OSPM can instead use the values in `fadt->gpe0_blk{,_len}`, which | ||||
| 	 * seems to work fine on Linux 5.0 and Windows 10. | ||||
| 	 * | ||||
| 	 * FIXME: GPE1_BASE is not initialised. | ||||
| 	 * | ||||
| 	 */ | ||||
|  | ||||
| 	if (fadt->gpe0_blk) | ||||
| 		fill_x_pm_io(&fadt->x_gpe0_blk, ACPI_ACCESS_SIZE_BYTE_ACCESS, | ||||
| 			     fadt->gpe0_blk, fadt->gpe0_blk_len); | ||||
|  | ||||
| 	if (fadt->gpe1_blk) | ||||
| 		fill_x_pm_io(&fadt->x_gpe1_blk, ACPI_ACCESS_SIZE_BYTE_ACCESS, | ||||
| 			     fadt->gpe1_blk, fadt->gpe1_blk_len); | ||||
| } | ||||
| @@ -1537,6 +1537,8 @@ void arch_fill_fadt(acpi_fadt_t *fadt); | ||||
| void soc_fill_fadt(acpi_fadt_t *fadt); | ||||
| void mainboard_fill_fadt(acpi_fadt_t *fadt); | ||||
|  | ||||
| void fill_fadt_extended_pm_io(acpi_fadt_t *fadt); | ||||
|  | ||||
| void acpi_fill_gnvs(void); | ||||
| void acpi_fill_cnvs(void); | ||||
|  | ||||
|   | ||||
| @@ -95,33 +95,7 @@ void acpi_clear_pm_gpe_status(void) | ||||
|  | ||||
| void fill_fadt_extended_pm_regs(acpi_fadt_t *fadt) | ||||
| { | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
| } | ||||
|  | ||||
| int acpi_get_sleep_type(void) | ||||
|   | ||||
| @@ -155,12 +155,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_blk = pmbase + PM1_TMR; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	if (config->s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|   | ||||
| @@ -103,14 +103,9 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_len = 4; | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	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.addrh = 0x0; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.access_size = ACPI_ACCESS_SIZE_DWORD_ACCESS; | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	if (cfg->lpss_s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|   | ||||
| @@ -20,6 +20,9 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm2_cnt_len = 1; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 2 * (GPE0_EN - GPE0_STS); | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | | ||||
| @@ -27,44 +30,4 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 			ACPI_FADT_SEALED_CASE | ACPI_FADT_S4_RTC_WAKE | | ||||
| 			ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* | ||||
| 	 * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5. | ||||
| 	 * The bit_width field intentionally overflows here. | ||||
| 	 * 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 = 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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -21,51 +21,13 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm2_cnt_len = 1; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 2 * (GPE0_EN - GPE0_STS); | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | | ||||
| 			ACPI_FADT_SLEEP_BUTTON | | ||||
| 			ACPI_FADT_SEALED_CASE | ACPI_FADT_S4_RTC_WAKE | | ||||
| 			ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* | ||||
| 	 * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5. | ||||
| 	 * The bit_width field intentionally overflows here. | ||||
| 	 * 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 = 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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -20,6 +20,9 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm2_cnt_len = 1; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 32; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | | ||||
| @@ -28,45 +31,4 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 		       ACPI_FADT_SEALED_CASE | | ||||
| 		       ACPI_FADT_S4_RTC_WAKE | | ||||
| 		       ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* | ||||
| 	 * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5. | ||||
| 	 * The bit_width field intentionally overflows here. | ||||
| 	 * 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 = 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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -154,12 +154,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_blk = pmbase + PM1_TMR; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	if (config->s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|   | ||||
| @@ -105,6 +105,7 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	/* GPE0 STS/EN pairs each 32 bits wide. */ | ||||
| 	fadt->gpe0_blk_len = 2 * GPE0_REG_MAX * sizeof(uint32_t); | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | | ||||
| 			ACPI_FADT_SLEEP_BUTTON | | ||||
| @@ -112,33 +113,6 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	if (CONFIG(USE_PM_ACPI_TIMER)) | ||||
| 		fadt->flags |= ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	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.addrh = 0x0; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS; | ||||
|  | ||||
| 	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.addrh = 0x0; | ||||
| 	fadt->x_pm1a_cnt_blk.addrl = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.access_size = ACPI_ACCESS_SIZE_WORD_ACCESS; | ||||
|  | ||||
| 	/* | ||||
| 	 * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5. | ||||
| 	 * The bit_width field intentionally overflows here. | ||||
| 	 * 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 = 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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|  | ||||
| unsigned long southbridge_write_acpi_tables(const struct device *device, | ||||
|   | ||||
| @@ -97,21 +97,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	/* PM2 Control Registers */ | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* PM1 Timer Register */ | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
| 	/* PM Extended Registers */ | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
| } | ||||
|  | ||||
| static acpi_tstate_t denverton_tss_table[] = { | ||||
|   | ||||
| @@ -153,12 +153,9 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_blk = pmbase + PM1_TMR; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->preferred_pm_profile = PM_MOBILE; | ||||
|  | ||||
| 	if (config->s0ix_enable) | ||||
|   | ||||
| @@ -153,12 +153,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_blk = pmbase + PM1_TMR; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	if (config->s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|   | ||||
| @@ -156,12 +156,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_blk = pmbase + PM1_TMR; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	if (config->s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|   | ||||
| @@ -16,6 +16,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm2_cnt_len = 1; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_FREE; | ||||
| 	if (!CONFIG(NO_FADT_8042)) | ||||
| 		fadt->iapc_boot_arch |= ACPI_FADT_8042; | ||||
| @@ -23,17 +25,5 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	if (config->s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -153,12 +153,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->pm_tmr_blk = pmbase + PM1_TMR; | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	if (config->s0ix_enable) | ||||
| 		fadt->flags |= ACPI_FADT_LOW_PWR_IDLE_S0; | ||||
|   | ||||
| @@ -50,22 +50,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	/* PM2 Control Registers */ | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* PM1 Timer Register */ | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* PM Extended Registers */ | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
| } | ||||
|  | ||||
| void uncore_inject_dsdt(const struct device *device) | ||||
|   | ||||
| @@ -49,35 +49,8 @@ void soc_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm2_cnt_blk = pmbase + PM2_CNT; | ||||
| 	fadt->pm2_cnt_len = 1; | ||||
|  | ||||
| 	/* PM2 Control Registers */ | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* PM1 Timer Register */ | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
|  | ||||
| 	fadt->x_gpe1_blk.space_id = ACPI_ADDRESS_SPACE_IO; | ||||
| 	fadt->x_gpe1_blk.bit_width = fadt->gpe1_blk_len * 8; | ||||
| 	fadt->x_gpe1_blk.bit_offset = 0; | ||||
| 	fadt->x_gpe1_blk.access_size = ACPI_ACCESS_SIZE_BYTE_ACCESS; | ||||
| 	fadt->x_gpe1_blk.addrl = fadt->gpe1_blk; | ||||
| 	fadt->x_gpe1_blk.addrh = 0x0; | ||||
| 	/* PM Extended Registers */ | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
| } | ||||
|  | ||||
| static void create_dsdt_iou_pci_resource(uint8_t socket, uint8_t stack, const STACK_RES *ri, | ||||
|   | ||||
| @@ -36,6 +36,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm_tmr_len = 4;	/* 32 bits */ | ||||
| 	fadt->gpe0_blk_len = 8;	/* 64 bits */ | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->duty_offset = 1;	/* CLK_VAL bits 3:1 */ | ||||
| 	fadt->duty_width = 3;	/* CLK_VAL bits 3:1 */ | ||||
| 	fadt->iapc_boot_arch = FADT_BOOT_ARCH;	/* See table 5-10 */ | ||||
| @@ -52,32 +54,4 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	fadt->x_firmware_ctl_l = 0;	/* set to 0 if firmware_ctrl is used */ | ||||
| 	fadt->x_firmware_ctl_h = 0; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -24,6 +24,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 16; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | | ||||
| @@ -32,42 +34,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 			ACPI_FADT_SEALED_CASE | | ||||
| 			ACPI_FADT_S4_RTC_WAKE | | ||||
| 			ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	if (chip->docking_supported) { | ||||
| 		fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED; | ||||
| 	} | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -29,6 +29,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 4; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	/* | ||||
| 	 * bit  meaning | ||||
| 	 * 0    1: We have user-visible legacy devices | ||||
| @@ -90,32 +92,4 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	 */ | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | ACPI_FADT_SLEEP_BUTTON | | ||||
| 		       ACPI_FADT_S4_RTC_WAKE; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -18,36 +18,10 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 8; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | ACPI_FADT_SLEEP_BUTTON | | ||||
| 			ACPI_FADT_S4_RTC_WAKE | ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -33,45 +33,13 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	else | ||||
| 		fadt->duty_width = 0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_8042 | ACPI_FADT_LEGACY_DEVICES; | ||||
| 	fadt->flags |= (ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | ||||
| 		       | ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_S4_RTC_WAKE | ||||
| 		       | ACPI_FADT_PLATFORM_CLOCK | ACPI_FADT_C2_MP_SUPPORTED); | ||||
|  | ||||
| 	if (chip->docking_supported) | ||||
| 		fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -26,43 +26,10 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->duty_offset = 1; | ||||
| 	fadt->duty_width = 3; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_FREE; | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | | ||||
| 			ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_S4_RTC_WAKE | | ||||
| 			ACPI_FADT_DOCKING_SUPPORTED | ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -26,43 +26,10 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->duty_offset = 1; | ||||
| 	fadt->duty_width = 0; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_8042 | ACPI_FADT_LEGACY_DEVICES; | ||||
| 	fadt->flags |= (ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED | ||||
| 		       | ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_S4_RTC_WAKE | ||||
| 		       | ACPI_FADT_PLATFORM_CLOCK | ACPI_FADT_C2_MP_SUPPORTED); | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -24,6 +24,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	fadt->pm_tmr_len = 4; | ||||
| 	fadt->gpe0_blk_len = 16; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042; | ||||
|  | ||||
| 	fadt->flags |= ACPI_FADT_WBINVD | | ||||
| @@ -31,42 +33,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 			ACPI_FADT_SLEEP_BUTTON | | ||||
| 			ACPI_FADT_S4_RTC_WAKE | | ||||
| 			ACPI_FADT_PLATFORM_CLOCK; | ||||
|  | ||||
| 	if (chip->docking_supported) { | ||||
| 		fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED; | ||||
| 	} | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
| @@ -21,6 +21,8 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
| 	else | ||||
| 		fadt->gpe0_blk = pmbase + GPE0_STS; | ||||
|  | ||||
| 	fill_fadt_extended_pm_io(fadt); | ||||
|  | ||||
| 	/* | ||||
| 	 * Some of the lengths here are doubled. This is because they describe | ||||
| 	 * blocks containing two registers, where the size of each register | ||||
| @@ -47,45 +49,4 @@ void acpi_fill_fadt(acpi_fadt_t *fadt) | ||||
|  | ||||
| 	if (cfg && cfg->docking_supported) | ||||
| 		fadt->flags |= ACPI_FADT_DOCKING_SUPPORTED; | ||||
|  | ||||
| 	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_WORD_ACCESS; | ||||
| 	fadt->x_pm1a_evt_blk.addrl = fadt->pm1a_evt_blk; | ||||
| 	fadt->x_pm1a_evt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm1a_cnt_blk; | ||||
| 	fadt->x_pm1a_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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 = fadt->pm2_cnt_blk; | ||||
| 	fadt->x_pm2_cnt_blk.addrh = 0x0; | ||||
|  | ||||
| 	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; | ||||
| 	fadt->x_pm_tmr_blk.addrl = fadt->pm_tmr_blk; | ||||
| 	fadt->x_pm_tmr_blk.addrh = 0x0; | ||||
|  | ||||
| 	/* | ||||
| 	 * Windows 10 requires x_gpe0_blk to be set starting with FADT revision 5. | ||||
| 	 * The bit_width field intentionally overflows here. | ||||
| 	 * 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 = 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 = fadt->gpe0_blk; | ||||
| 	fadt->x_gpe0_blk.addrh = 0x0; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user