hdata: Remove legacy SPIRA structure

skiboot only supports POWER8 > DD1 now, all supported platforms
should use the new SPIRA-S/H structure.

Signed-off-by: Nicholas Piggin <[email protected]>
Signed-off-by: Reza Arbab <[email protected]>

Author: npiggin

hdata/fsp.c

@@ -282,7 +282,7 @@ static void add_chip_id_to_sensors(struct dt_node *sensor_node, uint32_t slca_in
 		return;
 	}
 
-	for_each_ntuple_idx(&spira.ntuples.proc_chip, hdif, i, SPPCRD_HDIF_SIG) {
+	for_each_ntuple_idx(&spiras->ntuples.proc_chip, hdif, i, SPPCRD_HDIF_SIG) {
 		fru_id = HDIF_get_idata(hdif, SPPCRD_IDATA_FRU_ID, NULL);
 		if (!fru_id)
 			return;
@@ -309,7 +309,7 @@ static void add_ipmi_sensors(struct dt_node *bmc_node)
 	const struct ipmi_sensors *ipmi_sensors;
 	struct dt_node *sensors_node, *sensor_node;
 
-	hdif_sensor = get_hdif(&spira.ntuples.ipmi_sensor, IPMI_SENSORS_HDIF_SIG);
+	hdif_sensor = get_hdif(&spiras->ntuples.ipmi_sensor, IPMI_SENSORS_HDIF_SIG);
 	if (!hdif_sensor) {
 		prlog(PR_DEBUG, "SENSORS: Missing IPMI sensors mappings tuple\n");
 		return;
@@ -498,11 +498,11 @@ void bmc_parse(void)
 	const void *sp;
 	int i;
 
-	sp = get_hdif(&spira.ntuples.sp_subsys, SPSS_HDIF_SIG);
+	sp = get_hdif(&spiras->ntuples.sp_subsys, SPSS_HDIF_SIG);
 	if (!sp)
 		return;
 
-	for_each_ntuple_idx(&spira.ntuples.sp_subsys, sp, i, SPSS_HDIF_SIG) {
+	for_each_ntuple_idx(&spiras->ntuples.sp_subsys, sp, i, SPSS_HDIF_SIG) {
 		if (find_service_proc_type(sp, i) == SP_BMC) {
 			bmc_create_node(sp);
 			found = true;
@@ -520,13 +520,13 @@ void fsp_parse(void)
 	int index;
 
 	/* Find SPSS tuple in SPIRA */
-	sp = get_hdif(&spira.ntuples.sp_subsys, SPSS_HDIF_SIG);
+	sp = get_hdif(&spiras->ntuples.sp_subsys, SPSS_HDIF_SIG);
 	if (!sp) {
 		prlog(PR_WARNING, "HDAT: No FSP/BMC found!\n");
 		return;
 	}
 
-	for_each_ntuple_idx(&spira.ntuples.sp_subsys, sp, index, SPSS_HDIF_SIG) {
+	for_each_ntuple_idx(&spiras->ntuples.sp_subsys, sp, index, SPSS_HDIF_SIG) {
 		switch (find_service_proc_type(sp, index)) {
 		case SP_FSP:
 			if (!fsp_root) {

hdata/iohub.c

@@ -868,7 +868,7 @@ void io_parse(void)
 	unsigned int i, size;
 
 	/* Look for IO Hubs */
-	if (!get_hdif(&spira.ntuples.cec_iohub_fru, "IO HUB")) {
+	if (!get_hdif(&spiras->ntuples.cec_iohub_fru, "IO HUB")) {
 		prerror("CEC: Cannot locate IO Hub FRU data !\n");
 		return;
 	}
@@ -881,7 +881,7 @@ void io_parse(void)
 	 * increment it for each chip. Works for the machines I have here
 	 */
 
-	for_each_ntuple_idx(&spira.ntuples.cec_iohub_fru, sp_iohubs, i,
+	for_each_ntuple_idx(&spiras->ntuples.cec_iohub_fru, sp_iohubs, i,
 			    CECHUB_FRU_HDIF_SIG) {
 		const struct cechub_hub_fru_id *fru_id_data;
 		unsigned int type;

hdata/memory.c

@@ -236,7 +236,7 @@ static void add_bus_freq_to_ram_area(struct dt_node *ram_node, u32 chip_id)
 	u64 freq;
 	u32 size;
 
-	pcia = get_hdif(&spira.ntuples.pcia, SPPCIA_HDIF_SIG);
+	pcia = get_hdif(&spiras->ntuples.pcia, SPPCIA_HDIF_SIG);
 	if (!pcia) {
 		prlog(PR_WARNING, "HDAT: Failed to add memory bus frequency "
 		      "as PCIA does not exist\n");
@@ -897,15 +897,15 @@ static bool __memory_parse(struct dt_node *root)
 	const struct msvpd_total_config_ms *tcms;
 	unsigned int size;
 
-	ms_vpd = get_hdif(&spira.ntuples.ms_vpd, MSVPD_HDIF_SIG);
+	ms_vpd = get_hdif(&spiras->ntuples.ms_vpd, MSVPD_HDIF_SIG);
 	if (!ms_vpd) {
 		prerror("MS VPD: invalid\n");
 		op_display(OP_FATAL, OP_MOD_MEM, 0x0000);
 		return false;
 	}
-	if (be32_to_cpu(spira.ntuples.ms_vpd.act_len) < sizeof(*ms_vpd)) {
+	if (be32_to_cpu(spiras->ntuples.ms_vpd.act_len) < sizeof(*ms_vpd)) {
 		prerror("MS VPD: invalid size %u\n",
-			be32_to_cpu(spira.ntuples.ms_vpd.act_len));
+			be32_to_cpu(spiras->ntuples.ms_vpd.act_len));
 		op_display(OP_FATAL, OP_MOD_MEM, 0x0001);
 		return false;
 	}

hdata/naca.c

@@ -9,9 +9,9 @@
 __section(".naca.data") struct naca naca = {
 	.spirah_addr = CPU_TO_BE64(SPIRAH_OFF),
 	.hv_release_data_addr = CPU_TO_BE64(NACA_OFF + offsetof(struct naca, hv_release_data)),
-	.spira_addr = CPU_TO_BE64(SPIRA_OFF),
+	.spira_addr = 0,
 	.lid_table_addr = CPU_TO_BE64(NACA_OFF + offsetof(struct naca, hv_lid_load_table)),
-	.spira_size = CPU_TO_BE32(SPIRA_ACTUAL_SIZE),
+	.spira_size = 0,
 	.hv_load_map_addr = 0,
 	.attn_enabled = 0,
 	.pcia_supported = 1,

hdata/pcia.c

@@ -15,8 +15,8 @@
 
 static unsigned int pcia_index(const void *pcia)
 {
-	return (pcia - (void *)get_hdif(&spira.ntuples.pcia, "SPPCIA"))
-		/ be32_to_cpu(spira.ntuples.pcia.alloc_len);
+	return (pcia - (void *)get_hdif(&spiras->ntuples.pcia, "SPPCIA"))
+		/ be32_to_cpu(spiras->ntuples.pcia.alloc_len);
 }
 
 static const struct sppcia_cpu_thread *find_tada(const void *pcia,
@@ -180,7 +180,7 @@ bool pcia_parse(void)
 	const void *pcia;
 	struct dt_node *cpus;
 
-	pcia = get_hdif(&spira.ntuples.pcia, "SPPCIA");
+	pcia = get_hdif(&spiras->ntuples.pcia, "SPPCIA");
 	if (!pcia)
 		return false;
 

hdata/slca.c

@@ -13,7 +13,7 @@ const struct slca_entry *slca_get_entry(uint16_t slca_index)
 	struct HDIF_common_hdr *slca_hdr;
 	int count;
 
-	slca_hdr = get_hdif(&spira.ntuples.slca, SLCA_HDIF_SIG);
+	slca_hdr = get_hdif(&spiras->ntuples.slca, SLCA_HDIF_SIG);
 	if (!slca_hdr) {
 		prerror("SLCA Invalid\n");
 		return NULL;
@@ -89,7 +89,7 @@ static const struct slca_entry *slca_get_sai_entry(void)
 	struct HDIF_common_hdr *slca_hdr;
 	uint16_t sai_fru_id = SLCA_SAI_INDICATOR_ID;
 
-	slca_hdr = get_hdif(&spira.ntuples.slca, SLCA_HDIF_SIG);
+	slca_hdr = get_hdif(&spiras->ntuples.slca, SLCA_HDIF_SIG);
 	if (!slca_hdr) {
 		prerror("SLCA Invalid\n");
 		return NULL;