sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86: Replace some __SMM__ guards

Browse Source 
We generally do not guard source in attempts to reduce
the final object sizes, but rely on garbage collection.

Most of the __unused attributes inserted here will be
removed when remaining __SIMPLE_DEVICE__ guards can
be removed.

Change-Id: I2440931fab4f41d7e8249c082e6c9b5a9cd0ef13
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36641
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-11-05 18:50:38 +02:00
parent be5317f6d0
commit 21d6a27ac0
14 changed files with 72 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/southbridge/intel/ibexpeak/me.c
View File

@@ -23,20 +23,17 @@
*/
#include <arch/acpi.h>
#include <device/mmio.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/pci_ids.h>
#include <device/device.h>
#include <device/mmio.h>
#include <device/pci.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <string.h>
#include <delay.h>
#include <elog.h>
#ifndef __SMM__
#include <device/device.h>
#include <device/pci.h>
#endif
#include "me.h"
#include "pch.h"
@@ -44,9 +41,8 @@
#include <vendorcode/google/chromeos/gnvs.h>
#endif
#ifndef __SMM__
/* Path that the BIOS should take based on ME state */
static const char *me_bios_path_values[] = {
static const char *me_bios_path_values[] __unused = {
[ME_NORMAL_BIOS_PATH] = "Normal",
[ME_S3WAKE_BIOS_PATH] = "S3 Wake",
[ME_ERROR_BIOS_PATH] = "Error",
@@ -54,7 +50,6 @@ static const char *me_bios_path_values[] = {
[ME_DISABLE_BIOS_PATH] = "Disable",
[ME_FIRMWARE_UPDATE_BIOS_PATH] = "Firmware Update",
};
#endif
/* MMIO base address for MEI interface */
static u32 *mei_base_address;
@@ -111,7 +106,7 @@ static inline void mei_write_dword_ptr(void *ptr, int offset)
mei_dump(ptr, dword, offset, "WRITE");
}
#ifndef __SMM__
#ifndef __SIMPLE_DEVICE__
static inline void pci_read_dword_ptr(struct device *dev,void *ptr,
int offset)
{
@@ -131,7 +126,6 @@ static inline void write_host_csr(struct mei_csr *csr)
mei_write_dword_ptr(csr, MEI_H_CSR);
}
#ifdef __SMM__
static inline void read_me_csr(struct mei_csr *csr)
{
mei_read_dword_ptr(csr, MEI_ME_CSR_HA);
@@ -348,7 +342,7 @@ static inline int mei_sendrecv(struct mei_header *mei, struct mkhi_header *mkhi,
}
/* Send END OF POST message to the ME */
static int mkhi_end_of_post(void)
static int __unused mkhi_end_of_post(void)
{
struct mkhi_header mkhi = {
.group_id = MKHI_GROUP_ID_GEN,
@@ -371,6 +365,8 @@ static int mkhi_end_of_post(void)
return 0;
}
#ifdef __SIMPLE_DEVICE__
static void intel_me7_finalize_smm(void)
{
struct me_hfs hfs;
@@ -420,7 +416,7 @@ void intel_me_finalize_smm(void)
printk(BIOS_ERR, "No finalize handler for ME %08x.\n", did);
}
}
#else /* !__SMM__ */
#else /* !__SIMPLE_DEVICE__ */
/* Determine the path that we should take based on ME status */
static me_bios_path intel_me_path(struct device *dev)
@@ -629,4 +625,4 @@ static const struct pci_driver intel_me __pci_driver = {
.devices = pci_device_ids
};
#endif /* !__SMM__ */
#endif /* !__SIMPLE_DEVICE__ */