Commit 043b4d40 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next 



Conflicts:
	security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parents 29282381 722154e4

Documentation/DocBook/libata.tmpl

+16 −33
Original line number Original line Diff line number Diff line
@@ -107,10 +107,6 @@ void (*dev_config) (struct ata_port *, struct ata_device *); 
	issue of SET FEATURES - XFER MODE, and prior to operation.

	issue of SET FEATURES - XFER MODE, and prior to operation.

	</para>

	</para>

	<para>

	<para>

	Called by ata_device_add() after ata_dev_identify() determines

	a device is present.

	</para>

	<para>

	This entry may be specified as NULL in ata_port_operations.

	This entry may be specified as NULL in ata_port_operations.

	</para>

	</para>
@@ -154,8 +150,8 @@ unsigned int (*mode_filter) (struct ata_port *, struct ata_device *, unsigned in 




	<sect2><title>Taskfile read/write</title>

	<sect2><title>Taskfile read/write</title>

	<programlisting>

	<programlisting>

void (*tf_load) (struct ata_port *ap, struct ata_taskfile *tf);

void (*sff_tf_load) (struct ata_port *ap, struct ata_taskfile *tf);

void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf);

void (*sff_tf_read) (struct ata_port *ap, struct ata_taskfile *tf);

	</programlisting>

	</programlisting>





	<para>

	<para>
@@ -164,36 +160,35 @@ void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); 
	hardware registers / DMA buffers, to obtain the current set of

	hardware registers / DMA buffers, to obtain the current set of

	taskfile register values.

	taskfile register values.

	Most drivers for taskfile-based hardware (PIO or MMIO) use

	Most drivers for taskfile-based hardware (PIO or MMIO) use

	ata_tf_load() and ata_tf_read() for these hooks.

	ata_sff_tf_load() and ata_sff_tf_read() for these hooks.

	</para>

	</para>





	</sect2>

	</sect2>





	<sect2><title>PIO data read/write</title>

	<sect2><title>PIO data read/write</title>

	<programlisting>

	<programlisting>

void (*data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);

void (*sff_data_xfer) (struct ata_device *, unsigned char *, unsigned int, int);

	</programlisting>

	</programlisting>





	<para>

	<para>

All bmdma-style drivers must implement this hook.  This is the low-level

All bmdma-style drivers must implement this hook.  This is the low-level

operation that actually copies the data bytes during a PIO data

operation that actually copies the data bytes during a PIO data

transfer.

transfer.

Typically the driver

Typically the driver will choose one of ata_sff_data_xfer_noirq(),

will choose one of ata_pio_data_xfer_noirq(), ata_pio_data_xfer(), or

ata_sff_data_xfer(), or ata_sff_data_xfer32().

ata_mmio_data_xfer().

	</para>

	</para>





	</sect2>

	</sect2>





	<sect2><title>ATA command execute</title>

	<sect2><title>ATA command execute</title>

	<programlisting>

	<programlisting>

void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf);

void (*sff_exec_command)(struct ata_port *ap, struct ata_taskfile *tf);

	</programlisting>

	</programlisting>





	<para>

	<para>

	causes an ATA command, previously loaded with

	causes an ATA command, previously loaded with

	->tf_load(), to be initiated in hardware.

	->tf_load(), to be initiated in hardware.

	Most drivers for taskfile-based hardware use ata_exec_command()

	Most drivers for taskfile-based hardware use ata_sff_exec_command()

	for this hook.

	for this hook.

	</para>

	</para>
@@ -218,8 +213,8 @@ command. 




	<sect2><title>Read specific ATA shadow registers</title>

	<sect2><title>Read specific ATA shadow registers</title>

	<programlisting>

	<programlisting>

u8   (*check_status)(struct ata_port *ap);

u8   (*sff_check_status)(struct ata_port *ap);

u8   (*check_altstatus)(struct ata_port *ap);

u8   (*sff_check_altstatus)(struct ata_port *ap);

	</programlisting>

	</programlisting>





	<para>

	<para>
@@ -227,20 +222,14 @@ u8 (*check_altstatus)(struct ata_port *ap); 
	hardware.  On some hardware, reading the Status register has

	hardware.  On some hardware, reading the Status register has

	the side effect of clearing the interrupt condition.

	the side effect of clearing the interrupt condition.

	Most drivers for taskfile-based hardware use

	Most drivers for taskfile-based hardware use

	ata_check_status() for this hook.

	ata_sff_check_status() for this hook.

	</para>

	<para>

	Note that because this is called from ata_device_add(), at

	least a dummy function that clears device interrupts must be

	provided for all drivers, even if the controller doesn't

	actually have a taskfile status register.

	</para>

	</para>





	</sect2>

	</sect2>





	<sect2><title>Select ATA device on bus</title>

	<sect2><title>Select ATA device on bus</title>

	<programlisting>

	<programlisting>

void (*dev_select)(struct ata_port *ap, unsigned int device);

void (*sff_dev_select)(struct ata_port *ap, unsigned int device);

	</programlisting>

	</programlisting>





	<para>

	<para>
@@ -251,9 +240,7 @@ void (*dev_select)(struct ata_port *ap, unsigned int device); 
	</para>

	</para>

	<para>

	<para>

	Most drivers for taskfile-based hardware use

	Most drivers for taskfile-based hardware use

	ata_std_dev_select() for this hook.  Controllers which do not

	ata_sff_dev_select() for this hook.

	support second drives on a port (such as SATA contollers) will

	use ata_noop_dev_select().

	</para>

	</para>





	</sect2>

	</sect2>
@@ -441,13 +428,13 @@ void (*irq_clear) (struct ata_port *); 
	to struct ata_host_set.

	to struct ata_host_set.

	</para>

	</para>

	<para>

	<para>

	Most legacy IDE drivers use ata_interrupt() for the

	Most legacy IDE drivers use ata_sff_interrupt() for the

	irq_handler hook, which scans all ports in the host_set,

	irq_handler hook, which scans all ports in the host_set,

	determines which queued command was active (if any), and calls

	determines which queued command was active (if any), and calls

	ata_host_intr(ap,qc).

	ata_sff_host_intr(ap,qc).

	</para>

	</para>

	<para>

	<para>

	Most legacy IDE drivers use ata_bmdma_irq_clear() for the

	Most legacy IDE drivers use ata_sff_irq_clear() for the

	irq_clear() hook, which simply clears the interrupt and error

	irq_clear() hook, which simply clears the interrupt and error

	flags in the DMA status register.

	flags in the DMA status register.

	</para>

	</para>
@@ -496,10 +483,6 @@ void (*host_stop) (struct ata_host_set *host_set); 
	data from port at this time.

	data from port at this time.

	</para>

	</para>

	<para>

	<para>

	Many drivers use ata_port_stop() as this hook, which frees the

	PRD table.

	</para>

	<para>

	->host_stop() is called after all ->port_stop() calls

	->host_stop() is called after all ->port_stop() calls

have completed.  The hook must finalize hardware shutdown, release DMA

have completed.  The hook must finalize hardware shutdown, release DMA

and other resources, etc.

and other resources, etc.

Documentation/input/elantech.txt

+4 −4
Original line number Original line Diff line number Diff line
@@ -333,14 +333,14 @@ byte 0: 
byte 1:

byte 1:





   bit   7   6   5   4   3   2   1   0

   bit   7   6   5   4   3   2   1   0

        x15 x14 x13 x12 x11 x10 x9  x8

         .   .   .   .   .  x10 x9  x8





byte 2:

byte 2:





   bit   7   6   5   4   3   2   1   0

   bit   7   6   5   4   3   2   1   0

        x7  x6  x5  x4  x4  x2  x1  x0

        x7  x6  x5  x4  x4  x2  x1  x0





         x15..x0 = absolute x value (horizontal)

         x10..x0 = absolute x value (horizontal)





byte 3:

byte 3:
@@ -350,14 +350,14 @@ byte 3: 
byte 4:

byte 4:





   bit   7   6   5   4   3   2   1   0

   bit   7   6   5   4   3   2   1   0

        y15 y14 y13 y12 y11 y10 y8  y8

         .   .   .   .   .   .  y9  y8





byte 5:

byte 5:





   bit   7   6   5   4   3   2   1   0

   bit   7   6   5   4   3   2   1   0

        y7  y6  y5  y4  y3  y2  y1  y0

        y7  y6  y5  y4  y3  y2  y1  y0





         y15..y0 = absolute y value (vertical)

         y9..y0 = absolute y value (vertical)









4.2.2 Two finger touch

4.2.2 Two finger touch

crypto/async_tx/async_raid6_recov.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -324,6 +324,7 @@ struct dma_async_tx_descriptor * 
async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb,

async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb,

			struct page **blocks, struct async_submit_ctl *submit)

			struct page **blocks, struct async_submit_ctl *submit)

{

{

	void *scribble = submit->scribble;

	int non_zero_srcs, i;

	int non_zero_srcs, i;





	BUG_ON(faila == failb);

	BUG_ON(faila == failb);
@@ -332,11 +333,13 @@ async_raid6_2data_recov(int disks, size_t bytes, int faila, int failb, 




	pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes);

	pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes);





	/* we need to preserve the contents of 'blocks' for the async

	/* if a dma resource is not available or a scribble buffer is not

	 * case, so punt to synchronous if a scribble buffer is not available

	 * available punt to the synchronous path.  In the 'dma not

	 * available' case be sure to use the scribble buffer to

	 * preserve the content of 'blocks' as the caller intended.

	 */

	 */

	if (!submit->scribble) {

	if (!async_dma_find_channel(DMA_PQ) || !scribble) {

		void **ptrs = (void **) blocks;

		void **ptrs = scribble ? scribble : (void **) blocks;





		async_tx_quiesce(&submit->depend_tx);

		async_tx_quiesce(&submit->depend_tx);

		for (i = 0; i < disks; i++)

		for (i = 0; i < disks; i++)
@@ -406,11 +409,13 @@ async_raid6_datap_recov(int disks, size_t bytes, int faila, 




	pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes);

	pr_debug("%s: disks: %d len: %zu\n", __func__, disks, bytes);





	/* we need to preserve the contents of 'blocks' for the async

	/* if a dma resource is not available or a scribble buffer is not

	 * case, so punt to synchronous if a scribble buffer is not available

	 * available punt to the synchronous path.  In the 'dma not

	 * available' case be sure to use the scribble buffer to

	 * preserve the content of 'blocks' as the caller intended.

	 */

	 */

	if (!scribble) {

	if (!async_dma_find_channel(DMA_PQ) || !scribble) {

		void **ptrs = (void **) blocks;

		void **ptrs = scribble ? scribble : (void **) blocks;





		async_tx_quiesce(&submit->depend_tx);

		async_tx_quiesce(&submit->depend_tx);

		for (i = 0; i < disks; i++)

		for (i = 0; i < disks; i++)

drivers/ata/pata_pcmcia.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -424,7 +424,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),

	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),

	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),

	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),

	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),

	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x55d5bffb),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
@@ -446,7 +446,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x7558f133),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),

	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),

drivers/ide/ide-cs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -409,7 +409,7 @@ static struct pcmcia_device_id ide_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),

	PCMCIA_DEVICE_PROD_ID12("Hyperstone", "Model1", 0x3d5b9ef5, 0xca6ab420),

	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),

	PCMCIA_DEVICE_PROD_ID12("IBM", "microdrive", 0xb569a6e5, 0xa6d76178),

	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),

	PCMCIA_DEVICE_PROD_ID12("IBM", "IBM17JSSFP20", 0xb569a6e5, 0xf2508753),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x3e520e17),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 1GB", 0x2e6d1829, 0x55d5bffb),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF CARD 4GB", 0x2e6d1829, 0x531e7d10),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),

	PCMCIA_DEVICE_PROD_ID12("KINGSTON", "CF8GB", 0x2e6d1829, 0xacbe682e),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),

	PCMCIA_DEVICE_PROD_ID12("IO DATA", "CBIDE2      ", 0x547e66dc, 0x8671043b),
@@ -431,7 +431,7 @@ static struct pcmcia_device_id ide_ids[] = { 
	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS1GCF80", 0x709b1bf1, 0x2a54d4b1),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS2GCF120", 0x709b1bf1, 0x969aa4f2),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF120", 0x709b1bf1, 0xf54a91c8),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x9351e59d),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS4GCF133", 0x709b1bf1, 0x7558f133),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),

	PCMCIA_DEVICE_PROD_ID12("TRANSCEND", "TS8GCF133", 0x709b1bf1, 0xb2f89b47),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),

	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),

	PCMCIA_DEVICE_PROD_ID12("WEIDA", "TWTTI", 0xcc7cf69c, 0x212bb918),