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

soc/intel/common: Update SA bit fields as per EDS

Browse Source 
This patch updates system agent related registers bit definitions
as per EDS.

For example:
As per CNL/ICL EDS MCHBAR register base is between bit 16-38
but coreboot programming was not aligned with EDS previously.

CNL EDS doc number: 566216

Also provide provision to program 64bit values as per SA EDS definitions

TEST=Dump MCHBAR in coreboot and ASL shows same 32 bit value.

Change-Id: I37340408fe89c94ce81953c751c8d7e22bc81a42
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38387
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Subrata Banik
2020-01-21 14:28:26 +05:30
parent 6476e41512
commit f8d9a13aba
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/soc/intel/common/block/include/intelblocks/systemagent.h
View File

@ -43,13 +43,13 @@ void bootblock_systemagent_early_init(void);
* Fixed MMIO range * Fixed MMIO range
* INDEX = Either PCI configuration space registers or MMIO offsets * INDEX = Either PCI configuration space registers or MMIO offsets
* mapped from REG. * mapped from REG.
* BASE = 32 bit Address. * BASE = 64 bit Address.
* SIZE = base length * SIZE = base length
* DESCRIPTION = Name of the register/offset. * DESCRIPTION = Name of the register/offset.
*/ */
struct sa_mmio_descriptor { struct sa_mmio_descriptor {
unsigned int index; unsigned int index;
uintptr_t base; uint64_t base;
size_t size; size_t size;
const char *description; const char *description;
}; };

15
src/soc/intel/common/block/systemagent/systemagent_early.c
View File

@ -1,7 +1,7 @@
/* /*
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2017 Intel Corporation. * Copyright (C) 2017-2020 Intel Corporation.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -71,7 +71,7 @@ void sa_set_pci_bar(const struct sa_mmio_descriptor *fixed_set_resources,
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
uintptr_t base; uint64_t base;
unsigned int index; unsigned int index;
index = fixed_set_resources[i].index; index = fixed_set_resources[i].index;
@ -83,8 +83,9 @@ void sa_set_pci_bar(const struct sa_mmio_descriptor *fixed_set_resources,
return; return;
base = fixed_set_resources[i].base; base = fixed_set_resources[i].base;
if (base >> 32)
pci_write_config32(SA_DEV_ROOT, index, base | 1); pci_write_config32(SA_DEV_ROOT, index + 4, base >> 32);
pci_write_config32(SA_DEV_ROOT, index, (base & 0xffffffff) | 1);
} }
} }
@ -99,12 +100,14 @@ void sa_set_mch_bar(const struct sa_mmio_descriptor *fixed_set_resources,
int i; int i;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
uintptr_t base; uint64_t base;
unsigned int index; unsigned int index;
base = fixed_set_resources[i].base; base = fixed_set_resources[i].base;
index = fixed_set_resources[i].index; index = fixed_set_resources[i].index;
write32((void *)(MCH_BASE_ADDRESS + index), base | 1); if (base >> 32)
write32((void *)(MCH_BASE_ADDRESS + index + 4), base >> 32);
write32((void *)(MCH_BASE_ADDRESS + index), (base & 0xffffffff) | 1);
} }
} }