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

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

block: IBM RamSan 70/80 branding changes. 



This patch includes changing the hardware branding name from
IBM RamSan to IBM FlashSystem.

v2 Changes include:
o Removing the unnecessary IBM Vendor ID #define

v1 Changes include:
o Changed all references of RamSan to FlashSystem.
o Changed the vendor/device IDs for the product.
o Changed driver version number.
o Updated the MAINTAINERS file.
o Various other little things.

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

MAINTAINERS

+6 −6
Original line number Diff line number Diff line
@@ -3242,6 +3242,12 @@ F: Documentation/firmware_class/ 
F:	drivers/base/firmware*.c

F:	include/linux/firmware.h



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

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

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

S:	Maintained

F:	drivers/block/rsxx/



FLOPPY DRIVER

M:	Jiri Kosina <jkosina@suse.cz>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -6516,12 +6522,6 @@ S: Maintained 
F:	Documentation/blockdev/ramdisk.txt

F:	drivers/block/brd.c



RAMSAM DRIVER (IBM RamSan 70/80 PCI SSD Flash Card)

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

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

S:	Maintained

F:	drivers/block/rsxx/



RANDOM NUMBER DRIVER

M:	Theodore Ts'o" <tytso@mit.edu>

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 "RamSam PCIe Flash SSD Device Driver"

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

	depends on PCI

	help

	  Device driver for IBM's high speed PCIe SSD

	  storage devices: RamSan-70 and RamSan-80.

	  storage devices: FlashSystem-70 and FlashSystem-80.



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

	  module will be called rsxx.

drivers/block/rsxx/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_BLK_DEV_RSXX) += rsxx.o

rsxx-y := config.o core.o cregs.o dev.o dma.o
 
rsxx-objs := config.o core.o cregs.o dev.o dma.o

drivers/block/rsxx/config.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static void initialize_config(struct rsxx_card_cfg *cfg) 


	cfg->data.block_size        = RSXX_HW_BLK_SIZE;

	cfg->data.stripe_size       = RSXX_HW_BLK_SIZE;

	cfg->data.vendor_id         = RSXX_VENDOR_ID_TMS_IBM;

	cfg->data.vendor_id         = RSXX_VENDOR_ID_IBM;

	cfg->data.cache_order       = (-1);

	cfg->data.intr_coal.mode    = RSXX_INTR_COAL_DISABLED;

	cfg->data.intr_coal.count   = 0;

drivers/block/rsxx/core.c

+4 −6
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


#define NO_LEGACY 0



MODULE_DESCRIPTION("IBM RamSan PCIe Flash SSD Device Driver");

MODULE_AUTHOR("IBM <support@ramsan.com>");

MODULE_DESCRIPTION("IBM FlashSystem 70/80 PCIe SSD Device Driver");

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

MODULE_LICENSE("GPL");

MODULE_VERSION(DRIVER_VERSION);
@@ -593,10 +593,8 @@ static void rsxx_pci_shutdown(struct pci_dev *dev) 
}



static DEFINE_PCI_DEVICE_TABLE(rsxx_pci_ids) = {

	{PCI_DEVICE(PCI_VENDOR_ID_TMS_IBM, PCI_DEVICE_ID_RS70_FLASH)},

	{PCI_DEVICE(PCI_VENDOR_ID_TMS_IBM, PCI_DEVICE_ID_RS70D_FLASH)},

	{PCI_DEVICE(PCI_VENDOR_ID_TMS_IBM, PCI_DEVICE_ID_RS80_FLASH)},

	{PCI_DEVICE(PCI_VENDOR_ID_TMS_IBM, PCI_DEVICE_ID_RS81_FLASH)},

	{PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS70_FLASH)},

	{PCI_DEVICE(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_FS80_FLASH)},

	{0,},

};