From patchwork Wed Mar 8 16:57:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 736661 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vdfsB66DVz9sNw for ; Thu, 9 Mar 2017 03:59:58 +1100 (AEDT) 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="JUzO1ecs"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754061AbdCHQ74 (ORCPT ); Wed, 8 Mar 2017 11:59:56 -0500 Received: from mail-pf0-f176.google.com ([209.85.192.176]:34474 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753721AbdCHQ7E (ORCPT ); Wed, 8 Mar 2017 11:59:04 -0500 Received: by mail-pf0-f176.google.com with SMTP id v190so16983947pfb.1 for ; Wed, 08 Mar 2017 08:58:15 -0800 (PST) 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:in-reply-to:references; bh=s8NF92DYCHKHw15TAXpyUTVecPpBscpXGhwvsKdZrUI=; b=JUzO1ecsy0oXteHd4zYTH3BWw8X+yLvVk9DKPW/vlF/7emSJBFbtc7JYOF96VCq2ik 0qMQnDU/tNs5TTG3YW+rDvsVgviZSwvGq53krarhdOXf4ixP+mePyjC3/lmFwORdBzYf qcPKh5blEDlTE0h49jS7FnRage+mrJ0GLXf5NSpDGT1RPCPNNxA8/eSypF1yBvN0+V2D R0oWIGBYg4SgysCIOxOGcpxSE4pWKJB7ypv9ENn7rqKd8MZaiFeHmfw9GpR7y9WpoUTj 5ICbruLYVX2YGZ7iLIFOxwkvYJZnOfsvSL0bTCq/hHRvCC2wXcEOtjMlecr4QYEq8qQQ vygA== 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=s8NF92DYCHKHw15TAXpyUTVecPpBscpXGhwvsKdZrUI=; b=ieErluEsJr2V0uTkN+h+BFhWlBXFNpepnLEM43QGnPsbC9sPcGEjxeLG8258+HUAA/ X/Ty0aF/2tbZQKL9g1ENH1Nzlmn7iXhNdtu1gbrqBDoSa4b7vnaJCrBCwURspAY1HAQH XtOE+ekn5NlMs7B+WM8MWAAvBMOisQIqAqKZDKq0+iJiZGWpM2Hrz9ota5UJBCCYfI7r P95pzsIkbC8f6P5T6A35DJMvoisTgsdiNIU3uS8aWwB02IOiZ+wx+ZOVNM/JMsvSoDkw b6+im6hJX9Idzg0iENjo8p96ArmZq3dyD3L64O56RqgN5uHl+U3XQMHBF0PDO3ORQ0Ks 64Ew== X-Gm-Message-State: AMke39l5MXdlmi3vYRjX6WnldlPmY0sD2PVeI0L5ReavGP+wf1qvyT6ZKxEaT30hk4NbG1N4 X-Received: by 10.99.2.139 with SMTP id 133mr8126810pgc.168.1488992295281; Wed, 08 Mar 2017 08:58:15 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id s20sm7350335pfg.11.2017.03.08.08.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Mar 2017 08:58:14 -0800 (PST) From: Jakub Kicinski To: netdev@vger.kernel.org Cc: oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next 8/9] nfp: add metadata format bit Date: Wed, 8 Mar 2017 08:57:07 -0800 Message-Id: <20170308165708.96087-9-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170308165708.96087-1-jakub.kicinski@netronome.com> References: <20170308165708.96087-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We only need FW version in the first cache line of adapter struct because we need to know the metadata format. To save space add a metadata format bit. Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 ++ drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index 4ad27570b6c4..34f8c439f42f 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -440,6 +440,7 @@ struct nfp_stat_pair { * @is_vf: Is the driver attached to a VF? * @bpf_offload_skip_sw: Offloaded BPF program will not be rerun by cls_bpf * @bpf_offload_xdp: Offloaded BPF program is XDP + * @chained_metadata_format: Firemware will use new metadata format * @ctrl: Local copy of the control register/word. * @fl_bufsz: Currently configured size of the freelist buffers * @rx_offset: Offset in the RX buffers where packet data starts @@ -507,6 +508,7 @@ struct nfp_net { unsigned is_vf:1; unsigned bpf_offload_skip_sw:1; unsigned bpf_offload_xdp:1; + unsigned chained_metadata_format:1; u32 ctrl; u32 fl_bufsz; diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 119775d4097e..2d964d030dbe 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -1652,7 +1652,7 @@ static int nfp_net_rx(struct nfp_net_rx_ring *rx_ring, int budget) skb_reserve(skb, data_off); skb_put(skb, pkt_len); - if (nn->fw_ver.major <= 3) { + if (!nn->chained_metadata_format) { nfp_net_set_hash_desc(nn->netdev, skb, rxd); } else if (meta_len) { void *end; @@ -3196,6 +3196,8 @@ int nfp_net_netdev_init(struct net_device *netdev) struct nfp_net *nn = netdev_priv(netdev); int err; + nn->chained_metadata_format = nn->fw_ver.major > 3; + /* Get some of the read-only fields from the BAR */ nn->cap = nn_readl(nn, NFP_NET_CFG_CAP); nn->max_mtu = nn_readl(nn, NFP_NET_CFG_MAX_MTU);