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

soc/intel/alderlake/hsphy.c: Handle case with DMA protection 

The HSPHY firmware must be downloaded to DMA-allowed host address
space. Check for DMA buffer presence and use it as the buffer for HSPHY
firmware to be downloaded from CSME.

TEST=Successfully load HSPHY firmware to CPU on MSI PRO Z690-A DDR4
with DMA protection enabled.

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
Change-Id: I88edda26a027b557eeaba80426a5b7be7199507d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68556
Reviewed-by: Michał Kopeć <michal.kopec@3mdeb.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Michał Żygowski 2022-10-19 09:55:18 +02:00 committed by Paul Fagerburg
parent 5f05ee2a0a
commit a49945e4b7
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/soc/intel/alderlake/hsphy.c
View File

@ -10,6 +10,7 @@
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <intelblocks/cse.h> #include <intelblocks/cse.h>
#include <intelblocks/systemagent.h> #include <intelblocks/systemagent.h>
#include <intelblocks/vtd.h>
#include <security/vboot/misc.h> #include <security/vboot/misc.h>
#include <soc/hsphy.h> #include <soc/hsphy.h>
#include <soc/iomap.h> #include <soc/iomap.h>
@ -161,6 +162,7 @@ void load_and_init_hsphy(void)
uint8_t hsphy_hash[MAX_HASH_SIZE] = { 0 }; uint8_t hsphy_hash[MAX_HASH_SIZE] = { 0 };
uint8_t hash_type; uint8_t hash_type;
uint32_t buf_size = HSPHY_PAYLOAD_SIZE; uint32_t buf_size = HSPHY_PAYLOAD_SIZE;
size_t dma_buf_size;
pci_devfn_t dev = PCH_DEV_CSE; pci_devfn_t dev = PCH_DEV_CSE;
const uint16_t pci_cmd_bme_mem = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY; const uint16_t pci_cmd_bme_mem = PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
uint32_t status; uint32_t status;
@ -171,13 +173,30 @@ void load_and_init_hsphy(void)
return; return;
} }
/* Align the buffer to page size, otherwise the HECI command will fail */ if (CONFIG(ENABLE_EARLY_DMA_PROTECTION)) {
hsphy_buf = memalign(4 * KiB, HSPHY_PAYLOAD_SIZE); hsphy_buf = vtd_get_dma_buffer(&dma_buf_size);
if (!hsphy_buf || dma_buf_size < HSPHY_PAYLOAD_SIZE) {
printk(BIOS_ERR, "DMA protection enabled but DMA buffer does not"
" exist or is too small\n");
printk(BIOS_ERR, "Aborting HSPHY firmware loading, "
"PCIe Gen5 won't work.\n");
return;
}
if (!hsphy_buf) { /* Rather impossible scenario, but check alignment anyways */
printk(BIOS_ERR, "Could not allocate memory for HSPHY blob\n"); if (!IS_ALIGNED((uintptr_t)hsphy_buf, 4 * KiB) &&
printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n"); (HSPHY_PAYLOAD_SIZE + 4 * KiB) <= dma_buf_size)
return; hsphy_buf = (void *)ALIGN_UP((uintptr_t)hsphy_buf, 4 * KiB);
} else {
/* Align the buffer to page size, otherwise the HECI command will fail */
hsphy_buf = memalign(4 * KiB, HSPHY_PAYLOAD_SIZE);
if (!hsphy_buf) {
printk(BIOS_ERR, "Could not allocate memory for HSPHY blob\n");
printk(BIOS_ERR, "Aborting HSPHY firmware loading, "
"PCIe Gen5 won't work.\n");
return;
}
} }
memset(hsphy_buf, 0, HSPHY_PAYLOAD_SIZE); memset(hsphy_buf, 0, HSPHY_PAYLOAD_SIZE);
@ -186,8 +205,7 @@ void load_and_init_hsphy(void)
printk(BIOS_ERR, "%s: CSME not enabled or not visible, but required\n", printk(BIOS_ERR, "%s: CSME not enabled or not visible, but required\n",
__func__); __func__);
printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n"); printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n");
free(hsphy_buf); goto hsphy_exit;
return;
} }
/* Ensure BAR, BME and memory space are enabled */ /* Ensure BAR, BME and memory space are enabled */
@ -203,17 +221,17 @@ void load_and_init_hsphy(void)
if (heci_get_hsphy_payload(hsphy_buf, &buf_size, hsphy_hash, &hash_type, &status)) { if (heci_get_hsphy_payload(hsphy_buf, &buf_size, hsphy_hash, &hash_type, &status)) {
printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n"); printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n");
free(hsphy_buf); goto hsphy_exit;
return;
} }
if (verify_hsphy_hash(hsphy_buf, buf_size, hsphy_hash, hash_type)) { if (verify_hsphy_hash(hsphy_buf, buf_size, hsphy_hash, hash_type)) {
printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n"); printk(BIOS_ERR, "Aborting HSPHY firmware loading, PCIe Gen5 won't work.\n");
free(hsphy_buf); goto hsphy_exit;
return;
} }
upload_hsphy_to_cpu_pcie(hsphy_buf, buf_size); upload_hsphy_to_cpu_pcie(hsphy_buf, buf_size);
free(hsphy_buf); hsphy_exit:
if (!CONFIG(ENABLE_EARLY_DMA_PROTECTION))
free(hsphy_buf);
} }