Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/780093/?format=api
{ "id": 780093, "url": "http://patchwork.ozlabs.org/api/patches/780093/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20170623082451.32671-6-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": "<20170623082451.32671-6-alice.michael@intel.com>", "list_archive_url": null, "date": "2017-06-23T08:24:47", "name": "[next,S74-V2,06/10] i40e: remove workaround for Open Firmware MAC address", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "244776ea2c377343037860bbefdfcc719253465c", "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/20170623082451.32671-6-alice.michael@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/780093/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/780093/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" ], "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 3wvP661yXvz9sNW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 24 Jun 2017 02:29:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C4C9A87A13;\n\tFri, 23 Jun 2017 16:29:00 +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 Xh4EnQNFomc8; Fri, 23 Jun 2017 16:29:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2452A8797B;\n\tFri, 23 Jun 2017 16:29:00 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id F41591C26F5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:28:56 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id EC16D88CBB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:28:56 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ktiozTTYT0ZB for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:28:55 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id BBE6688DD3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 23 Jun 2017 16:28:55 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga105.jf.intel.com with ESMTP; 23 Jun 2017 09:28:55 -0700", "from unknown (HELO localhost.jf.intel.com) ([10.166.16.121])\n\tby fmsmga001.fm.intel.com with ESMTP; 23 Jun 2017 09:28:55 -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.39,379,1493708400\"; d=\"scan'208\";\n\ta=\"1163958881\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 23 Jun 2017 04:24:47 -0400", "Message-Id": "<20170623082451.32671-6-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.9.3", "In-Reply-To": "<20170623082451.32671-1-alice.michael@intel.com>", "References": "<20170623082451.32671-1-alice.michael@intel.com>", "Cc": "tushar.n.dave@oracle.com", "Subject": "[Intel-wired-lan] [next PATCH S74-V2 06/10] i40e: remove workaround\n\tfor Open Firmware MAC address", "X-BeenThere": "intel-wired-lan@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.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: Jacob Keller <jacob.e.keller@intel.com>\n\nSince commit b499ffb0a22c (\"i40e: Look up MAC address in Open Firmware\nor IDPROM\"), we've had support for obtaining the MAC address\nform Open Firmware or IDPROM.\n\nThis code relied on sending the Open Firmware address directly to the\ndevice firmware instead of relying on our MAC/VLAN filter list. Thus,\na work around was introduced in commit b1b15df59232 (\"i40e: Explicitly\nwrite platform-specific mac address after PF reset\")\n\nWe refactored the Open Firmware address enablement code in the ill-named\ncommit 41c4c2b50d52 (\"i40e: allow look-up of MAC address from Open\nFirmware or IDPROM\")\n\nSince this refactor, we no longer even set I40E_FLAG_PF_MAC. Further, we\ndon't need this work around, because we actually store the MAC address\nas part of the MAC/VLAN filter hash. Thus, we will restore the address\ncorrectly upon reset.\n\nThe refactor above failed to revert the workaround, so do that now.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 -\n drivers/net/ethernet/intel/i40e/i40e_main.c | 60 -----------------------------\n 2 files changed, 61 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex f07217b..d0c1bf5 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -445,7 +445,6 @@ struct i40e_pf {\n #define I40E_FLAG_VEB_STATS_ENABLED\t\tBIT_ULL(37)\n #define I40E_FLAG_LINK_POLLING_ENABLED\t\tBIT_ULL(39)\n #define I40E_FLAG_VEB_MODE_ENABLED\t\tBIT_ULL(40)\n-#define I40E_FLAG_PF_MAC\t\t\tBIT_ULL(50)\n #define I40E_FLAG_TRUE_PROMISC_SUPPORT\t\tBIT_ULL(51)\n #define I40E_FLAG_CLIENT_RESET\t\t\tBIT_ULL(54)\n #define I40E_FLAG_TEMP_LINK_POLLING\t\tBIT_ULL(55)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 1acb9fc..43840cf 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -2715,44 +2715,6 @@ static int i40e_vlan_rx_kill_vid(struct net_device *netdev,\n }\n \n /**\n- * i40e_macaddr_init - explicitly write the mac address filters\n- *\n- * @vsi: pointer to the vsi\n- * @macaddr: the MAC address\n- *\n- * This is needed when the macaddr has been obtained by other\n- * means than the default, e.g., from Open Firmware or IDPROM.\n- * Returns 0 on success, negative on failure\n- **/\n-static int i40e_macaddr_init(struct i40e_vsi *vsi, u8 *macaddr)\n-{\n-\tint ret;\n-\tstruct i40e_aqc_add_macvlan_element_data element;\n-\n-\tret = i40e_aq_mac_address_write(&vsi->back->hw,\n-\t\t\t\t\tI40E_AQC_WRITE_TYPE_LAA_WOL,\n-\t\t\t\t\tmacaddr, NULL);\n-\tif (ret) {\n-\t\tdev_info(&vsi->back->pdev->dev,\n-\t\t\t \"Addr change for VSI failed: %d\\n\", ret);\n-\t\treturn -EADDRNOTAVAIL;\n-\t}\n-\n-\tmemset(&element, 0, sizeof(element));\n-\tether_addr_copy(element.mac_addr, macaddr);\n-\telement.flags = cpu_to_le16(I40E_AQC_MACVLAN_ADD_PERFECT_MATCH);\n-\tret = i40e_aq_add_macvlan(&vsi->back->hw, vsi->seid, &element, 1, NULL);\n-\tif (ret) {\n-\t\tdev_info(&vsi->back->pdev->dev,\n-\t\t\t \"add filter failed err %s aq_err %s\\n\",\n-\t\t\t i40e_stat_str(&vsi->back->hw, ret),\n-\t\t\t i40e_aq_str(&vsi->back->hw,\n-\t\t\t\t vsi->back->hw.aq.asq_last_status));\n-\t}\n-\treturn ret;\n-}\n-\n-/**\n * i40e_restore_vlan - Reinstate vlans when vsi/netdev comes back up\n * @vsi: the vsi being brought back up\n **/\n@@ -3204,19 +3166,8 @@ static void i40e_vsi_config_dcb_rings(struct i40e_vsi *vsi)\n **/\n static void i40e_set_vsi_rx_mode(struct i40e_vsi *vsi)\n {\n-\tstruct i40e_pf *pf = vsi->back;\n-\tint err;\n-\n \tif (vsi->netdev)\n \t\ti40e_set_rx_mode(vsi->netdev);\n-\n-\tif (!!(pf->flags & I40E_FLAG_PF_MAC)) {\n-\t\terr = i40e_macaddr_init(vsi, pf->hw.mac.addr);\n-\t\tif (err) {\n-\t\t\tdev_warn(&pf->pdev->dev,\n-\t\t\t\t \"could not set up macaddr; err %d\\n\", err);\n-\t\t}\n-\t}\n }\n \n /**\n@@ -10399,17 +10350,6 @@ struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,\n \tswitch (vsi->type) {\n \t/* setup the netdev if needed */\n \tcase I40E_VSI_MAIN:\n-\t\t/* Apply relevant filters if a platform-specific mac\n-\t\t * address was selected.\n-\t\t */\n-\t\tif (!!(pf->flags & I40E_FLAG_PF_MAC)) {\n-\t\t\tret = i40e_macaddr_init(vsi, pf->hw.mac.addr);\n-\t\t\tif (ret) {\n-\t\t\t\tdev_warn(&pf->pdev->dev,\n-\t\t\t\t\t \"could not set up macaddr; err %d\\n\",\n-\t\t\t\t\t ret);\n-\t\t\t}\n-\t\t}\n \tcase I40E_VSI_VMDQ2:\n \t\tret = i40e_config_netdev(vsi);\n \t\tif (ret)\n", "prefixes": [ "next", "S74-V2", "06/10" ] }