soc/intel/xeon_sp: Configure DPR on all stacks

Configure DPR to span the region between cbmem_top and TSEG base.
This region was already unavailable to the OS.

Change-Id: Ia0d34e50b3d577f19172619156352534f740ea6b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46818
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Arthur Heymans 2020-10-22 17:11:22 +02:00 committed by Hung-Te Lin
parent cfe526dce2
commit 77509be2c8
3 changed files with 51 additions and 0 deletions

View File

@ -78,6 +78,7 @@
#define VMD_FUNC_NUM 0x05 #define VMD_FUNC_NUM 0x05
#define MMAP_VTD_CFG_REG_DEVID 0x2024 #define MMAP_VTD_CFG_REG_DEVID 0x2024
#define MMAP_VTD_STACK_CFG_REG_DEVID 0x2034
#define VTD_DEV_NUM 0x5 #define VTD_DEV_NUM 0x5
#define VTD_FUNC_NUM 0x0 #define VTD_FUNC_NUM 0x0

View File

@ -128,6 +128,7 @@
#define HPET0_FUNC_NUM 0x00 #define HPET0_FUNC_NUM 0x00
#define MMAP_VTD_CFG_REG_DEVID 0x2024 #define MMAP_VTD_CFG_REG_DEVID 0x2024
#define MMAP_VTD_STACK_CFG_REG_DEVID 0x2034
#define VTD_DEV_NUM 0x5 #define VTD_DEV_NUM 0x5
#define VTD_FUNC_NUM 0x0 #define VTD_FUNC_NUM 0x0

View File

@ -11,6 +11,8 @@
#include <soc/ramstage.h> #include <soc/ramstage.h>
#include <soc/util.h> #include <soc/util.h>
#include <fsp/util.h> #include <fsp/util.h>
#include <security/intel/txt/txt_platform.h>
#include <soc/pci_devs.h>
struct map_entry { struct map_entry {
uint32_t reg; uint32_t reg;
@ -88,6 +90,20 @@ static void mc_report_map_entries(struct device *dev, uint64_t *values)
} }
} }
static void configure_dpr(struct device *dev)
{
const uintptr_t cbmem_top_mb = ALIGN_UP((uintptr_t)cbmem_top(), MiB) / MiB;
union dpr_register dpr = { .raw = pci_read_config32(dev, VTD_LTDPR) };
/* The DPR lock bit has to be set sufficiently early. It looks like
* it cannot be set anymore after FSP-S.
*/
dpr.lock = 1;
dpr.epm = 1;
dpr.size = dpr.top - cbmem_top_mb;
pci_write_config32(dev, VTD_LTDPR, dpr.raw);
}
/* /*
* Host Memory Map: * Host Memory Map:
* *
@ -127,6 +143,8 @@ static void mc_report_map_entries(struct device *dev, uint64_t *values)
* | MEseg (relocatable) | 32, 64, 128 or 256 MB (0x78000000 - 0x7fffffff, 0x20000) * | MEseg (relocatable) | 32, 64, 128 or 256 MB (0x78000000 - 0x7fffffff, 0x20000)
* +--------------------------+ * +--------------------------+
* | Tseg (relocatable) | N x 8MB (0x70000000 - 0x77ffffff, 0x20000) * | Tseg (relocatable) | N x 8MB (0x70000000 - 0x77ffffff, 0x20000)
* +--------------------------+
* | DPR |
* +--------------------------+ cbmem_top * +--------------------------+ cbmem_top
* | Reserved - CBMEM | (0x6fffe000 - 0x6fffffff, 0x2000) * | Reserved - CBMEM | (0x6fffe000 - 0x6fffffff, 0x2000)
* +--------------------------+ * +--------------------------+
@ -203,6 +221,16 @@ static void mc_add_dram_resources(struct device *dev, int *res_count)
LOG_MEM_RESOURCE("mmio_tseg", dev, index, base_kb, size_kb); LOG_MEM_RESOURCE("mmio_tseg", dev, index, base_kb, size_kb);
reserved_ram_resource(dev, index++, base_kb, size_kb); reserved_ram_resource(dev, index++, base_kb, size_kb);
/* Reserve and set up DPR */
configure_dpr(dev);
union dpr_register dpr = { .raw = pci_read_config32(dev, VTD_LTDPR) };
if (dpr.size) {
uint32_t dpr_base_k = (dpr.top - dpr.size) << 10;
uint32_t dpr_size_k = dpr.size << 10;
reserved_ram_resource(dev, index++, dpr_base_k, dpr_size_k);
LOG_MEM_RESOURCE("dpr", dev, index, dpr_base_k, dpr_size_k);
}
/* Mark region between TSEG - TOLM (eg. MESEG) as reserved */ /* Mark region between TSEG - TOLM (eg. MESEG) as reserved */
if (mc_values[TSEG_LIMIT_REG] < mc_values[TOLM_REG]) { if (mc_values[TSEG_LIMIT_REG] < mc_values[TOLM_REG]) {
base_kb = ((mc_values[TSEG_LIMIT_REG] + 1) >> 10); base_kb = ((mc_values[TSEG_LIMIT_REG] + 1) >> 10);
@ -294,3 +322,24 @@ static const struct pci_driver mmapvtd_driver __pci_driver = {
.vendor = PCI_VENDOR_ID_INTEL, .vendor = PCI_VENDOR_ID_INTEL,
.devices = mmapvtd_ids .devices = mmapvtd_ids
}; };
static void vtd_read_resources(struct device *dev)
{
pci_dev_read_resources(dev);
configure_dpr(dev);
}
static struct device_operations vtd_ops = {
.read_resources = vtd_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
.ops_pci = &soc_pci_ops,
};
/* VTD devices on other stacks */
static const struct pci_driver vtd_driver __pci_driver = {
.ops = &vtd_ops,
.vendor = PCI_VENDOR_ID_INTEL,
.device = MMAP_VTD_STACK_CFG_REG_DEVID,
};