soc/intel/common/block/pmc: Fix ACPI BAR and PCI_COMMAND in PMC config space
read_resources in common/block/pmc/pmc.c is corrupting the BAR at offset 0x20. pch_pmc_read_resources | pci_dev_read_resources | pci_get_resource Within pci_get_resource, the BAR is read and written back. Since read of ACPI BAR does not return the correct value, the subsequent write corrupts the BAR. Hence re-programming the BAR. Also, reading PMC STATUSCOMMAND register does not return bit 0 correctly in pci_dev_enable_resources. This causes IO SPACE ACCESS to get disabled. Hence making sure IO ACCESS gets enabled by setting dev->command TEST=Can boot to OS Without this change coreboot will be stuck at "Disabling ACPI via APMC:" Change-Id: I27062419d06127951ecbbb641835d06ca39ff435 Signed-off-by: Hannah Williams <hannah.williams@intel.com> Reviewed-on: https://review.coreboot.org/23230 Reviewed-by: Subrata Banik <subrata.banik@intel.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
8b40b675a8
commit
1177bf5165
|
@ -57,6 +57,7 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select PCIEX_LENGTH_256MB
|
||||
select POSTCAR_CONSOLE
|
||||
select POSTCAR_STAGE
|
||||
select PMC_INVALID_READ_AFTER_WRITE
|
||||
select REG_SCRIPT
|
||||
select RELOCATABLE_RAMSTAGE # Build fails if this is not selected
|
||||
select RTC
|
||||
|
|
|
@ -30,3 +30,10 @@ config POWER_STATE_PREVIOUS_AFTER_FAILURE
|
|||
power
|
||||
|
||||
endchoice
|
||||
|
||||
config PMC_INVALID_READ_AFTER_WRITE
|
||||
bool
|
||||
default n
|
||||
help
|
||||
Enable this for PMC devices where a read back of ACPI BAR and
|
||||
IO access bit does not return the previously written value.
|
||||
|
|
|
@ -65,6 +65,23 @@ static void pch_pmc_add_io_resources(struct device *dev,
|
|||
cfg->abase_addr, cfg->abase_size,
|
||||
IORESOURCE_IO | IORESOURCE_ASSIGNED |
|
||||
IORESOURCE_FIXED);
|
||||
if (IS_ENABLED(CONFIG_PMC_INVALID_READ_AFTER_WRITE)) {
|
||||
/*
|
||||
* The ACPI IO BAR (offset 0x20) is not PCI compliant. We've
|
||||
* observed cases where the BAR reads back as 0, but the IO
|
||||
* window is open. This also means that it will not respond
|
||||
* to PCI probing.
|
||||
*/
|
||||
pci_write_config16(dev, cfg->abase_offset, cfg->abase_addr);
|
||||
/*
|
||||
* In pci_dev_enable_resources, reading IO SPACE ACCESS bit in
|
||||
* STATUSCOMMAND register does not read back the written
|
||||
* value correctly, hence IO access gets disabled. This is
|
||||
* seen in some PMC devices, hence this code makes sure
|
||||
* IO access is available.
|
||||
*/
|
||||
dev->command |= PCI_COMMAND_IO;
|
||||
}
|
||||
}
|
||||
|
||||
static void pch_pmc_read_resources(struct device *dev)
|
||||
|
|
Loading…
Reference in New Issue