Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/925523/?format=api
{ "id": 925523, "url": "http://patchwork.ozlabs.org/api/patches/925523/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180605151113.3359.74309.stgit@ahduyck-green-test.jf.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": "<20180605151113.3359.74309.stgit@ahduyck-green-test.jf.intel.com>", "list_archive_url": null, "date": "2018-06-05T15:11:14", "name": "[net-queue,2/2] ixgbe: Fix bit definitions and add support for testing for ipsec support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "900cb3c50887d9a0796bfd6fedcc41eb59355c64", "submitter": { "id": 251, "url": "http://patchwork.ozlabs.org/api/people/251/?format=api", "name": "Duyck, Alexander H", "email": "alexander.h.duyck@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/20180605151113.3359.74309.stgit@ahduyck-green-test.jf.intel.com/mbox/", "series": [ { "id": 48643, "url": "http://patchwork.ozlabs.org/api/series/48643/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=48643", "date": "2018-06-05T15:11:03", "name": "More fixes for ipsec", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/48643/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/925523/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/925523/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@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 AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 410b7M5QXgz9s08\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 6 Jun 2018 01:19:11 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 078DA85AF4;\n\tTue, 5 Jun 2018 15:19:10 +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 jH6wvHmYJgY7; Tue, 5 Jun 2018 15:19:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 13D1289D44;\n\tTue, 5 Jun 2018 15:19:08 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id ECB0F1C2797\n\tfor <intel-wired-lan@osuosl.org>;\n\tTue, 5 Jun 2018 15:19:06 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E6F0C89D44\n\tfor <intel-wired-lan@osuosl.org>;\n\tTue, 5 Jun 2018 15:19:06 +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 szdrM3hEfTzo for <intel-wired-lan@osuosl.org>;\n\tTue, 5 Jun 2018 15:19:06 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 6BB0B89D3B\n\tfor <intel-wired-lan@osuosl.org>;\n\tTue, 5 Jun 2018 15:19:06 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Jun 2018 08:19:06 -0700", "from ahduyck-green-test.jf.intel.com ([10.166.244.179])\n\tby FMSMGA003.fm.intel.com with ESMTP; 05 Jun 2018 08:19:06 -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.49,479,1520924400\"; d=\"scan'208\";a=\"54933669\"", "From": "Alexander Duyck <alexander.h.duyck@intel.com>", "To": "shannon.nelson@oracle.com, intel-wired-lan@osuosl.org", "Date": "Tue, 05 Jun 2018 11:11:14 -0400", "Message-ID": "<20180605151113.3359.74309.stgit@ahduyck-green-test.jf.intel.com>", "In-Reply-To": "<20180605150520.3359.94409.stgit@ahduyck-green-test.jf.intel.com>", "References": "<20180605150520.3359.94409.stgit@ahduyck-green-test.jf.intel.com>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [net-queue PATCH 2/2] ixgbe: Fix bit definitions\n\tand add support for testing for ipsec support", "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>", "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 addresses two issues. First it adds the correct bit definitions\nfor the SECTXSTAT and SECRXSTAT registers. Then it makes use of those\ndefinitions to test for if ipsec has been disabled on the part and if so we\ndo not enable it.\n\nSigned-off-by: Alexander Duyck <alexander.h.duyck@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 14 +++++++++++++-\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 6 ++++--\n 2 files changed, 17 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\nindex 7b23fb0..4b242c0 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c\n@@ -975,10 +975,22 @@ void ixgbe_ipsec_rx(struct ixgbe_ring *rx_ring,\n **/\n void ixgbe_init_ipsec_offload(struct ixgbe_adapter *adapter)\n {\n+\tstruct ixgbe_hw *hw = &adapter->hw;\n \tstruct ixgbe_ipsec *ipsec;\n+\tu32 t_dis, r_dis;\n \tsize_t size;\n \n-\tif (adapter->hw.mac.type == ixgbe_mac_82598EB)\n+\tif (hw->mac.type == ixgbe_mac_82598EB)\n+\t\treturn;\n+\n+\t/* If there is no support for either Tx or Rx offload\n+\t * we should not be advertising support for ipsec.\n+\t */\n+\tt_dis = IXGBE_READ_REG(hw, IXGBE_SECTXSTAT) &\n+\t\tIXGBE_SECTXSTAT_SECTX_OFF_DIS;\n+\tr_dis = IXGBE_READ_REG(hw, IXGBE_SECRXSTAT) &\n+\t\tIXGBE_SECRXSTAT_SECRX_OFF_DIS;\n+\tif (t_dis || r_dis)\n \t\treturn;\n \n \tipsec = kzalloc(sizeof(*ipsec), GFP_KERNEL);\ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex e8ed377..3d54746 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -599,13 +599,15 @@ struct ixgbe_nvm_version {\n #define IXGBE_SECTXCTRL_STORE_FORWARD 0x00000004\n \n #define IXGBE_SECTXSTAT_SECTX_RDY 0x00000001\n-#define IXGBE_SECTXSTAT_ECC_TXERR 0x00000002\n+#define IXGBE_SECTXSTAT_SECTX_OFF_DIS\t0x00000002\n+#define IXGBE_SECTXSTAT_ECC_TXERR 0x00000004\n \n #define IXGBE_SECRXCTRL_SECRX_DIS 0x00000001\n #define IXGBE_SECRXCTRL_RX_DIS 0x00000002\n \n #define IXGBE_SECRXSTAT_SECRX_RDY 0x00000001\n-#define IXGBE_SECRXSTAT_ECC_RXERR 0x00000002\n+#define IXGBE_SECRXSTAT_SECRX_OFF_DIS\t0x00000002\n+#define IXGBE_SECRXSTAT_ECC_RXERR 0x00000004\n \n /* LinkSec (MacSec) Registers */\n #define IXGBE_LSECTXCAP 0x08A00\n", "prefixes": [ "net-queue", "2/2" ] }