Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1261084/?format=api
{ "id": 1261084, "url": "http://patchwork.ozlabs.org/api/patches/1261084/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200325003824.5487-5-andre.guedes@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200325003824.5487-5-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-03-25T00:38:18", "name": "[04/10] igc: Use netdev log helpers in igc_dump.c", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e79e9852ccd6076af0ef1cac72e458003e012351", "submitter": { "id": 72323, "url": "http://patchwork.ozlabs.org/api/people/72323/?format=api", "name": "Andre Guedes", "email": "andre.guedes@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200325003824.5487-5-andre.guedes@intel.com/mbox/", "series": [ { "id": 166478, "url": "http://patchwork.ozlabs.org/api/series/166478/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=166478", "date": "2020-03-25T00:38:14", "name": "igc: Align log messages", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/166478/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1261084/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1261084/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.138;\n\thelo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48n8PL24lFz9sR4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 25 Mar 2020 11:38:46 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id A18E28517C;\n\tWed, 25 Mar 2020 00:38:44 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 8VBOyFzDb7UZ; Wed, 25 Mar 2020 00:38:42 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D707C84D9F;\n\tWed, 25 Mar 2020 00:38:42 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id F0BB81BF32A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 25 Mar 2020 00:38:38 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id EDCAF2012F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 25 Mar 2020 00:38:38 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id q-11jDhkw22J for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 25 Mar 2020 00:38:36 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 08D1C20022\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 25 Mar 2020 00:38:36 +0000 (UTC)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; \n\t24 Mar 2020 17:38:35 -0700", "from johnorte-mobl2.amr.corp.intel.com ([10.251.10.249])\n\tby fmsmga006.fm.intel.com with ESMTP; 24 Mar 2020 17:38:35 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "IronPort-SDR": [ "gY4QL5wjBjUWAGEIAkSZDGRghTfi0+riomcQRpa5dBRTLtUsi2ib1DPvE1WJakAuTD8WUQUjkt\n\ts5qw4iJuInNw==", "r9DwSBOrIi9L1TWbxo5+fR/bFmdZAOm+uF5I8hWkm89/WCIgsDw5P3FJXrcXu3xSE03obR+1KW\n\tTeGfjCn4L9JQ==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.72,302,1580803200\"; d=\"scan'208\";a=\"448099346\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 24 Mar 2020 17:38:18 -0700", "Message-Id": "<20200325003824.5487-5-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.25.0", "In-Reply-To": "<20200325003824.5487-1-andre.guedes@intel.com>", "References": "<20200325003824.5487-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 04/10] igc: Use netdev log helpers in\n\tigc_dump.c", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "In igc_dump.c we print log messages using dev_* and pr_* helpers,\ngenerating inconsistent output with the rest of the driver. Since this\nis a network device driver, we should preferably use netdev_* helpers\nbecause they append the interface name to the message, helping making\nsense out of the logs.\n\nThis patch converts all dev_* and pr_* calls to netdev_*. It also takes\nthis opportunity to remove the '\\n' character at the end of messages\nsince is it automatically added by netdev_* log helpers.\n\nQuick note about igc_rings_dump(): This function is always called with\nvalid adapter->netdev so there is not need to check it.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_dump.c | 109 +++++++++++-----------\n 1 file changed, 54 insertions(+), 55 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_dump.c b/drivers/net/ethernet/intel/igc/igc_dump.c\nindex 657ab50ae296..d6990d63c8bb 100644\n--- a/drivers/net/ethernet/intel/igc/igc_dump.c\n+++ b/drivers/net/ethernet/intel/igc/igc_dump.c\n@@ -47,6 +47,7 @@ static const struct igc_reg_info igc_reg_info_tbl[] = {\n /* igc_regdump - register printout routine */\n static void igc_regdump(struct igc_hw *hw, struct igc_reg_info *reginfo)\n {\n+\tstruct net_device *dev = igc_get_hw_dev(hw);\n \tint n = 0;\n \tchar rname[16];\n \tu32 regs[8];\n@@ -101,13 +102,14 @@ static void igc_regdump(struct igc_hw *hw, struct igc_reg_info *reginfo)\n \t\t\tregs[n] = rd32(IGC_TXDCTL(n));\n \t\tbreak;\n \tdefault:\n-\t\tpr_info(\"%-15s %08x\\n\", reginfo->name, rd32(reginfo->ofs));\n+\t\tnetdev_info(dev, \"%-15s %08x\", reginfo->name,\n+\t\t\t rd32(reginfo->ofs));\n \t\treturn;\n \t}\n \n \tsnprintf(rname, 16, \"%s%s\", reginfo->name, \"[0-3]\");\n-\tpr_info(\"%-15s %08x %08x %08x %08x\\n\", rname, regs[0], regs[1],\n-\t\tregs[2], regs[3]);\n+\tnetdev_info(dev, \"%-15s %08x %08x %08x %08x\", rname, regs[0], regs[1],\n+\t\t regs[2], regs[3]);\n }\n \n /* igc_rings_dump - Tx-rings and Rx-rings */\n@@ -125,39 +127,34 @@ void igc_rings_dump(struct igc_adapter *adapter)\n \tif (!netif_msg_hw(adapter))\n \t\treturn;\n \n-\t/* Print netdevice Info */\n-\tif (netdev) {\n-\t\tdev_info(&adapter->pdev->dev, \"Net device Info\\n\");\n-\t\tpr_info(\"Device Name state trans_start\\n\");\n-\t\tpr_info(\"%-15s %016lX %016lX\\n\", netdev->name,\n-\t\t\tnetdev->state, dev_trans_start(netdev));\n-\t}\n+\tnetdev_info(netdev, \"Device info: state %016lX trans_start %016lX\",\n+\t\t netdev->state, dev_trans_start(netdev));\n \n \t/* Print TX Ring Summary */\n-\tif (!netdev || !netif_running(netdev))\n+\tif (!netif_running(netdev))\n \t\tgoto exit;\n \n-\tdev_info(&adapter->pdev->dev, \"TX Rings Summary\\n\");\n-\tpr_info(\"Queue [NTU] [NTC] [bi(ntc)->dma ] leng ntw timestamp\\n\");\n+\tnetdev_info(netdev, \"TX Rings Summary\");\n+\tnetdev_info(netdev, \"Queue [NTU] [NTC] [bi(ntc)->dma ] leng ntw timestamp\");\n \tfor (n = 0; n < adapter->num_tx_queues; n++) {\n \t\tstruct igc_tx_buffer *buffer_info;\n \n \t\ttx_ring = adapter->tx_ring[n];\n \t\tbuffer_info = &tx_ring->tx_buffer_info[tx_ring->next_to_clean];\n \n-\t\tpr_info(\" %5d %5X %5X %016llX %04X %p %016llX\\n\",\n-\t\t\tn, tx_ring->next_to_use, tx_ring->next_to_clean,\n-\t\t\t(u64)dma_unmap_addr(buffer_info, dma),\n-\t\t\tdma_unmap_len(buffer_info, len),\n-\t\t\tbuffer_info->next_to_watch,\n-\t\t\t(u64)buffer_info->time_stamp);\n+\t\tnetdev_info(netdev, \"%5d %5X %5X %016llX %04X %p %016llX\",\n+\t\t\t n, tx_ring->next_to_use, tx_ring->next_to_clean,\n+\t\t\t (u64)dma_unmap_addr(buffer_info, dma),\n+\t\t\t dma_unmap_len(buffer_info, len),\n+\t\t\t buffer_info->next_to_watch,\n+\t\t\t (u64)buffer_info->time_stamp);\n \t}\n \n \t/* Print TX Rings */\n \tif (!netif_msg_tx_done(adapter))\n \t\tgoto rx_ring_summary;\n \n-\tdev_info(&adapter->pdev->dev, \"TX Rings Dump\\n\");\n+\tnetdev_info(netdev, \"TX Rings Dump\");\n \n \t/* Transmit Descriptor Formats\n \t *\n@@ -172,10 +169,11 @@ void igc_rings_dump(struct igc_adapter *adapter)\n \n \tfor (n = 0; n < adapter->num_tx_queues; n++) {\n \t\ttx_ring = adapter->tx_ring[n];\n-\t\tpr_info(\"------------------------------------\\n\");\n-\t\tpr_info(\"TX QUEUE INDEX = %d\\n\", tx_ring->queue_index);\n-\t\tpr_info(\"------------------------------------\\n\");\n-\t\tpr_info(\"T [desc] [address 63:0 ] [PlPOCIStDDM Ln] [bi->dma ] leng ntw timestamp bi->skb\\n\");\n+\t\tnetdev_info(netdev, \"------------------------------------\");\n+\t\tnetdev_info(netdev, \"TX QUEUE INDEX = %d\",\n+\t\t\t tx_ring->queue_index);\n+\t\tnetdev_info(netdev, \"------------------------------------\");\n+\t\tnetdev_info(netdev, \"T [desc] [address 63:0 ] [PlPOCIStDDM Ln] [bi->dma ] leng ntw timestamp bi->skb\");\n \n \t\tfor (i = 0; tx_ring->desc && (i < tx_ring->count); i++) {\n \t\t\tconst char *next_desc;\n@@ -194,14 +192,14 @@ void igc_rings_dump(struct igc_adapter *adapter)\n \t\t\telse\n \t\t\t\tnext_desc = \"\";\n \n-\t\t\tpr_info(\"T [0x%03X] %016llX %016llX %016llX %04X %p %016llX %p%s\\n\",\n-\t\t\t\ti, le64_to_cpu(u0->a),\n-\t\t\t\tle64_to_cpu(u0->b),\n-\t\t\t\t(u64)dma_unmap_addr(buffer_info, dma),\n-\t\t\t\tdma_unmap_len(buffer_info, len),\n-\t\t\t\tbuffer_info->next_to_watch,\n-\t\t\t\t(u64)buffer_info->time_stamp,\n-\t\t\t\tbuffer_info->skb, next_desc);\n+\t\t\tnetdev_info(netdev, \"T [0x%03X] %016llX %016llX %016llX %04X %p %016llX %p%s\",\n+\t\t\t\t i, le64_to_cpu(u0->a),\n+\t\t\t\t le64_to_cpu(u0->b),\n+\t\t\t\t (u64)dma_unmap_addr(buffer_info, dma),\n+\t\t\t\t dma_unmap_len(buffer_info, len),\n+\t\t\t\t buffer_info->next_to_watch,\n+\t\t\t\t (u64)buffer_info->time_stamp,\n+\t\t\t\t buffer_info->skb, next_desc);\n \n \t\t\tif (netif_msg_pktdata(adapter) && buffer_info->skb)\n \t\t\t\tprint_hex_dump(KERN_INFO, \"\",\n@@ -214,19 +212,19 @@ void igc_rings_dump(struct igc_adapter *adapter)\n \n \t/* Print RX Rings Summary */\n rx_ring_summary:\n-\tdev_info(&adapter->pdev->dev, \"RX Rings Summary\\n\");\n-\tpr_info(\"Queue [NTU] [NTC]\\n\");\n+\tnetdev_info(netdev, \"RX Rings Summary\");\n+\tnetdev_info(netdev, \"Queue [NTU] [NTC]\");\n \tfor (n = 0; n < adapter->num_rx_queues; n++) {\n \t\trx_ring = adapter->rx_ring[n];\n-\t\tpr_info(\" %5d %5X %5X\\n\",\n-\t\t\tn, rx_ring->next_to_use, rx_ring->next_to_clean);\n+\t\tnetdev_info(netdev, \"%5d %5X %5X\", n, rx_ring->next_to_use,\n+\t\t\t rx_ring->next_to_clean);\n \t}\n \n \t/* Print RX Rings */\n \tif (!netif_msg_rx_status(adapter))\n \t\tgoto exit;\n \n-\tdev_info(&adapter->pdev->dev, \"RX Rings Dump\\n\");\n+\tnetdev_info(netdev, \"RX Rings Dump\");\n \n \t/* Advanced Receive Descriptor (Read) Format\n \t * 63 1 0\n@@ -251,11 +249,12 @@ void igc_rings_dump(struct igc_adapter *adapter)\n \n \tfor (n = 0; n < adapter->num_rx_queues; n++) {\n \t\trx_ring = adapter->rx_ring[n];\n-\t\tpr_info(\"------------------------------------\\n\");\n-\t\tpr_info(\"RX QUEUE INDEX = %d\\n\", rx_ring->queue_index);\n-\t\tpr_info(\"------------------------------------\\n\");\n-\t\tpr_info(\"R [desc] [ PktBuf A0] [ HeadBuf DD] [bi->dma ] [bi->skb] <-- Adv Rx Read format\\n\");\n-\t\tpr_info(\"RWB[desc] [PcsmIpSHl PtRs] [vl er S cks ln] ---------------- [bi->skb] <-- Adv Rx Write-Back format\\n\");\n+\t\tnetdev_info(netdev, \"------------------------------------\");\n+\t\tnetdev_info(netdev, \"RX QUEUE INDEX = %d\",\n+\t\t\t rx_ring->queue_index);\n+\t\tnetdev_info(netdev, \"------------------------------------\");\n+\t\tnetdev_info(netdev, \"R [desc] [ PktBuf A0] [ HeadBuf DD] [bi->dma ] [bi->skb] <-- Adv Rx Read format\");\n+\t\tnetdev_info(netdev, \"RWB[desc] [PcsmIpSHl PtRs] [vl er S cks ln] ---------------- [bi->skb] <-- Adv Rx Write-Back format\");\n \n \t\tfor (i = 0; i < rx_ring->count; i++) {\n \t\t\tconst char *next_desc;\n@@ -275,18 +274,18 @@ void igc_rings_dump(struct igc_adapter *adapter)\n \n \t\t\tif (staterr & IGC_RXD_STAT_DD) {\n \t\t\t\t/* Descriptor Done */\n-\t\t\t\tpr_info(\"%s[0x%03X] %016llX %016llX ---------------- %s\\n\",\n-\t\t\t\t\t\"RWB\", i,\n-\t\t\t\t\tle64_to_cpu(u0->a),\n-\t\t\t\t\tle64_to_cpu(u0->b),\n-\t\t\t\t\tnext_desc);\n+\t\t\t\tnetdev_info(netdev, \"%s[0x%03X] %016llX %016llX ---------------- %s\",\n+\t\t\t\t\t \"RWB\", i,\n+\t\t\t\t\t le64_to_cpu(u0->a),\n+\t\t\t\t\t le64_to_cpu(u0->b),\n+\t\t\t\t\t next_desc);\n \t\t\t} else {\n-\t\t\t\tpr_info(\"%s[0x%03X] %016llX %016llX %016llX %s\\n\",\n-\t\t\t\t\t\"R \", i,\n-\t\t\t\t\tle64_to_cpu(u0->a),\n-\t\t\t\t\tle64_to_cpu(u0->b),\n-\t\t\t\t\t(u64)buffer_info->dma,\n-\t\t\t\t\tnext_desc);\n+\t\t\t\tnetdev_info(netdev, \"%s[0x%03X] %016llX %016llX %016llX %s\",\n+\t\t\t\t\t \"R \", i,\n+\t\t\t\t\t le64_to_cpu(u0->a),\n+\t\t\t\t\t le64_to_cpu(u0->b),\n+\t\t\t\t\t (u64)buffer_info->dma,\n+\t\t\t\t\t next_desc);\n \n \t\t\t\tif (netif_msg_pktdata(adapter) &&\n \t\t\t\t buffer_info->dma && buffer_info->page) {\n@@ -314,8 +313,8 @@ void igc_regs_dump(struct igc_adapter *adapter)\n \tstruct igc_reg_info *reginfo;\n \n \t/* Print Registers */\n-\tdev_info(&adapter->pdev->dev, \"Register Dump\\n\");\n-\tpr_info(\" Register Name Value\\n\");\n+\tnetdev_info(adapter->netdev, \"Register Dump\");\n+\tnetdev_info(adapter->netdev, \"Register Name Value\");\n \tfor (reginfo = (struct igc_reg_info *)igc_reg_info_tbl;\n \t reginfo->name; reginfo++) {\n \t\tigc_regdump(hw, reginfo);\n", "prefixes": [ "04/10" ] }