renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 21:54:06 +08:00
Code

rsxx: Adding in sync_start module paramenter.

Browse Source 
Before, the partition table would have to be reread because our
card was attached before it transistioned out of it's 'starting'
state.

This change will cause the driver to wait to attach the device
until the adapter is ready.

Signed-off-by: Philip J Kelleher <pjk1939@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Philip J Kelleher 2013-06-18 14:42:36 -05:00 committed by Jens Axboe
parent 7b379cc378
commit fb065cd9e0
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/block/rsxx/core.c
View File

@ -39,6 +39,7 @@
#include "rsxx_cfg.h" #include "rsxx_cfg.h"
#define NO_LEGACY 0 #define NO_LEGACY 0
#define SYNC_START_TIMEOUT (10 * 60) /* 10 minutes */
MODULE_DESCRIPTION("IBM FlashSystem 70/80 PCIe SSD Device Driver"); MODULE_DESCRIPTION("IBM FlashSystem 70/80 PCIe SSD Device Driver");
MODULE_AUTHOR("Joshua Morris/Philip Kelleher, IBM"); MODULE_AUTHOR("Joshua Morris/Philip Kelleher, IBM");
@ -49,6 +50,11 @@ static unsigned int force_legacy = NO_LEGACY;
module_param(force_legacy, uint, 0444); module_param(force_legacy, uint, 0444);
MODULE_PARM_DESC(force_legacy, "Force the use of legacy type PCI interrupts"); MODULE_PARM_DESC(force_legacy, "Force the use of legacy type PCI interrupts");
static unsigned int sync_start = 1;
module_param(sync_start, uint, 0444);
MODULE_PARM_DESC(sync_start, "On by Default: Driver load will not complete "
"until the card startup has completed.");
static DEFINE_IDA(rsxx_disk_ida); static DEFINE_IDA(rsxx_disk_ida);
static DEFINE_SPINLOCK(rsxx_ida_lock); static DEFINE_SPINLOCK(rsxx_ida_lock);
@ -540,6 +546,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
{ {
struct rsxx_cardinfo *card; struct rsxx_cardinfo *card;
int st; int st;
unsigned int sync_timeout;
dev_info(&dev->dev, "PCI-Flash SSD discovered\n"); dev_info(&dev->dev, "PCI-Flash SSD discovered\n");
@ -698,6 +705,33 @@ static int rsxx_pci_probe(struct pci_dev *dev,
if (st) if (st)
dev_crit(CARD_TO_DEV(card), dev_crit(CARD_TO_DEV(card),
"Failed issuing card startup\n"); "Failed issuing card startup\n");
if (sync_start) {
sync_timeout = SYNC_START_TIMEOUT;
dev_info(CARD_TO_DEV(card),
"Waiting for card to startup\n");
do {
ssleep(1);
sync_timeout--;
rsxx_get_card_state(card, &card->state);
} while (sync_timeout &&
(card->state == CARD_STATE_STARTING));
if (card->state == CARD_STATE_STARTING) {
dev_warn(CARD_TO_DEV(card),
"Card startup timed out\n");
card->size8 = 0;
} else {
dev_info(CARD_TO_DEV(card),
"card state: %s\n",
rsxx_card_state_to_str(card->state));
st = rsxx_get_card_size8(card, &card->size8);
if (st)
card->size8 = 0;
}
}
} else if (card->state == CARD_STATE_GOOD || } else if (card->state == CARD_STATE_GOOD ||
card->state == CARD_STATE_RD_ONLY_FAULT) { card->state == CARD_STATE_RD_ONLY_FAULT) {
st = rsxx_get_card_size8(card, &card->size8); st = rsxx_get_card_size8(card, &card->size8);