block: IBM RamSan 70/80 branding changes.
PATCH v2 3/4 block: IBM RamSan 70/80 branding changes.
From: Philip J Kelleher <[email protected]>
This patch includes changing the hardware branding name from IBM RamSan to IBM FlashSystem.
Signed-off-by Philip J Kelleher <[email protected]>
-------------------------------------------------------------------------------
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.
drivers/block/Kconfig +2 -2
@@ -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/config.c +1 -1
@@ -35,7 +35,7 @@ static void initialize_config(struct rsx 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
@@ -39,8 +39,8 @@#define NO_LEGACY 0 -MODULE_DESCRIPTION ("IBM RamSan PCIe Flash SSD Device Driver" ); -MODULE_AUTHOR ("IBM <[email protected]>" ); +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 }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 ,}, };
drivers/block/rsxx/dma.c +1 -1
@@ -28,7 +28,7 @@struct rsxx_dma {struct list_head list;u8 cmd; -unsigned int laddr;/* Logical address on the ramsan */ +unsigned int laddr;/* Logical address */ struct {u32 off;u32 cnt;
drivers/block/rsxx/Makefile +1 -1
@@ -1,2 +1,2 @@ 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/rsxx_cfg.h +1 -1
@@ -58,7 +58,7 @@ struct rsxx_card_cfg { };/* Vendor ID Values */ -#define RSXX_VENDOR_ID_TMS_IBM 0 +#define RSXX_VENDOR_ID_IBM 0#define RSXX_VENDOR_ID_DSI 1#define RSXX_VENDOR_COUNT 2
drivers/block/rsxx/rsxx_priv.h +3 -6
@@ -45,16 +45,13 @@struct proc_cmd ; -#define PCI_VENDOR_ID_TMS_IBM 0x15B6 -#define PCI_DEVICE_ID_RS70_FLASH 0x0019 -#define PCI_DEVICE_ID_RS70D_FLASH 0x001A -#define PCI_DEVICE_ID_RS80_FLASH 0x001C -#define PCI_DEVICE_ID_RS81_FLASH 0x001E +#define PCI_DEVICE_ID_FS70_FLASH 0x04A9 +#define PCI_DEVICE_ID_FS80_FLASH 0x04AA#define RS70_PCI_REV_SUPPORTED 4#define DRIVER_NAME "rsxx" -#define DRIVER_VERSION "3.7" +#define DRIVER_VERSION "4.0"/* Block size is 4096 */ #define RSXX_HW_BLK_SHIFT 12
MAINTAINERS +6 -6
@@ -3157,6 +3157,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 <[email protected]> +M: Philip Kelleher <[email protected]> +S: Maintained +F: drivers/block/rsxx/ + FLOPPY DRIVER M: Jiri Kosina <[email protected]> T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git
@@ -6312,12 +6318,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 <[email protected]> -M: Philip Kelleher <[email protected]> -S: Maintained -F: drivers/block/rsxx/ - RANDOM NUMBER DRIVER M: Theodore Ts'o" <[email protected]> S: Maintained