Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1266156/?format=api
{ "id": 1266156, "url": "http://patchwork.ozlabs.org/api/patches/1266156/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200403181743.23447-2-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": "<20200403181743.23447-2-andre.guedes@intel.com>", "list_archive_url": null, "date": "2020-04-03T18:17:40", "name": "[1/4] igc: Rename IGC_VLAPQF macro", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "71b7613f882496f65fdd5072691bd0e9f59924f0", "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/20200403181743.23447-2-andre.guedes@intel.com/mbox/", "series": [ { "id": 168477, "url": "http://patchwork.ozlabs.org/api/series/168477/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=168477", "date": "2020-04-03T18:17:41", "name": "igc: Fixes for VLAN priority filtering code", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/168477/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1266156/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1266156/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.136;\n\thelo=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 48v7VF49QBz9sSj\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 4 Apr 2020 05:18:45 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 52D5526876;\n\tFri, 3 Apr 2020 18:18:43 +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 ktNYzdV-Vwar; Fri, 3 Apr 2020 18:18:41 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id E8B812039A;\n\tFri, 3 Apr 2020 18:18:41 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id B37EC1BF397\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2020 18:18:38 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id AD41020390\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2020 18:18: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 xikN8PVFHYCy for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2020 18:18:33 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby silver.osuosl.org (Postfix) with ESMTPS id BB4972045E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 3 Apr 2020 18:18:33 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; \n\t03 Apr 2020 11:18:32 -0700", "from unknown (HELO localhost.localdomain) ([10.254.70.217])\n\tby orsmga006.jf.intel.com with ESMTP; 03 Apr 2020 11:18:32 -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": [ "suHiyxaJdYE9pD2zzV984auA1hUbOIHxt3V+XI6LfXusCX3F7IylXzpxTTKd4gBJzSogGSDPI7\n\t6CNCxC3zMhgw==", "cGG1xh4JlnEAAy39tv3MjAVNXPowOcsQdy1Zr++dJUt7tUo94zyYwmTJLt4QRmDBt1pbF6hiAT\n\tOBBtUHqd5MSQ==" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.72,340,1580803200\"; d=\"scan'208\";a=\"253445196\"", "From": "Andre Guedes <andre.guedes@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 3 Apr 2020 11:17:40 -0700", "Message-Id": "<20200403181743.23447-2-andre.guedes@intel.com>", "X-Mailer": "git-send-email 2.26.0", "In-Reply-To": "<20200403181743.23447-1-andre.guedes@intel.com>", "References": "<20200403181743.23447-1-andre.guedes@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH 1/4] igc: Rename IGC_VLAPQF macro", "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": "This patch renames the IGC_VLAPQF macro to IGC_VLANPQF as well as\nrelated macros so they match the register name and fields described in\nthe datasheet.\n\nSigned-off-by: Andre Guedes <andre.guedes@intel.com>\n---\n drivers/net/ethernet/intel/igc/igc_defines.h | 6 +++---\n drivers/net/ethernet/intel/igc/igc_ethtool.c | 21 ++++++++++----------\n drivers/net/ethernet/intel/igc/igc_regs.h | 2 +-\n 3 files changed, 14 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/igc/igc_defines.h b/drivers/net/ethernet/intel/igc/igc_defines.h\nindex 63d3d34763da..a4edf344bd63 100644\n--- a/drivers/net/ethernet/intel/igc/igc_defines.h\n+++ b/drivers/net/ethernet/intel/igc/igc_defines.h\n@@ -514,9 +514,9 @@\n #define IGC_MAX_MAC_HDR_LEN\t127\n #define IGC_MAX_NETWORK_HDR_LEN\t511\n \n-#define IGC_VLAPQF_QUEUE_SEL(_n, q_idx) ((q_idx) << ((_n) * 4))\n-#define IGC_VLAPQF_P_VALID(_n)\t(0x1 << (3 + (_n) * 4))\n-#define IGC_VLAPQF_QUEUE_MASK\t0x03\n+#define IGC_VLANPQF_QSEL(_n, q_idx) ((q_idx) << ((_n) * 4))\n+#define IGC_VLANPQF_VALID(_n)\t(0x1 << (3 + (_n) * 4))\n+#define IGC_VLANPQF_QUEUE_MASK\t0x03\n \n #define IGC_ADVTXD_MACLEN_SHIFT\t\t9 /* Adv ctxt desc mac len shift */\n #define IGC_ADVTXD_TUCMD_L4T_UDP\t0x00000000 /* L4 Packet TYPE of UDP */\ndiff --git a/drivers/net/ethernet/intel/igc/igc_ethtool.c b/drivers/net/ethernet/intel/igc/igc_ethtool.c\nindex 47115d73ea61..9811b26f3c59 100644\n--- a/drivers/net/ethernet/intel/igc/igc_ethtool.c\n+++ b/drivers/net/ethernet/intel/igc/igc_ethtool.c\n@@ -1229,23 +1229,23 @@ static int igc_rxnfc_write_vlan_prio_filter(struct igc_adapter *adapter,\n \tu16 queue_index;\n \tu32 vlapqf;\n \n-\tvlapqf = rd32(IGC_VLAPQF);\n+\tvlapqf = rd32(IGC_VLANPQF);\n \tvlan_priority = (ntohs(input->filter.vlan_tci) & VLAN_PRIO_MASK)\n \t\t\t\t>> VLAN_PRIO_SHIFT;\n-\tqueue_index = (vlapqf >> (vlan_priority * 4)) & IGC_VLAPQF_QUEUE_MASK;\n+\tqueue_index = (vlapqf >> (vlan_priority * 4)) & IGC_VLANPQF_QUEUE_MASK;\n \n \t/* check whether this vlan prio is already set */\n-\tif (vlapqf & IGC_VLAPQF_P_VALID(vlan_priority) &&\n+\tif (vlapqf & IGC_VLANPQF_VALID(vlan_priority) &&\n \t queue_index != input->action) {\n \t\tnetdev_err(adapter->netdev,\n \t\t\t \"ethtool rxnfc set vlan prio filter failed\");\n \t\treturn -EEXIST;\n \t}\n \n-\tvlapqf |= IGC_VLAPQF_P_VALID(vlan_priority);\n-\tvlapqf |= IGC_VLAPQF_QUEUE_SEL(vlan_priority, input->action);\n+\tvlapqf |= IGC_VLANPQF_VALID(vlan_priority);\n+\tvlapqf |= IGC_VLANPQF_QSEL(vlan_priority, input->action);\n \n-\twr32(IGC_VLAPQF, vlapqf);\n+\twr32(IGC_VLANPQF, vlapqf);\n \n \treturn 0;\n }\n@@ -1313,12 +1313,11 @@ static void igc_clear_vlan_prio_filter(struct igc_adapter *adapter,\n \n \tvlan_priority = (vlan_tci & VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;\n \n-\tvlapqf = rd32(IGC_VLAPQF);\n-\tvlapqf &= ~IGC_VLAPQF_P_VALID(vlan_priority);\n-\tvlapqf &= ~IGC_VLAPQF_QUEUE_SEL(vlan_priority,\n-\t\t\t\t\t\tIGC_VLAPQF_QUEUE_MASK);\n+\tvlapqf = rd32(IGC_VLANPQF);\n+\tvlapqf &= ~IGC_VLANPQF_VALID(vlan_priority);\n+\tvlapqf &= ~IGC_VLANPQF_QSEL(vlan_priority, IGC_VLANPQF_QUEUE_MASK);\n \n-\twr32(IGC_VLAPQF, vlapqf);\n+\twr32(IGC_VLANPQF, vlapqf);\n }\n \n int igc_erase_filter(struct igc_adapter *adapter, struct igc_nfc_filter *input)\ndiff --git a/drivers/net/ethernet/intel/igc/igc_regs.h b/drivers/net/ethernet/intel/igc/igc_regs.h\nindex 7bfba20bf207..ab8ac46d381a 100644\n--- a/drivers/net/ethernet/intel/igc/igc_regs.h\n+++ b/drivers/net/ethernet/intel/igc/igc_regs.h\n@@ -123,7 +123,7 @@\n #define IGC_UTA\t\t\t0x0A000 /* Unicast Table Array - RW */\n #define IGC_RAL(_n)\t\t(0x05400 + ((_n) * 0x08))\n #define IGC_RAH(_n)\t\t(0x05404 + ((_n) * 0x08))\n-#define IGC_VLAPQF\t\t0x055B0 /* VLAN Priority Queue Filter VLAPQF */\n+#define IGC_VLANPQF\t\t0x055B0 /* VLAN Priority Queue Filter - RW */\n \n /* Transmit Register Descriptions */\n #define IGC_TCTL\t\t0x00400 /* Tx Control - RW */\n", "prefixes": [ "1/4" ] }