Skip to content

Commit

Permalink
qed*: Add and modify some prints
Browse files Browse the repository at this point in the history 
This patch touches various prints in the driver - it reduces the
verbosity of some prints [which were previously logged by default]
while adding several new debug prints and modifying others.

Signed-off-by: Yuval Mintz <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
@davem330
Yuval Mintz authored and davem330 committed Aug 15, 2016
1 parent 83aeb93 commit 525ef5c
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 24 deletions.
10 changes: 7 additions & 3 deletions drivers/net/ethernet/qlogic/qed/qed_dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ static int qed_reg_assert(struct qed_hwfn *p_hwfn,
u32 assert_val = qed_rd(p_hwfn, p_ptt, reg);

if (assert_val != expected) {
DP_NOTICE(p_hwfn, "Value at address 0x%x != 0x%08x\n",
DP_NOTICE(p_hwfn, "Value at address 0x%08x != 0x%08x\n",
reg, expected);
return -EINVAL;
}
Expand Down Expand Up @@ -1306,6 +1306,10 @@ static void get_function_id(struct qed_hwfn *p_hwfn)
PXP_CONCRETE_FID_PFID);
p_hwfn->port_id = GET_FIELD(p_hwfn->hw_info.concrete_fid,
PXP_CONCRETE_FID_PORT);

DP_VERBOSE(p_hwfn, NETIF_MSG_PROBE,
"Read ME register: Concrete 0x%08x Opaque 0x%04x\n",
p_hwfn->hw_info.concrete_fid, p_hwfn->hw_info.opaque_fid);
}

static void qed_hw_set_feat(struct qed_hwfn *p_hwfn)
Expand Down Expand Up @@ -1605,10 +1609,10 @@ static void qed_get_num_funcs(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)

DP_VERBOSE(p_hwfn,
NETIF_MSG_PROBE,
"PF [rel_id %d, abs_id %d] within the %d enabled functions on the engine\n",
"PF [rel_id %d, abs_id %d] occupies index %d within the %d enabled functions on the engine\n",
p_hwfn->rel_pf_id,
p_hwfn->abs_pf_id,
p_hwfn->num_funcs_on_engine);
p_hwfn->enabled_func_idx, p_hwfn->num_funcs_on_engine);
}

static int
Expand Down
8 changes: 6 additions & 2 deletions drivers/net/ethernet/qlogic/qed/qed_int.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2576,8 +2576,12 @@ static u16 qed_get_igu_sb_id(struct qed_hwfn *p_hwfn, u16 sb_id)
else
igu_sb_id = qed_vf_get_igu_sb_id(p_hwfn, sb_id);

DP_VERBOSE(p_hwfn, NETIF_MSG_INTR, "SB [%s] index is 0x%04x\n",
(sb_id == QED_SP_SB_ID) ? "DSB" : "non-DSB", igu_sb_id);
if (sb_id == QED_SP_SB_ID)
DP_VERBOSE(p_hwfn, NETIF_MSG_INTR,
"Slowpath SB index in IGU is 0x%04x\n", igu_sb_id);
else
DP_VERBOSE(p_hwfn, NETIF_MSG_INTR,
"SB [%04x] <--> IGU SB [%04x]\n", sb_id, igu_sb_id);

return igu_sb_id;
}
Expand Down
21 changes: 15 additions & 6 deletions drivers/net/ethernet/qlogic/qed/qed_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ MODULE_FIRMWARE(QED_FW_FILE_NAME);

static int __init qed_init(void)
{
pr_notice("qed_init called\n");

pr_info("%s", version);

return 0;
Expand Down Expand Up @@ -437,6 +435,11 @@ static int qed_set_int_mode(struct qed_dev *cdev, bool force_mode)
}

out:
if (!rc)
DP_INFO(cdev, "Using %s interrupts\n",
int_params->out.int_mode == QED_INT_MODE_INTA ?
"INTa" : int_params->out.int_mode == QED_INT_MODE_MSI ?
"MSI" : "MSIX");
cdev->int_coalescing_mode = QED_COAL_MODE_ENABLE;

return rc;
Expand Down Expand Up @@ -512,19 +515,18 @@ static irqreturn_t qed_single_int(int irq, void *dev_instance)
int qed_slowpath_irq_req(struct qed_hwfn *hwfn)
{
struct qed_dev *cdev = hwfn->cdev;
u32 int_mode;
int rc = 0;
u8 id;

if (cdev->int_params.out.int_mode == QED_INT_MODE_MSIX) {
int_mode = cdev->int_params.out.int_mode;
if (int_mode == QED_INT_MODE_MSIX) {
id = hwfn->my_id;
snprintf(hwfn->name, NAME_SIZE, "sp-%d-%02x:%02x.%02x",
id, cdev->pdev->bus->number,
PCI_SLOT(cdev->pdev->devfn), hwfn->abs_pf_id);
rc = request_irq(cdev->int_params.msix_table[id].vector,
qed_msix_sp_int, 0, hwfn->name, hwfn->sp_dpc);
if (!rc)
DP_VERBOSE(hwfn, (NETIF_MSG_INTR | QED_MSG_SP),
"Requested slowpath MSI-X\n");
} else {
unsigned long flags = 0;

Expand All @@ -539,6 +541,13 @@ int qed_slowpath_irq_req(struct qed_hwfn *hwfn)
flags, cdev->name, cdev);
}

if (rc)
DP_NOTICE(cdev, "request_irq failed, rc = %d\n", rc);
else
DP_VERBOSE(hwfn, (NETIF_MSG_INTR | QED_MSG_SP),
"Requested slowpath %s\n",
(int_mode == QED_INT_MODE_MSIX) ? "MSI-X" : "IRQ");

return rc;
}

Expand Down
7 changes: 4 additions & 3 deletions drivers/net/ethernet/qlogic/qed/qed_mcp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,8 @@ static int qed_do_mcp_cmd(struct qed_hwfn *p_hwfn,
*o_mcp_param = DRV_MB_RD(p_hwfn, p_ptt, fw_mb_param);
} else {
/* FW BUG! */
DP_ERR(p_hwfn, "MFW failed to respond!\n");
DP_ERR(p_hwfn, "MFW failed to respond [cmd 0x%x param 0x%x]\n",
cmd, param);
*o_mcp_resp = 0;
rc = -EAGAIN;
}
Expand All @@ -333,7 +334,7 @@ static int qed_mcp_cmd_and_union(struct qed_hwfn *p_hwfn,

/* MCP not initialized */
if (!qed_mcp_is_init(p_hwfn)) {
DP_NOTICE(p_hwfn, "MFW is not initialized !\n");
DP_NOTICE(p_hwfn, "MFW is not initialized!\n");
return -EBUSY;
}

Expand Down Expand Up @@ -935,7 +936,7 @@ int qed_mcp_get_media_type(struct qed_dev *cdev, u32 *p_media_type)
return -EINVAL;

if (!qed_mcp_is_init(p_hwfn)) {
DP_NOTICE(p_hwfn, "MFW is not initialized !\n");
DP_NOTICE(p_hwfn, "MFW is not initialized!\n");
return -EBUSY;
}

Expand Down
11 changes: 9 additions & 2 deletions drivers/net/ethernet/qlogic/qed/qed_spq.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,15 +824,22 @@ int qed_spq_completion(struct qed_hwfn *p_hwfn,

if (!found) {
DP_NOTICE(p_hwfn,
"Failed to find an entry this EQE completes\n");
"Failed to find an entry this EQE [echo %04x] completes\n",
le16_to_cpu(echo));
return -EEXIST;
}

DP_VERBOSE(p_hwfn, QED_MSG_SPQ, "Complete: func %p cookie %p)\n",
DP_VERBOSE(p_hwfn, QED_MSG_SPQ,
"Complete EQE [echo %04x]: func %p cookie %p)\n",
le16_to_cpu(echo),
p_ent->comp_cb.function, p_ent->comp_cb.cookie);
if (found->comp_cb.function)
found->comp_cb.function(p_hwfn, found->comp_cb.cookie, p_data,
fw_return_code);
else
DP_VERBOSE(p_hwfn,
QED_MSG_SPQ,
"Got a completion without a callback function\n");

if ((found->comp_mode != QED_SPQ_MODE_EBLOCK) ||
(found->queue == &p_spq->unlimited_pending))
Expand Down
20 changes: 12 additions & 8 deletions drivers/net/ethernet/qlogic/qede/qede_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ int __init qede_init(void)
{
int ret;

pr_notice("qede_init: %s\n", version);
pr_info("qede_init: %s\n", version);

qed_ops = qed_get_eth_ops();
if (!qed_ops) {
Expand Down Expand Up @@ -253,7 +253,8 @@ int __init qede_init(void)

static void __exit qede_cleanup(void)
{
pr_notice("qede_cleanup called\n");
if (debug & QED_LOG_INFO_MASK)
pr_info("qede_cleanup called\n");

unregister_netdevice_notifier(&qede_netdev_notifier);
pci_unregister_driver(&qede_pci_driver);
Expand Down Expand Up @@ -1453,7 +1454,7 @@ static int qede_rx_int(struct qede_fastpath *fp, int budget)
skb = netdev_alloc_skb(edev->ndev, QEDE_RX_HDR_SIZE);
if (unlikely(!skb)) {
DP_NOTICE(edev,
"Build_skb failed, dropping incoming packet\n");
"skb allocation failed, dropping incoming packet\n");
qede_recycle_rx_bd_ring(rxq, edev, fp_cqe->bd_num);
rxq->rx_alloc_errors++;
goto next_cqe;
Expand Down Expand Up @@ -2130,7 +2131,7 @@ static void qede_udp_tunnel_add(struct net_device *dev,

edev->vxlan_dst_port = t_port;

DP_VERBOSE(edev, QED_MSG_DEBUG, "Added vxlan port=%d",
DP_VERBOSE(edev, QED_MSG_DEBUG, "Added vxlan port=%d\n",
t_port);

set_bit(QEDE_SP_VXLAN_PORT_CONFIG, &edev->sp_flags);
Expand All @@ -2141,7 +2142,7 @@ static void qede_udp_tunnel_add(struct net_device *dev,

edev->geneve_dst_port = t_port;

DP_VERBOSE(edev, QED_MSG_DEBUG, "Added geneve port=%d",
DP_VERBOSE(edev, QED_MSG_DEBUG, "Added geneve port=%d\n",
t_port);
set_bit(QEDE_SP_GENEVE_PORT_CONFIG, &edev->sp_flags);
break;
Expand All @@ -2165,7 +2166,7 @@ static void qede_udp_tunnel_del(struct net_device *dev,

edev->vxlan_dst_port = 0;

DP_VERBOSE(edev, QED_MSG_DEBUG, "Deleted vxlan port=%d",
DP_VERBOSE(edev, QED_MSG_DEBUG, "Deleted vxlan port=%d\n",
t_port);

set_bit(QEDE_SP_VXLAN_PORT_CONFIG, &edev->sp_flags);
Expand All @@ -2176,7 +2177,7 @@ static void qede_udp_tunnel_del(struct net_device *dev,

edev->geneve_dst_port = 0;

DP_VERBOSE(edev, QED_MSG_DEBUG, "Deleted geneve port=%d",
DP_VERBOSE(edev, QED_MSG_DEBUG, "Deleted geneve port=%d\n",
t_port);
set_bit(QEDE_SP_GENEVE_PORT_CONFIG, &edev->sp_flags);
break;
Expand Down Expand Up @@ -2243,6 +2244,9 @@ static struct qede_dev *qede_alloc_etherdev(struct qed_dev *cdev,
edev->q_num_rx_buffers = NUM_RX_BDS_DEF;
edev->q_num_tx_buffers = NUM_TX_BDS_DEF;

DP_INFO(edev, "Allocated netdev with %d tx queues and %d rx queues\n",
info->num_queues, info->num_queues);

SET_NETDEV_DEV(ndev, &pdev->dev);

memset(&edev->stats, 0, sizeof(edev->stats));
Expand Down Expand Up @@ -2568,7 +2572,7 @@ static void __qede_remove(struct pci_dev *pdev, enum qede_remove_mode mode)
qed_ops->common->slowpath_stop(cdev);
qed_ops->common->remove(cdev);

pr_notice("Ending successfully qede_remove\n");
dev_info(&pdev->dev, "Ending qede_remove successfully\n");
}

static void qede_remove(struct pci_dev *pdev)
Expand Down

0 comments on commit 525ef5c

Please sign in to comment.