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

Commit c4ee5d81 authored by Prasad Kanneganti's avatar Prasad Kanneganti Committed by David S. Miller
Browse files

liquidio: replace info-pointer mode with buffer-pointer-only mode 



Each Octeon output ring can DMA packets to host memory in two modes:  info-
pointer mode and buffer-pointer-only mode.  In info-pointer mode, Octeon
takes two buffer pointers for each packet and places the length of the
packet along with specified number of bytes from the beginning of the
packet into one buffer and the rest of the packet in a separate buffer.  In
buffer-pointer-only mode, Octeon takes single buffer pointer and places the
length of the packet at the beginning of the buffer followed by the packet
data.

This patch switches all Octeon output rings from info-pointer mode to
buffer-pointer-only mode.  This results in fewer DMA setups and cache line
snoops.

Signed-off-by: default avatarPrasad Kanneganti <pkanneganti@cavium.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@cavium.com>
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 47b3e2f7

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

+4 −6
Original line number Diff line number Diff line
@@ -493,9 +493,8 @@ static void cn23xx_pf_setup_global_output_regs(struct octeon_device *oct) 
	for (q_no = srn; q_no < ern; q_no++) {

		reg_val = octeon_read_csr(oct, CN23XX_SLI_OQ_PKT_CONTROL(q_no));



		/* set IPTR & DPTR */

		reg_val |=

		    (CN23XX_PKT_OUTPUT_CTL_IPTR | CN23XX_PKT_OUTPUT_CTL_DPTR);

		/* set DPTR */

		reg_val |= CN23XX_PKT_OUTPUT_CTL_DPTR;



		/* reset BMODE */

		reg_val &= ~(CN23XX_PKT_OUTPUT_CTL_BMODE);
@@ -638,7 +637,7 @@ static void cn23xx_setup_oq_regs(struct octeon_device *oct, u32 oq_no) 
	octeon_write_csr(oct, CN23XX_SLI_OQ_SIZE(oq_no), droq->max_count);



	octeon_write_csr(oct, CN23XX_SLI_OQ_BUFF_INFO_SIZE(oq_no),

			 (droq->buffer_size | (OCT_RH_SIZE << 16)));

			 droq->buffer_size);



	/* Get the mapped address of the pkt_sent and pkts_credit regs */

	droq->pkts_sent_reg =
@@ -1343,8 +1342,7 @@ int validate_cn23xx_pf_config_info(struct octeon_device *oct, 
		return 1;

	}



	if (!(CFG_GET_OQ_INFO_PTR(conf23xx)) ||

	    !(CFG_GET_OQ_REFILL_THRESHOLD(conf23xx))) {

	if (!CFG_GET_OQ_REFILL_THRESHOLD(conf23xx)) {

		dev_err(&oct->pci_dev->dev, "%s: Invalid parameter for OQ\n",

			__func__);

		return 1;

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

+3 −4
Original line number Diff line number Diff line
@@ -165,9 +165,8 @@ static void cn23xx_vf_setup_global_output_regs(struct octeon_device *oct) 
		reg_val =

		    octeon_read_csr(oct, CN23XX_VF_SLI_OQ_PKT_CONTROL(q_no));



		/* set IPTR & DPTR */

		reg_val |=

		    (CN23XX_PKT_OUTPUT_CTL_IPTR | CN23XX_PKT_OUTPUT_CTL_DPTR);

		/* set DPTR */

		reg_val |= CN23XX_PKT_OUTPUT_CTL_DPTR;



		/* reset BMODE */

		reg_val &= ~(CN23XX_PKT_OUTPUT_CTL_BMODE);
@@ -249,7 +248,7 @@ static void cn23xx_setup_vf_oq_regs(struct octeon_device *oct, u32 oq_no) 
	octeon_write_csr(oct, CN23XX_VF_SLI_OQ_SIZE(oq_no), droq->max_count);



	octeon_write_csr(oct, CN23XX_VF_SLI_OQ_BUFF_INFO_SIZE(oq_no),

			 (droq->buffer_size | (OCT_RH_SIZE << 16)));

			 droq->buffer_size);



	/* Get the mapped address of the pkt_sent and pkts_credit regs */

	droq->pkts_sent_reg =

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

+2 −6
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ void lio_cn6xxx_setup_global_output_regs(struct octeon_device *oct) 
		octeon_write_csr64(oct, CN6XXX_SLI_OQ_WMARK, 0);

	}



	/* / Select Info Ptr for length & data */

	octeon_write_csr(oct, CN6XXX_SLI_PKT_IPTR, 0xFFFFFFFF);



	/* / Select Packet count instead of bytes for SLI_PKTi_CNTS[CNT] */

	octeon_write_csr(oct, CN6XXX_SLI_PKT_OUT_BMODE, 0);
@@ -314,7 +311,7 @@ void lio_cn6xxx_setup_oq_regs(struct octeon_device *oct, u32 oq_no) 
	octeon_write_csr(oct, CN6XXX_SLI_OQ_SIZE(oq_no), droq->max_count);



	octeon_write_csr(oct, CN6XXX_SLI_OQ_BUFF_INFO_SIZE(oq_no),

			 (droq->buffer_size | (OCT_RH_SIZE << 16)));

			 droq->buffer_size);



	/* Get the mapped address of the pkt_sent and pkts_credit regs */

	droq->pkts_sent_reg =
@@ -734,8 +731,7 @@ int lio_validate_cn6xxx_config_info(struct octeon_device *oct, 
			__func__);

		return 1;

	}

	if (!(CFG_GET_OQ_INFO_PTR(conf6xxx)) ||

	    !(CFG_GET_OQ_REFILL_THRESHOLD(conf6xxx))) {

	if (!CFG_GET_OQ_REFILL_THRESHOLD(conf6xxx)) {

		dev_err(&oct->pci_dev->dev, "%s: Invalid parameter for OQ\n",

			__func__);

		return 1;

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

+4 −3
Original line number Diff line number Diff line
@@ -3899,7 +3899,7 @@ static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf) 
	union oct_link_status *ls;

	int i;



	if (recv_pkt->buffer_size[0] != sizeof(*ls)) {

	if (recv_pkt->buffer_size[0] != (sizeof(*ls) + OCT_DROQ_INFO_SIZE)) {

		dev_err(&oct->pci_dev->dev, "Malformed NIC_INFO, len=%d, ifidx=%d\n",

			recv_pkt->buffer_size[0],

			recv_pkt->rh.r_nic_info.gmxport);
@@ -3907,7 +3907,8 @@ static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf) 
	}



	gmxport = recv_pkt->rh.r_nic_info.gmxport;

	ls = (union oct_link_status *)get_rbd(recv_pkt->buffer_ptr[0]);

	ls = (union oct_link_status *)(get_rbd(recv_pkt->buffer_ptr[0]) +

		OCT_DROQ_INFO_SIZE);



	octeon_swap_8B_data((u64 *)ls, (sizeof(union oct_link_status)) >> 3);

	for (i = 0; i < oct->ifcount; i++) {
@@ -4465,7 +4466,7 @@ octeon_recv_vf_drv_notice(struct octeon_recv_info *recv_info, void *buf) 
	u64 *data, vf_num;



	notice = recv_pkt->rh.r.ossp;

	data = (u64 *)get_rbd(recv_pkt->buffer_ptr[0]);

	data = (u64 *)(get_rbd(recv_pkt->buffer_ptr[0]) + OCT_DROQ_INFO_SIZE);



	/* the first 64-bit word of data is the vf_num */

	vf_num = data[0];

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

+3 −2
Original line number Diff line number Diff line
@@ -2718,7 +2718,7 @@ static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf) 
	int gmxport = 0;

	int i;



	if (recv_pkt->buffer_size[0] != sizeof(*ls)) {

	if (recv_pkt->buffer_size[0] != (sizeof(*ls) + OCT_DROQ_INFO_SIZE)) {

		dev_err(&oct->pci_dev->dev, "Malformed NIC_INFO, len=%d, ifidx=%d\n",

			recv_pkt->buffer_size[0],

			recv_pkt->rh.r_nic_info.gmxport);
@@ -2726,7 +2726,8 @@ static int lio_nic_info(struct octeon_recv_info *recv_info, void *buf) 
	}



	gmxport = recv_pkt->rh.r_nic_info.gmxport;

	ls = (union oct_link_status *)get_rbd(recv_pkt->buffer_ptr[0]);

	ls = (union oct_link_status *)(get_rbd(recv_pkt->buffer_ptr[0]) +

		OCT_DROQ_INFO_SIZE);



	octeon_swap_8B_data((u64 *)ls, (sizeof(union oct_link_status)) >> 3);