rsxx: Reset the pcie slot of adapter trains incorrectly.
PATCH 1/1 rsxx: Reset the pcie slot of adapter trains incorrectly.
From: Philip J Kelleher <[email protected]>
This patch contains a software workaround for a firmware bug that can cause the pcie adapter to train to a width below the desired width of x8.
It will reset the adapter 3 times before the driver gives up and informs the user that the link width has been trained to something unexpected.
Signed-off-by Philip J Kelleher <[email protected]>
drivers/block/rsxx/core.c +56 -0
@@ -42,6 +42,8 @@#define NO_LEGACY 0#define SYNC_START_TIMEOUT (10 * 60)/* 10 minutes */ +#define EXPECTED_LINK_WIDTH 8 +#define MAX_RETRAIN_CNT 3MODULE_DESCRIPTION ("IBM Flash Adapter 900GB Full Height Device Driver" );MODULE_AUTHOR ("Joshua Morris/Philip Kelleher, IBM" );
@@ -600,6 +602,50 @@ static int card_shutdown(struct rsxx_cardinfo *card)return 0 ; } +static void rsxx_reset_slot (struct rsxx_cardinfo *card) +{ +if (card->retrain_cnt >=MAX_RETRAIN_CNT ) { +dev_warn (CARD_TO_DEV (card),"Failed to train the adapter to x%d " +"(is x%d), performance degradation " +"possible" ,EXPECTED_LINK_WIDTH , + card->link_width); +return ; + } + +pci_cfg_access_lock (card->dev); +pci_set_pcie_reset_state (card->dev, pcie_warm_reset); +msleep (500 ); +pci_set_pcie_reset_state (card->dev, pcie_deassert_reset); +msleep (2000 ); +pci_cfg_access_unlock (card->dev); + +} + +static void rsxx_verify_link_width (struct rsxx_cardinfo *card) +{ +int pos; +u16 reg16; + + card->retrain_cnt =0 ; + +do { + pos =pci_find_capability (card->dev,PCI_CAP_ID_EXP ); +pci_read_config_word (card->dev, + pos +PCI_EXP_LNKSTA , + ®16); + card->link_width = (reg16 &PCI_EXP_LNKSTA_NLW ) >>4 ; + +if (card->link_width !=EXPECTED_LINK_WIDTH ) { + card->retrain_cnt++; +rsxx_reset_slot (card); + }else { +pci_restore_state (card->dev); +break ; + } + + }while (card->retrain_cnt <MAX_RETRAIN_CNT ); +} +static int rsxx_eeh_frozen (struct pci_dev *dev) {struct rsxx_cardinfo *card =pci_get_drvdata (dev);
@@ -723,6 +769,8 @@ static pci_ers_result_t rsxx_slot_reset(struct pci_dev *dev)dev_warn (&dev->dev,"IBM Flash Adapter PCI: recovering from slot reset.\n" ); +rsxx_verify_link_width (card); + st =pci_enable_device (dev);if (st) goto failed_hw_setup;
@@ -837,6 +885,14 @@ static int rsxx_pci_probe(struct pci_dev *dev,if (st) goto failed_ida_get; + st =pci_save_state (dev); +if (st) { +dev_err (CARD_TO_DEV (card),"Failed to save PCI config space\n" ); + goto failed_enable; + } + +rsxx_verify_link_width (card); + st =pci_enable_device (dev);if (st) goto failed_enable;
drivers/block/rsxx/rsxx_priv.h +3 -1
@@ -52,7 +52,7 @@ struct proc_cmd;#define RS70_PCI_REV_SUPPORTED 4#define DRIVER_NAME "rsxx" -#define DRIVER_VERSION "4.0.3.2516" +#define DRIVER_VERSION "4.0.4"/* Block size is 4096 */ #define RSXX_HW_BLK_SHIFT 12
@@ -122,6 +122,8 @@ struct rsxx_cardinfo {struct pci_dev *dev;unsigned int halt;unsigned int eeh_state; +unsigned short link_width; +unsigned int retrain_cnt;void __iomem *regmap;spinlock_t irq_lock;