sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake: Use ITSS common code

Browse Source 
This patch uses common ITSS library to setup
itss irq.

Change-Id: Ibe65a92f1604277bec229c67f4375b6636c0972d
Signed-off-by: Bora Guvendik <bora.guvendik@intel.com>
Reviewed-on: https://review.coreboot.org/19244
Reviewed-by: Subrata Banik <subrata.banik@intel.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Bora Guvendik
2017-04-11 16:05:23 -07:00
committed by Martin Roth
parent 33117ec601
commit 43c3109696
5 changed files with 22 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/skylake/Kconfig
View File

@@ -51,6 +51,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
select SOC_INTEL_COMMON_BLOCK select SOC_INTEL_COMMON_BLOCK
select SOC_INTEL_COMMON_BLOCK_GSPI select SOC_INTEL_COMMON_BLOCK_GSPI
select SOC_INTEL_COMMON_BLOCK_ITSS
select SOC_INTEL_COMMON_BLOCK_LPSS select SOC_INTEL_COMMON_BLOCK_LPSS
select SOC_INTEL_COMMON_BLOCK_PCR select SOC_INTEL_COMMON_BLOCK_PCR
select SOC_INTEL_COMMON_BLOCK_RTC select SOC_INTEL_COMMON_BLOCK_RTC

2
src/soc/intel/skylake/acpi/pch.asl
View File

@@ -15,10 +15,10 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <intelblocks/itss.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/irq.h> #include <soc/irq.h>
#include <soc/itss.h>
#include <soc/gpio_defs.h> #include <soc/gpio_defs.h>
#include <soc/gpe.h> #include <soc/gpe.h>
#include <soc/pcr_ids.h> #include <soc/pcr_ids.h>

16
src/soc/intel/skylake/bootblock/pch.c
View File

@@ -18,11 +18,11 @@
#include <chip.h> #include <chip.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <intelblocks/itss.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <intelblocks/rtc.h> #include <intelblocks/rtc.h>
#include <soc/bootblock.h> #include <soc/bootblock.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/itss.h>
#include <soc/lpc.h> #include <soc/lpc.h>
#include <soc/p2sb.h> #include <soc/p2sb.h>
#include <soc/pch.h> #include <soc/pch.h>
@@ -132,8 +132,7 @@ static void pch_interrupt_init(void)
{ {
const struct device *dev; const struct device *dev;
const config_t *config; const config_t *config;
u8 index = 0; uint8_t pch_interrupt_routing[MAX_PXRC_CONFIG];
u8 pch_interrupt_routing[MAX_PXRC_CONFIG];
dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0)); dev = dev_find_slot(0, PCI_DEVFN(PCH_DEV_SLOT_LPC, 0));
if (!dev || !dev->chip_info) if (!dev || !dev->chip_info)
@@ -149,17 +148,10 @@ static void pch_interrupt_init(void)
pch_interrupt_routing[6] = config->pirqg_routing; pch_interrupt_routing[6] = config->pirqg_routing;
pch_interrupt_routing[7] = config->pirqh_routing; pch_interrupt_routing[7] = config->pirqh_routing;
for (index = 0; index < MAX_PXRC_CONFIG; index++) { itss_irq_init(pch_interrupt_routing);
if (pch_interrupt_routing[index] < 16 &&
pch_interrupt_routing[index] > 2 &&
pch_interrupt_routing[index] != 8 &&
pch_interrupt_routing[index] != 13) {
pcr_write8(PID_ITSS, PCR_ITSS_PIRQA_ROUT + index,
pch_interrupt_routing[index]);
}
}
} }
static void soc_config_acpibase(void) static void soc_config_acpibase(void)
{ {
uint32_t reg32; uint32_t reg32;

24
src/soc/intel/skylake/include/soc/itss.h
View File

@@ -16,26 +16,8 @@
#ifndef SOC_INTEL_SKL_ITSS_H #ifndef SOC_INTEL_SKL_ITSS_H
#define SOC_INTEL_SKL_ITSS_H #define SOC_INTEL_SKL_ITSS_H
/* Max PXRC registers in ITSS*/ #define ITSS_MAX_IRQ 119
#define MAX_PXRC_CONFIG 0x08 #define IRQS_PER_IPC 32
#define NUM_IPC_REGS ((ITSS_MAX_IRQ + IRQS_PER_IPC - 1)/IRQS_PER_IPC)
/* PIRQA Routing Control Register*/
#define PCR_ITSS_PIRQA_ROUT 0x3100
/* PIRQB Routing Control Register*/
#define PCR_ITSS_PIRQB_ROUT 0x3101
/* PIRQC Routing Control Register*/
#define PCR_ITSS_PIRQC_ROUT 0x3102
/* PIRQD Routing Control Register*/
#define PCR_ITSS_PIRQD_ROUT 0x3103
/* PIRQE Routing Control Register*/
#define PCR_ITSS_PIRQE_ROUT 0x3104
/* PIRQF Routing Control Register*/
#define PCR_ITSS_PIRQF_ROUT 0x3105
/* PIRQG Routing Control Register*/
#define PCR_ITSS_PIRQG_ROUT 0x3106
/* PIRQH Routing Control Register*/
#define PCR_ITSS_PIRQH_ROUT 0x3107
/* ITSS Power reduction control */
#define PCR_ITSS_ITSSPRC 0x3300
#endif /* SOC_INTEL_SKL_ITSS_H */ #endif /* SOC_INTEL_SKL_ITSS_H */

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

@@ -30,13 +30,13 @@
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/smm.h> #include <cpu/x86/smm.h>
#include <cbmem.h> #include <cbmem.h>
#include <intelblocks/itss.h>
#include <intelblocks/pcr.h> #include <intelblocks/pcr.h>
#include <reg_script.h> #include <reg_script.h>
#include <string.h> #include <string.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/gpio.h> #include <soc/gpio.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/itss.h>
#include <soc/lpc.h> #include <soc/lpc.h>
#include <soc/nvs.h> #include <soc/nvs.h>
#include <soc/pch.h> #include <soc/pch.h>
@@ -98,15 +98,18 @@ static void pch_pirq_init(device_t dev)
{ {
device_t irq_dev; device_t irq_dev;
config_t *config = dev->chip_info; config_t *config = dev->chip_info;
uint8_t pch_interrupt_routing[MAX_PXRC_CONFIG];
pcr_write8(PID_ITSS, PCR_ITSS_PIRQA_ROUT, config->pirqa_routing); pch_interrupt_routing[0] = config->pirqa_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQB_ROUT, config->pirqb_routing); pch_interrupt_routing[1] = config->pirqb_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQC_ROUT, config->pirqc_routing); pch_interrupt_routing[2] = config->pirqc_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQD_ROUT, config->pirqd_routing); pch_interrupt_routing[3] = config->pirqd_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQE_ROUT, config->pirqe_routing); pch_interrupt_routing[4] = config->pirqe_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQF_ROUT, config->pirqf_routing); pch_interrupt_routing[5] = config->pirqf_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQG_ROUT, config->pirqg_routing); pch_interrupt_routing[6] = config->pirqg_routing;
pcr_write8(PID_ITSS, PCR_ITSS_PIRQH_ROUT, config->pirqh_routing); pch_interrupt_routing[7] = config->pirqh_routing;
itss_irq_init(pch_interrupt_routing);
for (irq_dev = all_devices; irq_dev; irq_dev = irq_dev->next) { for (irq_dev = all_devices; irq_dev; irq_dev = irq_dev->next) {
u8 int_pin = 0, int_line = 0; u8 int_pin = 0, int_line = 0;
@@ -159,12 +162,11 @@ static const struct reg_script pch_misc_init_script[] = {
static void clock_gate_8254(struct device *dev) static void clock_gate_8254(struct device *dev)
{ {
config_t *config = dev->chip_info; config_t *config = dev->chip_info;
const uint32_t cge8254_mask = (1 << 2);
if (!config->clock_gate_8254) if (!config->clock_gate_8254)
return; return;
pcr_rmw32(PID_ITSS, PCR_ITSS_ITSSPRC, ~cge8254_mask, cge8254_mask); itss_clock_gate_8254();
} }
static void lpc_init(struct device *dev) static void lpc_init(struct device *dev)