diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2019-06-18 17:29:12 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-06-24 15:59:07 +1000 |
| commit | 30ea4db09c7cfde3ce12983f6a38bdf9b616287d (patch) | |
| tree | bb3ae50f188a27ae5b4bab99d021705aca169d4f | |
| parent | 1b07618e8a2d71308cf34950b98b70db02e64dea (diff) | |
| download | skiboot-30ea4db09c7cfde3ce12983f6a38bdf9b616287d.zip skiboot-30ea4db09c7cfde3ce12983f6a38bdf9b616287d.tar.gz skiboot-30ea4db09c7cfde3ce12983f6a38bdf9b616287d.tar.bz2 | |
Move core/hostservices.c to platforms/ibm-fsp/
It's only used on FSP systems so should really just be part of that
platform support.
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
| -rw-r--r-- | core/Makefile.inc | 2 | ||||
| -rw-r--r-- | hw/occ.c | 1 | ||||
| -rw-r--r-- | include/hostservices.h | 2 | ||||
| -rw-r--r-- | include/occ.h | 2 | ||||
| -rw-r--r-- | platforms/ibm-fsp/Makefile.inc | 3 | ||||
| -rw-r--r-- | platforms/ibm-fsp/hostservices.c (renamed from core/hostservices.c) | 0 |
6 files changed, 4 insertions, 6 deletions
diff --git a/core/Makefile.inc b/core/Makefile.inc index 21c12fb..64aa43c 100644 --- a/core/Makefile.inc +++ b/core/Makefile.inc @@ -5,7 +5,7 @@ CORE_OBJS = relocate.o console.o stack.o init.o chip.o mem_region.o CORE_OBJS += malloc.o lock.o cpu.o utils.o fdt.o opal.o interrupts.o timebase.o CORE_OBJS += opal-msg.o pci.o pci-virt.o pci-slot.o pcie-slot.o CORE_OBJS += pci-opal.o fast-reboot.o device.o exceptions.o trace.o affinity.o -CORE_OBJS += vpd.o hostservices.o platform.o nvram.o nvram-format.o hmi.o +CORE_OBJS += vpd.o platform.o nvram.o nvram-format.o hmi.o CORE_OBJS += console-log.o ipmi.o time-utils.o pel.o pool.o errorlog.o CORE_OBJS += timer.o i2c.o rtc.o flash.o sensor.o ipmi-opal.o CORE_OBJS += flash-subpartition.o bitmap.o buddy.o pci-quirk.o powercap.o psr.o @@ -22,7 +22,6 @@ #include <chip.h> #include <mem_region.h> #include <timebase.h> -#include <hostservices.h> #include <errorlog.h> #include <opal-api.h> #include <opal-msg.h> diff --git a/include/hostservices.h b/include/hostservices.h index bdff9da..ebd1a58 100644 --- a/include/hostservices.h +++ b/include/hostservices.h @@ -36,8 +36,6 @@ void host_services_occ_base_setup(void); #define HOMER_IMAGE_SIZE 0x400000 /* 4MB per-chip */ #define OCC_COMMON_SIZE 0x800000 /* 8MB */ -int find_master_and_slave_occ(uint64_t **master, uint64_t **slave, - int *nr_masters, int *nr_slaves); int hservice_send_error_log(uint32_t plid, uint32_t dsize, void *data); int hservice_wakeup(uint32_t i_core, uint32_t i_mode); int fsp_occ_reset_status(u64 chipid, s64 status); diff --git a/include/occ.h b/include/occ.h index 6b831e0..7ba6be8 100644 --- a/include/occ.h +++ b/include/occ.h @@ -20,6 +20,8 @@ extern void occ_pstates_init(void); extern void occ_fsp_init(void); +int find_master_and_slave_occ(uint64_t **master, uint64_t **slave, + int *nr_masters, int *nr_slaves); /* OCC interrupt for P8 */ extern void occ_p8_interrupt(uint32_t chip_id); diff --git a/platforms/ibm-fsp/Makefile.inc b/platforms/ibm-fsp/Makefile.inc index 653222f..1b751e5 100644 --- a/platforms/ibm-fsp/Makefile.inc +++ b/platforms/ibm-fsp/Makefile.inc @@ -1,7 +1,6 @@ SUBDIRS += $(PLATDIR)/ibm-fsp -IBM_FSP_OBJS = common.o lxvpd.o \ +IBM_FSP_OBJS = common.o lxvpd.o hostservices.o \ firenze.o firenze-pci.o zz.o IBM_FSP = $(PLATDIR)/ibm-fsp/built-in.a $(IBM_FSP): $(IBM_FSP_OBJS:%=$(PLATDIR)/ibm-fsp/%) - diff --git a/core/hostservices.c b/platforms/ibm-fsp/hostservices.c index d515f13..d515f13 100644 --- a/core/hostservices.c +++ b/platforms/ibm-fsp/hostservices.c |