Skip to contentSkip to conversation

block: IBM RamSan 70/80 driver fixes.

PATCH In review Philip J. Kelleher 2 participants 3 messages Feb 19, 2013 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 block: IBM RamSan 70/80 driver fixes.

From: Philip J Kelleher <[email protected]>

This patch include a few driver fixes for the IBM RamSan 70/80 driver.

---------------------------------------------------------------------
NOTE: This patch is built off of Jen's for-next branch.

This patch include the previous changes of:
o Changed the creg_ctrl lock from a mutex to a spinlock.
o Added a count check for ioctl calls.
o Removed unnecessary casting of void pointers.
o Made every function static that needed to be.
o Added comments to explain things more thoroughly.

As well of changes that include:
o Removal of wmb()
o Changed void * into actually structure.

drivers/block/rsxx/config.c +3 -5
diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/config.c linux-block/drivers/block/rsxx/config.c
@@ -29,10 +29,8 @@
 #include "rsxx_priv.h"
 #include "rsxx_cfg.h"
 
-static void initialize_config(void *config)
+static void initialize_config(struct rsxx_card_cfg *cfg)
 {
-	struct rsxx_card_cfg *cfg = (struct rsxx_card_cfg *) config;
-
 	cfg->hdr.version = RSXX_CFG_VERSION;
 
 	cfg->data.block_size        = RSXX_HW_BLK_SIZE;
@@ -97,7 +95,7 @@ static void config_data_cpu_to_le(struct
 
 
 /*----------------- Config Operations ------------------*/
-int rsxx_save_config(struct rsxx_cardinfo *card)
+static int rsxx_save_config(struct rsxx_cardinfo *card)
 {
 	struct rsxx_card_cfg cfg;
 	int st;
@@ -181,7 +179,7 @@ int rsxx_load_config(struct rsxx_cardinf
 	} else {
 		dev_info(CARD_TO_DEV(card),
 			"Initializing card configuration.\n");
-		initialize_config(card);
+		initialize_config(&card->config);
 		st = rsxx_save_config(card);
 		if (st)
 			return st;
drivers/block/rsxx/core.c +21 -23

97 lines not on this page · raw message

drivers/block/rsxx/cregs.c +32 -24

168 lines not on this page · raw message

drivers/block/rsxx/dev.c +1 -1
diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/dev.c linux-block/drivers/block/rsxx/dev.c
@@ -149,7 +149,7 @@ static void bio_dma_done_cb(struct rsxx_
 			    void *cb_data,
 			    unsigned int error)
 {
-	struct rsxx_bio_meta *meta = (struct rsxx_bio_meta *)cb_data;
+	struct rsxx_bio_meta *meta = cb_data;
 
 	if (error)
 		atomic_set(&meta->error, 1);
drivers/block/rsxx/dma.c +5 -17
diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/dma.c linux-block/drivers/block/rsxx/dma.c
@@ -102,7 +102,7 @@ struct dma_tracker_list {
 
 
 /*----------------- Misc Utility Functions -------------------*/
-unsigned int rsxx_addr8_to_laddr(u64 addr8, struct rsxx_cardinfo *card)
+static unsigned int rsxx_addr8_to_laddr(u64 addr8, struct rsxx_cardinfo *card)
 {
 	unsigned long long tgt_addr8;
 
@@ -113,7 +113,7 @@ unsigned int rsxx_addr8_to_laddr(u64 add
 	return tgt_addr8;
 }
 
-unsigned int rsxx_get_dma_tgt(struct rsxx_cardinfo *card, u64 addr8)
+static unsigned int rsxx_get_dma_tgt(struct rsxx_cardinfo *card, u64 addr8)
 {
 	unsigned int tgt;
 
@@ -432,16 +432,6 @@ static void rsxx_issue_dmas(struct work_
 
 	/* Let HW know we've queued commands. */
 	if (cmds_pending) {
-		/*
-		 * We must guarantee that the CPU writes to 'ctrl->cmd.buf'
-		 * (which is in PCI-consistent system-memory) from the loop
-		 * above make it into the coherency domain before the
-		 * following PIO "trigger" updating the cmd.idx.  A WMB is
-		 * sufficient. We need not explicitly CPU cache-flush since
-		 * the memory is a PCI-consistent (ie; coherent) mapping.
-		 */
-		wmb();
-
 		atomic_add(cmds_pending, &ctrl->stats.hw_q_depth);
 		mod_timer(&ctrl->activity_timer,
 			  jiffies + DMA_ACTIVITY_TIMEOUT);
@@ -757,7 +747,7 @@ static int rsxx_dma_ctrl_init(struct pci
 	INIT_LIST_HEAD(&ctrl->queue);
 
 	setup_timer(&ctrl->activity_timer, dma_engine_stalled,
-		    (unsigned long)ctrl);
+					(unsigned long)ctrl);
 
 	ctrl->issue_wq = alloc_ordered_workqueue(DRIVER_NAME"_issue", 0);
 	if (!ctrl->issue_wq)
@@ -798,12 +788,10 @@ static int rsxx_dma_ctrl_init(struct pci
 	iowrite32(ctrl->cmd.idx, ctrl->regmap + HW_CMD_IDX);
 	iowrite32(ctrl->cmd.idx, ctrl->regmap + SW_CMD_IDX);
 
-	wmb();
-
 	return 0;
 }
 
-int rsxx_dma_stripe_setup(struct rsxx_cardinfo *card,
+static int rsxx_dma_stripe_setup(struct rsxx_cardinfo *card,
 			      unsigned int stripe_size8)
 {
 	if (!is_power_of_2(stripe_size8)) {
@@ -834,7 +822,7 @@ int rsxx_dma_stripe_setup(struct rsxx_ca
 	return 0;
 }
 
-int rsxx_dma_configure(struct rsxx_cardinfo *card)
+static int rsxx_dma_configure(struct rsxx_cardinfo *card)
 {
 	u32 intr_coal;
 
drivers/block/rsxx/rsxx.h +5 -1
diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/rsxx.h linux-block/drivers/block/rsxx/rsxx.h
@@ -27,14 +27,18 @@
 
 /*----------------- IOCTL Definitions -------------------*/
 
+#define RSXX_MAX_DATA 8
+
 struct rsxx_reg_access {
 	__u32 addr;
 	__u32 cnt;
 	__u32 stat;
 	__u32 stream;
-	__u32 data[8];
+	__u32 data[RSXX_MAX_DATA];
 };
 
+#define RSXX_MAX_REG_CNT	(RSXX_MAX_DATA * (sizeof(__u32)))
+
 #define RSXX_IOC_MAGIC 'r'
 
 #define RSXX_GETREG _IOWR(RSXX_IOC_MAGIC, 0x20, struct rsxx_reg_access)
drivers/block/rsxx/rsxx_priv.h +1 -10
diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/rsxx_priv.h linux-block/drivers/block/rsxx/rsxx_priv.h
@@ -127,7 +127,7 @@ struct rsxx_cardinfo {
 
 	/* Embedded CPU Communication */
 	struct {
-		struct mutex		lock;
+		spinlock_t		lock;
 		bool			active;
 		struct creg_cmd		*active_cmd;
 		struct work_struct	done_work;
@@ -141,7 +141,6 @@ struct rsxx_cardinfo {
 		} creg_stats;
 		struct timer_list	cmd_timer;
 		struct mutex		reset_lock;
-		spinlock_t		pop_lock;
 		int			reset;
 	} creg_ctrl;
 
@@ -336,7 +335,6 @@ static inline unsigned int CREG_DATA(int
 
 /***** config.c *****/
 int rsxx_load_config(struct rsxx_cardinfo *card);
-int rsxx_save_config(struct rsxx_cardinfo *card);
 
 /***** core.c *****/
 void rsxx_enable_ier(struct rsxx_cardinfo *card, unsigned int intr);
@@ -345,8 +343,6 @@ void rsxx_enable_ier_and_isr(struct rsxx
 				 unsigned int intr);
 void rsxx_disable_ier_and_isr(struct rsxx_cardinfo *card,
 				  unsigned int intr);
-char *rsxx_card_state_to_str(unsigned int state);
-irqreturn_t rsxx_isr(int irq, void *pdata);
 
 /***** dev.c *****/
 int rsxx_attach_dev(struct rsxx_cardinfo *card);
@@ -364,16 +360,11 @@ int rsxx_dma_setup(struct rsxx_cardinfo 
 void rsxx_dma_destroy(struct rsxx_cardinfo *card);
 int rsxx_dma_init(void);
 void rsxx_dma_cleanup(void);
-int rsxx_dma_configure(struct rsxx_cardinfo *card);
 int rsxx_dma_queue_bio(struct rsxx_cardinfo *card,
 			   struct bio *bio,
 			   atomic_t *n_dmas,
 			   rsxx_dma_cb cb,
 			   void *cb_data);
-int rsxx_dma_stripe_setup(struct rsxx_cardinfo *card,
-			      unsigned int stripe_size8);
-unsigned int rsxx_get_dma_tgt(struct rsxx_cardinfo *card, u64 addr8);
-unsigned int rsxx_addr8_to_laddr(u64 addr8, struct rsxx_cardinfo *card);
 
 /***** cregs.c *****/
 int rsxx_creg_write(struct rsxx_cardinfo *card, u32 addr,
#1 lore raw
Quoted 3 lines · Philip J. Kelleher

From: Philip J Kelleher <[email protected]>

This patch include a few driver fixes for the IBM RamSan 70/80 driver.

trivial comments:

Quoted 1 line

diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/config.c linux-block/drivers/block/rsxx/config.c

[]

drivers/block/rsxx/core.c irqreturn_t rsxx_isr(int irq, void *pdat · line 164

Quoted 5 lines
drivers/block/rsxx/core.c +1 -0
@@ -161,6 +161,17 @@ irqreturn_t rsxx_isr(int irq, void *pdat
 }
 
 /*----------------- Card Event Handler -------------------*/
+static char *rsxx_card_state_to_str(unsigned int state)

static const char *

drivers/block/rsxx/core.c irqreturn_t rsxx_isr(int irq, void *pdat · line 166

Quoted 2 lines
drivers/block/rsxx/core.c +2 -0
+{
+	static char *state_strings[] = {

static const char * const state_strings[] = {

drivers/block/rsxx/core.c irqreturn_t rsxx_isr(int irq, void *pdat · line 170

Quoted 4 lines
drivers/block/rsxx/core.c +4 -0
+		"Unknown", "Shutdown", "Starting", "Formatting",
+		"Uninitialized", "Good", "Shutting Down",
+		"Fault", "Read Only Fault", "dStroying"
+	};

[]

drivers/block/rsxx/cregs.c static int __issue_creg_rw(struct rsxx_c · line 395

Quoted 6 lines
drivers/block/rsxx/cregs.c +2 -0
@@ -390,8 +391,13 @@ static int __issue_creg_rw(struct rsxx_c
 	if (st)
 		return st;
 
+	/*
+	 * This timeout is neccessary for unresponsive hardware. The additional

One "c" in necessary

drivers/block/rsxx/cregs.c static int __issue_creg_rw(struct rsxx_c · line 400

Quoted 6 lines
drivers/block/rsxx/cregs.c +4 -1
+	 * 20 seconds to used to guarantee that each cregs requests has time to
+	 * complete.
+	 */
 	timeout = msecs_to_jiffies((CREG_TIMEOUT_MSEC *
-				    card->creg_ctrl.q_depth) + 20000);
+				card->creg_ctrl.q_depth) + 20000);

The alignment was nicer before this change.
Still using unnecessary parentheses.

#2 lore raw

Thanks for the response.

Comments inline.

Quoted 8 lines · Joe Perches
Quoted 3 lines · Philip J. Kelleher

From: Philip J Kelleher <[email protected]>

This patch include a few driver fixes for the IBM RamSan 70/80 driver.

trivial comments:

Quoted 1 line

diff -uprN -X linux-block-vanilla/Documentation/dontdiff linux-block-vanilla/drivers/block/rsxx/config.c linux-block/drivers/block/rsxx/config.c

Quoted 9 lines

[]

drivers/block/rsxx/core.c irqreturn_t rsxx_isr(int irq, void *pdat · line 164

Quoted 5 lines
drivers/block/rsxx/core.c +1 -0
@@ -161,6 +161,17 @@ irqreturn_t rsxx_isr(int irq, void *pdat
 }
 
 /*----------------- Card Event Handler -------------------*/
+static char *rsxx_card_state_to_str(unsigned int state)

static const char *

Ok.

Quoted 5 lines

drivers/block/rsxx/core.c irqreturn_t rsxx_isr(int irq, void *pdat · line 166

Quoted 2 lines
drivers/block/rsxx/core.c +2 -0
+{
+	static char *state_strings[] = {

static const char * const state_strings[] = {

Ok.

Quoted 7 lines

drivers/block/rsxx/core.c irqreturn_t rsxx_isr(int irq, void *pdat · line 170

Quoted 4 lines
drivers/block/rsxx/core.c +4 -0
+		"Unknown", "Shutdown", "Starting", "Formatting",
+		"Uninitialized", "Good", "Shutting Down",
+		"Fault", "Read Only Fault", "dStroying"
+	};

[]

Quoted 9 lines

drivers/block/rsxx/cregs.c static int __issue_creg_rw(struct rsxx_c · line 395

Quoted 6 lines
drivers/block/rsxx/cregs.c +2 -0
@@ -390,8 +391,13 @@ static int __issue_creg_rw(struct rsxx_c
 	if (st)
 		return st;
 
+	/*
+	 * This timeout is neccessary for unresponsive hardware. The additional

One "c" in necessary

Haha... Oops. Thanks.

Quoted 11 lines

drivers/block/rsxx/cregs.c static int __issue_creg_rw(struct rsxx_c · line 400

Quoted 6 lines
drivers/block/rsxx/cregs.c +4 -1
+	 * 20 seconds to used to guarantee that each cregs requests has time to
+	 * complete.
+	 */
 	timeout = msecs_to_jiffies((CREG_TIMEOUT_MSEC *
-				    card->creg_ctrl.q_depth) + 20000);
+				card->creg_ctrl.q_depth) + 20000);

The alignment was nicer before this change.
Still using unnecessary parentheses.

Agreed.