Skip to content

Commit c104f1f

Browse files
committed
Merge branch 'for-3.4/drivers' of git://git.kernel.dk/linux-block
Pull block driver bits from Jens Axboe: - A series of fixes for mtip32xx. Most from Asai at Micron, but also one from Greg, getting rid of the dependency on PCIE_HOTPLUG. - A few bug fixes for xen-blkfront, and blkback. - A virtio-blk fix for Vivek, making resize actually work. - Two fixes from Stephen, making larger transfers possible on cciss. This is needed for tape drive support. * 'for-3.4/drivers' of git://git.kernel.dk/linux-block: block: mtip32xx: remove HOTPLUG_PCI_PCIE dependancy mtip32xx: dump tagmap on failure mtip32xx: fix handling of commands in various scenarios mtip32xx: Shorten macro names mtip32xx: misc changes mtip32xx: Add new sysfs entry 'status' mtip32xx: make setting comp_time as common mtip32xx: Add new bitwise flag 'dd_flag' mtip32xx: fix error handling in mtip_init() virtio-blk: Call revalidate_disk() upon online disk resize xen/blkback: Make optional features be really optional. xen/blkback: Squash the discard support for 'file' and 'phy' type. mtip32xx: fix incorrect value set for drv_cleanup_done, and re-initialize and start port in mtip_restart_port() cciss: Fix scsi tape io with more than 255 scatter gather elements cciss: Initialize scsi host max_sectors for tape drive support xen-blkfront: make blkif_io_lock spinlock per-device xen/blkfront: don't put bdev right after getting it xen-blkfront: use bitmap_set() and bitmap_clear() xen/blkback: Enable blkback on HVM guests xen/blkback: use grant-table.c hypercall wrappers
2 parents d8dd0b6 + 6363480 commit c104f1f

File tree

10 files changed

+796
-332
lines changed

10 files changed

+796
-332
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/block/rssd*/registers
2+
Date: March 2012
3+
KernelVersion: 3.3
4+
Contact: Asai Thambi S P <[email protected]>
5+
Description: This is a read-only file. Dumps below driver information and
6+
hardware registers.
7+
- S ACTive
8+
- Command Issue
9+
- Allocated
10+
- Completed
11+
- PORT IRQ STAT
12+
- HOST IRQ STAT
13+
14+
What: /sys/block/rssd*/status
15+
Date: April 2012
16+
KernelVersion: 3.4
17+
Contact: Asai Thambi S P <[email protected]>
18+
Description: This is a read-only file. Indicates the status of the device.

drivers/block/cciss_scsi.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,6 +866,7 @@ cciss_scsi_detect(ctlr_info_t *h)
866866
sh->can_queue = cciss_tape_cmds;
867867
sh->sg_tablesize = h->maxsgentries;
868868
sh->max_cmd_len = MAX_COMMAND_SIZE;
869+
sh->max_sectors = h->cciss_max_sectors;
869870

870871
((struct cciss_scsi_adapter_data_t *)
871872
h->scsi_ctlr)->scsi_host = sh;
@@ -1410,7 +1411,7 @@ static void cciss_scatter_gather(ctlr_info_t *h, CommandList_struct *c,
14101411
/* track how many SG entries we are using */
14111412
if (request_nsgs > h->maxSG)
14121413
h->maxSG = request_nsgs;
1413-
c->Header.SGTotal = (__u8) request_nsgs + chained;
1414+
c->Header.SGTotal = (u16) request_nsgs + chained;
14141415
if (request_nsgs > h->max_cmd_sgentries)
14151416
c->Header.SGList = h->max_cmd_sgentries;
14161417
else

drivers/block/mtip32xx/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
config BLK_DEV_PCIESSD_MTIP32XX
66
tristate "Block Device Driver for Micron PCIe SSDs"
7-
depends on HOTPLUG_PCI_PCIE
7+
depends on PCI
88
help
99
This enables the block driver for Micron PCIe SSDs.

0 commit comments

Comments
 (0)