Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1049867/?format=api
{ "id": 1049867, "url": "http://patchwork.ozlabs.org/api/patches/1049867/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190228232603.32156-10-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": "<20190228232603.32156-10-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-28T23:25:55", "name": "[S17,09/17] ice: Add ability to update rx-usecs-high", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b51f4cd2d014fc50bfcb51aa6a72d2f4c456f89e", "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/20190228232603.32156-10-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 94829, "url": "http://patchwork.ozlabs.org/api/series/94829/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=94829", "date": "2019-02-28T23:25:46", "name": "Implementation updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/94829/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1049867/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1049867/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 449TFw3fSPz9sCJ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 1 Mar 2019 10:26:28 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id B2F5F20768;\n\tThu, 28 Feb 2019 23:26:26 +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 bx7pCfgKm0+F; Thu, 28 Feb 2019 23:26:19 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 8883E226C2;\n\tThu, 28 Feb 2019 23:26:16 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 77E5C1BF3EA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 724EF8201C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:15 +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 P-vuBR5pYe+I for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:06 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id ED09B815ED\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 28 Feb 2019 23:26:05 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t28 Feb 2019 15:26:05 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby FMSMGA003.fm.intel.com with ESMTP; 28 Feb 2019 15:26:05 -0800" ], "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.58,425,1544515200\"; d=\"scan'208\";a=\"137127998\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 28 Feb 2019 15:25:55 -0800", "Message-Id": "<20190228232603.32156-10-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190228232603.32156-1-anirudh.venkataramanan@intel.com>", "References": "<20190228232603.32156-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S17 09/17] ice: Add ability to update\n\trx-usecs-high", "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>", "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: Brett Creeley <brett.creeley@intel.com>\n\nCurrently the driver allows rx-usecs-high values to be set,\nbut when querying the device for rx-usecs-high the value\ndoes not stick. This is because it was not yet implemented.\nAdd code to allow the user to change rx-usecs-high and\nuse this to set the q_vector's intrl value.\n\nSigned-off-by: Brett Creeley <brett.creeley@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 31 +++++++++++++++++++++++++++-\n drivers/net/ethernet/intel/ice/ice_lib.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_lib.h | 1 +\n drivers/net/ethernet/intel/ice/ice_txrx.h | 1 +\n 4 files changed, 33 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 64a4c4456ba0..f995ed599cd9 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -2228,12 +2228,18 @@ static int\n ice_get_rc_coalesce(struct ethtool_coalesce *ec, enum ice_container_type c_type,\n \t\t struct ice_ring_container *rc)\n {\n-\tstruct ice_pf *pf = rc->ring->vsi->back;\n+\tstruct ice_pf *pf;\n+\n+\tif (!rc->ring)\n+\t\treturn -EINVAL;\n+\n+\tpf = rc->ring->vsi->back;\n \n \tswitch (c_type) {\n \tcase ICE_RX_CONTAINER:\n \t\tec->use_adaptive_rx_coalesce = ITR_IS_DYNAMIC(rc->itr_setting);\n \t\tec->rx_coalesce_usecs = rc->itr_setting & ~ICE_ITR_DYNAMIC;\n+\t\tec->rx_coalesce_usecs_high = rc->ring->q_vector->intrl;\n \t\tbreak;\n \tcase ICE_TX_CONTAINER:\n \t\tec->use_adaptive_tx_coalesce = ITR_IS_DYNAMIC(rc->itr_setting);\n@@ -2342,6 +2348,23 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,\n \n \tswitch (c_type) {\n \tcase ICE_RX_CONTAINER:\n+\t\tif (ec->rx_coalesce_usecs_high > ICE_MAX_INTRL ||\n+\t\t (ec->rx_coalesce_usecs_high &&\n+\t\t ec->rx_coalesce_usecs_high < pf->hw.intrl_gran)) {\n+\t\t\tnetdev_info(vsi->netdev,\n+\t\t\t\t \"Invalid value, rx-usecs-high valid values are 0 (disabled), %d-%d\\n\",\n+\t\t\t\t pf->hw.intrl_gran, ICE_MAX_INTRL);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tif (ec->rx_coalesce_usecs_high != rc->ring->q_vector->intrl) {\n+\t\t\trc->ring->q_vector->intrl = ec->rx_coalesce_usecs_high;\n+\t\t\twr32(&pf->hw, GLINT_RATE(vsi->hw_base_vector +\n+\t\t\t\t\t\t rc->ring->q_vector->v_idx),\n+\t\t\t ice_intrl_usec_to_reg(ec->rx_coalesce_usecs_high,\n+\t\t\t\t\t\t pf->hw.intrl_gran));\n+\t\t}\n+\n \t\tif (ec->rx_coalesce_usecs != itr_setting &&\n \t\t ec->use_adaptive_rx_coalesce) {\n \t\t\tnetdev_info(vsi->netdev,\n@@ -2364,6 +2387,12 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,\n \t\t}\n \t\tbreak;\n \tcase ICE_TX_CONTAINER:\n+\t\tif (ec->tx_coalesce_usecs_high) {\n+\t\t\tnetdev_info(vsi->netdev,\n+\t\t\t\t \"setting tx-usecs-high is not supported\\n\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n \t\tif (ec->tx_coalesce_usecs != itr_setting &&\n \t\t ec->use_adaptive_tx_coalesce) {\n \t\t\tnetdev_info(vsi->netdev,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 982a3a9e9b8d..4c6ecc25aaa0 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1764,7 +1764,7 @@ int ice_vsi_cfg_lan_txqs(struct ice_vsi *vsi)\n * This function converts a decimal interrupt rate limit in usecs to the format\n * expected by firmware.\n */\n-static u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)\n+u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran)\n {\n \tu32 val = intrl / gran;\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h\nindex 714ace077796..a91d3553cc89 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.h\n@@ -80,4 +80,5 @@ void ice_vsi_free_tx_rings(struct ice_vsi *vsi);\n \n int ice_vsi_manage_rss_lut(struct ice_vsi *vsi, bool ena);\n \n+u32 ice_intrl_usec_to_reg(u8 intrl, u8 gran);\n #endif /* !_ICE_LIB_H_ */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h\nindex c75d9fd12a68..66e05032ee56 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h\n@@ -142,6 +142,7 @@ enum ice_rx_dtype {\n #define ICE_ITR_ADAPTIVE_BULK\t\t0x0000\n \n #define ICE_DFLT_INTRL\t0\n+#define ICE_MAX_INTRL\t236\n \n /* Legacy or Advanced Mode Queue */\n #define ICE_TX_ADVANCED\t0\n", "prefixes": [ "S17", "09/17" ] }