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

Commit b58ffb41 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

cnic: Fix context memory init. on 5709. 



We need to zero context memory on 5709 in the function cnic_init_context().
Without this, iscsid restart on 5709 will not work because of stale data.
TX context blocks should not be initialized by cnic_init_context() because
of the special remapping on 5709.

Update version to 2.1.2.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17d95640

drivers/net/cnic.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -3367,13 +3367,9 @@ static int cnic_cm_shutdown(struct cnic_dev *dev) 




static void cnic_init_context(struct cnic_dev *dev, u32 cid)

static void cnic_init_context(struct cnic_dev *dev, u32 cid)

{

{

	struct cnic_local *cp = dev->cnic_priv;

	u32 cid_addr;

	u32 cid_addr;

	int i;

	int i;





	if (CHIP_NUM(cp) == CHIP_NUM_5709)

		return;



	cid_addr = GET_CID_ADDR(cid);

	cid_addr = GET_CID_ADDR(cid);





	for (i = 0; i < CTX_SIZE; i += 4)

	for (i = 0; i < CTX_SIZE; i += 4)
@@ -3530,14 +3526,11 @@ static void cnic_init_bnx2_tx_ring(struct cnic_dev *dev) 




	sb_id = cp->status_blk_num;

	sb_id = cp->status_blk_num;

	tx_cid = 20;

	tx_cid = 20;

	cnic_init_context(dev, tx_cid);

	cnic_init_context(dev, tx_cid + 1);

	cp->tx_cons_ptr = &s_blk->status_tx_quick_consumer_index2;

	cp->tx_cons_ptr = &s_blk->status_tx_quick_consumer_index2;

	if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {

	if (ethdev->drv_state & CNIC_DRV_STATE_USING_MSIX) {

		struct status_block_msix *sblk = cp->status_blk.bnx2;

		struct status_block_msix *sblk = cp->status_blk.bnx2;





		tx_cid = TX_TSS_CID + sb_id - 1;

		tx_cid = TX_TSS_CID + sb_id - 1;

		cnic_init_context(dev, tx_cid);

		CNIC_WR(dev, BNX2_TSCH_TSS_CFG, (sb_id << 24) |

		CNIC_WR(dev, BNX2_TSCH_TSS_CFG, (sb_id << 24) |

			(TX_TSS_CID << 7));

			(TX_TSS_CID << 7));

		cp->tx_cons_ptr = &sblk->status_tx_quick_consumer_index;

		cp->tx_cons_ptr = &sblk->status_tx_quick_consumer_index;
@@ -3556,6 +3549,9 @@ static void cnic_init_bnx2_tx_ring(struct cnic_dev *dev) 
		offset2 = BNX2_L2CTX_TBDR_BHADDR_HI_XI;

		offset2 = BNX2_L2CTX_TBDR_BHADDR_HI_XI;

		offset3 = BNX2_L2CTX_TBDR_BHADDR_LO_XI;

		offset3 = BNX2_L2CTX_TBDR_BHADDR_LO_XI;

	} else {

	} else {

		cnic_init_context(dev, tx_cid);

		cnic_init_context(dev, tx_cid + 1);



		offset0 = BNX2_L2CTX_TYPE;

		offset0 = BNX2_L2CTX_TYPE;

		offset1 = BNX2_L2CTX_CMD_TYPE;

		offset1 = BNX2_L2CTX_CMD_TYPE;

		offset2 = BNX2_L2CTX_TBDR_BHADDR_HI;

		offset2 = BNX2_L2CTX_TBDR_BHADDR_HI;

drivers/net/cnic_if.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -12,8 +12,8 @@ 
#ifndef CNIC_IF_H

#ifndef CNIC_IF_H

#define CNIC_IF_H

#define CNIC_IF_H





#define CNIC_MODULE_VERSION	"2.1.1"

#define CNIC_MODULE_VERSION	"2.1.2"

#define CNIC_MODULE_RELDATE	"Feb 22, 2010"

#define CNIC_MODULE_RELDATE	"May 26, 2010"





#define CNIC_ULP_RDMA		0

#define CNIC_ULP_RDMA		0

#define CNIC_ULP_ISCSI		1

#define CNIC_ULP_ISCSI		1