From patchwork Thu Mar 5 05:23:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249412 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=CF/Yn230; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48Xzg96zlRz9sQx for ; Thu, 5 Mar 2020 16:23:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725926AbgCEFXd (ORCPT ); Thu, 5 Mar 2020 00:23:33 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45706 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbgCEFXc (ORCPT ); Thu, 5 Mar 2020 00:23:32 -0500 Received: by mail-pg1-f194.google.com with SMTP id m15so2148769pgv.12 for ; Wed, 04 Mar 2020 21:23:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6BJD4y/MJKY4TduWGLVqWk4PWDU4OuLSC5J4NWYa63U=; b=CF/Yn230gl0OwWYQBPb/hMUTusbPmYdtQHOyznSyzwNlZ+bjRZDBo6BtQY8gripEcB 6WaLpxL251TiJg+z3fTxAw7PXtCaf1wyPXLcC0DWqcVlT1EDXZZ0NgsL/zipnjGdtDoq Qw3VIvlMyVVMdbXsfOUlmD0X7YX98ngGIcSEMhMe46aNeK3lmmlwl407yqe7EZaubuVi ku9MQXk6zvTME5P80a+0uwuS3NhqB6GvIH003E7b8eU/pLLLvQ+p464uvBcqofTxfZ+B XjoAmdhFFiBEtXwiFbDAApf3IYd+5eoYXPp3cGjz9jwBcm+0CO6X4D46nWXSpYCQVV5o lDZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6BJD4y/MJKY4TduWGLVqWk4PWDU4OuLSC5J4NWYa63U=; b=b/hboRS+L+5tyin451x6CcnhQr3jC8UmPnPhvReoUP8zZMpgtMtJRJVoV4PmEaNsYO ipDmRwn+SZ6MlFIxneNe/su6EoHUykgI0AXkhu9GhyhBN/p9dJTpSVPz7TdWXrk8NwHx eY04YtvC0ETgBDGOB8ijBWZakVt4tf5cHCBaObPJCDIZoCbb1BXKt4MuFE+vPMqA7IHi HNW1AkevaC6A7wHdcqR9JuDwa1JnHNiNjcUGPJyLcKki3RSwfMH75a2s7srPVRWgCV04 ye+51d2Tn1gjW7M1EiXXyUh7RZKFYWFr0C5is6aZj2ZW0+ZVicYbNemXMzUWRSdonb6t P9XQ== X-Gm-Message-State: ANhLgQ0vciQFAkc/W956fZHvAXfwv0YfVX2kJ3UWS/GD04qa3i+hPVfH 9RgehnLvkdwU/ZBHWK6HZrPqzKEMXKA= X-Google-Smtp-Source: ADFU+vssiSkbLRhM0zP+lG1kUCZGl55pU0kgNhm/wJywQUF/69DwJFu8l3a/4cb5OuNr+J9fWSff/A== X-Received: by 2002:a63:617:: with SMTP id 23mr5994307pgg.208.1583385809471; Wed, 04 Mar 2020 21:23:29 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:28 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 1/8] ionic: keep ionic dev on lif init fail Date: Wed, 4 Mar 2020 21:23:12 -0800 Message-Id: <20200305052319.14682-2-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If the basic ionic interface works but the lif creation fails, don't fail the probe. This will allow us to use the driver to help inspect the hw/fw/pci interface for debugging purposes. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 8 ++++++++ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 448d7b23b2f7..554bafac1147 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -37,6 +37,9 @@ int ionic_bus_alloc_irq_vectors(struct ionic *ionic, unsigned int nintrs) void ionic_bus_free_irq_vectors(struct ionic *ionic) { + if (!ionic->nintrs) + return; + pci_free_irq_vectors(ionic->pdev); } @@ -346,6 +349,11 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ionic_reset(ionic); err_out_teardown: ionic_dev_teardown(ionic); + /* Don't fail the probe for these errors, keep + * the hw interface around for inspection + */ + return 0; + err_out_unmap_bars: ionic_unmap_bars(ionic); pci_release_regions(pdev); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 191271f6260d..1b7e18fe83db 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -2408,6 +2408,9 @@ void ionic_lifs_unregister(struct ionic *ionic) * current model, so don't bother searching the * ionic->lif for candidates to unregister */ + if (!ionic->master_lif) + return; + cancel_work_sync(&ionic->master_lif->deferred.work); cancel_work_sync(&ionic->master_lif->tx_timeout_work); if (ionic->master_lif->netdev->reg_state == NETREG_REGISTERED) From patchwork Thu Mar 5 05:23:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249413 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=GLCRX0Ua; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgB5JtXz9sQt for ; Thu, 5 Mar 2020 16:23:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725975AbgCEFXd (ORCPT ); Thu, 5 Mar 2020 00:23:33 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:45366 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbgCEFXd (ORCPT ); Thu, 5 Mar 2020 00:23:33 -0500 Received: by mail-pf1-f194.google.com with SMTP id 2so2162798pfg.12 for ; Wed, 04 Mar 2020 21:23:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rc6jNvp/c23UvoUnFO2kVN5wxgcAoTsXXqLWvToQMSg=; b=GLCRX0UaUnax0xL8/G+sCdPa4ai/nRD/pCtN+gpuHbNXUcsXie7ZMntWQAOn8dH7dN ZKNZUyY+mWG+AGitv+SDjCfk7dJ9Ro/7mKm5Fm2dlv4Cg2N0DoXOuDDnHvrg63aHnZ5E dHH6/BhiknA4dDg3jRQ/dU3l+L/KRMjwcFJmuPEMn4IkUKBw6n7P/P9REeQEpEy2I6Z2 sZS1O9Q9n7jD2ITZbQd0D/W/cVzCpxSxt/KhYEB+UYwilmrDdvDuvXaRjnVBy28yqbIB cg7UK8qgERUE6PfU4HQEjEi/yuksPtrthkqWDjZrkqkAVhlHi/Lw5PCkH94FN8DMwfmu 2R4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rc6jNvp/c23UvoUnFO2kVN5wxgcAoTsXXqLWvToQMSg=; b=XOQF+HbkNaOSreSOyTf9fJYtbLyiOELgeCzHLey1ygahRDs2kw8Qa6cvFlrQC0Ihw+ K+SSOniuxQutHViZsXBcNCX4mp3NNI4xTgWx/E6QGAm9Lv3KYvvPWCivV1STqSyoRsE5 UTlQPMLI61d8rNC7LuOkDjeu5jjAHnKEvGIBOIDD7593MjWaJ32ayF22gYz/QWfm5anM 8tTF51oVzUJ7ltP8HF+JM0+XCXzi4/eUKAGkzahUV7QR/vsZ18JGKVpXDhAz1vF6SFxI xj/UdmedZutEGATRO7FQyUwQhscRJWEalovHaeWXZUX6hWnVLON1sRcnKai9R3v/lVNX dzuA== X-Gm-Message-State: ANhLgQ0msx9INYhxjxAnQ4kW8vqOCncGwH5rIC/9YrtBaVkPKmeStXwT lwFRJqTduH5FU1KELx2CAq16XQHsBMs= X-Google-Smtp-Source: ADFU+vsZgfVEv9BCYCqBijs6fFyjohSL3deSvQUheImibn1djIZgZwpjMELuCFI7lC4fvVoBGWXkEQ== X-Received: by 2002:a63:cc4c:: with SMTP id q12mr5722464pgi.443.1583385810353; Wed, 04 Mar 2020 21:23:30 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:29 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 2/8] ionic: remove pragma packed Date: Wed, 4 Mar 2020 21:23:13 -0800 Message-Id: <20200305052319.14682-3-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace the misguided "#pragma packed" with tags on each struct/union definition that actually needs it. This is safer and more efficient on the various compilers and architectures. Signed-off-by: Shannon Nelson --- .../net/ethernet/pensando/ionic/ionic_if.h | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h index ce07c2931a72..e5e98067fba4 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_if.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h @@ -4,8 +4,6 @@ #ifndef _IONIC_IF_H_ #define _IONIC_IF_H_ -#pragma pack(push, 1) - #define IONIC_DEV_INFO_SIGNATURE 0x44455649 /* 'DEVI' */ #define IONIC_DEV_INFO_VERSION 1 #define IONIC_IFNAMSIZ 16 @@ -366,7 +364,7 @@ union ionic_lif_config { u8 rsvd2[2]; __le64 features; __le32 queue_count[IONIC_QTYPE_MAX]; - }; + } __packed; __le32 words[64]; }; @@ -417,7 +415,7 @@ union ionic_lif_identity { __le32 max_frame_size; u8 rsvd2[106]; union ionic_lif_config config; - } eth; + } __packed eth; struct { u8 version; @@ -439,8 +437,8 @@ union ionic_lif_identity { struct ionic_lif_logical_qtype rq_qtype; struct ionic_lif_logical_qtype cq_qtype; struct ionic_lif_logical_qtype eq_qtype; - } rdma; - }; + } __packed rdma; + } __packed; __le32 words[512]; }; @@ -526,7 +524,7 @@ struct ionic_q_init_cmd { __le64 sg_ring_base; __le32 eq_index; u8 rsvd2[16]; -}; +} __packed; /** * struct ionic_q_init_comp - Queue init command completion @@ -1095,7 +1093,7 @@ struct ionic_port_status { u8 status; u8 rsvd[51]; struct ionic_xcvr_status xcvr; -}; +} __packed; /** * struct ionic_port_identify_cmd - Port identify command @@ -1251,7 +1249,7 @@ struct ionic_port_getattr_comp { u8 pause_type; u8 loopback_mode; u8 rsvd2[11]; - }; + } __packed; u8 color; }; @@ -1319,7 +1317,7 @@ struct ionic_dev_setattr_cmd { char name[IONIC_IFNAMSIZ]; __le64 features; u8 rsvd2[60]; - }; + } __packed; }; /** @@ -1334,7 +1332,7 @@ struct ionic_dev_setattr_comp { union { __le64 features; u8 rsvd2[11]; - }; + } __packed; u8 color; }; @@ -1361,7 +1359,7 @@ struct ionic_dev_getattr_comp { union { __le64 features; u8 rsvd2[11]; - }; + } __packed; u8 color; }; @@ -1426,7 +1424,7 @@ struct ionic_lif_setattr_cmd { } rss; u8 stats_ctl; u8 rsvd[60]; - }; + } __packed; }; /** @@ -1444,7 +1442,7 @@ struct ionic_lif_setattr_comp { union { __le64 features; u8 rsvd2[11]; - }; + } __packed; u8 color; }; @@ -1483,7 +1481,7 @@ struct ionic_lif_getattr_comp { u8 mac[6]; __le64 features; u8 rsvd2[11]; - }; + } __packed; u8 color; }; @@ -1688,7 +1686,7 @@ struct ionic_vf_setattr_cmd { u8 linkstate; __le64 stats_pa; u8 pad[60]; - }; + } __packed; }; struct ionic_vf_setattr_comp { @@ -1726,7 +1724,7 @@ struct ionic_vf_getattr_comp { u8 linkstate; __le64 stats_pa; u8 pad[11]; - }; + } __packed; u8 color; }; @@ -2471,7 +2469,7 @@ union ionic_dev_cmd_regs { union ionic_dev_cmd_comp comp; u8 rsvd[48]; u32 data[478]; - }; + } __packed; u32 words[512]; }; @@ -2484,7 +2482,7 @@ union ionic_dev_regs { struct { union ionic_dev_info_regs info; union ionic_dev_cmd_regs devcmd; - }; + } __packed; __le32 words[1024]; }; @@ -2574,6 +2572,4 @@ struct ionic_identity { union ionic_qos_identity qos; }; -#pragma pack(pop) - #endif /* _IONIC_IF_H_ */ From patchwork Thu Mar 5 05:23:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249417 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=Ka693Pcg; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgK1L8Fz9sPg for ; Thu, 5 Mar 2020 16:23:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726037AbgCEFXg (ORCPT ); Thu, 5 Mar 2020 00:23:36 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:47054 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbgCEFXd (ORCPT ); Thu, 5 Mar 2020 00:23:33 -0500 Received: by mail-pf1-f195.google.com with SMTP id o24so2159937pfp.13 for ; Wed, 04 Mar 2020 21:23:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=omLW27ISR6OibziXSfi5be6HG4rkQoni8p1KLgyQoXg=; b=Ka693Pcg/9hyajoI+1moiHAh9GCYNupnbMA/AdbZd9Ua4CLpeQ4ARas2+3daap/5OZ gQX268CaCYcbk0pKVya2xptwudWL2I6TaVvK+/VSqd37f1wHpkEh9HKzkubAuVmEDMeB x+eK9MfYr9j5+ISFMfcLu+qStSVzM925sL0J2yg8UsnAXI0ah7tnQAyjA/0KDrThibBG STUHJq8IQS07ght+Ab98k6Qo3pfZFBNto9XI35t+QKgikXYeig3CWZbfHdQKCFhIAEi2 TrafSVcPaIxu8dExdC8r6tOcvtMDusHhXWyfLSvyJ8Rjhy3bfi6OXI/KpZ8WibhPUygL na3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=omLW27ISR6OibziXSfi5be6HG4rkQoni8p1KLgyQoXg=; b=J0it7acwyBmbG7vrgj59uf8BuV35G3ABajDxtVyu1KBQoIrH1J5eTqWGTne/ua1WrO PVPOQClbMFuoKUz1/FYg+ZsHOFxpcq1XnTz8wVVGvHXZ5hVvpfDFE7obm2Dit9/N+M9W ZDl8Tkre6LfT8Tpvp5wdsbIPl8tJlaQDyR+pzWMWC190zx8dLCvQlS7FVApYpME/5ehS HaY1NlyiT0gVgDMuetZtU5fN7ky4Y6XVD3I+kKlaFJz7omQ/lLbDN29DR4XkWB/pxAZl Mh5ud24y4fsx+oT6zS0w4R5+RXiRsRUYy389j3ocG2FwrTwtf5f0+lftWn2vQ0GA7Qjn 5KsA== X-Gm-Message-State: ANhLgQ2fY3+vGkvHajCfIfxVgVbVHIOGyNcMQb4XT264U3QZ090PoN+l meJCxPX8xp4ARpAbl56a4rptj/VtsuM= X-Google-Smtp-Source: ADFU+vvN5v/JzIXjq+flBhC1IVCE/TXVTwBhzcSBp6CrNiqRSjAPV/PB4nMrJiiFT+9ZzXlL4cOVFA== X-Received: by 2002:a63:8e44:: with SMTP id k65mr5675519pge.452.1583385811245; Wed, 04 Mar 2020 21:23:31 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:30 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 3/8] ionic: improve irq numa locality Date: Wed, 4 Mar 2020 21:23:14 -0800 Message-Id: <20200305052319.14682-4-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Spreading the interrupts across the CPU cores is good for load balancing, but not necessarily as good when using a CPU/core that is not part of the NUMA local CPU. If it can be localized, the kernel's cpumask_local_spread() service will pick a core that is on the node close to the PCI device. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 1b7e18fe83db..7df49b433ae5 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -424,8 +424,9 @@ static int ionic_qcq_alloc(struct ionic_lif *lif, unsigned int type, ionic_intr_mask_assert(idev->intr_ctrl, new->intr.index, IONIC_INTR_MASK_SET); - new->intr.cpu = new->intr.index % num_online_cpus(); - if (cpu_online(new->intr.cpu)) + new->intr.cpu = cpumask_local_spread(new->intr.index, + dev_to_node(dev)); + if (new->intr.cpu != -1) cpumask_set_cpu(new->intr.cpu, &new->intr.affinity_mask); } else { From patchwork Thu Mar 5 05:23:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249419 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=aX9GNNtn; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgM3nG1z9sPg for ; Thu, 5 Mar 2020 16:23:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726145AbgCEFXm (ORCPT ); Thu, 5 Mar 2020 00:23:42 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:47059 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725830AbgCEFXf (ORCPT ); Thu, 5 Mar 2020 00:23:35 -0500 Received: by mail-pf1-f194.google.com with SMTP id o24so2159958pfp.13 for ; Wed, 04 Mar 2020 21:23:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n+tX6FtoNy0xqtHkylnOj8rDMvnTHLoC+mNlcDwGY+A=; b=aX9GNNtnBSILPcJPzb9/GGRMQxL6BEF/HMqTFQs5OEvDPqaduCVvxdQDKkYrWa+tR3 UIYNzPvzEDzw/cn6EwdRpH69DVpElYwvcWKcdVEfsmHXBX3Jqb0+kAeBmuJv2KBPbgGY vR41Z1Y4NjnF9yxZUZePgvR3ZzdHCblkD9gBNdjnrV8U999V8EEe/wE8lasWXd6OFOTl PQsbGDOmMy5Qu+u1LhdoxDjZnN90/Z1dz2ilEYLFV1NB7pN7K2o1/UnUTybsXUYAc7Mk Tih4d2OFSFlcaCrQPbS1eqcza3Zacx9XTEKWcXU6S8euBW0QkAWQ9ocCsMjTtzocYn2I tLvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n+tX6FtoNy0xqtHkylnOj8rDMvnTHLoC+mNlcDwGY+A=; b=c9+WLophR8cS1v0O6tTrvCQeFkmqpdqEFTlXHWwk+JieYHWPS/ylLTHlyalgUHn8h4 +IDnGO8Dgwp4yQLiCd7bF9xz/Yqke2KlZCfbPkPO/G1BrWWzHX3SrHugwQ9aKtqcHhRy KAfApG94chInw0XRErGvn8WEF3L3a6yPZ/CvNPOXyaTKFKQfr7kwSMui5b0l/UxxI2Ok TT4NcqZhDTw6KrAYUyFe5aCKEWZlUA1Z/ucu1dGok4XR44H0WsNxD6U9xqnN/0rMe8JJ jKRkluB0rIcNlcpv5FX4puN0Tvao8uG7vK8Gf0EyphdgXy10OLEWAiLKLYFFs3R/z9hK 6uvg== X-Gm-Message-State: ANhLgQ2O8ECKRSg9ycH522401HM3OoH0VIqcNtEezSnQ23qvQ8nYsttK 1Ogj4h8/q9pVtpGa3FeOqpEyyW43+C8= X-Google-Smtp-Source: ADFU+vshhIOk52vEBbJ/n+NgeLQ7K6lXj5fuxwZKzovIPvZs12/RBmV7hhfMFm0Hs5Dgkyo0Pv5l+w== X-Received: by 2002:aa7:8612:: with SMTP id p18mr6748337pfn.194.1583385812145; Wed, 04 Mar 2020 21:23:32 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:31 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 4/8] ionic: clean up bitflag usage Date: Wed, 4 Mar 2020 21:23:15 -0800 Message-Id: <20200305052319.14682-5-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove the unused flags field and and fix the bitflag names to include the _F_ flag hint. Signed-off-by: Shannon Nelson --- .../ethernet/pensando/ionic/ionic_ethtool.c | 24 ++++++++----------- .../net/ethernet/pensando/ionic/ionic_lif.c | 24 +++++++++---------- .../net/ethernet/pensando/ionic/ionic_lif.h | 15 ++++++------ .../net/ethernet/pensando/ionic/ionic_stats.c | 20 ++++++++-------- .../net/ethernet/pensando/ionic/ionic_txrx.c | 4 ++-- 5 files changed, 41 insertions(+), 46 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c index f778fff034f5..acd53e27d1ec 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -462,7 +462,7 @@ static int ionic_set_coalesce(struct net_device *netdev, if (coal != lif->rx_coalesce_hw) { lif->rx_coalesce_hw = coal; - if (test_bit(IONIC_LIF_UP, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state)) { for (i = 0; i < lif->nxqs; i++) { qcq = lif->rxqcqs[i].qcq; ionic_intr_coal_init(lif->ionic->idev.intr_ctrl, @@ -509,11 +509,11 @@ static int ionic_set_ringparam(struct net_device *netdev, ring->rx_pending == lif->nrxq_descs) return 0; - err = ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET); + err = ionic_wait_for_bit(lif, IONIC_LIF_F_QUEUE_RESET); if (err) return err; - running = test_bit(IONIC_LIF_UP, lif->state); + running = test_bit(IONIC_LIF_F_UP, lif->state); if (running) ionic_stop(netdev); @@ -522,7 +522,7 @@ static int ionic_set_ringparam(struct net_device *netdev, if (running) ionic_open(netdev); - clear_bit(IONIC_LIF_QUEUE_RESET, lif->state); + clear_bit(IONIC_LIF_F_QUEUE_RESET, lif->state); return 0; } @@ -553,11 +553,11 @@ static int ionic_set_channels(struct net_device *netdev, if (ch->combined_count == lif->nxqs) return 0; - err = ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET); + err = ionic_wait_for_bit(lif, IONIC_LIF_F_QUEUE_RESET); if (err) return err; - running = test_bit(IONIC_LIF_UP, lif->state); + running = test_bit(IONIC_LIF_F_UP, lif->state); if (running) ionic_stop(netdev); @@ -565,7 +565,7 @@ static int ionic_set_channels(struct net_device *netdev, if (running) ionic_open(netdev); - clear_bit(IONIC_LIF_QUEUE_RESET, lif->state); + clear_bit(IONIC_LIF_F_QUEUE_RESET, lif->state); return 0; } @@ -575,7 +575,7 @@ static u32 ionic_get_priv_flags(struct net_device *netdev) struct ionic_lif *lif = netdev_priv(netdev); u32 priv_flags = 0; - if (test_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state)) + if (test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) priv_flags |= PRIV_F_SW_DBG_STATS; return priv_flags; @@ -584,14 +584,10 @@ static u32 ionic_get_priv_flags(struct net_device *netdev) static int ionic_set_priv_flags(struct net_device *netdev, u32 priv_flags) { struct ionic_lif *lif = netdev_priv(netdev); - u32 flags = lif->flags; - clear_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state); + clear_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state); if (priv_flags & PRIV_F_SW_DBG_STATS) - set_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state); - - if (flags != lif->flags) - lif->flags = flags; + set_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state); return 0; } diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index 7df49b433ae5..d1567e477b1f 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -84,7 +84,7 @@ static void ionic_link_status_check(struct ionic_lif *lif) netdev_info(netdev, "Link up - %d Gbps\n", le32_to_cpu(lif->info->status.link_speed) / 1000); - if (test_bit(IONIC_LIF_UP, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state)) { netif_tx_wake_all_queues(lif->netdev); netif_carrier_on(netdev); } @@ -93,12 +93,12 @@ static void ionic_link_status_check(struct ionic_lif *lif) /* carrier off first to avoid watchdog timeout */ netif_carrier_off(netdev); - if (test_bit(IONIC_LIF_UP, lif->state)) + if (test_bit(IONIC_LIF_F_UP, lif->state)) netif_tx_stop_all_queues(netdev); } link_out: - clear_bit(IONIC_LIF_LINK_CHECK_REQUESTED, lif->state); + clear_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state); } static void ionic_link_status_check_request(struct ionic_lif *lif) @@ -106,7 +106,7 @@ static void ionic_link_status_check_request(struct ionic_lif *lif) struct ionic_deferred_work *work; /* we only need one request outstanding at a time */ - if (test_and_set_bit(IONIC_LIF_LINK_CHECK_REQUESTED, lif->state)) + if (test_and_set_bit(IONIC_LIF_F_LINK_CHECK_REQUESTED, lif->state)) return; if (in_interrupt()) { @@ -1579,7 +1579,7 @@ int ionic_open(struct net_device *netdev) netif_set_real_num_tx_queues(netdev, lif->nxqs); netif_set_real_num_rx_queues(netdev, lif->nxqs); - set_bit(IONIC_LIF_UP, lif->state); + set_bit(IONIC_LIF_F_UP, lif->state); ionic_link_status_check_request(lif); if (netif_carrier_ok(netdev)) @@ -1599,13 +1599,13 @@ int ionic_stop(struct net_device *netdev) struct ionic_lif *lif = netdev_priv(netdev); int err = 0; - if (!test_bit(IONIC_LIF_UP, lif->state)) { + if (!test_bit(IONIC_LIF_F_UP, lif->state)) { dev_dbg(lif->ionic->dev, "%s: %s state=DOWN\n", __func__, lif->name); return 0; } dev_dbg(lif->ionic->dev, "%s: %s state=UP\n", __func__, lif->name); - clear_bit(IONIC_LIF_UP, lif->state); + clear_bit(IONIC_LIF_F_UP, lif->state); /* carrier off before disabling queues to avoid watchdog timeout */ netif_carrier_off(netdev); @@ -1872,7 +1872,7 @@ int ionic_reset_queues(struct ionic_lif *lif) /* Put off the next watchdog timeout */ netif_trans_update(lif->netdev); - err = ionic_wait_for_bit(lif, IONIC_LIF_QUEUE_RESET); + err = ionic_wait_for_bit(lif, IONIC_LIF_F_QUEUE_RESET); if (err) return err; @@ -1882,7 +1882,7 @@ int ionic_reset_queues(struct ionic_lif *lif) if (!err && running) ionic_open(lif->netdev); - clear_bit(IONIC_LIF_QUEUE_RESET, lif->state); + clear_bit(IONIC_LIF_F_QUEUE_RESET, lif->state); return err; } @@ -2049,10 +2049,10 @@ void ionic_lifs_free(struct ionic *ionic) static void ionic_lif_deinit(struct ionic_lif *lif) { - if (!test_bit(IONIC_LIF_INITED, lif->state)) + if (!test_bit(IONIC_LIF_F_INITED, lif->state)) return; - clear_bit(IONIC_LIF_INITED, lif->state); + clear_bit(IONIC_LIF_F_INITED, lif->state); ionic_rx_filters_deinit(lif); ionic_lif_rss_deinit(lif); @@ -2288,7 +2288,7 @@ static int ionic_lif_init(struct ionic_lif *lif) lif->rx_copybreak = IONIC_RX_COPYBREAK_DEFAULT; - set_bit(IONIC_LIF_INITED, lif->state); + set_bit(IONIC_LIF_F_INITED, lif->state); INIT_WORK(&lif->tx_timeout_work, ionic_tx_timeout_work); diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.h b/drivers/net/ethernet/pensando/ionic/ionic_lif.h index 9c5a7dd45f9d..7c0c6fef8c0b 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.h +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.h @@ -121,14 +121,14 @@ struct ionic_lif_sw_stats { }; enum ionic_lif_state_flags { - IONIC_LIF_INITED, - IONIC_LIF_SW_DEBUG_STATS, - IONIC_LIF_UP, - IONIC_LIF_LINK_CHECK_REQUESTED, - IONIC_LIF_QUEUE_RESET, + IONIC_LIF_F_INITED, + IONIC_LIF_F_SW_DEBUG_STATS, + IONIC_LIF_F_UP, + IONIC_LIF_F_LINK_CHECK_REQUESTED, + IONIC_LIF_F_QUEUE_RESET, /* leave this as last */ - IONIC_LIF_STATE_SIZE + IONIC_LIF_F_STATE_SIZE }; #define IONIC_LIF_NAME_MAX_SZ 32 @@ -136,7 +136,7 @@ struct ionic_lif { char name[IONIC_LIF_NAME_MAX_SZ]; struct list_head list; struct net_device *netdev; - DECLARE_BITMAP(state, IONIC_LIF_STATE_SIZE); + DECLARE_BITMAP(state, IONIC_LIF_F_STATE_SIZE); struct ionic *ionic; bool registered; unsigned int index; @@ -179,7 +179,6 @@ struct ionic_lif { u32 rx_coalesce_usecs; /* what the user asked for */ u32 rx_coalesce_hw; /* what the hw is using */ - u32 flags; struct work_struct tx_timeout_work; }; diff --git a/drivers/net/ethernet/pensando/ionic/ionic_stats.c b/drivers/net/ethernet/pensando/ionic/ionic_stats.c index a1e9796a660a..8f2a8fb029f1 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_stats.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_stats.c @@ -118,8 +118,8 @@ static u64 ionic_sw_stats_get_count(struct ionic_lif *lif) /* rx stats */ total += MAX_Q(lif) * IONIC_NUM_RX_STATS; - if (test_bit(IONIC_LIF_UP, lif->state) && - test_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state) && + test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) { /* tx debug stats */ total += MAX_Q(lif) * (IONIC_NUM_DBG_CQ_STATS + IONIC_NUM_TX_Q_STATS + @@ -151,8 +151,8 @@ static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf) *buf += ETH_GSTRING_LEN; } - if (test_bit(IONIC_LIF_UP, lif->state) && - test_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state) && + test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) { for (i = 0; i < IONIC_NUM_TX_Q_STATS; i++) { snprintf(*buf, ETH_GSTRING_LEN, "txq_%d_%s", @@ -190,8 +190,8 @@ static void ionic_sw_stats_get_strings(struct ionic_lif *lif, u8 **buf) *buf += ETH_GSTRING_LEN; } - if (test_bit(IONIC_LIF_UP, lif->state) && - test_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state) && + test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) { for (i = 0; i < IONIC_NUM_DBG_CQ_STATS; i++) { snprintf(*buf, ETH_GSTRING_LEN, "rxq_%d_cq_%s", @@ -247,8 +247,8 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) (*buf)++; } - if (test_bit(IONIC_LIF_UP, lif->state) && - test_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state) && + test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) { txqcq = lif_to_txqcq(lif, q_num); for (i = 0; i < IONIC_NUM_TX_Q_STATS; i++) { **buf = IONIC_READ_STAT64(&txqcq->q, @@ -281,8 +281,8 @@ static void ionic_sw_stats_get_values(struct ionic_lif *lif, u64 **buf) (*buf)++; } - if (test_bit(IONIC_LIF_UP, lif->state) && - test_bit(IONIC_LIF_SW_DEBUG_STATS, lif->state)) { + if (test_bit(IONIC_LIF_F_UP, lif->state) && + test_bit(IONIC_LIF_F_SW_DEBUG_STATS, lif->state)) { rxqcq = lif_to_rxqcq(lif, q_num); for (i = 0; i < IONIC_NUM_DBG_CQ_STATS; i++) { **buf = IONIC_READ_STAT64(&rxqcq->cq, diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c index e452f4242ba0..a268cead9f50 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c @@ -158,7 +158,7 @@ static void ionic_rx_clean(struct ionic_queue *q, struct ionic_desc_info *desc_i } /* no packet processing while resetting */ - if (unlikely(test_bit(IONIC_LIF_QUEUE_RESET, q->lif->state))) { + if (unlikely(test_bit(IONIC_LIF_F_QUEUE_RESET, q->lif->state))) { stats->dropped++; return; } @@ -1026,7 +1026,7 @@ netdev_tx_t ionic_start_xmit(struct sk_buff *skb, struct net_device *netdev) int ndescs; int err; - if (unlikely(!test_bit(IONIC_LIF_UP, lif->state))) { + if (unlikely(!test_bit(IONIC_LIF_F_UP, lif->state))) { dev_kfree_skb(skb); return NETDEV_TX_OK; } From patchwork Thu Mar 5 05:23:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249418 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=3Guskwcl; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgL2N1dz9sQt for ; Thu, 5 Mar 2020 16:23:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725993AbgCEFXf (ORCPT ); Thu, 5 Mar 2020 00:23:35 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:56196 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725953AbgCEFXe (ORCPT ); Thu, 5 Mar 2020 00:23:34 -0500 Received: by mail-pj1-f68.google.com with SMTP id a18so1963436pjs.5 for ; Wed, 04 Mar 2020 21:23:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7Fanemj7lqCOtUtHai5n5mSddCSmoi8i8DsjH04odmA=; b=3GuskwclUaXDJ/otg+I4CwuZ48HynxURncFQwl6s7PTKtTWrEfNG2tNhbQ1Qtfifp6 QbGbNZNgAO6MiETCHtc7hh2Z6CfsEOek88IEZuk2XpbFpCPPurphFDo1e3ROoPhhEkp1 o7KL1x/DPavdCDs7RvQ10gxY1OQtAbrtixiFWRYsm2y0cohBzI6is+Qubjmd32+zGC7f WYfYbqI8zmhq85nr2xF7W8aBPmQmuEc6t0xKQcvm85lwUkv8oU5TMAfaNRXfe/4dN9IT xclCzAJ0dGqAtXifqpU79hv3+7yAIYInM+6sjSLZ+V1hqu/75I5wLrY/v6upyf3+mmcQ xEsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7Fanemj7lqCOtUtHai5n5mSddCSmoi8i8DsjH04odmA=; b=hxdRHCPaqvnVc32pFG2GkKbCmTnFypsY2BuTl1Zj3/fL5FpHKR6sBEA9/oCQJTans5 HXAf8Ax0/H6y4Nq3BOWprP8eGU5WnxMlD4lF0g7xuIliEcpl74DBJOmIMu5tsU51hKmK szQKXgbQ9/VZr9cyj0q1X5PlmiIX+Jz9Z/FkTsypMOcPmLNmnnUrSC2IEzfMqMmsPDZP wrrHluPxqOBI9c+jTi1lRm166Hf0iquILzMPbNZuUAXdlxhirSYYmpb+moCjbl0WGSTl Zy/kVrFqcIr/mCfS3/LYhJ4kvVGcz0ds1jHOzleSHIbpWGk3UpUu2DV5WdZ4II2EkZHR J2aA== X-Gm-Message-State: ANhLgQ3hFmj1ESVrwt8eB/vHwHolZqh/DuvGOmfbXwqUUTzr7oSukJUK vWGf4Cf44JyZwzUmUTtj+fgyrKlBc7Q= X-Google-Smtp-Source: ADFU+vvh2LB4iBXS0UJHq8FbqTUfyTaOdq99ZcWvHgmCYip99RM8i8NtukEEyLHVXGXtxjfXV70Lyw== X-Received: by 2002:a17:90a:7784:: with SMTP id v4mr6855098pjk.134.1583385812937; Wed, 04 Mar 2020 21:23:32 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:32 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 5/8] ionic: support ethtool rxhash disable Date: Wed, 4 Mar 2020 21:23:16 -0800 Message-Id: <20200305052319.14682-6-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We can disable rxhashing by setting rss_types to 0. The user can toggle this with "ethtool -K rxhash off|on", which calls into the .ndo_set_features callback with the NETIF_F_RXHASH feature bit set or cleared. This patch adds a check for that bit and updates the FW if necessary. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_lif.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index d1567e477b1f..4b953f9e9084 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -1094,6 +1094,7 @@ static int ionic_set_nic_features(struct ionic_lif *lif, u64 vlan_flags = IONIC_ETH_HW_VLAN_TX_TAG | IONIC_ETH_HW_VLAN_RX_STRIP | IONIC_ETH_HW_VLAN_RX_FILTER; + u64 old_hw_features; int err; ctx.cmd.lif_setattr.features = ionic_netdev_features_to_nic(features); @@ -1101,9 +1102,13 @@ static int ionic_set_nic_features(struct ionic_lif *lif, if (err) return err; + old_hw_features = lif->hw_features; lif->hw_features = le64_to_cpu(ctx.cmd.lif_setattr.features & ctx.comp.lif_setattr.features); + if ((old_hw_features ^ lif->hw_features) & IONIC_ETH_HW_RX_HASH) + ionic_lif_rss_config(lif, lif->rss_types, NULL, NULL); + if ((vlan_flags & features) && !(vlan_flags & le64_to_cpu(ctx.comp.lif_setattr.features))) dev_info_once(lif->ionic->dev, "NIC is not supporting vlan offload, likely in SmartNIC mode\n"); @@ -1357,13 +1362,15 @@ int ionic_lif_rss_config(struct ionic_lif *lif, const u16 types, .cmd.lif_setattr = { .opcode = IONIC_CMD_LIF_SETATTR, .attr = IONIC_LIF_ATTR_RSS, - .rss.types = cpu_to_le16(types), .rss.addr = cpu_to_le64(lif->rss_ind_tbl_pa), }, }; unsigned int i, tbl_sz; - lif->rss_types = types; + if (lif->hw_features & IONIC_ETH_HW_RX_HASH) { + lif->rss_types = types; + ctx.cmd.lif_setattr.rss.types = cpu_to_le16(types); + } if (key) memcpy(lif->rss_hash_key, key, IONIC_RSS_HASH_KEY_SIZE); From patchwork Thu Mar 5 05:23:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249415 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=DkLmPL16; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgG09Zqz9sQt for ; Thu, 5 Mar 2020 16:23:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726092AbgCEFXh (ORCPT ); Thu, 5 Mar 2020 00:23:37 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45722 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726004AbgCEFXg (ORCPT ); Thu, 5 Mar 2020 00:23:36 -0500 Received: by mail-pg1-f195.google.com with SMTP id m15so2148852pgv.12 for ; Wed, 04 Mar 2020 21:23:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=s5+2M55qCyjMNWRRfZa1qww5IAjEysQ2sF63nol+NPk=; b=DkLmPL16mkXXWsgVO5Tg8AiuA3Y7UohKEKxfo0xBAv1GooPWROJThgG2fDFoVejXK4 lvYVgpkiY3NP4dgBALOR5ou/rHfYOus1lcqxiHC46mDPXynpPeVA2P6Dd4OtKFbqyfsD F5H9MSf60Di516TuP/JKex9t3zy/ddLOllxdiQzcAwQTQesDZqwd3AvSYGeyMVK9HMW/ h1QxHjvvBMpZ7noXo/QZHi/HGx+zkuqEMIsCO+nezioOoPWqfm3ugqCXAXuAdUQeh5VU izGiUgB2OVQC+AIDL8gC6Xpm88EOcvipMcT6Y1mNyS0+0f8hOtvkq0H5jlYg9LE78CNO I3fA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=s5+2M55qCyjMNWRRfZa1qww5IAjEysQ2sF63nol+NPk=; b=sMx4jMfM8psbp2g6MqLkuxL0YPrYWGZUPxSDwlV3TQ4NOXn3ktREAsfqPH90Rz8+Zk xwvwANBu43FL2jF+9EBY9DvjMcP0QkjGK7zyDvR4Q0ut5zU7jbCZRNdqMoZ97e5cDoDy o2sLVH7a+n4Po7aaOqZHKJeWOPZzkM256uvffILX9JixZeLLfQ+V1ESjNRiRLTtRrrou hHogoBdwghOyd9+i1ZNR+C3FpzNq4uZrQ4zqG1wzlWep/KokBJhZODFRsN2Ei6pB24oA m0vu8OQSrcWdMScdi6wFg2k2CzwREYt3YYzafUnLY8QWYlUlCN5h6bpaSsPe4QSD8Ftu cN4Q== X-Gm-Message-State: ANhLgQ24hiTs/YMXmRonN+qiR5XGSCZXkGx/UDFj+Y9QDmyCLJqoImqo YJ3mjfqwpK0FBC+coi2QMZR32yjh07w= X-Google-Smtp-Source: ADFU+vtUq4b5rOBmzoLUcb/lsj6vaRNcMBzsuceXwbZN1fY4/L4DNkVaKF31iW54RXe3c0sTPYR7xw== X-Received: by 2002:aa7:875a:: with SMTP id g26mr6759732pfo.193.1583385813800; Wed, 04 Mar 2020 21:23:33 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:33 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 6/8] ionic: print pci bus lane info Date: Wed, 4 Mar 2020 21:23:17 -0800 Message-Id: <20200305052319.14682-7-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Print the PCI bus lane information so people can keep an eye out for poor configurations that might not support the advertised speed. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 554bafac1147..59b0091146e6 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -248,6 +248,7 @@ static int ionic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } pci_set_master(pdev); + pcie_print_link_status(pdev); err = ionic_map_bars(ionic); if (err) From patchwork Thu Mar 5 05:23:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249414 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=c2rZWdIy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgF3Qrtz9sPg for ; Thu, 5 Mar 2020 16:23:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726079AbgCEFXg (ORCPT ); Thu, 5 Mar 2020 00:23:36 -0500 Received: from mail-pl1-f195.google.com ([209.85.214.195]:37687 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725991AbgCEFXf (ORCPT ); Thu, 5 Mar 2020 00:23:35 -0500 Received: by mail-pl1-f195.google.com with SMTP id b8so2108967plx.4 for ; Wed, 04 Mar 2020 21:23:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=61gZ4SQN/1tdeU8RQk3DcrIUxl3TSrJNCIjlf4zlDM0=; b=c2rZWdIyjxSoFFNxGpSsDAFN/DmrQ9plnVo2DjzHabStkhK7qga4oPnp2yX+YdcpbG EgiAdSFDLmicoc06LxQSFLwxMuyyXXTfUck9NhUHzxZrnpSwdJhIoct10vZjzkw140Qo PIZNGOtX9OFf6sK1dJeEIhPX5h6TnHDJjhoUHuQpXU0IYxzNhCLjWCn79Ku4xc3vPxxH ljcsT/6oA8rVsSI0u0p88FCMwBrVuRK7qDSRyZYR1nlP7vq07AJghI/wdULgfmCBdaXv +c4PemCrRd0AUrnoKzLFFwVjmErys2+6L7DzkWC83OOIdsqt0Pp9shTukzp/tyJa0bLk 1PyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=61gZ4SQN/1tdeU8RQk3DcrIUxl3TSrJNCIjlf4zlDM0=; b=pU7WIfW7o954P7oQphJ2zVEGUdBctAuDuwNGh9mHLBKEXxZHMjYU8pFsB/9KXwZiHA TZp/1im9OXVycjAvm0S5F7zjDxd1Ku6dg8v6noaKd2Kvz8CCATpenfsrVu9AxExyLkbw uSz3kdZsuDOmZmA25DLezEhJfpMkBEen3mWn9yfZzstQVClSacK8sT5qo7oPVSVbrptA ibXq+MlXCnyje+PVfaQS5O1ZQ32T007jndIYYMMumdPlYaMXUrifkDK/3APRjrZxa4i6 F6P8bvAQHQ9+iLgYauaghugHUyXgsoRtORzt95rjAxnuAdvJzosu4MpVBF+nU+sgf6WZ aKJA== X-Gm-Message-State: ANhLgQ0yfqdDLJvG2cjE0pGybu7hS3VwDlD/HN7JzIYdicxgWZlHCkm5 lSAp0ELTGLxgyYuM4EGeCSHu1aOZjMg= X-Google-Smtp-Source: ADFU+vtVAluaGxjTSAJjstPuTqpSzbevEOqlvy/blfv1Rbg0bJ01xM6jbjbICv9lb/jcFHzh13Yx5g== X-Received: by 2002:a17:90a:8c06:: with SMTP id a6mr6131838pjo.137.1583385814649; Wed, 04 Mar 2020 21:23:34 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:34 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson Subject: [PATCH v3 net-next 7/8] ionic: add support for device id 0x1004 Date: Wed, 4 Mar 2020 21:23:18 -0800 Message-Id: <20200305052319.14682-8-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add support for an additional device id. Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic.h | 1 + drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h index bb106a32f416..c8ff33da243a 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic.h +++ b/drivers/net/ethernet/pensando/ionic/ionic.h @@ -18,6 +18,7 @@ struct ionic_lif; #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF 0x1002 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF 0x1003 +#define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT 0x1004 #define DEVCMD_TIMEOUT 10 diff --git a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c index 59b0091146e6..3dc985cae391 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_bus_pci.c @@ -15,6 +15,7 @@ static const struct pci_device_id ionic_id_table[] = { { PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF) }, { PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF) }, + { PCI_VDEVICE(PENSANDO, PCI_DEVICE_ID_PENSANDO_IONIC_ETH_MGMT) }, { 0, } /* end of table */ }; MODULE_DEVICE_TABLE(pci, ionic_id_table); From patchwork Thu Mar 5 05:23:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1249416 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=pensando.io header.i=@pensando.io header.a=rsa-sha256 header.s=google header.b=bzY35VHj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XzgG6VHvz9sPg for ; Thu, 5 Mar 2020 16:23:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726129AbgCEFXh (ORCPT ); Thu, 5 Mar 2020 00:23:37 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:51616 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbgCEFXg (ORCPT ); Thu, 5 Mar 2020 00:23:36 -0500 Received: by mail-pj1-f68.google.com with SMTP id l8so1973197pjy.1 for ; Wed, 04 Mar 2020 21:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RtIYhhu7vszHkRer90QnW0fSQoRZY8VL5n9Nyh6LaXc=; b=bzY35VHjsxqzKzo6AJYy3FQVxOLMUCw1rJP9Y46h4kaHKTJyB6REW/C2z20Sdq/2nU 4fFPpzcACKhJARLRLt8IiOFIFQyHd/QRwwBD5Ud95tZlMVvI+gAF9PL7kpwhkMEY1XXN 2Tn6JH1FaembMaBZtbKzRirq0KT9lU3zwXwNnpVERZDboSujYtfN5ZK6nJQmpO+bRtwM EAEW1KfZAJP8M0zhYRiap3Er3i3fxd9cBd6/MNdwHpuDRZJq68ea/A3eQUSXqRjZSyfy rwcLirti/+S9FZOrE0dm8syWr8FBodqjh+o8UxVBHKl/VAbuLXnNdsDBfehoZgR242bG Z/BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RtIYhhu7vszHkRer90QnW0fSQoRZY8VL5n9Nyh6LaXc=; b=Va2/iJkZonT1UrpKnhWyDaf0XY9HtCixhvEDsTCZaHp+A7LPmpqAsw4EvTfb8Fumeg IU+6i247yGYyv7JmMXEBpHZwx9x5h9/1qUDENye0nhPStfqde4O2AQ91U/pHv/JYq5f/ FzAEbpy4/BQd07HEtTtfB5WEg9UObMtIyOELx4I5awNp4J+3nvFiZ7ZqIP1K+WJ/wiUE 9qbm+fhppo2Ana/i4SoF4ph7heFFty+oWGkyF1D0ZlCCktQnMzcwScr7wRNvdAd/WpNM oodkPvEKYo+EVm3Ov2wovdmuwMayKR7Xhj6S5mu6bPFKqeW7EoOGxW95Wc5AtW5CoLiT QlkA== X-Gm-Message-State: ANhLgQ3qJD99VfGs3QiHMMsSWAvwiqh/Pur8X51Yakguni0XbTGGWo4h e8foX+iQQz/JaF4ZqcUAjaGYjGYnH7I= X-Google-Smtp-Source: ADFU+vsIk7Byz2afXRc3YSO/A/G9/suB8o965LpXXq68a0j99OQflpT2gvDj7Wo6J7fttGirMNnrhw== X-Received: by 2002:a17:902:6ac2:: with SMTP id i2mr6241326plt.221.1583385815549; Wed, 04 Mar 2020 21:23:35 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id h2sm29337759pgv.40.2020.03.04.21.23.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2020 21:23:35 -0800 (PST) From: Shannon Nelson To: netdev@vger.kernel.org, davem@davemloft.net Cc: Shannon Nelson , Leon Romanovsky Subject: [PATCH v3 net-next 8/8] ionic: drop ethtool driver version Date: Wed, 4 Mar 2020 21:23:19 -0800 Message-Id: <20200305052319.14682-9-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200305052319.14682-1-snelson@pensando.io> References: <20200305052319.14682-1-snelson@pensando.io> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use the default kernel version in ethtool drv_info output and drop the module version. Cc: Leon Romanovsky Signed-off-by: Shannon Nelson --- drivers/net/ethernet/pensando/ionic/ionic.h | 1 - drivers/net/ethernet/pensando/ionic/ionic_ethtool.c | 1 - drivers/net/ethernet/pensando/ionic/ionic_main.c | 6 ++---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h index c8ff33da243a..1c720759fd80 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic.h +++ b/drivers/net/ethernet/pensando/ionic/ionic.h @@ -12,7 +12,6 @@ struct ionic_lif; #define IONIC_DRV_NAME "ionic" #define IONIC_DRV_DESCRIPTION "Pensando Ethernet NIC Driver" -#define IONIC_DRV_VERSION "0.20.0-k" #define PCI_VENDOR_ID_PENSANDO 0x1dd8 diff --git a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c index acd53e27d1ec..bea9b78e0189 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_ethtool.c @@ -86,7 +86,6 @@ static void ionic_get_drvinfo(struct net_device *netdev, struct ionic *ionic = lif->ionic; strlcpy(drvinfo->driver, IONIC_DRV_NAME, sizeof(drvinfo->driver)); - strlcpy(drvinfo->version, IONIC_DRV_VERSION, sizeof(drvinfo->version)); strlcpy(drvinfo->fw_version, ionic->idev.dev_info.fw_version, sizeof(drvinfo->fw_version)); strlcpy(drvinfo->bus_info, ionic_bus_info(ionic), diff --git a/drivers/net/ethernet/pensando/ionic/ionic_main.c b/drivers/net/ethernet/pensando/ionic/ionic_main.c index a8e3fb73b465..e4a76e66f542 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_main.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_main.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "ionic.h" #include "ionic_bus.h" @@ -15,7 +16,6 @@ MODULE_DESCRIPTION(IONIC_DRV_DESCRIPTION); MODULE_AUTHOR("Pensando Systems, Inc"); MODULE_LICENSE("GPL"); -MODULE_VERSION(IONIC_DRV_VERSION); static const char *ionic_error_to_str(enum ionic_status_code code) { @@ -414,7 +414,7 @@ int ionic_identify(struct ionic *ionic) memset(ident, 0, sizeof(*ident)); ident->drv.os_type = cpu_to_le32(IONIC_OS_TYPE_LINUX); - strncpy(ident->drv.driver_ver_str, IONIC_DRV_VERSION, + strncpy(ident->drv.driver_ver_str, UTS_RELEASE, sizeof(ident->drv.driver_ver_str) - 1); mutex_lock(&ionic->dev_cmd_lock); @@ -558,8 +558,6 @@ int ionic_port_reset(struct ionic *ionic) static int __init ionic_init_module(void) { - pr_info("%s %s, ver %s\n", - IONIC_DRV_NAME, IONIC_DRV_DESCRIPTION, IONIC_DRV_VERSION); ionic_debugfs_create(); return ionic_bus_register_driver(); }