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

amdfam_10h-15h: Use ENV_PCI_SIMPLE_DEVICE 

Change-Id: I265d50af1099ae4449b5adebcf21e2043aa02c7a
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35654
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-09-27 15:32:22 +03:00
parent 0f639750a1
commit 23d4d9f368
6 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/amd/family_10h-family_15h/ram_calc.c
View File

@ -65,7 +65,7 @@ uint64_t get_cc6_memory_size()
if (is_fam15h()) { if (is_fam15h()) {
enable_cc6 = 0; enable_cc6 = 0;
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
if (pci_read_config32(PCI_DEV(0, 0x18, 2), 0x118) & (0x1 << 18)) if (pci_read_config32(PCI_DEV(0, 0x18, 2), 0x118) & (0x1 << 18))
enable_cc6 = 1; enable_cc6 = 1;
#else #else

4
src/cpu/amd/quadcore/quadcore_id.c
View File

@ -42,7 +42,7 @@ struct node_core_id get_node_core_id(u32 nb_cfg_54)
uint32_t family; uint32_t family;
uint32_t model; uint32_t model;
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
f3xe8 = pci_read_config32(NODE_PCI(0, 3), 0xe8); f3xe8 = pci_read_config32(NODE_PCI(0, 3), 0xe8);
#else #else
f3xe8 = pci_read_config32(get_node_pci(0, 3), 0xe8); f3xe8 = pci_read_config32(get_node_pci(0, 3), 0xe8);
@ -109,7 +109,7 @@ struct node_core_id get_node_core_id(u32 nb_cfg_54)
uint32_t f5x84; uint32_t f5x84;
uint8_t core_count; uint8_t core_count;
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
f5x84 = pci_read_config32(NODE_PCI(0, 5), 0x84); f5x84 = pci_read_config32(NODE_PCI(0, 5), 0x84);
#else #else
f5x84 = pci_read_config32(get_node_pci(0, 5), 0x84); f5x84 = pci_read_config32(get_node_pci(0, 5), 0x84);

2
src/northbridge/amd/amdfam10/amdfam10.h
View File

@ -1017,11 +1017,9 @@ BOOL AMD_CB_ManualBUIDSwapList(u8 Node, u8 Link, const u8 **List);
struct acpi_rsdp; struct acpi_rsdp;
#ifndef __SIMPLE_DEVICE__
unsigned long northbridge_write_acpi_tables(struct device *device, unsigned long northbridge_write_acpi_tables(struct device *device,
unsigned long start, unsigned long start,
struct acpi_rsdp *rsdp); struct acpi_rsdp *rsdp);
void northbridge_acpi_write_vars(struct device *device); void northbridge_acpi_write_vars(struct device *device);
#endif
#endif /* AMDFAM10_H */ #endif /* AMDFAM10_H */

2
src/northbridge/amd/amdfam10/amdfam10_util.c
View File

@ -21,7 +21,7 @@
#include "raminit.h" #include "raminit.h"
#include <northbridge/amd/amdmct/amddefs.h> #include <northbridge/amd/amdmct/amddefs.h>
#ifndef __SIMPLE_DEVICE__ #if !ENV_PCI_SIMPLE_DEVICE
u32 Get_NB32(u32 dev, u32 reg) u32 Get_NB32(u32 dev, u32 reg)
{ {
return pci_read_config32(pcidev_path_on_root(PCI_DEV2DEVFN(dev)), reg); return pci_read_config32(pcidev_path_on_root(PCI_DEV2DEVFN(dev)), reg);

14
src/northbridge/amd/amdmct/mct_ddr3/s3utils.c
View File

@ -69,7 +69,7 @@ ssize_t get_s3nv_file_offset(void)
return s3nv_region.region.offset; return s3nv_region.region.offset;
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static uint32_t read_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct, static uint32_t read_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct,
uint32_t reg) uint32_t reg)
#else #else
@ -79,7 +79,7 @@ static uint32_t read_config32_dct(struct device *dev, uint8_t node, uint8_t dct,
{ {
if (is_fam15h()) { if (is_fam15h()) {
uint32_t dword; uint32_t dword;
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
pci_devfn_t dev_fn1 = PCI_DEV(0, 0x18 + node, 1); pci_devfn_t dev_fn1 = PCI_DEV(0, 0x18 + node, 1);
#else #else
struct device *dev_fn1 = pcidev_on_root(0x18 + node, 1); struct device *dev_fn1 = pcidev_on_root(0x18 + node, 1);
@ -98,7 +98,7 @@ static uint32_t read_config32_dct(struct device *dev, uint8_t node, uint8_t dct,
return pci_read_config32(dev, reg); return pci_read_config32(dev, reg);
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static void write_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct, static void write_config32_dct(pci_devfn_t dev, uint8_t node, uint8_t dct,
uint32_t reg, uint32_t value) uint32_t reg, uint32_t value)
#else #else
@ -108,7 +108,7 @@ static void write_config32_dct(struct device *dev, uint8_t node, uint8_t dct,
{ {
if (is_fam15h()) { if (is_fam15h()) {
uint32_t dword; uint32_t dword;
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
pci_devfn_t dev_fn1 = PCI_DEV(0, 0x18 + node, 1); pci_devfn_t dev_fn1 = PCI_DEV(0, 0x18 + node, 1);
#else #else
struct device *dev_fn1 = pcidev_on_root(0x18 + node, 1); struct device *dev_fn1 = pcidev_on_root(0x18 + node, 1);
@ -127,7 +127,7 @@ static void write_config32_dct(struct device *dev, uint8_t node, uint8_t dct,
pci_write_config32(dev, reg, value); pci_write_config32(dev, reg, value);
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static uint32_t read_amd_dct_index_register(pci_devfn_t dev, static uint32_t read_amd_dct_index_register(pci_devfn_t dev,
uint32_t index_ctl_reg, uint32_t index) uint32_t index_ctl_reg, uint32_t index)
#else #else
@ -147,7 +147,7 @@ static uint32_t read_amd_dct_index_register(struct device *dev,
return dword; return dword;
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static uint32_t read_amd_dct_index_register_dct(pci_devfn_t dev, uint8_t node, static uint32_t read_amd_dct_index_register_dct(pci_devfn_t dev, uint8_t node,
uint8_t dct, uint32_t index_ctl_reg, uint32_t index) uint8_t dct, uint32_t index_ctl_reg, uint32_t index)
#else #else
@ -158,7 +158,7 @@ static uint32_t read_amd_dct_index_register_dct(struct device *dev,
{ {
if (is_fam15h()) { if (is_fam15h()) {
uint32_t dword; uint32_t dword;
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
pci_devfn_t dev_fn1 = PCI_DEV(0, 0x18 + node, 1); pci_devfn_t dev_fn1 = PCI_DEV(0, 0x18 + node, 1);
#else #else
struct device *dev_fn1 = pcidev_on_root(0x18 + node, 1); struct device *dev_fn1 = pcidev_on_root(0x18 + node, 1);

28
src/southbridge/amd/sr5650/cmn.h
View File

@ -34,7 +34,7 @@
#define AB_INDX 0xCD8 #define AB_INDX 0xCD8
#define AB_DATA (AB_INDX+4) #define AB_DATA (AB_INDX+4)
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline u32 nb_read_index(pci_devfn_t dev, u32 index_reg, u32 index) static inline u32 nb_read_index(pci_devfn_t dev, u32 index_reg, u32 index)
#else #else
static inline u32 nb_read_index(struct device *dev, u32 index_reg, u32 index) static inline u32 nb_read_index(struct device *dev, u32 index_reg, u32 index)
@ -44,7 +44,7 @@ static inline u32 nb_read_index(struct device *dev, u32 index_reg, u32 index)
return pci_read_config32(dev, index_reg + 0x4); return pci_read_config32(dev, index_reg + 0x4);
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void nb_write_index(pci_devfn_t dev, u32 index_reg, u32 index, static inline void nb_write_index(pci_devfn_t dev, u32 index_reg, u32 index,
u32 data) u32 data)
#else #else
@ -56,7 +56,7 @@ static inline void nb_write_index(struct device *dev, u32 index_reg, u32 index,
pci_write_config32(dev, index_reg + 0x4, data); pci_write_config32(dev, index_reg + 0x4, data);
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline u32 nbmisc_read_index(pci_devfn_t nb_dev, u32 index) static inline u32 nbmisc_read_index(pci_devfn_t nb_dev, u32 index)
#else #else
static inline u32 nbmisc_read_index(struct device *nb_dev, u32 index) static inline u32 nbmisc_read_index(struct device *nb_dev, u32 index)
@ -65,7 +65,7 @@ static inline u32 nbmisc_read_index(struct device *nb_dev, u32 index)
return nb_read_index((nb_dev), NBMISC_INDEX, (index)); return nb_read_index((nb_dev), NBMISC_INDEX, (index));
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void nbmisc_write_index(pci_devfn_t nb_dev, u32 index, u32 data) static inline void nbmisc_write_index(pci_devfn_t nb_dev, u32 index, u32 data)
#else #else
static inline void nbmisc_write_index(struct device *nb_dev, u32 index, static inline void nbmisc_write_index(struct device *nb_dev, u32 index,
@ -75,7 +75,7 @@ static inline void nbmisc_write_index(struct device *nb_dev, u32 index,
nb_write_index((nb_dev), NBMISC_INDEX, ((index) | 0x80), (data)); nb_write_index((nb_dev), NBMISC_INDEX, ((index) | 0x80), (data));
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void set_nbmisc_enable_bits(pci_devfn_t nb_dev, u32 reg_pos, static inline void set_nbmisc_enable_bits(pci_devfn_t nb_dev, u32 reg_pos,
u32 mask, u32 val) u32 mask, u32 val)
#else #else
@ -92,7 +92,7 @@ static inline void set_nbmisc_enable_bits(struct device *nb_dev, u32 reg_pos,
} }
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline u32 htiu_read_index(pci_devfn_t nb_dev, u32 index) static inline u32 htiu_read_index(pci_devfn_t nb_dev, u32 index)
#else #else
static inline u32 htiu_read_index(struct device *nb_dev, u32 index) static inline u32 htiu_read_index(struct device *nb_dev, u32 index)
@ -101,7 +101,7 @@ static inline u32 htiu_read_index(struct device *nb_dev, u32 index)
return nb_read_index((nb_dev), NBHTIU_INDEX, (index)); return nb_read_index((nb_dev), NBHTIU_INDEX, (index));
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void htiu_write_index(pci_devfn_t nb_dev, u32 index, u32 data) static inline void htiu_write_index(pci_devfn_t nb_dev, u32 index, u32 data)
#else #else
static inline void htiu_write_index(struct device *nb_dev, u32 index, u32 data) static inline void htiu_write_index(struct device *nb_dev, u32 index, u32 data)
@ -110,7 +110,7 @@ static inline void htiu_write_index(struct device *nb_dev, u32 index, u32 data)
nb_write_index((nb_dev), NBHTIU_INDEX, ((index) | 0x100), (data)); nb_write_index((nb_dev), NBHTIU_INDEX, ((index) | 0x100), (data));
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline u32 nbmc_read_index(pci_devfn_t nb_dev, u32 index) static inline u32 nbmc_read_index(pci_devfn_t nb_dev, u32 index)
#else #else
static inline u32 nbmc_read_index(struct device *nb_dev, u32 index) static inline u32 nbmc_read_index(struct device *nb_dev, u32 index)
@ -119,7 +119,7 @@ static inline u32 nbmc_read_index(struct device *nb_dev, u32 index)
return nb_read_index((nb_dev), NBMC_INDEX, (index)); return nb_read_index((nb_dev), NBMC_INDEX, (index));
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void nbmc_write_index(pci_devfn_t nb_dev, u32 index, u32 data) static inline void nbmc_write_index(pci_devfn_t nb_dev, u32 index, u32 data)
#else #else
static inline void nbmc_write_index(struct device *nb_dev, u32 index, u32 data) static inline void nbmc_write_index(struct device *nb_dev, u32 index, u32 data)
@ -128,7 +128,7 @@ static inline void nbmc_write_index(struct device *nb_dev, u32 index, u32 data)
nb_write_index((nb_dev), NBMC_INDEX, ((index) | 1 << 9), (data)); nb_write_index((nb_dev), NBMC_INDEX, ((index) | 1 << 9), (data));
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void set_htiu_enable_bits(pci_devfn_t nb_dev, u32 reg_pos, static inline void set_htiu_enable_bits(pci_devfn_t nb_dev, u32 reg_pos,
u32 mask, u32 val) u32 mask, u32 val)
#else #else
@ -145,7 +145,7 @@ static inline void set_htiu_enable_bits(struct device *nb_dev, u32 reg_pos,
} }
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void set_nbcfg_enable_bits(pci_devfn_t nb_dev, u32 reg_pos, static inline void set_nbcfg_enable_bits(pci_devfn_t nb_dev, u32 reg_pos,
u32 mask, u32 val) u32 mask, u32 val)
#else #else
@ -162,7 +162,7 @@ static inline void set_nbcfg_enable_bits(struct device *nb_dev, u32 reg_pos,
} }
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void set_nbcfg_enable_bits_8(pci_devfn_t nb_dev, u32 reg_pos, static inline void set_nbcfg_enable_bits_8(pci_devfn_t nb_dev, u32 reg_pos,
u8 mask, u8 val) u8 mask, u8 val)
#else #else
@ -179,7 +179,7 @@ static inline void set_nbcfg_enable_bits_8(struct device *nb_dev, u32 reg_pos,
} }
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void set_nbmc_enable_bits(pci_devfn_t nb_dev, u32 reg_pos, static inline void set_nbmc_enable_bits(pci_devfn_t nb_dev, u32 reg_pos,
u32 mask, u32 val) u32 mask, u32 val)
#else #else
@ -196,7 +196,7 @@ static inline void set_nbmc_enable_bits(struct device *nb_dev, u32 reg_pos,
} }
} }
#ifdef __SIMPLE_DEVICE__ #if ENV_PCI_SIMPLE_DEVICE
static inline void set_pcie_enable_bits(pci_devfn_t dev, u32 reg_pos, u32 mask, static inline void set_pcie_enable_bits(pci_devfn_t dev, u32 reg_pos, u32 mask,
u32 val) u32 val)
#else #else