Commit 773d4023 authored by Alan Brady's avatar Alan Brady Committed by Jeff Kirsher
Browse files

i40e: refactor AQ CMD buffer debug printing 



This patch refactors the '%*ph' printk format specifier to instead use
the print_hex_dump function, as recommended by the '%*ph' documentation.
This produces better/more standardized output.

Change-ID: Id56700b4e8abc40ff8c04bc8379e7df04cb4d6fd
Signed-off-by: default avatarAlan Brady <alan.brady@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3c234c47

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

+12 −7
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
	struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;

	u16 len;

	u8 *buf = (u8 *)buffer;

	u16 i = 0;



	if ((!(mask & hw->debug_mask)) || (desc == NULL))

		return;
@@ -328,12 +327,18 @@ void i40e_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
		if (buf_len < len)

			len = buf_len;

		/* write the full 16-byte chunks */

		for (i = 0; i < (len - 16); i += 16)

			i40e_debug(hw, mask, "\t0x%04X  %16ph\n", i, buf + i);

		/* write whatever's left over without overrunning the buffer */

		if (i < len)

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

					     i, len - i, buf + i);

		if (hw->debug_mask & mask) {

			char prefix[20];



			snprintf(prefix, 20,

				 "i40e %02x:%02x.%x: \t0x",

				 hw->bus.bus_id,

				 hw->bus.device,

				 hw->bus.func);



			print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET,

				       16, 1, buf, len, false);

		}

	}

}

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

+12 −7
Original line number Diff line number Diff line
@@ -304,7 +304,6 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
{

	struct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;

	u8 *buf = (u8 *)buffer;

	u16 i = 0;



	if ((!(mask & hw->debug_mask)) || (desc == NULL))

		return;
@@ -332,12 +331,18 @@ void i40evf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc, 
		if (buf_len < len)

			len = buf_len;

		/* write the full 16-byte chunks */

		for (i = 0; i < (len - 16); i += 16)

			i40e_debug(hw, mask, "\t0x%04X  %16ph\n", i, buf + i);

		/* write whatever's left over without overrunning the buffer */

		if (i < len)

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

					     i, len - i, buf + i);

		if (hw->debug_mask & mask) {

			char prefix[20];



			snprintf(prefix, 20,

				 "i40evf %02x:%02x.%x: \t0x",

				 hw->bus.bus_id,

				 hw->bus.device,

				 hw->bus.func);



			print_hex_dump(KERN_INFO, prefix, DUMP_PREFIX_OFFSET,

				       16, 1, buf, len, false);

		}

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE