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

haswell: Turn RCBA configuration into a function

Browse Source 
Instead of passing around a pointer to an array, just write the relevant
registers directly. Note that intel/baskingridge used spaces to indent
line continuations and had to be replaced with tabs to quell Jenkins.

Change-Id: Ifa06a2ab24da9b8c6aac6480542fa32d04f6d6fe
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43097
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tristan Corrick <tristan@corrick.kiwi>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Angel Pons 2020-07-03 13:05:10 +02:00
parent 2cb3cc5238
commit 6e1c471f70
11 changed files with 109 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mainboard/asrock/b85m_pro4/romstage.c
View File

@ -9,18 +9,17 @@
#include <southbridge/intel/common/gpio.h> #include <southbridge/intel/common/gpio.h>
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
static const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
RCBA_SET_REG_16(D31IR, DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA)), {
RCBA_SET_REG_16(D29IR, DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC)), RCBA16(D31IR) = DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA);
RCBA_SET_REG_16(D28IR, DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA)), RCBA16(D29IR) = DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC);
RCBA_SET_REG_16(D27IR, DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD)), RCBA16(D28IR) = DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA);
RCBA_SET_REG_16(D26IR, DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD)), RCBA16(D27IR) = DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_16(D25IR, DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH)), RCBA16(D26IR) = DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD);
RCBA_SET_REG_16(D22IR, DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQB)), RCBA16(D25IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH);
RCBA_SET_REG_16(D20IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D22IR) = DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQB);
RCBA16(D20IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_END_CONFIG, }
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -74,7 +73,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.gpio_map = &mainboard_gpio_map, .gpio_map = &mainboard_gpio_map,
.rcba_config = &rcba_config[0],
}; };
romstage_common(&romstage_params); romstage_common(&romstage_params);

24
src/mainboard/asrock/h81m-hds/romstage.c
View File

@ -9,18 +9,17 @@
#include <southbridge/intel/common/gpio.h> #include <southbridge/intel/common/gpio.h>
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
static const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
RCBA_SET_REG_16(D31IR, DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA)), {
RCBA_SET_REG_16(D29IR, DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC)), RCBA16(D31IR) = DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA);
RCBA_SET_REG_16(D28IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D29IR) = DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC);
RCBA_SET_REG_16(D27IR, DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD)), RCBA16(D28IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_16(D26IR, DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD)), RCBA16(D27IR) = DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_16(D25IR, DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH)), RCBA16(D26IR) = DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD);
RCBA_SET_REG_16(D22IR, DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQB)), RCBA16(D25IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH);
RCBA_SET_REG_16(D20IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D22IR) = DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQB);
RCBA16(D20IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_END_CONFIG, }
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -74,7 +73,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.gpio_map = &mainboard_gpio_map, .gpio_map = &mainboard_gpio_map,
.rcba_config = &rcba_config[0],
}; };
romstage_common(&romstage_params); romstage_common(&romstage_params);

43
src/mainboard/google/beltino/romstage.c
View File

@ -12,8 +12,8 @@
#include <variant/gpio.h> #include <variant/gpio.h>
#include "onboard.h" #include "onboard.h"
const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
{
/* /*
* GFX INTA -> PIRQA (MSI) * GFX INTA -> PIRQA (MSI)
* D28IP_P1IP PCIE INTA -> PIRQA * D28IP_P1IP PCIE INTA -> PIRQA
@ -26,28 +26,26 @@ const struct rcba_config_instruction rcba_config[] = {
*/ */
/* Device interrupt pin register (board specific) */ /* Device interrupt pin register (board specific) */
RCBA_SET_REG_32(D31IP, (INTC << D31IP_TTIP) | (NOINT << D31IP_SIP2) | RCBA32(D31IP) = (INTC << D31IP_TTIP) | (NOINT << D31IP_SIP2) |
(INTB << D31IP_SMIP) | (INTA << D31IP_SIP)), (INTB << D31IP_SMIP) | (INTA << D31IP_SIP);
RCBA_SET_REG_32(D29IP, (INTA << D29IP_E1P)), RCBA32(D29IP) = (INTA << D29IP_E1P);
RCBA_SET_REG_32(D28IP, (INTA << D28IP_P1IP) | (INTC << D28IP_P3IP) | RCBA32(D28IP) = (INTA << D28IP_P1IP) | (INTC << D28IP_P3IP) |
(INTB << D28IP_P4IP)), (INTB << D28IP_P4IP);
RCBA_SET_REG_32(D27IP, (INTA << D27IP_ZIP)), RCBA32(D27IP) = (INTA << D27IP_ZIP);
RCBA_SET_REG_32(D26IP, (INTA << D26IP_E2P)), RCBA32(D26IP) = (INTA << D26IP_E2P);
RCBA_SET_REG_32(D22IP, (NOINT << D22IP_MEI1IP)), RCBA32(D22IP) = (NOINT << D22IP_MEI1IP);
RCBA_SET_REG_32(D20IP, (INTA << D20IP_XHCI)), RCBA32(D20IP) = (INTA << D20IP_XHCI);
/* Device interrupt route registers */ /* Device interrupt route registers */
RCBA_SET_REG_32(D31IR, DIR_ROUTE(PIRQG, PIRQC, PIRQB, PIRQA)),/* LPC */ RCBA32(D31IR) = DIR_ROUTE(PIRQG, PIRQC, PIRQB, PIRQA); /* LPC */
RCBA_SET_REG_32(D29IR, DIR_ROUTE(PIRQD, PIRQD, PIRQD, PIRQD)),/* EHCI */ RCBA32(D29IR) = DIR_ROUTE(PIRQD, PIRQD, PIRQD, PIRQD); /* EHCI */
RCBA_SET_REG_32(D28IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)),/* PCIE */ RCBA32(D28IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD); /* PCIE */
RCBA_SET_REG_32(D27IR, DIR_ROUTE(PIRQG, PIRQG, PIRQG, PIRQG)),/* HDA */ RCBA32(D27IR) = DIR_ROUTE(PIRQG, PIRQG, PIRQG, PIRQG); /* HDA */
RCBA_SET_REG_32(D22IR, DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA)),/* ME */ RCBA32(D22IR) = DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA); /* ME */
RCBA_SET_REG_32(D21IR, DIR_ROUTE(PIRQE, PIRQF, PIRQF, PIRQF)),/* SIO */ RCBA32(D21IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQF, PIRQF); /* SIO */
RCBA_SET_REG_32(D20IR, DIR_ROUTE(PIRQC, PIRQC, PIRQC, PIRQC)),/* XHCI */ RCBA32(D20IR) = DIR_ROUTE(PIRQC, PIRQC, PIRQC, PIRQC); /* XHCI */
RCBA_SET_REG_32(D23IR, DIR_ROUTE(PIRQH, PIRQH, PIRQH, PIRQH)),/* SDIO */ RCBA32(D23IR) = DIR_ROUTE(PIRQH, PIRQH, PIRQH, PIRQH); /* SDIO */
}
RCBA_END_CONFIG,
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -109,7 +107,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.gpio_map = &mainboard_gpio_map, .gpio_map = &mainboard_gpio_map,
.rcba_config = &rcba_config[0],
}; };
/* Early SuperIO setup */ /* Early SuperIO setup */

43
src/mainboard/google/slippy/romstage.c
View File

@ -7,8 +7,8 @@
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
#include "variant.h" #include "variant.h"
const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
{
/* /*
* GFX INTA -> PIRQA (MSI) * GFX INTA -> PIRQA (MSI)
* D28IP_P1IP PCIE INTA -> PIRQA * D28IP_P1IP PCIE INTA -> PIRQA
@ -21,28 +21,26 @@ const struct rcba_config_instruction rcba_config[] = {
*/ */
/* Device interrupt pin register (board specific) */ /* Device interrupt pin register (board specific) */
RCBA_SET_REG_32(D31IP, (INTC << D31IP_TTIP) | (NOINT << D31IP_SIP2) | RCBA32(D31IP) = (INTC << D31IP_TTIP) | (NOINT << D31IP_SIP2) |
(INTB << D31IP_SMIP) | (INTA << D31IP_SIP)), (INTB << D31IP_SMIP) | (INTA << D31IP_SIP);
RCBA_SET_REG_32(D29IP, (INTA << D29IP_E1P)), RCBA32(D29IP) = (INTA << D29IP_E1P);
RCBA_SET_REG_32(D28IP, (INTA << D28IP_P1IP) | (INTC << D28IP_P3IP) | RCBA32(D28IP) = (INTA << D28IP_P1IP) | (INTC << D28IP_P3IP) |
(INTB << D28IP_P4IP)), (INTB << D28IP_P4IP);
RCBA_SET_REG_32(D27IP, (INTA << D27IP_ZIP)), RCBA32(D27IP) = (INTA << D27IP_ZIP);
RCBA_SET_REG_32(D26IP, (INTA << D26IP_E2P)), RCBA32(D26IP) = (INTA << D26IP_E2P);
RCBA_SET_REG_32(D22IP, (NOINT << D22IP_MEI1IP)), RCBA32(D22IP) = (NOINT << D22IP_MEI1IP);
RCBA_SET_REG_32(D20IP, (INTA << D20IP_XHCI)), RCBA32(D20IP) = (INTA << D20IP_XHCI);
/* Device interrupt route registers */ /* Device interrupt route registers */
RCBA_SET_REG_32(D31IR, DIR_ROUTE(PIRQG, PIRQC, PIRQB, PIRQA)),/* LPC */ RCBA32(D31IR) = DIR_ROUTE(PIRQG, PIRQC, PIRQB, PIRQA); /* LPC */
RCBA_SET_REG_32(D29IR, DIR_ROUTE(PIRQD, PIRQD, PIRQD, PIRQD)),/* EHCI */ RCBA32(D29IR) = DIR_ROUTE(PIRQD, PIRQD, PIRQD, PIRQD); /* EHCI */
RCBA_SET_REG_32(D28IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)),/* PCIE */ RCBA32(D28IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD); /* PCIE */
RCBA_SET_REG_32(D27IR, DIR_ROUTE(PIRQG, PIRQG, PIRQG, PIRQG)),/* HDA */ RCBA32(D27IR) = DIR_ROUTE(PIRQG, PIRQG, PIRQG, PIRQG); /* HDA */
RCBA_SET_REG_32(D22IR, DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA)),/* ME */ RCBA32(D22IR) = DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA); /* ME */
RCBA_SET_REG_32(D21IR, DIR_ROUTE(PIRQE, PIRQF, PIRQF, PIRQF)),/* SIO */ RCBA32(D21IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQF, PIRQF); /* SIO */
RCBA_SET_REG_32(D20IR, DIR_ROUTE(PIRQC, PIRQC, PIRQC, PIRQC)),/* XHCI */ RCBA32(D20IR) = DIR_ROUTE(PIRQC, PIRQC, PIRQC, PIRQC); /* XHCI */
RCBA_SET_REG_32(D23IR, DIR_ROUTE(PIRQH, PIRQH, PIRQH, PIRQH)),/* SDIO */ RCBA32(D23IR) = DIR_ROUTE(PIRQH, PIRQH, PIRQH, PIRQH); /* SDIO */
}
RCBA_END_CONFIG,
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -76,7 +74,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.rcba_config = rcba_config,
}; };
variant_romstage_entry(&romstage_params); variant_romstage_entry(&romstage_params);

42
src/mainboard/intel/baskingridge/romstage.c
View File

@ -9,7 +9,8 @@
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
#include <southbridge/intel/common/gpio.h> #include <southbridge/intel/common/gpio.h>
const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
{
/* /*
* GFX INTA -> PIRQA (MSI) * GFX INTA -> PIRQA (MSI)
* D28IP_P1IP WLAN INTA -> PIRQB * D28IP_P1IP WLAN INTA -> PIRQB
@ -23,28 +24,26 @@ const struct rcba_config_instruction rcba_config[] = {
*/ */
/* Device interrupt pin register (board specific) */ /* Device interrupt pin register (board specific) */
RCBA_SET_REG_32(D31IP, (INTC << D31IP_TTIP) | (NOINT << D31IP_SIP2) | RCBA32(D31IP) = (INTC << D31IP_TTIP) | (NOINT << D31IP_SIP2) |
(INTB << D31IP_SMIP) | (INTA << D31IP_SIP)), (INTB << D31IP_SMIP) | (INTA << D31IP_SIP);
RCBA_SET_REG_32(D30IP, (NOINT << D30IP_PIP)), RCBA32(D30IP) = (NOINT << D30IP_PIP);
RCBA_SET_REG_32(D29IP, (INTA << D29IP_E1P)), RCBA32(D29IP) = (INTA << D29IP_E1P);
RCBA_SET_REG_32(D28IP, (INTA << D28IP_P1IP) | (INTC << D28IP_P3IP) | RCBA32(D28IP) = (INTA << D28IP_P1IP) | (INTC << D28IP_P3IP) |
(INTB << D28IP_P4IP)), (INTB << D28IP_P4IP);
RCBA_SET_REG_32(D27IP, (INTA << D27IP_ZIP)), RCBA32(D27IP) = (INTA << D27IP_ZIP);
RCBA_SET_REG_32(D26IP, (INTA << D26IP_E2P)), RCBA32(D26IP) = (INTA << D26IP_E2P);
RCBA_SET_REG_32(D25IP, (NOINT << D25IP_LIP)), RCBA32(D25IP) = (NOINT << D25IP_LIP);
RCBA_SET_REG_32(D22IP, (NOINT << D22IP_MEI1IP)), RCBA32(D22IP) = (NOINT << D22IP_MEI1IP);
/* Device interrupt route registers */ /* Device interrupt route registers */
RCBA_SET_REG_32(D31IR, DIR_ROUTE(PIRQF, PIRQG, PIRQH, PIRQA)), RCBA32(D31IR) = DIR_ROUTE(PIRQF, PIRQG, PIRQH, PIRQA);
RCBA_SET_REG_32(D29IR, DIR_ROUTE(PIRQD, PIRQE, PIRQF, PIRQG)), RCBA32(D29IR) = DIR_ROUTE(PIRQD, PIRQE, PIRQF, PIRQG);
RCBA_SET_REG_32(D28IR, DIR_ROUTE(PIRQB, PIRQC, PIRQD, PIRQE)), RCBA32(D28IR) = DIR_ROUTE(PIRQB, PIRQC, PIRQD, PIRQE);
RCBA_SET_REG_32(D27IR, DIR_ROUTE(PIRQG, PIRQH, PIRQA, PIRQB)), RCBA32(D27IR) = DIR_ROUTE(PIRQG, PIRQH, PIRQA, PIRQB);
RCBA_SET_REG_32(D26IR, DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH)), RCBA32(D26IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH);
RCBA_SET_REG_32(D25IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA32(D25IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_32(D22IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA32(D22IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
}
RCBA_END_CONFIG,
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -116,7 +115,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.gpio_map = &mainboard_gpio_map, .gpio_map = &mainboard_gpio_map,
.rcba_config = &rcba_config[0],
.copy_spd = NULL, .copy_spd = NULL,
}; };

24
src/mainboard/lenovo/t440p/romstage.c
View File

@ -11,18 +11,17 @@
#include <ec/lenovo/pmh7/pmh7.h> #include <ec/lenovo/pmh7/pmh7.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
static const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
RCBA_SET_REG_16(D31IR, DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA)), {
RCBA_SET_REG_16(D29IR, DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC)), RCBA16(D31IR) = DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA);
RCBA_SET_REG_16(D28IR, DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA)), RCBA16(D29IR) = DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC);
RCBA_SET_REG_16(D27IR, DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD)), RCBA16(D28IR) = DIR_ROUTE(PIRQA, PIRQA, PIRQA, PIRQA);
RCBA_SET_REG_16(D26IR, DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD)), RCBA16(D27IR) = DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_16(D25IR, DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH)), RCBA16(D26IR) = DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD);
RCBA_SET_REG_16(D22IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D25IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH);
RCBA_SET_REG_16(D20IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D22IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA16(D20IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_END_CONFIG, }
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -76,7 +75,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.gpio_map = &mainboard_gpio_map, .gpio_map = &mainboard_gpio_map,
.rcba_config = rcba_config,
}; };
romstage_common(&romstage_params); romstage_common(&romstage_params);

24
src/mainboard/supermicro/x10slm-f/romstage.c
View File

@ -8,18 +8,17 @@
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
#include <stdint.h> #include <stdint.h>
static const struct rcba_config_instruction rcba_config[] = { void mainboard_config_rcba(void)
RCBA_SET_REG_16(D31IR, DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA)), {
RCBA_SET_REG_16(D29IR, DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC)), RCBA16(D31IR) = DIR_ROUTE(PIRQA, PIRQD, PIRQC, PIRQA);
RCBA_SET_REG_16(D28IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D29IR) = DIR_ROUTE(PIRQH, PIRQD, PIRQA, PIRQC);
RCBA_SET_REG_16(D27IR, DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD)), RCBA16(D28IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_16(D26IR, DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD)), RCBA16(D27IR) = DIR_ROUTE(PIRQG, PIRQB, PIRQC, PIRQD);
RCBA_SET_REG_16(D25IR, DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH)), RCBA16(D26IR) = DIR_ROUTE(PIRQA, PIRQF, PIRQC, PIRQD);
RCBA_SET_REG_16(D22IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D25IR) = DIR_ROUTE(PIRQE, PIRQF, PIRQG, PIRQH);
RCBA_SET_REG_16(D20IR, DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD)), RCBA16(D22IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA16(D20IR) = DIR_ROUTE(PIRQA, PIRQB, PIRQC, PIRQD);
RCBA_END_CONFIG, }
};
void mainboard_romstage_entry(void) void mainboard_romstage_entry(void)
{ {
@ -72,7 +71,6 @@ void mainboard_romstage_entry(void)
struct romstage_params romstage_params = { struct romstage_params romstage_params = {
.pei_data = &pei_data, .pei_data = &pei_data,
.gpio_map = &mainboard_gpio_map, .gpio_map = &mainboard_gpio_map,
.rcba_config = rcba_config,
}; };
romstage_common(&romstage_params); romstage_common(&romstage_params);

2
src/northbridge/intel/haswell/haswell.h
View File

@ -190,11 +190,9 @@
void intel_northbridge_haswell_finalize_smm(void); void intel_northbridge_haswell_finalize_smm(void);
struct pei_data; struct pei_data;
struct rcba_config_instruction;
struct romstage_params { struct romstage_params {
struct pei_data *pei_data; struct pei_data *pei_data;
const void *gpio_map; const void *gpio_map;
const struct rcba_config_instruction *rcba_config;
void (*copy_spd)(struct pei_data *peid); void (*copy_spd)(struct pei_data *peid);
}; };
void romstage_common(const struct romstage_params *params); void romstage_common(const struct romstage_params *params);

2
src/northbridge/intel/haswell/romstage.c
View File

@ -19,7 +19,7 @@ void romstage_common(const struct romstage_params *params)
enable_lapic(); enable_lapic();
wake_from_s3 = early_pch_init(params->gpio_map, params->rcba_config); wake_from_s3 = early_pch_init(params->gpio_map);
/* Perform some early chipset initialization required /* Perform some early chipset initialization required
* before RAM initialization can work * before RAM initialization can work

5
src/southbridge/intel/lynxpoint/early_pch.c
View File

@ -77,8 +77,7 @@ void __weak mainboard_config_superio(void)
{ {
} }
int early_pch_init(const void *gpio_map, int early_pch_init(const void *gpio_map)
const struct rcba_config_instruction *rcba_config)
{ {
int wake_from_s3; int wake_from_s3;
@ -101,7 +100,7 @@ int early_pch_init(const void *gpio_map,
(void) RCBA16(OIC); (void) RCBA16(OIC);
/* Mainboard RCBA settings */ /* Mainboard RCBA settings */
pch_config_rcba(rcba_config); mainboard_config_rcba();
RCBA32_OR(FD, PCH_DISABLE_ALWAYS); RCBA32_OR(FD, PCH_DISABLE_ALWAYS);

4
src/southbridge/intel/lynxpoint/pch.h
View File

@ -161,10 +161,10 @@ void acpi_create_intel_hpet(acpi_hpet_t * hpet);
void acpi_create_serialio_ssdt(acpi_header_t *ssdt); void acpi_create_serialio_ssdt(acpi_header_t *ssdt);
void enable_usb_bar(void); void enable_usb_bar(void);
int early_pch_init(const void *gpio_map, int early_pch_init(const void *gpio_map);
const struct rcba_config_instruction *rcba_config);
void pch_enable_lpc(void); void pch_enable_lpc(void);
void mainboard_config_superio(void); void mainboard_config_superio(void);
void mainboard_config_rcba(void);
#define MAINBOARD_POWER_OFF 0 #define MAINBOARD_POWER_OFF 0
#define MAINBOARD_POWER_ON 1 #define MAINBOARD_POWER_ON 1