Commit 3cdb35fb authored by Niklas Söderlund's avatar Niklas Söderlund Committed by David S. Miller
Browse files

nfp: expose common functions to be used for AF_XDP 



There are some common functionality that can be reused in the upcoming
AF_XDP support. Expose those functions in the header. While at it mark
some arguments of nfp_net_rx_csum() as const.

Signed-off-by: default avatarNiklas Söderlund <niklas.soderlund@corigine.com>
Signed-off-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34fe804e

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

+14 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ int nfp_net_mbox_reconfig_and_unlock(struct nfp_net *nn, u32 mbox_cmd); 
void nfp_net_mbox_reconfig_post(struct nfp_net *nn, u32 update);

int nfp_net_mbox_reconfig_wait_posted(struct nfp_net *nn);



void nfp_net_irq_unmask(struct nfp_net *nn, unsigned int entry_nr);

unsigned int

nfp_net_irqs_alloc(struct pci_dev *pdev, struct msix_entry *irq_entries,

		   unsigned int min_irqs, unsigned int want_irqs);
@@ -973,6 +974,19 @@ void 
nfp_net_irqs_assign(struct nfp_net *nn, struct msix_entry *irq_entries,

		    unsigned int n);



void nfp_net_tx_xmit_more_flush(struct nfp_net_tx_ring *tx_ring);

void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring, int budget);



bool

nfp_net_parse_meta(struct net_device *netdev, struct nfp_meta_parsed *meta,

		   void *data, void *pkt, unsigned int pkt_len, int meta_len);



void nfp_net_rx_csum(const struct nfp_net_dp *dp,

		     struct nfp_net_r_vector *r_vec,

		     const struct nfp_net_rx_desc *rxd,

		     const struct nfp_meta_parsed *meta,

		     struct sk_buff *skb);



struct nfp_net_dp *nfp_net_clone_dp(struct nfp_net *nn);

int nfp_net_ring_reconfig(struct nfp_net *nn, struct nfp_net_dp *new,

			  struct netlink_ext_ack *extack);

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

+8 −8
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ int nfp_net_mbox_reconfig_and_unlock(struct nfp_net *nn, u32 mbox_cmd) 
 *

 * Clear the ICR for the IRQ entry.

 */

static void nfp_net_irq_unmask(struct nfp_net *nn, unsigned int entry_nr)

void nfp_net_irq_unmask(struct nfp_net *nn, unsigned int entry_nr)

{

	nn_writeb(nn, NFP_NET_CFG_ICR(entry_nr), NFP_NET_CFG_ICR_UNMASKED);

	nn_pci_flush(nn);
@@ -923,7 +923,7 @@ static void nfp_net_tls_tx_undo(struct sk_buff *skb, u64 tls_handle) 
#endif

}



static void nfp_net_tx_xmit_more_flush(struct nfp_net_tx_ring *tx_ring)

void nfp_net_tx_xmit_more_flush(struct nfp_net_tx_ring *tx_ring)

{

	wmb();

	nfp_qcp_wr_ptr_add(tx_ring->qcp_q, tx_ring->wr_ptr_add);
@@ -1142,7 +1142,7 @@ static netdev_tx_t nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) 
 * @tx_ring:	TX ring structure

 * @budget:	NAPI budget (only used as bool to determine if in NAPI context)

 */

static void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring, int budget)

void nfp_net_tx_complete(struct nfp_net_tx_ring *tx_ring, int budget)

{

	struct nfp_net_r_vector *r_vec = tx_ring->r_vec;

	struct nfp_net_dp *dp = &r_vec->nfp_net->dp;
@@ -1587,10 +1587,10 @@ static int nfp_net_rx_csum_has_errors(u16 flags) 
 * @meta: Parsed metadata prepend

 * @skb: Pointer to SKB

 */

static void nfp_net_rx_csum(struct nfp_net_dp *dp,

void nfp_net_rx_csum(const struct nfp_net_dp *dp,

		     struct nfp_net_r_vector *r_vec,

			    struct nfp_net_rx_desc *rxd,

			    struct nfp_meta_parsed *meta, struct sk_buff *skb)

		     const struct nfp_net_rx_desc *rxd,

		     const struct nfp_meta_parsed *meta, struct sk_buff *skb)

{

	skb_checksum_none_assert(skb);
@@ -1668,7 +1668,7 @@ nfp_net_set_hash_desc(struct net_device *netdev, struct nfp_meta_parsed *meta, 
			 &rx_hash->hash);

}



static bool

bool

nfp_net_parse_meta(struct net_device *netdev, struct nfp_meta_parsed *meta,

		   void *data, void *pkt, unsigned int pkt_len, int meta_len)

{