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

Commit bc47ab02 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next

Manual merge of:
	arch/powerpc/kernel/asm-offsets.c
parents 37f9ef55 8ebf9756
Loading
Loading
Loading
Loading
+59 −0
Original line number Original line Diff line number Diff line
@@ -60,3 +60,62 @@ Description:
		Indicates whether the block layer should automatically
		Indicates whether the block layer should automatically
		generate checksums for write requests bound for
		generate checksums for write requests bound for
		devices that support receiving integrity metadata.
		devices that support receiving integrity metadata.

What:		/sys/block/<disk>/alignment_offset
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report a physical block size that is
		bigger than the logical block size (for instance a drive
		with 4KB physical sectors exposing 512-byte logical
		blocks to the operating system).  This parameter
		indicates how many bytes the beginning of the device is
		offset from the disk's natural alignment.

What:		/sys/block/<disk>/<partition>/alignment_offset
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report a physical block size that is
		bigger than the logical block size (for instance a drive
		with 4KB physical sectors exposing 512-byte logical
		blocks to the operating system).  This parameter
		indicates how many bytes the beginning of the partition
		is offset from the disk's natural alignment.

What:		/sys/block/<disk>/queue/logical_block_size
Date:		May 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		This is the smallest unit the storage device can
		address.  It is typically 512 bytes.

What:		/sys/block/<disk>/queue/physical_block_size
Date:		May 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		This is the smallest unit the storage device can write
		without resorting to read-modify-write operation.  It is
		usually the same as the logical block size but may be
		bigger.  One example is SATA drives with 4KB sectors
		that expose a 512-byte logical block size to the
		operating system.

What:		/sys/block/<disk>/queue/minimum_io_size
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report a preferred minimum I/O size,
		which is the smallest request the device can perform
		without incurring a read-modify-write penalty.  For disk
		drives this is often the physical block size.  For RAID
		arrays it is often the stripe chunk size.

What:		/sys/block/<disk>/queue/optimal_io_size
Date:		April 2009
Contact:	Martin K. Petersen <martin.petersen@oracle.com>
Description:
		Storage devices may report an optimal I/O size, which is
		the device's preferred unit of receiving I/O.  This is
		rarely reported for disk drives.  For RAID devices it is
		usually the stripe width or the internal block size.
+33 −0
Original line number Original line Diff line number Diff line
Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/model
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 0 model for logical drive
		Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/rev
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 0 revision for logical
		drive Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/unique_id
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 83 serial number for logical
		drive Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/vendor
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	Displays the SCSI INQUIRY page 0 vendor for logical drive
		Y of controller X.

Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/block:cciss!cXdY
Date:		March 2009
Kernel Version: 2.6.30
Contact:	iss_storagedev@hp.com
Description:	A symbolic link to /sys/block/cciss!cXdY
+18 −0
Original line number Original line Diff line number Diff line
What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
Date:      August 2008
KernelVersion:	2.6.27
Contact:	mark.langsdorf@amd.com
Description:	These files exist in every cpu's cache index directories.
		There are currently 2 cache_disable_# files in each
		directory.  Reading from these files on a supported
		processor will return that cache disable index value
		for that processor and node.  Writing to one of these
		files will cause the specificed cache index to be disabled.

		Currently, only AMD Family 10h Processors support cache index
		disable, and only for their L3 caches.  See the BIOS and
		Kernel Developer's Guide at
		http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
		for formatting information and other details on the
		cache index disable.
Users:    joachim.deguara@amd.com
+12 −0
Original line number Original line Diff line number Diff line
@@ -704,12 +704,24 @@ this directory the following files can currently be found:
				The current number of free dma_debug_entries
				The current number of free dma_debug_entries
				in the allocator.
				in the allocator.


	dma-api/driver-filter
				You can write a name of a driver into this file
				to limit the debug output to requests from that
				particular driver. Write an empty string to
				that file to disable the filter and see
				all errors again.

If you have this code compiled into your kernel it will be enabled by default.
If you have this code compiled into your kernel it will be enabled by default.
If you want to boot without the bookkeeping anyway you can provide
If you want to boot without the bookkeeping anyway you can provide
'dma_debug=off' as a boot parameter. This will disable DMA-API debugging.
'dma_debug=off' as a boot parameter. This will disable DMA-API debugging.
Notice that you can not enable it again at runtime. You have to reboot to do
Notice that you can not enable it again at runtime. You have to reboot to do
so.
so.


If you want to see debug messages only for a special device driver you can
specify the dma_debug_driver=<drivername> parameter. This will enable the
driver filter at boot time. The debug code will only print errors for that
driver afterwards. This filter can be disabled or changed later using debugfs.

When the code disables itself at runtime this is most likely because it ran
When the code disables itself at runtime this is most likely because it ran
out of dma_debug_entries. These entries are preallocated at boot. The number
out of dma_debug_entries. These entries are preallocated at boot. The number
of preallocated entries is defined per architecture. If it is too low for you
of preallocated entries is defined per architecture. If it is too low for you
+2 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
	    alsa-driver-api.xml writing-an-alsa-driver.xml
	    alsa-driver-api.xml writing-an-alsa-driver.xml \
	    tracepoint.xml


###
###
# The build process is as follows (targets):
# The build process is as follows (targets):
Loading