* [PATCH] powerpc/powernv: Fix endian issues in memory error handling code
@ 2014-06-04 4:48 Anton Blanchard
2014-06-06 18:14 ` Mahesh J Salgaonkar
0 siblings, 1 reply; 2+ messages in thread
From: Anton Blanchard @ 2014-06-04 4:48 UTC (permalink / raw)
To: benh, paulus, mahesh; +Cc: linuxppc-dev
struct OpalMemoryErrorData is passed to us from firmware, so we
have to byteswap it.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Having enums in a firmware interface concerns me, but that cleanup
can be in a subsequent patch.
Mahesh, could you give this a test to see if it works?
Index: b/arch/powerpc/include/asm/opal.h
===================================================================
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -482,7 +482,7 @@ enum OpalMemErr_DynErrType {
struct OpalMemoryErrorData {
enum OpalMemErr_Version version:8; /* 0x00 */
enum OpalMemErrType type:8; /* 0x01 */
- uint16_t flags; /* 0x02 */
+ __be16 flags; /* 0x02 */
uint8_t reserved_1[4]; /* 0x04 */
union {
@@ -490,15 +490,15 @@ struct OpalMemoryErrorData {
struct {
enum OpalMemErr_ResilErrType resil_err_type:8;
uint8_t reserved_1[7];
- uint64_t physical_address_start;
- uint64_t physical_address_end;
+ __be64 physical_address_start;
+ __be64 physical_address_end;
} resilience;
/* Dynamic memory deallocation error info */
struct {
enum OpalMemErr_DynErrType dyn_err_type:8;
uint8_t reserved_1[7];
- uint64_t physical_address_start;
- uint64_t physical_address_end;
+ __be64 physical_address_start;
+ __be64 physical_address_end;
} dyn_dealloc;
} u;
};
Index: b/arch/powerpc/platforms/powernv/opal-memory-errors.c
===================================================================
--- a/arch/powerpc/platforms/powernv/opal-memory-errors.c
+++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c
@@ -47,12 +47,12 @@ static void handle_memory_error_event(st
__func__, merr_evt->type);
switch (merr_evt->type) {
case OPAL_MEM_ERR_TYPE_RESILIENCE:
- paddr_start = merr_evt->u.resilience.physical_address_start;
- paddr_end = merr_evt->u.resilience.physical_address_end;
+ paddr_start = be64_to_cpu(merr_evt->u.resilience.physical_address_start);
+ paddr_end = be64_to_cpu(merr_evt->u.resilience.physical_address_end);
break;
case OPAL_MEM_ERR_TYPE_DYN_DALLOC:
- paddr_start = merr_evt->u.dyn_dealloc.physical_address_start;
- paddr_end = merr_evt->u.dyn_dealloc.physical_address_end;
+ paddr_start = be64_to_cpu(merr_evt->u.dyn_dealloc.physical_address_start);
+ paddr_end = be64_to_cpu(merr_evt->u.dyn_dealloc.physical_address_end);
break;
default:
return;
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] powerpc/powernv: Fix endian issues in memory error handling code
2014-06-04 4:48 [PATCH] powerpc/powernv: Fix endian issues in memory error handling code Anton Blanchard
@ 2014-06-06 18:14 ` Mahesh J Salgaonkar
0 siblings, 0 replies; 2+ messages in thread
From: Mahesh J Salgaonkar @ 2014-06-06 18:14 UTC (permalink / raw)
To: Anton Blanchard; +Cc: paulus, linuxppc-dev
On 2014-06-04 14:48:48 Wed, Anton Blanchard wrote:
> struct OpalMemoryErrorData is passed to us from firmware, so we
> have to byteswap it.
>
> Signed-off-by: Anton Blanchard <anton@samba.org>
Tested-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
> ---
>
> Having enums in a firmware interface concerns me, but that cleanup
> can be in a subsequent patch.
>
> Mahesh, could you give this a test to see if it works?
>
> Index: b/arch/powerpc/include/asm/opal.h
> ===================================================================
> --- a/arch/powerpc/include/asm/opal.h
> +++ b/arch/powerpc/include/asm/opal.h
> @@ -482,7 +482,7 @@ enum OpalMemErr_DynErrType {
> struct OpalMemoryErrorData {
> enum OpalMemErr_Version version:8; /* 0x00 */
> enum OpalMemErrType type:8; /* 0x01 */
> - uint16_t flags; /* 0x02 */
> + __be16 flags; /* 0x02 */
> uint8_t reserved_1[4]; /* 0x04 */
>
> union {
> @@ -490,15 +490,15 @@ struct OpalMemoryErrorData {
> struct {
> enum OpalMemErr_ResilErrType resil_err_type:8;
> uint8_t reserved_1[7];
> - uint64_t physical_address_start;
> - uint64_t physical_address_end;
> + __be64 physical_address_start;
> + __be64 physical_address_end;
> } resilience;
> /* Dynamic memory deallocation error info */
> struct {
> enum OpalMemErr_DynErrType dyn_err_type:8;
> uint8_t reserved_1[7];
> - uint64_t physical_address_start;
> - uint64_t physical_address_end;
> + __be64 physical_address_start;
> + __be64 physical_address_end;
> } dyn_dealloc;
> } u;
> };
> Index: b/arch/powerpc/platforms/powernv/opal-memory-errors.c
> ===================================================================
> --- a/arch/powerpc/platforms/powernv/opal-memory-errors.c
> +++ b/arch/powerpc/platforms/powernv/opal-memory-errors.c
> @@ -47,12 +47,12 @@ static void handle_memory_error_event(st
> __func__, merr_evt->type);
> switch (merr_evt->type) {
> case OPAL_MEM_ERR_TYPE_RESILIENCE:
> - paddr_start = merr_evt->u.resilience.physical_address_start;
> - paddr_end = merr_evt->u.resilience.physical_address_end;
> + paddr_start = be64_to_cpu(merr_evt->u.resilience.physical_address_start);
> + paddr_end = be64_to_cpu(merr_evt->u.resilience.physical_address_end);
> break;
> case OPAL_MEM_ERR_TYPE_DYN_DALLOC:
> - paddr_start = merr_evt->u.dyn_dealloc.physical_address_start;
> - paddr_end = merr_evt->u.dyn_dealloc.physical_address_end;
> + paddr_start = be64_to_cpu(merr_evt->u.dyn_dealloc.physical_address_start);
> + paddr_end = be64_to_cpu(merr_evt->u.dyn_dealloc.physical_address_end);
> break;
> default:
> return;
>
--
Mahesh J Salgaonkar
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-06 18:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-04 4:48 [PATCH] powerpc/powernv: Fix endian issues in memory error handling code Anton Blanchard
2014-06-06 18:14 ` Mahesh J Salgaonkar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).