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

amdblocks/biosram: Force use of abstraction 

Hide the fundamental BIOSRAM accessors to force use of the
memory space via abstraction functions.

Change-Id: I774b6640cdd9873f52e446c4ca41b7c537a87883
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37862
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2019-12-20 04:19:46 +02:00
parent ec35a3d885
commit bc17b6f98f
4 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/soc/amd/common/block/acpimmio/biosram.c
View File

@ -11,9 +11,55 @@
* GNU General Public License for more details. * GNU General Public License for more details.
*/ */
#include <cbmem.h> #include <amdblocks/acpimmio_map.h>
#include <amdblocks/acpimmio.h>
#include <amdblocks/biosram.h> #include <amdblocks/biosram.h>
#include <cbmem.h>
#include <device/mmio.h>
#include <stdint.h>
/* BiosRam Ranges at 0xfed80500 or I/O 0xcd4/0xcd5 */
#define BIOSRAM_AP_ENTRY 0xe8 /* 8 bytes */
#define BIOSRAM_CBMEM_TOP 0xf0 /* 4 bytes */
#define BIOSRAM_UMA_SIZE 0xf4 /* 4 bytes */
#define BIOSRAM_UMA_BASE 0xf8 /* 8 bytes */
static uint8_t biosram_read8(uint8_t reg)
{
return read8((void *)(ACPIMMIO_BIOSRAM_BASE + reg));
}
static void biosram_write8(uint8_t reg, uint8_t value)
{
write8((void *)(ACPIMMIO_BIOSRAM_BASE + reg), value);
}
static uint16_t biosram_read16(uint8_t reg) /* Must be 1 byte at a time */
{
return (biosram_read8(reg + sizeof(uint8_t)) << 8 | biosram_read8(reg));
}
static uint32_t biosram_read32(uint8_t reg)
{
uint32_t value = biosram_read16(reg + sizeof(uint16_t)) << 16;
return value | biosram_read16(reg);
}
static void biosram_write16(uint8_t reg, uint16_t value)
{
biosram_write8(reg, value & 0xff);
value >>= 8;
biosram_write8(reg + sizeof(uint8_t), value & 0xff);
}
static void biosram_write32(uint8_t reg, uint32_t value)
{
biosram_write16(reg, value & 0xffff);
value >>= 16;
biosram_write16(reg + sizeof(uint16_t), value & 0xffff);
}
/* Access to BIOSRAM is only allowed through the abstractions below. */
void *get_ap_entry_ptr(void) void *get_ap_entry_ptr(void)
{ {

25
src/soc/amd/common/block/acpimmio/mmio_util.c
View File

@ -72,28 +72,3 @@ void pm_io_write32(uint8_t reg, uint32_t value)
value >>= 16; value >>= 16;
pm_io_write16(reg + sizeof(uint16_t), value & 0xffff); pm_io_write16(reg + sizeof(uint16_t), value & 0xffff);
} }
uint16_t biosram_read16(uint8_t reg) /* Must be 1 byte at a time */
{
return (biosram_read8(reg + sizeof(uint8_t)) << 8 | biosram_read8(reg));
}
uint32_t biosram_read32(uint8_t reg)
{
uint32_t value = biosram_read16(reg + sizeof(uint16_t)) << 16;
return value | biosram_read16(reg);
}
void biosram_write16(uint8_t reg, uint16_t value)
{
biosram_write8(reg, value & 0xff);
value >>= 8;
biosram_write8(reg + sizeof(uint8_t), value & 0xff);
}
void biosram_write32(uint8_t reg, uint32_t value)
{
biosram_write16(reg, value & 0xffff);
value >>= 16;
biosram_write16(reg + sizeof(uint16_t), value & 0xffff);
}

18
src/soc/amd/common/block/include/amdblocks/acpimmio.h
View File

@ -116,14 +116,6 @@ void pm_io_write8(uint8_t reg, uint8_t value);
void pm_io_write16(uint8_t reg, uint16_t value); void pm_io_write16(uint8_t reg, uint16_t value);
void pm_io_write32(uint8_t reg, uint32_t value); void pm_io_write32(uint8_t reg, uint32_t value);
/* Access BIOS RAM storage at 0xfed80500 */
uint16_t biosram_read16(uint8_t reg);
uint32_t biosram_read32(uint8_t reg);
void biosram_write16(uint8_t reg, uint16_t value);
void biosram_write32(uint8_t reg, uint32_t value);
static inline uint8_t sm_pci_read8(uint8_t reg) static inline uint8_t sm_pci_read8(uint8_t reg)
{ {
return read8((void *)(ACPIMMIO_SM_PCI_BASE + reg)); return read8((void *)(ACPIMMIO_SM_PCI_BASE + reg));
@ -214,16 +206,6 @@ static inline void pm_write32(uint8_t reg, uint32_t value)
write32((void *)(ACPIMMIO_PMIO_BASE + reg), value); write32((void *)(ACPIMMIO_PMIO_BASE + reg), value);
} }
static inline uint8_t biosram_read8(uint8_t reg)
{
return read8((void *)(ACPIMMIO_BIOSRAM_BASE + reg));
}
static inline void biosram_write8(uint8_t reg, uint8_t value)
{
write8((void *)(ACPIMMIO_BIOSRAM_BASE + reg), value);
}
static inline uint8_t acpi_read8(uint8_t reg) static inline uint8_t acpi_read8(uint8_t reg)
{ {
return read8((void *)(ACPIMMIO_ACPI_BASE + reg)); return read8((void *)(ACPIMMIO_ACPI_BASE + reg));

6
src/soc/amd/common/block/include/amdblocks/biosram.h
View File

@ -16,12 +16,6 @@
#include <stdint.h> #include <stdint.h>
/* BiosRam Ranges at 0xfed80500 or I/O 0xcd4/0xcd5 */
#define BIOSRAM_AP_ENTRY 0xe8 /* 8 bytes */
#define BIOSRAM_CBMEM_TOP 0xf0 /* 4 bytes */
#define BIOSRAM_UMA_SIZE 0xf4 /* 4 bytes */
#define BIOSRAM_UMA_BASE 0xf8 /* 8 bytes */
/* Returns the bootblock C entry point for APs */ /* Returns the bootblock C entry point for APs */
void *get_ap_entry_ptr(void); void *get_ap_entry_ptr(void);
/* Used by BSP to store the bootblock entry point for APs */ /* Used by BSP to store the bootblock entry point for APs */