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

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

cnic: Fix parity error code conflict 



The recently added parity error handling used an error code that was
already defined for a different error.  This could lead to bnx2x
firmware assert.  We need to fix this with new error codes that are
defined for parity error only.

Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Reviewed-by: default avatarEddie Wai <eddie.wai@broadcom.com>
Reviewed-by: default avatarBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ae52890

drivers/net/ethernet/broadcom/cnic.c

+7 −5
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "bnx2x/bnx2x_hsi.h"

#include "../../../scsi/bnx2i/57xx_iscsi_constants.h"

#include "../../../scsi/bnx2i/57xx_iscsi_hsi.h"

#include "../../../scsi/bnx2fc/bnx2fc_constants.h"

#include "cnic.h"

#include "cnic_defs.h"
@@ -2547,7 +2548,7 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe) 
		}

		kcqe.kcqe_op_flag = kcqe_op << KCQE_FLAGS_OPCODE_SHIFT;

		kcqe.kcqe_op_flag |= KCQE_FLAGS_LAYER_MASK_L5_FCOE;

		kcqe.kcqe_info1 = FCOE_KCQE_COMPLETION_STATUS_NIC_ERROR;

		kcqe.kcqe_info1 = FCOE_KCQE_COMPLETION_STATUS_PARITY_ERROR;

		kcqe.kcqe_info2 = cid;

		kcqe.kcqe_info0 = l5_cid;
@@ -2558,7 +2559,7 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe) 


		kcqe.kcqe_op_flag = (opcode + 0x10) << KCQE_FLAGS_OPCODE_SHIFT;

		kcqe.kcqe_op_flag |= KCQE_FLAGS_LAYER_MASK_L5_ISCSI;

		kcqe.kcqe_info1 = ISCSI_KCQE_COMPLETION_STATUS_NIC_ERROR;

		kcqe.kcqe_info1 = ISCSI_KCQE_COMPLETION_STATUS_PARITY_ERR;

		kcqe.kcqe_info2 = cid;

		cnic_get_l5_cid(cp, BNX2X_SW_CID(cid), &kcqe.kcqe_info0);
@@ -2577,7 +2578,7 @@ static void cnic_bnx2x_kwqe_err(struct cnic_dev *dev, struct kwqe *kwqe) 


		kcqe.kcqe_op_flag = (kcqe_op << KCQE_FLAGS_OPCODE_SHIFT) |

				    KCQE_FLAGS_LAYER_MASK_L4;

		l4kcqe->status = L4_KCQE_COMPLETION_STATUS_NIC_ERROR;

		l4kcqe->status = L4_KCQE_COMPLETION_STATUS_PARITY_ERROR;

		l4kcqe->cid = cid;

		cnic_get_l5_cid(cp, BNX2X_SW_CID(cid), &l4kcqe->conn_id);

	} else {
@@ -3933,7 +3934,8 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe) 
	case L4_KCQE_OPCODE_VALUE_CONNECT_COMPLETE:

		if (l4kcqe->status == 0)

			set_bit(SK_F_OFFLD_COMPLETE, &csk->flags);

		else if (l4kcqe->status == L4_KCQE_COMPLETION_STATUS_NIC_ERROR)

		else if (l4kcqe->status ==

			 L4_KCQE_COMPLETION_STATUS_PARITY_ERROR)

			set_bit(SK_F_HW_ERR, &csk->flags);



		smp_mb__before_clear_bit();
@@ -3946,7 +3948,7 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe) 
	case L4_KCQE_OPCODE_VALUE_RESET_COMP:

	case L5CM_RAMROD_CMD_ID_SEARCHER_DELETE:

	case L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD:

		if (l4kcqe->status == L4_KCQE_COMPLETION_STATUS_NIC_ERROR)

		if (l4kcqe->status == L4_KCQE_COMPLETION_STATUS_PARITY_ERROR)

			set_bit(SK_F_HW_ERR, &csk->flags);



		cp->close_conn(csk, opcode);

drivers/net/ethernet/broadcom/cnic_defs.h

+1 −27
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ 
#define L5CM_RAMROD_CMD_ID_SEARCHER_DELETE	(L5CM_RAMROD_CMD_ID_BASE + 14)

#define L5CM_RAMROD_CMD_ID_TERMINATE_OFFLOAD	(L5CM_RAMROD_CMD_ID_BASE + 15)



#define FCOE_KCQE_OPCODE_INIT_FUNC			(0x10)

#define FCOE_KCQE_OPCODE_DESTROY_FUNC			(0x11)

#define FCOE_KCQE_OPCODE_STAT_FUNC			(0x12)

#define FCOE_KCQE_OPCODE_OFFLOAD_CONN			(0x15)

#define FCOE_KCQE_OPCODE_ENABLE_CONN			(0x16)

#define FCOE_KCQE_OPCODE_DISABLE_CONN			(0x17)

#define FCOE_KCQE_OPCODE_DESTROY_CONN			(0x18)

#define FCOE_KCQE_OPCODE_CQ_EVENT_NOTIFICATION  (0x20)

#define FCOE_KCQE_OPCODE_FCOE_ERROR				(0x21)



#define FCOE_RAMROD_CMD_ID_INIT_FUNC		(FCOE_KCQE_OPCODE_INIT_FUNC)

#define FCOE_RAMROD_CMD_ID_DESTROY_FUNC		(FCOE_KCQE_OPCODE_DESTROY_FUNC)

#define FCOE_RAMROD_CMD_ID_STAT_FUNC		(FCOE_KCQE_OPCODE_STAT_FUNC)
@@ -54,23 +44,6 @@ 
#define FCOE_RAMROD_CMD_ID_DESTROY_CONN		(FCOE_KCQE_OPCODE_DESTROY_CONN)

#define FCOE_RAMROD_CMD_ID_TERMINATE_CONN	(0x81)



#define FCOE_KWQE_OPCODE_INIT1                  (0)

#define FCOE_KWQE_OPCODE_INIT2                  (1)

#define FCOE_KWQE_OPCODE_INIT3                  (2)

#define FCOE_KWQE_OPCODE_OFFLOAD_CONN1  (3)

#define FCOE_KWQE_OPCODE_OFFLOAD_CONN2  (4)

#define FCOE_KWQE_OPCODE_OFFLOAD_CONN3  (5)

#define FCOE_KWQE_OPCODE_OFFLOAD_CONN4  (6)

#define FCOE_KWQE_OPCODE_ENABLE_CONN	(7)

#define FCOE_KWQE_OPCODE_DISABLE_CONN	(8)

#define FCOE_KWQE_OPCODE_DESTROY_CONN	(9)

#define FCOE_KWQE_OPCODE_DESTROY		(10)

#define FCOE_KWQE_OPCODE_STAT			(11)



#define FCOE_KCQE_COMPLETION_STATUS_ERROR	(0x1)

#define FCOE_KCQE_COMPLETION_STATUS_CTX_ALLOC_FAILURE	(0x3)

#define FCOE_KCQE_COMPLETION_STATUS_NIC_ERROR	(0x5)



/* KCQ (kernel completion queue) response op codes */

#define L4_KCQE_OPCODE_VALUE_CLOSE_COMP             (53)

#define L4_KCQE_OPCODE_VALUE_RESET_COMP             (54)
@@ -87,6 +60,7 @@ 
/* KCQ (kernel completion queue) completion status */

#define L4_KCQE_COMPLETION_STATUS_SUCCESS           (0)

#define L4_KCQE_COMPLETION_STATUS_NIC_ERROR         (4)

#define L4_KCQE_COMPLETION_STATUS_PARITY_ERROR	    (0x81)

#define L4_KCQE_COMPLETION_STATUS_TIMEOUT           (0x93)



#define L4_KCQE_COMPLETION_STATUS_CTX_ALLOC_FAIL    (0x83)

drivers/net/ethernet/broadcom/cnic_if.h

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

#define CNIC_IF_H



#define CNIC_MODULE_VERSION	"2.5.9"

#define CNIC_MODULE_RELDATE	"Feb 8, 2012"

#define CNIC_MODULE_VERSION	"2.5.10"

#define CNIC_MODULE_RELDATE	"March 21, 2012"



#define CNIC_ULP_RDMA		0

#define CNIC_ULP_ISCSI		1

drivers/scsi/bnx2fc/bnx2fc_constants.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define FCOE_KCQE_COMPLETION_STATUS_CTX_FREE_FAILURE	(0x4)

#define FCOE_KCQE_COMPLETION_STATUS_NIC_ERROR			(0x5)

#define FCOE_KCQE_COMPLETION_STATUS_WRONG_HSI_VERSION   (0x6)

#define FCOE_KCQE_COMPLETION_STATUS_PARITY_ERROR	(0x81)



/* CQE type */

#define FCOE_PENDING_CQE_TYPE			0

drivers/scsi/bnx2i/57xx_iscsi_constants.h

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ 
#define ISCSI_KCQE_COMPLETION_STATUS_LOM_ISCSI_NOT_ENABLED              (0x51)



#define ISCSI_KCQE_COMPLETION_STATUS_CID_BUSY				(0x80)

#define ISCSI_KCQE_COMPLETION_STATUS_PARITY_ERR                         (0x81)



/* SQ/RQ/CQ DB structure sizes */

#define ISCSI_SQ_DB_SIZE    (16)