From patchwork Wed Mar 4 04:20:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1248787 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=ypORS6EX; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLJq2Sb5z9sSG for ; Wed, 4 Mar 2020 15:20:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727386AbgCDEUZ (ORCPT ); Tue, 3 Mar 2020 23:20:25 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:47030 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbgCDEUZ (ORCPT ); Tue, 3 Mar 2020 23:20:25 -0500 Received: by mail-pf1-f195.google.com with SMTP id o24so259008pfp.13 for ; Tue, 03 Mar 2020 20:20:23 -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=ypORS6EXesxKCgPHLJc5QCYj9wNqypHaplifPRaz4Pff1eR86dkxAhfkuUiWtOykP4 iMvaMo9gnAeUuiXsRSazvIbIBY8Yw3PcLDGzPBKqhnqMPll9UamYbp00hG1AnfRbMMXq qY61KZDyRRP7RzaaRhEX2phT3J8FAUETrR+aNBP69AE/eahtzJi5DyQ/vR/sjw2stGkw gm1BqZSBNHYHiPDLCSJgtsyplADpzMBOBvToGGW1QkzUenHkB6c/deoXrU6xnuDMKkWP s+QmKDp1kjI40wRHvRDJvvySwA1D35zw+Jm1CH8nysSaYxkkL6m8J78akJ9uzXc/KziN G5SQ== 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=flCqrasMtmbAOZDjfKAV4aQdPuEsF7zOWglHlxQ+U8RhinaqZ7ZMF0doCTZcnRMr+Y qtBhvpRj31AveUB+DnxmHH2edht2fCMZa3S0q09QOTYkYQ6fvQ13g96kimF6TCaQPTRP hJH25N5GuxFGjSy6vmIfpaclKpKdUjmU7n4hShqk2J8rU6wLzQWDQS+U/4eZSESvBaIq TMZzKY/il3ySwAYhSZixFk7MIy1soBYANYtE+6qS7APT6eJX/PDrVmedFq74H5hIdSr/ KJMhS3Cq9Hrwp2e0/1BGAoa2OzrsU05ZV8xOH2UaLvx2kcJ8kczGMptkO9YWlYfKDu5z VqRw== X-Gm-Message-State: ANhLgQ374qhmbt7qiiTJtK/PUWA8/gut98CFW5AxV/uZdHnLjq34oLGz W6GzvriECNcw7oMxxuojscjekw== X-Google-Smtp-Source: ADFU+vsPdGhVml3jO3A5kRxHPEiagTaGXsGpXtQvENGDM6x7PdM8tWcT1O+kSHARITql1U55wSEZKQ== X-Received: by 2002:a62:382:: with SMTP id 124mr1232683pfd.11.1583295622895; Tue, 03 Mar 2020 20:20:22 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:22 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 1/8] ionic: keep ionic dev on lif init fail Date: Tue, 3 Mar 2020 20:20:06 -0800 Message-Id: <20200304042013.51970-2-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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 Wed Mar 4 04:20:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1248789 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=NyGAEY5R; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLJr2DDZz9sP7 for ; Wed, 4 Mar 2020 15:20:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727692AbgCDEU1 (ORCPT ); Tue, 3 Mar 2020 23:20:27 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42250 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727327AbgCDEU0 (ORCPT ); Tue, 3 Mar 2020 23:20:26 -0500 Received: by mail-pg1-f195.google.com with SMTP id h8so344309pgs.9 for ; Tue, 03 Mar 2020 20:20:24 -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=KKBKvNcJGY1TZuV+ovrL2wWJl2GnYYxVCVyMuW9EBv0=; b=NyGAEY5R1dSBgmNdQWCt6UwzSQEQxhz1EzfyvMuNzJlpyY2UGPOMmJzS8nrrDyO1Lx 4xonKPgx+6/f5K7Qhz5m9j+2SlcJkzKriu7poaF2TomCrCXaIvXHooI+st4OaSHx0pMt 7wHkiGgOGhqI7wwWsrr3mtMRY7JH4EnHHyFNaayvu/xmVNw/USmtwmzl/3qQ0U32/DdP TzOu25eCdSf+LcWlM2xJtgGdFzgERFTnEfqHpjFPzu1BxUBicERwot9KdLpir6GdhbkS 7Ny4Cm3axIiT1X8DmZFrP/4oeYiLkSWaPoVcD37ZGZybJ7a0yc+eIODBV5U2CmuOmCKa ZIrA== 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=KKBKvNcJGY1TZuV+ovrL2wWJl2GnYYxVCVyMuW9EBv0=; b=qig/wKe16Epdfh1nWnsOoLP0teBwGpy1Ji1gA7QglhyT8niOA3TMu9TjpEeEDKKoCP oqrtPc7t5ti1ekNABKWCABpGhy6rvjJuXcbV/f9UdZaPcC97SONJVCYe0b/bLN4K6Kd+ Z7OW4NfCWr0LX88RzXbM1Kgbe/Ymq+gS8hlOyNfOLsZfguKsQvUOJuXkHCYa1/Fxfpot rbzbhacqn9CPprr0FS0tmNh6817kbKTQY5PTy0KmyYcQhkAIRuaIxh60bXGfGi39lW7j IUnNmDiTWio8nuwwePftA74fzEW4Z2mbf97xnk+R02KLWts7P+zo/CgxuiP5apCcC5Fp jIOw== X-Gm-Message-State: ANhLgQ2cGByLqwzsO/HApLYDPeWKqia1u/NjNsIYCt8Ly6H+8QLDHqS5 coAxMTOPaxXLU23QKAf7Dafpx1XpCko= X-Google-Smtp-Source: ADFU+vsrsm23z67vx+/wnFffUGyeUaVcIpCNPhTr9/VSvCpMqsZjmyCuitkuBCnlp6O6bwH5yO3T5A== X-Received: by 2002:a62:e70e:: with SMTP id s14mr1177259pfh.115.1583295623769; Tue, 03 Mar 2020 20:20:23 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:23 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 2/8] ionic: remove pragma packed Date: Tue, 3 Mar 2020 20:20:07 -0800 Message-Id: <20200304042013.51970-3-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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..74697c25cd40 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]; - }; + } __attribute__((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; + } __attribute__((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; - }; + } __attribute((packed)) rdma; + } __attribute((packed)); __le32 words[512]; }; @@ -526,7 +524,7 @@ struct ionic_q_init_cmd { __le64 sg_ring_base; __le32 eq_index; u8 rsvd2[16]; -}; +} __attribute__((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; -}; +} __attribute((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]; - }; + } __attribute__((packed)); u8 color; }; @@ -1319,7 +1317,7 @@ struct ionic_dev_setattr_cmd { char name[IONIC_IFNAMSIZ]; __le64 features; u8 rsvd2[60]; - }; + } __attribute__((packed)); }; /** @@ -1334,7 +1332,7 @@ struct ionic_dev_setattr_comp { union { __le64 features; u8 rsvd2[11]; - }; + } __attribute__((packed)); u8 color; }; @@ -1361,7 +1359,7 @@ struct ionic_dev_getattr_comp { union { __le64 features; u8 rsvd2[11]; - }; + } __attribute__((packed)); u8 color; }; @@ -1426,7 +1424,7 @@ struct ionic_lif_setattr_cmd { } rss; u8 stats_ctl; u8 rsvd[60]; - }; + } __attribute__((packed)); }; /** @@ -1444,7 +1442,7 @@ struct ionic_lif_setattr_comp { union { __le64 features; u8 rsvd2[11]; - }; + } __attribute__((packed)); u8 color; }; @@ -1483,7 +1481,7 @@ struct ionic_lif_getattr_comp { u8 mac[6]; __le64 features; u8 rsvd2[11]; - }; + } __attribute__((packed)); u8 color; }; @@ -1688,7 +1686,7 @@ struct ionic_vf_setattr_cmd { u8 linkstate; __le64 stats_pa; u8 pad[60]; - }; + } __attribute__((packed)); }; struct ionic_vf_setattr_comp { @@ -1726,7 +1724,7 @@ struct ionic_vf_getattr_comp { u8 linkstate; __le64 stats_pa; u8 pad[11]; - }; + } __attribute__((packed)); u8 color; }; @@ -2471,7 +2469,7 @@ union ionic_dev_cmd_regs { union ionic_dev_cmd_comp comp; u8 rsvd[48]; u32 data[478]; - }; + } __attribute__((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; - }; + } __attribute__((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 Wed Mar 4 04:20:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1248788 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=19lIKLQx; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLJq62scz9sSJ for ; Wed, 4 Mar 2020 15:20:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727486AbgCDEU0 (ORCPT ); Tue, 3 Mar 2020 23:20:26 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:44553 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726563AbgCDEUZ (ORCPT ); Tue, 3 Mar 2020 23:20:25 -0500 Received: by mail-pg1-f193.google.com with SMTP id a14so340942pgb.11 for ; Tue, 03 Mar 2020 20:20:25 -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=19lIKLQxsyxKIA7sxifB3gXFdCfyL3kUs+tibihLM8UT9LJKtAenGcR4SYEHML1Ye5 IWGjQSP+R98IxQ4XlW8PbCsXS6vLhWe7QcfMPOS68X8723lPv46gsNuoXpCygfQkV80N n8CY0tKMmQqcFbnQUG0WUPqDkQor8DYGoR9oBd//VM5vbxI1ZVDPPexvCPsuNOQw9EBk zP2fqv5olvcs+QOb/KQQhHTATxIzshhWa3rBO4wAvfu2ZBIbajwVNSUqlBUR61UoyYY1 q+Vl4xfN9YhiMkIiJomvEG6OOQMSQ2ztLo4LChSYtnwhawbgEjGC8IWii18Sbnvzd+Lq 8g5A== 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=qj1ltlaBXu43XvNIuKz/WKSU10lEBvOattJmoCwExxRKKSbO+onIdlAwFdZ6aRIR2F Pq/TY/KrM1vrXcZfFIP5FHAFRT0PjC6+P3BK67cKDV2ZbAHQ9pZlej/kiUWNZToTdAWt 1DdHREdRXnDZ16kFKQDm957GnGambTisY0W30fx+1+Aj5w6vOmNAkmT7BNY9EHvvD85o 65MYqYHALUFZDP9T0vvRbd4xBSH4CFDRcqQH92Dmy9RVymrQQq67h2CmM8kRdu00zYYC 1t7bW3Wry0NgfsjCyGAzJ0Nbyex/C4C+vVWpaaNR/dwEGOm+VK9A8mOBU0zDe5nnrwI0 a9wA== X-Gm-Message-State: ANhLgQ3045q311egta/zNnFPvjarqAnPKku7G+cyLSFar0xwI1ftDzLd KneMo6SG94m3i/4Cnjr+VBbvg3gshAU= X-Google-Smtp-Source: ADFU+vvF5AwWQo+3nvDwA/2rwBr4iPraBil4pBoZW4pOCHe9APndJBXPXUW2Vdp/64Bpiyj0Bpq9NQ== X-Received: by 2002:a63:7e49:: with SMTP id o9mr881552pgn.80.1583295624628; Tue, 03 Mar 2020 20:20:24 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:24 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 3/8] ionic: improve irq numa locality Date: Tue, 3 Mar 2020 20:20:08 -0800 Message-Id: <20200304042013.51970-4-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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 Wed Mar 4 04:20:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1248793 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=xPglia/g; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLK04C9Sz9sP7 for ; Wed, 4 Mar 2020 15:20:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727985AbgCDEU3 (ORCPT ); Tue, 3 Mar 2020 23:20:29 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:39294 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbgCDEU0 (ORCPT ); Tue, 3 Mar 2020 23:20:26 -0500 Received: by mail-pg1-f193.google.com with SMTP id s2so351763pgv.6 for ; Tue, 03 Mar 2020 20:20:26 -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=xPglia/gLDotp3ZEuWWE7ujW4/+W1wTW39faU+Mvws1yH2cNUJa9otUnbdm8CwNWoj Eif3xzdmK1e9gG0pUFmvvOyGvNslJFF7L4o448DBIEpWeAmiUQZQMnBI4r4DGIL/nVKP 3bBSPZ7TcNa2HPpnx3vMvRYyPD+zpoLj/3supBum7OE8xCTiqavzsh7438e5pc4WHv7C Nf6HHKxDCC+rovHfpwCijhLpQwAeVxlxi+UwWMdvxTAjb5vh+OXL0JylHYjabkR1SJ/8 EewxUguFJBSUNAKJFMT/umx4kSF7Ki/REz0ePuPEzDZRjsNbH828tPuCGI+dDxk2kwVf qAuA== 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=LRMwnPoZ0swtTD4seFS+H8fdyjjm8hwzMNkc7tcmBK7sFXHcXcPBV/1n1Jj3lWofoQ jmd0WgbJS22DB5n5r8KVoGwmdnxSZFrD0QL7gJIumZ7dQCULGQH8K/ZIJ1NF1r3mrTUd uVs8T94Qysstq+K7h/tK+y2GRnoSUiCkmIgz7tc4ne8UrrsFxlLVdINNzjPN8CX5O5gU YTKmCdUO+VFm4AQSbfcwu45fUqY35QLajV7G58Zsja7HBFX+MFIYE/xf0OZ+Th8GpmN2 3948YIdQYdwdHoR2v3xY+nVGfBzQVKrbfwoo+4UDB5Cacvpvw263wXx3AMWEnTYQFfei lIFw== X-Gm-Message-State: ANhLgQ1s9l1CHlwgV7cBGE8V0X5L7/Q2+f6/HO91+YvhD1Bk3a/0NFcz TXT5o6qa2MQoZNBw4gLUHlI5bg== X-Google-Smtp-Source: ADFU+vtIfEOEsU0UftcfBIIdZ9TqEzgEIVumgiHYzsEXaVdGrngfyEswZWYP6Xj8KlP1dXwAHSRbgA== X-Received: by 2002:aa7:9732:: with SMTP id k18mr1144109pfg.231.1583295625498; Tue, 03 Mar 2020 20:20:25 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:25 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 4/8] ionic: clean up bitflag usage Date: Tue, 3 Mar 2020 20:20:09 -0800 Message-Id: <20200304042013.51970-5-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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 Wed Mar 4 04:20:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1248794 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=2konT/Ed; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLK21Pl2z9sSG for ; Wed, 4 Mar 2020 15:20:38 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727827AbgCDEU3 (ORCPT ); Tue, 3 Mar 2020 23:20:29 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:43078 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727543AbgCDEU1 (ORCPT ); Tue, 3 Mar 2020 23:20:27 -0500 Received: by mail-pl1-f196.google.com with SMTP id x17so408794plm.10 for ; Tue, 03 Mar 2020 20:20:26 -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=2konT/EdhSgfOPsJQR741twjwc+/kCy9kPbaCwOVYZzBZvyHINDIF/D6Y2DorNMgc2 DIN1ZaMedNhWKVV4kVqas9glVQwAiUjODHI1kV69ydSW6rf6FFAk8x8p+HAk1bOE89fM qcopn1mT5s6uDzq56QYzIlJDaEaDlkYGvvNGkbwVsgBt42KtBQhZeJVJv9ov6Ul5wEJP FWocMwDQfgc+qY3KXEQc2Djp8FXLlqafo8lTUrL4+87hXUfIoPJS725Inul2yI7P05GT 3MVFfnh514QlmhSynGogw+TDs/VsLSIz3s1lughljcE/pguLrS3fXDon0EOWQKZjaUfB HbHw== 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=Nh6f3JaVaMg8HkwCHQ1KrQLBcKohQ74sNtXhJI3/9qp3P1mwW8d+mNG6k9YbJFMKsy V8dYDTodp+a/ZJXEYeWMgnr3qYFH0jvwsBTTY8wht2l80GRuFRPBf2f3a83//vdPHbjK KQqHItnEmSJAy1QCruH0i8V4wrLznFcuPydXPBnS7QRVA8wkh07BeCBAD42mXwm/OYBQ 5lfSA6Uk1PxgZvvrB0qTl+3g2r51lLYAQI5Pfib9g3pT5bGqvtrCTW9Si+7Zo44u2eQX elXygxOSDAoSi8DXZtTiGmNUeskuApo1CZWC/4sdenruYpRmp1dxrq3DAp0JMsq78QJO dAAA== X-Gm-Message-State: ANhLgQ2oW2uL5/m8nKE4CKxl5CikOKdpSxoNRMmB8/Gn/AiX6sRVOTxr Feeoi64Ha0iOkTWtpC0ZmQSdeA== X-Google-Smtp-Source: ADFU+vu3lqMXxkdA5ssBcszagEbaMtPEg1ZsJ7wNQ5/JbRiKFExqVt0b7K63lseSUytVJgeKJiIGRw== X-Received: by 2002:a17:902:b113:: with SMTP id q19mr1266767plr.199.1583295626282; Tue, 03 Mar 2020 20:20:26 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:25 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 5/8] ionic: support ethtool rxhash disable Date: Tue, 3 Mar 2020 20:20:10 -0800 Message-Id: <20200304042013.51970-6-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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 Wed Mar 4 04:20:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Nelson X-Patchwork-Id: 1248791 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=o/8mqBok; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLJx4RC0z9sP7 for ; Wed, 4 Mar 2020 15:20:33 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728212AbgCDEUa (ORCPT ); Tue, 3 Mar 2020 23:20:30 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:34078 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727745AbgCDEU3 (ORCPT ); Tue, 3 Mar 2020 23:20:29 -0500 Received: by mail-pj1-f67.google.com with SMTP id f2so2000053pjq.1 for ; Tue, 03 Mar 2020 20:20:27 -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=o/8mqBokSRQXoU4XC6DcIe4Ph6Hueob/rLo8judmjoqeeu4syg13hZhI87wMvih09b Csb55Ge0v17DZploNjVpl1k5SUa4TaA22AmQe9G7d9t0zohCxDX/hULDPoeHsF1pf+Uy VgDWm7ypDG+Gm8cgaNDl6nZ4joUBHA68j3POAsTSZlquroR7I/VeMFn90QVxpFVoUeUa vfRy+/BTnbeVTdi1tQXSazckVvHQqEBmnZ1USfeISQRlc39VmfxBO9/OVW4Sar2aURNd JYDF17Agq8Uc6OGFcnRrdts9drMGWMcVYkCu9wh3vVjZWYrYS8LJIb8jGhAUDz+ChGha lN/g== 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=TofN6/kYyjL2JBzZUQvemYpsKvRIaijSE8NPe046/6tRhu7ZUmuiImTdCWE6f/Ecxq vsvkWqZlMRQLpawo8JMb6Ylwok9f+xzpFtVQaiP6PIavxiVmfN9oRF+tKfNAd+zO72NQ s9JSWLZFQBG3fzgFenlrFkaHwq1W7NifUafQR7ZOXHREJl79/BG2o6pKFiStJb53r7lU iBjzR5qmGI+ahz5XZEi9M6OgBLy1+LMx5QvoKX7swRVJJfucM6C6UdmxEMeN72TXo42t 54Ootkta/P83VMxcm+0nqjRtxrRCw8r3iNmuRJCQYTIC+DV0hhJjTTVvRdnniRfedqTw cxpw== X-Gm-Message-State: ANhLgQ21rd69/+/02MN6cB6dZzd1UprKQG3NtVc5wP7Vg65l1l0jRoEE 0zyzeCzN0+OKMlZWISUZF0R36g== X-Google-Smtp-Source: ADFU+vv+IM95Aj3uNPou2H87G8LB84K8g6d8oGy7gOaXKt4DS7G559Eu5AliT7iX788nlRWv87T21g== X-Received: by 2002:a17:90a:5d18:: with SMTP id s24mr1027193pji.141.1583295627282; Tue, 03 Mar 2020 20:20:27 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:26 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 6/8] ionic: print pci bus lane info Date: Tue, 3 Mar 2020 20:20:11 -0800 Message-Id: <20200304042013.51970-7-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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 Wed Mar 4 04:20: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: 1248792 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=DHb23UfR; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLJy49Sbz9sP7 for ; Wed, 4 Mar 2020 15:20:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728079AbgCDEUa (ORCPT ); Tue, 3 Mar 2020 23:20:30 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44342 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727725AbgCDEU3 (ORCPT ); Tue, 3 Mar 2020 23:20:29 -0500 Received: by mail-pf1-f196.google.com with SMTP id y26so264829pfn.11 for ; Tue, 03 Mar 2020 20:20:28 -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=DHb23UfRr/fiJv5qGnRFaJ1wMjsOPnKEsetj6f1VRGxCNAnpsgA1EpLN+MXw55P3zp YTrmcvuvpn2kf/cYszileF8CW3fk7nKR27kIvkPSb7NBajnBbC5tT1ZZgjG5CyreL/HZ DY/g8ie+r6w7/Tc1H5FuY3QjKANbno8LHNGz2RxkajY7kj/Dgr2CLJvLodjMIs7V0wG9 Xlh1MVgY9ecz2gqothladDC0ME6+mKm31UbI5uJv7O0EHr/Gty0ejVbSw1QHZ6hFM9OS qc+h1qoDUEeQNUWRV5JJacnWvRhC0hrEM+eD0FSpHqHbDDfdS2vkaln0igs5EkubzOfE +zNg== 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=sAe/Ddt1yS9iecgsldcSTGlOXeoBoUV+KgPsGPtd/lbqFad7nGh+6PAWcPycs1gAun jlQ74bRiR7jZwQgW9BtHsVRiJSSvxbVUXYyUpVYldJPE2ROszEV4C2hvt8jEXz38PHN/ Rsz+1RWMbXJqAilqo2m6bZv2WjYRjE0fMGmCVxPAUxd4eJw7xe3fgohVWsAZox5sWRZD MZ+wqXdGY17uOKX6YUOHpNW47PuPfRvBXpqZIckvrNPllGqRsE5yZwfb09Qdq2l0g7WS kMBeeTxu4KJfDJE6c6flTrHLMmLGTN0Io+AldnPpqCv+j4Y+k2WanEPoJ4NVKXEgaqE7 MdPw== X-Gm-Message-State: ANhLgQ1Tib+sOZfBFazxm+HeyXkET5aU+HSK7kCrVenqm3KqgR+iMWn6 kxf9r/KlVeiVcXgkf2E9onlxWST2c8Y= X-Google-Smtp-Source: ADFU+vv51Alsd1d1sy9IgYfRMUobkFuv32eyTCUIVo2/zN6C6D2m6NhRDtOXkFEr3/N8XLuoyIihHg== X-Received: by 2002:a62:e10b:: with SMTP id q11mr1247791pfh.48.1583295628156; Tue, 03 Mar 2020 20:20:28 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:27 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson Subject: [PATCH v2 net-next 7/8] ionic: add support for device id 0x1004 Date: Tue, 3 Mar 2020 20:20:12 -0800 Message-Id: <20200304042013.51970-8-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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 Wed Mar 4 04:20: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: 1248790 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=Y5asKhSF; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48XLJw2w8Gz9sP7 for ; Wed, 4 Mar 2020 15:20:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728228AbgCDEUb (ORCPT ); Tue, 3 Mar 2020 23:20:31 -0500 Received: from mail-pj1-f66.google.com ([209.85.216.66]:52764 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726436AbgCDEUa (ORCPT ); Tue, 3 Mar 2020 23:20:30 -0500 Received: by mail-pj1-f66.google.com with SMTP id lt1so312540pjb.2 for ; Tue, 03 Mar 2020 20:20:29 -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=Y5asKhSFRQgBVo7i1EGAIT7YuDSDA20t2VHNWsn0691ETCFnzMWoE886n4w+R8IYSF lIezhJ2NRISYbCiFf0N7sgMd0qg9rfTX8g55Pfc83jns3yk/UQOjikvQcmOJCLkXu3hp biUdN67ABC4mBx7wwCgZQPzDMHge3qL6UMzlW2+IzUp4j5emHuMv+TBCMTorT4LQfj2A mC7U232zgRjbB8pR0hrCfObEJi4henA6IJvMrhRy4ya96BhhBaN6O6bHFJgISxdlmQZi FZruhmDxC7n/5qGEMKNKx/WztoRMHFoW0y7mXH6wgcpiTD2SBIrP4C0L+FT1bTClPzrL oJpg== 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=rwMf50b7nwZSf6hpznjuLmyuhc/saWzKpn5iX/9fEtbAEZYtfCDMe3QYcd+f9drZjH I6ZKsiGcTZGcwe6deFUgTvWJbRv49WXHsEUwmmAgVdDo5x4l2mfaewpKh8WXOpqTAauM z/LXKB6Z9XPbpeSB6p8s18MhnISmAb/SJNcyc5mAGidGbtFXn+yVFxfRCglvR6KJDz5D Zvm1GRyGBhTV/Wb/hzJe0qr8UPAGgMOSIkPVNuWUiSznb/8qiPxntkQ49ZfPpOZNT3+a X4tPVB+ONHhL8/mUNyILlJJPKCdM48oCPMBm0+LOG1RWs50/LKpnPiWLDsoJo2MgoSQ9 D/aw== X-Gm-Message-State: ANhLgQ0xwkiCC/oUHDbE8ZiEOEWqKf+37USLifKw+mtTuNJ7lCSKauAB KcN+mO3WIen2hgAArAP8Pkd04g== X-Google-Smtp-Source: ADFU+vtCI6kGEhrskL1+VzeRVyU67YSR4rKM/DoQQjHbUrY8CfQvP1fOMWCzAGnIAYacvhDMk0B/eA== X-Received: by 2002:a17:90a:e795:: with SMTP id iz21mr1037315pjb.81.1583295629248; Tue, 03 Mar 2020 20:20:29 -0800 (PST) Received: from driver-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id c2sm671702pjo.28.2020.03.03.20.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Mar 2020 20:20:28 -0800 (PST) From: Shannon Nelson To: davem@davemloft.net, netdev@vger.kernel.org Cc: Shannon Nelson , Leon Romanovsky Subject: [PATCH v2 net-next 8/8] ionic: drop ethtool driver version Date: Tue, 3 Mar 2020 20:20:13 -0800 Message-Id: <20200304042013.51970-9-snelson@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200304042013.51970-1-snelson@pensando.io> References: <20200304042013.51970-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(); }