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

sb/intel/bd82x6x/me_smm.c: Deduplicate finalisation code

Browse source 
The only difference between ME7 and ME8 is the MKHI message handling.
Remove duplicated code, and also clean up includes.

Change-Id: Ia44eb29d3509eb4208ba2aed9e0cf7e8f8d2c41a
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49992
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Evgeny Zinoviev <me@ch1p.io>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-01-27 12:29:30 +01:00
parent 5deff30059
commit 5152f16a2b
2 changed files with 16 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/southbridge/intel/bd82x6x/me.h
View file

@ -276,7 +276,6 @@ int intel_early_me_uma_size(void);
int intel_early_me_init_done(u8 status); int intel_early_me_init_done(u8 status);
void intel_me_finalize_smm(void); void intel_me_finalize_smm(void);
void intel_me8_finalize_smm(void);
typedef struct { typedef struct {
u32 major_version : 16; u32 major_version : 16;

72
src/southbridge/intel/bd82x6x/me_smm.c
View file

@ -1,15 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
#include <device/mmio.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#include <device/pci_ids.h> #include <device/pci.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#include <delay.h>
#include "me.h" #include "me.h"
#include "pch.h" #include "pch.h"
@ -41,38 +38,6 @@ static int me8_mkhi_end_of_post(void)
return 0; return 0;
} }
void intel_me8_finalize_smm(void)
{
struct me_hfs hfs;
u32 reg32;
update_mei_base_address();
/* S3 path will have hidden this device already */
if (!is_mei_base_address_valid())
return;
/* Make sure ME is in a mode that expects EOP */
reg32 = pci_read_config32(PCH_ME_DEV, PCI_ME_HFS);
memcpy(&hfs, &reg32, sizeof(u32));
/* Abort and leave device alone if not normal mode */
if (hfs.fpt_bad ||
hfs.working_state != ME_HFS_CWS_NORMAL ||
hfs.operation_mode != ME_HFS_MODE_NORMAL)
return;
/* Try to send EOP command so ME stops accepting other commands */
me8_mkhi_end_of_post();
/* Make sure IO is disabled */
pci_and_config16(PCH_ME_DEV, PCI_COMMAND,
~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
/* Hide the PCI device */
RCBA32_OR(FD2, PCH_DISABLE_MEI1);
}
/* Send END OF POST message to the ME */ /* Send END OF POST message to the ME */
static int me7_mkhi_end_of_post(void) static int me7_mkhi_end_of_post(void)
{ {
@ -97,7 +62,7 @@ static int me7_mkhi_end_of_post(void)
return 0; return 0;
} }
static void intel_me7_finalize_smm(void) void intel_me_finalize_smm(void)
{ {
struct me_hfs hfs; struct me_hfs hfs;
u32 reg32; u32 reg32;
@ -119,7 +84,17 @@ static void intel_me7_finalize_smm(void)
return; return;
/* Try to send EOP command so ME stops accepting other commands */ /* Try to send EOP command so ME stops accepting other commands */
me7_mkhi_end_of_post(); const u16 did = pci_read_config16(PCH_ME_DEV, PCI_DEVICE_ID);
switch (did) {
case 0x1c3a:
me7_mkhi_end_of_post();
break;
case 0x1e3a:
me8_mkhi_end_of_post();
break;
default:
printk(BIOS_ERR, "No finalize handler for ME %04x.\n", did);
}
/* Make sure IO is disabled */ /* Make sure IO is disabled */
pci_and_config16(PCH_ME_DEV, PCI_COMMAND, pci_and_config16(PCH_ME_DEV, PCI_COMMAND,
@ -128,18 +103,3 @@ static void intel_me7_finalize_smm(void)
/* Hide the PCI device */ /* Hide the PCI device */
RCBA32_OR(FD2, PCH_DISABLE_MEI1); RCBA32_OR(FD2, PCH_DISABLE_MEI1);
} }
void intel_me_finalize_smm(void)
{
u16 did = pci_read_config16(PCH_ME_DEV, PCI_DEVICE_ID);
switch (did) {
case 0x1c3a:
intel_me7_finalize_smm();
break;
case 0x1e3a:
intel_me8_finalize_smm();
break;
default:
printk(BIOS_ERR, "No finalize handler for ME %04x.\n", did);
}
}