opal-api: add endian conversions to most opal calls

This adds missing endian conversions to most calls, sufficient at least
to handle calls from a kernel booting on mambo.

Subsystems requiring more extensive changes (e.g., xive) will be done
with individual changes.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>

3 files changed, 33 insertions, 26 deletions

diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c
index 1a2ecab..624efb4 100644
--- a/hw/fsp/fsp-console.c
+++ b/hw/fsp/fsp-console.c
@@ -579,7 +579,7 @@ void fsp_console_preinit(void)
 
 }
 
-static int64_t fsp_console_write(int64_t term_number, int64_t *length,
+static int64_t fsp_console_write(int64_t term_number, __be64 *__length,
 				 const uint8_t *buffer)
 {
 	struct fsp_serial *fs;
@@ -596,7 +596,7 @@ static int64_t fsp_console_write(int64_t term_number, int64_t *length,
 		return OPAL_CLOSED;
 	}
 	/* Clamp to a reasonable size */
-	requested = *length;
+	requested = be64_to_cpu(*__length);
 	if (requested > 0x1000)
 		requested = 0x1000;
 	written = fsp_write_vserial(fs, buffer, requested);
@@ -618,7 +618,7 @@ static int64_t fsp_console_write(int64_t term_number, int64_t *length,
 	      buffer[6], buffer[6], buffer[7], buffer[7]);
 #endif /* OPAL_DEBUG_CONSOLE_IO */
 
-	*length = written;
+	*__length = cpu_to_be64(written);
 	unlock(&fsp_con_lock);
 
 	if (written)
@@ -628,11 +628,12 @@ static int64_t fsp_console_write(int64_t term_number, int64_t *length,
 }
 
 static int64_t fsp_console_write_buffer_space(int64_t term_number,
-					      int64_t *length)
+					      __be64 *__length)
 {
 	static bool elog_generated = false;
 	struct fsp_serial *fs;
 	struct fsp_serbuf_hdr *sb;
+	int64_t length;
 
 	if (term_number < 0 || term_number >= MAX_SERIAL)
 		return OPAL_PARAMETER;
@@ -645,15 +646,16 @@ static int64_t fsp_console_write_buffer_space(int64_t term_number,
 		return OPAL_CLOSED;
 	}
 	sb = fs->out_buf;
-	*length = (sb->next_out + SER_BUF_DATA_SIZE - sb->next_in - 1)
+	length = (sb->next_out + SER_BUF_DATA_SIZE - sb->next_in - 1)
 		% SER_BUF_DATA_SIZE;
 	unlock(&fsp_con_lock);
 
 	/* Console buffer has enough space to write incoming data */
-	if (*length != fs->out_buf_prev_len) {
-		fs->out_buf_prev_len = *length;
+	if (length != fs->out_buf_prev_len) {
+		fs->out_buf_prev_len = length;
 		fs->out_buf_timeout = 0;
 
+		*__length = cpu_to_be64(length);
 		return OPAL_SUCCESS;
 	}
 
@@ -667,8 +669,10 @@ static int64_t fsp_console_write_buffer_space(int64_t term_number,
 			secs_to_tb(SER_BUFFER_OUT_TIMEOUT);
 	}
 
-	if (tb_compare(mftb(), fs->out_buf_timeout) != TB_AAFTERB)
+	if (tb_compare(mftb(), fs->out_buf_timeout) != TB_AAFTERB) {
+		*__length = cpu_to_be64(length);
 		return OPAL_SUCCESS;
+	}
 
 	/*
 	 * FSP is still active but not reading console data. Hence
@@ -686,13 +690,13 @@ static int64_t fsp_console_write_buffer_space(int64_t term_number,
 	return OPAL_RESOURCE;
 }
 
-static int64_t fsp_console_read(int64_t term_number, int64_t *length,
+static int64_t fsp_console_read(int64_t term_number, __be64 *__length,
 				uint8_t *buffer)
 {
 	struct fsp_serial *fs;
 	struct fsp_serbuf_hdr *sb;
 	bool pending = false;
-	uint32_t old_nin, n, i, chunk, req = *length;
+	uint32_t old_nin, n, i, chunk, req = be64_to_cpu(*__length);
 	int rc = OPAL_SUCCESS;
 
 	if (term_number < 0 || term_number >= MAX_SERIAL)
@@ -716,7 +720,7 @@ static int64_t fsp_console_read(int64_t term_number, int64_t *length,
 		pending = true;
 		n = req;
 	}
-	*length = n;
+	*__length = cpu_to_be64(n);
 
 	chunk = SER_BUF_DATA_SIZE - sb->next_out;
 	if (chunk > n)
diff --git a/hw/fsp/fsp-rtc.c b/hw/fsp/fsp-rtc.c
index 53838f8..e68836e 100644
--- a/hw/fsp/fsp-rtc.c
+++ b/hw/fsp/fsp-rtc.c
@@ -249,12 +249,13 @@ static int64_t fsp_rtc_send_read_request(void)
 	return OPAL_BUSY_EVENT;
 }
 
-static int64_t fsp_opal_rtc_read(uint32_t *year_month_day,
-				 uint64_t *hour_minute_second_millisecond)
+static int64_t fsp_opal_rtc_read(__be32 *__ymd, __be64 *__hmsm)
 {
 	int64_t rc;
+	uint32_t ymd;
+	uint64_t hmsm;
 
-	if (!year_month_day || !hour_minute_second_millisecond)
+	if (!__ymd || !__hmsm)
 		return OPAL_PARAMETER;
 
 	lock(&rtc_lock);
@@ -267,8 +268,7 @@ static int64_t fsp_opal_rtc_read(uint32_t *year_month_day,
 	/* During R/R of FSP, read cached TOD */
 	if (fsp_in_rr()) {
 		if (rtc_tod_state == RTC_TOD_VALID) {
-			rtc_cache_get_datetime(year_month_day,
-					       hour_minute_second_millisecond);
+			rtc_cache_get_datetime(&ymd, &hmsm);
 			rc = OPAL_SUCCESS;
 		} else {
 			rc = OPAL_INTERNAL_ERROR;
@@ -290,11 +290,9 @@ static int64_t fsp_opal_rtc_read(uint32_t *year_month_day,
                 opal_rtc_eval_events(true);
 
                 if (rtc_tod_state == RTC_TOD_VALID) {
-                        rtc_cache_get_datetime(year_month_day,
-					       hour_minute_second_millisecond);
+                        rtc_cache_get_datetime(&ymd, &hmsm);
                         prlog(PR_TRACE,"FSP-RTC Cached datetime: %x %llx\n",
-                              *year_month_day,
-                              *hour_minute_second_millisecond);
+                              ymd, hmsm);
                         rc = OPAL_SUCCESS;
                 } else {
                         rc = OPAL_INTERNAL_ERROR;
@@ -306,8 +304,7 @@ static int64_t fsp_opal_rtc_read(uint32_t *year_month_day,
 		prlog(PR_TRACE, "RTC read timed out\n");
 
 		if (rtc_tod_state == RTC_TOD_VALID) {
-			rtc_cache_get_datetime(year_month_day,
-					       hour_minute_second_millisecond);
+			rtc_cache_get_datetime(&ymd, &hmsm);
 			rc = OPAL_SUCCESS;
 		} else {
                         rc = OPAL_INTERNAL_ERROR;
@@ -319,6 +316,12 @@ static int64_t fsp_opal_rtc_read(uint32_t *year_month_day,
 	}
 out:
 	unlock(&rtc_lock);
+
+	if (rc == OPAL_SUCCESS) {
+		*__ymd = cpu_to_be32(ymd);
+		*__hmsm = cpu_to_be64(hmsm);
+	}
+
 	return rc;
 }
 
diff --git a/hw/fsp/fsp-sensor.c b/hw/fsp/fsp-sensor.c
index 43c8ce4..74deac7 100644
--- a/hw/fsp/fsp-sensor.c
+++ b/hw/fsp/fsp-sensor.c
@@ -70,7 +70,7 @@ enum spcn_attr {
 /* Parsed sensor attributes, passed through OPAL */
 struct opal_sensor_data {
 	uint64_t	async_token;	/* Asynchronous token */
-	uint64_t	*sensor_data;	/* Kernel pointer to copy data */
+	__be64		*sensor_data;	/* Kernel pointer to copy data */
 	enum spcn_attr	spcn_attr;	/* Modifier attribute */
 	uint16_t	rid;		/* Sensor RID */
 	uint8_t		frc;		/* Sensor resource class */
@@ -243,7 +243,7 @@ static void fsp_sensor_process_data(struct opal_sensor_data *attr)
 		sensor_buf_ptr += spcn_mod_data[attr->mod_index].entry_size;
 	}
 
-	*(attr->sensor_data) = sensor_data;
+	*attr->sensor_data = cpu_to_be64(sensor_data);
 	if (sensor_data == INVALID_DATA)
 		queue_msg_for_delivery(OPAL_PARTIAL, attr);
 	else
@@ -345,7 +345,7 @@ static void fsp_sensor_read_complete(struct fsp_msg *msg)
 	unlock(&sensor_lock);
 	return;
 err:
-	*(attr->sensor_data) = INVALID_DATA;
+	*attr->sensor_data = cpu_to_be64(INVALID_DATA);
 	queue_msg_for_delivery(rc, attr);
 	unlock(&sensor_lock);
 	log_simple_error(&e_info(OPAL_RC_SENSOR_ASYNC_COMPLETE),
@@ -496,7 +496,7 @@ static int64_t parse_sensor_id(uint32_t handler, struct opal_sensor_data *attr)
 
 
 int64_t fsp_opal_read_sensor(uint32_t sensor_hndl, int token,
-		uint64_t *sensor_data)
+				__be64 *sensor_data)
 {
 	struct opal_sensor_data *attr;
 	int64_t rc;