Commit a7a79deb authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller

enic: Use (netdev|dev|pr)_<level> macro helpers for logging

Replace all printk routines with the (netdev|dev|pr)_<level> macros that
provide verbose logs.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarScott Feldman <scofeldm@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 S. Miller <davem@davemloft.net>
parent 383ab92f
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver" #define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Driver"
#define DRV_VERSION "1.4.1.1" #define DRV_VERSION "1.4.1.1"
#define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc" #define DRV_COPYRIGHT "Copyright 2008-2009 Cisco Systems, Inc"
#define PFX DRV_NAME ": "
#define ENIC_BARS_MAX 6 #define ENIC_BARS_MAX 6
...@@ -130,4 +129,9 @@ struct enic { ...@@ -130,4 +129,9 @@ struct enic {
unsigned int cq_count; unsigned int cq_count;
}; };
static inline struct device *enic_get_dev(struct enic *enic)
{
return &(enic->pdev->dev);
}
#endif /* _ENIC_H_ */ #endif /* _ENIC_H_ */
This diff is collapsed.
...@@ -46,7 +46,8 @@ int enic_get_vnic_config(struct enic *enic) ...@@ -46,7 +46,8 @@ int enic_get_vnic_config(struct enic *enic)
err = vnic_dev_mac_addr(enic->vdev, enic->mac_addr); err = vnic_dev_mac_addr(enic->vdev, enic->mac_addr);
if (err) { if (err) {
printk(KERN_ERR PFX "Error getting MAC addr, %d\n", err); dev_err(enic_get_dev(enic),
"Error getting MAC addr, %d\n", err);
return err; return err;
} }
...@@ -56,7 +57,7 @@ int enic_get_vnic_config(struct enic *enic) ...@@ -56,7 +57,7 @@ int enic_get_vnic_config(struct enic *enic)
offsetof(struct vnic_enet_config, m), \ offsetof(struct vnic_enet_config, m), \
sizeof(c->m), &c->m); \ sizeof(c->m), &c->m); \
if (err) { \ if (err) { \
printk(KERN_ERR PFX \ dev_err(enic_get_dev(enic), \
"Error getting %s, %d\n", #m, err); \ "Error getting %s, %d\n", #m, err); \
return err; \ return err; \
} \ } \
...@@ -92,10 +93,10 @@ int enic_get_vnic_config(struct enic *enic) ...@@ -92,10 +93,10 @@ int enic_get_vnic_config(struct enic *enic)
INTR_COALESCE_HW_TO_USEC(VNIC_INTR_TIMER_MAX), INTR_COALESCE_HW_TO_USEC(VNIC_INTR_TIMER_MAX),
c->intr_timer_usec); c->intr_timer_usec);
printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n", dev_info(enic_get_dev(enic), "vNIC MAC addr %pM wq/rq %d/%d\n",
enic->mac_addr, c->wq_desc_count, c->rq_desc_count); enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d " dev_info(enic_get_dev(enic), "vNIC mtu %d csum tx/rx %d/%d "
"intr timer %d usec\n", "tso/lro %d/%d intr timer %d usec\n",
c->mtu, ENIC_SETTING(enic, TXCSUM), c->mtu, ENIC_SETTING(enic, TXCSUM),
ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO), ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO),
ENIC_SETTING(enic, LRO), c->intr_timer_usec); ENIC_SETTING(enic, LRO), c->intr_timer_usec);
...@@ -111,7 +112,7 @@ int enic_add_vlan(struct enic *enic, u16 vlanid) ...@@ -111,7 +112,7 @@ int enic_add_vlan(struct enic *enic, u16 vlanid)
err = vnic_dev_cmd(enic->vdev, CMD_VLAN_ADD, &a0, &a1, wait); err = vnic_dev_cmd(enic->vdev, CMD_VLAN_ADD, &a0, &a1, wait);
if (err) if (err)
printk(KERN_ERR PFX "Can't add vlan id, %d\n", err); dev_err(enic_get_dev(enic), "Can't add vlan id, %d\n", err);
return err; return err;
} }
...@@ -124,7 +125,7 @@ int enic_del_vlan(struct enic *enic, u16 vlanid) ...@@ -124,7 +125,7 @@ int enic_del_vlan(struct enic *enic, u16 vlanid)
err = vnic_dev_cmd(enic->vdev, CMD_VLAN_DEL, &a0, &a1, wait); err = vnic_dev_cmd(enic->vdev, CMD_VLAN_DEL, &a0, &a1, wait);
if (err) if (err)
printk(KERN_ERR PFX "Can't delete vlan id, %d\n", err); dev_err(enic_get_dev(enic), "Can't delete vlan id, %d\n", err);
return err; return err;
} }
...@@ -192,8 +193,8 @@ void enic_get_res_counts(struct enic *enic) ...@@ -192,8 +193,8 @@ void enic_get_res_counts(struct enic *enic)
vnic_dev_get_res_count(enic->vdev, RES_TYPE_INTR_CTRL), vnic_dev_get_res_count(enic->vdev, RES_TYPE_INTR_CTRL),
ENIC_INTR_MAX); ENIC_INTR_MAX);
printk(KERN_INFO PFX "vNIC resources avail: " dev_info(enic_get_dev(enic),
"wq %d rq %d cq %d intr %d\n", "vNIC resources avail: wq %d rq %d cq %d intr %d\n",
enic->wq_count, enic->rq_count, enic->wq_count, enic->rq_count,
enic->cq_count, enic->intr_count); enic->cq_count, enic->intr_count);
} }
...@@ -308,15 +309,14 @@ int enic_alloc_vnic_resources(struct enic *enic) ...@@ -308,15 +309,14 @@ int enic_alloc_vnic_resources(struct enic *enic)
intr_mode = vnic_dev_get_intr_mode(enic->vdev); intr_mode = vnic_dev_get_intr_mode(enic->vdev);
printk(KERN_INFO PFX "vNIC resources used: " dev_info(enic_get_dev(enic), "vNIC resources used: "
"wq %d rq %d cq %d intr %d intr mode %s\n", "wq %d rq %d cq %d intr %d intr mode %s\n",
enic->wq_count, enic->rq_count, enic->wq_count, enic->rq_count,
enic->cq_count, enic->intr_count, enic->cq_count, enic->intr_count,
intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" : intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" :
intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" : intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" :
intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" : intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" :
"unknown" "unknown");
);
/* Allocate queue resources /* Allocate queue resources
*/ */
...@@ -362,7 +362,8 @@ int enic_alloc_vnic_resources(struct enic *enic) ...@@ -362,7 +362,8 @@ int enic_alloc_vnic_resources(struct enic *enic)
enic->legacy_pba = vnic_dev_get_res(enic->vdev, enic->legacy_pba = vnic_dev_get_res(enic->vdev,
RES_TYPE_INTR_PBA_LEGACY, 0); RES_TYPE_INTR_PBA_LEGACY, 0);
if (!enic->legacy_pba && intr_mode == VNIC_DEV_INTR_MODE_INTX) { if (!enic->legacy_pba && intr_mode == VNIC_DEV_INTR_MODE_INTX) {
printk(KERN_ERR PFX "Failed to hook legacy pba resource\n"); dev_err(enic_get_dev(enic),
"Failed to hook legacy pba resource\n");
err = -ENODEV; err = -ENODEV;
goto err_out_cleanup; goto err_out_cleanup;
} }
......
...@@ -42,7 +42,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index, ...@@ -42,7 +42,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index,
cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index); cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);
if (!cq->ctrl) { if (!cq->ctrl) {
printk(KERN_ERR "Failed to hook CQ[%d] resource\n", index); pr_err("Failed to hook CQ[%d] resource\n", index);
return -EINVAL; return -EINVAL;
} }
......
...@@ -78,19 +78,19 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, ...@@ -78,19 +78,19 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev,
return -EINVAL; return -EINVAL;
if (bar->len < VNIC_MAX_RES_HDR_SIZE) { if (bar->len < VNIC_MAX_RES_HDR_SIZE) {
printk(KERN_ERR "vNIC BAR0 res hdr length error\n"); pr_err("vNIC BAR0 res hdr length error\n");
return -EINVAL; return -EINVAL;
} }
rh = bar->vaddr; rh = bar->vaddr;
if (!rh) { if (!rh) {
printk(KERN_ERR "vNIC BAR0 res hdr not mem-mapped\n"); pr_err("vNIC BAR0 res hdr not mem-mapped\n");
return -EINVAL; return -EINVAL;
} }
if (ioread32(&rh->magic) != VNIC_RES_MAGIC || if (ioread32(&rh->magic) != VNIC_RES_MAGIC ||
ioread32(&rh->version) != VNIC_RES_VERSION) { ioread32(&rh->version) != VNIC_RES_VERSION) {
printk(KERN_ERR "vNIC BAR0 res magic/version error " pr_err("vNIC BAR0 res magic/version error "
"exp (%lx/%lx) curr (%x/%x)\n", "exp (%lx/%lx) curr (%x/%x)\n",
VNIC_RES_MAGIC, VNIC_RES_VERSION, VNIC_RES_MAGIC, VNIC_RES_VERSION,
ioread32(&rh->magic), ioread32(&rh->version)); ioread32(&rh->magic), ioread32(&rh->version));
...@@ -122,7 +122,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, ...@@ -122,7 +122,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev,
/* each count is stride bytes long */ /* each count is stride bytes long */
len = count * VNIC_RES_STRIDE; len = count * VNIC_RES_STRIDE;
if (len + bar_offset > bar[bar_num].len) { if (len + bar_offset > bar[bar_num].len) {
printk(KERN_ERR "vNIC BAR0 resource %d " pr_err("vNIC BAR0 resource %d "
"out-of-bounds, offset 0x%x + " "out-of-bounds, offset 0x%x + "
"size 0x%x > bar len 0x%lx\n", "size 0x%x > bar len 0x%lx\n",
type, bar_offset, type, bar_offset,
...@@ -229,8 +229,7 @@ int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring, ...@@ -229,8 +229,7 @@ int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring,
&ring->base_addr_unaligned); &ring->base_addr_unaligned);
if (!ring->descs_unaligned) { if (!ring->descs_unaligned) {
printk(KERN_ERR pr_err("Failed to allocate ring (size=%d), aborting\n",
"Failed to allocate ring (size=%d), aborting\n",
(int)ring->size); (int)ring->size);
return -ENOMEM; return -ENOMEM;
} }
...@@ -268,7 +267,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, ...@@ -268,7 +267,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
status = ioread32(&devcmd->status); status = ioread32(&devcmd->status);
if (status & STAT_BUSY) { if (status & STAT_BUSY) {
printk(KERN_ERR "Busy devcmd %d\n", _CMD_N(cmd)); pr_err("Busy devcmd %d\n", _CMD_N(cmd));
return -EBUSY; return -EBUSY;
} }
...@@ -294,7 +293,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, ...@@ -294,7 +293,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
err = (int)readq(&devcmd->args[0]); err = (int)readq(&devcmd->args[0]);
if (err != ERR_ECMDUNKNOWN || if (err != ERR_ECMDUNKNOWN ||
cmd != CMD_CAPABILITY) cmd != CMD_CAPABILITY)
printk(KERN_ERR "Error %d devcmd %d\n", pr_err("Error %d devcmd %d\n",
err, _CMD_N(cmd)); err, _CMD_N(cmd));
return err; return err;
} }
...@@ -309,7 +308,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, ...@@ -309,7 +308,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd,
} }
} }
printk(KERN_ERR "Timedout devcmd %d\n", _CMD_N(cmd)); pr_err("Timedout devcmd %d\n", _CMD_N(cmd));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -565,7 +564,7 @@ int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast, ...@@ -565,7 +564,7 @@ int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,
err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait); err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait);
if (err) if (err)
printk(KERN_ERR "Can't set packet filter\n"); pr_err("Can't set packet filter\n");
return err; return err;
} }
...@@ -582,7 +581,7 @@ int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr) ...@@ -582,7 +581,7 @@ int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait); err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
if (err) if (err)
printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err); pr_err("Can't add addr [%pM], %d\n", addr, err);
return err; return err;
} }
...@@ -599,7 +598,7 @@ int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) ...@@ -599,7 +598,7 @@ int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait); err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
if (err) if (err)
printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err); pr_err("Can't del addr [%pM], %d\n", addr, err);
return err; return err;
} }
...@@ -626,8 +625,7 @@ int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr) ...@@ -626,8 +625,7 @@ int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr)
err = vnic_dev_cmd(vdev, CMD_IAR, &a0, &a1, wait); err = vnic_dev_cmd(vdev, CMD_IAR, &a0, &a1, wait);
if (err) if (err)
printk(KERN_ERR "Failed to raise INTR[%d], err %d\n", pr_err("Failed to raise INTR[%d], err %d\n", intr, err);
intr, err);
return err; return err;
} }
...@@ -658,8 +656,7 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr) ...@@ -658,8 +656,7 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
dma_addr_t notify_pa; dma_addr_t notify_pa;
if (vdev->notify || vdev->notify_pa) { if (vdev->notify || vdev->notify_pa) {
printk(KERN_ERR "notify block %p still allocated", pr_err("notify block %p still allocated", vdev->notify);
vdev->notify);
return -EINVAL; return -EINVAL;
} }
......
...@@ -41,6 +41,9 @@ static inline void writeq(u64 val, void __iomem *reg) ...@@ -41,6 +41,9 @@ static inline void writeq(u64 val, void __iomem *reg)
} }
#endif #endif
#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
enum vnic_dev_hw_version { enum vnic_dev_hw_version {
VNIC_DEV_HW_VER_UNKNOWN, VNIC_DEV_HW_VER_UNKNOWN,
VNIC_DEV_HW_VER_A1, VNIC_DEV_HW_VER_A1,
......
...@@ -39,8 +39,7 @@ int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr, ...@@ -39,8 +39,7 @@ int vnic_intr_alloc(struct vnic_dev *vdev, struct vnic_intr *intr,
intr->ctrl = vnic_dev_get_res(vdev, RES_TYPE_INTR_CTRL, index); intr->ctrl = vnic_dev_get_res(vdev, RES_TYPE_INTR_CTRL, index);
if (!intr->ctrl) { if (!intr->ctrl) {
printk(KERN_ERR "Failed to hook INTR[%d].ctrl resource\n", pr_err("Failed to hook INTR[%d].ctrl resource\n", index);
index);
return -EINVAL; return -EINVAL;
} }
......
...@@ -39,7 +39,7 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq) ...@@ -39,7 +39,7 @@ static int vnic_rq_alloc_bufs(struct vnic_rq *rq)
for (i = 0; i < blks; i++) { for (i = 0; i < blks; i++) {
rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC); rq->bufs[i] = kzalloc(VNIC_RQ_BUF_BLK_SZ, GFP_ATOMIC);
if (!rq->bufs[i]) { if (!rq->bufs[i]) {
printk(KERN_ERR "Failed to alloc rq_bufs\n"); pr_err("Failed to alloc rq_bufs\n");
return -ENOMEM; return -ENOMEM;
} }
} }
...@@ -94,7 +94,7 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index, ...@@ -94,7 +94,7 @@ int vnic_rq_alloc(struct vnic_dev *vdev, struct vnic_rq *rq, unsigned int index,
rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index); rq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_RQ, index);
if (!rq->ctrl) { if (!rq->ctrl) {
printk(KERN_ERR "Failed to hook RQ[%d] resource\n", index); pr_err("Failed to hook RQ[%d] resource\n", index);
return -EINVAL; return -EINVAL;
} }
...@@ -174,7 +174,7 @@ int vnic_rq_disable(struct vnic_rq *rq) ...@@ -174,7 +174,7 @@ int vnic_rq_disable(struct vnic_rq *rq)
udelay(10); udelay(10);
} }
printk(KERN_ERR "Failed to disable RQ[%d]\n", rq->index); pr_err("Failed to disable RQ[%d]\n", rq->index);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
......
...@@ -39,7 +39,7 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq) ...@@ -39,7 +39,7 @@ static int vnic_wq_alloc_bufs(struct vnic_wq *wq)
for (i = 0; i < blks; i++) { for (i = 0; i < blks; i++) {
wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC); wq->bufs[i] = kzalloc(VNIC_WQ_BUF_BLK_SZ, GFP_ATOMIC);
if (!wq->bufs[i]) { if (!wq->bufs[i]) {
printk(KERN_ERR "Failed to alloc wq_bufs\n"); pr_err("Failed to alloc wq_bufs\n");
return -ENOMEM; return -ENOMEM;
} }
} }
...@@ -94,7 +94,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index, ...@@ -94,7 +94,7 @@ int vnic_wq_alloc(struct vnic_dev *vdev, struct vnic_wq *wq, unsigned int index,
wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index); wq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_WQ, index);
if (!wq->ctrl) { if (!wq->ctrl) {
printk(KERN_ERR "Failed to hook WQ[%d] resource\n", index); pr_err("Failed to hook WQ[%d] resource\n", index);
return -EINVAL; return -EINVAL;
} }
...@@ -167,7 +167,7 @@ int vnic_wq_disable(struct vnic_wq *wq) ...@@ -167,7 +167,7 @@ int vnic_wq_disable(struct vnic_wq *wq)
udelay(10); udelay(10);
} }
printk(KERN_ERR "Failed to disable WQ[%d]\n", wq->index); pr_err("Failed to disable WQ[%d]\n", wq->index);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment