Skip to contentSkip to conversation

be2iscsi: Fixes for powerpc compile

PATCH In review Jayamohan Kallickal 2 participants 2 messages Sep 8, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 be2iscsi: Fixes for powerpc compile

This patch contains fixes to remove virt_to_* family from the driver. It also contains some function name changes to a few low level functions to avoid name clash with our net driver.

This patch is a diff on
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git

---
 drivers/scsi/be2iscsi/be.h       |    2 +-
 drivers/scsi/be2iscsi/be_cmds.c  |   15 +++++----
 drivers/scsi/be2iscsi/be_cmds.h  |    6 ++--
 drivers/scsi/be2iscsi/be_iscsi.c |   62 +++++++++++++++++++++++++++++++++++--
 drivers/scsi/be2iscsi/be_iscsi.h |    2 +
 drivers/scsi/be2iscsi/be_main.c  |   58 +++++++++++++++++-----------------
 drivers/scsi/be2iscsi/be_main.h  |    3 +-
 7 files changed, 103 insertions(+), 45 deletions(-)
drivers/scsi/be2iscsi/be.h +1 -1
index 8c973a2..751721e 100644
@@ -177,7 +177,7 @@ static inline void swap_dws(void *wrb, int len)
 #endif /* __BIG_ENDIAN */
 }
 
-extern void be_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm,
+extern void beiscsi_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm,
 		u16 num_popped);
 
 #endif /* BEISCSI_H */
drivers/scsi/be2iscsi/be_cmds.c +8 -7
index 63afea2..4b92a7b 100644
@@ -60,7 +60,8 @@ static inline bool is_link_state_evt(u32 trailer)
 		ASYNC_TRAILER_EVENT_CODE_MASK) == ASYNC_EVENT_CODE_LINK_STATE);
 }
 
-void be_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm, u16 num_popped)
+void beiscsi_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm,
+							 u16 num_popped)
 {
 	u32 val = 0;
 	val |= qid & DB_CQ_RING_ID_MASK;
@@ -202,7 +203,7 @@ struct be_mcc_wrb *wrb_from_mbox(struct be_dma_mem *mbox_mem)
 	return &((struct be_mcc_mailbox *)(mbox_mem->va))->wrb;
 }
 
-int be_cmd_eq_create(struct be_ctrl_info *ctrl,
+int beiscsi_cmd_eq_create(struct be_ctrl_info *ctrl,
 		struct be_queue_info *eq, int eq_delay)
 {
 	struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
@@ -270,7 +271,7 @@ int be_cmd_fw_initialize(struct be_ctrl_info *ctrl)
 	return status;
 }
 
-int be_cmd_cq_create(struct be_ctrl_info *ctrl,
+int beiscsi_cmd_cq_create(struct be_ctrl_info *ctrl,
 		      struct be_queue_info *cq, struct be_queue_info *eq,
 		      bool sol_evts, bool no_delay, int coalesce_wm)
 {
@@ -290,11 +291,11 @@ int be_cmd_cq_create(struct be_ctrl_info *ctrl,
 			OPCODE_COMMON_CQ_CREATE, sizeof(*req));
 
 	if (q_mem->va) {
-		SE_DEBUG(DBG_LVL_8, "In be_cmd_cq_create, q_mem->va =%p \n",
+		SE_DEBUG(DBG_LVL_8, "beiscsi_cmd_cq_create, q_mem->va =%p \n",
 								q_mem->va);
 	} else
 		SE_DEBUG(DBG_LVL_1,
-			"In be_cmd_cq_create, uninitialized q_mem->va\n");
+			"In beiscsi_cmd_cq_create, uninitialized q_mem->va\n");
 
 	req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
 
@@ -332,7 +333,7 @@ static u32 be_encoded_q_len(int q_len)
 		len_encoded = 0;
 	return len_encoded;
 }
-int be_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
+int beiscsi_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
 							int queue_type)
 {
 	struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
@@ -521,6 +522,6 @@ int be_cmd_iscsi_post_sgl_pages(struct be_ctrl_info *ctrl,
 error:
 	spin_unlock(&ctrl->mbox_lock);
 	if (status != 0)
-		be_cmd_q_destroy(ctrl, NULL, QTYPE_SGL);
+		beiscsi_cmd_q_destroy(ctrl, NULL, QTYPE_SGL);
 	return status;
 }
drivers/scsi/be2iscsi/be_cmds.h +3 -3
index 1dc52cc..175506c 100644
@@ -407,15 +407,15 @@ struct be_cmd_resp_get_mac_addr {
 	u32 rsvd[23];
 };
 
-int be_cmd_eq_create(struct be_ctrl_info *ctrl,
+int beiscsi_cmd_eq_create(struct be_ctrl_info *ctrl,
 		     struct be_queue_info *eq, int eq_delay);
 
-int be_cmd_cq_create(struct be_ctrl_info *ctrl,
+int beiscsi_cmd_cq_create(struct be_ctrl_info *ctrl,
 		     struct be_queue_info *cq, struct be_queue_info *eq,
 		     bool sol_evts, bool no_delay,
 		     int num_cqe_dma_coalesce);
 
-int be_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
+int beiscsi_cmd_q_destroy(struct be_ctrl_info *ctrl, struct be_queue_info *q,
 		     int type);
 int be_poll_mcc(struct be_ctrl_info *ctrl);
 unsigned char mgmt_check_supported_fw(struct be_ctrl_info *ctrl);
drivers/scsi/be2iscsi/be_iscsi.c +58 -4

80 lines not on this page · raw message

drivers/scsi/be2iscsi/be_iscsi.h +2 -0
index fab16fd..f92ffc5 100644
@@ -39,6 +39,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
 						 uint16_t qdepth,
 						 uint32_t initial_cmdsn);
 
+void beiscsi_session_destroy(struct iscsi_cls_session *cls_session);
+
 struct iscsi_cls_conn *beiscsi_conn_create(struct iscsi_cls_session
 					   *cls_session, uint32_t cid);
 
drivers/scsi/be2iscsi/be_main.c +29 -29

166 lines not on this page · raw message

drivers/scsi/be2iscsi/be_main.h +2 -1
index 2c5022e..2520c39 100644
@@ -386,7 +386,8 @@ struct beiscsi_io_task {
 	unsigned short cid;
 	unsigned short header_len;
 
-	struct be_cmd_bhs cmd_bhs;
+	unsigned int alloc_size;
+	struct be_cmd_bhs *cmd_bhs;
 	struct be_bus_address bhs_pa;
 	unsigned short bhs_len;
 };
Signature · 1 line
1.6.4
#1 lore raw
Quoted 36 lines · Jayamohan Kallickal

This patch contains fixes to remove virt_to_* family from the driver. It also contains some function name changes to a few low level functions to avoid name clash with our net driver.

This patch is a diff on
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git

---
  drivers/scsi/be2iscsi/be.h       |    2 +-
  drivers/scsi/be2iscsi/be_cmds.c  |   15 +++++----
  drivers/scsi/be2iscsi/be_cmds.h  |    6 ++--
  drivers/scsi/be2iscsi/be_iscsi.c |   62 +++++++++++++++++++++++++++++++++++--
  drivers/scsi/be2iscsi/be_iscsi.h |    2 +
  drivers/scsi/be2iscsi/be_main.c  |   58 +++++++++++++++++-----------------
  drivers/scsi/be2iscsi/be_main.h  |    3 +-
  7 files changed, 103 insertions(+), 45 deletions(-)
drivers/scsi/be2iscsi/be.h +1 -1
index 8c973a2..751721e 100644
@@ -177,7 +177,7 @@ static inline void swap_dws(void *wrb, int len)
  #endif /* __BIG_ENDIAN */
  }
 
-extern void be_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm,
+extern void beiscsi_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm,
  		u16 num_popped);
 
  #endif /* BEISCSI_H */
drivers/scsi/be2iscsi/be_cmds.c +0 -0
index 63afea2..4b92a7b 100644

drivers/scsi/be2iscsi/be_cmds.c static inline bool is_link_state_evt(u32 trailer) · line 64

Quoted 6 lines
drivers/scsi/be2iscsi/be_cmds.c +2 -1
@@ -60,7 +60,8 @@ static inline bool is_link_state_evt(u32 trailer)
  		ASYNC_TRAILER_EVENT_CODE_MASK) == ASYNC_EVENT_CODE_LINK_STATE);
  }
 
-void be_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm, u16 num_popped)
+void beiscsi_cq_notify(struct be_ctrl_info *ctrl, u16 qid, bool arm,
+							 u16 num_popped)

Looks like you got tab happy.

Quoted 36 lines
drivers/scsi/be2iscsi/be_iscsi.c +11 -3
index 5a8fa33..a58c704 100644
@@ -43,6 +43,15 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
  {
  	struct Scsi_Host *shost;
  	struct beiscsi_endpoint *beiscsi_ep;
+	struct iscsi_cls_session *cls_session;
+	struct iscsi_session *sess;
+	struct beiscsi_hba *phba;
+	struct iscsi_task *task;
+	struct beiscsi_io_task *io_task;
+	unsigned int max_size, num_cmd;
+	dma_addr_t bus_add;
+	u64 pa_addr;
+	void *vaddr;
 
  	SE_DEBUG(DBG_LVL_8, "In beiscsi_session_create\n");
 
@@ -51,7 +60,8 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
  		return NULL;
  	}
  	beiscsi_ep = ep->dd_data;
-	shost = beiscsi_ep->phba->shost;
+	phba = beiscsi_ep->phba;
+	shost = phba->shost;
  	if (cmds_max>  beiscsi_ep->phba->params.wrbs_per_cxn) {
  		shost_printk(KERN_ERR, shost, "Cannot handle %d cmds."
  			     "Max cmds per session supported is %d. Using %d. "
@@ -61,9 +71,53 @@ struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep,
  		cmds_max = beiscsi_ep->phba->params.wrbs_per_cxn;
  	}
 
-	return iscsi_session_setup(&beiscsi_iscsi_transport, shost, cmds_max,
-				   sizeof(struct beiscsi_io_task),

drivers/scsi/be2iscsi/be_iscsi.c struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, · line 82

Quoted 10 lines
drivers/scsi/be2iscsi/be_iscsi.c +9 -1
-				   initial_cmdsn, ISCSI_MAX_TARGET);
+	 cls_session = iscsi_session_setup(&beiscsi_iscsi_transport,
+					    shost, cmds_max,
+					    sizeof(struct beiscsi_io_task),
+					    initial_cmdsn, ISCSI_MAX_TARGET);
+	if (!cls_session)
+		return NULL;
+	sess = cls_session->dd_data;
+	max_size = ALIGN(sizeof(struct be_cmd_bhs), 64) * sess->cmds_max;
+	vaddr = pci_alloc_consistent(phba->pcidev,

Do you just want a dma/pci pool? It will align structs for you too, I think.

drivers/scsi/be2iscsi/be_iscsi.c struct iscsi_cls_session *beiscsi_session_create(struct iscsi_endpoint *ep, · line 84

Quoted 2 lines
drivers/scsi/be2iscsi/be_iscsi.c +2 -0
+						max_size,
+						&bus_add);

No need to break this up into multiple lines. Just put it on the same line as the as the pci_alloc_consistent.