diff options
| author | Alexandru Gagniuc <alexandrux.gagniuc@intel.com> | 2016-04-06 10:49:55 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-05-12 04:54:30 +0200 |
| commit | 717dccc3ee7d7f2f25386476b5ef30d8ce3effa4 (patch) | |
| tree | f903b4bbb672832df3caf9130e0280efd790aa99 /src/soc | |
| parent | c364019486bbdf960d1b217bb87f8ccbb59bc591 (diff) | |
soc/apollolake: Handle non-standard ACPI BAR in PMC device
The ACPI BAR (BAR2 - offset 0x20) is not PCI compliant. That means
that probing may not work. In that case, a resource still needs to be
created for the BAR.
BONUS: We now avoid the need to declare the MMIO resources as fixed.
Change-Id: I52fd2d2718ac8013067aaa450c5eb31e00738ab9
Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc@intel.com>
Reviewed-on: https://review.coreboot.org/14634
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/apollolake/include/soc/iomap.h | 1 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/pmc.c | 33 |
2 files changed, 15 insertions, 19 deletions
diff --git a/src/soc/intel/apollolake/include/soc/iomap.h b/src/soc/intel/apollolake/include/soc/iomap.h index 27f09cc4b6..e676ba5a7f 100644 --- a/src/soc/intel/apollolake/include/soc/iomap.h +++ b/src/soc/intel/apollolake/include/soc/iomap.h @@ -23,6 +23,7 @@ #define MCH_BASE_SIZE (32 * KiB) #define ACPI_PMIO_BASE 0x400 +#define ACPI_PMIO_SIZE 0x100 #define R_ACPI_PM1_TMR 0x8 /* Accesses to these BARs are hardcoded in FSP */ diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c index 0251e7cf61..8cf9843924 100644 --- a/src/soc/intel/apollolake/pmc.c +++ b/src/soc/intel/apollolake/pmc.c @@ -1,7 +1,8 @@ /* * This file is part of the coreboot project. * - * Copyright (C) 2015-2016 Intel Corp. + * Copyright (C) 2016 Intel Corp. + * (Written by Alexandru Gagniuc <alexandrux.gagniuc@intel.com> for Intel Corp.) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,39 +15,33 @@ * GNU General Public License for more details. */ -#include <console/console.h> -#include <cpu/cpu.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> #include <soc/iomap.h> #include <soc/pci_ids.h> -static void pmc_init(device_t dev) -{ - printk(BIOS_SPEW, "%s/%s ( %s )\n", - __FILE__, __func__, dev_name(dev)); -} - -static void pmc_read_resources(device_t dev) +/* + * 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. In the event that probing the BAR + * fails, we still need to create a resource for it. + */ +static void read_resources(device_t dev) { struct resource *res; - - mmio_resource(dev, PCI_BASE_ADDRESS_0, PMC_BAR0/KiB, 1); - mmio_resource(dev, PCI_BASE_ADDRESS_2, PMC_BAR1/KiB, 2); + pci_dev_read_resources(dev); res = new_resource(dev, PCI_BASE_ADDRESS_4); res->base = ACPI_PMIO_BASE; - res->size = KiB; + res->size = ACPI_PMIO_SIZE; res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; } static const struct device_operations device_ops = { - .read_resources = pmc_read_resources, - .set_resources = DEVICE_NOOP, - .enable_resources = DEVICE_NOOP, - .init = pmc_init, - .enable = DEVICE_NOOP, + .read_resources = read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, }; static const struct pci_driver pmc __pci_driver = { |