Skip to content

L
linux
Commit 457ff3b7 authored by Jayamohan Kallickal's avatar Jayamohan Kallickal Committed by James Bottomley
Browse files
Options

[SCSI] be2iscsi: Fix warnings from new checkpatch.pl 

The latest checkpatch.pl throws some new warnings. Fixing it
to get rid of a bunch of warnings
Signed-off-by: default avatarJayamohan Kallickal <jayamohank@serverengines.com>
Reviewed-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent bbe56c73
Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 123 deletions
drivers/scsi/be2iscsi/be.h
View file @ 457ff3b7
...@@ -128,8 +128,8 @@ struct be_ctrl_info { ...@@ -128,8 +128,8 @@ struct be_ctrl_info {
#define mcc_timeout 120000 /* 5s timeout */ #define mcc_timeout 120000 /* 5s timeout */
/* Returns number of pages spanned by the data starting at the given addr */ /* Returns number of pages spanned by the data starting at the given addr */
#define PAGES_4K_SPANNED(_address, size) \ #define PAGES_4K_SPANNED(_address, size) \
((u32)((((size_t)(_address) & (PAGE_SIZE_4K - 1)) + \ ((u32)((((size_t)(_address) & (PAGE_SIZE_4K - 1)) + \
(size) + (PAGE_SIZE_4K - 1)) >> PAGE_SHIFT_4K)) (size) + (PAGE_SIZE_4K - 1)) >> PAGE_SHIFT_4K))
/* Byte offset into the page corresponding to given address */ /* Byte offset into the page corresponding to given address */
...@@ -137,7 +137,7 @@ struct be_ctrl_info { ...@@ -137,7 +137,7 @@ struct be_ctrl_info {
((size_t)(addr) & (PAGE_SIZE_4K-1)) ((size_t)(addr) & (PAGE_SIZE_4K-1))
/* Returns bit offset within a DWORD of a bitfield */ /* Returns bit offset within a DWORD of a bitfield */
#define AMAP_BIT_OFFSET(_struct, field) \ #define AMAP_BIT_OFFSET(_struct, field) \
(((size_t)&(((_struct *)0)->field))%32) (((size_t)&(((_struct *)0)->field))%32)
/* Returns the bit mask of the field that is NOT shifted into location. */ /* Returns the bit mask of the field that is NOT shifted into location. */
......
drivers/scsi/be2iscsi/be_cmds.c
View file @ 457ff3b7
...@@ -151,20 +151,20 @@ void beiscsi_async_link_state_process(struct beiscsi_hba *phba, ...@@ -151,20 +151,20 @@ void beiscsi_async_link_state_process(struct beiscsi_hba *phba,
{ {
switch (evt->port_link_status) { switch (evt->port_link_status) {
case ASYNC_EVENT_LINK_DOWN: case ASYNC_EVENT_LINK_DOWN:
SE_DEBUG(DBG_LVL_1, "Link Down on Physical Port %d \n", SE_DEBUG(DBG_LVL_1, "Link Down on Physical Port %d\n",
evt->physical_port); evt->physical_port);
phba->state |= BE_ADAPTER_LINK_DOWN; phba->state |= BE_ADAPTER_LINK_DOWN;
iscsi_host_for_each_session(phba->shost, iscsi_host_for_each_session(phba->shost,
be2iscsi_fail_session); be2iscsi_fail_session);
break; break;
case ASYNC_EVENT_LINK_UP: case ASYNC_EVENT_LINK_UP:
phba->state = BE_ADAPTER_UP; phba->state = BE_ADAPTER_UP;
SE_DEBUG(DBG_LVL_1, "Link UP on Physical Port %d \n", SE_DEBUG(DBG_LVL_1, "Link UP on Physical Port %d\n",
evt->physical_port); evt->physical_port);
break; break;
default: default:
SE_DEBUG(DBG_LVL_1, "Unexpected Async Notification %d on" SE_DEBUG(DBG_LVL_1, "Unexpected Async Notification %d on"
"Physical Port %d \n", "Physical Port %d\n",
evt->port_link_status, evt->port_link_status,
evt->physical_port); evt->physical_port);
} }
...@@ -199,7 +199,7 @@ int beiscsi_process_mcc(struct beiscsi_hba *phba) ...@@ -199,7 +199,7 @@ int beiscsi_process_mcc(struct beiscsi_hba *phba)
else else
SE_DEBUG(DBG_LVL_1, SE_DEBUG(DBG_LVL_1,
" Unsupported Async Event, flags" " Unsupported Async Event, flags"
" = 0x%08x \n", compl->flags); " = 0x%08x\n", compl->flags);
} else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) { } else if (compl->flags & CQE_FLAGS_COMPLETED_MASK) {
status = be_mcc_compl_process(ctrl, compl); status = be_mcc_compl_process(ctrl, compl);
...@@ -286,7 +286,7 @@ int be_mbox_notify(struct be_ctrl_info *ctrl) ...@@ -286,7 +286,7 @@ int be_mbox_notify(struct be_ctrl_info *ctrl)
status = be_mbox_db_ready_wait(ctrl); status = be_mbox_db_ready_wait(ctrl);
if (status != 0) { if (status != 0) {
SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed 1\n"); SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed\n");
return status; return status;
} }
val = 0; val = 0;
...@@ -297,14 +297,14 @@ int be_mbox_notify(struct be_ctrl_info *ctrl) ...@@ -297,14 +297,14 @@ int be_mbox_notify(struct be_ctrl_info *ctrl)
status = be_mbox_db_ready_wait(ctrl); status = be_mbox_db_ready_wait(ctrl);
if (status != 0) { if (status != 0) {
SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed 2\n"); SE_DEBUG(DBG_LVL_1, " be_mbox_db_ready_wait failed\n");
return status; return status;
} }
if (be_mcc_compl_is_new(compl)) { if (be_mcc_compl_is_new(compl)) {
status = be_mcc_compl_process(ctrl, &mbox->compl); status = be_mcc_compl_process(ctrl, &mbox->compl);
be_mcc_compl_use(compl); be_mcc_compl_use(compl);
if (status) { if (status) {
SE_DEBUG(DBG_LVL_1, "After be_mcc_compl_process \n"); SE_DEBUG(DBG_LVL_1, "After be_mcc_compl_process\n");
return status; return status;
} }
} else { } else {
...@@ -500,7 +500,7 @@ int be_cmd_fw_initialize(struct be_ctrl_info *ctrl) ...@@ -500,7 +500,7 @@ int be_cmd_fw_initialize(struct be_ctrl_info *ctrl)
status = be_mbox_notify(ctrl); status = be_mbox_notify(ctrl);
if (status) if (status)
SE_DEBUG(DBG_LVL_1, "be_cmd_fw_initialize Failed \n"); SE_DEBUG(DBG_LVL_1, "be_cmd_fw_initialize Failed\n");
spin_unlock(&ctrl->mbox_lock); spin_unlock(&ctrl->mbox_lock);
return status; return status;
...@@ -517,7 +517,7 @@ int beiscsi_cmd_cq_create(struct be_ctrl_info *ctrl, ...@@ -517,7 +517,7 @@ int beiscsi_cmd_cq_create(struct be_ctrl_info *ctrl,
void *ctxt = &req->context; void *ctxt = &req->context;
int status; int status;
SE_DEBUG(DBG_LVL_8, "In beiscsi_cmd_cq_create \n"); SE_DEBUG(DBG_LVL_8, "In beiscsi_cmd_cq_create\n");
spin_lock(&ctrl->mbox_lock); spin_lock(&ctrl->mbox_lock);
memset(wrb, 0, sizeof(*wrb)); memset(wrb, 0, sizeof(*wrb));
...@@ -550,7 +550,7 @@ int beiscsi_cmd_cq_create(struct be_ctrl_info *ctrl, ...@@ -550,7 +550,7 @@ int beiscsi_cmd_cq_create(struct be_ctrl_info *ctrl,
cq->id = le16_to_cpu(resp->cq_id); cq->id = le16_to_cpu(resp->cq_id);
cq->created = true; cq->created = true;
} else } else
SE_DEBUG(DBG_LVL_1, "In be_cmd_cq_create, status=ox%08x \n", SE_DEBUG(DBG_LVL_1, "In be_cmd_cq_create, status=ox%08x\n",
status); status);
spin_unlock(&ctrl->mbox_lock); spin_unlock(&ctrl->mbox_lock);
...@@ -619,7 +619,7 @@ int beiscsi_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q, ...@@ -619,7 +619,7 @@ int beiscsi_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
u8 subsys = 0, opcode = 0; u8 subsys = 0, opcode = 0;
int status; int status;
SE_DEBUG(DBG_LVL_8, "In beiscsi_cmd_q_destroy \n"); SE_DEBUG(DBG_LVL_8, "In beiscsi_cmd_q_destroy\n");
spin_lock(&ctrl->mbox_lock); spin_lock(&ctrl->mbox_lock);
memset(wrb, 0, sizeof(*wrb)); memset(wrb, 0, sizeof(*wrb));
be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0); be_wrb_hdr_prepare(wrb, sizeof(*req), true, 0);
......
drivers/scsi/be2iscsi/be_cmds.h
View file @ 457ff3b7
...@@ -47,8 +47,8 @@ struct be_mcc_wrb { ...@@ -47,8 +47,8 @@ struct be_mcc_wrb {
#define CQE_FLAGS_VALID_MASK (1 << 31) #define CQE_FLAGS_VALID_MASK (1 << 31)
#define CQE_FLAGS_ASYNC_MASK (1 << 30) #define CQE_FLAGS_ASYNC_MASK (1 << 30)
#define CQE_FLAGS_COMPLETED_MASK (1 << 28) #define CQE_FLAGS_COMPLETED_MASK (1 << 28)
#define CQE_FLAGS_CONSUMED_MASK (1 << 27) #define CQE_FLAGS_CONSUMED_MASK (1 << 27)
/* Completion Status */ /* Completion Status */
#define MCC_STATUS_SUCCESS 0x0 #define MCC_STATUS_SUCCESS 0x0
...@@ -143,14 +143,14 @@ struct be_mcc_mailbox { ...@@ -143,14 +143,14 @@ struct be_mcc_mailbox {
*/ */
#define OPCODE_COMMON_CQ_CREATE 12 #define OPCODE_COMMON_CQ_CREATE 12
#define OPCODE_COMMON_EQ_CREATE 13 #define OPCODE_COMMON_EQ_CREATE 13
#define OPCODE_COMMON_MCC_CREATE 21 #define OPCODE_COMMON_MCC_CREATE 21
#define OPCODE_COMMON_GET_CNTL_ATTRIBUTES 32 #define OPCODE_COMMON_GET_CNTL_ATTRIBUTES 32
#define OPCODE_COMMON_GET_FW_VERSION 35 #define OPCODE_COMMON_GET_FW_VERSION 35
#define OPCODE_COMMON_MODIFY_EQ_DELAY 41 #define OPCODE_COMMON_MODIFY_EQ_DELAY 41
#define OPCODE_COMMON_FIRMWARE_CONFIG 42 #define OPCODE_COMMON_FIRMWARE_CONFIG 42
#define OPCODE_COMMON_MCC_DESTROY 53 #define OPCODE_COMMON_MCC_DESTROY 53
#define OPCODE_COMMON_CQ_DESTROY 54 #define OPCODE_COMMON_CQ_DESTROY 54
#define OPCODE_COMMON_EQ_DESTROY 55 #define OPCODE_COMMON_EQ_DESTROY 55
#define OPCODE_COMMON_QUERY_FIRMWARE_CONFIG 58 #define OPCODE_COMMON_QUERY_FIRMWARE_CONFIG 58
#define OPCODE_COMMON_FUNCTION_RESET 61 #define OPCODE_COMMON_FUNCTION_RESET 61
...@@ -164,9 +164,9 @@ struct be_mcc_mailbox { ...@@ -164,9 +164,9 @@ struct be_mcc_mailbox {
#define OPCODE_COMMON_ISCSI_NTWK_GET_NIC_CONFIG 7 #define OPCODE_COMMON_ISCSI_NTWK_GET_NIC_CONFIG 7
#define OPCODE_COMMON_ISCSI_SET_FRAGNUM_BITS_FOR_SGL_CRA 61 #define OPCODE_COMMON_ISCSI_SET_FRAGNUM_BITS_FOR_SGL_CRA 61
#define OPCODE_COMMON_ISCSI_DEFQ_CREATE 64 #define OPCODE_COMMON_ISCSI_DEFQ_CREATE 64
#define OPCODE_COMMON_ISCSI_DEFQ_DESTROY 65 #define OPCODE_COMMON_ISCSI_DEFQ_DESTROY 65
#define OPCODE_COMMON_ISCSI_WRBQ_CREATE 66 #define OPCODE_COMMON_ISCSI_WRBQ_CREATE 66
#define OPCODE_COMMON_ISCSI_WRBQ_DESTROY 67 #define OPCODE_COMMON_ISCSI_WRBQ_DESTROY 67
struct be_cmd_req_hdr { struct be_cmd_req_hdr {
u8 opcode; /* dword 0 */ u8 opcode; /* dword 0 */
...@@ -875,7 +875,7 @@ struct be_fw_cfg { ...@@ -875,7 +875,7 @@ struct be_fw_cfg {
*/ */
#define UNSOL_HDR_NOTIFY 28 /* Unsolicited header notify.*/ #define UNSOL_HDR_NOTIFY 28 /* Unsolicited header notify.*/
#define UNSOL_DATA_NOTIFY 29 /* Unsolicited data notify.*/ #define UNSOL_DATA_NOTIFY 29 /* Unsolicited data notify.*/
#define UNSOL_DATA_DIGEST_ERROR_NOTIFY 30 /* Unsolicited data digest #define UNSOL_DATA_DIGEST_ERROR_NOTIFY 30 /* Unsolicited data digest
* error notify. * error notify.
*/ */
#define DRIVERMSG_NOTIFY 31 /* TCP acknowledge based #define DRIVERMSG_NOTIFY 31 /* TCP acknowledge based
......
drivers/scsi/be2iscsi/be_iscsi.c
View file @ 457ff3b7
...@@ -52,7 +52,7 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, ...@@ -52,7 +52,7 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
SE_DEBUG(DBG_LVL_8, "In beiscsi_session_create\n"); SE_DEBUG(DBG_LVL_8, "In beiscsi_session_create\n");
if (!ep) { if (!ep) {
SE_DEBUG(DBG_LVL_1, "beiscsi_session_create: invalid ep \n"); SE_DEBUG(DBG_LVL_1, "beiscsi_session_create: invalid ep\n");
return NULL; return NULL;
} }
beiscsi_ep = ep->dd_data; beiscsi_ep = ep->dd_data;
...@@ -157,7 +157,7 @@ static int beiscsi_bindconn_cid(struct beiscsi_hba *phba, ...@@ -157,7 +157,7 @@ static int beiscsi_bindconn_cid(struct beiscsi_hba *phba,
"Connection table already occupied. Detected clash\n"); "Connection table already occupied. Detected clash\n");
return -EINVAL; return -EINVAL;
} else { } else {
SE_DEBUG(DBG_LVL_8, "phba->conn_table[%d]=%p(beiscsi_conn) \n", SE_DEBUG(DBG_LVL_8, "phba->conn_table[%d]=%p(beiscsi_conn)\n",
cid, beiscsi_conn); cid, beiscsi_conn);
phba->conn_table[cid] = beiscsi_conn; phba->conn_table[cid] = beiscsi_conn;
} }
...@@ -196,7 +196,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session, ...@@ -196,7 +196,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session,
if (beiscsi_ep->phba != phba) { if (beiscsi_ep->phba != phba) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"beiscsi_ep->hba=%p not equal to phba=%p \n", "beiscsi_ep->hba=%p not equal to phba=%p\n",
beiscsi_ep->phba, phba); beiscsi_ep->phba, phba);
return -EEXIST; return -EEXIST;
} }
...@@ -204,7 +204,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session, ...@@ -204,7 +204,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session,
beiscsi_conn->beiscsi_conn_cid = beiscsi_ep->ep_cid; beiscsi_conn->beiscsi_conn_cid = beiscsi_ep->ep_cid;
beiscsi_conn->ep = beiscsi_ep; beiscsi_conn->ep = beiscsi_ep;
beiscsi_ep->conn = beiscsi_conn; beiscsi_ep->conn = beiscsi_conn;
SE_DEBUG(DBG_LVL_8, "beiscsi_conn=%p conn=%p ep_cid=%d \n", SE_DEBUG(DBG_LVL_8, "beiscsi_conn=%p conn=%p ep_cid=%d\n",
beiscsi_conn, conn, beiscsi_ep->ep_cid); beiscsi_conn, conn, beiscsi_ep->ep_cid);
return beiscsi_bindconn_cid(phba, beiscsi_conn, beiscsi_ep->ep_cid); return beiscsi_bindconn_cid(phba, beiscsi_conn, beiscsi_ep->ep_cid);
} }
...@@ -308,7 +308,7 @@ int beiscsi_get_host_param(struct Scsi_Host *shost, ...@@ -308,7 +308,7 @@ int beiscsi_get_host_param(struct Scsi_Host *shost,
case ISCSI_HOST_PARAM_HWADDRESS: case ISCSI_HOST_PARAM_HWADDRESS:
tag = be_cmd_get_mac_addr(phba); tag = be_cmd_get_mac_addr(phba);
if (!tag) { if (!tag) {
SE_DEBUG(DBG_LVL_1, "be_cmd_get_mac_addr Failed \n"); SE_DEBUG(DBG_LVL_1, "be_cmd_get_mac_addr Failed\n");
return -1; return -1;
} else } else
wait_event_interruptible(phba->ctrl.mcc_wait[tag], wait_event_interruptible(phba->ctrl.mcc_wait[tag],
...@@ -319,7 +319,7 @@ int beiscsi_get_host_param(struct Scsi_Host *shost, ...@@ -319,7 +319,7 @@ int beiscsi_get_host_param(struct Scsi_Host *shost,
status = phba->ctrl.mcc_numtag[tag] & 0x000000FF; status = phba->ctrl.mcc_numtag[tag] & 0x000000FF;
if (status || extd_status) { if (status || extd_status) {
SE_DEBUG(DBG_LVL_1, "be_cmd_get_mac_addr Failed" SE_DEBUG(DBG_LVL_1, "be_cmd_get_mac_addr Failed"
" status = %d extd_status = %d \n", " status = %d extd_status = %d\n",
status, extd_status); status, extd_status);
free_mcc_tag(&phba->ctrl, tag); free_mcc_tag(&phba->ctrl, tag);
return -1; return -1;
...@@ -493,7 +493,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep, ...@@ -493,7 +493,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep,
SE_DEBUG(DBG_LVL_1, "No free cid available\n"); SE_DEBUG(DBG_LVL_1, "No free cid available\n");
return ret; return ret;
} }
SE_DEBUG(DBG_LVL_8, "In beiscsi_open_conn, ep_cid=%d ", SE_DEBUG(DBG_LVL_8, "In beiscsi_open_conn, ep_cid=%d\n",
beiscsi_ep->ep_cid); beiscsi_ep->ep_cid);
phba->ep_array[beiscsi_ep->ep_cid - phba->ep_array[beiscsi_ep->ep_cid -
phba->fw_config.iscsi_cid_start] = ep; phba->fw_config.iscsi_cid_start] = ep;
...@@ -507,7 +507,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep, ...@@ -507,7 +507,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep,
tag = mgmt_open_connection(phba, dst_addr, beiscsi_ep); tag = mgmt_open_connection(phba, dst_addr, beiscsi_ep);
if (!tag) { if (!tag) {
SE_DEBUG(DBG_LVL_1, SE_DEBUG(DBG_LVL_1,
"mgmt_open_connection Failed for cid=%d \n", "mgmt_open_connection Failed for cid=%d\n",
beiscsi_ep->ep_cid); beiscsi_ep->ep_cid);
} else { } else {
wait_event_interruptible(phba->ctrl.mcc_wait[tag], wait_event_interruptible(phba->ctrl.mcc_wait[tag],
...@@ -526,7 +526,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep, ...@@ -526,7 +526,7 @@ static int beiscsi_open_conn(struct iscsi_endpoint *ep,
wrb = queue_get_wrb(mccq, wrb_num); wrb = queue_get_wrb(mccq, wrb_num);
free_mcc_tag(&phba->ctrl, tag); free_mcc_tag(&phba->ctrl, tag);
ptcpcnct_out = embedded_payload(wrb); ptcpcnct_out = embedded_payload(wrb);
beiscsi_ep = ep->dd_data; beiscsi_ep = ep->dd_data;
beiscsi_ep->fw_handle = ptcpcnct_out->connection_handle; beiscsi_ep->fw_handle = ptcpcnct_out->connection_handle;
beiscsi_ep->cid_vld = 1; beiscsi_ep->cid_vld = 1;
...@@ -556,18 +556,18 @@ beiscsi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr, ...@@ -556,18 +556,18 @@ beiscsi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
struct iscsi_endpoint *ep; struct iscsi_endpoint *ep;
int ret; int ret;
SE_DEBUG(DBG_LVL_8, "In beiscsi_ep_connect \n"); SE_DEBUG(DBG_LVL_8, "In beiscsi_ep_connect\n");
if (shost) if (shost)
phba = iscsi_host_priv(shost); phba = iscsi_host_priv(shost);
else { else {
ret = -ENXIO; ret = -ENXIO;
SE_DEBUG(DBG_LVL_1, "shost is NULL \n"); SE_DEBUG(DBG_LVL_1, "shost is NULL\n");
return ERR_PTR(ret); return ERR_PTR(ret);
} }
if (phba->state != BE_ADAPTER_UP) { if (phba->state != BE_ADAPTER_UP) {
ret = -EBUSY; ret = -EBUSY;
SE_DEBUG(DBG_LVL_1, "The Adapter state is Not UP \n"); SE_DEBUG(DBG_LVL_1, "The Adapter state is Not UP\n");
return ERR_PTR(ret); return ERR_PTR(ret);
} }
...@@ -581,7 +581,7 @@ beiscsi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr, ...@@ -581,7 +581,7 @@ beiscsi_ep_connect(struct Scsi_Host *shost, struct sockaddr *dst_addr,
beiscsi_ep->phba = phba; beiscsi_ep->phba = phba;
beiscsi_ep->openiscsi_ep = ep; beiscsi_ep->openiscsi_ep = ep;
if (beiscsi_open_conn(ep, NULL, dst_addr, non_blocking)) { if (beiscsi_open_conn(ep, NULL, dst_addr, non_blocking)) {
SE_DEBUG(DBG_LVL_1, "Failed in beiscsi_open_conn \n"); SE_DEBUG(DBG_LVL_1, "Failed in beiscsi_open_conn\n");
ret = -ENOMEM; ret = -ENOMEM;
goto free_ep; goto free_ep;
} }
...@@ -624,7 +624,7 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag) ...@@ -624,7 +624,7 @@ static int beiscsi_close_conn(struct beiscsi_endpoint *beiscsi_ep, int flag)
tag = mgmt_upload_connection(phba, beiscsi_ep->ep_cid, flag); tag = mgmt_upload_connection(phba, beiscsi_ep->ep_cid, flag);
if (!tag) { if (!tag) {
SE_DEBUG(DBG_LVL_8, "upload failed for cid 0x%x", SE_DEBUG(DBG_LVL_8, "upload failed for cid 0x%x\n",
beiscsi_ep->ep_cid); beiscsi_ep->ep_cid);
ret = -1; ret = -1;
} else { } else {
...@@ -646,7 +646,7 @@ static int beiscsi_unbind_conn_to_cid(struct beiscsi_hba *phba, ...@@ -646,7 +646,7 @@ static int beiscsi_unbind_conn_to_cid(struct beiscsi_hba *phba,
if (phba->conn_table[cid]) if (phba->conn_table[cid])
phba->conn_table[cid] = NULL; phba->conn_table[cid] = NULL;
else { else {
SE_DEBUG(DBG_LVL_8, "Connection table Not occupied. \n"); SE_DEBUG(DBG_LVL_8, "Connection table Not occupied.\n");
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -687,7 +687,7 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep) ...@@ -687,7 +687,7 @@ void beiscsi_ep_disconnect(struct iscsi_endpoint *ep)
savecfg_flag); savecfg_flag);
if (!tag) { if (!tag) {
SE_DEBUG(DBG_LVL_1, SE_DEBUG(DBG_LVL_1,
"mgmt_invalidate_connection Failed for cid=%d \n", "mgmt_invalidate_connection Failed for cid=%d\n",
beiscsi_ep->ep_cid); beiscsi_ep->ep_cid);
} else { } else {
wait_event_interruptible(phba->ctrl.mcc_wait[tag], wait_event_interruptible(phba->ctrl.mcc_wait[tag],
......
drivers/scsi/be2iscsi/be_main.c
View file @ 457ff3b7
...@@ -216,7 +216,7 @@ static struct beiscsi_hba *beiscsi_hba_alloc(struct pci_dev *pcidev) ...@@ -216,7 +216,7 @@ static struct beiscsi_hba *beiscsi_hba_alloc(struct pci_dev *pcidev)
shost = iscsi_host_alloc(&beiscsi_sht, sizeof(*phba), 0); shost = iscsi_host_alloc(&beiscsi_sht, sizeof(*phba), 0);
if (!shost) { if (!shost) {
dev_err(&pcidev->dev, "beiscsi_hba_alloc -" dev_err(&pcidev->dev, "beiscsi_hba_alloc -"
"iscsi_host_alloc failed \n"); "iscsi_host_alloc failed\n");
return NULL; return NULL;
} }
shost->dma_boundary = pcidev->dma_mask; shost->dma_boundary = pcidev->dma_mask;
...@@ -371,7 +371,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba) ...@@ -371,7 +371,7 @@ static void beiscsi_get_params(struct beiscsi_hba *phba)
+ BE2_TMFS) / 512) + 1) * 512; + BE2_TMFS) / 512) + 1) * 512;
phba->params.num_eq_entries = (phba->params.num_eq_entries < 1024) phba->params.num_eq_entries = (phba->params.num_eq_entries < 1024)
? 1024 : phba->params.num_eq_entries; ? 1024 : phba->params.num_eq_entries;
SE_DEBUG(DBG_LVL_8, "phba->params.num_eq_entries=%d \n", SE_DEBUG(DBG_LVL_8, "phba->params.num_eq_entries=%d\n",
phba->params.num_eq_entries); phba->params.num_eq_entries);
phba->params.num_cq_entries = phba->params.num_cq_entries =
(((BE2_CMDS_PER_CXN * 2 + phba->fw_config.iscsi_cid_count * 2 (((BE2_CMDS_PER_CXN * 2 + phba->fw_config.iscsi_cid_count * 2
...@@ -692,7 +692,7 @@ beiscsi_process_async_pdu(struct beiscsi_conn *beiscsi_conn, ...@@ -692,7 +692,7 @@ beiscsi_process_async_pdu(struct beiscsi_conn *beiscsi_conn,
break; break;
default: default:
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"Unrecognized opcode 0x%x in async msg \n", "Unrecognized opcode 0x%x in async msg\n",
(ppdu-> (ppdu->
dw[offsetof(struct amap_pdu_base, opcode) / 32] dw[offsetof(struct amap_pdu_base, opcode) / 32]
& PDUBASE_OPCODE_MASK)); & PDUBASE_OPCODE_MASK));
...@@ -711,7 +711,7 @@ static struct sgl_handle *alloc_io_sgl_handle(struct beiscsi_hba *phba) ...@@ -711,7 +711,7 @@ static struct sgl_handle *alloc_io_sgl_handle(struct beiscsi_hba *phba)
if (phba->io_sgl_hndl_avbl) { if (phba->io_sgl_hndl_avbl) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"In alloc_io_sgl_handle,io_sgl_alloc_index=%d \n", "In alloc_io_sgl_handle,io_sgl_alloc_index=%d\n",
phba->io_sgl_alloc_index); phba->io_sgl_alloc_index);
psgl_handle = phba->io_sgl_hndl_base[phba-> psgl_handle = phba->io_sgl_hndl_base[phba->
io_sgl_alloc_index]; io_sgl_alloc_index];
...@@ -730,7 +730,7 @@ static struct sgl_handle *alloc_io_sgl_handle(struct beiscsi_hba *phba) ...@@ -730,7 +730,7 @@ static struct sgl_handle *alloc_io_sgl_handle(struct beiscsi_hba *phba)
static void static void
free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle) free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
{ {
SE_DEBUG(DBG_LVL_8, "In free_,io_sgl_free_index=%d \n", SE_DEBUG(DBG_LVL_8, "In free_,io_sgl_free_index=%d\n",
phba->io_sgl_free_index); phba->io_sgl_free_index);
if (phba->io_sgl_hndl_base[phba->io_sgl_free_index]) { if (phba->io_sgl_hndl_base[phba->io_sgl_free_index]) {
/* /*
...@@ -739,7 +739,7 @@ free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle) ...@@ -739,7 +739,7 @@ free_io_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
*/ */
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"Double Free in IO SGL io_sgl_free_index=%d," "Double Free in IO SGL io_sgl_free_index=%d,"
"value there=%p \n", phba->io_sgl_free_index, "value there=%p\n", phba->io_sgl_free_index,
phba->io_sgl_hndl_base[phba->io_sgl_free_index]); phba->io_sgl_hndl_base[phba->io_sgl_free_index]);
return; return;
} }
...@@ -804,7 +804,7 @@ free_wrb_handle(struct beiscsi_hba *phba, struct hwi_wrb_context *pwrb_context, ...@@ -804,7 +804,7 @@ free_wrb_handle(struct beiscsi_hba *phba, struct hwi_wrb_context *pwrb_context,
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"FREE WRB: pwrb_handle=%p free_index=0x%x" "FREE WRB: pwrb_handle=%p free_index=0x%x"
"wrb_handles_available=%d \n", "wrb_handles_available=%d\n",
pwrb_handle, pwrb_context->free_index, pwrb_handle, pwrb_context->free_index,
pwrb_context->wrb_handles_available); pwrb_context->wrb_handles_available);
} }
...@@ -816,7 +816,7 @@ static struct sgl_handle *alloc_mgmt_sgl_handle(struct beiscsi_hba *phba) ...@@ -816,7 +816,7 @@ static struct sgl_handle *alloc_mgmt_sgl_handle(struct beiscsi_hba *phba)
if (phba->eh_sgl_hndl_avbl) { if (phba->eh_sgl_hndl_avbl) {
psgl_handle = phba->eh_sgl_hndl_base[phba->eh_sgl_alloc_index]; psgl_handle = phba->eh_sgl_hndl_base[phba->eh_sgl_alloc_index];
phba->eh_sgl_hndl_base[phba->eh_sgl_alloc_index] = NULL; phba->eh_sgl_hndl_base[phba->eh_sgl_alloc_index] = NULL;
SE_DEBUG(DBG_LVL_8, "mgmt_sgl_alloc_index=%d=0x%x \n", SE_DEBUG(DBG_LVL_8, "mgmt_sgl_alloc_index=%d=0x%x\n",
phba->eh_sgl_alloc_index, phba->eh_sgl_alloc_index); phba->eh_sgl_alloc_index, phba->eh_sgl_alloc_index);
phba->eh_sgl_hndl_avbl--; phba->eh_sgl_hndl_avbl--;
if (phba->eh_sgl_alloc_index == if (phba->eh_sgl_alloc_index ==
...@@ -834,7 +834,7 @@ void ...@@ -834,7 +834,7 @@ void
free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle) free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
{ {
SE_DEBUG(DBG_LVL_8, "In free_mgmt_sgl_handle,eh_sgl_free_index=%d \n", SE_DEBUG(DBG_LVL_8, "In free_mgmt_sgl_handle,eh_sgl_free_index=%d\n",
phba->eh_sgl_free_index); phba->eh_sgl_free_index);
if (phba->eh_sgl_hndl_base[phba->eh_sgl_free_index]) { if (phba->eh_sgl_hndl_base[phba->eh_sgl_free_index]) {
/* /*
...@@ -842,7 +842,7 @@ free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle) ...@@ -842,7 +842,7 @@ free_mgmt_sgl_handle(struct beiscsi_hba *phba, struct sgl_handle *psgl_handle)
* failed in xmit_task or alloc_pdu. * failed in xmit_task or alloc_pdu.
*/ */
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"Double Free in eh SGL ,eh_sgl_free_index=%d \n", "Double Free in eh SGL ,eh_sgl_free_index=%d\n",
phba->eh_sgl_free_index); phba->eh_sgl_free_index);
return; return;
} }
...@@ -1081,7 +1081,7 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn, ...@@ -1081,7 +1081,7 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,
case HWH_TYPE_LOGIN: case HWH_TYPE_LOGIN:
SE_DEBUG(DBG_LVL_1, SE_DEBUG(DBG_LVL_1,
"\t\t No HWH_TYPE_LOGIN Expected in hwi_complete_cmd" "\t\t No HWH_TYPE_LOGIN Expected in hwi_complete_cmd"
"- Solicited path \n"); "- Solicited path\n");
break; break;
case HWH_TYPE_NOP: case HWH_TYPE_NOP:
...@@ -1164,7 +1164,7 @@ hwi_get_async_handle(struct beiscsi_hba *phba, ...@@ -1164,7 +1164,7 @@ hwi_get_async_handle(struct beiscsi_hba *phba,
default: default:
pbusy_list = NULL; pbusy_list = NULL;
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"Unexpected code=%d \n", "Unexpected code=%d\n",
pdpdu_cqe->dw[offsetof(struct amap_i_t_dpdu_cqe, pdpdu_cqe->dw[offsetof(struct amap_i_t_dpdu_cqe,
code) / 32] & PDUCQE_CODE_MASK); code) / 32] & PDUCQE_CODE_MASK);
return NULL; return NULL;
...@@ -1552,7 +1552,7 @@ static void beiscsi_process_mcc_isr(struct beiscsi_hba *phba) ...@@ -1552,7 +1552,7 @@ static void beiscsi_process_mcc_isr(struct beiscsi_hba *phba)
else else
SE_DEBUG(DBG_LVL_1, SE_DEBUG(DBG_LVL_1,
" Unsupported Async Event, flags" " Unsupported Async Event, flags"
" = 0x%08x \n", mcc_compl->flags); " = 0x%08x\n", mcc_compl->flags);
} else if (mcc_compl->flags & CQE_FLAGS_COMPLETED_MASK) { } else if (mcc_compl->flags & CQE_FLAGS_COMPLETED_MASK) {
be_mcc_compl_process_isr(&phba->ctrl, mcc_compl); be_mcc_compl_process_isr(&phba->ctrl, mcc_compl);
atomic_dec(&phba->ctrl.mcc_obj.q.used); atomic_dec(&phba->ctrl.mcc_obj.q.used);
...@@ -1611,7 +1611,7 @@ static unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq) ...@@ -1611,7 +1611,7 @@ static unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq)
hwi_complete_cmd(beiscsi_conn, phba, sol); hwi_complete_cmd(beiscsi_conn, phba, sol);
break; break;
case DRIVERMSG_NOTIFY: case DRIVERMSG_NOTIFY:
SE_DEBUG(DBG_LVL_8, "Received DRIVERMSG_NOTIFY \n"); SE_DEBUG(DBG_LVL_8, "Received DRIVERMSG_NOTIFY\n");
dmsg = (struct dmsg_cqe *)sol; dmsg = (struct dmsg_cqe *)sol;
hwi_complete_drvr_msgs(beiscsi_conn, phba, sol); hwi_complete_drvr_msgs(beiscsi_conn, phba, sol);
break; break;
...@@ -1782,9 +1782,9 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg, ...@@ -1782,9 +1782,9 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg,
sg_len = sg_dma_len(sg); sg_len = sg_dma_len(sg);
addr = (u64) sg_dma_address(sg); addr = (u64) sg_dma_address(sg);
AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_lo, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_lo, pwrb,
(addr & 0xFFFFFFFF)); ((u32)(addr & 0xFFFFFFFF)));
AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_hi, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_hi, pwrb,
(addr >> 32)); ((u32)(addr >> 32)));
AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_len, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_len, pwrb,
sg_len); sg_len);
sge_len = sg_len; sge_len = sg_len;
...@@ -1794,9 +1794,9 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg, ...@@ -1794,9 +1794,9 @@ hwi_write_sgl(struct iscsi_wrb *pwrb, struct scatterlist *sg,
sg_len = sg_dma_len(sg); sg_len = sg_dma_len(sg);
addr = (u64) sg_dma_address(sg); addr = (u64) sg_dma_address(sg);
AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_addr_lo, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_addr_lo, pwrb,
(addr & 0xFFFFFFFF)); ((u32)(addr & 0xFFFFFFFF)));
AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_addr_hi, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_addr_hi, pwrb,
(addr >> 32)); ((u32)(addr >> 32)));
AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_len, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge1_len, pwrb,
sg_len); sg_len);
} }
...@@ -1872,9 +1872,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task) ...@@ -1872,9 +1872,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task)
addr = 0; addr = 0;
} }
AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_lo, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_lo, pwrb,
(addr & 0xFFFFFFFF)); ((u32)(addr & 0xFFFFFFFF)));
AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_hi, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_addr_hi, pwrb,
(addr >> 32)); ((u32)(addr >> 32)));
AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_len, pwrb, AMAP_SET_BITS(struct amap_iscsi_wrb, sge0_len, pwrb,
task->data_count); task->data_count);
...@@ -1904,9 +1904,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task) ...@@ -1904,9 +1904,9 @@ static void hwi_write_buffer(struct iscsi_wrb *pwrb, struct iscsi_task *task)
psgl++; psgl++;
if (task->data) { if (task->data) {
AMAP_SET_BITS(struct amap_iscsi_sge, addr_lo, psgl, AMAP_SET_BITS(struct amap_iscsi_sge, addr_lo, psgl,
(addr & 0xFFFFFFFF)); ((u32)(addr & 0xFFFFFFFF)));
AMAP_SET_BITS(struct amap_iscsi_sge, addr_hi, psgl, AMAP_SET_BITS(struct amap_iscsi_sge, addr_hi, psgl,
(addr >> 32)); ((u32)(addr >> 32)));
} }
AMAP_SET_BITS(struct amap_iscsi_sge, len, psgl, 0x106); AMAP_SET_BITS(struct amap_iscsi_sge, len, psgl, 0x106);
} }
...@@ -2054,7 +2054,8 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba) ...@@ -2054,7 +2054,8 @@ static int beiscsi_alloc_mem(struct beiscsi_hba *phba)
mem_descr->mem_array[j - 1].size, mem_descr->mem_array[j - 1].size,
mem_descr->mem_array[j - 1]. mem_descr->mem_array[j - 1].
virtual_address, virtual_address,
mem_descr->mem_array[j - 1]. (unsigned long)mem_descr->
mem_array[j - 1].
bus_address.u.a64.address); bus_address.u.a64.address);
} }
if (i) { if (i) {
...@@ -2223,10 +2224,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba) ...@@ -2223,10 +2224,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
if (mem_descr->mem_array[0].virtual_address) { if (mem_descr->mem_array[0].virtual_address) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"hwi_init_async_pdu_ctx HWI_MEM_ASYNC_HEADER_BUF" "hwi_init_async_pdu_ctx HWI_MEM_ASYNC_HEADER_BUF"
"va=%p \n", mem_descr->mem_array[0].virtual_address); "va=%p\n", mem_descr->mem_array[0].virtual_address);
} else } else
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"No Virtual address \n"); "No Virtual address\n");
pasync_ctx->async_header.va_base = pasync_ctx->async_header.va_base =
mem_descr->mem_array[0].virtual_address; mem_descr->mem_array[0].virtual_address;
...@@ -2239,10 +2240,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba) ...@@ -2239,10 +2240,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
if (mem_descr->mem_array[0].virtual_address) { if (mem_descr->mem_array[0].virtual_address) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"hwi_init_async_pdu_ctx HWI_MEM_ASYNC_HEADER_RING" "hwi_init_async_pdu_ctx HWI_MEM_ASYNC_HEADER_RING"
"va=%p \n", mem_descr->mem_array[0].virtual_address); "va=%p\n", mem_descr->mem_array[0].virtual_address);
} else } else
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"No Virtual address \n"); "No Virtual address\n");
pasync_ctx->async_header.ring_base = pasync_ctx->async_header.ring_base =
mem_descr->mem_array[0].virtual_address; mem_descr->mem_array[0].virtual_address;
...@@ -2251,10 +2252,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba) ...@@ -2251,10 +2252,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
if (mem_descr->mem_array[0].virtual_address) { if (mem_descr->mem_array[0].virtual_address) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"hwi_init_async_pdu_ctx HWI_MEM_ASYNC_HEADER_HANDLE" "hwi_init_async_pdu_ctx HWI_MEM_ASYNC_HEADER_HANDLE"
"va=%p \n", mem_descr->mem_array[0].virtual_address); "va=%p\n", mem_descr->mem_array[0].virtual_address);
} else } else
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"No Virtual address \n"); "No Virtual address\n");
pasync_ctx->async_header.handle_base = pasync_ctx->async_header.handle_base =
mem_descr->mem_array[0].virtual_address; mem_descr->mem_array[0].virtual_address;
...@@ -2266,10 +2267,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba) ...@@ -2266,10 +2267,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
if (mem_descr->mem_array[0].virtual_address) { if (mem_descr->mem_array[0].virtual_address) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"hwi_init_async_pdu_ctx HWI_MEM_ASYNC_DATA_BUF" "hwi_init_async_pdu_ctx HWI_MEM_ASYNC_DATA_BUF"
"va=%p \n", mem_descr->mem_array[0].virtual_address); "va=%p\n", mem_descr->mem_array[0].virtual_address);
} else } else
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"No Virtual address \n"); "No Virtual address\n");
pasync_ctx->async_data.va_base = pasync_ctx->async_data.va_base =
mem_descr->mem_array[0].virtual_address; mem_descr->mem_array[0].virtual_address;
pasync_ctx->async_data.pa_base.u.a64.address = pasync_ctx->async_data.pa_base.u.a64.address =
...@@ -2280,10 +2281,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba) ...@@ -2280,10 +2281,10 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
if (mem_descr->mem_array[0].virtual_address) { if (mem_descr->mem_array[0].virtual_address) {
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"hwi_init_async_pdu_ctx HWI_MEM_ASYNC_DATA_RING" "hwi_init_async_pdu_ctx HWI_MEM_ASYNC_DATA_RING"
"va=%p \n", mem_descr->mem_array[0].virtual_address); "va=%p\n", mem_descr->mem_array[0].virtual_address);
} else } else
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"No Virtual address \n"); "No Virtual address\n");
pasync_ctx->async_data.ring_base = pasync_ctx->async_data.ring_base =
mem_descr->mem_array[0].virtual_address; mem_descr->mem_array[0].virtual_address;
...@@ -2292,7 +2293,7 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba) ...@@ -2292,7 +2293,7 @@ static void hwi_init_async_pdu_ctx(struct beiscsi_hba *phba)
mem_descr += HWI_MEM_ASYNC_DATA_HANDLE; mem_descr += HWI_MEM_ASYNC_DATA_HANDLE;
if (!mem_descr->mem_array[0].virtual_address) if (!mem_descr->mem_array[0].virtual_address)
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"No Virtual address \n"); "No Virtual address\n");
pasync_ctx->async_data.handle_base = pasync_ctx->async_data.handle_base =
mem_descr->mem_array[0].virtual_address; mem_descr->mem_array[0].virtual_address;
...@@ -2364,7 +2365,7 @@ be_sgl_create_contiguous(void *virtual_address, ...@@ -2364,7 +2365,7 @@ be_sgl_create_contiguous(void *virtual_address,
WARN_ON(!sgl); WARN_ON(!sgl);
sgl->va = virtual_address; sgl->va = virtual_address;
sgl->dma = physical_address; sgl->dma = (unsigned long)physical_address;
sgl->size = length; sgl->size = length;
return 0; return 0;
...@@ -2447,7 +2448,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, ...@@ -2447,7 +2448,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
sizeof(struct be_eq_entry), eq_vaddress); sizeof(struct be_eq_entry), eq_vaddress);
if (ret) { if (ret) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"be_fill_queue Failed for EQ \n"); "be_fill_queue Failed for EQ\n");
goto create_eq_error; goto create_eq_error;
} }
...@@ -2457,7 +2458,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, ...@@ -2457,7 +2458,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,
if (ret) { if (ret) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"beiscsi_cmd_eq_create" "beiscsi_cmd_eq_create"
"Failedfor EQ \n"); "Failedfor EQ\n");
goto create_eq_error; goto create_eq_error;
} }
SE_DEBUG(DBG_LVL_8, "eqid = %d\n", phwi_context->be_eq[i].q.id); SE_DEBUG(DBG_LVL_8, "eqid = %d\n", phwi_context->be_eq[i].q.id);
...@@ -2505,7 +2506,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, ...@@ -2505,7 +2506,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
sizeof(struct sol_cqe), cq_vaddress); sizeof(struct sol_cqe), cq_vaddress);
if (ret) { if (ret) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"be_fill_queue Failed for ISCSI CQ \n"); "be_fill_queue Failed for ISCSI CQ\n");
goto create_cq_error; goto create_cq_error;
} }
...@@ -2515,7 +2516,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, ...@@ -2515,7 +2516,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,
if (ret) { if (ret) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"beiscsi_cmd_eq_create" "beiscsi_cmd_eq_create"
"Failed for ISCSI CQ \n"); "Failed for ISCSI CQ\n");
goto create_cq_error; goto create_cq_error;
} }
SE_DEBUG(DBG_LVL_8, "iscsi cq_id is %d for eq_id %d\n", SE_DEBUG(DBG_LVL_8, "iscsi cq_id is %d for eq_id %d\n",
...@@ -2565,7 +2566,8 @@ beiscsi_create_def_hdr(struct beiscsi_hba *phba, ...@@ -2565,7 +2566,8 @@ beiscsi_create_def_hdr(struct beiscsi_hba *phba,
"be_fill_queue Failed for DEF PDU HDR\n"); "be_fill_queue Failed for DEF PDU HDR\n");
return ret; return ret;
} }
mem->dma = mem_descr->mem_array[idx].bus_address.u.a64.address; mem->dma = (unsigned long)mem_descr->mem_array[idx].
bus_address.u.a64.address;
ret = be_cmd_create_default_pdu_queue(&phba->ctrl, cq, dq, ret = be_cmd_create_default_pdu_queue(&phba->ctrl, cq, dq,
def_pdu_ring_sz, def_pdu_ring_sz,
phba->params.defpdu_hdr_sz); phba->params.defpdu_hdr_sz);
...@@ -2609,7 +2611,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba, ...@@ -2609,7 +2611,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba,
"be_fill_queue Failed for DEF PDU DATA\n"); "be_fill_queue Failed for DEF PDU DATA\n");
return ret; return ret;
} }
mem->dma = mem_descr->mem_array[idx].bus_address.u.a64.address; mem->dma = (unsigned long)mem_descr->mem_array[idx].
bus_address.u.a64.address;
ret = be_cmd_create_default_pdu_queue(&phba->ctrl, cq, dataq, ret = be_cmd_create_default_pdu_queue(&phba->ctrl, cq, dataq,
def_pdu_ring_sz, def_pdu_ring_sz,
phba->params.defpdu_data_sz); phba->params.defpdu_data_sz);
...@@ -2623,7 +2626,7 @@ beiscsi_create_def_data(struct beiscsi_hba *phba, ...@@ -2623,7 +2626,7 @@ beiscsi_create_def_data(struct beiscsi_hba *phba,
SE_DEBUG(DBG_LVL_8, "iscsi def data id is %d\n", SE_DEBUG(DBG_LVL_8, "iscsi def data id is %d\n",
phwi_context->be_def_dataq.id); phwi_context->be_def_dataq.id);
hwi_post_async_buffers(phba, 0); hwi_post_async_buffers(phba, 0);
SE_DEBUG(DBG_LVL_8, "DEFAULT PDU DATA RING CREATED \n"); SE_DEBUG(DBG_LVL_8, "DEFAULT PDU DATA RING CREATED\n");
return 0; return 0;
} }
...@@ -2655,7 +2658,7 @@ beiscsi_post_pages(struct beiscsi_hba *phba) ...@@ -2655,7 +2658,7 @@ beiscsi_post_pages(struct beiscsi_hba *phba)
} }
pm_arr++; pm_arr++;
} }
SE_DEBUG(DBG_LVL_8, "POSTED PAGES \n"); SE_DEBUG(DBG_LVL_8, "POSTED PAGES\n");
return 0; return 0;
} }
...@@ -2885,7 +2888,7 @@ static int find_num_cpus(void) ...@@ -2885,7 +2888,7 @@ static int find_num_cpus(void)
if (num_cpus >= MAX_CPUS) if (num_cpus >= MAX_CPUS)
num_cpus = MAX_CPUS - 1; num_cpus = MAX_CPUS - 1;
SE_DEBUG(DBG_LVL_8, "num_cpus = %d \n", num_cpus); SE_DEBUG(DBG_LVL_8, "num_cpus = %d\n", num_cpus);
return num_cpus; return num_cpus;
} }
...@@ -2908,7 +2911,7 @@ static int hwi_init_port(struct beiscsi_hba *phba) ...@@ -2908,7 +2911,7 @@ static int hwi_init_port(struct beiscsi_hba *phba)
status = beiscsi_create_eqs(phba, phwi_context); status = beiscsi_create_eqs(phba, phwi_context);
if (status != 0) { if (status != 0) {
shost_printk(KERN_ERR, phba->shost, "EQ not created \n"); shost_printk(KERN_ERR, phba->shost, "EQ not created\n");
goto error; goto error;
} }
...@@ -2919,7 +2922,7 @@ static int hwi_init_port(struct beiscsi_hba *phba) ...@@ -2919,7 +2922,7 @@ static int hwi_init_port(struct beiscsi_hba *phba)
status = mgmt_check_supported_fw(ctrl, phba); status = mgmt_check_supported_fw(ctrl, phba);
if (status != 0) { if (status != 0) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"Unsupported fw version \n"); "Unsupported fw version\n");
goto error; goto error;
} }
...@@ -2975,7 +2978,7 @@ static int hwi_init_controller(struct beiscsi_hba *phba) ...@@ -2975,7 +2978,7 @@ static int hwi_init_controller(struct beiscsi_hba *phba)
if (1 == phba->init_mem[HWI_MEM_ADDN_CONTEXT].num_elements) { if (1 == phba->init_mem[HWI_MEM_ADDN_CONTEXT].num_elements) {
phwi_ctrlr->phwi_ctxt = (struct hwi_context_memory *)phba-> phwi_ctrlr->phwi_ctxt = (struct hwi_context_memory *)phba->
init_mem[HWI_MEM_ADDN_CONTEXT].mem_array[0].virtual_address; init_mem[HWI_MEM_ADDN_CONTEXT].mem_array[0].virtual_address;
SE_DEBUG(DBG_LVL_8, " phwi_ctrlr->phwi_ctxt=%p \n", SE_DEBUG(DBG_LVL_8, " phwi_ctrlr->phwi_ctxt=%p\n",
phwi_ctrlr->phwi_ctxt); phwi_ctrlr->phwi_ctxt);
} else { } else {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
...@@ -3008,8 +3011,8 @@ static void beiscsi_free_mem(struct beiscsi_hba *phba) ...@@ -3008,8 +3011,8 @@ static void beiscsi_free_mem(struct beiscsi_hba *phba)
pci_free_consistent(phba->pcidev, pci_free_consistent(phba->pcidev,
mem_descr->mem_array[j - 1].size, mem_descr->mem_array[j - 1].size,
mem_descr->mem_array[j - 1].virtual_address, mem_descr->mem_array[j - 1].virtual_address,
mem_descr->mem_array[j - 1].bus_address. (unsigned long)mem_descr->mem_array[j - 1].
u.a64.address); bus_address.u.a64.address);
} }
kfree(mem_descr->mem_array); kfree(mem_descr->mem_array);
mem_descr++; mem_descr++;
...@@ -3025,7 +3028,7 @@ static int beiscsi_init_controller(struct beiscsi_hba *phba) ...@@ -3025,7 +3028,7 @@ static int beiscsi_init_controller(struct beiscsi_hba *phba)
ret = beiscsi_get_memory(phba); ret = beiscsi_get_memory(phba);
if (ret < 0) { if (ret < 0) {
shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe -" shost_printk(KERN_ERR, phba->shost, "beiscsi_dev_probe -"
"Failed in beiscsi_alloc_memory \n"); "Failed in beiscsi_alloc_memory\n");
return ret; return ret;
} }
...@@ -3102,12 +3105,12 @@ static int beiscsi_init_sgl_handle(struct beiscsi_hba *phba) ...@@ -3102,12 +3105,12 @@ static int beiscsi_init_sgl_handle(struct beiscsi_hba *phba)
} }
SE_DEBUG(DBG_LVL_8, SE_DEBUG(DBG_LVL_8,
"phba->io_sgl_hndl_avbl=%d" "phba->io_sgl_hndl_avbl=%d"
"phba->eh_sgl_hndl_avbl=%d \n", "phba->eh_sgl_hndl_avbl=%d\n",
phba->io_sgl_hndl_avbl, phba->io_sgl_hndl_avbl,
phba->eh_sgl_hndl_avbl); phba->eh_sgl_hndl_avbl);
mem_descr_sg = phba->init_mem; mem_descr_sg = phba->init_mem;
mem_descr_sg += HWI_MEM_SGE; mem_descr_sg += HWI_MEM_SGE;
SE_DEBUG(DBG_LVL_8, "\n mem_descr_sg->num_elements=%d \n", SE_DEBUG(DBG_LVL_8, "\n mem_descr_sg->num_elements=%d\n",
mem_descr_sg->num_elements); mem_descr_sg->num_elements);
arr_index = 0; arr_index = 0;
idx = 0; idx = 0;
...@@ -3156,7 +3159,7 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) ...@@ -3156,7 +3159,7 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)
if (!phba->ep_array) { if (!phba->ep_array) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"Failed to allocate memory in " "Failed to allocate memory in "
"hba_setup_cid_tbls \n"); "hba_setup_cid_tbls\n");
kfree(phba->cid_array); kfree(phba->cid_array);
return -ENOMEM; return -ENOMEM;
} }
...@@ -3185,21 +3188,21 @@ static unsigned char hwi_enable_intr(struct beiscsi_hba *phba) ...@@ -3185,21 +3188,21 @@ static unsigned char hwi_enable_intr(struct beiscsi_hba *phba)
addr = (u8 __iomem *) ((u8 __iomem *) ctrl->pcicfg + addr = (u8 __iomem *) ((u8 __iomem *) ctrl->pcicfg +
PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET); PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET);
reg = ioread32(addr); reg = ioread32(addr);
SE_DEBUG(DBG_LVL_8, "reg =x%08x \n", reg); SE_DEBUG(DBG_LVL_8, "reg =x%08x\n", reg);
enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; enabled = reg & MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK;
if (!enabled) { if (!enabled) {
reg |= MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK; reg |= MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK;
SE_DEBUG(DBG_LVL_8, "reg =x%08x addr=%p \n", reg, addr); SE_DEBUG(DBG_LVL_8, "reg =x%08x addr=%p\n", reg, addr);
iowrite32(reg, addr); iowrite32(reg, addr);
if (!phba->msix_enabled) { if (!phba->msix_enabled) {
eq = &phwi_context->be_eq[0].q; eq = &phwi_context->be_eq[0].q;
SE_DEBUG(DBG_LVL_8, "eq->id=%d \n", eq->id); SE_DEBUG(DBG_LVL_8, "eq->id=%d\n", eq->id);
hwi_ring_eq_db(phba, eq->id, 0, 0, 1, 1); hwi_ring_eq_db(phba, eq->id, 0, 0, 1, 1);
} else { } else {
for (i = 0; i <= phba->num_cpus; i++) { for (i = 0; i <= phba->num_cpus; i++) {
eq = &phwi_context->be_eq[i].q; eq = &phwi_context->be_eq[i].q;
SE_DEBUG(DBG_LVL_8, "eq->id=%d \n", eq->id); SE_DEBUG(DBG_LVL_8, "eq->id=%d\n", eq->id);
hwi_ring_eq_db(phba, eq->id, 0, 0, 1, 1); hwi_ring_eq_db(phba, eq->id, 0, 0, 1, 1);
} }
} }
...@@ -3220,7 +3223,7 @@ static void hwi_disable_intr(struct beiscsi_hba *phba) ...@@ -3220,7 +3223,7 @@ static void hwi_disable_intr(struct beiscsi_hba *phba)
iowrite32(reg, addr); iowrite32(reg, addr);
} else } else
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"In hwi_disable_intr, Already Disabled \n"); "In hwi_disable_intr, Already Disabled\n");
} }
static int beiscsi_init_port(struct beiscsi_hba *phba) static int beiscsi_init_port(struct beiscsi_hba *phba)
...@@ -3231,14 +3234,14 @@ static int beiscsi_init_port(struct beiscsi_hba *phba) ...@@ -3231,14 +3234,14 @@ static int beiscsi_init_port(struct beiscsi_hba *phba)
if (ret < 0) { if (ret < 0) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"beiscsi_dev_probe - Failed in" "beiscsi_dev_probe - Failed in"
"beiscsi_init_controller \n"); "beiscsi_init_controller\n");
return ret; return ret;
} }
ret = beiscsi_init_sgl_handle(phba); ret = beiscsi_init_sgl_handle(phba);
if (ret < 0) { if (ret < 0) {
shost_printk(KERN_ERR, phba->shost, shost_printk(KERN_ERR, phba->shost,
"beiscsi_dev_probe - Failed in" "beiscsi_dev_probe - Failed in"
"beiscsi_init_sgl_handle \n"); "beiscsi_init_sgl_handle\n");
goto do_cleanup_ctrlr; goto do_cleanup_ctrlr;
} }
...@@ -3297,7 +3300,7 @@ static void beiscsi_clean_port(struct beiscsi_hba *phba) ...@@ -3297,7 +3300,7 @@ static void beiscsi_clean_port(struct beiscsi_hba *phba)
mgmt_status = mgmt_epfw_cleanup(phba, CMD_CONNECTION_CHUTE_0); mgmt_status = mgmt_epfw_cleanup(phba, CMD_CONNECTION_CHUTE_0);
if (mgmt_status) if (mgmt_status)
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"mgmt_epfw_cleanup FAILED \n"); "mgmt_epfw_cleanup FAILED\n");
hwi_purge_eq(phba); hwi_purge_eq(phba);
hwi_cleanup(phba); hwi_cleanup(phba);
...@@ -3487,7 +3490,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode) ...@@ -3487,7 +3490,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)
io_task->pwrb_handle = NULL; io_task->pwrb_handle = NULL;
pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs, pci_pool_free(beiscsi_sess->bhs_pool, io_task->cmd_bhs,
io_task->bhs_pa.u.a64.address); io_task->bhs_pa.u.a64.address);
SE_DEBUG(DBG_LVL_1, "Alloc of SGL_ICD Failed \n"); SE_DEBUG(DBG_LVL_1, "Alloc of SGL_ICD Failed\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -3654,7 +3657,7 @@ static int beiscsi_mtask(struct iscsi_task *task) ...@@ -3654,7 +3657,7 @@ static int beiscsi_mtask(struct iscsi_task *task)
break; break;
default: default:
SE_DEBUG(DBG_LVL_1, "opcode =%d Not supported \n", SE_DEBUG(DBG_LVL_1, "opcode =%d Not supported\n",
task->hdr->opcode & ISCSI_OPCODE_MASK); task->hdr->opcode & ISCSI_OPCODE_MASK);
return -EINVAL; return -EINVAL;
} }
...@@ -3696,7 +3699,7 @@ static int beiscsi_task_xmit(struct iscsi_task *task) ...@@ -3696,7 +3699,7 @@ static int beiscsi_task_xmit(struct iscsi_task *task)
sg = scsi_sglist(sc); sg = scsi_sglist(sc);
if (sc->sc_data_direction == DMA_TO_DEVICE) { if (sc->sc_data_direction == DMA_TO_DEVICE) {
writedir = 1; writedir = 1;
SE_DEBUG(DBG_LVL_4, "task->imm_count=0x%08x \n", SE_DEBUG(DBG_LVL_4, "task->imm_count=0x%08x\n",
task->imm_count); task->imm_count);
} else } else
writedir = 0; writedir = 0;
...@@ -3713,7 +3716,7 @@ static void beiscsi_remove(struct pci_dev *pcidev) ...@@ -3713,7 +3716,7 @@ static void beiscsi_remove(struct pci_dev *pcidev)
phba = (struct beiscsi_hba *)pci_get_drvdata(pcidev); phba = (struct beiscsi_hba *)pci_get_drvdata(pcidev);
if (!phba) { if (!phba) {
dev_err(&pcidev->dev, "beiscsi_remove called with no phba \n"); dev_err(&pcidev->dev, "beiscsi_remove called with no phba\n");
return; return;
} }
...@@ -3782,7 +3785,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev, ...@@ -3782,7 +3785,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
phba = beiscsi_hba_alloc(pcidev); phba = beiscsi_hba_alloc(pcidev);
if (!phba) { if (!phba) {
dev_err(&pcidev->dev, "beiscsi_dev_probe-" dev_err(&pcidev->dev, "beiscsi_dev_probe-"
" Failed in beiscsi_hba_alloc \n"); " Failed in beiscsi_hba_alloc\n");
goto disable_pci; goto disable_pci;
} }
...@@ -3805,7 +3808,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev, ...@@ -3805,7 +3808,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
else else
num_cpus = 1; num_cpus = 1;
phba->num_cpus = num_cpus; phba->num_cpus = num_cpus;
SE_DEBUG(DBG_LVL_8, "num_cpus = %d \n", phba->num_cpus); SE_DEBUG(DBG_LVL_8, "num_cpus = %d\n", phba->num_cpus);
if (enable_msix) if (enable_msix)
beiscsi_msix_enable(phba); beiscsi_msix_enable(phba);
...@@ -3877,7 +3880,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev, ...@@ -3877,7 +3880,7 @@ static int __devinit beiscsi_dev_probe(struct pci_dev *pcidev,
"Failed to hwi_enable_intr\n"); "Failed to hwi_enable_intr\n");
goto free_ctrlr; goto free_ctrlr;
} }
SE_DEBUG(DBG_LVL_8, "\n\n\n SUCCESS - DRIVER LOADED \n\n\n"); SE_DEBUG(DBG_LVL_8, "\n\n\n SUCCESS - DRIVER LOADED\n\n\n");
return 0; return 0;
free_ctrlr: free_ctrlr:
...@@ -3989,7 +3992,7 @@ static int __init beiscsi_module_init(void) ...@@ -3989,7 +3992,7 @@ static int __init beiscsi_module_init(void)
"transport.\n"); "transport.\n");
return -ENOMEM; return -ENOMEM;
} }
SE_DEBUG(DBG_LVL_8, "In beiscsi_module_init, tt=%p \n", SE_DEBUG(DBG_LVL_8, "In beiscsi_module_init, tt=%p\n",
&beiscsi_iscsi_transport); &beiscsi_iscsi_transport);
ret = pci_register_driver(&beiscsi_pci_driver); ret = pci_register_driver(&beiscsi_pci_driver);
......
drivers/scsi/be2iscsi/be_main.h
View file @ 457ff3b7
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
"Linux iSCSI Driver version" BUILD_STR "Linux iSCSI Driver version" BUILD_STR
#define DRV_DESC BE_NAME " " "Driver" #define DRV_DESC BE_NAME " " "Driver"
#define BE_VENDOR_ID 0x19A2 #define BE_VENDOR_ID 0x19A2
/* DEVICE ID's for BE2 */ /* DEVICE ID's for BE2 */
#define BE_DEVICE_ID1 0x212 #define BE_DEVICE_ID1 0x212
#define OC_DEVICE_ID1 0x702 #define OC_DEVICE_ID1 0x702
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
#define BEISCSI_NUM_MAX_LUN 256 /* scsi_host->max_lun */ #define BEISCSI_NUM_MAX_LUN 256 /* scsi_host->max_lun */
#define BEISCSI_NUM_DEVICES_SUPPORTED 0x01 #define BEISCSI_NUM_DEVICES_SUPPORTED 0x01
#define BEISCSI_MAX_FRAGS_INIT 192 #define BEISCSI_MAX_FRAGS_INIT 192
#define BE_NUM_MSIX_ENTRIES 1 #define BE_NUM_MSIX_ENTRIES 1
#define MPU_EP_SEMAPHORE 0xac #define MPU_EP_SEMAPHORE 0xac
#define BE_SENSE_INFO_SIZE 258 #define BE_SENSE_INFO_SIZE 258
#define BE_ISCSI_PDU_HEADER_SIZE 64 #define BE_ISCSI_PDU_HEADER_SIZE 64
...@@ -105,7 +105,7 @@ do { \ ...@@ -105,7 +105,7 @@ do { \
#define HWI_GET_ASYNC_PDU_CTX(phwi) (phwi->phwi_ctxt->pasync_ctx) #define HWI_GET_ASYNC_PDU_CTX(phwi) (phwi->phwi_ctxt->pasync_ctx)
/********* Memory BAR register ************/ /********* Memory BAR register ************/
#define PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET 0xfc #define PCICFG_MEMBAR_CTRL_INT_CTRL_OFFSET 0xfc
/** /**
* Host Interrupt Enable, if set interrupts are enabled although "PCI Interrupt * Host Interrupt Enable, if set interrupts are enabled although "PCI Interrupt
* Disable" may still globally block interrupts in addition to individual * Disable" may still globally block interrupts in addition to individual
...@@ -116,7 +116,7 @@ do { \ ...@@ -116,7 +116,7 @@ do { \
#define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */ #define MEMBAR_CTRL_INT_CTRL_HOSTINTR_MASK (1 << 29) /* bit 29 */
/********* ISR0 Register offset **********/ /********* ISR0 Register offset **********/
#define CEV_ISR0_OFFSET 0xC18 #define CEV_ISR0_OFFSET 0xC18
#define CEV_ISR_SIZE 4 #define CEV_ISR_SIZE 4
/** /**
...@@ -139,12 +139,12 @@ do { \ ...@@ -139,12 +139,12 @@ do { \
#define DB_EQ_REARM_SHIFT (29) /* bit 29 */ #define DB_EQ_REARM_SHIFT (29) /* bit 29 */
/********* Compl Q door bell *************/ /********* Compl Q door bell *************/
#define DB_CQ_OFFSET 0x120 #define DB_CQ_OFFSET 0x120
#define DB_CQ_RING_ID_MASK 0x3FF /* bits 0 - 9 */ #define DB_CQ_RING_ID_MASK 0x3FF /* bits 0 - 9 */
/* Number of event entries processed */ /* Number of event entries processed */
#define DB_CQ_NUM_POPPED_SHIFT (16) /* bits 16 - 28 */ #define DB_CQ_NUM_POPPED_SHIFT (16) /* bits 16 - 28 */
/* Rearm bit */ /* Rearm bit */
#define DB_CQ_REARM_SHIFT (29) /* bit 29 */ #define DB_CQ_REARM_SHIFT (29) /* bit 29 */
#define GET_HWI_CONTROLLER_WS(pc) (pc->phwi_ctrlr) #define GET_HWI_CONTROLLER_WS(pc) (pc->phwi_ctrlr)
#define HWI_GET_DEF_BUFQ_ID(pc) (((struct hwi_controller *)\ #define HWI_GET_DEF_BUFQ_ID(pc) (((struct hwi_controller *)\
...@@ -161,12 +161,12 @@ enum be_mem_enum { ...@@ -161,12 +161,12 @@ enum be_mem_enum {
HWI_MEM_WRBH, HWI_MEM_WRBH,
HWI_MEM_SGLH, HWI_MEM_SGLH,
HWI_MEM_SGE, HWI_MEM_SGE,
HWI_MEM_ASYNC_HEADER_BUF, /* 5 */ HWI_MEM_ASYNC_HEADER_BUF, /* 5 */
HWI_MEM_ASYNC_DATA_BUF, HWI_MEM_ASYNC_DATA_BUF,
HWI_MEM_ASYNC_HEADER_RING, HWI_MEM_ASYNC_HEADER_RING,
HWI_MEM_ASYNC_DATA_RING, HWI_MEM_ASYNC_DATA_RING,
HWI_MEM_ASYNC_HEADER_HANDLE, HWI_MEM_ASYNC_HEADER_HANDLE,
HWI_MEM_ASYNC_DATA_HANDLE, /* 10 */ HWI_MEM_ASYNC_DATA_HANDLE, /* 10 */
HWI_MEM_ASYNC_PDU_CONTEXT, HWI_MEM_ASYNC_PDU_CONTEXT,
ISCSI_MEM_GLOBAL_HEADER, ISCSI_MEM_GLOBAL_HEADER,
SE_MEM_MAX SE_MEM_MAX
......
drivers/scsi/be2iscsi/be_mgmt.c
View file @ 457ff3b7
...@@ -58,7 +58,7 @@ unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl, ...@@ -58,7 +58,7 @@ unsigned char mgmt_get_fw_config(struct be_ctrl_info *ctrl,
} }
} else { } else {
shost_printk(KERN_WARNING, phba->shost, shost_printk(KERN_WARNING, phba->shost,
"Failed in mgmt_get_fw_config \n"); "Failed in mgmt_get_fw_config\n");
} }
spin_unlock(&ctrl->mbox_lock); spin_unlock(&ctrl->mbox_lock);
...@@ -167,7 +167,7 @@ unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba, ...@@ -167,7 +167,7 @@ unsigned char mgmt_invalidate_icds(struct beiscsi_hba *phba,
&nonemb_cmd.dma); &nonemb_cmd.dma);
if (nonemb_cmd.va == NULL) { if (nonemb_cmd.va == NULL) {
SE_DEBUG(DBG_LVL_1, SE_DEBUG(DBG_LVL_1,
"Failed to allocate memory for mgmt_invalidate_icds\n"); "Failed to alloc memory for mgmt_invalidate_icds\n");
spin_unlock(&ctrl->mbox_lock); spin_unlock(&ctrl->mbox_lock);
return 0; return 0;
} }
...@@ -339,7 +339,7 @@ int mgmt_open_connection(struct beiscsi_hba *phba, ...@@ -339,7 +339,7 @@ int mgmt_open_connection(struct beiscsi_hba *phba,
if (phba->nxt_cqid == phba->num_cpus) if (phba->nxt_cqid == phba->num_cpus)
phba->nxt_cqid = 0; phba->nxt_cqid = 0;
req->cq_id = phwi_context->be_cq[i].id; req->cq_id = phwi_context->be_cq[i].id;
SE_DEBUG(DBG_LVL_8, "i=%d cq_id=%d \n", i, req->cq_id); SE_DEBUG(DBG_LVL_8, "i=%d cq_id=%d\n", i, req->cq_id);
req->defq_id = def_hdr_id; req->defq_id = def_hdr_id;
req->hdr_ring_id = def_hdr_id; req->hdr_ring_id = def_hdr_id;
req->data_ring_id = def_data_id; req->data_ring_id = def_data_id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7