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

Commit c104f1fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d8dd0b6d 63634806

Documentation/ABI/testing/sysfs-block-rssd

0 → 100644
+18 −0
Original line number Diff line number Diff line 
What:           /sys/block/rssd*/registers

Date:           March 2012

KernelVersion:  3.3

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:    This is a read-only file. Dumps below driver information and

                hardware registers.

                    - S ACTive

                    - Command Issue

                    - Allocated

                    - Completed

                    - PORT IRQ STAT

                    - HOST IRQ STAT



What:           /sys/block/rssd*/status

Date:           April 2012

KernelVersion:  3.4

Contact:        Asai Thambi S P <asamymuthupa@micron.com>

Description:   This is a read-only file. Indicates the status of the device.

drivers/block/cciss_scsi.c

+2 −1
Original line number Diff line number Diff line
@@ -866,6 +866,7 @@ cciss_scsi_detect(ctlr_info_t *h) 
	sh->can_queue = cciss_tape_cmds;

	sh->sg_tablesize = h->maxsgentries;

	sh->max_cmd_len = MAX_COMMAND_SIZE;

	sh->max_sectors = h->cciss_max_sectors;



	((struct cciss_scsi_adapter_data_t *) 

		h->scsi_ctlr)->scsi_host = sh;
@@ -1410,7 +1411,7 @@ static void cciss_scatter_gather(ctlr_info_t *h, CommandList_struct *c, 
	/* track how many SG entries we are using */

	if (request_nsgs > h->maxSG)

		h->maxSG = request_nsgs;

	c->Header.SGTotal = (__u8) request_nsgs + chained;

	c->Header.SGTotal = (u16) request_nsgs + chained;

	if (request_nsgs > h->max_cmd_sgentries)

		c->Header.SGList = h->max_cmd_sgentries;

	else

drivers/block/mtip32xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 


config BLK_DEV_PCIESSD_MTIP32XX

	tristate "Block Device Driver for Micron PCIe SSDs"

	depends on HOTPLUG_PCI_PCIE

	depends on PCI

	help

          This enables the block driver for Micron PCIe SSDs.