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

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

nfp: separate high level and low level NSP headers 



We will soon add more NSP commands and structure definitions.
Move all high-level NSP header contents to a common nfp_nsp.h file.
Right now it mostly boils down to renaming nfp_nsp_eth.h and
moving some functions from nfp.h there.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f9e0da5

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include "nfpcore/nfp.h"

#include "nfpcore/nfp_cpp.h"

#include "nfpcore/nfp_nffw.h"

#include "nfpcore/nfp_nsp_eth.h"

#include "nfpcore/nfp_nsp.h"



#include "nfpcore/nfp6000_pcie.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#include <net/pkt_cls.h>

#include <net/vxlan.h>



#include "nfpcore/nfp_nsp_eth.h"

#include "nfpcore/nfp_nsp.h"

#include "nfp_net_ctrl.h"

#include "nfp_net.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
#include <linux/ethtool.h>



#include "nfpcore/nfp.h"

#include "nfpcore/nfp_nsp_eth.h"

#include "nfpcore/nfp_nsp.h"

#include "nfp_net_ctrl.h"

#include "nfp_net.h"

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

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#include "nfpcore/nfp.h"

#include "nfpcore/nfp_cpp.h"

#include "nfpcore/nfp_nffw.h"

#include "nfpcore/nfp_nsp_eth.h"

#include "nfpcore/nfp_nsp.h"

#include "nfpcore/nfp6000_pcie.h"



#include "nfp_net_ctrl.h"

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

+2 −10
Original line number Diff line number Diff line
@@ -48,18 +48,10 @@ 


const char *nfp_hwinfo_lookup(struct nfp_cpp *cpp, const char *lookup);



/* Implemented in nfp_nsp.c */

/* Implemented in nfp_nsp.c, low level functions */



struct nfp_nsp;

struct firmware;



struct nfp_nsp *nfp_nsp_open(struct nfp_cpp *cpp);

void nfp_nsp_close(struct nfp_nsp *state);

u16 nfp_nsp_get_abi_ver_major(struct nfp_nsp *state);

u16 nfp_nsp_get_abi_ver_minor(struct nfp_nsp *state);

int nfp_nsp_wait(struct nfp_nsp *state);

int nfp_nsp_device_soft_reset(struct nfp_nsp *state);

int nfp_nsp_load_fw(struct nfp_nsp *state, const struct firmware *fw);



int nfp_nsp_read_eth_table(struct nfp_nsp *state, void *buf, unsigned int size);

int nfp_nsp_write_eth_table(struct nfp_nsp *state,

			    const void *buf, unsigned int size);