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

soc/intel/baytrail,braswell,quark: Drop RES_IN_KIB 

Change-Id: I2360a1a79f07ff8466ed01aa7f180d410e019292
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55926
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
Kyösti Mälkki 2021-06-25 13:02:55 +03:00 committed by Felix Held
parent 772ca3cc00
commit 5c3cbcd8cc
3 changed files with 40 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/soc/intel/baytrail/northcluster.c
View File

@ -47,7 +47,6 @@
* | Cacheable/Usable | * | Cacheable/Usable |
* +--------------------------+ 0 * +--------------------------+ 0
*/ */
#define RES_IN_KiB(r) ((r) >> 10)
uint32_t nc_read_top_of_low_memory(void) uint32_t nc_read_top_of_low_memory(void)
{ {
@ -63,13 +62,11 @@ uint32_t nc_read_top_of_low_memory(void)
static void nc_read_resources(struct device *dev) static void nc_read_resources(struct device *dev)
{ {
unsigned long mmconf; uint64_t mmconf;
unsigned long bmbound_k; uint64_t bmbound;
unsigned long bmbound_hi; uint64_t bmbound_hi;
unsigned long smmrrh; uint64_t smmrrh;
unsigned long smmrrl; uint64_t smmrrl;
unsigned long base_k, size_k;
const unsigned long four_gig_kib = (4 << (30 - 10));
int index = 0; int index = 0;
/* Read standard PCI resources. */ /* Read standard PCI resources. */
@ -80,35 +77,31 @@ static void nc_read_resources(struct device *dev)
mmio_range(dev, BUNIT_MMCONF_REG, mmconf, CONFIG_ECAM_MMCONF_BUS_NUMBER * MiB); mmio_range(dev, BUNIT_MMCONF_REG, mmconf, CONFIG_ECAM_MMCONF_BUS_NUMBER * MiB);
/* 0 -> 0xa0000 */ /* 0 -> 0xa0000 */
base_k = RES_IN_KiB(0); ram_from_to(dev, index++, 0, 0xa0000);
size_k = RES_IN_KiB(0xa0000) - base_k;
ram_resource_kb(dev, index++, base_k, size_k);
/* The SMMRR registers are 1MiB granularity with smmrrh being /* The SMMRR registers are 1MiB granularity with smmrrh being
* inclusive of the SMM region. */ * inclusive of the SMM region. */
smmrrl = (iosf_bunit_read(BUNIT_SMRRL) & 0xffff) << 10; smmrrl = (iosf_bunit_read(BUNIT_SMRRL) & 0xffff) * MiB;
smmrrh = ((iosf_bunit_read(BUNIT_SMRRH) & 0xffff) + 1) << 10; smmrrh = ((iosf_bunit_read(BUNIT_SMRRH) & 0xffff) + 1) * MiB;
/* 0xc0000 -> smrrl - cacheable and usable */ /* 0xc0000 -> smrrl - cacheable and usable */
base_k = RES_IN_KiB(0xc0000); ram_from_to(dev, index++, 0xc0000, smmrrl);
size_k = smmrrl - base_k;
ram_resource_kb(dev, index++, base_k, size_k);
if (smmrrh > smmrrl) if (smmrrh > smmrrl)
reserved_ram_resource_kb(dev, index++, smmrrl, smmrrh - smmrrl); reserved_ram_from_to(dev, index++, smmrrl, smmrrh);
/* All address space between bmbound and smmrrh is unusable. */ /* All address space between bmbound and smmrrh is unusable. */
bmbound_k = RES_IN_KiB(nc_read_top_of_low_memory()); bmbound = nc_read_top_of_low_memory();
mmio_resource_kb(dev, index++, smmrrh, bmbound_k - smmrrh); mmio_from_to(dev, index++, smmrrh, bmbound);
/* /*
* The BMBOUND_HI register matches register bits of 31:24 with address * The BMBOUND_HI register matches register bits of 31:24 with address
* bits of 35:28. Therefore, shift register to align properly. * bits of 35:28. Therefore, shift register to align properly.
*/ */
bmbound_hi = iosf_bunit_read(BUNIT_BMBOUND_HI) & ~((1 << 24) - 1); bmbound_hi = iosf_bunit_read(BUNIT_BMBOUND_HI) & ~((1 << 24) - 1);
bmbound_hi = RES_IN_KiB(bmbound_hi) << 4; bmbound_hi <<= 4;
if (bmbound_hi > four_gig_kib) if (bmbound_hi > 4ull * GiB)
ram_resource_kb(dev, index++, four_gig_kib, bmbound_hi - four_gig_kib); ram_from_to(dev, index++, 4ull * GiB, bmbound_hi);
/* /*
* Reserve everything between A segment and 1MB: * Reserve everything between A segment and 1MB:

50
src/soc/intel/braswell/northcluster.c
View File

@ -51,8 +51,6 @@
* | Cacheable/Usable | * | Cacheable/Usable |
* +--------------------------+ 0 * +--------------------------+ 0
*/ */
#define RES_IN_KiB(r) ((r) >> 10)
uint32_t nc_read_top_of_low_memory(void) uint32_t nc_read_top_of_low_memory(void)
{ {
static uint32_t tolm; static uint32_t tolm;
@ -67,16 +65,14 @@ uint32_t nc_read_top_of_low_memory(void)
static void nc_read_resources(struct device *dev) static void nc_read_resources(struct device *dev)
{ {
unsigned long mmconf; uint64_t mmconf;
unsigned long bmbound_k; uint64_t bmbound;
unsigned long bmbound_hi; uint64_t bmbound_hi;
uintptr_t smm_base; uintptr_t smm_base;
size_t smm_size; size_t smm_size;
unsigned long tseg_base_k; uint64_t tseg_base;
unsigned long tseg_top_k; uint64_t tseg_top;
unsigned long fsp_res_base_k; uint64_t fsp_res_base;
unsigned long base_k, size_k;
const unsigned long four_gig_kib = (4 << (30 - 10));
void *fsp_reserved_memory_area; void *fsp_reserved_memory_area;
int index = 0; int index = 0;
@ -85,16 +81,16 @@ static void nc_read_resources(struct device *dev)
/* Determine TSEG data */ /* Determine TSEG data */
smm_region(&smm_base, &smm_size); smm_region(&smm_base, &smm_size);
tseg_base_k = RES_IN_KiB(smm_base); tseg_base = smm_base;
tseg_top_k = tseg_base_k + RES_IN_KiB(smm_size); tseg_top = tseg_base + smm_size;
/* Determine the base of the FSP reserved memory */ /* Determine the base of the FSP reserved memory */
fsp_reserved_memory_area = cbmem_find(CBMEM_ID_FSP_RESERVED_MEMORY); fsp_reserved_memory_area = cbmem_find(CBMEM_ID_FSP_RESERVED_MEMORY);
if (fsp_reserved_memory_area) { if (fsp_reserved_memory_area) {
fsp_res_base_k = RES_IN_KiB((unsigned int)fsp_reserved_memory_area); fsp_res_base = (uintptr_t)fsp_reserved_memory_area;
} else { } else {
/* If no FSP reserved area */ /* If no FSP reserved area */
fsp_res_base_k = tseg_base_k; fsp_res_base = tseg_base;
} }
/* PCIe memory-mapped config space access - 256 MiB. */ /* PCIe memory-mapped config space access - 256 MiB. */
@ -102,32 +98,26 @@ static void nc_read_resources(struct device *dev)
mmio_range(dev, BUNIT_MMCONF_REG, mmconf, CONFIG_ECAM_MMCONF_BUS_NUMBER * MiB); mmio_range(dev, BUNIT_MMCONF_REG, mmconf, CONFIG_ECAM_MMCONF_BUS_NUMBER * MiB);
/* 0 -> 0xa0000 */ /* 0 -> 0xa0000 */
base_k = RES_IN_KiB(0); ram_from_to(dev, index++, 0, 0xa0000);
size_k = RES_IN_KiB(0xa0000) - base_k;
ram_resource_kb(dev, index++, base_k, size_k);
/* High memory -> fsp_res_base - cacheable and usable */ /* High memory -> fsp_res_base - cacheable and usable */
base_k = RES_IN_KiB(0x100000); ram_from_to(dev, index++, 1 * MiB, fsp_res_base);
size_k = fsp_res_base_k - base_k;
ram_resource_kb(dev, index++, base_k, size_k);
/* fsp_res_base -> tseg_top - Reserved */ /* fsp_res_base -> tseg_top - Reserved */
base_k = fsp_res_base_k; reserved_ram_from_to(dev, index++, fsp_res_base, tseg_top);
size_k = tseg_top_k - base_k;
reserved_ram_resource_kb(dev, index++, base_k, size_k);
/* TSEG TOP -> bmbound is memory backed mmio. */ /* TSEG TOP -> bmbound is memory backed mmio. */
bmbound_k = RES_IN_KiB(nc_read_top_of_low_memory()); bmbound = nc_read_top_of_low_memory();
mmio_resource_kb(dev, index++, tseg_top_k, bmbound_k - tseg_top_k); mmio_from_to(dev, index++, tseg_top, bmbound);
/* /*
* The BMBOUND_HI register matches register bits of 31:24 with address * The BMBOUND_HI register matches register bits of 31:24 with address
* bits of 35:28. Therefore, shift register to align properly. * bits of 35:28. Therefore, shift register to align properly.
*/ */
bmbound_hi = iosf_bunit_read(BUNIT_BMBOUND_HI) & ~((1 << 24) - 1); bmbound_hi = iosf_bunit_read(BUNIT_BMBOUND_HI) & ~((1 << 24) - 1);
bmbound_hi = RES_IN_KiB(bmbound_hi) << 4; bmbound_hi <<= 4;
if (bmbound_hi > four_gig_kib) if (bmbound_hi > 4ull * GiB)
ram_resource_kb(dev, index++, four_gig_kib, bmbound_hi - four_gig_kib); ram_from_to(dev, index++, 4ull * GiB, bmbound_hi);
/* /*
* Reserve everything between A segment and 1MB: * Reserve everything between A segment and 1MB:
@ -141,9 +131,7 @@ static void nc_read_resources(struct device *dev)
/* /*
* Reserve local APIC * Reserve local APIC
*/ */
base_k = RES_IN_KiB(LAPIC_DEFAULT_BASE); mmio_range(dev, index++, LAPIC_DEFAULT_BASE, 1 * MiB);
size_k = RES_IN_KiB(0x00100000);
mmio_resource_kb(dev, index++, base_k, size_k);
} }
static void nc_generate_ssdt(const struct device *dev) static void nc_generate_ssdt(const struct device *dev)

30
src/soc/intel/quark/northcluster.c
View File

@ -6,21 +6,15 @@
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/ramstage.h> #include <soc/ramstage.h>
#define RES_IN_KIB(r) ((r) >> 10)
static void nc_read_resources(struct device *dev) static void nc_read_resources(struct device *dev)
{ {
unsigned long base_k;
int index = 0; int index = 0;
unsigned long size_k;
/* Read standard PCI resources. */ /* Read standard PCI resources. */
pci_dev_read_resources(dev); pci_dev_read_resources(dev);
/* 0 -> 0xa0000 */ /* 0 -> 0xa0000 */
base_k = 0; ram_from_to(dev, index++, 0, 0xa0000);
size_k = 0xa0000 - base_k;
ram_resource_kb(dev, index++, RES_IN_KIB(base_k), RES_IN_KIB(size_k));
/* /*
* Reserve everything between A segment and 1MB: * Reserve everything between A segment and 1MB:
@ -29,30 +23,18 @@ static void nc_read_resources(struct device *dev)
* 0xc0000 - 0xdffff: RAM * 0xc0000 - 0xdffff: RAM
* 0xe0000 - 0xfffff: ROM shadow * 0xe0000 - 0xfffff: ROM shadow
*/ */
base_k += size_k; mmio_from_to(dev, index++, 0xa0000, 0xc0000);
size_k = 0xc0000 - base_k;
mmio_resource_kb(dev, index++, RES_IN_KIB(base_k), RES_IN_KIB(size_k));
base_k += size_k; reserved_ram_from_to(dev, index++, 0xc0000, 1 * MiB);
size_k = 0x100000 - base_k;
reserved_ram_resource_kb(dev, index++, RES_IN_KIB(base_k),
RES_IN_KIB(size_k));
/* 0x100000 -> cbmem_top - cacheable and usable */ /* 0x100000 -> cbmem_top - cacheable and usable */
base_k += size_k; ram_from_to(dev, index++, 1 * MiB, (uintptr_t)cbmem_top());
size_k = (unsigned long)cbmem_top() - base_k;
ram_resource_kb(dev, index++, RES_IN_KIB(base_k), RES_IN_KIB(size_k));
/* cbmem_top -> 0xc0000000 - reserved */ /* cbmem_top -> 0xc0000000 - reserved */
base_k += size_k; reserved_ram_from_to(dev, index++, (uintptr_t)cbmem_top(), 0xc0000000);
size_k = 0xc0000000 - base_k;
reserved_ram_resource_kb(dev, index++, RES_IN_KIB(base_k),
RES_IN_KIB(size_k));
/* 0xc0000000 -> 4GiB is mmio. */ /* 0xc0000000 -> 4GiB is mmio. */
base_k += size_k; mmio_from_to(dev, index++, 0xc0000000, 4ull * GiB);
size_k = 0x100000000ull - base_k;
mmio_resource_kb(dev, index++, RES_IN_KIB(base_k), RES_IN_KIB(size_k));
} }
static struct device_operations nc_ops = { static struct device_operations nc_ops = {