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

soc/apollolake/lpc: Allow configuring SERIRQ via devicetree 

Every other SOC uses a CONFIG_* flag to enable or disable SERIRQ
continuous mode. Why they do that is beyond me, but the way we
implement it on apollolake is via devicetree.

Change-Id: I6e05758e5e264c6b0015467dd25add3bffe2b040
Signed-off-by: Alexandru Gagniuc <alexandrux.gagniuc@intel.com>
Reviewed-on: https://review.coreboot.org/14586
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Alexandru Gagniuc 2016-04-04 10:47:49 -07:00 committed by Martin Roth
parent 665fca156c
commit 3aa34a8167
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/soc/intel/apollolake/chip.h
View File

@ -20,6 +20,13 @@
#define CLKREQ_DISABLED 0xf #define CLKREQ_DISABLED 0xf
/* Serial IRQ control. SERIRQ_QUIET is the default (0). */
enum serirq_mode {
SERIRQ_QUIET,
SERIRQ_CONTINUOUS,
SERIRQ_OFF,
};
struct soc_intel_apollolake_config { struct soc_intel_apollolake_config {
/* /*
* Mapping from PCIe root port to CLKREQ input on the SOC. The SOC has * Mapping from PCIe root port to CLKREQ input on the SOC. The SOC has
@ -32,6 +39,9 @@ struct soc_intel_apollolake_config {
uint8_t pcie_rp3_clkreq_pin; uint8_t pcie_rp3_clkreq_pin;
uint8_t pcie_rp4_clkreq_pin; uint8_t pcie_rp4_clkreq_pin;
uint8_t pcie_rp5_clkreq_pin; uint8_t pcie_rp5_clkreq_pin;
/* Configure serial IRQ (SERIRQ) line. */
enum serirq_mode serirq_mode;
}; };
#endif /* _SOC_APOLLOLAKE_CHIP_H_ */ #endif /* _SOC_APOLLOLAKE_CHIP_H_ */

24
src/soc/intel/apollolake/lpc.c
View File

@ -15,6 +15,7 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <console/console.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>
@ -22,6 +23,8 @@
#include <soc/lpc.h> #include <soc/lpc.h>
#include <soc/pci_ids.h> #include <soc/pci_ids.h>
#include "chip.h"
/* /*
* SCOPE: * SCOPE:
* The purpose of this driver is to eliminate manual resource allocation for * The purpose of this driver is to eliminate manual resource allocation for
@ -40,6 +43,26 @@
* opens up IO and memory windows as needed. * opens up IO and memory windows as needed.
*/ */
static void lpc_init(struct device *dev)
{
uint8_t scnt;
struct soc_intel_apollolake_config *cfg;
cfg = dev->chip_info;
if (!cfg) {
printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
return;
}
scnt = pci_read_config8(dev, REG_SERIRQ_CTL);
scnt &= ~(SCNT_EN | SCNT_MODE);
if (cfg->serirq_mode == SERIRQ_QUIET)
scnt |= SCNT_EN;
else if (cfg->serirq_mode == SERIRQ_CONTINUOUS);
scnt |= SCNT_EN | SCNT_MODE;
pci_write_config8(dev, REG_SERIRQ_CTL, scnt);
}
static void soc_lpc_add_io_resources(device_t dev) static void soc_lpc_add_io_resources(device_t dev)
{ {
struct resource *res; struct resource *res;
@ -116,6 +139,7 @@ static struct device_operations device_ops = {
.enable_resources = &pci_dev_enable_resources, .enable_resources = &pci_dev_enable_resources,
.write_acpi_tables = southbridge_write_acpi_tables, .write_acpi_tables = southbridge_write_acpi_tables,
.acpi_inject_dsdt_generator = southbridge_inject_dsdt, .acpi_inject_dsdt_generator = southbridge_inject_dsdt,
.init = lpc_init,
.scan_bus = scan_lpc_bus, .scan_bus = scan_lpc_bus,
}; };