Skip to contentSkip to conversation

be2iscsi: Fixes for powerpc compile

PATCH New Jayamohan Kallickal 1 participant 1 message Sep 9, 2009

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

PATCH 1/1 be2iscsi: Fixes for powerpc compile

This patch fixes the tab / code alignment concerns exressed by Mike Christie. This also contains fixes to remove virt_to_* family from the driver. It contains some function name changes to a few low level functions to avoid name clash with our net driver.

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

---
 drivers/scsi/be2iscsi/be.h       |    4 +-
 drivers/scsi/be2iscsi/be_cmds.c  |   27 +++++++---------
 drivers/scsi/be2iscsi/be_cmds.h  |   16 +++++-----
 drivers/scsi/be2iscsi/be_iscsi.c |   60 +++++++++++++++++++++++++++++++++++--
 drivers/scsi/be2iscsi/be_iscsi.h |    2 +
 drivers/scsi/be2iscsi/be_main.c  |   58 ++++++++++++++++++------------------
 drivers/scsi/be2iscsi/be_main.h  |    3 +-
 7 files changed, 111 insertions(+), 59 deletions(-)
drivers/scsi/be2iscsi/be.h +2 -2
index 8c973a2..b36020d 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,
-		u16 num_popped);
+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 +12 -15
index 63afea2..08007b6 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,8 +203,8 @@ 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,
-		struct be_queue_info *eq, int eq_delay)
+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);
 	struct be_cmd_req_eq_create *req = embedded_payload(wrb);
@@ -270,9 +271,9 @@ int be_cmd_fw_initialize(struct be_ctrl_info *ctrl)
 	return status;
 }
 
-int be_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)
+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)
 {
 	struct be_mcc_wrb *wrb = wrb_from_mbox(&ctrl->mbox_mem);
 	struct be_cmd_req_cq_create *req = embedded_payload(wrb);
@@ -289,12 +290,8 @@ int be_cmd_cq_create(struct be_ctrl_info *ctrl,
 	be_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
 			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",
-								q_mem->va);
-	} else
-		SE_DEBUG(DBG_LVL_1,
-			"In be_cmd_cq_create, uninitialized q_mem->va\n");
+	if (!q_mem->va)
+		SE_DEBUG(DBG_LVL_1, "uninitialized q_mem->va\n");
 
 	req->num_pages = cpu_to_le16(PAGES_4K_SPANNED(q_mem->va, q_mem->size));
 
@@ -332,8 +329,8 @@ 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 queue_type)
+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);
 	struct be_cmd_req_q_destroy *req = embedded_payload(wrb);
@@ -521,6 +518,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 +8 -8
index 1dc52cc..c20d686 100644
@@ -407,16 +407,16 @@ struct be_cmd_resp_get_mac_addr {
 	u32 rsvd[23];
 };
 
-int be_cmd_eq_create(struct be_ctrl_info *ctrl,
-		     struct be_queue_info *eq, int eq_delay);
+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,
-		     struct be_queue_info *cq, struct be_queue_info *eq,
-		     bool sol_evts, bool no_delay,
-		     int num_cqe_dma_coalesce);
+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 type);
+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);
 int be_cmd_get_mac_addr(struct be_ctrl_info *ctrl, u8 *mac_addr);
drivers/scsi/be2iscsi/be_iscsi.c +56 -4

78 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