[Skiboot] [PATCH 05/17] host_services_occ_base_setup is core homer code not host_services

Stewart Smith stewart at linux.ibm.com
Tue Jun 18 17:29:13 AEST 2019


Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
 hw/homer.c                       | 25 +++++++++++++++++++++++++
 include/hostservices.h           |  1 -
 platforms/ibm-fsp/hostservices.c | 24 ------------------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/hw/homer.c b/hw/homer.c
index 34ee3370d63f..964a6e05d233 100644
--- a/hw/homer.c
+++ b/hw/homer.c
@@ -157,6 +157,31 @@ static void homer_init_chip(struct proc_chip *chip)
 	}
 }
 
+
+static void host_services_occ_base_setup(void)
+{
+	struct proc_chip *chip;
+	uint64_t occ_common;
+
+	chip = next_chip(NULL); /* Frist chip */
+	occ_common = (uint64_t) local_alloc(chip->id, OCC_COMMON_SIZE, OCC_COMMON_SIZE);
+
+	for_each_chip(chip) {
+		chip->occ_common_base = occ_common;
+		chip->occ_common_size = OCC_COMMON_SIZE;
+
+		chip->homer_base = (uint64_t) local_alloc(chip->id, HOMER_IMAGE_SIZE,
+							HOMER_IMAGE_SIZE);
+		chip->homer_size = HOMER_IMAGE_SIZE;
+		memset((void *)chip->homer_base, 0, chip->homer_size);
+
+		prlog(PR_DEBUG, "HBRT: Chip %d HOMER base %016llx : %08llx\n",
+		      chip->id, chip->homer_base, chip->homer_size);
+		prlog(PR_DEBUG, "HBRT: OCC common base %016llx : %08llx\n",
+		      chip->occ_common_base, chip->occ_common_size);
+	}
+}
+
 void homer_init(void)
 {
 	struct proc_chip *chip;
diff --git a/include/hostservices.h b/include/hostservices.h
index ebd1a5899617..06c5fe797b4f 100644
--- a/include/hostservices.h
+++ b/include/hostservices.h
@@ -24,7 +24,6 @@ bool hservices_lid_preload_complete(void);
 int host_services_occ_load(void);
 int host_services_occ_start(void);
 int host_services_occ_stop(void);
-void host_services_occ_base_setup(void);
 
 /* No LID can be larger than 16M, but OCC lid is less than 1 MB */
 
diff --git a/platforms/ibm-fsp/hostservices.c b/platforms/ibm-fsp/hostservices.c
index d515f13403f0..9de8a63b3906 100644
--- a/platforms/ibm-fsp/hostservices.c
+++ b/platforms/ibm-fsp/hostservices.c
@@ -735,30 +735,6 @@ out:
 	return rc;
 }
 
-void host_services_occ_base_setup(void)
-{
-	struct proc_chip *chip;
-	uint64_t occ_common;
-
-	chip = next_chip(NULL); /* Frist chip */
-	occ_common = (uint64_t) local_alloc(chip->id, OCC_COMMON_SIZE, OCC_COMMON_SIZE);
-
-	for_each_chip(chip) {
-		chip->occ_common_base = occ_common;
-		chip->occ_common_size = OCC_COMMON_SIZE;
-
-		chip->homer_base = (uint64_t) local_alloc(chip->id, HOMER_IMAGE_SIZE,
-							HOMER_IMAGE_SIZE);
-		chip->homer_size = HOMER_IMAGE_SIZE;
-		memset((void *)chip->homer_base, 0, chip->homer_size);
-
-		prlog(PR_DEBUG, "HBRT: Chip %d HOMER base %016llx : %08llx\n",
-		      chip->id, chip->homer_base, chip->homer_size);
-		prlog(PR_DEBUG, "HBRT: OCC common base %016llx : %08llx\n",
-		      chip->occ_common_base, chip->occ_common_size);
-	}
-}
-
 bool hservices_init(void)
 {
 	void *code = NULL;
-- 
2.21.0



More information about the Skiboot mailing list