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

nb/intel/sandybridge: Use common {DMI,EP,MCH}BAR accessors 

Drop unused sandybridge.h includes to avoid build failures on Ironlake.

Tested with BUILD_TIMELESS=1, Asus P8Z77-V LX2 remains identical.

Change-Id: If2f0147fe50266e2fe2098cafdf004e51282f5e2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49752
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Angel Pons 2021-01-20 01:22:20 +01:00 committed by Patrick Georgi
parent a2a9e607b1
commit d9e58dca9e
22 changed files with 61 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/asus/p8z77-m_pro/early_init.c
View File

@ -85,9 +85,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
struct pei_data pd = { struct pei_data pd = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

4
src/mainboard/dell/optiplex_9010/early_init.c
View File

@ -32,8 +32,8 @@ void bootblock_mainboard_early_init(void)
* FIXME: the board gets stuck in reset loop in * FIXME: the board gets stuck in reset loop in
* mainboard_romstage_entry. Avoid that by clearing SSKPD * mainboard_romstage_entry. Avoid that by clearing SSKPD
*/ */
pci_write_config32(HOST_BRIDGE, MCHBAR, DEFAULT_MCHBAR | 1); pci_write_config32(HOST_BRIDGE, MCHBAR, CONFIG_FIXED_MCHBAR_MMIO_BASE | 1);
pci_write_config32(HOST_BRIDGE, MCHBAR + 4, (0LL + DEFAULT_MCHBAR) >> 32); pci_write_config32(HOST_BRIDGE, MCHBAR + 4, 0);
MCHBAR16(SSKPD_HI) = 0; MCHBAR16(SSKPD_HI) = 0;
sch5545_early_init(0x2e); sch5545_early_init(0x2e);

6
src/mainboard/google/butterfly/early_init.c
View File

@ -76,9 +76,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/google/link/early_init.c
View File

@ -85,9 +85,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/google/parrot/early_init.c
View File

@ -54,9 +54,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/google/stout/early_init.c
View File

@ -91,9 +91,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/intel/dcp847ske/romstage.c
View File

@ -14,9 +14,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/intel/emeraldlake2/early_init.c
View File

@ -51,9 +51,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/kontron/ktqm77/early_init.c
View File

@ -56,9 +56,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/lenovo/x220/early_init.c
View File

@ -12,9 +12,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/roda/rv11/variants/rv11/early_init.c
View File

@ -10,9 +10,9 @@ void mainboard_fill_pei_data(struct pei_data *const pei_data)
{ {
const struct pei_data pei_data_template = { const struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/roda/rv11/variants/rw11/early_init.c
View File

@ -40,9 +40,9 @@ void mainboard_fill_pei_data(struct pei_data *const pei_data)
{ {
const struct pei_data pei_data_template = { const struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/samsung/lumpy/early_init.c
View File

@ -116,9 +116,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

6
src/mainboard/samsung/stumpy/early_init.c
View File

@ -101,9 +101,9 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
{ {
struct pei_data pei_data_template = { struct pei_data pei_data_template = {
.pei_version = PEI_VERSION, .pei_version = PEI_VERSION,
.mchbar = DEFAULT_MCHBAR, .mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE,
.dmibar = DEFAULT_DMIBAR, .dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE,
.epbar = DEFAULT_EPBAR, .epbar = CONFIG_FIXED_EPBAR_MMIO_BASE,
.pciexbar = CONFIG_MMCONF_BASE_ADDRESS, .pciexbar = CONFIG_MMCONF_BASE_ADDRESS,
.smbusbar = CONFIG_FIXED_SMBUS_IO_BASE, .smbusbar = CONFIG_FIXED_SMBUS_IO_BASE,
.wdbbar = 0x4000000, .wdbbar = 0x4000000,

9
src/northbridge/intel/sandybridge/Kconfig
View File

@ -154,4 +154,13 @@ endif # !USE_NATIVE_RAMINIT
config INTEL_GMA_BCLV_OFFSET config INTEL_GMA_BCLV_OFFSET
default 0x48254 default 0x48254
config FIXED_MCHBAR_MMIO_BASE
default 0xfed10000
config FIXED_DMIBAR_MMIO_BASE
default 0xfed18000
config FIXED_EPBAR_MMIO_BASE
default 0xfed19000
endif endif

12
src/northbridge/intel/sandybridge/early_init.c
View File

@ -50,12 +50,12 @@ static void sandybridge_setup_bars(void)
{ {
printk(BIOS_DEBUG, "Setting up static northbridge registers..."); printk(BIOS_DEBUG, "Setting up static northbridge registers...");
/* Set up all hardcoded northbridge BARs */ /* Set up all hardcoded northbridge BARs */
pci_write_config32(HOST_BRIDGE, EPBAR, DEFAULT_EPBAR | 1); pci_write_config32(HOST_BRIDGE, EPBAR, CONFIG_FIXED_EPBAR_MMIO_BASE | 1);
pci_write_config32(HOST_BRIDGE, EPBAR + 4, (0LL + DEFAULT_EPBAR) >> 32); pci_write_config32(HOST_BRIDGE, EPBAR + 4, 0);
pci_write_config32(HOST_BRIDGE, MCHBAR, DEFAULT_MCHBAR | 1); pci_write_config32(HOST_BRIDGE, MCHBAR, CONFIG_FIXED_MCHBAR_MMIO_BASE | 1);
pci_write_config32(HOST_BRIDGE, MCHBAR + 4, (0LL + DEFAULT_MCHBAR) >> 32); pci_write_config32(HOST_BRIDGE, MCHBAR + 4, 0);
pci_write_config32(HOST_BRIDGE, DMIBAR, DEFAULT_DMIBAR | 1); pci_write_config32(HOST_BRIDGE, DMIBAR, CONFIG_FIXED_DMIBAR_MMIO_BASE | 1);
pci_write_config32(HOST_BRIDGE, DMIBAR + 4, (0LL + DEFAULT_DMIBAR) >> 32); pci_write_config32(HOST_BRIDGE, DMIBAR + 4, 0);
printk(BIOS_DEBUG, " done\n"); printk(BIOS_DEBUG, " done\n");
} }

5
src/northbridge/intel/sandybridge/memmap.h
View File

@ -3,11 +3,6 @@
#ifndef __NORTHBRIDGE_INTEL_SANDYBRIDGE_MEMMAP_H__ #ifndef __NORTHBRIDGE_INTEL_SANDYBRIDGE_MEMMAP_H__
#define __NORTHBRIDGE_INTEL_SANDYBRIDGE_MEMMAP_H__ #define __NORTHBRIDGE_INTEL_SANDYBRIDGE_MEMMAP_H__
/* Northbridge BARs */
#define DEFAULT_MCHBAR 0xfed10000 /* 16 KB */
#define DEFAULT_DMIBAR 0xfed18000 /* 4 KB */
#define DEFAULT_EPBAR 0xfed19000 /* 4 KB */
#define GFXVT_BASE 0xfed90000ULL #define GFXVT_BASE 0xfed90000ULL
#define VTVC0_BASE 0xfed91000ULL #define VTVC0_BASE 0xfed91000ULL

6
src/northbridge/intel/sandybridge/raminit_mrc.c
View File

@ -227,9 +227,9 @@ struct mrc_var_data {
static void northbridge_fill_pei_data(struct pei_data *pei_data) static void northbridge_fill_pei_data(struct pei_data *pei_data)
{ {
pei_data->mchbar = (uintptr_t)DEFAULT_MCHBAR; pei_data->mchbar = CONFIG_FIXED_MCHBAR_MMIO_BASE;
pei_data->dmibar = (uintptr_t)DEFAULT_DMIBAR; pei_data->dmibar = CONFIG_FIXED_DMIBAR_MMIO_BASE;
pei_data->epbar = DEFAULT_EPBAR; pei_data->epbar = CONFIG_FIXED_EPBAR_MMIO_BASE;
pei_data->pciexbar = CONFIG_MMCONF_BASE_ADDRESS; pei_data->pciexbar = CONFIG_MMCONF_BASE_ADDRESS;
pei_data->hpet_address = CONFIG_HPET_ADDRESS; pei_data->hpet_address = CONFIG_HPET_ADDRESS;
pei_data->thermalbase = 0xfed08000; pei_data->thermalbase = 0xfed08000;

13
src/northbridge/intel/sandybridge/sandybridge.h
View File

@ -37,9 +37,8 @@ enum platform_type {
* MCHBAR * MCHBAR
*/ */
#define MCHBAR8(x) (*((volatile u8 *)(DEFAULT_MCHBAR + (x)))) #include <northbridge/intel/common/fixed_bars.h>
#define MCHBAR16(x) (*((volatile u16 *)(DEFAULT_MCHBAR + (x))))
#define MCHBAR32(x) (*((volatile u32 *)(DEFAULT_MCHBAR + (x))))
#define MCHBAR8_AND(x, and) (MCHBAR8(x) = MCHBAR8(x) & (and)) #define MCHBAR8_AND(x, and) (MCHBAR8(x) = MCHBAR8(x) & (and))
#define MCHBAR16_AND(x, and) (MCHBAR16(x) = MCHBAR16(x) & (and)) #define MCHBAR16_AND(x, and) (MCHBAR16(x) = MCHBAR16(x) & (and))
#define MCHBAR32_AND(x, and) (MCHBAR32(x) = MCHBAR32(x) & (and)) #define MCHBAR32_AND(x, and) (MCHBAR32(x) = MCHBAR32(x) & (and))
@ -57,20 +56,12 @@ enum platform_type {
* EPBAR - Egress Port Root Complex Register Block * EPBAR - Egress Port Root Complex Register Block
*/ */
#define EPBAR8(x) (*((volatile u8 *)(DEFAULT_EPBAR + (x))))
#define EPBAR16(x) (*((volatile u16 *)(DEFAULT_EPBAR + (x))))
#define EPBAR32(x) (*((volatile u32 *)(DEFAULT_EPBAR + (x))))
#include "registers/epbar.h" #include "registers/epbar.h"
/* /*
* DMIBAR * DMIBAR
*/ */
#define DMIBAR8(x) (*((volatile u8 *)(DEFAULT_DMIBAR + (x))))
#define DMIBAR16(x) (*((volatile u16 *)(DEFAULT_DMIBAR + (x))))
#define DMIBAR32(x) (*((volatile u32 *)(DEFAULT_DMIBAR + (x))))
#include "registers/dmibar.h" #include "registers/dmibar.h"
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__

1
src/southbridge/intel/bd82x6x/early_rcba.c
View File

@ -1,6 +1,5 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <northbridge/intel/sandybridge/sandybridge.h>
#include "pch.h" #include "pch.h"
void southbridge_configure_default_intmap(void) void southbridge_configure_default_intmap(void)

1
src/southbridge/intel/bd82x6x/early_usb.c
View File

@ -3,7 +3,6 @@
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <southbridge/intel/common/rcba.h> #include <southbridge/intel/common/rcba.h>
#include <southbridge/intel/common/pmbase.h> #include <southbridge/intel/common/pmbase.h>

1
src/southbridge/intel/ibexpeak/early_usb.c
View File

@ -3,7 +3,6 @@
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <northbridge/intel/sandybridge/sandybridge.h>
#include <southbridge/intel/common/rcba.h> #include <southbridge/intel/common/rcba.h>
#include <southbridge/intel/common/pmbase.h> #include <southbridge/intel/common/pmbase.h>