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

Commit b0844444 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by David S. Miller
Browse files

net/mlx5_core: Introduce access function to read internal timer 



A preparation step which adds support for reading the hardware
internal timer and the hardware timestamping from the CQE.
In addition, advertize device_frequency_khz HCA capability.

Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 34802a42

drivers/net/ethernet/mellanox/mlx5/core/main.c

+13 −0
Original line number Diff line number Diff line
@@ -504,6 +504,19 @@ int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id) 
	return mlx5_cmd_status_to_err_v2(out);

}



cycle_t mlx5_read_internal_timer(struct mlx5_core_dev *dev)

{

	u32 timer_h, timer_h1, timer_l;



	timer_h = ioread32be(&dev->iseg->internal_timer_h);

	timer_l = ioread32be(&dev->iseg->internal_timer_l);

	timer_h1 = ioread32be(&dev->iseg->internal_timer_h);

	if (timer_h != timer_h1) /* wrap around */

		timer_l = ioread32be(&dev->iseg->internal_timer_l);



	return (cycle_t)timer_l | (cycle_t)timer_h1 << 32;

}



static int mlx5_irq_set_affinity_hint(struct mlx5_core_dev *mdev, int i)

{

	struct mlx5_priv *priv  = &mdev->priv;

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ int mlx5_core_sriov_configure(struct pci_dev *dev, int num_vfs); 
int mlx5_core_enable_hca(struct mlx5_core_dev *dev, u16 func_id);

int mlx5_core_disable_hca(struct mlx5_core_dev *dev, u16 func_id);

int mlx5_wait_for_vf_pages(struct mlx5_core_dev *dev);

cycle_t mlx5_read_internal_timer(struct mlx5_core_dev *dev);



void mlx5e_init(void);

void mlx5e_cleanup(void);

include/linux/mlx5/device.h

+17 −3
Original line number Diff line number Diff line
@@ -443,9 +443,12 @@ struct mlx5_init_seg { 
	__be32			rsvd1[120];

	__be32			initializing;

	struct health_buffer	health;

	__be32			rsvd2[884];

	__be32			rsvd2[880];

	__be32			internal_timer_h;

	__be32			internal_timer_l;

	__be32			rsrv3[2];

	__be32			health_counter;

	__be32			rsvd3[1019];

	__be32			rsvd4[1019];

	__be64			ieee1588_clk;

	__be32			ieee1588_clk_type;

	__be32			clr_intx;
@@ -601,7 +604,8 @@ struct mlx5_cqe64 { 
	__be32		imm_inval_pkey;

	u8		rsvd40[4];

	__be32		byte_cnt;

	__be64		timestamp;

	__be32		timestamp_h;

	__be32		timestamp_l;

	__be32		sop_drop_qpn;

	__be16		wqe_counter;

	u8		signature;
@@ -623,6 +627,16 @@ static inline int cqe_has_vlan(struct mlx5_cqe64 *cqe) 
	return !!(cqe->l4_hdr_type_etc & 0x1);

}



static inline u64 get_cqe_ts(struct mlx5_cqe64 *cqe)

{

	u32 hi, lo;



	hi = be32_to_cpu(cqe->timestamp_h);

	lo = be32_to_cpu(cqe->timestamp_l);



	return (u64)lo | ((u64)hi << 32);

}



enum {

	CQE_L4_HDR_TYPE_NONE			= 0x0,

	CQE_L4_HDR_TYPE_TCP_NO_ACK		= 0x1,

include/linux/mlx5/mlx5_ifc.h

+3 −3
Original line number Diff line number Diff line
@@ -829,9 +829,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { 
	u8         reserved_66[0x8];

	u8         log_uar_page_sz[0x10];



	u8         reserved_67[0xe0];



	u8         reserved_68[0x1f];

	u8         reserved_67[0x40];

	u8         device_frequency_khz[0x20];

	u8         reserved_68[0x5f];

	u8         cqe_zip[0x1];



	u8         cqe_zip_timeout[0x10];