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

Commit f1abd7db authored by Paul M Stillwell Jr's avatar Paul M Stillwell Jr Committed by Jeff Kirsher
Browse files

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: default avatarPaul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 92bf2008

drivers/net/ethernet/intel/i40e/i40e_common.c

+19 −12
Original line number Diff line number Diff line 
/*******************************************************************************

 *

 * Intel Ethernet Controller XL710 Family Linux Driver

 * Copyright(c) 2013 - 2014 Intel Corporation.

 * Copyright(c) 2013 - 2015 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * 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, 


	i40e_debug(hw, mask,

		   "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n",

		   aq_desc->opcode, aq_desc->flags, aq_desc->datalen,

		   aq_desc->retval);

		   le16_to_cpu(aq_desc->opcode),

		   le16_to_cpu(aq_desc->flags),

		   le16_to_cpu(aq_desc->datalen),

		   le16_to_cpu(aq_desc->retval));

	i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n",

		   aq_desc->cookie_high, aq_desc->cookie_low);

		   le32_to_cpu(aq_desc->cookie_high),

		   le32_to_cpu(aq_desc->cookie_low));

	i40e_debug(hw, mask, "\tparam (0,1)  0x%08X 0x%08X\n",

		   aq_desc->params.internal.param0,

		   aq_desc->params.internal.param1);

		   le32_to_cpu(aq_desc->params.internal.param0),

		   le32_to_cpu(aq_desc->params.internal.param1));

	i40e_debug(hw, mask, "\taddr (h,l)   0x%08X 0x%08X\n",

		   aq_desc->params.external.addr_high,

		   aq_desc->params.external.addr_low);

		   le32_to_cpu(aq_desc->params.external.addr_high),

		   le32_to_cpu(aq_desc->params.external.addr_low));



	if ((buffer != NULL) && (aq_desc->datalen != 0)) {

		memset(data, 0, sizeof(data));
@@ -116,15 +119,19 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
			if ((i % 16) == 15) {

				i40e_debug(hw, mask,

					   "\t0x%04X  %08X %08X %08X %08X\n",

					   i - 15, data[0], data[1], data[2],

					   data[3]);

					   i - 15, le32_to_cpu(data[0]),

					   le32_to_cpu(data[1]),

					   le32_to_cpu(data[2]),

					   le32_to_cpu(data[3]));

				memset(data, 0, sizeof(data));

			}

		}

		if ((i % 16) != 0)

			i40e_debug(hw, mask, "\t0x%04X  %08X %08X %08X %08X\n",

				   i - (i % 16), data[0], data[1], data[2],

				   data[3]);

				   i - (i % 16), le32_to_cpu(data[0]),

				   le32_to_cpu(data[1]),

				   le32_to_cpu(data[2]),

				   le32_to_cpu(data[3]));

	}

}

drivers/net/ethernet/intel/i40evf/i40e_common.c

+18 −11
Original line number Diff line number Diff line
@@ -94,16 +94,19 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 


	i40e_debug(hw, mask,

		   "AQ CMD: opcode 0x%04X, flags 0x%04X, datalen 0x%04X, retval 0x%04X\n",

		   aq_desc->opcode, aq_desc->flags, aq_desc->datalen,

		   aq_desc->retval);

		   le16_to_cpu(aq_desc->opcode),

		   le16_to_cpu(aq_desc->flags),

		   le16_to_cpu(aq_desc->datalen),

		   le16_to_cpu(aq_desc->retval));

	i40e_debug(hw, mask, "\tcookie (h,l) 0x%08X 0x%08X\n",

		   aq_desc->cookie_high, aq_desc->cookie_low);

		   le32_to_cpu(aq_desc->cookie_high),

		   le32_to_cpu(aq_desc->cookie_low));

	i40e_debug(hw, mask, "\tparam (0,1)  0x%08X 0x%08X\n",

		   aq_desc->params.internal.param0,

		   aq_desc->params.internal.param1);

		   le32_to_cpu(aq_desc->params.internal.param0),

		   le32_to_cpu(aq_desc->params.internal.param1));

	i40e_debug(hw, mask, "\taddr (h,l)   0x%08X 0x%08X\n",

		   aq_desc->params.external.addr_high,

		   aq_desc->params.external.addr_low);

		   le32_to_cpu(aq_desc->params.external.addr_high),

		   le32_to_cpu(aq_desc->params.external.addr_low));



	if ((buffer != NULL) && (aq_desc->datalen != 0)) {

		memset(data, 0, sizeof(data));
@@ -116,15 +119,19 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
			if ((i % 16) == 15) {

				i40e_debug(hw, mask,

					   "\t0x%04X  %08X %08X %08X %08X\n",

					   i - 15, data[0], data[1], data[2],

					   data[3]);

					   i - 15, le32_to_cpu(data[0]),

					   le32_to_cpu(data[1]),

					   le32_to_cpu(data[2]),

					   le32_to_cpu(data[3]));

				memset(data, 0, sizeof(data));

			}

		}

		if ((i % 16) != 0)

			i40e_debug(hw, mask, "\t0x%04X  %08X %08X %08X %08X\n",

				   i - (i % 16), data[0], data[1], data[2],

				   data[3]);

				   i - (i % 16), le32_to_cpu(data[0]),

				   le32_to_cpu(data[1]),

				   le32_to_cpu(data[2]),

				   le32_to_cpu(data[3]));

	}

}