Merge 5.4-rc1 into android-mainline (cb33d787) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/ima_policy

+5 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ Description:
		euid:= decimal value
		fowner:= decimal value
		lsm: are LSM specific
		option: appraise_type:= [imasig]
		option: appraise_type:= [imasig] [imasig\|modsig]
		template:= name of a defined IMA template type
		(eg, ima-ng). Only valid when action is "measure".
		pcr:= decimal value
		@@ -105,3 +105,7 @@ Description:

		measure func=KEXEC_KERNEL_CHECK pcr=4
		measure func=KEXEC_INITRAMFS_CHECK pcr=5

		Example of appraise rule allowing modsig appended signatures:

		appraise func=KEXEC_KERNEL_CHECK appraise_type=imasig\|modsig

+9 −0

Original line number	Diff line number	Diff line
		@@ -2276,6 +2276,15 @@
		lockd.nlm_udpport=M [NFS] Assign UDP port.
		Format: <integer>

		lockdown= [SECURITY]
		{ integrity \| confidentiality }
		Enable the kernel lockdown feature. If set to
		integrity, kernel features that allow userland to
		modify the running kernel are disabled. If set to
		confidentiality, kernel features that allow userland
		to extract confidential information from the kernel
		are also disabled.

		locktorture.nreaders_stress= [KNL]
		Set the number of locking read-acquisition kthreads.
		Defaults to being automatically set based on the

+0 −7

Original line number	Diff line number	Diff line
		@@ -36,12 +36,6 @@ properties:
		enum: [ 4, 8, 12, 16, 20, 24 ]
		default: 8

		adi,disable-energy-detect:
		description: \|
		Disables Energy Detect Powerdown Mode (default disabled, i.e energy detect
		is enabled if this property is unspecified)
		type: boolean

		examples:
		- \|
		ethernet {
		@@ -68,6 +62,5 @@ examples:
		reg = <1>;

		adi,fifo-depth-bits = <16>;
		adi,disable-energy-detect;
		};
		};

+30 −2

Original line number	Diff line number	Diff line
		@@ -12,8 +12,36 @@ and therefore may overwrite them.
		KSZ9021:

		All skew control options are specified in picoseconds. The minimum
		value is 0, the maximum value is 3000, and it is incremented by 200ps
		steps.
		value is 0, the maximum value is 3000, and it can be specified in 200ps
		steps, but these values are in not fact what you get because this chip's
		skew values actually increase in 120ps steps, starting from -840ps. The
		incorrect values came from an error in the original KSZ9021 datasheet
		before it was corrected in revision 1.2 (Feb 2014), but it is too late to
		change the driver now because of the many existing device trees that have
		been created using values that go up in increments of 200.

		The following table shows the actual skew delay you will get for each of the
		possible devicetree values, and the number that will be programmed into the
		corresponding pad skew register:

		Device Tree Value Delay Pad Skew Register Value
		-----------------------------------------------------
		0 -840ps 0000
		200 -720ps 0001
		400 -600ps 0010
		600 -480ps 0011
		800 -360ps 0100
		1000 -240ps 0101
		1200 -120ps 0110
		1400 0ps 0111
		1600 120ps 1000
		1800 240ps 1001
		2000 360ps 1010
		2200 480ps 1011
		2400 600ps 1100
		2600 720ps 1101
		2800 840ps 1110
		3000 960ps 1111

		Optional properties:

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ Required properties:
		R-Car Gen2 and RZ/G1 devices.

		- "renesas,etheravb-r8a774a1" for the R8A774A1 SoC.
		- "renesas,etheravb-r8a774b1" for the R8A774B1 SoC.
		- "renesas,etheravb-r8a774c0" for the R8A774C0 SoC.
		- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
		- "renesas,etheravb-r8a7796" for the R8A7796 SoC.