GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandru Gagniuc 2016-04-06 10:49:55 -07:00 committed by Aaron Durbin
parent c364019486
commit 717dccc3ee
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/apollolake/include/soc/iomap.h
View File

@ -23,6 +23,7 @@
#define MCH_BASE_SIZE (32 * KiB) #define MCH_BASE_SIZE (32 * KiB)
#define ACPI_PMIO_BASE 0x400 #define ACPI_PMIO_BASE 0x400
#define ACPI_PMIO_SIZE 0x100
#define R_ACPI_PM1_TMR 0x8 #define R_ACPI_PM1_TMR 0x8
/* Accesses to these BARs are hardcoded in FSP */ /* Accesses to these BARs are hardcoded in FSP */

33
src/soc/intel/apollolake/pmc.c
View File

@ -1,7 +1,8 @@
/* /*
* This file is part of the coreboot project. * 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 * 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 * it under the terms of the GNU General Public License as published by
@ -14,39 +15,33 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <console/console.h>
#include <cpu/cpu.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/pci_ids.h> #include <soc/pci_ids.h>
static void pmc_init(device_t dev) /*
{ * The ACPI IO BAR (offset 0x20) is not PCI compliant. We've observed cases
printk(BIOS_SPEW, "%s/%s ( %s )\n", * where the BAR reads back as 0, but the IO window is open. This also means
__FILE__, __func__, dev_name(dev)); * 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 pmc_read_resources(device_t dev) static void read_resources(device_t dev)
{ {
struct resource *res; struct resource *res;
pci_dev_read_resources(dev);
mmio_resource(dev, PCI_BASE_ADDRESS_0, PMC_BAR0/KiB, 1);
mmio_resource(dev, PCI_BASE_ADDRESS_2, PMC_BAR1/KiB, 2);
res = new_resource(dev, PCI_BASE_ADDRESS_4); res = new_resource(dev, PCI_BASE_ADDRESS_4);
res->base = ACPI_PMIO_BASE; res->base = ACPI_PMIO_BASE;
res->size = KiB; res->size = ACPI_PMIO_SIZE;
res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
} }
static const struct device_operations device_ops = { static const struct device_operations device_ops = {
.read_resources = pmc_read_resources, .read_resources = read_resources,
.set_resources = DEVICE_NOOP, .set_resources = pci_dev_set_resources,
.enable_resources = DEVICE_NOOP, .enable_resources = pci_dev_enable_resources,
.init = pmc_init,
.enable = DEVICE_NOOP,
}; };
static const struct pci_driver pmc __pci_driver = { static const struct pci_driver pmc __pci_driver = {