Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/531504/?format=api
{ "id": 531504, "url": "http://patchwork.ozlabs.org/api/patches/531504/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1445018231-3196-2-git-send-email-jacob.e.keller@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": "<1445018231-3196-2-git-send-email-jacob.e.keller@intel.com>", "list_archive_url": null, "date": "2015-10-16T17:56:56", "name": "[next-queue,v5,02/17] fm10k: set netdev features in one location", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b7cad589ea608fbb37d12f490c4739191d6b747b", "submitter": { "id": 9784, "url": "http://patchwork.ozlabs.org/api/people/9784/?format=api", "name": "Jacob Keller", "email": "jacob.e.keller@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/1445018231-3196-2-git-send-email-jacob.e.keller@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/531504/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/531504/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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ozlabs.org (Postfix) with ESMTP id B23191402B2\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 17 Oct 2015 04:57:24 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 0CCC432983;\n\tFri, 16 Oct 2015 17:57:24 +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 MvBEnSaf6Z9Y; Fri, 16 Oct 2015 17:57:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 50FD9307BB;\n\tFri, 16 Oct 2015 17:57:19 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id B4CE21CE568\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:15 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AD13C8B0C5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:15 +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 AWz6s7rXdaoX for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:13 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id ADCBF8AE6A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 16 Oct 2015 17:57:13 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby orsmga103.jf.intel.com with ESMTP; 16 Oct 2015 10:57:13 -0700", "from jekeller-desk.amr.corp.intel.com ([134.134.3.123])\n\tby fmsmga001.fm.intel.com with ESMTP; 16 Oct 2015 10:57:14 -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.17,689,1437462000\"; d=\"scan'208\";a=\"812781734\"", "From": "Jacob Keller <jacob.e.keller@intel.com>", "To": "Intel Wired LAN <intel-wired-lan@lists.osuosl.org>", "Date": "Fri, 16 Oct 2015 10:56:56 -0700", "Message-Id": "<1445018231-3196-2-git-send-email-jacob.e.keller@intel.com>", "X-Mailer": "git-send-email 2.6.1.264.gbab76a9", "In-Reply-To": "<1445018231-3196-1-git-send-email-jacob.e.keller@intel.com>", "References": "<1445018231-3196-1-git-send-email-jacob.e.keller@intel.com>", "Subject": "[Intel-wired-lan] [next-queue v5 02/17] fm10k: set netdev features\n\tin one location", "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>", "MIME-Version": "1.0", "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": "Don't change netdev hw_features later in fm10k_probe, instead set all\nvalues inside fm10k_alloc_netdev. To do so, we need to know the MAC type\n(whether it is PF or VF) in order to determine what to do. This helps\nensure that all logic regarding features is co-located.\n\nSigned-off-by: Jacob Keller <jacob.e.keller@intel.com>\n---\n drivers/net/ethernet/intel/fm10k/fm10k.h | 2 +-\n drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 31 +++++++++++++++----------\n drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 +------\n 3 files changed, 21 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h\nindex aa9674a3d9ee..3495e9337745 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k.h\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k.h\n@@ -484,7 +484,7 @@ void fm10k_netpoll(struct net_device *netdev);\n #endif\n \n /* Netdev */\n-struct net_device *fm10k_alloc_netdev(void);\n+struct net_device *fm10k_alloc_netdev(const struct fm10k_info *info);\n int fm10k_setup_rx_resources(struct fm10k_ring *);\n int fm10k_setup_tx_resources(struct fm10k_ring *);\n void fm10k_free_rx_resources(struct fm10k_ring *);\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\nindex 96364c7b7719..38fe2d8c8388 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_netdev.c\n@@ -1391,8 +1391,9 @@ static const struct net_device_ops fm10k_netdev_ops = {\n \n #define DEFAULT_DEBUG_LEVEL_SHIFT 3\n \n-struct net_device *fm10k_alloc_netdev(void)\n+struct net_device *fm10k_alloc_netdev(const struct fm10k_info *info)\n {\n+\tnetdev_features_t hw_features;\n \tstruct fm10k_intfc *interface;\n \tstruct net_device *dev;\n \n@@ -1415,27 +1416,31 @@ struct net_device *fm10k_alloc_netdev(void)\n \t\t\t NETIF_F_TSO |\n \t\t\t NETIF_F_TSO6 |\n \t\t\t NETIF_F_TSO_ECN |\n-\t\t\t NETIF_F_GSO_UDP_TUNNEL |\n \t\t\t NETIF_F_RXHASH |\n \t\t\t NETIF_F_RXCSUM;\n \n+\t/* Only the PF can support VXLAN and NVGRE tunnel offloads */\n+\tif (info->mac == fm10k_mac_pf) {\n+\t\tdev->hw_enc_features = NETIF_F_IP_CSUM |\n+\t\t\t\t NETIF_F_TSO |\n+\t\t\t\t NETIF_F_TSO6 |\n+\t\t\t\t NETIF_F_TSO_ECN |\n+\t\t\t\t NETIF_F_GSO_UDP_TUNNEL |\n+\t\t\t\t NETIF_F_IPV6_CSUM |\n+\t\t\t\t NETIF_F_SG;\n+\n+\t\tdev->features |= NETIF_F_GSO_UDP_TUNNEL;\n+\t}\n+\n \t/* all features defined to this point should be changeable */\n-\tdev->hw_features |= dev->features;\n+\thw_features = dev->features;\n \n \t/* allow user to enable L2 forwarding acceleration */\n-\tdev->hw_features |= NETIF_F_HW_L2FW_DOFFLOAD;\n+\thw_features |= NETIF_F_HW_L2FW_DOFFLOAD;\n \n \t/* configure VLAN features */\n \tdev->vlan_features |= dev->features;\n \n-\t/* configure tunnel offloads */\n-\tdev->hw_enc_features |= NETIF_F_IP_CSUM |\n-\t\t\t\tNETIF_F_TSO |\n-\t\t\t\tNETIF_F_TSO6 |\n-\t\t\t\tNETIF_F_TSO_ECN |\n-\t\t\t\tNETIF_F_GSO_UDP_TUNNEL |\n-\t\t\t\tNETIF_F_IPV6_CSUM;\n-\n \t/* we want to leave these both on as we cannot disable VLAN tag\n \t * insertion or stripping on the hardware since it is contained\n \t * in the FTAG and not in the frame itself.\n@@ -1446,5 +1451,7 @@ struct net_device *fm10k_alloc_netdev(void)\n \n \tdev->priv_flags |= IFF_UNICAST_FLT;\n \n+\tdev->hw_features |= hw_features;\n+\n \treturn dev;\n }\ndiff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\nindex 5fbffbaefe32..1af4b222d003 100644\n--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c\n@@ -1722,13 +1722,6 @@ static int fm10k_sw_init(struct fm10k_intfc *interface,\n \t\t\t\t\t pci_resource_len(pdev, 4));\n \thw->sw_addr = interface->sw_addr;\n \n-\t/* Only the PF can support VXLAN and NVGRE offloads */\n-\tif (hw->mac.type != fm10k_mac_pf) {\n-\t\tnetdev->hw_enc_features = 0;\n-\t\tnetdev->features &= ~NETIF_F_GSO_UDP_TUNNEL;\n-\t\tnetdev->hw_features &= ~NETIF_F_GSO_UDP_TUNNEL;\n-\t}\n-\n \t/* initialize DCBNL interface */\n \tfm10k_dcbnl_set_ops(netdev);\n \n@@ -1894,7 +1887,7 @@ static int fm10k_probe(struct pci_dev *pdev,\n \tpci_set_master(pdev);\n \tpci_save_state(pdev);\n \n-\tnetdev = fm10k_alloc_netdev();\n+\tnetdev = fm10k_alloc_netdev(fm10k_info_tbl[ent->driver_data]);\n \tif (!netdev) {\n \t\terr = -ENOMEM;\n \t\tgoto err_alloc_netdev;\n", "prefixes": [ "next-queue", "v5", "02/17" ] }