Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next (7fe3016f) · Commits · 戴 / test

Documentation/DocBook/80211.tmpl

+0 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,6 @@
		!Finclude/net/cfg80211.h cfg80211_beacon_data
		!Finclude/net/cfg80211.h cfg80211_ap_settings
		!Finclude/net/cfg80211.h station_parameters
		!Finclude/net/cfg80211.h station_info_flags
		!Finclude/net/cfg80211.h rate_info_flags
		!Finclude/net/cfg80211.h rate_info
		!Finclude/net/cfg80211.h station_info

Documentation/kernel-parameters.txt

+12 −0

Original line number	Diff line number	Diff line
		@@ -3180,6 +3180,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

		retain_initrd [RAM] Keep initrd memory after extraction

		rfkill.default_state=
		0 "airplane mode". All wifi, bluetooth, wimax, gps, fm,
		etc. communication is blocked by default.
		1 Unblocked.

		rfkill.master_switch_mode=
		0 The "airplane mode" button does nothing.
		1 The "airplane mode" button toggles between everything
		blocked and the previous configuration.
		2 The "airplane mode" button toggles between everything
		blocked and everything unblocked.

		rhash_entries= [KNL,NET]
		Set number of hash buckets for route cache

Documentation/memory-barriers.txt

+42 −0

Original line number	Diff line number	Diff line
		@@ -1633,6 +1633,48 @@ There are some more advanced barrier functions:
		operations" subsection for information on where to use these.


		(*) dma_wmb();
		(*) dma_rmb();

		These are for use with consistent memory to guarantee the ordering
		of writes or reads of shared memory accessible to both the CPU and a
		DMA capable device.

		For example, consider a device driver that shares memory with a device
		and uses a descriptor status value to indicate if the descriptor belongs
		to the device or the CPU, and a doorbell to notify it when new
		descriptors are available:

		if (desc->status != DEVICE_OWN) {
		/* do not read data until we own descriptor */
		dma_rmb();

		/* read/modify data */
		read_data = desc->data;
		desc->data = write_data;

		/* flush modifications before status update */
		dma_wmb();

		/* assign ownership */
		desc->status = DEVICE_OWN;

		/* force memory to sync before notifying device via MMIO */
		wmb();

		/* notify device of new descriptors */
		writel(DESC_NOTIFY, doorbell);
		}

		The dma_rmb() allows us guarantee the device has released ownership
		before we read the data from the descriptor, and he dma_wmb() allows
		us to guarantee the data is written to the descriptor before the device
		can see it now has ownership. The wmb() is needed to guarantee that the
		cache coherent memory writes have completed before attempting a write to
		the cache incoherent MMIO region.

		See Documentation/DMA-API.txt for more information on consistent memory.

		MMIO WRITE BARRIER
		------------------

Documentation/rfkill.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ whether they can be changed or not:
		- soft block: writable radio block (need not be readable) that is set by
		the system software.

		The rfkill subsystem has two parameters, rfkill.default_state and
		rfkill.master_switch_mode, which are documented in kernel-parameters.txt.


		2. Implementation details

arch/alpha/include/asm/barrier.h

+51 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,57 @@
		#define rmb() __asm__ __volatile__("mb": : :"memory")
		#define wmb() __asm__ __volatile__("wmb": : :"memory")

		/**
		* read_barrier_depends - Flush all pending reads that subsequents reads
		* depend on.
		*
		* No data-dependent reads from memory-like regions are ever reordered
		* over this barrier. All reads preceding this primitive are guaranteed
		* to access memory (but not necessarily other CPUs' caches) before any
		* reads following this primitive that depend on the data return by
		* any of the preceding reads. This primitive is much lighter weight than
		* rmb() on most CPUs, and is never heavier weight than is
		* rmb().
		*
		* These ordering constraints are respected by both the local CPU
		* and the compiler.
		*
		* Ordering is not guaranteed by anything other than these primitives,
		* not even by data dependencies. See the documentation for
		* memory_barrier() for examples and URLs to more information.
		*
		* For example, the following code would force ordering (the initial
		* value of "a" is zero, "b" is one, and "p" is "&a"):
		*
		* <programlisting>
		* CPU 0 CPU 1
		*
		* b = 2;
		* memory_barrier();
		* p = &b; q = p;
		* read_barrier_depends();
		* d = *q;
		* </programlisting>
		*
		* because the read of "*q" depends on the read of "p" and these
		* two reads are separated by a read_barrier_depends(). However,
		* the following code, with the same initial values for "a" and "b":
		*
		* <programlisting>
		* CPU 0 CPU 1
		*
		* a = 2;
		* memory_barrier();
		* b = 3; y = b;
		* read_barrier_depends();
		* x = a;
		* </programlisting>
		*
		* does not enforce ordering, since there is no data dependency between
		* the read of "a" and the read of "b". Therefore, on some CPUs, such
		* as Alpha, "y" could be set to 3 and "x" to 0. Use rmb()
		* in cases like this where there are no data dependencies.
		*/
		#define read_barrier_depends() __asm__ __volatile__("mb": : :"memory")

		#ifdef CONFIG_SMP

Admin message