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

Commit 849c4542 authored by Emil Tantilov's avatar Emil Tantilov Committed by David S. Miller
Browse files

ixgbe: Use netdev_<level>, dev_<level>, pr_<level> 



This patch is alternative to a previous patch submitted by Joe Perches.

Create common macros e_<level> and e_dev_<level> that use netdev_<level> and
dev_<level> similar to e1000e.
Redefined pr_fmt for driver messages.
Use %pM to display MAC address.
Aligned text to better match the new format.

CC: Joe Perches <joe@perches.com>
Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent faa9dcf7

drivers/net/ixgbe/ixgbe.h

+3 −5
Original line number Diff line number Diff line
@@ -44,11 +44,9 @@ 
#include <linux/dca.h>

#endif



#define PFX "ixgbe: "

#define DPRINTK(nlevel, klevel, fmt, args...) \

	((void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \

	printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \

		__func__ , ## args)))

/* common prefix used by pr_<> macros */

#undef pr_fmt

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



/* TX/RX descriptor defines */

#define IXGBE_DEFAULT_TXD		    512

drivers/net/ixgbe/ixgbe_82599.c

+2 −3
Original line number Diff line number Diff line
@@ -707,9 +707,8 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw, 


out:

	if (link_up && (link_speed == IXGBE_LINK_SPEED_1GB_FULL))

		netif_info(adapter, hw, adapter->netdev, "Smartspeed has"

			" downgraded the link speed from the maximum"

			" advertised\n");

		e_info("Smartspeed has downgraded the link speed from "

		       "the maximum advertised\n");

	return status;

}

drivers/net/ixgbe/ixgbe_common.h

+20 −6
Original line number Diff line number Diff line
@@ -105,12 +105,26 @@ s32 ixgbe_blink_led_stop_generic(struct ixgbe_hw *hw, u32 index); 


#define IXGBE_WRITE_FLUSH(a) IXGBE_READ_REG(a, IXGBE_STATUS)



#ifdef DEBUG

extern char *ixgbe_get_hw_dev_name(struct ixgbe_hw *hw);

extern struct net_device *ixgbe_get_hw_dev(struct ixgbe_hw *hw);

#define hw_dbg(hw, format, arg...) \

	printk(KERN_DEBUG "%s: " format, ixgbe_get_hw_dev_name(hw), ##arg)

#else

#define hw_dbg(hw, format, arg...) do {} while (0)

#endif

	netdev_dbg(ixgbe_get_hw_dev(hw), format, ##arg)

#define e_err(format, arg...) \

	netdev_err(adapter->netdev, format, ## arg)

#define e_info(format, arg...) \

	netdev_info(adapter->netdev, format, ## arg)

#define e_warn(format, arg...) \

	netdev_warn(adapter->netdev, format, ## arg)

#define e_notice(format, arg...) \

	netdev_notice(adapter->netdev, format, ## arg)

#define e_crit(format, arg...) \

	netdev_crit(adapter->netdev, format, ## arg)

#define e_dev_info(format, arg...) \

	dev_info(&adapter->pdev->dev, format, ## arg)

#define e_dev_warn(format, arg...) \

	dev_warn(&adapter->pdev->dev, format, ## arg)

#define e_dev_err(format, arg...) \

	dev_err(&adapter->pdev->dev, format, ## arg)

#define e_dev_notice(format, arg...) \

	dev_notice(&adapter->pdev->dev, format, ## arg)



#endif /* IXGBE_COMMON */

drivers/net/ixgbe/ixgbe_dcb_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) 
			goto out;



		if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {

			DPRINTK(DRV, ERR, "Enable failed, needs MSI-X\n");

			e_err("Enable failed, needs MSI-X\n");

			err = 1;

			goto out;

		}

drivers/net/ixgbe/ixgbe_ethtool.c

+20 −23
Original line number Diff line number Diff line
@@ -294,8 +294,7 @@ static int ixgbe_set_settings(struct net_device *netdev, 
		hw->mac.autotry_restart = true;

		err = hw->mac.ops.setup_link(hw, advertised, true, true);

		if (err) {

			DPRINTK(PROBE, INFO,

			        "setup link failed with code %d\n", err);

			e_info("setup link failed with code %d\n", err);

			hw->mac.ops.setup_link(hw, old, true, true);

		}

	} else {
@@ -1188,7 +1187,7 @@ static struct ixgbe_reg_test reg_test_82598[] = { 
		writel((_test[pat] & W), (adapter->hw.hw_addr + R));          \

		val = readl(adapter->hw.hw_addr + R);                         \

		if (val != (_test[pat] & W & M)) {                            \

			DPRINTK(DRV, ERR, "pattern test reg %04X failed: got "\

			e_err("pattern test reg %04X failed: got "	\

			      "0x%08X expected 0x%08X\n",		\

			      R, val, (_test[pat] & W & M));                \

			*data = R;                                            \
@@ -1206,7 +1205,7 @@ static struct ixgbe_reg_test reg_test_82598[] = { 
	writel((W & M), (adapter->hw.hw_addr + R));                           \

	val = readl(adapter->hw.hw_addr + R);                                 \

	if ((W & M) != (val & M)) {                                           \

		DPRINTK(DRV, ERR, "set/check reg %04X test failed: got 0x%08X "\

		e_err("set/check reg %04X test failed: got 0x%08X "	\

		      "expected 0x%08X\n", R, (val & M), (W & M));	\

		*data = R;                                                    \

		writel(before, (adapter->hw.hw_addr + R));                    \
@@ -1240,8 +1239,8 @@ static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data) 
	IXGBE_WRITE_REG(&adapter->hw, IXGBE_STATUS, toggle);

	after = IXGBE_READ_REG(&adapter->hw, IXGBE_STATUS) & toggle;

	if (value != after) {

		DPRINTK(DRV, ERR, "failed STATUS register test got: "

		        "0x%08X expected: 0x%08X\n", after, value);

		e_err("failed STATUS register test got: 0x%08X expected: "

		      "0x%08X\n", after, value);

		*data = 1;

		return 1;

	}
@@ -1341,8 +1340,8 @@ static int ixgbe_intr_test(struct ixgbe_adapter *adapter, u64 *data) 
		*data = 1;

		return -1;

	}

	DPRINTK(HW, INFO, "testing %s interrupt\n",

		(shared_int ? "shared" : "unshared"));

	e_info("testing %s interrupt\n", shared_int ?

		   "shared" : "unshared");



	/* Disable all the interrupts */

	IXGBE_WRITE_REG(&adapter->hw, IXGBE_EIMC, 0xFFFFFFFF);
@@ -1847,7 +1846,7 @@ static void ixgbe_diag_test(struct net_device *netdev, 
	if (eth_test->flags == ETH_TEST_FL_OFFLINE) {

		/* Offline tests */



		DPRINTK(HW, INFO, "offline testing starting\n");

		e_info("offline testing starting\n");



		/* Link test performed before hardware reset so autoneg doesn't

		 * interfere with test result */
@@ -1880,17 +1879,17 @@ static void ixgbe_diag_test(struct net_device *netdev, 
		else

			ixgbe_reset(adapter);



		DPRINTK(HW, INFO, "register testing starting\n");

		e_info("register testing starting\n");

		if (ixgbe_reg_test(adapter, &data[0]))

			eth_test->flags |= ETH_TEST_FL_FAILED;



		ixgbe_reset(adapter);

		DPRINTK(HW, INFO, "eeprom testing starting\n");

		e_info("eeprom testing starting\n");

		if (ixgbe_eeprom_test(adapter, &data[1]))

			eth_test->flags |= ETH_TEST_FL_FAILED;



		ixgbe_reset(adapter);

		DPRINTK(HW, INFO, "interrupt testing starting\n");

		e_info("interrupt testing starting\n");

		if (ixgbe_intr_test(adapter, &data[2]))

			eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -1898,14 +1897,13 @@ static void ixgbe_diag_test(struct net_device *netdev, 
		 * loopback diagnostic. */

		if (adapter->flags & (IXGBE_FLAG_SRIOV_ENABLED |

				      IXGBE_FLAG_VMDQ_ENABLED)) {

			DPRINTK(HW, INFO, "Skip MAC loopback diagnostic in VT "

				"mode\n");

			e_info("Skip MAC loopback diagnostic in VT mode\n");

			data[3] = 0;

			goto skip_loopback;

		}



		ixgbe_reset(adapter);

		DPRINTK(HW, INFO, "loopback testing starting\n");

		e_info("loopback testing starting\n");

		if (ixgbe_loopback_test(adapter, &data[3]))

			eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -1916,7 +1914,7 @@ static void ixgbe_diag_test(struct net_device *netdev, 
		if (if_running)

			dev_open(netdev);

	} else {

		DPRINTK(HW, INFO, "online testing starting\n");

		e_info("online testing starting\n");

		/* Online tests */

		if (ixgbe_link_test(adapter, &data[4]))

			eth_test->flags |= ETH_TEST_FL_FAILED;
@@ -2089,7 +2087,7 @@ static bool ixgbe_reenable_rsc(struct ixgbe_adapter *adapter, 
	    (adapter->flags2 & IXGBE_FLAG2_RSC_CAPABLE)) {

		adapter->flags2 |= IXGBE_FLAG2_RSC_ENABLED;

		adapter->netdev->features |= NETIF_F_LRO;

		DPRINTK(PROBE, INFO, "rx-usecs set to %d, re-enabling RSC\n",

		e_info("rx-usecs set to %d, re-enabling RSC\n",

		       ec->rx_coalesce_usecs);

		return true;

	}
@@ -2158,8 +2156,7 @@ static int ixgbe_set_coalesce(struct net_device *netdev, 
		if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {

			adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;

			netdev->features &= ~NETIF_F_LRO;

			DPRINTK(PROBE, INFO,

			        "rx-usecs set to 0, disabling RSC\n");

			e_info("rx-usecs set to 0, disabling RSC\n");



			need_reset = true;

		}