block: IBM RamSan 70/80 driver fixes (c206c709) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/block/rsxx/config.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@

	static void initialize_config(void *config)		static void initialize_config(void *config)
	{		{
	struct rsxx_card_cfg cfg = (struct rsxx_card_cfg ) config;		struct rsxx_card_cfg *cfg = config;

	cfg->hdr.version = RSXX_CFG_VERSION;		cfg->hdr.version = RSXX_CFG_VERSION;

	@@ -97,7 +97,7 @@ static void config_data_cpu_to_le(struct rsxx_card_cfg *cfg)


	/----------------- Config Operations ------------------/		/----------------- Config Operations ------------------/
	int rsxx_save_config(struct rsxx_cardinfo *card)		static int rsxx_save_config(struct rsxx_cardinfo *card)
	{		{
	struct rsxx_card_cfg cfg;		struct rsxx_card_cfg cfg;
	int st;		int st;

drivers/block/rsxx/core.c

+21 −23

Original line number	Original line	Diff line number	Diff line
	@@ -102,9 +102,9 @@ void rsxx_disable_ier_and_isr(struct rsxx_cardinfo *card,
	iowrite32(card->ier_mask, card->regmap + IER);		iowrite32(card->ier_mask, card->regmap + IER);
	}		}

	irqreturn_t rsxx_isr(int irq, void *pdata)		static irqreturn_t rsxx_isr(int irq, void *pdata)
	{		{
	struct rsxx_cardinfo card = (struct rsxx_cardinfo ) pdata;		struct rsxx_cardinfo *card = pdata;
	unsigned int isr;		unsigned int isr;
	int handled = 0;		int handled = 0;
	int reread_isr;		int reread_isr;
	@@ -161,6 +161,17 @@ irqreturn_t rsxx_isr(int irq, void *pdata)
	}		}

	/----------------- Card Event Handler -------------------/		/----------------- Card Event Handler -------------------/
			static char *rsxx_card_state_to_str(unsigned int state)
			{
			static char *state_strings[] = {
			"Unknown", "Shutdown", "Starting", "Formatting",
			"Uninitialized", "Good", "Shutting Down",
			"Fault", "Read Only Fault", "dStroying"
			};

			return state_strings[ffs(state)];
			}

	static void card_state_change(struct rsxx_cardinfo *card,		static void card_state_change(struct rsxx_cardinfo *card,
	unsigned int new_state)		unsigned int new_state)
	{		{
	@@ -251,18 +262,6 @@ static void card_event_handler(struct work_struct *work)
	rsxx_read_hw_log(card);		rsxx_read_hw_log(card);
	}		}


	char *rsxx_card_state_to_str(unsigned int state)
	{
	static char *state_strings[] = {
	"Unknown", "Shutdown", "Starting", "Formatting",
	"Uninitialized", "Good", "Shutting Down",
	"Fault", "Read Only Fault", "dStroying"
	};

	return state_strings[ffs(state)];
	}

	/----------------- Card Operations -------------------/		/----------------- Card Operations -------------------/
	static int card_shutdown(struct rsxx_cardinfo *card)		static int card_shutdown(struct rsxx_cardinfo *card)
	{		{
	@@ -323,7 +322,6 @@ static int rsxx_pci_probe(struct pci_dev *dev,
	const struct pci_device_id *id)		const struct pci_device_id *id)
	{		{
	struct rsxx_cardinfo *card;		struct rsxx_cardinfo *card;
	unsigned long flags;
	int st;		int st;

	dev_info(&dev->dev, "PCI-Flash SSD discovered\n");		dev_info(&dev->dev, "PCI-Flash SSD discovered\n");
	@@ -386,9 +384,9 @@ static int rsxx_pci_probe(struct pci_dev *dev,
	spin_lock_init(&card->irq_lock);		spin_lock_init(&card->irq_lock);
	card->halt = 0;		card->halt = 0;

	spin_lock_irqsave(&card->irq_lock, flags);		spin_lock_irq(&card->irq_lock);
	rsxx_disable_ier_and_isr(card, CR_INTR_ALL);		rsxx_disable_ier_and_isr(card, CR_INTR_ALL);
	spin_unlock_irqrestore(&card->irq_lock, flags);		spin_unlock_irq(&card->irq_lock);

	if (!force_legacy) {		if (!force_legacy) {
	st = pci_enable_msi(dev);		st = pci_enable_msi(dev);
	@@ -408,9 +406,9 @@ static int rsxx_pci_probe(struct pci_dev *dev,
	/*********** Setup Processor Command Interface ***********/		/*********** Setup Processor Command Interface ***********/
	rsxx_creg_setup(card);		rsxx_creg_setup(card);

	spin_lock_irqsave(&card->irq_lock, flags);		spin_lock_irq(&card->irq_lock);
	rsxx_enable_ier_and_isr(card, CR_INTR_CREG);		rsxx_enable_ier_and_isr(card, CR_INTR_CREG);
	spin_unlock_irqrestore(&card->irq_lock, flags);		spin_unlock_irq(&card->irq_lock);

	st = rsxx_compatibility_check(card);		st = rsxx_compatibility_check(card);
	if (st) {		if (st) {
	@@ -463,9 +461,9 @@ static int rsxx_pci_probe(struct pci_dev *dev,
	* we can enable the event interrupt(it kicks off actions in		* we can enable the event interrupt(it kicks off actions in
	* those layers so we couldn't enable it right away.)		* those layers so we couldn't enable it right away.)
	*/		*/
	spin_lock_irqsave(&card->irq_lock, flags);		spin_lock_irq(&card->irq_lock);
	rsxx_enable_ier_and_isr(card, CR_INTR_EVENT);		rsxx_enable_ier_and_isr(card, CR_INTR_EVENT);
	spin_unlock_irqrestore(&card->irq_lock, flags);		spin_unlock_irq(&card->irq_lock);

	if (card->state == CARD_STATE_SHUTDOWN) {		if (card->state == CARD_STATE_SHUTDOWN) {
	st = rsxx_issue_card_cmd(card, CARD_CMD_STARTUP);		st = rsxx_issue_card_cmd(card, CARD_CMD_STARTUP);
	@@ -487,9 +485,9 @@ static int rsxx_pci_probe(struct pci_dev *dev,
	rsxx_dma_destroy(card);		rsxx_dma_destroy(card);
	failed_dma_setup:		failed_dma_setup:
	failed_compatiblity_check:		failed_compatiblity_check:
	spin_lock_irqsave(&card->irq_lock, flags);		spin_lock_irq(&card->irq_lock);
	rsxx_disable_ier_and_isr(card, CR_INTR_ALL);		rsxx_disable_ier_and_isr(card, CR_INTR_ALL);
	spin_unlock_irqrestore(&card->irq_lock, flags);		spin_unlock_irq(&card->irq_lock);
	free_irq(dev->irq, card);		free_irq(dev->irq, card);
	if (!force_legacy)		if (!force_legacy)
	pci_disable_msi(dev);		pci_disable_msi(dev);

drivers/block/rsxx/cregs.c

+37 −22

Original line number	Original line	Diff line number	Diff line
	@@ -107,10 +107,10 @@ static struct creg_cmd pop_active_cmd(struct rsxx_cardinfo card)
	* Spin lock is needed because this can be called in atomic/interrupt		* Spin lock is needed because this can be called in atomic/interrupt
	* context.		* context.
	*/		*/
	spin_lock_bh(&card->creg_ctrl.pop_lock);		spin_lock_bh(&card->creg_ctrl.lock);
	cmd = card->creg_ctrl.active_cmd;		cmd = card->creg_ctrl.active_cmd;
	card->creg_ctrl.active_cmd = NULL;		card->creg_ctrl.active_cmd = NULL;
	spin_unlock_bh(&card->creg_ctrl.pop_lock);		spin_unlock_bh(&card->creg_ctrl.lock);

	return cmd;		return cmd;
	}		}
	@@ -126,7 +126,11 @@ static void creg_issue_cmd(struct rsxx_cardinfo card, struct creg_cmd cmd)
	cmd->buf, cmd->stream);		cmd->buf, cmd->stream);
	}		}

	/* Data copy must complete before initiating the command. */		/*
			* Data copy must complete before initiating the command. This is
			* needed for weakly ordered processors (i.e. PowerPC), so that all
			* neccessary registers are written before we kick the hardware.
			*/
	wmb();		wmb();

	/* Setting the valid bit will kick off the command. */		/* Setting the valid bit will kick off the command. */
	@@ -192,11 +196,11 @@ static int creg_queue_cmd(struct rsxx_cardinfo *card,
	cmd->cb_private = cb_private;		cmd->cb_private = cb_private;
	cmd->status = 0;		cmd->status = 0;

	mutex_lock(&card->creg_ctrl.lock);		spin_lock(&card->creg_ctrl.lock);
	list_add_tail(&cmd->list, &card->creg_ctrl.queue);		list_add_tail(&cmd->list, &card->creg_ctrl.queue);
	card->creg_ctrl.q_depth++;		card->creg_ctrl.q_depth++;
	creg_kick_queue(card);		creg_kick_queue(card);
	mutex_unlock(&card->creg_ctrl.lock);		spin_unlock(&card->creg_ctrl.lock);

	return 0;		return 0;
	}		}
	@@ -219,10 +223,11 @@ static void creg_cmd_timed_out(unsigned long data)

	kmem_cache_free(creg_cmd_pool, cmd);		kmem_cache_free(creg_cmd_pool, cmd);

	spin_lock(&card->creg_ctrl.pop_lock);
			spin_lock(&card->creg_ctrl.lock);
	card->creg_ctrl.active = 0;		card->creg_ctrl.active = 0;
	creg_kick_queue(card);		creg_kick_queue(card);
	spin_unlock(&card->creg_ctrl.pop_lock);		spin_unlock(&card->creg_ctrl.lock);
	}		}


	@@ -291,10 +296,10 @@ static void creg_cmd_done(struct work_struct *work)

	kmem_cache_free(creg_cmd_pool, cmd);		kmem_cache_free(creg_cmd_pool, cmd);

	mutex_lock(&card->creg_ctrl.lock);		spin_lock(&card->creg_ctrl.lock);
	card->creg_ctrl.active = 0;		card->creg_ctrl.active = 0;
	creg_kick_queue(card);		creg_kick_queue(card);
	mutex_unlock(&card->creg_ctrl.lock);		spin_unlock(&card->creg_ctrl.lock);
	}		}

	static void creg_reset(struct rsxx_cardinfo *card)		static void creg_reset(struct rsxx_cardinfo *card)
	@@ -303,6 +308,10 @@ static void creg_reset(struct rsxx_cardinfo *card)
	struct creg_cmd *tmp;		struct creg_cmd *tmp;
	unsigned long flags;		unsigned long flags;

			/*
			* mutex_trylock is used here because if reset_lock is taken then a
			* reset is already happening. So, we can just go ahead and return.
			*/
	if (!mutex_trylock(&card->creg_ctrl.reset_lock))		if (!mutex_trylock(&card->creg_ctrl.reset_lock))
	return;		return;

	@@ -315,7 +324,7 @@ static void creg_reset(struct rsxx_cardinfo *card)
	"Resetting creg interface for recovery\n");		"Resetting creg interface for recovery\n");

	/* Cancel outstanding commands */		/* Cancel outstanding commands */
	mutex_lock(&card->creg_ctrl.lock);		spin_lock(&card->creg_ctrl.lock);
	list_for_each_entry_safe(cmd, tmp, &card->creg_ctrl.queue, list) {		list_for_each_entry_safe(cmd, tmp, &card->creg_ctrl.queue, list) {
	list_del(&cmd->list);		list_del(&cmd->list);
	card->creg_ctrl.q_depth--;		card->creg_ctrl.q_depth--;
	@@ -336,7 +345,7 @@ static void creg_reset(struct rsxx_cardinfo *card)

	card->creg_ctrl.active = 0;		card->creg_ctrl.active = 0;
	}		}
	mutex_unlock(&card->creg_ctrl.lock);		spin_unlock(&card->creg_ctrl.lock);

	card->creg_ctrl.reset = 0;		card->creg_ctrl.reset = 0;
	spin_lock_irqsave(&card->irq_lock, flags);		spin_lock_irqsave(&card->irq_lock, flags);
	@@ -359,7 +368,7 @@ static void creg_cmd_done_cb(struct rsxx_cardinfo *card,
	{		{
	struct creg_completion *cmd_completion;		struct creg_completion *cmd_completion;

	cmd_completion = (struct creg_completion *)cmd->cb_private;		cmd_completion = cmd->cb_private;
	BUG_ON(!cmd_completion);		BUG_ON(!cmd_completion);

	cmd_completion->st = st;		cmd_completion->st = st;
	@@ -380,7 +389,6 @@ static int __issue_creg_rw(struct rsxx_cardinfo *card,
	unsigned long timeout;		unsigned long timeout;
	int st;		int st;

	INIT_COMPLETION(cmd_done);
	completion.cmd_done = &cmd_done;		completion.cmd_done = &cmd_done;
	completion.st = 0;		completion.st = 0;
	completion.creg_status = 0;		completion.creg_status = 0;
	@@ -390,6 +398,11 @@ static int __issue_creg_rw(struct rsxx_cardinfo *card,
	if (st)		if (st)
	return st;		return st;

			/*
			* This timeout is neccessary for unresponsive hardware. The additional
			* 20 seconds to used to guarantee that each cregs requests has time to
			* complete.
			*/
	timeout = msecs_to_jiffies((CREG_TIMEOUT_MSEC *		timeout = msecs_to_jiffies((CREG_TIMEOUT_MSEC *
	card->creg_ctrl.q_depth) + 20000);		card->creg_ctrl.q_depth) + 20000);

	@@ -443,7 +456,7 @@ static int issue_creg_rw(struct rsxx_cardinfo *card,
	if (st)		if (st)
	return st;		return st;

	data = (void )((char )data + xfer);		data = (char *)data + xfer;
	addr += xfer;		addr += xfer;
	size8 -= xfer;		size8 -= xfer;
	} while (size8);		} while (size8);
	@@ -558,9 +571,9 @@ static void hw_log_msg(struct rsxx_cardinfo card, const char str, int len)
	}		}

	/*		/*
	* The substrncpy() function copies to string(up to count bytes) point to by src		* The substrncpy function copies the src string (which includes the
	* (including the terminating '\0' character) to dest. Returns the number of		* terminating '\0' character), up to the count into the dest pointer.
	* bytes copied to dest.		* Returns the number of bytes copied to dest.
	*/		*/
	static int substrncpy(char dest, const char src, int count)		static int substrncpy(char dest, const char src, int count)
	{		{
	@@ -657,6 +670,9 @@ int rsxx_reg_access(struct rsxx_cardinfo *card,
	if (st)		if (st)
	return -EFAULT;		return -EFAULT;

			if (cmd.cnt > RSXX_MAX_REG_CNT)
			return -EFAULT;

	st = issue_reg_cmd(card, &cmd, read);		st = issue_reg_cmd(card, &cmd, read);
	if (st)		if (st)
	return st;		return st;
	@@ -682,8 +698,7 @@ int rsxx_creg_setup(struct rsxx_cardinfo *card)
	INIT_WORK(&card->creg_ctrl.done_work, creg_cmd_done);		INIT_WORK(&card->creg_ctrl.done_work, creg_cmd_done);
	mutex_init(&card->creg_ctrl.reset_lock);		mutex_init(&card->creg_ctrl.reset_lock);
	INIT_LIST_HEAD(&card->creg_ctrl.queue);		INIT_LIST_HEAD(&card->creg_ctrl.queue);
	mutex_init(&card->creg_ctrl.lock);		spin_lock_init(&card->creg_ctrl.lock);
	spin_lock_init(&card->creg_ctrl.pop_lock);
	setup_timer(&card->creg_ctrl.cmd_timer, creg_cmd_timed_out,		setup_timer(&card->creg_ctrl.cmd_timer, creg_cmd_timed_out,
	(unsigned long) card);		(unsigned long) card);

	@@ -697,7 +712,7 @@ void rsxx_creg_destroy(struct rsxx_cardinfo *card)
	int cnt = 0;		int cnt = 0;

	/* Cancel outstanding commands */		/* Cancel outstanding commands */
	mutex_lock(&card->creg_ctrl.lock);		spin_lock(&card->creg_ctrl.lock);
	list_for_each_entry_safe(cmd, tmp, &card->creg_ctrl.queue, list) {		list_for_each_entry_safe(cmd, tmp, &card->creg_ctrl.queue, list) {
	list_del(&cmd->list);		list_del(&cmd->list);
	if (cmd->cb)		if (cmd->cb)
	@@ -722,7 +737,7 @@ void rsxx_creg_destroy(struct rsxx_cardinfo *card)
	"Canceled active creg command\n");		"Canceled active creg command\n");
	kmem_cache_free(creg_cmd_pool, cmd);		kmem_cache_free(creg_cmd_pool, cmd);
	}		}
	mutex_unlock(&card->creg_ctrl.lock);		spin_unlock(&card->creg_ctrl.lock);

	cancel_work_sync(&card->creg_ctrl.done_work);		cancel_work_sync(&card->creg_ctrl.done_work);
	}		}

drivers/block/rsxx/dev.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -149,7 +149,7 @@ static void bio_dma_done_cb(struct rsxx_cardinfo *card,
	void *cb_data,		void *cb_data,
	unsigned int error)		unsigned int error)
	{		{
	struct rsxx_bio_meta meta = (struct rsxx_bio_meta )cb_data;		struct rsxx_bio_meta *meta = cb_data;

	if (error)		if (error)
	atomic_set(&meta->error, 1);		atomic_set(&meta->error, 1);

drivers/block/rsxx/dma.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -102,7 +102,7 @@ struct dma_tracker_list {


	/----------------- Misc Utility Functions -------------------/		/----------------- 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;		unsigned long long tgt_addr8;

	@@ -113,7 +113,7 @@ unsigned int rsxx_addr8_to_laddr(u64 addr8, struct rsxx_cardinfo *card)
	return tgt_addr8;		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;		unsigned int tgt;

	@@ -803,7 +803,7 @@ static int rsxx_dma_ctrl_init(struct pci_dev *dev,
	return 0;		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)		unsigned int stripe_size8)
	{		{
	if (!is_power_of_2(stripe_size8)) {		if (!is_power_of_2(stripe_size8)) {
	@@ -834,7 +834,7 @@ int rsxx_dma_stripe_setup(struct rsxx_cardinfo *card,
	return 0;		return 0;
	}		}

	int rsxx_dma_configure(struct rsxx_cardinfo *card)		static int rsxx_dma_configure(struct rsxx_cardinfo *card)
	{		{
	u32 intr_coal;		u32 intr_coal;