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

Commit d18bfacf authored by Tony Luck's avatar Tony Luck
Browse files

Auto merge with /home/aegl/GIT/linus

parents a68db763 fd782a4a

Documentation/DocBook/libata.tmpl

+93 −3
Original line number Diff line number Diff line
@@ -84,6 +84,14 @@ void (*port_disable) (struct ata_port *); 
	Called from ata_bus_probe() and ata_bus_reset() error paths,

	as well as when unregistering from the SCSI module (rmmod, hot

	unplug).

	This function should do whatever needs to be done to take the

	port out of use.  In most cases, ata_port_disable() can be used

	as this hook.

	</para>

	<para>

	Called from ata_bus_probe() on a failed probe.

	Called from ata_bus_reset() on a failed bus reset.

	Called from ata_scsi_release().

	</para>



	</sect2>
@@ -98,6 +106,13 @@ void (*dev_config) (struct ata_port *, struct ata_device *); 
	found.  Typically used to apply device-specific fixups prior to

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

	</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.

	</para>



	</sect2>
@@ -135,6 +150,8 @@ void (*tf_read) (struct ata_port *ap, struct ata_taskfile *tf); 
	registers / DMA buffers.  ->tf_read() is called to read the

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

	taskfile register values.

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

	ata_tf_load() and ata_tf_read() for these hooks.

	</para>



	</sect2>
@@ -147,6 +164,8 @@ void (*exec_command)(struct ata_port *ap, struct ata_taskfile *tf); 
	<para>

	causes an ATA command, previously loaded with

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

	Most drivers for taskfile-based hardware use ata_exec_command()

	for this hook.

	</para>



	</sect2>
@@ -161,6 +180,10 @@ Allow low-level driver to filter ATA PACKET commands, returning a status 
indicating whether or not it is OK to use DMA for the supplied PACKET

command.

	</para>

	<para>

	This hook may be specified as NULL, in which case libata will

	assume that atapi dma can be supported.

	</para>



	</sect2>
@@ -175,6 +198,14 @@ u8 (*check_err)(struct ata_port *ap); 
	Reads the Status/AltStatus/Error ATA shadow register from

	hardware.  On some hardware, reading the Status register has

	the side effect of clearing the interrupt condition.

	Most drivers for taskfile-based hardware use

	ata_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>



	</sect2>
@@ -190,6 +221,12 @@ void (*dev_select)(struct ata_port *ap, unsigned int device); 
	available for use) on the ATA bus.  This generally has no

	meaning on FIS-based devices.

	</para>

	<para>

	Most drivers for taskfile-based hardware use

	ata_std_dev_select() for this hook.  Controllers which do not

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

	use ata_noop_dev_select().

	</para>



	</sect2>
@@ -204,6 +241,8 @@ void (*phy_reset) (struct ata_port *ap); 
	for device presence (PATA and SATA), typically a soft reset

	(SRST) will be performed.  Drivers typically use the helper

	functions ata_bus_reset() or sata_phy_reset() for this hook.

	Many SATA drivers use sata_phy_reset() or call it from within

	their own phy_reset() functions.

	</para>



	</sect2>
@@ -227,6 +266,25 @@ PCI IDE DMA Status register. 
These hooks are typically either no-ops, or simply not implemented, in

FIS-based drivers.

	</para>

	<para>

Most legacy IDE drivers use ata_bmdma_setup() for the bmdma_setup()

hook.  ata_bmdma_setup() will write the pointer to the PRD table to

the IDE PRD Table Address register, enable DMA in the DMA Command

register, and call exec_command() to begin the transfer.

	</para>

	<para>

Most legacy IDE drivers use ata_bmdma_start() for the bmdma_start()

hook.  ata_bmdma_start() will write the ATA_DMA_START flag to the DMA

Command register.

	</para>

	<para>

Many legacy IDE drivers use ata_bmdma_stop() for the bmdma_stop()

hook.  ata_bmdma_stop() clears the ATA_DMA_START flag in the DMA

command register.

	</para>

	<para>

Many legacy IDE drivers use ata_bmdma_status() as the bmdma_status() hook.

	</para>



	</sect2>
@@ -250,6 +308,10 @@ int (*qc_issue) (struct ata_queued_cmd *qc); 
	helper function ata_qc_issue_prot() for taskfile protocol-based

	dispatch.  More advanced drivers implement their own ->qc_issue.

	</para>

	<para>

	ata_qc_issue_prot() calls ->tf_load(), ->bmdma_setup(), and

	->bmdma_start() as necessary to initiate a transfer.

	</para>



	</sect2>
@@ -279,6 +341,21 @@ void (*irq_clear) (struct ata_port *); 
	before the interrupt handler is registered, to be sure hardware

	is quiet.

	</para>

	<para>

	The second argument, dev_instance, should be cast to a pointer

	to struct ata_host_set.

	</para>

	<para>

	Most legacy IDE drivers use ata_interrupt() for the

	irq_handler hook, which scans all ports in the host_set,

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

	ata_host_intr(ap,qc).

	</para>

	<para>

	Most legacy IDE drivers use ata_bmdma_irq_clear() for the

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

	flags in the DMA status register.

	</para>



	</sect2>
@@ -292,6 +369,7 @@ void (*scr_write) (struct ata_port *ap, unsigned int sc_reg, 
	<para>

	Read and write standard SATA phy registers.  Currently only used

	if ->phy_reset hook called the sata_phy_reset() helper function.

	sc_reg is one of SCR_STATUS, SCR_CONTROL, SCR_ERROR, or SCR_ACTIVE.

	</para>



	</sect2>
@@ -307,17 +385,29 @@ void (*host_stop) (struct ata_host_set *host_set); 
	->port_start() is called just after the data structures for each

	port are initialized.  Typically this is used to alloc per-port

	DMA buffers / tables / rings, enable DMA engines, and similar

	tasks.  

	tasks.  Some drivers also use this entry point as a chance to

	allocate driver-private memory for ap->private_data.

	</para>

	<para>

	Many drivers use ata_port_start() as this hook or call

	it from their own port_start() hooks.  ata_port_start()

	allocates space for a legacy IDE PRD table and returns.

	</para>

	<para>

	->port_stop() is called after ->host_stop().  It's sole function

	is to release DMA/memory resources, now that they are no longer

	actively being used.

	actively being used.  Many drivers also free driver-private

	data from port at this time.

	</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

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

and other resources, etc.

	This hook may be specified as NULL, in which case it is not called.

	</para>



	</sect2>

Documentation/SubmittingDrivers

+8 −6
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ Allocating Device Numbers 
-------------------------



Major and minor numbers for block and character devices are allocated

by the Linux assigned name and number authority (currently better

known as H Peter Anvin). The site is http://www.lanana.org/. This

by the Linux assigned name and number authority (currently this is

Torben Mathiasen). The site is http://www.lanana.org/. This

also deals with allocating numbers for devices that are not going to

be submitted to the mainstream kernel.

See Documentation/devices.txt for more information on this.



If you don't use assigned numbers then when you device is submitted it will

get given an assigned number even if that is different from values you may

If you don't use assigned numbers then when your device is submitted it will

be given an assigned number even if that is different from values you may

have shipped to customers before.



Who To Submit Drivers To
@@ -32,7 +33,8 @@ Linux 2.2: 
	If the code area has a general maintainer then please submit it to

	the maintainer listed in MAINTAINERS in the kernel file. If the

	maintainer does not respond or you cannot find the appropriate

	maintainer then please contact Alan Cox <alan@lxorguk.ukuu.org.uk>

	maintainer then please contact the 2.2 kernel maintainer:

	Marc-Christian Petersen <m.c.p@wolk-project.de>.



Linux 2.4:

	The same rules apply as 2.2. The final contact point for Linux 2.4
@@ -48,7 +50,7 @@ What Criteria Determine Acceptance 


Licensing:	The code must be released to us under the

		GNU General Public License. We don't insist on any kind

		of exclusively GPL licensing, and if you wish the driver

		of exclusive GPL licensing, and if you wish the driver

		to be useful to other communities such as BSD you may well

		wish to release under multiple licenses.

Documentation/SubmittingPatches

+29 −15
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ not in any lower subdirectory. 


To create a patch for a single file, it is often sufficient to do:



	SRCTREE= linux-2.4

	SRCTREE= linux-2.6

	MYFILE=  drivers/net/mydriver.c



	cd $SRCTREE
@@ -48,17 +48,18 @@ To create a patch for multiple files, you should unpack a "vanilla", 
or unmodified kernel source tree, and generate a diff against your

own source tree.  For example:



	MYSRC= /devel/linux-2.4

	MYSRC= /devel/linux-2.6



	tar xvfz linux-2.4.0-test11.tar.gz

	mv linux linux-vanilla

	wget http://www.moses.uklinux.net/patches/dontdiff

	diff -uprN -X dontdiff linux-vanilla $MYSRC > /tmp/patch

	rm -f dontdiff

	tar xvfz linux-2.6.12.tar.gz

	mv linux-2.6.12 linux-2.6.12-vanilla

	diff -uprN -X linux-2.6.12-vanilla/Documentation/dontdiff \

		linux-2.6.12-vanilla $MYSRC > /tmp/patch



"dontdiff" is a list of files which are generated by the kernel during

the build process, and should be ignored in any diff(1)-generated

patch.  dontdiff is maintained by Tigran Aivazian <tigran@veritas.com>

patch.  The "dontdiff" file is included in the kernel tree in

2.6.12 and later.  For earlier kernel versions, you can get it

from <http://www.xenotime.net/linux/doc/dontdiff>.



Make sure your patch does not include any extra files which do not

belong in a patch submission.  Make sure to review your patch -after-
@@ -66,18 +67,20 @@ generated it with diff(1), to ensure accuracy. 


If your changes produce a lot of deltas, you may want to look into

splitting them into individual patches which modify things in

logical stages, this will facilitate easier reviewing by other

logical stages.  This will facilitate easier reviewing by other

kernel developers, very important if you want your patch accepted.

There are a number of scripts which can aid in this;

There are a number of scripts which can aid in this:



Quilt:

http://savannah.nongnu.org/projects/quilt



Randy Dunlap's patch scripts:

http://developer.osdl.org/rddunlap/scripts/patching-scripts.tgz

http://www.xenotime.net/linux/scripts/patching-scripts-002.tar.gz



Andrew Morton's patch scripts:

http://www.zip.com.au/~akpm/linux/patches/patch-scripts-0.16

http://www.zip.com.au/~akpm/linux/patches/patch-scripts-0.20







2) Describe your changes.
@@ -163,6 +166,8 @@ patches. Trivial patches must qualify for one of the following rules: 
 since people copy, as long as it's trivial)

 Any fix by the author/maintainer of the file. (ie. patch monkey

 in re-transmission mode)

URL: <http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/>
@@ -291,6 +296,17 @@ now, but you can do this to mark internal company procedures or just 
point out some special detail about the sign-off. 







12) More references for submitting patches



Andrew Morton, "The perfect patch" (tpp).

  <http://www.zip.com.au/~akpm/linux/patches/stuff/tpp.txt>



Jeff Garzik, "Linux kernel patch submission format."

  <http://linux.yyz.us/patch-format.html>







-----------------------------------

SECTION 2 - HINTS, TIPS, AND TRICKS

-----------------------------------
@@ -359,7 +375,5 @@ and 'extern __inline__'. 
4) Don't over-design.



Don't try to anticipate nebulous future cases which may or may not

be useful:  "Make it as simple as you can, and no simpler"





be useful:  "Make it as simple as you can, and no simpler."

Documentation/kernel-parameters.txt

+15 −0
Original line number Diff line number Diff line
@@ -622,6 +622,17 @@ running once the system is up. 
	ips=		[HW,SCSI] Adaptec / IBM ServeRAID controller

			See header of drivers/scsi/ips.c.



	irqfixup	[HW]

			When an interrupt is not handled search all handlers

			for it. Intended to get systems with badly broken

			firmware running.



	irqpoll		[HW]

			When an interrupt is not handled search all handlers

			for it. Also check all handlers each timer

			interrupt. Intended to get systems with badly broken

			firmware running.



	isapnp=		[ISAPNP]

			Format: <RDP>, <reset>, <pci_scan>, <verbosity>
@@ -1030,6 +1041,10 @@ running once the system is up. 
		irqmask=0xMMMM		[IA-32] Set a bit mask of IRQs allowed to be assigned

					automatically to PCI devices. You can make the kernel

					exclude IRQs of your ISA cards this way.

		pirqaddr=0xAAAAA	[IA-32] Specify the physical address

					of the PIRQ table (normally generated

					by the BIOS) if it is outside the

					F0000h-100000h range.

		lastbus=N		[IA-32] Scan all buses till bus #N. Can be useful

					if the kernel is unable to find your secondary buses

					and you want to tell it explicitly which ones they are.

Documentation/video4linux/API.html

+16 −399

File changed.

Preview size limit exceeded, changes collapsed.