File librtas.fix_args_conversion_for_paltform-dump_c... of Package librtas.156

Overview Repositories Revisions Requests Users Attributes Meta

File librtas.fix_args_conversion_for_paltform-dump_call.patch of Package librtas.156

commit 8ef7f827e28e3cd284f6be5686a987786be7502d
Author: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date:   Fri Oct 17 10:16:16 2014 -0400

This patch fixes the conversion of args for paltform-dump call.
    platform dump passes 64bit values as, a pair of 32bit values.
    val_hi and val_lo. So when we convert a value 'X' to 32bit hi and lo
    values in BE, we should follow the below approach :
    
    X_hi = htobe32(BITS32_HI(X))
    X_lo = htobe32(BITS32_LO(X))
    
    and NOT
    X_tmp = htobe64(X);
    X_hi = BITS32_HI(X_tmp), X_lo = BITS32_LO(X_tmp)
    
    This patch has been tested with rtas_errd/extract_platdump to retrieve a
    dump from FSP.
    
    Signed-off-by: Suzuki K. Poulose <suzuki@in.ibm.com>

diff --git a/librtas_src/syscall_calls.c b/librtas_src/syscall_calls.c
index 5bd6486..29ab613 100644
--- a/librtas_src/syscall_calls.c
+++ b/librtas_src/syscall_calls.c
@@ -930,6 +930,7 @@ sc_platform_dump(int token, uint64_t dump_tag, uint64_t sequence, void *buffer,
 	uint32_t kernbuf_pa = 0;
 	uint32_t next_hi, next_lo;
 	uint32_t bytes_hi, bytes_lo;
+	uint32_t dump_tag_hi, dump_tag_lo;
 	void *kernbuf;
 	int status;
 	int rc;
@@ -939,22 +940,29 @@ sc_platform_dump(int token, uint64_t dump_tag, uint64_t sequence, void *buffer,
 		if (rc)
 			return rc;
 	}
+	/*
+	 * Converting a 64bit host value to 32bit BE, _hi and _lo
+	 * pair is tricky: we should convert the _hi and _lo 32bits
+	 * of the 64bit host value.
+	 */
+	dump_tag_hi = htobe32(BITS32_HI(dump_tag));
+	dump_tag_lo = htobe32(BITS32_LO(dump_tag));
+
+	next_hi = htobe32(BITS32_HI(sequence));
+	next_lo = htobe32(BITS32_LO(sequence));
 
-	*seq_next = htobe64(sequence);
 	do {
-		sequence = *seq_next;
-		rc = sc_rtas_call(token, 6, 5, BITS32_HI(htobe64(dump_tag)),
-				  BITS32_LO(htobe64(dump_tag)),
-				  BITS32_HI(sequence),
-				  BITS32_LO(sequence),
+		rc = sc_rtas_call(token, 6, 5, dump_tag_hi,
+				  dump_tag_lo,
+				  next_hi,
+				  next_lo,
 				  htobe32(kernbuf_pa), htobe32(length),
 				  &status, &next_hi, &next_lo, &bytes_hi,
 				  &bytes_lo);
 		if (rc < 0)
 			break;
-		
-		*seq_next = BITS64(next_hi, next_lo);
-		dbg1("%s: seq_next = 0x%llx\n", __FUNCTION__, *seq_next);
+		sequence = BITS64(be32toh(next_hi), be32toh(next_lo));
+		dbg1("%s: seq_next = 0x%llx\n", __FUNCTION__, sequence);
 
 		rc = handle_delay(status, &elapsed);
 	} while (rc == CALL_AGAIN);
@@ -965,9 +973,10 @@ sc_platform_dump(int token, uint64_t dump_tag, uint64_t sequence, void *buffer,
 	if (kernbuf)
 		(void)sc_free_rmo_buffer(kernbuf, kernbuf_pa, length);
 
+	*seq_next = sequence;
+	bytes_hi = be32toh(bytes_hi);
+	bytes_lo = be32toh(bytes_lo);
 	*bytes_ret = BITS64(bytes_hi, bytes_lo);
-	*seq_next = be64toh(*seq_next);
-	*bytes_ret = be64toh(*bytes_ret);
 
 	dbg1("(0x%llx, 0x%llx, %p, %d, %p, %p) = %d, 0x%llx, 0x%llx\n",
 	     dump_tag, sequence, buffer, length, seq_next, bytes_ret,

Places

File librtas.fix_args_conversion_for_paltform-dump_call.patch of Package librtas.156

Places