From patchwork Thu Mar 21 04:01:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1059773 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 (mailfrom) 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=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="jgD+u2KE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44PtQy5rrdz9sRQ for ; Thu, 21 Mar 2019 15:02:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725901AbfCUECQ (ORCPT ); Thu, 21 Mar 2019 00:02:16 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:35279 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725562AbfCUECQ (ORCPT ); Thu, 21 Mar 2019 00:02:16 -0400 Received: by mail-qt1-f195.google.com with SMTP id h39so5261124qte.2 for ; Wed, 20 Mar 2019 21:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vANSolWPAQD1hOybD4ZS4BF+Xy+gtzOl2NXftR0PGZs=; b=jgD+u2KEmXonAagHbO/yN+RFznRmedgHEbGy7w43+L1RBaoDEYI+Zy1xu1beitTFXA eEQiaSRtV93o0+QRhhJ/X2W9W5YRyKMQn1b+u5Uwki2rnliTXSy4f7XrrVcfyXWdtSqB koFvHEnnk63G18dkYoB8jkLRMVlsx5+FgCNZHrTzFb1TThAar0JD5Q6eJn1p4GvcEqY6 wnRCeHAuW9/n56wFSucmef8dKiJuicB3qMJxas6wD9pkqAvap2l+ZjGYR+FkAyoNl4Yw DftIEXdHwm/QzkjNE2aHLel2yfdaKBQA9WBaYTfDL3xset8zFN3P6Zd5Wc9jEkERVhsF 1qHA== 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:mime-version :content-transfer-encoding; bh=vANSolWPAQD1hOybD4ZS4BF+Xy+gtzOl2NXftR0PGZs=; b=ZOI+ALpcG1Pyjghi+/cgPtJ6C/MlPAbbgsF/6uKusrfGb0gAa47+z4RHZzSpoxZ1ju qN4RbJr4rcbnFDoQ90guwP8wXaOw5pMstnTAEYChVHlMGO/JV2fSgo0y/fcFsrTiN1ru 37WPkHpZBE69z85xQLwqpJt+TfgWBzQ6kh03yKbl64wpbJa9+YEg8aRCBgHfXyOdiXw0 9iH/QVn1+M75e7O57x/OLtvuElup1SJeua1joWZz/ud03grpSRM8Bw0sJxdHEF+QOty3 oJCG/0wRPuFe84Fl2r+ayU/T+O1QNfd0E6jAoHOcxnXB2fAD5HYi6UEFv962KviYK0Ub xqgA== X-Gm-Message-State: APjAAAVTxx1i4Xp09UfYgjm9ZFqArK52chynpZW8nEMbXwkkg13JZjBT MQg00WmCgswhxtcjtz6x1lD7Cg== X-Google-Smtp-Source: APXvYqzJRrzg4tPoCf2FmjQWlVhrhXVWC/Icruecio/StHV7lvXH1X5T//FoBkTiEWi+ZhyfxT7tOw== X-Received: by 2002:a0c:89f3:: with SMTP id 48mr1362147qvs.215.1553140935114; Wed, 20 Mar 2019 21:02:15 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id l129sm1981248qkb.44.2019.03.20.21.02.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Mar 2019 21:02:14 -0700 (PDT) From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next] nfp: remove defines for unused control bits Date: Wed, 20 Mar 2019 21:01:53 -0700 Message-Id: <20190321040153.24189-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org NFP driver ABI contains bits for L2 switching which were never implemented in initially envisioned form. Remove the defines, and open up the possibility of reclaiming the bits for other uses. Signed-off-by: Jakub Kicinski Reviewed-by: Dirk van der Merwe --- drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 3 +-- drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 6d1b8816552e..ad2f133bd545 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -3548,7 +3548,7 @@ void nfp_net_info(struct nfp_net *nn) nn->fw_ver.resv, nn->fw_ver.class, nn->fw_ver.major, nn->fw_ver.minor, nn->max_mtu); - nn_info(nn, "CAP: %#x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", + nn_info(nn, "CAP: %#x %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", nn->cap, nn->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", nn->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", @@ -3564,7 +3564,6 @@ void nfp_net_info(struct nfp_net *nn) nn->cap & NFP_NET_CFG_CTRL_RSS ? "RSS1 " : "", nn->cap & NFP_NET_CFG_CTRL_RSS2 ? "RSS2 " : "", nn->cap & NFP_NET_CFG_CTRL_CTAG_FILTER ? "CTAG_FILTER " : "", - nn->cap & NFP_NET_CFG_CTRL_L2SWITCH ? "L2SWITCH " : "", nn->cap & NFP_NET_CFG_CTRL_MSIXAUTO ? "AUTOMASK " : "", nn->cap & NFP_NET_CFG_CTRL_IRQMOD ? "IRQMOD " : "", nn->cap & NFP_NET_CFG_CTRL_VXLAN ? "VXLAN " : "", diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h index 372adea10e14..f5d564bbb55a 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h @@ -104,8 +104,6 @@ #define NFP_NET_CFG_CTRL_RINGPRIO (0x1 << 19) /* Ring priorities */ #define NFP_NET_CFG_CTRL_MSIXAUTO (0x1 << 20) /* MSI-X auto-masking */ #define NFP_NET_CFG_CTRL_TXRWB (0x1 << 21) /* Write-back of TX ring*/ -#define NFP_NET_CFG_CTRL_L2SWITCH (0x1 << 22) /* L2 Switch */ -#define NFP_NET_CFG_CTRL_L2SWITCH_LOCAL (0x1 << 23) /* Switch to local */ #define NFP_NET_CFG_CTRL_VXLAN (0x1 << 24) /* VXLAN tunnel support */ #define NFP_NET_CFG_CTRL_NVGRE (0x1 << 25) /* NVGRE tunnel support */ #define NFP_NET_CFG_CTRL_BPF (0x1 << 27) /* BPF offload capable */ @@ -130,7 +128,6 @@ #define NFP_NET_CFG_UPDATE_TXRPRIO (0x1 << 3) /* TX Ring prio change */ #define NFP_NET_CFG_UPDATE_RXRPRIO (0x1 << 4) /* RX Ring prio change */ #define NFP_NET_CFG_UPDATE_MSIX (0x1 << 5) /* MSI-X change */ -#define NFP_NET_CFG_UPDATE_L2SWITCH (0x1 << 6) /* Switch changes */ #define NFP_NET_CFG_UPDATE_RESET (0x1 << 7) /* Update due to FLR */ #define NFP_NET_CFG_UPDATE_IRQMOD (0x1 << 8) /* IRQ mod change */ #define NFP_NET_CFG_UPDATE_VXLAN (0x1 << 9) /* VXLAN port change */