Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/853253/?format=api
{ "id": 853253, "url": "http://patchwork.ozlabs.org/api/patches/853253/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20171227131750.23824-1-alice.michael@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": "<20171227131750.23824-1-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-12-27T13:17:50", "name": "[next,S84-V2,06/13] i40e: change flags to use 64 bits", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c96acac45fda2cd84a3277d05c86026b0005f19c", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20171227131750.23824-1-alice.michael@intel.com/mbox/", "series": [ { "id": 20417, "url": "http://patchwork.ozlabs.org/api/series/20417/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=20417", "date": "2017-12-27T13:14:40", "name": "[next,S84-V2,01/13] i40e: Add returning AQ critical error to SW", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/20417/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/853253/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/853253/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.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3z6Qq60zVfz9sR8\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 28 Dec 2017 08:24:50 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 7FEA386A73;\n\tWed, 27 Dec 2017 21:24:48 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id awLbIFLjPe4a; Wed, 27 Dec 2017 21:24:47 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C865B86842;\n\tWed, 27 Dec 2017 21:24:47 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 66B311C25C5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Dec 2017 21:24:46 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 6277986B8C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Dec 2017 21:24:46 +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 9RLI5on6LthQ for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Dec 2017 21:24:45 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 624E886B72\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 27 Dec 2017 21:24:45 +0000 (UTC)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Dec 2017 13:24:45 -0800", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby fmsmga004.fm.intel.com with ESMTP; 27 Dec 2017 13:24:44 -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.45,467,1508828400\"; d=\"scan'208\";a=\"15985918\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 27 Dec 2017 08:17:50 -0500", "Message-Id": "<20171227131750.23824-1-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.5", "Subject": "[Intel-wired-lan] [next PATCH S84-V2 06/13] i40e: change flags to\n\tuse 64 bits", "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": "As we have added more flags, we need to now use more\nbits and have overflooded the 32 bit size. So\nmake it 64.\n\nalso change all the existing bits to unsigned long long\nbits.\n\nSigned-off-by: Alice Michael <alice.michael@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 67 +++++++++++++-------------\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 4 +-\n 2 files changed, 36 insertions(+), 35 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex e019baa..46e9f4e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -508,39 +508,40 @@ struct i40e_pf {\n #define I40E_HW_PORT_ID_VALID\t\t\tBIT(17)\n #define I40E_HW_RESTART_AUTONEG\t\t\tBIT(18)\n \n-\tu32 flags;\n-#define I40E_FLAG_RX_CSUM_ENABLED\t\tBIT(0)\n-#define I40E_FLAG_MSI_ENABLED\t\t\tBIT(1)\n-#define I40E_FLAG_MSIX_ENABLED\t\t\tBIT(2)\n-#define I40E_FLAG_RSS_ENABLED\t\t\tBIT(3)\n-#define I40E_FLAG_VMDQ_ENABLED\t\t\tBIT(4)\n-#define I40E_FLAG_FILTER_SYNC\t\t\tBIT(5)\n-#define I40E_FLAG_SRIOV_ENABLED\t\t\tBIT(6)\n-#define I40E_FLAG_DCB_CAPABLE\t\t\tBIT(7)\n-#define I40E_FLAG_DCB_ENABLED\t\t\tBIT(8)\n-#define I40E_FLAG_FD_SB_ENABLED\t\t\tBIT(9)\n-#define I40E_FLAG_FD_ATR_ENABLED\t\tBIT(10)\n-#define I40E_FLAG_FD_SB_AUTO_DISABLED\t\tBIT(11)\n-#define I40E_FLAG_FD_ATR_AUTO_DISABLED\t\tBIT(12)\n-#define I40E_FLAG_MFP_ENABLED\t\t\tBIT(13)\n-#define I40E_FLAG_UDP_FILTER_SYNC\t\tBIT(14)\n-#define I40E_FLAG_HW_ATR_EVICT_ENABLED\t\tBIT(15)\n-#define I40E_FLAG_VEB_MODE_ENABLED\t\tBIT(16)\n-#define I40E_FLAG_VEB_STATS_ENABLED\t\tBIT(17)\n-#define I40E_FLAG_LINK_POLLING_ENABLED\t\tBIT(18)\n-#define I40E_FLAG_TRUE_PROMISC_SUPPORT\t\tBIT(19)\n-#define I40E_FLAG_TEMP_LINK_POLLING\t\tBIT(20)\n-#define I40E_FLAG_LEGACY_RX\t\t\tBIT(21)\n-#define I40E_FLAG_PTP\t\t\t\tBIT(22)\n-#define I40E_FLAG_IWARP_ENABLED\t\t\tBIT(23)\n-#define I40E_FLAG_SERVICE_CLIENT_REQUESTED\tBIT(24)\n-#define I40E_FLAG_CLIENT_L2_CHANGE\t\tBIT(25)\n-#define I40E_FLAG_CLIENT_RESET\t\t\tBIT(26)\n-#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED\tBIT(27)\n-#define I40E_FLAG_SOURCE_PRUNING_DISABLED\tBIT(28)\n-#define I40E_FLAG_TC_MQPRIO\t\t\tBIT(29)\n-#define I40E_FLAG_FD_SB_INACTIVE\t\tBIT(30)\n-#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER\t\tBIT(31)\n+\tu64 flags;\n+#define I40E_FLAG_RX_CSUM_ENABLED\t\tBIT_ULL(0)\n+#define I40E_FLAG_MSI_ENABLED\t\t\tBIT_ULL(1)\n+#define I40E_FLAG_MSIX_ENABLED\t\t\tBIT_ULL(2)\n+#define I40E_FLAG_RSS_ENABLED\t\t\tBIT_ULL(3)\n+#define I40E_FLAG_VMDQ_ENABLED\t\t\tBIT_ULL(4)\n+#define I40E_FLAG_FILTER_SYNC\t\t\tBIT_ULL(5)\n+#define I40E_FLAG_SRIOV_ENABLED\t\t\tBIT_ULL(6)\n+#define I40E_FLAG_DCB_CAPABLE\t\t\tBIT_ULL(7)\n+#define I40E_FLAG_DCB_ENABLED\t\t\tBIT_ULL(8)\n+#define I40E_FLAG_FD_SB_ENABLED\t\t\tBIT_ULL(9)\n+#define I40E_FLAG_FD_ATR_ENABLED\t\tBIT_ULL(10)\n+#define I40E_FLAG_FD_SB_AUTO_DISABLED\t\tBIT_ULL(11)\n+#define I40E_FLAG_FD_ATR_AUTO_DISABLED\t\tBIT_ULL(12)\n+#define I40E_FLAG_MFP_ENABLED\t\t\tBIT_ULL(13)\n+#define I40E_FLAG_UDP_FILTER_SYNC\t\tBIT_ULL(14)\n+#define I40E_FLAG_HW_ATR_EVICT_ENABLED\t\tBIT_ULL(15)\n+#define I40E_FLAG_VEB_MODE_ENABLED\t\tBIT_ULL(16)\n+#define I40E_FLAG_VEB_STATS_ENABLED\t\tBIT_ULL(17)\n+#define I40E_FLAG_LINK_POLLING_ENABLED\t\tBIT_ULL(18)\n+#define I40E_FLAG_TRUE_PROMISC_SUPPORT\t\tBIT_ULL(19)\n+#define I40E_FLAG_TEMP_LINK_POLLING\t\tBIT_ULL(20)\n+#define I40E_FLAG_LEGACY_RX\t\t\tBIT_ULL(21)\n+#define I40E_FLAG_PTP\t\t\t\tBIT_ULL(22)\n+#define I40E_FLAG_IWARP_ENABLED\t\t\tBIT_ULL(23)\n+#define I40E_FLAG_SERVICE_CLIENT_REQUESTED\tBIT_ULL(24)\n+#define I40E_FLAG_CLIENT_L2_CHANGE\t\tBIT_ULL(25)\n+#define I40E_FLAG_CLIENT_RESET\t\t\tBIT_ULL(26)\n+#define I40E_FLAG_LINK_DOWN_ON_CLOSE_ENABLED\tBIT_ULL(27)\n+#define I40E_FLAG_SOURCE_PRUNING_DISABLED\tBIT_ULL(28)\n+#define I40E_FLAG_TC_MQPRIO\t\t\tBIT_ULL(29)\n+#define I40E_FLAG_FD_SB_INACTIVE\t\tBIT_ULL(30)\n+#define I40E_FLAG_FD_SB_TO_CLOUD_FILTER\t\tBIT_ULL(31)\n+#define I40E_FLAG_DISABLE_FW_LLDP\t\tBIT_ULL(32)\n \n \tstruct i40e_client_instance *cinst;\n \tbool stat_offsets_loaded;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 79c752a..e42b1c2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -4266,7 +4266,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \tstruct i40e_netdev_priv *np = netdev_priv(dev);\n \tstruct i40e_vsi *vsi = np->vsi;\n \tstruct i40e_pf *pf = vsi->back;\n-\tu32 orig_flags, new_flags, changed_flags;\n+\tu64 orig_flags, new_flags, changed_flags;\n \tu32 i, j;\n \n \torig_flags = READ_ONCE(pf->flags);\n@@ -4323,7 +4323,7 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t * originally. We'll just punt with an error and log something in the\n \t * message buffer.\n \t */\n-\tif (cmpxchg(&pf->flags, orig_flags, new_flags) != orig_flags) {\n+\tif (cmpxchg64(&pf->flags, orig_flags, new_flags) != orig_flags) {\n \t\tdev_warn(&pf->pdev->dev,\n \t\t\t \"Unable to update pf->flags as it was modified by another thread...\\n\");\n \t\treturn -EAGAIN;\n", "prefixes": [ "next", "S84-V2", "06/13" ] }