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

Commit becf46a0 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: cleanup superfluous multi-context code 



MAX_RCV_CTX was set to 1, there's only rx context per
PCI function.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9f5bc7f1

drivers/net/netxen/netxen_nic.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -1280,7 +1280,7 @@ struct netxen_adapter { 
	 * Receive instances. These can be either one per port,

	 * Receive instances. These can be either one per port,

	 * or one per peg, etc.

	 * or one per peg, etc.

	 */

	 */

	struct netxen_recv_context recv_ctx[MAX_RCV_CTX];

	struct netxen_recv_context recv_ctx;





	int is_up;

	int is_up;

	struct netxen_dummy_dma dummy_dma;

	struct netxen_dummy_dma dummy_dma;
@@ -1464,10 +1464,9 @@ void netxen_initialize_adapter_ops(struct netxen_adapter *adapter); 
int netxen_init_firmware(struct netxen_adapter *adapter);

int netxen_init_firmware(struct netxen_adapter *adapter);

void netxen_nic_clear_stats(struct netxen_adapter *adapter);

void netxen_nic_clear_stats(struct netxen_adapter *adapter);

void netxen_watchdog_task(struct work_struct *work);

void netxen_watchdog_task(struct work_struct *work);

void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx,

void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid);

			    u32 ringid);

int netxen_process_cmd_ring(struct netxen_adapter *adapter);

int netxen_process_cmd_ring(struct netxen_adapter *adapter);

u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);

int netxen_process_rcv_ring(struct netxen_adapter *adapter, int max);

void netxen_p2_nic_set_multi(struct net_device *netdev);

void netxen_p2_nic_set_multi(struct net_device *netdev);

void netxen_p3_nic_set_multi(struct net_device *netdev);

void netxen_p3_nic_set_multi(struct net_device *netdev);

void netxen_p3_free_mac_list(struct netxen_adapter *adapter);

void netxen_p3_free_mac_list(struct netxen_adapter *adapter);

drivers/net/netxen/netxen_nic_ctx.c

+62 −68
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ int 
nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu)

nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu)

{

{

	u32 rcode = NX_RCODE_SUCCESS;

	u32 rcode = NX_RCODE_SUCCESS;

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx[0];

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;





	if (recv_ctx->state == NX_HOST_CTX_STATE_ACTIVE)

	if (recv_ctx->state == NX_HOST_CTX_STATE_ACTIVE)

		rcode = netxen_issue_cmd(adapter,

		rcode = netxen_issue_cmd(adapter,
@@ -179,7 +179,7 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter) 




	int err;

	int err;





	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx[0];

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;





	/* only one sds ring for now */

	/* only one sds ring for now */

	nrds_rings = adapter->max_rds_rings;

	nrds_rings = adapter->max_rds_rings;
@@ -292,7 +292,7 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter) 
static void

static void

nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter)

nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter)

{

{

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx[0];

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;





	if (netxen_issue_cmd(adapter,

	if (netxen_issue_cmd(adapter,

			adapter->ahw.pci_func,

			adapter->ahw.pci_func,
@@ -488,7 +488,7 @@ netxen_init_old_ctx(struct netxen_adapter *adapter) 
{

{

	struct netxen_recv_context *recv_ctx;

	struct netxen_recv_context *recv_ctx;

	struct nx_host_rds_ring *rds_ring;

	struct nx_host_rds_ring *rds_ring;

	int ctx, ring;

	int ring;

	int func_id = adapter->portnum;

	int func_id = adapter->portnum;





	adapter->ctx_desc->cmd_ring_addr =

	adapter->ctx_desc->cmd_ring_addr =
@@ -496,8 +496,7 @@ netxen_init_old_ctx(struct netxen_adapter *adapter) 
	adapter->ctx_desc->cmd_ring_size =

	adapter->ctx_desc->cmd_ring_size =

		cpu_to_le32(adapter->max_tx_desc_count);

		cpu_to_le32(adapter->max_tx_desc_count);





	for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {

	recv_ctx = &adapter->recv_ctx;

		recv_ctx = &adapter->recv_ctx[ctx];





	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

		rds_ring = &recv_ctx->rds_rings[ring];

		rds_ring = &recv_ctx->rds_rings[ring];
@@ -511,7 +510,6 @@ netxen_init_old_ctx(struct netxen_adapter *adapter) 
		cpu_to_le64(recv_ctx->rcv_status_desc_phys_addr);

		cpu_to_le64(recv_ctx->rcv_status_desc_phys_addr);

	adapter->ctx_desc->sts_ring_size =

	adapter->ctx_desc->sts_ring_size =

		cpu_to_le32(adapter->max_rx_desc_count);

		cpu_to_le32(adapter->max_rx_desc_count);

	}





	adapter->pci_write_normalize(adapter, CRB_CTX_ADDR_REG_LO(func_id),

	adapter->pci_write_normalize(adapter, CRB_CTX_ADDR_REG_LO(func_id),

			lower32(adapter->ctx_desc_phys_addr));

			lower32(adapter->ctx_desc_phys_addr));
@@ -533,7 +531,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) 
	u32 state = 0;

	u32 state = 0;

	void *addr;

	void *addr;

	int err = 0;

	int err = 0;

	int ctx, ring;

	int ring;

	struct netxen_recv_context *recv_ctx;

	struct netxen_recv_context *recv_ctx;

	struct nx_host_rds_ring *rds_ring;

	struct nx_host_rds_ring *rds_ring;
@@ -575,8 +573,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) 




	hw->cmd_desc_head = (struct cmd_desc_type0 *)addr;

	hw->cmd_desc_head = (struct cmd_desc_type0 *)addr;





	for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {

	recv_ctx = &adapter->recv_ctx;

		recv_ctx = &adapter->recv_ctx[ctx];





	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

		/* rx desc ring */

		/* rx desc ring */
@@ -615,7 +612,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter) 
		recv_ctx->crb_sts_consumer =

		recv_ctx->crb_sts_consumer =

			recv_crb_registers[adapter->portnum].

			recv_crb_registers[adapter->portnum].

			crb_sts_consumer;

			crb_sts_consumer;

	}





	if (adapter->fw_major >= 4) {

	if (adapter->fw_major >= 4) {

		adapter->intr_scheme = INTR_SCHEME_PERPORT;

		adapter->intr_scheme = INTR_SCHEME_PERPORT;
@@ -654,7 +650,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter) 
{

{

	struct netxen_recv_context *recv_ctx;

	struct netxen_recv_context *recv_ctx;

	struct nx_host_rds_ring *rds_ring;

	struct nx_host_rds_ring *rds_ring;

	int ctx, ring;

	int ring;





	if (adapter->fw_major >= 4) {

	if (adapter->fw_major >= 4) {

		nx_fw_cmd_destroy_tx_ctx(adapter);

		nx_fw_cmd_destroy_tx_ctx(adapter);
@@ -679,8 +675,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter) 
		adapter->ahw.cmd_desc_head = NULL;

		adapter->ahw.cmd_desc_head = NULL;

	}

	}





	for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {

	recv_ctx = &adapter->recv_ctx;

		recv_ctx = &adapter->recv_ctx[ctx];

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

		rds_ring = &recv_ctx->rds_rings[ring];

		rds_ring = &recv_ctx->rds_rings[ring];
@@ -701,5 +696,4 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter) 
		recv_ctx->rcv_status_desc_head = NULL;

		recv_ctx->rcv_status_desc_head = NULL;

	}

	}

}

}

}

drivers/net/netxen/netxen_nic_ethtool.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -474,16 +474,13 @@ static void 
netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)

netxen_nic_get_ringparam(struct net_device *dev, struct ethtool_ringparam *ring)

{

{

	struct netxen_adapter *adapter = netdev_priv(dev);

	struct netxen_adapter *adapter = netdev_priv(dev);

	int i;





	ring->rx_pending = 0;

	ring->rx_pending = 0;

	ring->rx_jumbo_pending = 0;

	ring->rx_jumbo_pending = 0;

	for (i = 0; i < MAX_RCV_CTX; ++i) {

	ring->rx_pending += adapter->recv_ctx.

		ring->rx_pending += adapter->recv_ctx[i].

		rds_rings[RCV_DESC_NORMAL_CTXID].max_rx_desc_count;

		rds_rings[RCV_DESC_NORMAL_CTXID].max_rx_desc_count;

		ring->rx_jumbo_pending += adapter->recv_ctx[i].

	ring->rx_jumbo_pending += adapter->recv_ctx.

		rds_rings[RCV_DESC_JUMBO_CTXID].max_rx_desc_count;

		rds_rings[RCV_DESC_JUMBO_CTXID].max_rx_desc_count;

	}

	ring->tx_pending = adapter->max_tx_desc_count;

	ring->tx_pending = adapter->max_tx_desc_count;





	if (adapter->ahw.board_type == NETXEN_NIC_GBE)

	if (adapter->ahw.board_type == NETXEN_NIC_GBE)

drivers/net/netxen/netxen_nic_hdr.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -363,12 +363,6 @@ enum { 
#define NETXEN_HW_CRB_HUB_AGT_ADR_LPC	\

#define NETXEN_HW_CRB_HUB_AGT_ADR_LPC	\

	((NETXEN_HW_H6_CH_HUB_ADR << 7) | NETXEN_HW_LPC_CRB_AGT_ADR)

	((NETXEN_HW_H6_CH_HUB_ADR << 7) | NETXEN_HW_LPC_CRB_AGT_ADR)





/*

 * MAX_RCV_CTX : The number of receive contexts that are available on

 * the phantom.

 */

#define MAX_RCV_CTX			1



#define NETXEN_SRE_INT_STATUS		(NETXEN_CRB_SRE + 0x00034)

#define NETXEN_SRE_INT_STATUS		(NETXEN_CRB_SRE + 0x00034)

#define NETXEN_SRE_PBI_ACTIVE_STATUS	(NETXEN_CRB_SRE + 0x01014)

#define NETXEN_SRE_PBI_ACTIVE_STATUS	(NETXEN_CRB_SRE + 0x01014)

#define NETXEN_SRE_L1RE_CTL		(NETXEN_CRB_SRE + 0x03000)

#define NETXEN_SRE_L1RE_CTL		(NETXEN_CRB_SRE + 0x03000)

drivers/net/netxen/netxen_nic_init.c

+103 −110
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ static unsigned int crb_addr_xform[NETXEN_MAX_CRB_XFORM]; 




#define NETXEN_NIC_XDMA_RESET 0x8000ff

#define NETXEN_NIC_XDMA_RESET 0x8000ff





static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,

static void

					uint32_t ctx, uint32_t ringid);

netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ringid);





static void crb_addr_transform_setup(void)

static void crb_addr_transform_setup(void)

{

{
@@ -148,10 +148,9 @@ void netxen_release_rx_buffers(struct netxen_adapter *adapter) 
	struct netxen_recv_context *recv_ctx;

	struct netxen_recv_context *recv_ctx;

	struct nx_host_rds_ring *rds_ring;

	struct nx_host_rds_ring *rds_ring;

	struct netxen_rx_buffer *rx_buf;

	struct netxen_rx_buffer *rx_buf;

	int i, ctxid, ring;

	int i, ring;





	for (ctxid = 0; ctxid < MAX_RCV_CTX; ++ctxid) {

	recv_ctx = &adapter->recv_ctx;

		recv_ctx = &adapter->recv_ctx[ctxid];

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

		rds_ring = &recv_ctx->rds_rings[ring];

		rds_ring = &recv_ctx->rds_rings[ring];

		for (i = 0; i < rds_ring->max_rx_desc_count; ++i) {

		for (i = 0; i < rds_ring->max_rx_desc_count; ++i) {
@@ -167,7 +166,6 @@ void netxen_release_rx_buffers(struct netxen_adapter *adapter) 
		}

		}

	}

	}

}

}

}





void netxen_release_tx_buffers(struct netxen_adapter *adapter)

void netxen_release_tx_buffers(struct netxen_adapter *adapter)

{

{
@@ -205,10 +203,9 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter) 
{

{

	struct netxen_recv_context *recv_ctx;

	struct netxen_recv_context *recv_ctx;

	struct nx_host_rds_ring *rds_ring;

	struct nx_host_rds_ring *rds_ring;

	int ctx, ring;

	int ring;





	for (ctx = 0; ctx < MAX_RCV_CTX; ctx++) {

	recv_ctx = &adapter->recv_ctx;

		recv_ctx = &adapter->recv_ctx[ctx];

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

		rds_ring = &recv_ctx->rds_rings[ring];

		rds_ring = &recv_ctx->rds_rings[ring];

		if (rds_ring->rx_buf_arr) {

		if (rds_ring->rx_buf_arr) {
@@ -216,7 +213,7 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter) 
			rds_ring->rx_buf_arr = NULL;

			rds_ring->rx_buf_arr = NULL;

		}

		}

	}

	}

	}



	if (adapter->cmd_buf_arr)

	if (adapter->cmd_buf_arr)

		vfree(adapter->cmd_buf_arr);

		vfree(adapter->cmd_buf_arr);

	return;

	return;
@@ -227,7 +224,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) 
	struct netxen_recv_context *recv_ctx;

	struct netxen_recv_context *recv_ctx;

	struct nx_host_rds_ring *rds_ring;

	struct nx_host_rds_ring *rds_ring;

	struct netxen_rx_buffer *rx_buf;

	struct netxen_rx_buffer *rx_buf;

	int ctx, ring, i, num_rx_bufs;

	int ring, i, num_rx_bufs;





	struct netxen_cmd_buffer *cmd_buf_arr;

	struct netxen_cmd_buffer *cmd_buf_arr;

	struct net_device *netdev = adapter->netdev;

	struct net_device *netdev = adapter->netdev;
@@ -241,8 +238,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) 
	memset(cmd_buf_arr, 0, TX_RINGSIZE);

	memset(cmd_buf_arr, 0, TX_RINGSIZE);

	adapter->cmd_buf_arr = cmd_buf_arr;

	adapter->cmd_buf_arr = cmd_buf_arr;





	for (ctx = 0; ctx < MAX_RCV_CTX; ctx++) {

	recv_ctx = &adapter->recv_ctx;

		recv_ctx = &adapter->recv_ctx[ctx];

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

	for (ring = 0; ring < adapter->max_rds_rings; ring++) {

		rds_ring = &recv_ctx->rds_rings[ring];

		rds_ring = &recv_ctx->rds_rings[ring];

		switch (RCV_DESC_TYPE(ring)) {

		switch (RCV_DESC_TYPE(ring)) {
@@ -310,7 +306,6 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter) 
			rx_buf++;

			rx_buf++;

		}

		}

	}

	}

	}





	return 0;

	return 0;
@@ -838,13 +833,13 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter, 
	return skb;

	return skb;

}

}





static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,

static void netxen_process_rcv(struct netxen_adapter *adapter,

		struct status_desc *desc)

		struct status_desc *desc)

{

{

	struct net_device *netdev = adapter->netdev;

	struct net_device *netdev = adapter->netdev;

	u64 sts_data = le64_to_cpu(desc->status_desc_data);

	u64 sts_data = le64_to_cpu(desc->status_desc_data);

	int index = netxen_get_sts_refhandle(sts_data);

	int index = netxen_get_sts_refhandle(sts_data);

	struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;

	struct netxen_rx_buffer *buffer;

	struct netxen_rx_buffer *buffer;

	struct sk_buff *skb;

	struct sk_buff *skb;

	u32 length = netxen_get_sts_totallength(sts_data);

	u32 length = netxen_get_sts_totallength(sts_data);
@@ -902,10 +897,10 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid, 
	adapter->stats.rxbytes += length;

	adapter->stats.rxbytes += length;

}

}





/* Process Receive status ring */

int

u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)

netxen_process_rcv_ring(struct netxen_adapter *adapter, int max)

{

{

	struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctxid]);

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;

	struct status_desc *desc_head = recv_ctx->rcv_status_desc_head;

	struct status_desc *desc_head = recv_ctx->rcv_status_desc_head;

	struct status_desc *desc;

	struct status_desc *desc;

	u32 consumer = recv_ctx->status_rx_consumer;

	u32 consumer = recv_ctx->status_rx_consumer;
@@ -922,7 +917,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) 




		opcode = netxen_get_sts_opcode(sts_data);

		opcode = netxen_get_sts_opcode(sts_data);





		netxen_process_rcv(adapter, ctxid, desc);

		netxen_process_rcv(adapter, desc);





		desc->status_desc_data = cpu_to_le64(STATUS_OWNER_PHANTOM);

		desc->status_desc_data = cpu_to_le64(STATUS_OWNER_PHANTOM);
@@ -932,7 +927,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max) 
	}

	}





	for (ring = 0; ring < adapter->max_rds_rings; ring++)

	for (ring = 0; ring < adapter->max_rds_rings; ring++)

		netxen_post_rx_buffers_nodb(adapter, ctxid, ring);

		netxen_post_rx_buffers_nodb(adapter, ring);





	if (count) {

	if (count) {

		recv_ctx->status_rx_consumer = consumer;

		recv_ctx->status_rx_consumer = consumer;
@@ -1013,14 +1008,12 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter) 
	return (done);

	return (done);

}

}





/*

void

 * netxen_post_rx_buffers puts buffer in the Phantom memory

netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid)

 */

void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)

{

{

	struct pci_dev *pdev = adapter->pdev;

	struct pci_dev *pdev = adapter->pdev;

	struct sk_buff *skb;

	struct sk_buff *skb;

	struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;

	struct nx_host_rds_ring *rds_ring = NULL;

	struct nx_host_rds_ring *rds_ring = NULL;

	uint producer;

	uint producer;

	struct rcv_desc *pdesc;

	struct rcv_desc *pdesc;
@@ -1098,12 +1091,12 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid) 
	}

	}

}

}





static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,

static void

					uint32_t ctx, uint32_t ringid)

netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ringid)

{

{

	struct pci_dev *pdev = adapter->pdev;

	struct pci_dev *pdev = adapter->pdev;

	struct sk_buff *skb;

	struct sk_buff *skb;

	struct netxen_recv_context *recv_ctx = &(adapter->recv_ctx[ctx]);

	struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;

	struct nx_host_rds_ring *rds_ring = NULL;

	struct nx_host_rds_ring *rds_ring = NULL;

	u32 producer;

	u32 producer;

	struct rcv_desc *pdesc;

	struct rcv_desc *pdesc;