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

Commit f5a20472 authored by Raghu Vatsavayi's avatar Raghu Vatsavayi Committed by David S. Miller
Browse files

liquidio: Support priv flag 



This patch adds support for private flags for the driver.

Signed-off-by: default avatarDerek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: default avatarSatanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: default avatarRaghu Vatsavayi <rvatsavayi@caviumnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 178cc10e

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

+19 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,23 @@ static void lio_get_regs(struct net_device *dev, 
	}

}



static u32 lio_get_priv_flags(struct net_device *netdev)

{

	struct lio *lio = GET_LIO(netdev);



	return lio->oct_dev->priv_flags;

}



static int lio_set_priv_flags(struct net_device *netdev, u32 flags)

{

	struct lio *lio = GET_LIO(netdev);

	bool intr_by_tx_bytes = !!(flags & (0x1 << OCT_PRIV_FLAG_TX_BYTES));



	lio_set_priv_flag(lio->oct_dev, OCT_PRIV_FLAG_TX_BYTES,

			  intr_by_tx_bytes);

	return 0;

}



static const struct ethtool_ops lio_ethtool_ops = {

	.get_settings		= lio_get_settings,

	.get_link		= ethtool_op_get_link,
@@ -1704,6 +1721,8 @@ static const struct ethtool_ops lio_ethtool_ops = { 
	.set_settings		= lio_set_settings,

	.get_coalesce		= lio_get_intr_coalesce,

	.set_coalesce		= lio_set_intr_coalesce,

	.get_priv_flags		= lio_get_priv_flags,

	.set_priv_flags		= lio_set_priv_flags,

	.get_ts_info		= lio_get_ts_info,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -3535,6 +3535,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev) 


		/* Register ethtool support */

		liquidio_set_ethtool_ops(netdev);

		octeon_dev->priv_flags = 0x0;



		if (netdev->features & NETIF_F_LRO)

		liquidio_set_feature(netdev, OCTNET_CMD_LRO_ENABLE,

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

+15 −0
Original line number Diff line number Diff line
@@ -400,6 +400,8 @@ struct octeon_device { 


	struct oct_link_stats link_stats; /*stastics from firmware*/



	/* private flags to control driver-specific features through ethtool */

	u32 priv_flags;

};



#define  OCT_DRV_ONLINE 1
@@ -660,4 +662,17 @@ void *oct_get_config_info(struct octeon_device *oct, u16 card_type); 
 */

struct octeon_config *octeon_get_conf(struct octeon_device *oct);



/* LiquidIO driver pivate flags */

enum {

	OCT_PRIV_FLAG_TX_BYTES = 0, /* Tx interrupts by pending byte count */

};



static inline void lio_set_priv_flag(struct octeon_device *octdev, u32 flag,

				     u32 val)

{

	if (val)

		octdev->priv_flags |= (0x1 << flag);

	else

		octdev->priv_flags &= ~(0x1 << flag);

}

#endif