Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/972024/?format=api
{ "id": 972024, "url": "http://patchwork.ozlabs.org/api/patches/972024/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180920002311.10891-9-anirudh.venkataramanan@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": "<20180920002311.10891-9-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2018-09-20T00:23:11", "name": "[8/8] ice: fix changing of ring descriptor size (ethtool -G)", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "71d0ea9adc15acbb2d457e80977e16361f7d0790", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20180920002311.10891-9-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 66524, "url": "http://patchwork.ozlabs.org/api/series/66524/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=66524", "date": "2018-09-20T00:23:03", "name": "Minor updates and bug fixes", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/66524/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/972024/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/972024/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;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.138; helo=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 42FyBQ5PWkz9sCP\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 20 Sep 2018 10:23:26 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 2806E882AE;\n\tThu, 20 Sep 2018 00:23:25 +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 cpVczcRsSmSj; Thu, 20 Sep 2018 00:23:22 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 8569D882CE;\n\tThu, 20 Sep 2018 00:23:21 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id D30191C08AF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:19 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D0A5E87EAF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:19 +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 fZwPXWbX31PL for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:19 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 98B3C882CA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 20 Sep 2018 00:23:18 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Sep 2018 17:23:18 -0700", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga006.jf.intel.com with ESMTP; 19 Sep 2018 17:23:11 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,396,1531810800\"; d=\"scan'208\";a=\"75747555\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 19 Sep 2018 17:23:11 -0700", "Message-Id": "<20180920002311.10891-9-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20180920002311.10891-1-anirudh.venkataramanan@intel.com>", "References": "<20180920002311.10891-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH 8/8] ice: fix changing of ring descriptor\n\tsize (ethtool -G)", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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>", "MIME-Version": "1.0", "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": "From: Bruce Allan <bruce.w.allan@intel.com>\n\nrx_mini_pending was set to an incorrect value. This was causing EINVAL to\nalways be returned to 'ethtool -G'. The driver does not support mini or\njumbo rings so the respective settings should be zero.\n\nAlso, change the valid range of the number of descriptors in the rings to\nmake the code simpler and easier for users to understand (this removes the\nvalid settings of 8 and 16). Add a system log message indicating when the\nnumber is rounded-up from what the user specifies with the 'ethtool -G'\ncommand (i.e. when it is not a multiple of 32), and update the log message\nwhen a user-provided value is out of range to also indicate the stride.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 4 ++--\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 17 ++++++++++++++---\n 2 files changed, 16 insertions(+), 5 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 9cf233d085d8..e84a612ffa71 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -39,9 +39,9 @@\n extern const char ice_drv_ver[];\n #define ICE_BAR0\t\t0\n #define ICE_DFLT_NUM_DESC\t128\n-#define ICE_MIN_NUM_DESC\t8\n-#define ICE_MAX_NUM_DESC\t8160\n #define ICE_REQ_DESC_MULTIPLE\t32\n+#define ICE_MIN_NUM_DESC\tICE_REQ_DESC_MULTIPLE\n+#define ICE_MAX_NUM_DESC\t8160\n #define ICE_DFLT_TRAFFIC_CLASS\tBIT(0)\n #define ICE_INT_NAME_STR_LEN\t(IFNAMSIZ + 16)\n #define ICE_ETHTOOL_FWVER_LEN\t32\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex db2c502ae932..96923580f2a6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -1198,9 +1198,11 @@ ice_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \tring->tx_max_pending = ICE_MAX_NUM_DESC;\n \tring->rx_pending = vsi->rx_rings[0]->count;\n \tring->tx_pending = vsi->tx_rings[0]->count;\n-\tring->rx_mini_pending = ICE_MIN_NUM_DESC;\n+\n+\t/* Rx mini and jumbo rings are not supported */\n \tring->rx_mini_max_pending = 0;\n \tring->rx_jumbo_max_pending = 0;\n+\tring->rx_mini_pending = 0;\n \tring->rx_jumbo_pending = 0;\n }\n \n@@ -1218,14 +1220,23 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \t ring->tx_pending < ICE_MIN_NUM_DESC ||\n \t ring->rx_pending > ICE_MAX_NUM_DESC ||\n \t ring->rx_pending < ICE_MIN_NUM_DESC) {\n-\t\tnetdev_err(netdev, \"Descriptors requested (Tx: %d / Rx: %d) out of range [%d-%d]\\n\",\n+\t\tnetdev_err(netdev, \"Descriptors requested (Tx: %d / Rx: %d) out of range [%d-%d] (increment %d)\\n\",\n \t\t\t ring->tx_pending, ring->rx_pending,\n-\t\t\t ICE_MIN_NUM_DESC, ICE_MAX_NUM_DESC);\n+\t\t\t ICE_MIN_NUM_DESC, ICE_MAX_NUM_DESC,\n+\t\t\t ICE_REQ_DESC_MULTIPLE);\n \t\treturn -EINVAL;\n \t}\n \n \tnew_tx_cnt = ALIGN(ring->tx_pending, ICE_REQ_DESC_MULTIPLE);\n+\tif (new_tx_cnt != ring->tx_pending)\n+\t\tnetdev_info(netdev,\n+\t\t\t \"Requested Tx descriptor count rounded up to %d\\n\",\n+\t\t\t new_tx_cnt);\n \tnew_rx_cnt = ALIGN(ring->rx_pending, ICE_REQ_DESC_MULTIPLE);\n+\tif (new_rx_cnt != ring->rx_pending)\n+\t\tnetdev_info(netdev,\n+\t\t\t \"Requested Rx descriptor count rounded up to %d\\n\",\n+\t\t\t new_rx_cnt);\n \n \t/* if nothing to do return success */\n \tif (new_tx_cnt == vsi->tx_rings[0]->count &&\n", "prefixes": [ "8/8" ] }