9 files changed, 238 insertions, 31 deletions

diff --git a/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl b/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
index 7ac7d7262bb7..3c3514815cd5 100644
--- a/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
+++ b/Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl
@@ -1,23 +1,18 @@
-What:           /sys/devices/platform/<i2c-demux-name>/cur_master
+What:           /sys/devices/platform/<i2c-demux-name>/available_masters
 Date:           January 2016
 KernelVersion:  4.6
 Contact:        Wolfram Sang <wsa@the-dreams.de>
 Description:
+                Reading the file will give you a list of masters which can be
+                selected for a demultiplexed bus. The format is
+                "<index>:<name>". Example from a Renesas Lager board:
 
-This file selects the active I2C master for a demultiplexed bus.
+                0:/i2c@e6500000 1:/i2c@e6508000
 
-Write 0 there for the first master, 1 for the second etc. Reading the file will
-give you a list with the active master marked. Example from a Renesas Lager
-board:
-
-root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
-* 0 - /i2c@9
-  1 - /i2c@e6520000
-  2 - /i2c@e6530000
-
-root@Lager:~# echo 2 > /sys/devices/platform/i2c@8/cur_master
-
-root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
-  0 - /i2c@9
-  1 - /i2c@e6520000
-* 2 - /i2c@e6530000
+What:           /sys/devices/platform/<i2c-demux-name>/current_master
+Date:           January 2016
+KernelVersion:  4.6
+Contact:        Wolfram Sang <wsa@the-dreams.de>
+Description:
+                This file selects/shows the active I2C master for a demultiplexed
+                bus. It uses the <index> value from the file 'available_masters'.
diff --git a/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt b/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
index e0fc2c11dd00..241fb0545b9e 100644
--- a/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
+++ b/Documentation/devicetree/bindings/clock/qca,ath79-pll.txt
@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9XXX PLL controller
 The PPL controller provides the 3 main clocks of the SoC: CPU, DDR and AHB.
 
 Required Properties:
-- compatible: has to be "qca,<soctype>-cpu-intc" and one of the following
+- compatible: has to be "qca,<soctype>-pll" and one of the following
   fallbacks:
   - "qca,ar7100-pll"
   - "qca,ar7240-pll"
@@ -21,8 +21,8 @@ Optional properties:
 
 Example:
 
-        memory-controller@18050000 {
-                compatible = "qca,ar9132-ppl", "qca,ar9130-pll";
+        pll-controller@18050000 {
+                compatible = "qca,ar9132-pll", "qca,ar9130-pll";
                 reg = <0x18050000 0x20>;
 
                 clock-names = "ref";
diff --git a/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
index 08a4a32c8eb0..0326154c7925 100644
--- a/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
+++ b/Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
@@ -134,12 +134,12 @@ mfio80		ddr_debug, mips_trace_data, mips_debug
 mfio81          dreq0, mips_trace_data, eth_debug
 mfio82          dreq1, mips_trace_data, eth_debug
 mfio83          mips_pll_lock, mips_trace_data, usb_debug
-mfio84          sys_pll_lock, mips_trace_data, usb_debug
-mfio85          wifi_pll_lock, mips_trace_data, sdhost_debug
-mfio86          bt_pll_lock, mips_trace_data, sdhost_debug
-mfio87          rpu_v_pll_lock, dreq2, socif_debug
-mfio88          rpu_l_pll_lock, dreq3, socif_debug
-mfio89          audio_pll_lock, dreq4, dreq5
+mfio84          audio_pll_lock, mips_trace_data, usb_debug
+mfio85          rpu_v_pll_lock, mips_trace_data, sdhost_debug
+mfio86          rpu_l_pll_lock, mips_trace_data, sdhost_debug
+mfio87          sys_pll_lock, dreq2, socif_debug
+mfio88          wifi_pll_lock, dreq3, socif_debug
+mfio89          bt_pll_lock, dreq4, dreq5
 tck
 trstn
 tdi
diff --git a/Documentation/filesystems/cramfs.txt b/Documentation/filesystems/cramfs.txt
index 31f53f0ab957..4006298f6707 100644
--- a/Documentation/filesystems/cramfs.txt
+++ b/Documentation/filesystems/cramfs.txt
@@ -38,7 +38,7 @@ the update lasts only as long as the inode is cached in memory, after
 which the timestamp reverts to 1970, i.e. moves backwards in time.
 
 Currently, cramfs must be written and read with architectures of the
-same endianness, and can be read only by kernels with PAGE_CACHE_SIZE
+same endianness, and can be read only by kernels with PAGE_SIZE
 == 4096.  At least the latter of these is a bug, but it hasn't been
 decided what the best fix is.  For the moment if you have larger pages
 you can just change the #define in mkcramfs.c, so long as you don't
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt
index d392e1505f17..d9c11d25bf02 100644
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
@@ -60,7 +60,7 @@ size:      The limit of allocated bytes for this tmpfs instance. The
            default is half of your physical RAM without swap. If you
            oversize your tmpfs instances the machine will deadlock
            since the OOM handler will not be able to free that memory.
-nr_blocks: The same as size, but in blocks of PAGE_CACHE_SIZE.
+nr_blocks: The same as size, but in blocks of PAGE_SIZE.
 nr_inodes: The maximum number of inodes for this instance. The default
            is half of the number of your physical RAM pages, or (on a
            machine with highmem) the number of lowmem RAM pages,
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index b02a7d598258..4164bd6397a2 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -708,9 +708,9 @@ struct address_space_operations {
         from the address space.  This generally corresponds to either a
         truncation, punch hole  or a complete invalidation of the address
         space (in the latter case 'offset' will always be 0 and 'length'
-        will be PAGE_CACHE_SIZE). Any private data associated with the page
+        will be PAGE_SIZE). Any private data associated with the page
         should be updated to reflect this truncation.  If offset is 0 and
-        length is PAGE_CACHE_SIZE, then the private data should be released,
+        length is PAGE_SIZE, then the private data should be released,
         because the page must be able to be completely discarded.  This may
         be done by calling the ->releasepage function, but in this case the
         release MUST succeed.
diff --git a/Documentation/networking/switchdev.txt b/Documentation/networking/switchdev.txt
index fad63136ee3e..2f659129694b 100644
--- a/Documentation/networking/switchdev.txt
+++ b/Documentation/networking/switchdev.txt
@@ -386,7 +386,7 @@ used. First phase is to "prepare" anything needed, including various checks,
 memory allocation, etc. The goal is to handle the stuff that is not unlikely
 to fail here. The second phase is to "commit" the actual changes.
 
-Switchdev provides an inftrastructure for sharing items (for example memory
+Switchdev provides an infrastructure for sharing items (for example memory
 allocations) between the two phases.
 
 The object created by a driver in "prepare" phase and it is queued up by:
diff --git a/Documentation/power/runtime_pm.txt b/Documentation/power/runtime_pm.txt
index 7328cf85236c..1fd1fbe9ce95 100644
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
@@ -586,6 +586,10 @@ drivers to make their ->remove() callbacks avoid races with runtime PM directly,
 but also it allows of more flexibility in the handling of devices during the
 removal of their drivers.
 
+Drivers in ->remove() callback should undo the runtime PM changes done
+in ->probe(). Usually this means calling pm_runtime_disable(),
+pm_runtime_dont_use_autosuspend() etc.
+
 The user space can effectively disallow the driver of the device to power manage
 it at run time by changing the value of its /sys/devices/.../power/control
 attribute to "on", which causes pm_runtime_forbid() to be called.  In principle,
diff --git a/Documentation/x86/topology.txt b/Documentation/x86/topology.txt
new file mode 100644
index 000000000000..06afac252f5b
--- /dev/null
+++ b/Documentation/x86/topology.txt
@@ -0,0 +1,208 @@
+x86 Topology
+============
+
+This documents and clarifies the main aspects of x86 topology modelling and
+representation in the kernel. Update/change when doing changes to the
+respective code.
+
+The architecture-agnostic topology definitions are in
+Documentation/cputopology.txt. This file holds x86-specific
+differences/specialities which must not necessarily apply to the generic
+definitions. Thus, the way to read up on Linux topology on x86 is to start
+with the generic one and look at this one in parallel for the x86 specifics.
+
+Needless to say, code should use the generic functions - this file is *only*
+here to *document* the inner workings of x86 topology.
+
+Started by Thomas Gleixner <tglx@linutronix.de> and Borislav Petkov <bp@alien8.de>.
+
+The main aim of the topology facilities is to present adequate interfaces to
+code which needs to know/query/use the structure of the running system wrt
+threads, cores, packages, etc.
+
+The kernel does not care about the concept of physical sockets because a
+socket has no relevance to software. It's an electromechanical component. In
+the past a socket always contained a single package (see below), but with the
+advent of Multi Chip Modules (MCM) a socket can hold more than one package. So
+there might be still references to sockets in the code, but they are of
+historical nature and should be cleaned up.
+
+The topology of a system is described in the units of:
+
+    - packages
+    - cores
+    - threads
+
+* Package:
+
+  Packages contain a number of cores plus shared resources, e.g. DRAM
+  controller, shared caches etc.
+
+  AMD nomenclature for package is 'Node'.
+
+  Package-related topology information in the kernel:
+
+  - cpuinfo_x86.x86_max_cores:
+
+    The number of cores in a package. This information is retrieved via CPUID.
+
+  - cpuinfo_x86.phys_proc_id:
+
+    The physical ID of the package. This information is retrieved via CPUID
+    and deduced from the APIC IDs of the cores in the package.
+
+  - cpuinfo_x86.logical_id:
+
+    The logical ID of the package. As we do not trust BIOSes to enumerate the
+    packages in a consistent way, we introduced the concept of logical package
+    ID so we can sanely calculate the number of maximum possible packages in
+    the system and have the packages enumerated linearly.
+
+  - topology_max_packages():
+
+    The maximum possible number of packages in the system. Helpful for per
+    package facilities to preallocate per package information.
+
+
+* Cores:
+
+  A core consists of 1 or more threads. It does not matter whether the threads
+  are SMT- or CMT-type threads.
+
+  AMDs nomenclature for a CMT core is "Compute Unit". The kernel always uses
+  "core".
+
+  Core-related topology information in the kernel:
+
+  - smp_num_siblings:
+
+    The number of threads in a core. The number of threads in a package can be
+    calculated by:
+
+        threads_per_package = cpuinfo_x86.x86_max_cores * smp_num_siblings
+
+
+* Threads:
+
+  A thread is a single scheduling unit. It's the equivalent to a logical Linux
+  CPU.
+
+  AMDs nomenclature for CMT threads is "Compute Unit Core". The kernel always
+  uses "thread".
+
+  Thread-related topology information in the kernel:
+
+  - topology_core_cpumask():
+
+    The cpumask contains all online threads in the package to which a thread
+    belongs.
+
+    The number of online threads is also printed in /proc/cpuinfo "siblings."
+
+  - topology_sibling_mask():
+
+    The cpumask contains all online threads in the core to which a thread
+    belongs.
+
+   - topology_logical_package_id():
+
+    The logical package ID to which a thread belongs.
+
+   - topology_physical_package_id():
+
+    The physical package ID to which a thread belongs.
+
+   - topology_core_id();
+
+    The ID of the core to which a thread belongs. It is also printed in /proc/cpuinfo
+    "core_id."
+
+
+
+System topology examples
+
+Note:
+
+The alternative Linux CPU enumeration depends on how the BIOS enumerates the
+threads. Many BIOSes enumerate all threads 0 first and then all threads 1.
+That has the "advantage" that the logical Linux CPU numbers of threads 0 stay
+the same whether threads are enabled or not. That's merely an implementation
+detail and has no practical impact.
+
+1) Single Package, Single Core
+
+   [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+
+2) Single Package, Dual Core
+
+   a) One thread per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+
+   b) Two threads per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 1
+                    -> [core 1] -> [thread 0] -> Linux CPU 2
+                                -> [thread 1] -> Linux CPU 3
+
+      Alternative enumeration:
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 2
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+                                -> [thread 1] -> Linux CPU 3
+
+      AMD nomenclature for CMT systems:
+
+        [node 0] -> [Compute Unit 0] -> [Compute Unit Core 0] -> Linux CPU 0
+                                     -> [Compute Unit Core 1] -> Linux CPU 1
+                 -> [Compute Unit 1] -> [Compute Unit Core 0] -> Linux CPU 2
+                                     -> [Compute Unit Core 1] -> Linux CPU 3
+
+4) Dual Package, Dual Core
+
+   a) One thread per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+
+        [package 1] -> [core 0] -> [thread 0] -> Linux CPU 2
+                    -> [core 1] -> [thread 0] -> Linux CPU 3
+
+   b) Two threads per core
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 1
+                    -> [core 1] -> [thread 0] -> Linux CPU 2
+                                -> [thread 1] -> Linux CPU 3
+
+        [package 1] -> [core 0] -> [thread 0] -> Linux CPU 4
+                                -> [thread 1] -> Linux CPU 5
+                    -> [core 1] -> [thread 0] -> Linux CPU 6
+                                -> [thread 1] -> Linux CPU 7
+
+      Alternative enumeration:
+
+        [package 0] -> [core 0] -> [thread 0] -> Linux CPU 0
+                                -> [thread 1] -> Linux CPU 4
+                    -> [core 1] -> [thread 0] -> Linux CPU 1
+                                -> [thread 1] -> Linux CPU 5
+
+        [package 1] -> [core 0] -> [thread 0] -> Linux CPU 2
+                                -> [thread 1] -> Linux CPU 6
+                    -> [core 1] -> [thread 0] -> Linux CPU 3
+                                -> [thread 1] -> Linux CPU 7
+
+      AMD nomenclature for CMT systems:
+
+        [node 0] -> [Compute Unit 0] -> [Compute Unit Core 0] -> Linux CPU 0
+                                     -> [Compute Unit Core 1] -> Linux CPU 1
+                 -> [Compute Unit 1] -> [Compute Unit Core 0] -> Linux CPU 2
+                                     -> [Compute Unit Core 1] -> Linux CPU 3
+
+        [node 1] -> [Compute Unit 0] -> [Compute Unit Core 0] -> Linux CPU 4
+                                     -> [Compute Unit Core 1] -> Linux CPU 5
+                 -> [Compute Unit 1] -> [Compute Unit Core 0] -> Linux CPU 6
+                                     -> [Compute Unit Core 1] -> Linux CPU 7