Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/599650/?format=api
{ "id": 599650, "url": "http://patchwork.ozlabs.org/api/patches/599650/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160318183250.40415.40323.stgit@mdrustad-wks.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": "<20160318183250.40415.40323.stgit@mdrustad-wks.jf.intel.com>", "list_archive_url": null, "date": "2016-03-18T18:32:50", "name": "[V2,1/7] ixgbe: Add definitions for new 10G MAC", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "1908c8be4429af7ef259491357c0f24bf2734722", "submitter": { "id": 13252, "url": "http://patchwork.ozlabs.org/api/people/13252/?format=api", "name": "Rustad, Mark D", "email": "mark.d.rustad@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/20160318183250.40415.40323.stgit@mdrustad-wks.jf.intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/599650/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/599650/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 3qRYkH3kZFz9s9Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 19 Mar 2016 05:32:55 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id CE3AD92189;\n\tFri, 18 Mar 2016 18:32:54 +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 gKlOd0Cy5UFv; Fri, 18 Mar 2016 18:32:52 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id DE1CD92187;\n\tFri, 18 Mar 2016 18:32:52 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 6E1851C105C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 18 Mar 2016 18:32:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 6A4E1A62FA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 18 Mar 2016 18:32:51 +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 TX-R36mVLWMB for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 18 Mar 2016 18:32:50 +0000 (UTC)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id BE145A62E8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 18 Mar 2016 18:32:50 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga104.fm.intel.com with ESMTP; 18 Mar 2016 11:32:50 -0700", "from mdrustad-wks.jf.intel.com ([134.134.3.229])\n\tby orsmga003.jf.intel.com with ESMTP; 18 Mar 2016 11:32:50 -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-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.24,356,1455004800\"; d=\"scan'208\";a=\"766972462\"", "From": "Mark D Rustad <mark.d.rustad@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 18 Mar 2016 11:32:50 -0700", "Message-ID": "<20160318183250.40415.40323.stgit@mdrustad-wks.jf.intel.com>", "In-Reply-To": "<20160318183203.40415.3005.stgit@mdrustad-wks.jf.intel.com>", "References": "<20160318183203.40415.3005.stgit@mdrustad-wks.jf.intel.com>", "User-Agent": "StGit/unknown-version", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH V2 1/7] ixgbe: Add definitions for new 10G\n\tMAC", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "Add definitions for a new 10G MAC device with a native SFP\ninterface.\n\nSigned-off-by: Mark Rustad <mark.d.rustad@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 22 ++++++++++++++++++----\n 1 file changed, 18 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\nindex 7ae4bbd26ad8..fae85d1c3bf9 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h\n@@ -80,16 +80,18 @@\n #define IXGBE_DEV_ID_X550EM_X_SFP\t0x15AC\n #define IXGBE_DEV_ID_X550EM_X_10G_T\t0x15AD\n #define IXGBE_DEV_ID_X550EM_X_1G_T\t0x15AE\n+#define IXGBE_DEV_ID_X550EM_A_SFP_N\t0x15C4\n+\n+/* VF Device IDs */\n #define IXGBE_DEV_ID_X550_VF_HV\t0x1564\n #define IXGBE_DEV_ID_X550_VF\t\t0x1565\n #define IXGBE_DEV_ID_X550EM_X_VF\t0x15A8\n #define IXGBE_DEV_ID_X550EM_X_VF_HV\t0x15A9\n-\n-/* VF Device IDs */\n #define IXGBE_DEV_ID_82599_VF 0x10ED\n #define IXGBE_DEV_ID_X540_VF 0x1515\n #define IXGBE_DEV_ID_X550_VF\t\t0x1565\n #define IXGBE_DEV_ID_X550EM_X_VF\t0x15A8\n+#define IXGBE_DEV_ID_X550EM_A_VF\t0x15C5\n \n #define IXGBE_CAT(r, m)\tIXGBE_##r##_##m\n \n@@ -128,7 +130,7 @@\n #define IXGBE_FLA_X540\t\tIXGBE_FLA_8259X\n #define IXGBE_FLA_X550\t\tIXGBE_FLA_8259X\n #define IXGBE_FLA_X550EM_x\tIXGBE_FLA_8259X\n-#define IXGBE_FLA_X550EM_a\t0x15F6C\n+#define IXGBE_FLA_X550EM_a\t0x15F68\n #define IXGBE_FLA(_hw)\t\tIXGBE_BY_MAC((_hw), FLA)\n #define IXGBE_EEMNGCTL 0x10110\n #define IXGBE_EEMNGDATA 0x10114\n@@ -368,6 +370,8 @@ struct ixgbe_thermal_sensor_data {\n #define IXGBE_MRCTL(_i) (0x0F600 + ((_i) * 4))\n #define IXGBE_VMRVLAN(_i) (0x0F610 + ((_i) * 4))\n #define IXGBE_VMRVM(_i) (0x0F630 + ((_i) * 4))\n+#define IXGBE_WQBR_RX(_i) (0x2FB0 + ((_i) * 4)) /* 4 total */\n+#define IXGBE_WQBR_TX(_i) (0x8130 + ((_i) * 4)) /* 4 total */\n #define IXGBE_L34T_IMIR(_i) (0x0E800 + ((_i) * 4)) /*128 of these (0-127)*/\n #define IXGBE_RXFECCERR0 0x051B8\n #define IXGBE_LLITHRESH 0x0EC90\n@@ -439,6 +443,8 @@ struct ixgbe_thermal_sensor_data {\n #define IXGBE_DMATXCTL_TE 0x1 /* Transmit Enable */\n #define IXGBE_DMATXCTL_NS 0x2 /* No Snoop LSO hdr buffer */\n #define IXGBE_DMATXCTL_GDV 0x8 /* Global Double VLAN */\n+#define IXGBE_DMATXCTL_MDP_EN 0x20 /* Bit 5 */\n+#define IXGBE_DMATXCTL_MBINTEN 0x40 /* Bit 6 */\n #define IXGBE_DMATXCTL_VT_SHIFT 16 /* VLAN EtherType */\n \n #define IXGBE_PFDTXGSWC_VT_LBEN 0x1 /* Local L2 VT switch enable */\n@@ -547,7 +553,6 @@ struct ixgbe_thermal_sensor_data {\n #define IXGBE_TDPT2TCCR(_i) (0x0CD20 + ((_i) * 4)) /* 8 of these (0-7) */\n #define IXGBE_TDPT2TCSR(_i) (0x0CD40 + ((_i) * 4)) /* 8 of these (0-7) */\n \n-\n /* Security Control Registers */\n #define IXGBE_SECTXCTRL 0x08800\n #define IXGBE_SECTXSTAT 0x08804\n@@ -1196,6 +1201,8 @@ struct ixgbe_thermal_sensor_data {\n #define IXGBE_RDRXCTL_RSCLLIDIS 0x00800000 /* Disable RSC compl on LLI */\n #define IXGBE_RDRXCTL_RSCACKC 0x02000000 /* must set 1 when RSC enabled */\n #define IXGBE_RDRXCTL_FCOE_WRFIX 0x04000000 /* must set 1 when RSC enabled */\n+#define IXGBE_RDRXCTL_MBINTEN 0x10000000\n+#define IXGBE_RDRXCTL_MDP_EN 0x20000000\n \n /* RQTC Bit Masks and Shifts */\n #define IXGBE_RQTC_SHIFT_TC(_i) ((_i) * 4)\n@@ -1950,7 +1957,9 @@ enum {\n #define IXGBE_GSSR_PHY1_SM\t\t0x0004\n #define IXGBE_GSSR_MAC_CSR_SM\t\t0x0008\n #define IXGBE_GSSR_FLASH_SM\t\t0x0010\n+#define IXGBE_GSSR_NVM_UPDATE_SM\t0x0200\n #define IXGBE_GSSR_SW_MNG_SM\t\t0x0400\n+#define IXGBE_GSSR_TOKEN_SM\t0x40000000 /* SW bit for shared access */\n #define IXGBE_GSSR_SHARED_I2C_SM\t0x1806 /* Wait for both phys & I2Cs */\n #define IXGBE_GSSR_I2C_MASK\t\t0x1800\n #define IXGBE_GSSR_NVM_PHY_MASK\t\t0xF\n@@ -2523,6 +2532,10 @@ enum ixgbe_fdir_pballoc_type {\n #define IXGBE_FDIRCTRL_REPORT_STATUS_ALWAYS 0x00000080\n #define IXGBE_FDIRCTRL_DROP_Q_SHIFT 8\n #define IXGBE_FDIRCTRL_FLEX_SHIFT 16\n+#define IXGBE_FDIRCTRL_DROP_NO_MATCH\t\t0x00008000\n+#define IXGBE_FDIRCTRL_FILTERMODE_SHIFT\t\t21\n+#define IXGBE_FDIRCTRL_FILTERMODE_MACVLAN\t0x0001 /* bit 23:21, 001b */\n+#define IXGBE_FDIRCTRL_FILTERMODE_CLOUD\t\t0x0002 /* bit 23:21, 010b */\n #define IXGBE_FDIRCTRL_SEARCHLIM 0x00800000\n #define IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT 24\n #define IXGBE_FDIRCTRL_FULL_THRESH_MASK 0xF0000000\n@@ -2981,6 +2994,7 @@ enum ixgbe_mac_type {\n \tixgbe_mac_X540,\n \tixgbe_mac_X550,\n \tixgbe_mac_X550EM_x,\n+\tixgbe_mac_x550em_a,\n \tixgbe_num_macs\n };\n \n", "prefixes": [ "V2", "1/7" ] }