iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/powernv: Fix endian issues in memory error handling code

Browse Source 
struct OpalMemoryErrorData is passed to us from firmware, so we
have to byteswap it.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard 2014-06-04 14:48:48 +10:00 committed by Benjamin Herrenschmidt
parent 2213fb142f
commit 223ca9d855
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/opal.h
View File

@ -510,7 +510,7 @@ enum OpalMemErr_DynErrType {
struct OpalMemoryErrorData { struct OpalMemoryErrorData {
enum OpalMemErr_Version version:8; /* 0x00 */ enum OpalMemErr_Version version:8; /* 0x00 */
enum OpalMemErrType type:8; /* 0x01 */ enum OpalMemErrType type:8; /* 0x01 */
uint16_t flags; /* 0x02 */ __be16 flags; /* 0x02 */
uint8_t reserved_1[4]; /* 0x04 */ uint8_t reserved_1[4]; /* 0x04 */
union { union {
@ -518,15 +518,15 @@ struct OpalMemoryErrorData {
struct { struct {
enum OpalMemErr_ResilErrType resil_err_type:8; enum OpalMemErr_ResilErrType resil_err_type:8;
uint8_t reserved_1[7]; uint8_t reserved_1[7];
uint64_t physical_address_start; __be64 physical_address_start;
uint64_t physical_address_end; __be64 physical_address_end;
} resilience; } resilience;
/* Dynamic memory deallocation error info */ /* Dynamic memory deallocation error info */
struct { struct {
enum OpalMemErr_DynErrType dyn_err_type:8; enum OpalMemErr_DynErrType dyn_err_type:8;
uint8_t reserved_1[7]; uint8_t reserved_1[7];
uint64_t physical_address_start; __be64 physical_address_start;
uint64_t physical_address_end; __be64 physical_address_end;
} dyn_dealloc; } dyn_dealloc;
} u; } u;
}; };

8
arch/powerpc/platforms/powernv/opal-memory-errors.c
View File

@ -47,12 +47,12 @@ static void handle_memory_error_event(struct OpalMemoryErrorData *merr_evt)
__func__, merr_evt->type); __func__, merr_evt->type);
switch (merr_evt->type) { switch (merr_evt->type) {
case OPAL_MEM_ERR_TYPE_RESILIENCE: case OPAL_MEM_ERR_TYPE_RESILIENCE:
paddr_start = merr_evt->u.resilience.physical_address_start; paddr_start = be64_to_cpu(merr_evt->u.resilience.physical_address_start);
paddr_end = merr_evt->u.resilience.physical_address_end; paddr_end = be64_to_cpu(merr_evt->u.resilience.physical_address_end);
break; break;
case OPAL_MEM_ERR_TYPE_DYN_DALLOC: case OPAL_MEM_ERR_TYPE_DYN_DALLOC:
paddr_start = merr_evt->u.dyn_dealloc.physical_address_start; paddr_start = be64_to_cpu(merr_evt->u.dyn_dealloc.physical_address_start);
paddr_end = merr_evt->u.dyn_dealloc.physical_address_end; paddr_end = be64_to_cpu(merr_evt->u.dyn_dealloc.physical_address_end);
break; break;
default: default:
return; return;