Merge pull request #2 from rockchip-linux/release-4.4

sync upstream Rockchip

Author: Tonymac32

.gitignore

@@ -45,6 +45,7 @@ Module.symvers
 /boot.img
 /kernel.img
 /resource.img
+/zboot.img
 /tags
 /TAGS
 /linux

Documentation/ABI/testing/sysfs-devices-system-cpu

@@ -276,6 +276,7 @@ What:		/sys/devices/system/cpu/vulnerabilities
 		/sys/devices/system/cpu/vulnerabilities/meltdown
 		/sys/devices/system/cpu/vulnerabilities/spectre_v1
 		/sys/devices/system/cpu/vulnerabilities/spectre_v2
+		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass
 Date:		January 2018
 Contact:	Linux kernel mailing list <[email protected]>
 Description:	Information about CPU vulnerabilities

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -101,6 +101,7 @@ Date:		February 2015
 Contact:	"Jaegeuk Kim" <[email protected]>
 Description:
 		 Controls the trimming rate in batch mode.
+		 <deprecated>
 
 What:		/sys/fs/f2fs/<disk>/cp_interval
 Date:		October 2015
@@ -192,3 +193,14 @@ Date:		November 2017
 Contact:	"Sheng Yong" <[email protected]>
 Description:
 		 Controls readahead inode block in readdir.
+
+What:		/sys/fs/f2fs/<disk>/extension_list
+Date:		Feburary 2018
+Contact:	"Chao Yu" <[email protected]>
+Description:
+		 Used to control configure extension list:
+		 - Query: cat /sys/fs/f2fs/<disk>/extension_list
+		 - Add: echo '[h/c]extension' > /sys/fs/f2fs/<disk>/extension_list
+		 - Del: echo '[h/c]!extension' > /sys/fs/f2fs/<disk>/extension_list
+		 - [h] means add/del hot file extension
+		 - [c] means add/del cold file extension

Documentation/Changes

@@ -25,7 +25,7 @@ o  GNU C                  3.2                     # gcc --version
 o  GNU make               3.80                    # make --version
 o  binutils               2.12                    # ld -v
 o  util-linux             2.10o                   # fdformat --version
-o  module-init-tools      0.9.10                  # depmod -V
+o  kmod                   13                      # depmod -V
 o  e2fsprogs              1.41.4                  # e2fsck -V
 o  jfsutils               1.1.3                   # fsck.jfs -V
 o  reiserfsprogs          3.6.3                   # reiserfsck -V
@@ -132,12 +132,6 @@ is not build with CONFIG_KALLSYMS and you have no way to rebuild and
 reproduce the Oops with that option, then you can still decode that Oops
 with ksymoops.
 
-Module-Init-Tools
------------------
-
-A new module loader is now in the kernel that requires module-init-tools
-to use.  It is backward compatible with the 2.4.x series kernels.
-
 Mkinitrd
 --------
 
@@ -319,14 +313,15 @@ Util-linux
 ----------
 o  <ftp://ftp.kernel.org/pub/linux/utils/util-linux/>
 
+Kmod
+----
+o  <https://www.kernel.org/pub/linux/utils/kernel/kmod/>
+o  <https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git>
+
 Ksymoops
 --------
 o  <ftp://ftp.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/>
 
-Module-Init-Tools
------------------
-o  <ftp://ftp.kernel.org/pub/linux/kernel/people/rusty/modules/>
-
 Mkinitrd
 --------
 o  <https://code.launchpad.net/initrd-tools/main>

Documentation/device-mapper/thin-provisioning.txt

@@ -112,9 +112,11 @@ $low_water_mark is expressed in blocks of size $data_block_size.  If
 free space on the data device drops below this level then a dm event
 will be triggered which a userspace daemon should catch allowing it to
 extend the pool device.  Only one such event will be sent.
-Resuming a device with a new table itself triggers an event so the
-userspace daemon can use this to detect a situation where a new table
-already exceeds the threshold.
+
+No special event is triggered if a just resumed device's free space is below
+the low water mark. However, resuming a device always triggers an
+event; a userspace daemon should verify that free space exceeds the low
+water mark when handling this event.
 
 A low water mark for the metadata device is maintained in the kernel and
 will trigger a dm event if free space on the metadata device drops below

Documentation/device-mapper/verity.txt

@@ -109,6 +109,17 @@ fec_start <offset>
     This is the offset, in <data_block_size> blocks, from the start of the
     FEC device to the beginning of the encoding data.
 
+check_at_most_once
+    Verify data blocks only the first time they are read from the data device,
+    rather than every time.  This reduces the overhead of dm-verity so that it
+    can be used on systems that are memory and/or CPU constrained.  However, it
+    provides a reduced level of security because only offline tampering of the
+    data device's content will be detected, not online tampering.
+
+    Hash blocks are still verified each time they are read from the hash device,
+    since verification of hash blocks is less performance critical than data
+    blocks, and a hash block will not be verified any more after all the data
+    blocks it covers have been verified anyway.
 
 Theory of operation
 ===================

Documentation/devicetree/bindings/arm/mali-midgard.txt

@@ -1,5 +1,5 @@
 #
-# (C) COPYRIGHT 2013-2015 ARM Limited. All rights reserved.
+# (C) COPYRIGHT 2013-2017 ARM Limited. All rights reserved.
 #
 # This program is free software and is provided to you under the terms of the
 # GNU General Public License version 2 as published by the Free Software
@@ -33,8 +33,6 @@ Optional:
 Documentation/devicetree/bindings/regulator/regulator.txt for details.
 - operating-points : Refer to Documentation/devicetree/bindings/power/opp.txt
 for details.
-- snoop_enable_smc : SMC function ID to enable CCI snooping on the GPU port(s).
-- snoop_disable_smc : SMC function ID to disable CCI snooping on the GPU port(s).
 - jm_config : For T860/T880. Sets job manager configuration. An array containing:
 	- 1 to override the TIMESTAMP value, 0 otherwise.
 	- 1 to override clock gate, forcing them to be always on, 0 otherwise.
@@ -45,19 +43,27 @@ for details.
 - power_model : Sets power model parameters. Note that this model was designed for the Juno
 	        platform, and may not be suitable for other platforms. A structure containing :
 	- compatible: Should be arm,mali-simple-power-model
-	- voltage: Voltage at reference point. Specified in mV.
-	- frequency: Frequency at reference point. Specified in MHz.
-	- dynamic-power: Dynamic power at reference frequency and voltage. Specified in mW.
-	- static-power: Static power at reference frequency. Specified in mW.
-	- ts: An array containing coefficients for the temperature scaling factor.
-	  Used as : tsf = ts[3]*T^3 + ts[2]*T^2 + ts[1]*T + ts[0], where T = temperature
+	- dynamic-coefficient: Coefficient, in pW/(Hz V^2), which is multiplied
+	  by v^2*f to calculate the dynamic power consumption.
+	- static-coefficient: Coefficient, in uW/V^3, which is multiplied by
+	  v^3 to calculate the static power consumption.
+	- ts: An array containing coefficients for the temperature scaling
+	  factor. This is used to scale the static power by a factor of
+	  tsf/1000000, where tsf = ts[3]*T^3 + ts[2]*T^2 + ts[1]*T + ts[0],
+	  and T = temperature in degrees.
 	- thermal-zone: A string identifying the thermal zone used for the GPU
 - system-coherency : Sets the coherency protocol to be used for coherent
 		     accesses made from the GPU.
 		     If not set then no coherency is used.
 	- 0  : ACE-Lite
 	- 1  : ACE
 	- 31 : No coherency
+- ipa-model : Sets the IPA model to be used for power management. GPU probe will fail if the
+	      model is not found in the registered models list. If no model is specified here,
+	      a gpu-id based model is picked if available, otherwise the default model is used.
+	- mali-simple-power-model: Default model used on mali
+- protected-mode-switcher : Phandle to device implemented protected mode switching functionality.
+Refer to Documentation/devicetree/bindings/arm/smc-protected-mode-switcher.txt for one implementation.
 
 Example for a Mali-T602:
 
@@ -82,10 +88,8 @@ gpu@0xfc010000 {
 	>;
 	power_model {
 		compatible = "arm,mali-simple-power-model";
-		voltage = <800>;
-		frequency = <500>;
-		static-power = <500>;
-		dynamic-power = <1500>;
+		static-coefficient = <2427750>;
+		dynamic-coefficient = <4687>;
 		ts = <20000 2000 (-20) 2>;
 		thermal-zone = "gpu";
 	};

Documentation/devicetree/bindings/arm/rockchip.txt

@@ -115,17 +115,33 @@ Rockchip platforms device tree bindings
     Required root node properties:
       - compatible = "rockchip,rk3399-evb", "rockchip,rk3399";
 
+- Rockchip RK3399 Rock960 version ab board:
+    Required root node properties:
+      - compatible = "rockchip,rock960", "rockchip,rk3399";
+
 - Rockchip RK3326 f863 board:
     Required root node properties:
       - compatible = "rockchip,rk3326-863-lp3-v10", "rockchip,rk3326";
 
+- Rockchip RK3326 f863 avb board:
+    Required root node properties:
+      - compatible = "rockchip,rk3326-863-lp3-v10-avb", "rockchip,rk3326";
+
+- Rockchip RK3326 86v board:
+    Required root node properties:
+      - compatible = "rockchip,rk3326-86v-v10", "rockchip,rk3326";
+
 - Rockchip RK3326 evb board:
     Required root node properties:
       - compatible = "rockchip,rk3326-evb-lp3-v10", "rockchip,rk3326";
+    Or
+      - compatible = "rockchip,rk3326-evb-lp3-v10-linux", "rockchip,rk3326";
 
 - Rockchip PX30 evb ddr3 board:
     Required root node properties:
       - compatible = "rockchip,px30-evb-ddr3-v10", "rockchip,px30";
+    Or
+      - compatible = "rockchip,px30-evb-ddr3-v10-linux", "rockchip,px30";
 
 - Rockchip PX30 evb ddr4 board:
     Required root node properties:

Documentation/devicetree/bindings/cpufreq/cpufreq-rockchip.txt

@@ -49,6 +49,8 @@ In 'operating-points-v2' table:
                        current temperature is above reference temperature.
 - rockchip,pvtm-thermal-zone: A thermal zone node containing thermal sensor,
                        it's used to get the current temperature.
+- rockchip,thermal-zone: A thermal zone node containing thermal sensor,
+                       it's used to get the current temperature.
 
 - nvmem-cells: A phandle to cpu_leakage data provided by a nvmem device.
 - nvmem-cell-names: Should be "cpu_leakage"

Documentation/devicetree/bindings/crypto/rockchip-crypto.txt

@@ -0,0 +1,29 @@
+Rockchip Electronics And Security Accelerator
+
+Required properties:
+- compatible: Should be "rockchip,rk3288-crypto"
+- reg: Base physical address of the engine and length of memory mapped
+       region
+- interrupts: Interrupt number
+- clocks: Reference to the clocks about crypto
+- clock-names: "aclk" used to clock data
+	       "hclk" used to clock data
+	       "sclk" used to clock crypto accelerator
+	       "apb_pclk" used to clock dma
+- resets: Must contain an entry for each entry in reset-names.
+	  See ../reset/reset.txt for details.
+- reset-names: Must include the name "crypto-rst".
+
+Examples:
+
+	crypto: cypto-controller@ff8a0000 {
+		compatible = "rockchip,rk3288-crypto";
+		reg = <0xff8a0000 0x4000>;
+		interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&cru ACLK_CRYPTO>, <&cru HCLK_CRYPTO>,
+			 <&cru SCLK_CRYPTO>, <&cru ACLK_DMAC1>;
+		clock-names = "aclk", "hclk", "sclk", "apb_pclk";
+		resets = <&cru SRST_CRYPTO>;
+		reset-names = "crypto-rst";
+		status = "okay";
+	};