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

Commit 929cfdd5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block 

* 'for-2.6.40/drivers' of git://git.kernel.dk/linux-2.6-block: (110 commits)
  loop: handle on-demand devices correctly
  loop: limit 'max_part' module param to DISK_MAX_PARTS
  drbd: fix warning
  drbd: fix warning
  drbd: Fix spelling
  drbd: fix schedule in atomic
  drbd: Take a more conservative approach when deciding max_bio_size
  drbd: Fixed state transitions after async outdate-peer-handler returned
  drbd: Disallow the peer_disk_state to be D_OUTDATED while connected
  drbd: Fix for the connection problems on high latency links
  drbd: fix potential activity log refcount imbalance in error path
  drbd: Only downgrade the disk state in case of disk failures
  drbd: fix disconnect/reconnect loop, if ping-timeout == ping-int
  drbd: fix potential distributed deadlock
  lru_cache.h: fix comments referring to ts_ instead of lc_
  drbd: Fix for application IO with the on-io-error=pass-on policy
  xen/p2m: Add EXPORT_SYMBOL_GPL to the M2P override functions.
  xen/p2m/m2p/gnttab: Support GNTMAP_host_map in the M2P override.
  xen/blkback: don't fail empty barrier requests
  xen/blkback: fix xenbus_transaction_start() hang caused by double xenbus_transaction_end()
  ...
parents 798ce8f1 a1c15c59

Documentation/blockdev/cciss.txt

+15 −0
Original line number Diff line number Diff line
@@ -169,3 +169,18 @@ is issued which positions the tape to a known position. Typically you 
must rewind the tape (by issuing "mt -f /dev/st0 rewind" for example)

before i/o can proceed again to a tape drive which was reset.



There is a cciss_tape_cmds module parameter which can be used to make cciss

allocate more commands for use by tape drives.  Ordinarily only a few commands

(6) are allocated for tape drives because tape drives are slow and

infrequently used and the primary purpose of Smart Array controllers is to

act as a RAID controller for disk drives, so the vast majority of commands

are allocated for disk devices.  However, if you have more than a few tape

drives attached to a smart array, the default number of commands may not be

enought (for example, if you have 8 tape drives, you could only rewind 6

at one time with the default number of commands.)  The cciss_tape_cmds module

parameter allows more commands (up to 16 more) to be allocated for use by

tape drives.  For example:



        insmod cciss.ko cciss_tape_cmds=16



Or, as a kernel boot parameter passed in via grub:  cciss.cciss_tape_cmds=8

drivers/block/Kconfig

+21 −0
Original line number Diff line number Diff line
@@ -470,6 +470,27 @@ config XEN_BLKDEV_FRONTEND 
	  block device driver.  It communicates with a back-end driver

	  in another domain which drives the actual block device.



config XEN_BLKDEV_BACKEND

	tristate "Block-device backend driver"

	depends on XEN_BACKEND

	help

	  The block-device backend driver allows the kernel to export its

	  block devices to other guests via a high-performance shared-memory

	  interface.



	  The corresponding Linux frontend driver is enabled by the

	  CONFIG_XEN_BLKDEV_FRONTEND configuration option.



	  The backend driver attaches itself to a any block device specified

	  in the XenBus configuration. There are no limits to what the block

	  device as long as it has a major and minor.



	  If you are compiling a kernel to run in a Xen block backend driver

	  domain (often this is domain 0) you should say Y here. To

	  compile this driver as a module, chose M here: the module

	  will be called xen-blkback.





config VIRTIO_BLK

	tristate "Virtio block driver (EXPERIMENTAL)"

	depends on EXPERIMENTAL && VIRTIO

drivers/block/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_BLK_DEV_UB) += ub.o 
obj-$(CONFIG_BLK_DEV_HD)	+= hd.o



obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= xen-blkfront.o

obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= xen-blkback/

obj-$(CONFIG_BLK_DEV_DRBD)     += drbd/

obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o

drivers/block/cciss.c

+457 −114

File changed.

Preview size limit exceeded, changes collapsed.

drivers/block/cciss.h

+9 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ struct ctlr_info 
 * the above.

 */

#define CCISS_BOARD_READY_WAIT_SECS (120)

#define CCISS_BOARD_NOT_READY_WAIT_SECS (10)

#define CCISS_BOARD_NOT_READY_WAIT_SECS (100)

#define CCISS_BOARD_READY_POLL_INTERVAL_MSECS (100)

#define CCISS_BOARD_READY_ITERATIONS \

	((CCISS_BOARD_READY_WAIT_SECS * 1000) / \
@@ -209,8 +209,9 @@ struct ctlr_info 
	((CCISS_BOARD_NOT_READY_WAIT_SECS * 1000) / \

		CCISS_BOARD_READY_POLL_INTERVAL_MSECS)

#define CCISS_POST_RESET_PAUSE_MSECS (3000)

#define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (1000)

#define CCISS_POST_RESET_NOOP_INTERVAL_MSECS (4000)

#define CCISS_POST_RESET_NOOP_RETRIES (12)

#define CCISS_POST_RESET_NOOP_TIMEOUT_MSECS (10000)



/* 

	Send the command to the hardware
@@ -239,11 +240,13 @@ static void SA5_intr_mask(ctlr_info_t *h, unsigned long val) 
	{ /* Turn interrupts on */

		h->interrupts_enabled = 1;

		writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

	} else /* Turn them off */

	{

		h->interrupts_enabled = 0;

        	writel( SA5_INTR_OFF, 

			h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

	}

}

/*
@@ -257,11 +260,13 @@ static void SA5B_intr_mask(ctlr_info_t *h, unsigned long val) 
        { /* Turn interrupts on */

		h->interrupts_enabled = 1;

                writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

        } else /* Turn them off */

        {

		h->interrupts_enabled = 0;

                writel( SA5B_INTR_OFF,

                        h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

        }

}
@@ -271,10 +276,12 @@ static void SA5_performant_intr_mask(ctlr_info_t *h, unsigned long val) 
	if (val) { /* turn on interrupts */

		h->interrupts_enabled = 1;

		writel(0, h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

	} else {

		h->interrupts_enabled = 0;

		writel(SA5_PERF_INTR_OFF,

				h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

		(void) readl(h->vaddr + SA5_REPLY_INTR_MASK_OFFSET);

	}

}