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

Commit e1fb77bf authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller
Browse files

enic: Log device configuration in detail during driver load 



Signed-off-by: default avatarChristian Benvenuti <benve@cisco.com>
Signed-off-by: default avatarDanny Guo <dannguo@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8757446d

drivers/net/enic/enic.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#define DRV_NAME		"enic"

#define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"

#define DRV_VERSION		"2.1.1.16"

#define DRV_VERSION		"2.1.1.17"

#define DRV_COPYRIGHT		"Copyright 2008-2011 Cisco Systems, Inc"



#define ENIC_BARS_MAX		6

drivers/net/enic/enic_res.c

+18 −5
Original line number Diff line number Diff line
@@ -97,11 +97,24 @@ int enic_get_vnic_config(struct enic *enic) 
	dev_info(enic_get_dev(enic),

		"vNIC MAC addr %pM wq/rq %d/%d mtu %d\n",

		enic->mac_addr, c->wq_desc_count, c->rq_desc_count, c->mtu);

	dev_info(enic_get_dev(enic), "vNIC csum tx/rx %d/%d "

		"tso %d intr timer %d usec rss %d\n",

		ENIC_SETTING(enic, TXCSUM), ENIC_SETTING(enic, RXCSUM),

		ENIC_SETTING(enic, TSO),

		c->intr_timer_usec, ENIC_SETTING(enic, RSS));



	dev_info(enic_get_dev(enic), "vNIC csum tx/rx %s/%s "

		"tso/lro %s/%s rss %s intr mode %s type %s timer %d usec "

		"loopback tag 0x%04x\n",

		ENIC_SETTING(enic, TXCSUM) ? "yes" : "no",

		ENIC_SETTING(enic, RXCSUM) ? "yes" : "no",

		ENIC_SETTING(enic, TSO) ? "yes" : "no",

		ENIC_SETTING(enic, LRO) ? "yes" : "no",

		ENIC_SETTING(enic, RSS) ? "yes" : "no",

		c->intr_mode == VENET_INTR_MODE_INTX ? "INTx" :

		c->intr_mode == VENET_INTR_MODE_MSI ? "MSI" :

		c->intr_mode == VENET_INTR_MODE_ANY ? "any" :

		"unknown",

		c->intr_timer_type == VENET_INTR_TYPE_MIN ? "min" :

		c->intr_timer_type == VENET_INTR_TYPE_IDLE ? "idle" :

		"unknown",

		c->intr_timer_usec,

		c->loop_tag);



	return 0;

}

drivers/net/enic/vnic_enet.h

+7 −0
Original line number Diff line number Diff line
@@ -51,4 +51,11 @@ struct vnic_enet_config { 
#define VENETF_RSSHASH_TCPIPV6_EX 0x400	/* Hash on TCP + IPv6 ext. fields */

#define VENETF_LOOP		0x800	/* Loopback enabled */



#define VENET_INTR_TYPE_MIN	0	/* Timer specs min interrupt spacing */

#define VENET_INTR_TYPE_IDLE	1	/* Timer specs idle time before irq */



#define VENET_INTR_MODE_ANY	0	/* Try MSI-X, then MSI, then INTx */

#define VENET_INTR_MODE_MSI	1	/* Try MSI then INTx */

#define VENET_INTR_MODE_INTX	2	/* Try INTx only */



#endif /* _VNIC_ENIC_H_ */