Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f730e3dc authored by Philip J Kelleher's avatar Philip J Kelleher Committed by Jens Axboe
Browse files

rsxx: Changing the adapter name to the official name. 



Changing the adapter name from FlashSystem-80 to the official
name: Flash Adapter 900GB Full Height.

Signed-off-by: default avatarPhilip J Kelleher <pjk1939@linux.vnet.ibm.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent fb065cd9

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3297,7 +3297,7 @@ F: Documentation/firmware_class/ 
F:	drivers/base/firmware*.c

F:	include/linux/firmware.h



FLASHSYSTEM DRIVER (IBM FlashSystem 70/80 PCI SSD Flash Card)

FLASH ADAPTER DRIVER (IBM Flash Adapter 900GB Full Height PCI Flash Card)

M:	Joshua Morris <josh.h.morris@us.ibm.com>

M:	Philip Kelleher <pjk1939@linux.vnet.ibm.com>

S:	Maintained

drivers/block/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -532,11 +532,11 @@ config BLK_DEV_RBD 
	  If unsure, say N.



config BLK_DEV_RSXX

	tristate "IBM FlashSystem 70/80 PCIe SSD Device Driver"

	tristate "IBM Flash Adapter 900GB Full Height PCIe Device Driver"

	depends on PCI

	help

	  Device driver for IBM's high speed PCIe SSD

	  storage devices: FlashSystem-70 and FlashSystem-80.

	  storage device: Flash Adapter 900GB Full Height.



	  To compile this driver as a module, choose M here: the

	  module will be called rsxx.

drivers/block/rsxx/core.c

+5 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#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 Flash Adapter 900GB Full Height Device Driver");

MODULE_AUTHOR("Joshua Morris/Philip Kelleher, IBM");

MODULE_LICENSE("GPL");

MODULE_VERSION(DRIVER_VERSION);
@@ -336,7 +336,7 @@ static int rsxx_eeh_frozen(struct pci_dev *dev) 
	int i;

	int st;



	dev_warn(&dev->dev, "IBM FlashSystem PCI: preparing for slot reset.\n");

	dev_warn(&dev->dev, "IBM Flash Adapter PCI: preparing for slot reset.\n");



	card->eeh_state = 1;

	rsxx_mask_interrupts(card);
@@ -376,7 +376,7 @@ static void rsxx_eeh_failure(struct pci_dev *dev) 
	int i;

	int cnt = 0;



	dev_err(&dev->dev, "IBM FlashSystem PCI: disabling failed card.\n");

	dev_err(&dev->dev, "IBM Flash Adapter PCI: disabling failed card.\n");



	card->eeh_state = 1;

	card->halt = 1;
@@ -450,7 +450,7 @@ static pci_ers_result_t rsxx_slot_reset(struct pci_dev *dev) 
	int st;



	dev_warn(&dev->dev,

		"IBM FlashSystem PCI: recovering from slot reset.\n");

		"IBM Flash Adapter PCI: recovering from slot reset.\n");



	st = pci_enable_device(dev);

	if (st)
@@ -503,7 +503,7 @@ static pci_ers_result_t rsxx_slot_reset(struct pci_dev *dev) 
				&card->ctrl[i].issue_dma_work);

	}



	dev_info(&dev->dev, "IBM FlashSystem PCI: recovery complete.\n");

	dev_info(&dev->dev, "IBM Flash Adapter PCI: recovery complete.\n");



	return PCI_ERS_RESULT_RECOVERED;