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

Commit 1f697ab1 authored by Satanand Burla's avatar Satanand Burla Committed by David S. Miller
Browse files

liquidio: remove duplicate code 



Remove code duplicated in PF and VF; define that code once only in a common
header file included by PF and VF.

Signed-off-by: default avatarSatanand Burla <satananda.burla@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 03e1de50

drivers/net/ethernet/cavium/liquidio/lio_main.c

+0 −36
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ MODULE_PARM_DESC(fw_type, "Type of firmware to be loaded. Default \"nic\""); 


static int ptp_enable = 1;



/* Bit mask values for lio->ifstate */

#define   LIO_IFSTATE_DROQ_OPS             0x01

#define   LIO_IFSTATE_REGISTERED           0x02

#define   LIO_IFSTATE_RUNNING              0x04

#define   LIO_IFSTATE_RX_TIMESTAMP_ENABLED 0x08



/* Polling interval for determining when NIC application is alive */

#define LIQUIDIO_STARTER_POLL_INTERVAL_MS 100
@@ -530,36 +524,6 @@ static void liquidio_deinit_pci(void) 
	pci_unregister_driver(&liquidio_pci_driver);

}



/**

 * \brief check interface state

 * @param lio per-network private data

 * @param state_flag flag state to check

 */

static inline int ifstate_check(struct lio *lio, int state_flag)

{

	return atomic_read(&lio->ifstate) & state_flag;

}



/**

 * \brief set interface state

 * @param lio per-network private data

 * @param state_flag flag state to set

 */

static inline void ifstate_set(struct lio *lio, int state_flag)

{

	atomic_set(&lio->ifstate, (atomic_read(&lio->ifstate) | state_flag));

}



/**

 * \brief clear interface state

 * @param lio per-network private data

 * @param state_flag flag state to clear

 */

static inline void ifstate_reset(struct lio *lio, int state_flag)

{

	atomic_set(&lio->ifstate, (atomic_read(&lio->ifstate) & ~(state_flag)));

}



/**

 * \brief Stop Tx queues

 * @param netdev network device

drivers/net/ethernet/cavium/liquidio/lio_vf_main.c

+0 −36
Original line number Diff line number Diff line
@@ -39,12 +39,6 @@ MODULE_PARM_DESC(debug, "NETIF_MSG debug bits"); 


#define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)



/* Bit mask values for lio->ifstate */

#define   LIO_IFSTATE_DROQ_OPS             0x01

#define   LIO_IFSTATE_REGISTERED           0x02

#define   LIO_IFSTATE_RUNNING              0x04

#define   LIO_IFSTATE_RX_TIMESTAMP_ENABLED 0x08



struct liquidio_if_cfg_context {

	int octeon_id;
@@ -335,36 +329,6 @@ static struct pci_driver liquidio_vf_pci_driver = { 
	.err_handler	= &liquidio_vf_err_handler,    /* For AER */

};



/**

 * \brief check interface state

 * @param lio per-network private data

 * @param state_flag flag state to check

 */

static int ifstate_check(struct lio *lio, int state_flag)

{

	return atomic_read(&lio->ifstate) & state_flag;

}



/**

 * \brief set interface state

 * @param lio per-network private data

 * @param state_flag flag state to set

 */

static void ifstate_set(struct lio *lio, int state_flag)

{

	atomic_set(&lio->ifstate, (atomic_read(&lio->ifstate) | state_flag));

}



/**

 * \brief clear interface state

 * @param lio per-network private data

 * @param state_flag flag state to clear

 */

static void ifstate_reset(struct lio *lio, int state_flag)

{

	atomic_set(&lio->ifstate, (atomic_read(&lio->ifstate) & ~(state_flag)));

}



/**

 * \brief Stop Tx queues

 * @param netdev network device

drivers/net/ethernet/cavium/liquidio/octeon_network.h

+36 −0
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ 
#define LIO_MAX_MTU_SIZE (OCTNET_MAX_FRM_SIZE - OCTNET_FRM_HEADER_SIZE)

#define LIO_MIN_MTU_SIZE ETH_MIN_MTU



/* Bit mask values for lio->ifstate */

#define   LIO_IFSTATE_DROQ_OPS             0x01

#define   LIO_IFSTATE_REGISTERED           0x02

#define   LIO_IFSTATE_RUNNING              0x04

#define   LIO_IFSTATE_RX_TIMESTAMP_ENABLED 0x08



struct oct_nic_stats_resp {

	u64     rh;

	struct oct_link_stats stats;
@@ -438,4 +444,34 @@ static inline void octeon_fast_packet_next(struct octeon_droq *droq, 
	       get_rbd(droq->recv_buf_list[idx].buffer), copy_len);

}



/**

 * \brief check interface state

 * @param lio per-network private data

 * @param state_flag flag state to check

 */

static inline int ifstate_check(struct lio *lio, int state_flag)

{

	return atomic_read(&lio->ifstate) & state_flag;

}



/**

 * \brief set interface state

 * @param lio per-network private data

 * @param state_flag flag state to set

 */

static inline void ifstate_set(struct lio *lio, int state_flag)

{

	atomic_set(&lio->ifstate, (atomic_read(&lio->ifstate) | state_flag));

}



/**

 * \brief clear interface state

 * @param lio per-network private data

 * @param state_flag flag state to clear

 */

static inline void ifstate_reset(struct lio *lio, int state_flag)

{

	atomic_set(&lio->ifstate, (atomic_read(&lio->ifstate) & ~(state_flag)));

}



#endif