Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9dcf88a authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

nfp: add metadata format bit 



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: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7de5f115

drivers/net/ethernet/netronome/nfp/nfp_net.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/netronome/nfp/nfp_net_common.c

+3 −1
Original line number Diff line number Diff line
@@ -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);