Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6feff6d4 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc/powernv: More little endian issues in OPAL RTC driver 



Sparse caught an issue where opal_set_rtc_time was incorrectly
byteswapping. Also fix a number of sparse warnings.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 29186097

arch/powerpc/include/asm/opal.h

+2 −2
Original line number Diff line number Diff line
@@ -543,8 +543,8 @@ int64_t opal_console_read(int64_t term_number, __be64 *length, 
			  uint8_t *buffer);

int64_t opal_console_write_buffer_space(int64_t term_number,

					__be64 *length);

int64_t opal_rtc_read(uint32_t *year_month_day,

		      uint64_t *hour_minute_second_millisecond);

int64_t opal_rtc_read(__be32 *year_month_day,

		      __be64 *hour_minute_second_millisecond);

int64_t opal_rtc_write(uint32_t year_month_day,

		       uint64_t hour_minute_second_millisecond);

int64_t opal_cec_power_down(uint64_t request);

arch/powerpc/platforms/powernv/opal-rtc.c

+10 −9
Original line number Diff line number Diff line
@@ -37,10 +37,12 @@ unsigned long __init opal_get_boot_time(void) 
	struct rtc_time tm;

	u32 y_m_d;

	u64 h_m_s_ms;

	__be32 __y_m_d;

	__be64 __h_m_s_ms;

	long rc = OPAL_BUSY;



	while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {

		rc = opal_rtc_read(&y_m_d, &h_m_s_ms);

		rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms);

		if (rc == OPAL_BUSY_EVENT)

			opal_poll_events(NULL);

		else
@@ -48,8 +50,8 @@ unsigned long __init opal_get_boot_time(void) 
	}

	if (rc != OPAL_SUCCESS)

		return 0;

	y_m_d = be32_to_cpu(y_m_d);

	h_m_s_ms = be64_to_cpu(h_m_s_ms);

	y_m_d = be32_to_cpu(__y_m_d);

	h_m_s_ms = be64_to_cpu(__h_m_s_ms);

	opal_to_tm(y_m_d, h_m_s_ms, &tm);

	return mktime(tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,

		      tm.tm_hour, tm.tm_min, tm.tm_sec);
@@ -60,9 +62,11 @@ void opal_get_rtc_time(struct rtc_time *tm) 
	long rc = OPAL_BUSY;

	u32 y_m_d;

	u64 h_m_s_ms;

	__be32 __y_m_d;

	__be64 __h_m_s_ms;



	while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {

		rc = opal_rtc_read(&y_m_d, &h_m_s_ms);

		rc = opal_rtc_read(&__y_m_d, &__h_m_s_ms);

		if (rc == OPAL_BUSY_EVENT)

			opal_poll_events(NULL);

		else
@@ -70,8 +74,8 @@ void opal_get_rtc_time(struct rtc_time *tm) 
	}

	if (rc != OPAL_SUCCESS)

		return;

	y_m_d = be32_to_cpu(y_m_d);

	h_m_s_ms = be64_to_cpu(h_m_s_ms);

	y_m_d = be32_to_cpu(__y_m_d);

	h_m_s_ms = be64_to_cpu(__h_m_s_ms);

	opal_to_tm(y_m_d, h_m_s_ms, tm);

}
@@ -90,9 +94,6 @@ int opal_set_rtc_time(struct rtc_time *tm) 
	h_m_s_ms |= ((u64)bin2bcd(tm->tm_min)) << 48;

	h_m_s_ms |= ((u64)bin2bcd(tm->tm_sec)) << 40;



	y_m_d = cpu_to_be32(y_m_d);

	h_m_s_ms = cpu_to_be64(h_m_s_ms);



	while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {

		rc = opal_rtc_write(y_m_d, h_m_s_ms);

		if (rc == OPAL_BUSY_EVENT)