diff options
author | Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com> | 2015-02-06 03:52:07 -0500 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-02-24 21:35:38 -0500 |
commit | f1abd7dbb38535ab6ac6ba9ac81714118562cadf (patch) | |
tree | 713a04af6e695abb14fc8b90b3dbd37aa4399a4c | |
parent | 92bf200881d978bc3c6a290991ae1f9ddc7b5411 (diff) |
i40e/i40evf: Fix output of i40e_debug_aq() for big endian machines
The function i40e_debug_aq() prints information helpful in debugging
admin queue commands, but it doesn't do so correctly on big endian machines.
This patch adds the appropriate LExx_TO_CPU wrappers for big endian
architectures.
Also update the copyright year.
Change-ID: I4b2dc229ed5bf6dfe35632a58cddf53c21aff4b0
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_common.c | 31 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40e_common.c | 29 |
2 files changed, 37 insertions, 23 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c index 8dbf7dd984ca..6d630a03a13d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_common.c +++ b/drivers/net/ethernet/intel/i40e/i40e_common.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************************* | 1 | /******************************************************************************* |
2 | * | 2 | * |
3 | * Intel Ethernet Controller XL710 Family Linux Driver | 3 | * Intel Ethernet Controller XL710 Family Linux Driver |
4 | * Copyright(c) 2013 - 2014 Intel Corporation. | 4 | * Copyright(c) 2013 - 2015 Intel Corporation. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -94,16 +94,19 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, | |||
94 | 94 | ||
95 | i40e_debug(hw, mask, | 95 | i40e_debug(hw, mask, |
96 | "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n", | 96 | "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n", |
97 | aq_desc->opcode, aq_desc->flags, aq_desc->datalen, | 97 | le16_to_cpu(aq_desc->opcode), |
98 | aq_desc->retval); | 98 | le16_to_cpu(aq_desc->flags), |
99 | le16_to_cpu(aq_desc->datalen), | ||
100 | le16_to_cpu(aq_desc->retval)); | ||
99 | i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n", | 101 | i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n", |
100 | aq_desc->cookie_high, aq_desc->cookie_low); | 102 | le32_to_cpu(aq_desc->cookie_high), |
103 | le32_to_cpu(aq_desc->cookie_low)); | ||
101 | i40e_debug(hw, mask, "\tparam (0,1) 0x%08X 0x%08X\n", | 104 | i40e_debug(hw, mask, "\tparam (0,1) 0x%08X 0x%08X\n", |
102 | aq_desc->params.internal.param0, | 105 | le32_to_cpu(aq_desc->params.internal.param0), |
103 | aq_desc->params.internal.param1); | 106 | le32_to_cpu(aq_desc->params.internal.param1)); |
104 | i40e_debug(hw, mask, "\taddr (h,l) 0x%08X 0x%08X\n", | 107 | i40e_debug(hw, mask, "\taddr (h,l) 0x%08X 0x%08X\n", |
105 | aq_desc->params.external.addr_high, | 108 | le32_to_cpu(aq_desc->params.external.addr_high), |
106 | aq_desc->params.external.addr_low); | 109 | le32_to_cpu(aq_desc->params.external.addr_low)); |
107 | 110 | ||
108 | if ((buffer != NULL) && (aq_desc->datalen != 0)) { | 111 | if ((buffer != NULL) && (aq_desc->datalen != 0)) { |
109 | memset(data, 0, sizeof(data)); | 112 | memset(data, 0, sizeof(data)); |
@@ -116,15 +119,19 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, | |||
116 | if ((i % 16) == 15) { | 119 | if ((i % 16) == 15) { |
117 | i40e_debug(hw, mask, | 120 | i40e_debug(hw, mask, |
118 | "\t0x%04X %08X %08X %08X %08X\n", | 121 | "\t0x%04X %08X %08X %08X %08X\n", |
119 | i - 15, data[0], data[1], data[2], | 122 | i - 15, le32_to_cpu(data[0]), |
120 | data[3]); | 123 | le32_to_cpu(data[1]), |
124 | le32_to_cpu(data[2]), | ||
125 | le32_to_cpu(data[3])); | ||
121 | memset(data, 0, sizeof(data)); | 126 | memset(data, 0, sizeof(data)); |
122 | } | 127 | } |
123 | } | 128 | } |
124 | if ((i % 16) != 0) | 129 | if ((i % 16) != 0) |
125 | i40e_debug(hw, mask, "\t0x%04X %08X %08X %08X %08X\n", | 130 | i40e_debug(hw, mask, "\t0x%04X %08X %08X %08X %08X\n", |
126 | i - (i % 16), data[0], data[1], data[2], | 131 | i - (i % 16), le32_to_cpu(data[0]), |
127 | data[3]); | 132 | le32_to_cpu(data[1]), |
133 | le32_to_cpu(data[2]), | ||
134 | le32_to_cpu(data[3])); | ||
128 | } | 135 | } |
129 | } | 136 | } |
130 | 137 | ||
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_common.c b/drivers/net/ethernet/intel/i40evf/i40e_common.c index 28c40c57d4f5..50b0ee54fc06 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_common.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_common.c | |||
@@ -94,16 +94,19 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, | |||
94 | 94 | ||
95 | i40e_debug(hw, mask, | 95 | i40e_debug(hw, mask, |
96 | "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n", | 96 | "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n", |
97 | aq_desc->opcode, aq_desc->flags, aq_desc->datalen, | 97 | le16_to_cpu(aq_desc->opcode), |
98 | aq_desc->retval); | 98 | le16_to_cpu(aq_desc->flags), |
99 | le16_to_cpu(aq_desc->datalen), | ||
100 | le16_to_cpu(aq_desc->retval)); | ||
99 | i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n", | 101 | i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n", |
100 | aq_desc->cookie_high, aq_desc->cookie_low); | 102 | le32_to_cpu(aq_desc->cookie_high), |
103 | le32_to_cpu(aq_desc->cookie_low)); | ||
101 | i40e_debug(hw, mask, "\tparam (0,1) 0x%08X 0x%08X\n", | 104 | i40e_debug(hw, mask, "\tparam (0,1) 0x%08X 0x%08X\n", |
102 | aq_desc->params.internal.param0, | 105 | le32_to_cpu(aq_desc->params.internal.param0), |
103 | aq_desc->params.internal.param1); | 106 | le32_to_cpu(aq_desc->params.internal.param1)); |
104 | i40e_debug(hw, mask, "\taddr (h,l) 0x%08X 0x%08X\n", | 107 | i40e_debug(hw, mask, "\taddr (h,l) 0x%08X 0x%08X\n", |
105 | aq_desc->params.external.addr_high, | 108 | le32_to_cpu(aq_desc->params.external.addr_high), |
106 | aq_desc->params.external.addr_low); | 109 | le32_to_cpu(aq_desc->params.external.addr_low)); |
107 | 110 | ||
108 | if ((buffer != NULL) && (aq_desc->datalen != 0)) { | 111 | if ((buffer != NULL) && (aq_desc->datalen != 0)) { |
109 | memset(data, 0, sizeof(data)); | 112 | memset(data, 0, sizeof(data)); |
@@ -116,15 +119,19 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, | |||
116 | if ((i % 16) == 15) { | 119 | if ((i % 16) == 15) { |
117 | i40e_debug(hw, mask, | 120 | i40e_debug(hw, mask, |
118 | "\t0x%04X %08X %08X %08X %08X\n", | 121 | "\t0x%04X %08X %08X %08X %08X\n", |
119 | i - 15, data[0], data[1], data[2], | 122 | i - 15, le32_to_cpu(data[0]), |
120 | data[3]); | 123 | le32_to_cpu(data[1]), |
124 | le32_to_cpu(data[2]), | ||
125 | le32_to_cpu(data[3])); | ||
121 | memset(data, 0, sizeof(data)); | 126 | memset(data, 0, sizeof(data)); |
122 | } | 127 | } |
123 | } | 128 | } |
124 | if ((i % 16) != 0) | 129 | if ((i % 16) != 0) |
125 | i40e_debug(hw, mask, "\t0x%04X %08X %08X %08X %08X\n", | 130 | i40e_debug(hw, mask, "\t0x%04X %08X %08X %08X %08X\n", |
126 | i - (i % 16), data[0], data[1], data[2], | 131 | i - (i % 16), le32_to_cpu(data[0]), |
127 | data[3]); | 132 | le32_to_cpu(data[1]), |
133 | le32_to_cpu(data[2]), | ||
134 | le32_to_cpu(data[3])); | ||
128 | } | 135 | } |
129 | } | 136 | } |
130 | 137 | ||