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

sb/intel/bd82x6x: Align some ME functions 

This eliminates the differences in the first part of the file.

Change-Id: Ifb7d57da08e02664a28819e65bc8e9697ed38c4c
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42009
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-06-02 13:36:57 +02:00 committed by Patrick Georgi
parent 93375f270c
commit 7f32df379c
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/southbridge/intel/bd82x6x/me.c
View File

@ -10,10 +10,10 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <device/mmio.h> #include <device/mmio.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <string.h> #include <string.h>
@ -564,7 +564,7 @@ static int intel_mei_setup(struct device *dev)
printk(BIOS_DEBUG, "ME: MEI resource not present!\n"); printk(BIOS_DEBUG, "ME: MEI resource not present!\n");
return -1; return -1;
} }
mei_base_address = (u32*)(uintptr_t)res->base; mei_base_address = (u32 *)(uintptr_t)res->base;
/* Ensure Memory and Bus Master bits are set */ /* Ensure Memory and Bus Master bits are set */
pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY); pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);

13
src/southbridge/intel/bd82x6x/me_8.x.c
View File

@ -25,12 +25,11 @@
#include "pch.h" #include "pch.h"
#if CONFIG(CHROMEOS) #if CONFIG(CHROMEOS)
#include <vendorcode/google/chromeos/chromeos.h>
#include <vendorcode/google/chromeos/gnvs.h> #include <vendorcode/google/chromeos/gnvs.h>
#endif #endif
/* Path that the BIOS should take based on ME state */ /* Path that the BIOS should take based on ME state */
static const char *me_bios_path_values[] __unused = { static const char *me_bios_path_values[] __unused = {
[ME_NORMAL_BIOS_PATH] = "Normal", [ME_NORMAL_BIOS_PATH] = "Normal",
[ME_S3WAKE_BIOS_PATH] = "S3 Wake", [ME_S3WAKE_BIOS_PATH] = "S3 Wake",
[ME_ERROR_BIOS_PATH] = "Error", [ME_ERROR_BIOS_PATH] = "Error",
@ -38,12 +37,10 @@ static const char *me_bios_path_values[] __unused = {
[ME_DISABLE_BIOS_PATH] = "Disable", [ME_DISABLE_BIOS_PATH] = "Disable",
[ME_FIRMWARE_UPDATE_BIOS_PATH] = "Firmware Update", [ME_FIRMWARE_UPDATE_BIOS_PATH] = "Firmware Update",
}; };
static int intel_me_read_mbp(me_bios_payload *mbp_data);
/* MMIO base address for MEI interface */ /* MMIO base address for MEI interface */
static u32 *mei_base_address; static u32 *mei_base_address;
static void mei_dump(void *ptr, int dword, int offset, const char *type) static void mei_dump(void *ptr, int dword, int offset, const char *type)
{ {
struct mei_csr *csr; struct mei_csr *csr;
@ -292,7 +289,7 @@ static int mei_recv_msg(struct mkhi_header *mkhi,
if (!mkhi_rsp.is_response || if (!mkhi_rsp.is_response ||
mkhi->group_id != mkhi_rsp.group_id || mkhi->group_id != mkhi_rsp.group_id ||
mkhi->command != mkhi_rsp.command) { mkhi->command != mkhi_rsp.command) {
printk(BIOS_ERR, "ME: invalid response, group %u ?= %u," printk(BIOS_ERR, "ME: invalid response, group %u ?= %u, "
"command %u ?= %u, is_response %u\n", mkhi->group_id, "command %u ?= %u, is_response %u\n", mkhi->group_id,
mkhi_rsp.group_id, mkhi->command, mkhi_rsp.command, mkhi_rsp.group_id, mkhi->command, mkhi_rsp.command,
mkhi_rsp.is_response); mkhi_rsp.is_response);
@ -568,6 +565,10 @@ static int intel_mei_setup(struct device *dev)
return 0; return 0;
} }
#if CONFIG(CHROMEOS)
#include <vendorcode/google/chromeos/chromeos.h>
#endif
/* Read the Extend register hash of ME firmware */ /* Read the Extend register hash of ME firmware */
static int intel_me_extend_valid(struct device *dev) static int intel_me_extend_valid(struct device *dev)
{ {
@ -622,6 +623,8 @@ static void intel_me_hide(struct device *dev)
pch_enable(dev); pch_enable(dev);
} }
static int intel_me_read_mbp(me_bios_payload *mbp_data);
/* Check whether ME is present and do basic init */ /* Check whether ME is present and do basic init */
static void intel_me_init(struct device *dev) static void intel_me_init(struct device *dev)
{ {