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

soc/amd/common/include/data_fabric_defs: introduce & use DF_REG_* macros 

To have both the PCI function number and the register offset into the
config space of that function of the data fabric device in the data
fabric register definitions, introduce and use the DF_REG_ID, DF_REG_FN
and DF_REG_REG macros. The DF_REG_ID macro is used for register
definitions where both the function number and the register offset are
specified, and the DF_REG_FN and DF_REG_REG macros are used to extract
the function number and the register offset from the register defines.
This will allow having one define for accessing an indexed group of
registers that are on different functions of the data fabric device.

TEST=MMIO resources read from the data fabric's MMIO decode registers
don't change on Mandolin and the ACPI CRAT table is also identical.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I63a284b26081c170a217b082b100c482f6158e7e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76886
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
This commit is contained in:
Felix Held 2023-08-03 00:10:03 +02:00
parent 8677d2ddb8
commit 18a3c230ff
10 changed files with 96 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/soc/amd/cezanne/include/soc/data_fabric.h
View File

@ -3,20 +3,21 @@
#ifndef AMD_CEZANNE_DATA_FABRIC_H #ifndef AMD_CEZANNE_DATA_FABRIC_H
#define AMD_CEZANNE_DATA_FABRIC_H #define AMD_CEZANNE_DATA_FABRIC_H
#include <amdblocks/data_fabric_defs.h>
#include <types.h> #include <types.h>
/* D18F0 - Fabric Configuration registers */ /* D18F0 - Fabric Configuration registers */
#define D18F0_MMIO_BASE0 0x200 #define D18F0_MMIO_BASE0 DF_REG_ID(0, 0x200)
#define D18F0_MMIO_LIMIT0 0x204 #define D18F0_MMIO_LIMIT0 DF_REG_ID(0, 0x204)
#define D18F0_MMIO_SHIFT 16 #define D18F0_MMIO_SHIFT 16
#define D18F0_MMIO_CTRL0 0x208 #define D18F0_MMIO_CTRL0 DF_REG_ID(0, 0x208)
#define DF_MMIO_REG_SET_SIZE 4 #define DF_MMIO_REG_SET_SIZE 4
#define DF_MMIO_REG_SET_COUNT 8 #define DF_MMIO_REG_SET_COUNT 8
#define DF_FICAA_BIOS 0x5C #define DF_FICAA_BIOS DF_REG_ID(4, 0x5C)
#define DF_FICAD_LO 0x98 #define DF_FICAD_LO DF_REG_ID(4, 0x98)
#define DF_FICAD_HI 0x9C #define DF_FICAD_HI DF_REG_ID(4, 0x9C)
#define IOMS0_FABRIC_ID 10 #define IOMS0_FABRIC_ID 10

65
src/soc/amd/common/block/data_fabric/data_fabric_helper.c
View File

@ -11,38 +11,41 @@
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <types.h> #include <types.h>
static void data_fabric_set_indirect_address(uint8_t func, uint16_t reg, uint8_t instance_id) static void data_fabric_set_indirect_address(uint16_t fn_reg, uint8_t instance_id)
{ {
union df_ficaa ficaa = { .cfg_inst_acc_en = 1 }; /* target only specific instance */ union df_ficaa ficaa = { .cfg_inst_acc_en = 1 }; /* target only specific instance */
/* convert register address to 32-bit register number */ /* convert register address to 32-bit register number */
ficaa.reg_num = reg >> 2; ficaa.reg_num = DF_REG_OFFSET(fn_reg) >> 2;
ficaa.func_num = func; ficaa.func_num = DF_REG_FN(fn_reg);
ficaa.inst_id = instance_id; ficaa.inst_id = instance_id;
pci_write_config32(SOC_DF_F4_DEV, DF_FICAA_BIOS, ficaa.raw); pci_write_config32(_SOC_DEV(DF_DEV, DF_REG_FN(DF_FICAA_BIOS)),
DF_REG_OFFSET(DF_FICAA_BIOS), ficaa.raw);
} }
uint32_t data_fabric_read32(uint8_t function, uint16_t reg, uint8_t instance_id) uint32_t data_fabric_read32(uint16_t fn_reg, uint8_t instance_id)
{ {
/* Broadcast reads might return unexpected results when a register has different /* Broadcast reads might return unexpected results when a register has different
contents in the different instances. */ contents in the different instances. */
if (instance_id == BROADCAST_FABRIC_ID) if (instance_id == BROADCAST_FABRIC_ID)
return data_fabric_broadcast_read32(function, reg); return data_fabric_broadcast_read32(fn_reg);
/* non-broadcast data fabric accesses need to be done via indirect access */ /* non-broadcast data fabric accesses need to be done via indirect access */
data_fabric_set_indirect_address(function, reg, instance_id); data_fabric_set_indirect_address(fn_reg, instance_id);
return pci_read_config32(SOC_DF_F4_DEV, DF_FICAD_LO); return pci_read_config32(_SOC_DEV(DF_DEV, DF_REG_FN(DF_FICAD_LO)),
DF_REG_OFFSET(DF_FICAD_LO));
} }
void data_fabric_write32(uint8_t function, uint16_t reg, uint8_t instance_id, uint32_t data) void data_fabric_write32(uint16_t fn_reg, uint8_t instance_id, uint32_t data)
{ {
if (instance_id == BROADCAST_FABRIC_ID) { if (instance_id == BROADCAST_FABRIC_ID) {
data_fabric_broadcast_write32(function, reg, data); data_fabric_broadcast_write32(fn_reg, data);
return; return;
} }
/* non-broadcast data fabric accesses need to be done via indirect access */ /* non-broadcast data fabric accesses need to be done via indirect access */
data_fabric_set_indirect_address(function, reg, instance_id); data_fabric_set_indirect_address(fn_reg, instance_id);
pci_write_config32(SOC_DF_F4_DEV, DF_FICAD_LO, data); pci_write_config32(_SOC_DEV(DF_DEV, DF_REG_FN(DF_FICAD_LO)),
DF_REG_OFFSET(DF_FICAD_LO), data);
} }
void data_fabric_print_mmio_conf(void) void data_fabric_print_mmio_conf(void)
@ -53,12 +56,12 @@ void data_fabric_print_mmio_conf(void)
"=== Data Fabric MMIO configuration registers ===\n" "=== Data Fabric MMIO configuration registers ===\n"
"idx base limit control R W NP F-ID\n"); "idx base limit control R W NP F-ID\n");
for (unsigned int i = 0; i < DF_MMIO_REG_SET_COUNT; i++) { for (unsigned int i = 0; i < DF_MMIO_REG_SET_COUNT; i++) {
control.raw = data_fabric_broadcast_read32(0, DF_MMIO_CONTROL(i)); control.raw = data_fabric_broadcast_read32(DF_MMIO_CONTROL(i));
/* Base and limit address registers don't contain the lower address bits, but /* Base and limit address registers don't contain the lower address bits, but
are shifted by D18F0_MMIO_SHIFT bits */ are shifted by D18F0_MMIO_SHIFT bits */
base = (uint64_t)data_fabric_broadcast_read32(0, DF_MMIO_BASE(i)) base = (uint64_t)data_fabric_broadcast_read32(DF_MMIO_BASE(i))
<< D18F0_MMIO_SHIFT; << D18F0_MMIO_SHIFT;
limit = (uint64_t)data_fabric_broadcast_read32(0, DF_MMIO_LIMIT(i)) limit = (uint64_t)data_fabric_broadcast_read32(DF_MMIO_LIMIT(i))
<< D18F0_MMIO_SHIFT; << D18F0_MMIO_SHIFT;
/* Lower D18F0_MMIO_SHIFT address limit bits are all 1 */ /* Lower D18F0_MMIO_SHIFT address limit bits are all 1 */
limit += (1 << D18F0_MMIO_SHIFT) - 1; limit += (1 << D18F0_MMIO_SHIFT) - 1;
@ -74,15 +77,15 @@ void data_fabric_print_mmio_conf(void)
void data_fabric_disable_mmio_reg(unsigned int reg) void data_fabric_disable_mmio_reg(unsigned int reg)
{ {
union df_mmio_control ctrl = { .fabric_id = IOMS0_FABRIC_ID }; union df_mmio_control ctrl = { .fabric_id = IOMS0_FABRIC_ID };
data_fabric_broadcast_write32(0, DF_MMIO_CONTROL(reg), ctrl.raw); data_fabric_broadcast_write32(DF_MMIO_CONTROL(reg), ctrl.raw);
data_fabric_broadcast_write32(0, DF_MMIO_BASE(reg), 0); data_fabric_broadcast_write32(DF_MMIO_BASE(reg), 0);
data_fabric_broadcast_write32(0, DF_MMIO_LIMIT(reg), 0); data_fabric_broadcast_write32(DF_MMIO_LIMIT(reg), 0);
} }
static bool is_mmio_reg_disabled(unsigned int reg) static bool is_mmio_reg_disabled(unsigned int reg)
{ {
union df_mmio_control ctrl; union df_mmio_control ctrl;
ctrl.raw = data_fabric_broadcast_read32(0, DF_MMIO_CONTROL(reg)); ctrl.raw = data_fabric_broadcast_read32(DF_MMIO_CONTROL(reg));
return !(ctrl.we || ctrl.re); return !(ctrl.we || ctrl.re);
} }
@ -128,12 +131,12 @@ void data_fabric_set_mmio_np(void)
for (i = 0; i < DF_MMIO_REG_SET_COUNT; i++) { for (i = 0; i < DF_MMIO_REG_SET_COUNT; i++) {
/* Adjust all registers that overlap */ /* Adjust all registers that overlap */
ctrl.raw = data_fabric_broadcast_read32(0, DF_MMIO_CONTROL(i)); ctrl.raw = data_fabric_broadcast_read32(DF_MMIO_CONTROL(i));
if (!(ctrl.we || ctrl.re)) if (!(ctrl.we || ctrl.re))
continue; /* not enabled */ continue; /* not enabled */
base = data_fabric_broadcast_read32(0, DF_MMIO_BASE(i)); base = data_fabric_broadcast_read32(DF_MMIO_BASE(i));
limit = data_fabric_broadcast_read32(0, DF_MMIO_LIMIT(i)); limit = data_fabric_broadcast_read32(DF_MMIO_LIMIT(i));
if (base > np_top || limit < np_bot) if (base > np_top || limit < np_bot)
continue; /* no overlap at all */ continue; /* no overlap at all */
@ -145,7 +148,7 @@ void data_fabric_set_mmio_np(void)
if (base < np_bot && limit > np_top) { if (base < np_bot && limit > np_top) {
/* Split the configured region */ /* Split the configured region */
data_fabric_broadcast_write32(0, DF_MMIO_LIMIT(i), np_bot - 1); data_fabric_broadcast_write32(DF_MMIO_LIMIT(i), np_bot - 1);
reg = data_fabric_find_unused_mmio_reg(); reg = data_fabric_find_unused_mmio_reg();
if (reg < 0) { if (reg < 0) {
/* Although a pair could be freed later, this condition is /* Although a pair could be freed later, this condition is
@ -154,17 +157,17 @@ void data_fabric_set_mmio_np(void)
printk(BIOS_ERR, "Not enough NB MMIO routing registers\n"); printk(BIOS_ERR, "Not enough NB MMIO routing registers\n");
continue; continue;
} }
data_fabric_broadcast_write32(0, DF_MMIO_BASE(reg), np_top + 1); data_fabric_broadcast_write32(DF_MMIO_BASE(reg), np_top + 1);
data_fabric_broadcast_write32(0, DF_MMIO_LIMIT(reg), limit); data_fabric_broadcast_write32(DF_MMIO_LIMIT(reg), limit);
data_fabric_broadcast_write32(0, DF_MMIO_CONTROL(reg), ctrl.raw); data_fabric_broadcast_write32(DF_MMIO_CONTROL(reg), ctrl.raw);
continue; continue;
} }
/* If still here, adjust only the base or limit */ /* If still here, adjust only the base or limit */
if (base <= np_bot) if (base <= np_bot)
data_fabric_broadcast_write32(0, DF_MMIO_LIMIT(i), np_bot - 1); data_fabric_broadcast_write32(DF_MMIO_LIMIT(i), np_bot - 1);
else else
data_fabric_broadcast_write32(0, DF_MMIO_BASE(i), np_top + 1); data_fabric_broadcast_write32(DF_MMIO_BASE(i), np_top + 1);
} }
reg = data_fabric_find_unused_mmio_reg(); reg = data_fabric_find_unused_mmio_reg();
@ -175,9 +178,9 @@ void data_fabric_set_mmio_np(void)
union df_mmio_control np_ctrl = { .fabric_id = IOMS0_FABRIC_ID, union df_mmio_control np_ctrl = { .fabric_id = IOMS0_FABRIC_ID,
.np = 1, .we = 1, .re = 1 }; .np = 1, .we = 1, .re = 1 };
data_fabric_broadcast_write32(0, DF_MMIO_BASE(reg), np_bot); data_fabric_broadcast_write32(DF_MMIO_BASE(reg), np_bot);
data_fabric_broadcast_write32(0, DF_MMIO_LIMIT(reg), np_top); data_fabric_broadcast_write32(DF_MMIO_LIMIT(reg), np_top);
data_fabric_broadcast_write32(0, DF_MMIO_CONTROL(reg), np_ctrl.raw); data_fabric_broadcast_write32(DF_MMIO_CONTROL(reg), np_ctrl.raw);
data_fabric_print_mmio_conf(); data_fabric_print_mmio_conf();
} }

6
src/soc/amd/common/block/data_fabric/domain.c
View File

@ -38,8 +38,8 @@ void amd_pci_domain_scan_bus(struct device *domain)
static void data_fabric_get_mmio_base_size(unsigned int reg, static void data_fabric_get_mmio_base_size(unsigned int reg,
resource_t *mmio_base, resource_t *mmio_limit) resource_t *mmio_base, resource_t *mmio_limit)
{ {
const uint32_t base_reg = data_fabric_broadcast_read32(0, DF_MMIO_BASE(reg)); const uint32_t base_reg = data_fabric_broadcast_read32(DF_MMIO_BASE(reg));
const uint32_t limit_reg = data_fabric_broadcast_read32(0, DF_MMIO_LIMIT(reg)); const uint32_t limit_reg = data_fabric_broadcast_read32(DF_MMIO_LIMIT(reg));
/* The raw register values are bits 47..16 of the actual address */ /* The raw register values are bits 47..16 of the actual address */
*mmio_base = (resource_t)base_reg << D18F0_MMIO_SHIFT; *mmio_base = (resource_t)base_reg << D18F0_MMIO_SHIFT;
*mmio_limit = (((resource_t)limit_reg + 1) << D18F0_MMIO_SHIFT) - 1; *mmio_limit = (((resource_t)limit_reg + 1) << D18F0_MMIO_SHIFT) - 1;
@ -101,7 +101,7 @@ static void add_data_fabric_mmio_regions(struct device *domain, unsigned int *id
(1ULL << get_usable_physical_address_bits()) - DF_RESERVED_TOP_12GB_MMIO_SIZE; (1ULL << get_usable_physical_address_bits()) - DF_RESERVED_TOP_12GB_MMIO_SIZE;
for (unsigned int i = 0; i < DF_MMIO_REG_SET_COUNT; i++) { for (unsigned int i = 0; i < DF_MMIO_REG_SET_COUNT; i++) {
ctrl.raw = data_fabric_broadcast_read32(0, DF_MMIO_CONTROL(i)); ctrl.raw = data_fabric_broadcast_read32(DF_MMIO_CONTROL(i));
/* Relevant MMIO regions need to have both reads and writes enabled */ /* Relevant MMIO regions need to have both reads and writes enabled */
if (!ctrl.we || !ctrl.re) if (!ctrl.we || !ctrl.re)

13
src/soc/amd/common/block/include/amdblocks/data_fabric.h
View File

@ -3,6 +3,7 @@
#ifndef AMD_BLOCK_DATA_FABRIC_H #ifndef AMD_BLOCK_DATA_FABRIC_H
#define AMD_BLOCK_DATA_FABRIC_H #define AMD_BLOCK_DATA_FABRIC_H
#include <amdblocks/data_fabric_defs.h>
#include <amdblocks/pci_devs.h> #include <amdblocks/pci_devs.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <soc/data_fabric.h> #include <soc/data_fabric.h>
@ -24,21 +25,21 @@
/* Last 12GB of the usable address space are reserved */ /* Last 12GB of the usable address space are reserved */
#define DF_RESERVED_TOP_12GB_MMIO_SIZE (12ULL * GiB) #define DF_RESERVED_TOP_12GB_MMIO_SIZE (12ULL * GiB)
uint32_t data_fabric_read32(uint8_t function, uint16_t reg, uint8_t instance_id); uint32_t data_fabric_read32(uint16_t fn_reg, uint8_t instance_id);
void data_fabric_write32(uint8_t function, uint16_t reg, uint8_t instance_id, uint32_t data); void data_fabric_write32(uint16_t fn_reg, uint8_t instance_id, uint32_t data);
static __always_inline static __always_inline
uint32_t data_fabric_broadcast_read32(uint8_t function, uint16_t reg) uint32_t data_fabric_broadcast_read32(uint16_t fn_reg)
{ {
/* No bit masking required. Macros will apply mask to values. */ /* No bit masking required. Macros will apply mask to values. */
return pci_read_config32(_SOC_DEV(DF_DEV, function), reg); return pci_read_config32(_SOC_DEV(DF_DEV, DF_REG_FN(fn_reg)), DF_REG_OFFSET(fn_reg));
} }
static __always_inline static __always_inline
void data_fabric_broadcast_write32(uint8_t function, uint16_t reg, uint32_t data) void data_fabric_broadcast_write32(uint16_t fn_reg, uint32_t data)
{ {
/* No bit masking required. Macros will apply mask to values. */ /* No bit masking required. Macros will apply mask to values. */
pci_write_config32(_SOC_DEV(DF_DEV, function), reg, data); pci_write_config32(_SOC_DEV(DF_DEV, DF_REG_FN(fn_reg)), DF_REG_OFFSET(fn_reg), data);
} }
void data_fabric_print_mmio_conf(void); void data_fabric_print_mmio_conf(void);

10
src/soc/amd/common/block/include/amdblocks/data_fabric_defs.h Normal file
View File

@ -0,0 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef AMD_BLOCK_DATA_FABRIC_DEFS_H
#define AMD_BLOCK_DATA_FABRIC_DEFS_H
#define DF_REG_ID(fn, reg) (((fn) & 0x7) << 12 | ((reg) & 0xfff))
#define DF_REG_FN(id) ((id) >> 12)
#define DF_REG_OFFSET(id) ((id) & 0xfff)
#endif /* AMD_BLOCK_DATA_FABRIC_DEFS_H */

13
src/soc/amd/glinda/include/soc/data_fabric.h
View File

@ -3,20 +3,21 @@
#ifndef AMD_GLINDA_DATA_FABRIC_H #ifndef AMD_GLINDA_DATA_FABRIC_H
#define AMD_GLINDA_DATA_FABRIC_H #define AMD_GLINDA_DATA_FABRIC_H
#include <amdblocks/data_fabric_defs.h>
#include <types.h> #include <types.h>
/* D18F0 - Fabric Configuration registers */ /* D18F0 - Fabric Configuration registers */
#define D18F0_MMIO_BASE0 0xD80 #define D18F0_MMIO_BASE0 DF_REG_ID(0, 0xD80)
#define D18F0_MMIO_LIMIT0 0xD84 #define D18F0_MMIO_LIMIT0 DF_REG_ID(0, 0xD84)
#define D18F0_MMIO_SHIFT 16 #define D18F0_MMIO_SHIFT 16
#define D18F0_MMIO_CTRL0 0xD88 #define D18F0_MMIO_CTRL0 DF_REG_ID(0, 0xD88)
#define DF_MMIO_REG_SET_SIZE 4 #define DF_MMIO_REG_SET_SIZE 4
#define DF_MMIO_REG_SET_COUNT 8 #define DF_MMIO_REG_SET_COUNT 8
#define DF_FICAA_BIOS 0x8C #define DF_FICAA_BIOS DF_REG_ID(4, 0x8C)
#define DF_FICAD_LO 0xB8 #define DF_FICAD_LO DF_REG_ID(4, 0xB8)
#define DF_FICAD_HI 0xBC #define DF_FICAD_HI DF_REG_ID(4, 0xBC)
#define IOMS0_FABRIC_ID 15 #define IOMS0_FABRIC_ID 15

13
src/soc/amd/mendocino/include/soc/data_fabric.h
View File

@ -3,13 +3,14 @@
#ifndef AMD_MENDOCINO_DATA_FABRIC_H #ifndef AMD_MENDOCINO_DATA_FABRIC_H
#define AMD_MENDOCINO_DATA_FABRIC_H #define AMD_MENDOCINO_DATA_FABRIC_H
#include <amdblocks/data_fabric_defs.h>
#include <types.h> #include <types.h>
/* D18F0 - Fabric Configuration registers */ /* D18F0 - Fabric Configuration registers */
#define D18F0_MMIO_BASE0 0x200 #define D18F0_MMIO_BASE0 DF_REG_ID(0, 0x200)
#define D18F0_MMIO_LIMIT0 0x204 #define D18F0_MMIO_LIMIT0 DF_REG_ID(0, 0x204)
#define D18F0_MMIO_SHIFT 16 #define D18F0_MMIO_SHIFT 16
#define D18F0_MMIO_CTRL0 0x208 #define D18F0_MMIO_CTRL0 DF_REG_ID(0, 0x208)
#if CONFIG(SOC_AMD_REMBRANDT) #if CONFIG(SOC_AMD_REMBRANDT)
#define DF_MMIO_REG_SET_SIZE 3 #define DF_MMIO_REG_SET_SIZE 3
@ -19,9 +20,9 @@
#define DF_MMIO_REG_SET_COUNT 8 #define DF_MMIO_REG_SET_COUNT 8
#define DF_FICAA_BIOS 0x5C #define DF_FICAA_BIOS DF_REG_ID(4, 0x5C)
#define DF_FICAD_LO 0x98 #define DF_FICAD_LO DF_REG_ID(4, 0x98)
#define DF_FICAD_HI 0x9C #define DF_FICAD_HI DF_REG_ID(4, 0x9C)
#define IOMS0_FABRIC_ID 9 #define IOMS0_FABRIC_ID 9

13
src/soc/amd/phoenix/include/soc/data_fabric.h
View File

@ -3,20 +3,21 @@
#ifndef AMD_PHOENIX_DATA_FABRIC_H #ifndef AMD_PHOENIX_DATA_FABRIC_H
#define AMD_PHOENIX_DATA_FABRIC_H #define AMD_PHOENIX_DATA_FABRIC_H
#include <amdblocks/data_fabric_defs.h>
#include <types.h> #include <types.h>
/* D18F0 - Fabric Configuration registers */ /* D18F0 - Fabric Configuration registers */
#define D18F0_MMIO_BASE0 0xD80 #define D18F0_MMIO_BASE0 DF_REG_ID(0, 0xD80)
#define D18F0_MMIO_LIMIT0 0xD84 #define D18F0_MMIO_LIMIT0 DF_REG_ID(0, 0xD84)
#define D18F0_MMIO_SHIFT 16 #define D18F0_MMIO_SHIFT 16
#define D18F0_MMIO_CTRL0 0xD88 #define D18F0_MMIO_CTRL0 DF_REG_ID(0, 0xD88)
#define DF_MMIO_REG_SET_SIZE 4 #define DF_MMIO_REG_SET_SIZE 4
#define DF_MMIO_REG_SET_COUNT 8 #define DF_MMIO_REG_SET_COUNT 8
#define DF_FICAA_BIOS 0x8C #define DF_FICAA_BIOS DF_REG_ID(4, 0x8C)
#define DF_FICAD_LO 0xB8 #define DF_FICAD_LO DF_REG_ID(4, 0xB8)
#define DF_FICAD_HI 0xBC #define DF_FICAD_HI DF_REG_ID(4, 0xBC)
#define IOMS0_FABRIC_ID 0x13 #define IOMS0_FABRIC_ID 0x13

6
src/soc/amd/picasso/agesa_acpi.c
View File

@ -64,10 +64,10 @@ static unsigned long gen_crat_memory_entries(struct acpi_crat_header *crat,
for (size_t dram_map_idx = 0; dram_map_idx < PICASSO_NUM_DRAM_REG; for (size_t dram_map_idx = 0; dram_map_idx < PICASSO_NUM_DRAM_REG;
dram_map_idx++) { dram_map_idx++) {
dram_base_reg = dram_base_reg =
data_fabric_read32(0, DF_DRAM_BASE(dram_map_idx), IOMS0_FABRIC_ID); data_fabric_read32(DF_DRAM_BASE(dram_map_idx), IOMS0_FABRIC_ID);
if (dram_base_reg & DRAM_BASE_REG_VALID) { if (dram_base_reg & DRAM_BASE_REG_VALID) {
dram_limit_reg = data_fabric_read32(0, DF_DRAM_LIMIT(dram_map_idx), dram_limit_reg = data_fabric_read32(DF_DRAM_LIMIT(dram_map_idx),
IOMS0_FABRIC_ID); IOMS0_FABRIC_ID);
memory_length = memory_length =
((dram_limit_reg & DRAM_LIMIT_ADDR) >> DRAM_LIMIT_ADDR_SHFT) + 1 ((dram_limit_reg & DRAM_LIMIT_ADDR) >> DRAM_LIMIT_ADDR_SHFT) + 1
@ -85,7 +85,7 @@ static unsigned long gen_crat_memory_entries(struct acpi_crat_header *crat,
} }
if (dram_base_reg & DRAM_BASE_HOLE_EN) { if (dram_base_reg & DRAM_BASE_HOLE_EN) {
dram_hole_ctl = data_fabric_read32(0, D18F0_DRAM_HOLE_CTL, dram_hole_ctl = data_fabric_read32(D18F0_DRAM_HOLE_CTL,
IOMS0_FABRIC_ID); IOMS0_FABRIC_ID);
hole_base = (dram_hole_ctl & DRAM_HOLE_CTL_BASE); hole_base = (dram_hole_ctl & DRAM_HOLE_CTL_BASE);
size_below_hole = hole_base - memory_base; size_below_hole = hole_base - memory_base;

21
src/soc/amd/picasso/include/soc/data_fabric.h
View File

@ -3,20 +3,21 @@
#ifndef AMD_PICASSO_DATA_FABRIC_H #ifndef AMD_PICASSO_DATA_FABRIC_H
#define AMD_PICASSO_DATA_FABRIC_H #define AMD_PICASSO_DATA_FABRIC_H
#include <amdblocks/data_fabric_defs.h>
#include <types.h> #include <types.h>
/* D18F0 - Fabric Configuration registers */ /* D18F0 - Fabric Configuration registers */
#define D18F0_MMIO_BASE0 0x200 #define D18F0_MMIO_BASE0 DF_REG_ID(0, 0x200)
#define D18F0_MMIO_LIMIT0 0x204 #define D18F0_MMIO_LIMIT0 DF_REG_ID(0, 0x204)
#define D18F0_MMIO_SHIFT 16 #define D18F0_MMIO_SHIFT 16
#define D18F0_MMIO_CTRL0 0x208 #define D18F0_MMIO_CTRL0 DF_REG_ID(0, 0x208)
#define DF_MMIO_REG_SET_SIZE 4 #define DF_MMIO_REG_SET_SIZE 4
#define DF_MMIO_REG_SET_COUNT 8 #define DF_MMIO_REG_SET_COUNT 8
#define DF_FICAA_BIOS 0x5C #define DF_FICAA_BIOS DF_REG_ID(4, 0x5C)
#define DF_FICAD_LO 0x98 #define DF_FICAD_LO DF_REG_ID(4, 0x98)
#define DF_FICAD_HI 0x9C #define DF_FICAD_HI DF_REG_ID(4, 0x9C)
#define IOMS0_FABRIC_ID 9 #define IOMS0_FABRIC_ID 9
@ -47,15 +48,15 @@ union df_ficaa {
}; };
#define D18F0_VGAEN 0x80 #define D18F0_VGAEN DF_REG_ID(0, 0x80)
#define VGA_ADDR_ENABLE BIT(0) #define VGA_ADDR_ENABLE BIT(0)
#define D18F0_DRAM_HOLE_CTL 0x104 #define D18F0_DRAM_HOLE_CTL DF_REG_ID(0, 0x104)
#define DRAM_HOLE_CTL_VALID BIT(0) #define DRAM_HOLE_CTL_VALID BIT(0)
#define DRAM_HOLE_CTL_BASE_SHFT 24 #define DRAM_HOLE_CTL_BASE_SHFT 24
#define DRAM_HOLE_CTL_BASE (0xff << DRAM_HOLE_CTL_BASE_SHFT) #define DRAM_HOLE_CTL_BASE (0xff << DRAM_HOLE_CTL_BASE_SHFT)
#define D18F0_DRAM_BASE0 0x110 #define D18F0_DRAM_BASE0 DF_REG_ID(0, 0x110)
#define DRAM_BASE_REG_VALID BIT(0) #define DRAM_BASE_REG_VALID BIT(0)
#define DRAM_BASE_HOLE_EN BIT(1) #define DRAM_BASE_HOLE_EN BIT(1)
#define DRAM_BASE_INTLV_CH_SHFT 4 #define DRAM_BASE_INTLV_CH_SHFT 4
@ -65,7 +66,7 @@ union df_ficaa {
#define DRAM_BASE_ADDR_SHFT 12 #define DRAM_BASE_ADDR_SHFT 12
#define DRAM_BASE_ADDR (0xfffff << DRAM_BASE_ADDR_SHFT) #define DRAM_BASE_ADDR (0xfffff << DRAM_BASE_ADDR_SHFT)
#define D18F0_DRAM_LIMIT0 0x114 #define D18F0_DRAM_LIMIT0 DF_REG_ID(0, 0x114)
#define DRAM_LIMIT_DST_ID_SHFT 0 #define DRAM_LIMIT_DST_ID_SHFT 0
#define DRAM_LIMIT_DST_ID (0xff << DRAM_LIMIT_DST_ID_SHFT) #define DRAM_LIMIT_DST_ID (0xff << DRAM_LIMIT_DST_ID_SHFT)
#define DRAM_LIMIT_INTLV_NUM_SOCK_SHFT 8 #define DRAM_LIMIT_INTLV_NUM_SOCK_SHFT 8