lael-labs/linux

CREDITS+4−0

@@ -1637,6 +1637,10 @@ S: Panoramastrasse 18 · 1636 unmodified lines
1637	S: D-69126 Heidelberg	1637	S: D-69126 Heidelberg
1638	S: Germany	1638	S: Germany
1639		1639
		1640	N: Simon Horman
		1641	M: horms@verge.net.au
		1642	D: Renesas ARM/ARM64 SoC maintainer
		1643
1640	N: Christopher Horn	1644	N: Christopher Horn
1641	E: chorn@warwick.net	1645	E: chorn@warwick.net
1642	D: Miscellaneous sysctl hacks	1646	D: Miscellaneous sysctl hacks

Documentation/admin-guide/cgroup-v2.rst+14−6

 Protections
 -----------
-A cgroup is protected to be allocated upto the configured amount of
+A cgroup is protected upto the configured amount of the resource
-the resource if the usages of all its ancestors are under their
+as long as the usages of all its ancestors are under their
 protected levels.  Protections can be hard guarantees or best effort
 soft boundaries.  Protections can also be over-committed in which case
 only upto the amount available to the parent is protected among
 	is within its effective min boundary, the cgroup's memory
 	won't be reclaimed under any conditions. If there is no
 	unprotected reclaimable memory available, OOM killer
-	is invoked.
+	is invoked. Above the effective min boundary (or
+	effective low boundary if it is higher), pages are reclaimed
+	proportionally to the overage, reducing reclaim pressure for
+	smaller overages.
        Effective min boundary is limited by memory.min values of
 	all ancestor cgroups. If there is memory.min overcommitment
 	Best-effort memory protection.  If the memory usage of a
 	cgroup is within its effective low boundary, the cgroup's
 	memory won't be reclaimed unless memory can be reclaimed
-	from unprotected cgroups.
+	from unprotected cgroups.  Above the effective low boundary (or
+	effective min boundary if it is higher), pages are reclaimed
+	proportionally to the overage, reducing reclaim pressure for
+	smaller overages.
 	Effective low boundary is limited by memory.low values of
 	all ancestor cgroups. If there is memory.low overcommitment
 becomes self-defeating.
 The memory.low boundary on the other hand is a top-down allocated
-reserve.  A cgroup enjoys reclaim protection when it's within its low,
+reserve.  A cgroup enjoys reclaim protection when it's within its
-which makes delegation of subtrees possible.
+effective low, which makes delegation of subtrees possible. It also
+enjoys having reclaim pressure proportional to its overage when
+above its effective low.
 The original high boundary, the hard limit, is defined as a strict
 limit that can not budge, even if the OOM killer has to be called.

Documentation/admin-guide/kernel-parameters.txt+4−0

 				the unplug protocol
 			never -- do not unplug even if version check succeeds
+	xen_legacy_crash	[X86,XEN]
+			Crash from Xen panic notifier, without executing late
+			panic() code such as dumping handler.
 	xen_nopvspin	[X86,XEN]
 			Disables the ticketlock slowpath using Xen PV
 			optimizations.

Documentation/arm64/memory.rst+8−1

@@ -154,11 +154,18 @@ return virtual addresses to userspace from a 48-bit range. · 153 unmodified lines
154		154
155	Software can "opt-in" to receiving VAs from a 52-bit space by	155	Software can "opt-in" to receiving VAs from a 52-bit space by
156	specifying an mmap hint parameter that is larger than 48-bit.	156	specifying an mmap hint parameter that is larger than 48-bit.
		157
157	For example:	158	For example:
158	maybe_high_address = mmap(~0UL, size, prot, flags,...);	159
		160	.. code-block:: c
		161
		162	maybe_high_address = mmap(~0UL, size, prot, flags,...);
159		163
160	It is also possible to build a debug kernel that returns addresses	164	It is also possible to build a debug kernel that returns addresses
161	from a 52-bit space by enabling the following kernel config options:	165	from a 52-bit space by enabling the following kernel config options:
		166
		167	.. code-block:: sh
		168
162	CONFIG_EXPERT=y && CONFIG_ARM64_FORCE_52BIT=y	169	CONFIG_EXPERT=y && CONFIG_ARM64_FORCE_52BIT=y
163		170
164	Note that this option is only intended for debugging applications	171	Note that this option is only intended for debugging applications

Documentation/core-api/index.rst+1−0

@@ -38,6 +38,7 @@ Core utilities · 37 unmodified lines
38	protection-keys	38	protection-keys
39	../RCU/index	39	../RCU/index
40	gcc-plugins	40	gcc-plugins
		41	symbol-namespaces
41		42
42		43
43	Interfaces for kernel debugging	44	Interfaces for kernel debugging

Documentation/core-api/memory-allocation.rst+4−0

@@ -98,6 +98,10 @@ limited. The actual limit depends on the hardware and the kernel · 97 unmodified lines
98	configuration, but it is a good practice to use `kmalloc` for objects	98	configuration, but it is a good practice to use `kmalloc` for objects
99	smaller than page size.	99	smaller than page size.
100		100
		101	The address of a chunk allocated with `kmalloc` is aligned to at least
		102	ARCH_KMALLOC_MINALIGN bytes. For sizes which are a power of two, the
		103	alignment is also guaranteed to be at least the respective size.
		104
101	For large allocations you can use :c:func:`vmalloc` and	105	For large allocations you can use :c:func:`vmalloc` and
102	:c:func:`vzalloc`, or directly request pages from the page	106	:c:func:`vzalloc`, or directly request pages from the page
103	allocator. The memory allocated by `vmalloc` and related functions is	107	allocator. The memory allocated by `vmalloc` and related functions is

Documentation/core-api/symbol-namespaces.rstrenamed from Documentation/kbuild/namespaces.rst+0−0

File renamed without changes.

Documentation/dev-tools/kasan.rst+3−0

@@ -41,6 +41,9 @@ smaller binary while the latter is 1.1 - 2 times faster. · 40 unmodified lines
41	Both KASAN modes work with both SLUB and SLAB memory allocators.	41	Both KASAN modes work with both SLUB and SLAB memory allocators.
42	For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.	42	For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.
43		43
		44	To augment reports with last allocation and freeing stack of the physical page,
		45	it is recommended to enable also CONFIG_PAGE_OWNER and boot with page_owner=on.
		46
44	To disable instrumentation for specific files or directories, add a line	47	To disable instrumentation for specific files or directories, add a line
45	similar to the following to the respective kernel Makefile:	48	similar to the following to the respective kernel Makefile:
46		49

Documentation/dev-tools/kselftest.rst+16−0

@@ -89,6 +89,22 @@ To build, save output files in a separate directory with KBUILD_OUTPUT :: · 88 unmodified lines
89		89
90	$ export KBUILD_OUTPUT=/tmp/kselftest; make TARGETS="size timers" kselftest	90	$ export KBUILD_OUTPUT=/tmp/kselftest; make TARGETS="size timers" kselftest
91		91
		92	Additionally you can use the "SKIP_TARGETS" variable on the make command
		93	line to specify one or more targets to exclude from the TARGETS list.
		94
		95	To run all tests but a single subsystem::
		96
		97	$ make -C tools/testing/selftests SKIP_TARGETS=ptrace run_tests
		98
		99	You can specify multiple tests to skip::
		100
		101	$ make SKIP_TARGETS="size timers" kselftest
		102
		103	You can also specify a restricted list of tests to run together with a
		104	dedicated skiplist::
		105
		106	$ make TARGETS="bpf breakpoints size timers" SKIP_TARGETS=bpf kselftest
		107
92	See the top-level tools/testing/selftests/Makefile for the list of all	108	See the top-level tools/testing/selftests/Makefile for the list of all
93	possible targets.	109	possible targets.
94		110

Documentation/devicetree/bindings/dsp/fsl,dsp.yaml+1−0

@@ -85,4 +85,5 @@ examples: · 84 unmodified lines
85	<&pd IMX_SC_R_DSP_RAM>;	85	<&pd IMX_SC_R_DSP_RAM>;
86	mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";	86	mbox-names = "txdb0", "txdb1", "rxdb0", "rxdb1";
87	mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;	87	mboxes = <&lsio_mu13 2 0>, <&lsio_mu13 2 1>, <&lsio_mu13 3 0>, <&lsio_mu13 3 1>;
		88	memory-region = <&dsp_reserved>;
88	};	89	};

Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml+3−4

   dvdd-supply:
     description: DVdd voltage supply
-    items:
-      - const: dvdd
   avdd-supply:
     description: AVdd voltage supply
-    items:
-      - const: avdd
   adi,rejection-60-Hz-enable:
     description: |
 examples:
   - |
     spi0 {
+      #address-cells = <1>;
+      #size-cells = <0>;
       adc@0 {
         compatible = "adi,ad7192";
         reg = <0>;

Documentation/devicetree/bindings/media/rc.yaml+0−1

@@ -73,7 +73,6 @@ properties: · 72 unmodified lines
73	- rc-genius-tvgo-a11mce	73	- rc-genius-tvgo-a11mce
74	- rc-gotview7135	74	- rc-gotview7135
75	- rc-hauppauge	75	- rc-hauppauge
76	- rc-hauppauge
77	- rc-hisi-poplar	76	- rc-hisi-poplar
78	- rc-hisi-tv-demo	77	- rc-hisi-tv-demo
79	- rc-imon-mce	78	- rc-imon-mce

Documentation/devicetree/bindings/phy/lantiq,vrx200-pcie-phy.yaml+1−1

@@ -37,7 +37,7 @@ properties: · 36 unmodified lines
37	- description: exclusive PHY reset line	37	- description: exclusive PHY reset line
38	- description: shared reset line between the PCIe PHY and PCIe controller	38	- description: shared reset line between the PCIe PHY and PCIe controller
39		39
40	resets-names:	40	reset-names:
41	items:	41	items:
42	- const: phy	42	- const: phy
43	- const: pcie	43	- const: pcie

Documentation/devicetree/bindings/serial/renesas,sci-serial.txt+2−0

     - "renesas,hscif-r8a77470" for R8A77470 (RZ/G1C) HSCIF compatible UART.
     - "renesas,scif-r8a774a1" for R8A774A1 (RZ/G2M) SCIF compatible UART.
     - "renesas,hscif-r8a774a1" for R8A774A1 (RZ/G2M) HSCIF compatible UART.
+    - "renesas,scif-r8a774b1" for R8A774B1 (RZ/G2N) SCIF compatible UART.
+    - "renesas,hscif-r8a774b1" for R8A774B1 (RZ/G2N) HSCIF compatible UART.
     - "renesas,scif-r8a774c0" for R8A774C0 (RZ/G2E) SCIF compatible UART.
     - "renesas,hscif-r8a774c0" for R8A774C0 (RZ/G2E) HSCIF compatible UART.
     - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.

Documentation/devicetree/bindings/usb/amlogic,dwc3.txt+2−2

@@ -85,8 +85,8 @@ A child node must exist to represent the core DWC2 IP block. The name of · 84 unmodified lines
85	the node is not important. The content of the node is defined in dwc2.txt.	85	the node is not important. The content of the node is defined in dwc2.txt.
86		86
87	PHY documentation is provided in the following places:	87	PHY documentation is provided in the following places:
88	- Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt	88	- Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
89	- Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt	89	- Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
90		90
91	Example device nodes:	91	Example device nodes:
92	usb: usb@ffe09000 {	92	usb: usb@ffe09000 {

Documentation/devicetree/bindings/usb/generic-ehci.yaml+6−1

     description:
       Set this flag to force EHCI reset after resume.
-  phys: true
+  phys:
+    description: PHY specifier for the USB PHY
+  phy-names:
+    const: usb
 required:
   - compatible
         interrupts = <39>;
         clocks = <&ahb_gates 1>;
         phys = <&usbphy 1>;
+        phy-names = "usb";
     };
 ...

Documentation/devicetree/bindings/usb/generic-ohci.yaml+6−1

     description:
       Overrides the detected port count
-  phys: true
+  phys:
+    description: PHY specifier for the USB PHY
+  phy-names:
+    const: usb
 required:
   - compatible
           interrupts = <64>;
           clocks = <&usb_clk 6>, <&ahb_gates 2>;
           phys = <&usbphy 1>;
+          phy-names = "usb";
       };
 ...

Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.txt+2−2

@@ -33,7 +33,7 @@ Required properties: · 32 unmodified lines
33	"dma_ck": dma_bus clock for data transfer by DMA,	33	"dma_ck": dma_bus clock for data transfer by DMA,
34	"xhci_ck": controller clock	34	"xhci_ck": controller clock
35		35
36	- phys : see usb-hcd.txt in the current directory	36	- phys : see usb-hcd.yaml in the current directory
37		37
38	Optional properties:	38	Optional properties:
39	- wakeup-source : enable USB remote wakeup;	39	- wakeup-source : enable USB remote wakeup;
@@ -53,7 +53,7 @@ Optional properties: · 13 unmodified lines
53	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt	53	See: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
54	- imod-interval-ns: default interrupt moderation interval is 5000ns	54	- imod-interval-ns: default interrupt moderation interval is 5000ns
55		55
56	additionally the properties from usb-hcd.txt (in the current directory) are	56	additionally the properties from usb-hcd.yaml (in the current directory) are
57	supported.	57	supported.
58		58
59	Example:	59	Example:

Documentation/devicetree/bindings/usb/mediatek,mtu3.txt+2−2

@@ -17,7 +17,7 @@ Required properties: · 16 unmodified lines
17	- clock-names : must contain "sys_ck" for clock of controller,	17	- clock-names : must contain "sys_ck" for clock of controller,
18	the following clocks are optional:	18	the following clocks are optional:
19	"ref_ck", "mcu_ck" and "dma_ck";	19	"ref_ck", "mcu_ck" and "dma_ck";
20	- phys : see usb-hcd.txt in the current directory	20	- phys : see usb-hcd.yaml in the current directory
21	- dr_mode : should be one of "host", "peripheral" or "otg",	21	- dr_mode : should be one of "host", "peripheral" or "otg",
22	refer to usb/generic.txt	22	refer to usb/generic.txt
23		23
@@ -60,7 +60,7 @@ Optional properties: · 36 unmodified lines
60	- mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,	60	- mediatek,u3p-dis-msk : mask to disable u3ports, bit0 for u3port0,
61	bit1 for u3port1, ... etc;	61	bit1 for u3port1, ... etc;
62		62
63	additionally the properties from usb-hcd.txt (in the current directory) are	63	additionally the properties from usb-hcd.yaml (in the current directory) are
64	supported.	64	supported.
65		65
66	Sub-nodes:	66	Sub-nodes:

Documentation/devicetree/bindings/usb/usb-hcd.yaml+5−0

     description:
       List of all the USB PHYs on this HCD
+  phy-names:
+    description:
+      Name specifier for the USB PHY
 examples:
   - |
     usb {
         phys = <&usb2_phy1>, <&usb3_phy1>;
+        phy-names = "usb";
     };

Documentation/devicetree/bindings/usb/usb-uhci.txt+1−1

@@ -6,7 +6,7 @@ Required properties: · 5 unmodified lines
6	- reg : Should contain 1 register ranges(address and length)	6	- reg : Should contain 1 register ranges(address and length)
7	- interrupts : UHCI controller interrupt	7	- interrupts : UHCI controller interrupt
8		8
9	additionally the properties from usb-hcd.txt (in the current directory) are	9	additionally the properties from usb-hcd.yaml (in the current directory) are
10	supported.	10	supported.
11		11
12	Example:	12	Example:

Documentation/devicetree/bindings/usb/usb-xhci.txt+2−2

@@ -41,9 +41,9 @@ Optional properties: · 40 unmodified lines
41	- usb3-lpm-capable: determines if platform is USB3 LPM capable	41	- usb3-lpm-capable: determines if platform is USB3 LPM capable
42	- quirk-broken-port-ped: set if the controller has broken port disable mechanism	42	- quirk-broken-port-ped: set if the controller has broken port disable mechanism
43	- imod-interval-ns: default interrupt moderation interval is 5000ns	43	- imod-interval-ns: default interrupt moderation interval is 5000ns
44	- phys : see usb-hcd.txt in the current directory	44	- phys : see usb-hcd.yaml in the current directory
45		45
46	additionally the properties from usb-hcd.txt (in the current directory) are	46	additionally the properties from usb-hcd.yaml (in the current directory) are
47	supported.	47	supported.
48		48
49		49

Documentation/hwmon/index.rst+1−0

@@ -7,6 +7,7 @@ Linux Hardware Monitoring · 6 unmodified lines
7		7
8	hwmon-kernel-api	8	hwmon-kernel-api
9	pmbus-core	9	pmbus-core
		10	inspur-ipsps1
10	submitting-patches	11	submitting-patches
11	sysfs-interface	12	sysfs-interface
12	userspace-tools	13	userspace-tools

Documentation/hwmon/inspur-ipsps1.rst+1−1

@@ -1,5 +1,5 @@
1	Kernel driver inspur-ipsps1	1	Kernel driver inspur-ipsps1
2	=======================	2	===========================
3		3
4	Supported chips:	4	Supported chips:
5		5

Documentation/hwmon/k10temp.rst+17−1

@@ -21,10 +21,17 @@ Supported chips: · 20 unmodified lines
21		21
22	* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)	22	* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
23		23
24	* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri", "Carrizo"	24	* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri",
		25	"Carrizo", "Stoney Ridge", "Bristol Ridge"
25		26
26	* AMD Family 16h processors: "Kabini", "Mullins"	27	* AMD Family 16h processors: "Kabini", "Mullins"
27		28
		29	* AMD Family 17h processors: "Zen", "Zen 2"
		30
		31	* AMD Family 18h processors: "Hygon Dhyana"
		32
		33	* AMD Family 19h processors: "Zen 3"
		34
28	Prefix: 'k10temp'	35	Prefix: 'k10temp'
29		36
30	Addresses scanned: PCI space	37	Addresses scanned: PCI space
@@ -110,3 +117,12 @@ The maximum value for Tctl is available in the file temp1_max. · 79 unmodified lines
110	If the BIOS has enabled hardware temperature control, the threshold at	117	If the BIOS has enabled hardware temperature control, the threshold at
111	which the processor will throttle itself to avoid damage is available in	118	which the processor will throttle itself to avoid damage is available in
112	temp1_crit and temp1_crit_hyst.	119	temp1_crit and temp1_crit_hyst.
		120
		121	On some AMD CPUs, there is a difference between the die temperature (Tdie) and
		122	the reported temperature (Tctl). Tdie is the real measured temperature, and
		123	Tctl is used for fan control. While Tctl is always available as temp1_input,
		124	the driver exports Tdie temperature as temp2_input for those CPUs which support
		125	it.
		126
		127	Models from 17h family report relative temperature, the driver aims to
		128	compensate and report the real temperature.

Documentation/kbuild/makefiles.rst+0−5

@@ -954,11 +954,6 @@ When kbuild executes, the following steps are followed (roughly): · 953 unmodified lines
954		954
955	From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).	955	From commandline LDFLAGS_MODULE shall be used (see kbuild.txt).
956		956
957	KBUILD_ARFLAGS Options for $(AR) when creating archives
958
959	$(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic
960	mode) if this option is supported by $(AR).
961
962	KBUILD_LDS	957	KBUILD_LDS
963		958
964	The linker script with full path. Assigned by the top-level Makefile.	959	The linker script with full path. Assigned by the top-level Makefile.

Documentation/kbuild/modules.rst+4−3

 	will be written containing all exported symbols that were not
 	defined in the kernel.
---- 6.3 Symbols From Another External Module
+6.3 Symbols From Another External Module
+----------------------------------------
 	Sometimes, an external module uses exported symbols from
-	another external module. kbuild needs to have full knowledge of
+	another external module. Kbuild needs to have full knowledge of
 	all symbols to avoid spitting out warnings about undefined
 	symbols. Three solutions exist for this situation.
 		The top-level kbuild file would then look like::
 			#./Kbuild (or ./Makefile):
-				obj-y := foo/ bar/
+				obj-m := foo/ bar/
 		And executing::

Documentation/kbuild/reproducible-builds.rst+9−4

 Timestamps
 ----------
-The kernel embeds a timestamp in two places:
+The kernel embeds timestamps in three places:
 * The version string exposed by ``uname()`` and included in
   ``/proc/version``
 * File timestamps in the embedded initramfs
-By default the timestamp is the current time.  This must be overridden
+* If enabled via ``CONFIG_IKHEADERS``, file timestamps of kernel
-using the `KBUILD_BUILD_TIMESTAMP`_ variable.  If you are building
+  headers embedded in the kernel or respective module,
-from a git commit, you could use its commit date.
+  exposed via ``/sys/kernel/kheaders.tar.xz``
+By default the timestamp is the current time and in the case of
+``kheaders`` the various files' modification times. This must
+be overridden using the `KBUILD_BUILD_TIMESTAMP`_ variable.
+If you are building from a git commit, you could use its commit date.
 The kernel does *not* use the ``__DATE__`` and ``__TIME__`` macros,
 and enables warnings if they are used.  If you incorporate external

Documentation/networking/device_drivers/index.rst+1−0

@@ -23,6 +23,7 @@ Contents: · 22 unmodified lines
23	intel/ice	23	intel/ice
24	google/gve	24	google/gve
25	mellanox/mlx5	25	mellanox/mlx5
		26	netronome/nfp
26	pensando/ionic	27	pensando/ionic
27		28
28	.. only:: subproject and html	29	.. only:: subproject and html

Documentation/networking/j1939.rst+1−1

@@ -272,7 +272,7 @@ supported flags are: · 271 unmodified lines
272	* MSG_DONTWAIT, i.e. non-blocking operation.	272	* MSG_DONTWAIT, i.e. non-blocking operation.
273		273
274	recvmsg(2)	274	recvmsg(2)
275	^^^^^^^^^	275	^^^^^^^^^^
276		276
277	In most cases recvmsg(2) is needed if you want to extract more information than	277	In most cases recvmsg(2) is needed if you want to extract more information than
278	recvfrom(2) can provide. For example package priority and timestamp. The	278	recvfrom(2) can provide. For example package priority and timestamp. The

Documentation/process/coding-style.rst+1−1

@@ -56,7 +56,7 @@ instead of ``double-indenting`` the ``case`` labels. E.g.: · 55 unmodified lines
56	case 'K':	56	case 'K':
57	case 'k':	57	case 'k':
58	mem <<= 10;	58	mem <<= 10;
59	/* fall through */	59	fallthrough;
60	default:	60	default:
61	break;	61	break;
62	}	62	}

Documentation/process/deprecated.rst+23−10

@@ -122,14 +122,27 @@ memory adjacent to the stack (when built without `CONFIG_VMAP_STACK=y`) · 121 unmodified lines
122		122
123	Implicit switch case fall-through	123	Implicit switch case fall-through
124	---------------------------------	124	---------------------------------
125	The C language allows switch cases to "fall through" when	125	The C language allows switch cases to "fall-through" when a "break" statement
126	a "break" statement is missing at the end of a case. This,	126	is missing at the end of a case. This, however, introduces ambiguity in the
127	however, introduces ambiguity in the code, as it's not always	127	code, as it's not always clear if the missing break is intentional or a bug.
128	clear if the missing break is intentional or a bug. As there	128
129	have been a long list of flaws `due to missing "break" statements	129	As there have been a long list of flaws `due to missing "break" statements
130	<https://cwe.mitre.org/data/definitions/484.html>`_, we no longer allow	130	<https://cwe.mitre.org/data/definitions/484.html>`_, we no longer allow
131	"implicit fall-through". In order to identify an intentional fall-through	131	"implicit fall-through".
132	case, we have adopted the marking used by static analyzers: a comment	132
133	saying `/* Fall through */`. Once the C++17 `__attribute__((fallthrough))`	133	In order to identify intentional fall-through cases, we have adopted a
134	is more widely handled by C compilers, static analyzers, and IDEs, we can	134	pseudo-keyword macro 'fallthrough' which expands to gcc's extension
135	switch to using that instead.	135	__attribute__((__fallthrough__)). `Statement Attributes
		136	<https://gcc.gnu.org/onlinedocs/gcc/Statement-Attributes.html>`_
		137
		138	When the C17/C18 [[fallthrough]] syntax is more commonly supported by
		139	C compilers, static analyzers, and IDEs, we can switch to using that syntax
		140	for the macro pseudo-keyword.
		141
		142	All switch/case blocks must end in one of:
		143
		144	break;
		145	fallthrough;
		146	continue;
		147	goto <label>;
		148	return [expression];

Documentation/usb/rio.rst+0−109

@@ -1,109 +0,0 @@
1	============
2	Diamonds Rio
3	============
4
5	Copyright (C) 1999, 2000 Bruce Tenison
6
7	Portions Copyright (C) 1999, 2000 David Nelson
8
9	Thanks to David Nelson for guidance and the usage of the scanner.txt
10	and scanner.c files to model our driver and this informative file.
11
12	Mar. 2, 2000
13
14	Changes
15	=======
16
17	- Initial Revision
18
19
20	Overview
21	========
22
23	This README will address issues regarding how to configure the kernel
24	to access a RIO 500 mp3 player.
25	Before I explain how to use this to access the Rio500 please be warned:
26
27	.. warning::
28
29	Please note that this software is still under development. The authors
30	are in no way responsible for any damage that may occur, no matter how
31	inconsequential.
32
33	It seems that the Rio has a problem when sending .mp3 with low batteries.
34	I suggest when the batteries are low and you want to transfer stuff that you
35	replace it with a fresh one. In my case, what happened is I lost two 16kb
36	blocks (they are no longer usable to store information to it). But I don't
37	know if that's normal or not; it could simply be a problem with the flash
38	memory.
39
40	In an extreme case, I left my Rio playing overnight and the batteries wore
41	down to nothing and appear to have corrupted the flash memory. My RIO
42	needed to be replaced as a result. Diamond tech support is aware of the
43	problem. Do NOT allow your batteries to wear down to nothing before
44	changing them. It appears RIO 500 firmware does not handle low battery
45	power well at all.
46
47	On systems with OHCI controllers, the kernel OHCI code appears to have
48	power on problems with some chipsets. If you are having problems
49	connecting to your RIO 500, try turning it on first and then plugging it
50	into the USB cable.
51
52	Contact Information
53	-------------------
54
55	The main page for the project is hosted at sourceforge.net in the following
56	URL: <http://rio500.sourceforge.net>. You can also go to the project's
57	sourceforge home page at: <http://sourceforge.net/projects/rio500/>.
58	There is also a mailing list: rio500-users@lists.sourceforge.net
59
60	Authors
61	-------
62
63	Most of the code was written by Cesar Miquel <miquel@df.uba.ar>. Keith
64	Clayton <kclayton@jps.net> is incharge of the PPC port and making sure
65	things work there. Bruce Tenison <btenison@dibbs.net> is adding support
66	for .fon files and also does testing. The program will mostly sure be
67	re-written and Pete Ikusz along with the rest will re-design it. I would
68	also like to thank Tri Nguyen <tmn_3022000@hotmail.com> who provided use
69	with some important information regarding the communication with the Rio.
70
71	Additional Information and userspace tools
72
73	http://rio500.sourceforge.net/
74
75
76	Requirements
77	============
78
79	A host with a USB port running a Linux kernel with RIO 500 support enabled.
80
81	The driver is a module called rio500, which should be automatically loaded
82	as you plug in your device. If that fails you can manually load it with
83
84	modprobe rio500
85
86	Udev should automatically create a device node as soon as plug in your device.
87	If that fails, you can manually add a device for the USB rio500::
88
89	mknod /dev/usb/rio500 c 180 64
90
91	In that case, set appropriate permissions for /dev/usb/rio500 (don't forget
92	about group and world permissions). Both read and write permissions are
93	required for proper operation.
94
95	That's it. The Rio500 Utils at: http://rio500.sourceforge.net should
96	be able to access the rio500.
97
98	Limits
99	======
100
101	You can use only a single rio500 device at a time with your computer.
102
103	Bugs
104	====
105
106	If you encounter any problems feel free to drop me an email.
107
108	Bruce Tenison
109	btenison@dibbs.net

MAINTAINERS+2−11

@@ -2165,12 +2165,10 @@ F: arch/arm64/boot/dts/realtek/ · 2164 unmodified lines
2165	F: Documentation/devicetree/bindings/arm/realtek.yaml	2165	F: Documentation/devicetree/bindings/arm/realtek.yaml
2166		2166
2167	ARM/RENESAS ARM64 ARCHITECTURE	2167	ARM/RENESAS ARM64 ARCHITECTURE
2168	M: Simon Horman <horms@verge.net.au>
2169	M: Geert Uytterhoeven <geert+renesas@glider.be>	2168	M: Geert Uytterhoeven <geert+renesas@glider.be>
2170	M: Magnus Damm <magnus.damm@gmail.com>	2169	M: Magnus Damm <magnus.damm@gmail.com>
2171	L: linux-renesas-soc@vger.kernel.org	2170	L: linux-renesas-soc@vger.kernel.org
2172	Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/	2171	Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
2173	T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
2174	T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next	2172	T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
2175	S: Supported	2173	S: Supported
2176	F: arch/arm64/boot/dts/renesas/	2174	F: arch/arm64/boot/dts/renesas/
@@ -2282,12 +2280,10 @@ S: Maintained · 105 unmodified lines
2282	F: drivers/media/platform/s5p-mfc/	2280	F: drivers/media/platform/s5p-mfc/
2283		2281
2284	ARM/SHMOBILE ARM ARCHITECTURE	2282	ARM/SHMOBILE ARM ARCHITECTURE
2285	M: Simon Horman <horms@verge.net.au>
2286	M: Geert Uytterhoeven <geert+renesas@glider.be>	2283	M: Geert Uytterhoeven <geert+renesas@glider.be>
2287	M: Magnus Damm <magnus.damm@gmail.com>	2284	M: Magnus Damm <magnus.damm@gmail.com>
2288	L: linux-renesas-soc@vger.kernel.org	2285	L: linux-renesas-soc@vger.kernel.org
2289	Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/	2286	Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
2290	T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
2291	T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next	2287	T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
2292	S: Supported	2288	S: Supported
2293	F: arch/arm/boot/dts/emev2*	2289	F: arch/arm/boot/dts/emev2*
@@ -9187,6 +9183,7 @@ M: Pavel Machek <pavel@ucw.cz> · 6893 unmodified lines
9187	R: Dan Murphy <dmurphy@ti.com>	9183	R: Dan Murphy <dmurphy@ti.com>
9188	L: linux-leds@vger.kernel.org	9184	L: linux-leds@vger.kernel.org
9189	T: git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git	9185	T: git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
		9186	T: git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git
9190	S: Maintained	9187	S: Maintained
9191	F: Documentation/devicetree/bindings/leds/	9188	F: Documentation/devicetree/bindings/leds/
9192	F: drivers/leds/	9189	F: drivers/leds/
@@ -11547,6 +11544,7 @@ NSDEPS · 2354 unmodified lines
11547	M: Matthias Maennich <maennich@google.com>	11544	M: Matthias Maennich <maennich@google.com>
11548	S: Maintained	11545	S: Maintained
11549	F: scripts/nsdeps	11546	F: scripts/nsdeps
		11547	F: Documentation/core-api/symbol-namespaces.rst
11550		11548
11551	NTB AMD DRIVER	11549	NTB AMD DRIVER
11552	M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>	11550	M: Shyam Sundar S K <Shyam-sundar.S-k@amd.com>
@@ -16766,13 +16764,6 @@ W: http://www.linux-usb.org/usbnet · 5213 unmodified lines
16766	S: Maintained	16764	S: Maintained
16767	F: drivers/net/usb/dm9601.c	16765	F: drivers/net/usb/dm9601.c
16768		16766
16769	USB DIAMOND RIO500 DRIVER
16770	M: Cesar Miquel <miquel@df.uba.ar>
16771	L: rio500-users@lists.sourceforge.net
16772	W: http://rio500.sourceforge.net
16773	S: Maintained
16774	F: drivers/usb/misc/rio500*
16775
16776	USB EHCI DRIVER	16767	USB EHCI DRIVER
16777	M: Alan Stern <stern@rowland.harvard.edu>	16768	M: Alan Stern <stern@rowland.harvard.edu>
16778	L: linux-usb@vger.kernel.org	16769	L: linux-usb@vger.kernel.org

Makefile+7−28

 VERSION = 5
 PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc3
-NAME = Bobtail Squid
+NAME = Nesting Opossum
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
   KBUILD_CHECKSRC = 0
 endif
-# Use make M=dir to specify directory of external module to build
+# Use make M=dir or set the environment variable KBUILD_EXTMOD to specify the
-# Old syntax make ... SUBDIRS=$PWD is still supported
+# directory of external module to build. Setting M= takes precedence.
-# Setting the environment variable KBUILD_EXTMOD take precedence
-ifdef SUBDIRS
-  $(warning ================= WARNING ================)
-  $(warning 'SUBDIRS' will be removed after Linux 5.3)
-  $(warning )
-  $(warning If you are building an individual subdirectory)
-  $(warning in the kernel tree, you can do like this:)
-  $(warning $$ make path/to/dir/you/want/to/build/)
-  $(warning (Do not forget the trailing slash))
-  $(warning )
-  $(warning If you are building an external module,)
-  $(warning Please use 'M=' or 'KBUILD_EXTMOD' instead)
-  $(warning ==========================================)
-  KBUILD_EXTMOD ?= $(SUBDIRS)
-endif
 ifeq ("$(origin M)", "command line")
   KBUILD_EXTMOD := $(M)
 endif
 export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
 export KBUILD_AFLAGS_MODULE KBUILD_CFLAGS_MODULE KBUILD_LDFLAGS_MODULE
 export KBUILD_AFLAGS_KERNEL KBUILD_CFLAGS_KERNEL
-export KBUILD_ARFLAGS
 # Files to ignore in find ... statements
 # in addition to whatever we do anyway.
 # Just "make" or "make all" shall build modules as well
-ifneq ($(filter all _all modules,$(MAKECMDGOALS)),)
+ifneq ($(filter all _all modules nsdeps,$(MAKECMDGOALS)),)
   KBUILD_MODULES := 1
 endif
 KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
 endif
-# use the deterministic mode of AR if available
-KBUILD_ARFLAGS := $(call ar-option,D)
 include scripts/Makefile.kasan
 include scripts/Makefile.extrawarn
 include scripts/Makefile.ubsan
 kselftest:
 	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests run_tests
-PHONY += kselftest-clean
+kselftest-%: FORCE
-kselftest-clean:
+	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests $*
-	$(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean
 PHONY += kselftest-merge
 kselftest-merge:

arch/arm/boot/dts/am335x-icev2.dts+1−1

@@ -432,7 +432,7 @@ · 431 unmodified lines
432	pinctrl-0 = <&mmc0_pins_default>;	432	pinctrl-0 = <&mmc0_pins_default>;
433	};	433	};
434		434
435	&gpio0 {	435	&gpio0_target {
436	/* Do not idle the GPIO used for holding the VTT regulator */	436	/* Do not idle the GPIO used for holding the VTT regulator */
437	ti,no-reset-on-init;	437	ti,no-reset-on-init;
438	ti,no-idle-on-init;	438	ti,no-idle-on-init;

arch/arm/boot/dts/am33xx-l4.dtsi+4−2

 			ranges = <0x0 0x5000 0x1000>;
 		};
-		target-module@7000 {			/* 0x44e07000, ap 14 20.0 */
+		gpio0_target: target-module@7000 {	/* 0x44e07000, ap 14 20.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			ti,hwmods = "gpio1";
 			reg = <0x7000 0x4>,
 			reg = <0xe000 0x4>,
 			      <0xe054 0x4>;
 			reg-names = "rev", "sysc";
-			ti,sysc-midle ;
+			ti,sysc-midle = <SYSC_IDLE_FORCE>,
+					<SYSC_IDLE_NO>,
+					<SYSC_IDLE_SMART>;
 			ti,sysc-sidle = <SYSC_IDLE_FORCE>,
 					<SYSC_IDLE_NO>,
 					<SYSC_IDLE_SMART>;

arch/arm/boot/dts/am4372.dtsi+2−0

@@ -337,6 +337,8 @@ · 336 unmodified lines
337	ti,hwmods = "dss_dispc";	337	ti,hwmods = "dss_dispc";
338	clocks = <&disp_clk>;	338	clocks = <&disp_clk>;
339	clock-names = "fck";	339	clock-names = "fck";
		340
		341	max-memory-bandwidth = <230000000>;
340	};	342	};
341		343
342	rfbi: rfbi@4832a800 {	344	rfbi: rfbi@4832a800 {

arch/arm/boot/dts/dra7-l4.dtsi+21−27

 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 129 1>, <&edma_xbar 128 1>;
 				dma-names = "tx", "rx";
-				clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 22>,
+				clocks = <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 0>,
 					 <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,
 					 <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 28>;
 				clock-names = "fck", "ahclkx", "ahclkr";
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 131 1>, <&edma_xbar 130 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 0>,
-					 <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 24>,
+					 <&ipu_clkctrl DRA7_IPU_MCASP1_CLKCTRL 24>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP2_CLKCTRL 28>;
 				clock-names = "fck", "ahclkx", "ahclkr";
 				status = "disabled";
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>,
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 28>;
+			clock-names = "fck", "ahclkx";
-			clock-names = "fck", "ahclkx", "ahclkr";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x68000 0x2000>,
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 133 1>, <&edma_xbar 132 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 0>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP3_CLKCTRL 24>;
 				clock-names = "fck", "ahclkx";
 				status = "disabled";
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>,
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 28>;
+			clock-names = "fck", "ahclkx";
-			clock-names = "fck", "ahclkx", "ahclkr";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x6c000 0x2000>,
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 135 1>, <&edma_xbar 134 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 0>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP4_CLKCTRL 24>;
 				clock-names = "fck", "ahclkx";
 				status = "disabled";
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>,
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 28>;
+			clock-names = "fck", "ahclkx";
-			clock-names = "fck", "ahclkx", "ahclkr";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x70000 0x2000>,
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 137 1>, <&edma_xbar 136 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 0>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP5_CLKCTRL 24>;
 				clock-names = "fck", "ahclkx";
 				status = "disabled";
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>,
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 28>;
+			clock-names = "fck", "ahclkx";
-			clock-names = "fck", "ahclkx", "ahclkr";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x74000 0x2000>,
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 139 1>, <&edma_xbar 138 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 0>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP6_CLKCTRL 24>;
 				clock-names = "fck", "ahclkx";
 				status = "disabled";
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>,
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 28>;
+			clock-names = "fck", "ahclkx";
-			clock-names = "fck", "ahclkx", "ahclkr";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x78000 0x2000>,
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 141 1>, <&edma_xbar 140 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 0>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP7_CLKCTRL 24>;
 				clock-names = "fck", "ahclkx";
 				status = "disabled";
 					<SYSC_IDLE_SMART>;
 			/* Domains (P, C): l4per_pwrdm, l4per2_clkdm */
 			clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 0>,
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>,
+				 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;
-				 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 28>;
+			clock-names = "fck", "ahclkx";
-			clock-names = "fck", "ahclkx", "ahclkr";
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0x7c000 0x2000>,
 				interrupt-names = "tx", "rx";
 				dmas = <&edma_xbar 143 1>, <&edma_xbar 142 1>;
 				dma-names = "tx", "rx";
-				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 22>,
+				clocks = <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 0>,
 					 <&l4per2_clkctrl DRA7_L4PER2_MCASP8_CLKCTRL 24>;
 				clock-names = "fck", "ahclkx";
 				status = "disabled";

arch/arm/boot/dts/omap3-gta04.dtsi+1−0

@@ -124,6 +124,7 @@ · 123 unmodified lines
124	spi-max-frequency = <100000>;	124	spi-max-frequency = <100000>;
125	spi-cpol;	125	spi-cpol;
126	spi-cpha;	126	spi-cpha;
		127	spi-cs-high;
127		128
128	backlight= <&backlight>;	129	backlight= <&backlight>;
129	label = "lcd";	130	label = "lcd";

arch/arm/boot/dts/ste-dbx5x0.dtsi+8−3

 #include <dt-bindings/mfd/dbx500-prcmu.h>
 #include <dt-bindings/arm/ux500_pm_domains.h>
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/thermal/thermal.h>
 / {
 	#address-cells = <1>;
 		 * cooling.
 		 */
 		cpu_thermal: cpu-thermal {
-			polling-delay-passive = <0>;
+			polling-delay-passive = <250>;
-			polling-delay = <1000>;
+			/*
+			 * This sensor fires interrupts to update the thermal
+			 * zone, so no polling is needed.
+			 */
+			polling-delay = <0>;
 			thermal-sensors = <&thermal>;
 			cooling-maps {
 				trip = <&cpu_alert>;
-				cooling-device = <&CPU0 0 2>;
+				cooling-device = <&CPU0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
 				contribution = <100>;
 			};
 		};

arch/arm/boot/dts/sun4i-a10.dtsi+4−0

 			interrupts = <39>;
 			clocks = <&ccu CLK_AHB_EHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <64>;
 			clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <40>;
 			clocks = <&ccu CLK_AHB_EHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <65>;
 			clocks = <&ccu CLK_USB_OHCI1>, <&ccu CLK_AHB_OHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun5i.dtsi+2−0

 			interrupts = <39>;
 			clocks = <&ccu CLK_AHB_EHCI>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <40>;
 			clocks = <&ccu CLK_USB_OHCI>, <&ccu CLK_AHB_OHCI>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun6i-a31.dtsi+4−0

 			clocks = <&ccu CLK_AHB1_EHCI0>;
 			resets = <&ccu RST_AHB1_EHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_AHB1_OHCI0>, <&ccu CLK_USB_OHCI0>;
 			resets = <&ccu RST_AHB1_OHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_AHB1_EHCI1>;
 			resets = <&ccu RST_AHB1_EHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_AHB1_OHCI1>, <&ccu CLK_USB_OHCI1>;
 			resets = <&ccu RST_AHB1_OHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun7i-a20.dtsi+4−0

 			interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_AHB_EHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_AHB_EHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_USB_OHCI1>, <&ccu CLK_AHB_OHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun8i-a23-a33.dtsi+2−0

 			clocks = <&ccu CLK_BUS_EHCI>;
 			resets = <&ccu RST_BUS_EHCI>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_BUS_OHCI>, <&ccu CLK_USB_OHCI>;
 			resets = <&ccu RST_BUS_OHCI>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun8i-a83t.dtsi+3−0

 			clocks = <&ccu CLK_BUS_EHCI0>;
 			resets = <&ccu RST_BUS_EHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_BUS_OHCI0>, <&ccu CLK_USB_OHCI0>;
 			resets = <&ccu RST_BUS_OHCI0>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_BUS_EHCI1>;
 			resets = <&ccu RST_BUS_EHCI1>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun8i-r40.dtsi+4−0

 			clocks = <&ccu CLK_BUS_EHCI1>;
 			resets = <&ccu RST_BUS_EHCI1>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI1>;
 			resets = <&ccu RST_BUS_OHCI1>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_BUS_EHCI2>;
 			resets = <&ccu RST_BUS_EHCI2>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI2>;
 			resets = <&ccu RST_BUS_OHCI2>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sun9i-a80.dtsi+5−0

 			clocks = <&usb_clocks CLK_BUS_HCI0>;
 			resets = <&usb_clocks RST_USB0_HCI>;
 			phys = <&usbphy1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&usb_clocks CLK_USB_OHCI0>;
 			resets = <&usb_clocks RST_USB0_HCI>;
 			phys = <&usbphy1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&usb_clocks CLK_BUS_HCI1>;
 			resets = <&usb_clocks RST_USB1_HCI>;
 			phys = <&usbphy2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&usb_clocks CLK_BUS_HCI2>;
 			resets = <&usb_clocks RST_USB2_HCI>;
 			phys = <&usbphy3>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&usb_clocks CLK_USB_OHCI2>;
 			resets = <&usb_clocks RST_USB2_HCI>;
 			phys = <&usbphy3>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/boot/dts/sunxi-h3-h5.dtsi+6−0

 			clocks = <&ccu CLK_BUS_EHCI1>, <&ccu CLK_BUS_OHCI1>;
 			resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI1>;
 			resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_BUS_EHCI2>, <&ccu CLK_BUS_OHCI2>;
 			resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI2>;
 			resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>;
 			phys = <&usbphy 2>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 			clocks = <&ccu CLK_BUS_EHCI3>, <&ccu CLK_BUS_OHCI3>;
 			resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>;
 			phys = <&usbphy 3>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI3>;
 			resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>;
 			phys = <&usbphy 3>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm/configs/badge4_defconfig+0−1

@@ -91,7 +91,6 @@ CONFIG_USB_SERIAL_PL2303=m · 90 unmodified lines
91	CONFIG_USB_SERIAL_CYBERJACK=m	91	CONFIG_USB_SERIAL_CYBERJACK=m
92	CONFIG_USB_SERIAL_XIRCOM=m	92	CONFIG_USB_SERIAL_XIRCOM=m
93	CONFIG_USB_SERIAL_OMNINET=m	93	CONFIG_USB_SERIAL_OMNINET=m
94	CONFIG_USB_RIO500=m
95	CONFIG_EXT2_FS=m	94	CONFIG_EXT2_FS=m
96	CONFIG_EXT3_FS=m	95	CONFIG_EXT3_FS=m
97	CONFIG_MSDOS_FS=y	96	CONFIG_MSDOS_FS=y

arch/arm/configs/corgi_defconfig+0−1

@@ -195,7 +195,6 @@ CONFIG_USB_SERIAL_XIRCOM=m · 194 unmodified lines
195	CONFIG_USB_SERIAL_OMNINET=m	195	CONFIG_USB_SERIAL_OMNINET=m
196	CONFIG_USB_EMI62=m	196	CONFIG_USB_EMI62=m
197	CONFIG_USB_EMI26=m	197	CONFIG_USB_EMI26=m
198	CONFIG_USB_RIO500=m
199	CONFIG_USB_LEGOTOWER=m	198	CONFIG_USB_LEGOTOWER=m
200	CONFIG_USB_LCD=m	199	CONFIG_USB_LCD=m
201	CONFIG_USB_CYTHERM=m	200	CONFIG_USB_CYTHERM=m

arch/arm/configs/davinci_all_defconfig+1−1

@@ -228,7 +228,7 @@ CONFIG_RTC_DRV_OMAP=m · 227 unmodified lines
228	CONFIG_DMADEVICES=y	228	CONFIG_DMADEVICES=y
229	CONFIG_TI_EDMA=y	229	CONFIG_TI_EDMA=y
230	CONFIG_COMMON_CLK_PWM=m	230	CONFIG_COMMON_CLK_PWM=m
231	CONFIG_REMOTEPROC=m	231	CONFIG_REMOTEPROC=y
232	CONFIG_DA8XX_REMOTEPROC=m	232	CONFIG_DA8XX_REMOTEPROC=m
233	CONFIG_MEMORY=y	233	CONFIG_MEMORY=y
234	CONFIG_TI_AEMIF=m	234	CONFIG_TI_AEMIF=m

arch/arm/configs/multi_v7_defconfig+2−2

@@ -415,7 +415,7 @@ CONFIG_SPI_SH_MSIOF=m · 414 unmodified lines
415	CONFIG_SPI_SH_HSPI=y	415	CONFIG_SPI_SH_HSPI=y
416	CONFIG_SPI_SIRF=y	416	CONFIG_SPI_SIRF=y
417	CONFIG_SPI_STM32=m	417	CONFIG_SPI_STM32=m
418	CONFIG_SPI_STM32_QSPI=m	418	CONFIG_SPI_STM32_QSPI=y
419	CONFIG_SPI_SUN4I=y	419	CONFIG_SPI_SUN4I=y
420	CONFIG_SPI_SUN6I=y	420	CONFIG_SPI_SUN6I=y
421	CONFIG_SPI_TEGRA114=y	421	CONFIG_SPI_TEGRA114=y
@@ -933,7 +933,7 @@ CONFIG_BCM2835_MBOX=y · 511 unmodified lines
933	CONFIG_ROCKCHIP_IOMMU=y	933	CONFIG_ROCKCHIP_IOMMU=y
934	CONFIG_TEGRA_IOMMU_GART=y	934	CONFIG_TEGRA_IOMMU_GART=y
935	CONFIG_TEGRA_IOMMU_SMMU=y	935	CONFIG_TEGRA_IOMMU_SMMU=y
936	CONFIG_REMOTEPROC=m	936	CONFIG_REMOTEPROC=y
937	CONFIG_ST_REMOTEPROC=m	937	CONFIG_ST_REMOTEPROC=m
938	CONFIG_RPMSG_VIRTIO=m	938	CONFIG_RPMSG_VIRTIO=m
939	CONFIG_ASPEED_LPC_CTRL=m	939	CONFIG_ASPEED_LPC_CTRL=m

arch/arm/configs/omap2plus_defconfig+4−1

 CONFIG_DRM_OMAP_PANEL_NEC_NL8048HL11=m
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_TI_TFP410=m
 CONFIG_FB=y
 CONFIG_FIRMWARE_EDID=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_USB_SERIAL_SIMPLE=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_TEST=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_AM335X_PHY_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_CPCAP=m
+CONFIG_LEDS_LM3532=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_PCA963X=m
 CONFIG_LEDS_PWM=m
 CONFIG_RTC_DRV_CPCAP=m
 CONFIG_DMADEVICES=y
 CONFIG_OMAP_IOMMU=y
-CONFIG_REMOTEPROC=m
+CONFIG_REMOTEPROC=y
 CONFIG_OMAP_REMOTEPROC=m
 CONFIG_WKUP_M3_RPROC=m
 CONFIG_SOC_TI=y

arch/arm/configs/pxa_defconfig+0−1

@@ -581,7 +581,6 @@ CONFIG_USB_SERIAL_XIRCOM=m · 580 unmodified lines
581	CONFIG_USB_SERIAL_OMNINET=m	581	CONFIG_USB_SERIAL_OMNINET=m
582	CONFIG_USB_EMI62=m	582	CONFIG_USB_EMI62=m
583	CONFIG_USB_EMI26=m	583	CONFIG_USB_EMI26=m
584	CONFIG_USB_RIO500=m
585	CONFIG_USB_LEGOTOWER=m	584	CONFIG_USB_LEGOTOWER=m
586	CONFIG_USB_LCD=m	585	CONFIG_USB_LCD=m
587	CONFIG_USB_CYTHERM=m	586	CONFIG_USB_CYTHERM=m

arch/arm/configs/s3c2410_defconfig+0−1

@@ -327,7 +327,6 @@ CONFIG_USB_EMI62=m · 326 unmodified lines
327	CONFIG_USB_EMI26=m	327	CONFIG_USB_EMI26=m
328	CONFIG_USB_ADUTUX=m	328	CONFIG_USB_ADUTUX=m
329	CONFIG_USB_SEVSEG=m	329	CONFIG_USB_SEVSEG=m
330	CONFIG_USB_RIO500=m
331	CONFIG_USB_LEGOTOWER=m	330	CONFIG_USB_LEGOTOWER=m
332	CONFIG_USB_LCD=m	331	CONFIG_USB_LCD=m
333	CONFIG_USB_CYPRESS_CY7C63=m	332	CONFIG_USB_CYPRESS_CY7C63=m

arch/arm/configs/spitz_defconfig+0−1

@@ -189,7 +189,6 @@ CONFIG_USB_SERIAL_XIRCOM=m · 188 unmodified lines
189	CONFIG_USB_SERIAL_OMNINET=m	189	CONFIG_USB_SERIAL_OMNINET=m
190	CONFIG_USB_EMI62=m	190	CONFIG_USB_EMI62=m
191	CONFIG_USB_EMI26=m	191	CONFIG_USB_EMI26=m
192	CONFIG_USB_RIO500=m
193	CONFIG_USB_LEGOTOWER=m	192	CONFIG_USB_LEGOTOWER=m
194	CONFIG_USB_LCD=m	193	CONFIG_USB_LCD=m
195	CONFIG_USB_CYTHERM=m	194	CONFIG_USB_CYTHERM=m

arch/arm/crypto/Kconfig+1−0

@@ -98,6 +98,7 @@ config CRYPTO_AES_ARM_CE · 97 unmodified lines
98	tristate "Accelerated AES using ARMv8 Crypto Extensions"	98	tristate "Accelerated AES using ARMv8 Crypto Extensions"
99	depends on KERNEL_MODE_NEON	99	depends on KERNEL_MODE_NEON
100	select CRYPTO_BLKCIPHER	100	select CRYPTO_BLKCIPHER
		101	select CRYPTO_LIB_AES
101	select CRYPTO_SIMD	102	select CRYPTO_SIMD
102	help	103	help
103	Use an implementation of AES in CBC, CTR and XTS modes that uses	104	Use an implementation of AES in CBC, CTR and XTS modes that uses

arch/arm/crypto/aes-ce-core.S+1−0

@@ -9,6 +9,7 @@ · 8 unmodified lines
9	#include <asm/assembler.h>	9	#include <asm/assembler.h>
10		10
11	.text	11	.text
		12	.arch armv8-a
12	.fpu crypto-neon-fp-armv8	13	.fpu crypto-neon-fp-armv8
13	.align 3	14	.align 3
14		15

arch/arm/include/asm/xen/xen-ops.h+0−6

@@ -1,6 +0,0 @@
1	#ifndef _ASM_XEN_OPS_H
2	#define _ASM_XEN_OPS_H
3
4	void xen_efi_runtime_setup(void);
5
6	#endif /* _ASM_XEN_OPS_H */

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c+2−1

 	.rev_offs	= 0x0000,
 	.sysc_offs	= 0x0010,
 	.syss_offs	= 0x0014,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+			  SYSC_HAS_RESET_STATUS,
 	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
 			  SIDLE_SMART_WKUP),
 	.sysc_fields	= &omap_hwmod_sysc_type2,

arch/arm/mach-omap2/omap_hwmod_33xx_data.c+3−2

 static struct omap_hwmod_class_sysconfig lcdc_sysc = {
 	.rev_offs	= 0x0,
 	.sysc_offs	= 0x54,
-	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE),
+	.sysc_flags	= SYSC_HAS_SIDLEMODE | SYSC_HAS_MIDLEMODE,
-	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+	.idlemodes	= SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+			  MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART,
 	.sysc_fields	= &omap_hwmod_sysc_type2,
 };

arch/arm/mach-omap2/pm.c+0−100

@@ -74,83 +74,6 @@ int omap_pm_clkdms_setup(struct clockdomain clkdm, void unused) · 73 unmodified lines
74	return 0;	74	return 0;
75	}	75	}
76		76
77	/*
78	* This API is to be called during init to set the various voltage
79	* domains to the voltage as per the opp table. Typically we boot up
80	* at the nominal voltage. So this function finds out the rate of
81	* the clock associated with the voltage domain, finds out the correct
82	* opp entry and sets the voltage domain to the voltage specified
83	* in the opp entry
84	*/
85	static int __init omap2_set_init_voltage(char vdd_name, char clk_name,
86	const char *oh_name)
87	{
88	struct voltagedomain *voltdm;
89	struct clk *clk;
90	struct dev_pm_opp *opp;
91	unsigned long freq, bootup_volt;
92	struct device *dev;
93
94	if (!vdd_name \|\| !clk_name \|\| !oh_name) {
95	pr_err("%s: invalid parameters\n", __func__);
96	goto exit;
97	}
98
99	if (!strncmp(oh_name, "mpu", 3))
100	/*
101	* All current OMAPs share voltage rail and clock
102	* source, so CPU0 is used to represent the MPU-SS.
103	*/
104	dev = get_cpu_device(0);
105	else
106	dev = omap_device_get_by_hwmod_name(oh_name);
107
108	if (IS_ERR(dev)) {
109	pr_err("%s: Unable to get dev pointer for hwmod %s\n",
110	__func__, oh_name);
111	goto exit;
112	}
113
114	voltdm = voltdm_lookup(vdd_name);
115	if (!voltdm) {
116	pr_err("%s: unable to get vdd pointer for vdd_%s\n",
117	__func__, vdd_name);
118	goto exit;
119	}
120
121	clk = clk_get(NULL, clk_name);
122	if (IS_ERR(clk)) {
123	pr_err("%s: unable to get clk %s\n", __func__, clk_name);
124	goto exit;
125	}
126
127	freq = clk_get_rate(clk);
128	clk_put(clk);
129
130	opp = dev_pm_opp_find_freq_ceil(dev, &freq);
131	if (IS_ERR(opp)) {
132	pr_err("%s: unable to find boot up OPP for vdd_%s\n",
133	__func__, vdd_name);
134	goto exit;
135	}
136
137	bootup_volt = dev_pm_opp_get_voltage(opp);
138	dev_pm_opp_put(opp);
139
140	if (!bootup_volt) {
141	pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n",
142	__func__, vdd_name);
143	goto exit;
144	}
145
146	voltdm_scale(voltdm, bootup_volt);
147	return 0;
148
149	exit:
150	pr_err("%s: unable to set vdd_%s\n", __func__, vdd_name);
151	return -EINVAL;
152	}
153
154	#ifdef CONFIG_SUSPEND	77	#ifdef CONFIG_SUSPEND
155	static int omap_pm_enter(suspend_state_t suspend_state)	78	static int omap_pm_enter(suspend_state_t suspend_state)
156	{	79	{
@@ -208,25 +131,6 @@ void omap_common_suspend_init(void *pm_suspend) · 51 unmodified lines
208	}	131	}
209	#endif /* CONFIG_SUSPEND */	132	#endif /* CONFIG_SUSPEND */
210		133
211	static void __init omap3_init_voltages(void)
212	{
213	if (!soc_is_omap34xx())
214	return;
215
216	omap2_set_init_voltage("mpu_iva", "dpll1_ck", "mpu");
217	omap2_set_init_voltage("core", "l3_ick", "l3_main");
218	}
219
220	static void __init omap4_init_voltages(void)
221	{
222	if (!soc_is_omap44xx())
223	return;
224
225	omap2_set_init_voltage("mpu", "dpll_mpu_ck", "mpu");
226	omap2_set_init_voltage("core", "l3_div_ck", "l3_main_1");
227	omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
228	}
229
230	int __maybe_unused omap_pm_nop_init(void)	134	int __maybe_unused omap_pm_nop_init(void)
231	{	135	{
232	return 0;	136	return 0;
@@ -246,10 +150,6 @@ int __init omap2_common_pm_late_init(void) · 13 unmodified lines
246	omap4_twl_init();	150	omap4_twl_init();
247	omap_voltage_late_init();	151	omap_voltage_late_init();
248		152
249	/* Initialize the voltages */
250	omap3_init_voltages();
251	omap4_init_voltages();
252
253	/* Smartreflex device init */	153	/* Smartreflex device init */
254	omap_devinit_smartreflex();	154	omap_devinit_smartreflex();
255		155

arch/arm/xen/Makefile+0−1

@@ -1,3 +1,2 @@
1	# SPDX-License-Identifier: GPL-2.0-only	1	# SPDX-License-Identifier: GPL-2.0-only
2	obj-y := enlighten.o hypercall.o grant-table.o p2m.o mm.o	2	obj-y := enlighten.o hypercall.o grant-table.o p2m.o mm.o
3	obj-$(CONFIG_XEN_EFI) += efi.o

arch/arm/xen/efi.c+0−28

@@ -1,28 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*
3	* Copyright (c) 2015, Linaro Limited, Shannon Zhao
4	*/
5
6	#include <linux/efi.h>
7	#include <xen/xen-ops.h>
8	#include <asm/xen/xen-ops.h>
9
10	/* Set XEN EFI runtime services function pointers. Other fields of struct efi,
11	* e.g. efi.systab, will be set like normal EFI.
12	*/
13	void __init xen_efi_runtime_setup(void)
14	{
15	efi.get_time = xen_efi_get_time;
16	efi.set_time = xen_efi_set_time;
17	efi.get_wakeup_time = xen_efi_get_wakeup_time;
18	efi.set_wakeup_time = xen_efi_set_wakeup_time;
19	efi.get_variable = xen_efi_get_variable;
20	efi.get_next_variable = xen_efi_get_next_variable;
21	efi.set_variable = xen_efi_set_variable;
22	efi.query_variable_info = xen_efi_query_variable_info;
23	efi.update_capsule = xen_efi_update_capsule;
24	efi.query_capsule_caps = xen_efi_query_capsule_caps;
25	efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
26	efi.reset_system = xen_efi_reset_system;
27	}
28	EXPORT_SYMBOL_GPL(xen_efi_runtime_setup);

arch/arm/xen/enlighten.c+1−2

 #include <xen/xen-ops.h>
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/hypercall.h>
-#include <asm/xen/xen-ops.h>
 #include <asm/system_misc.h>
 #include <asm/efi.h>
 #include <linux/interrupt.h>
 EXPORT_SYMBOL_GPL(HYPERVISOR_physdev_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_vcpu_op);
 EXPORT_SYMBOL_GPL(HYPERVISOR_tmem_op);
-EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op);
+EXPORT_SYMBOL_GPL(HYPERVISOR_platform_op_raw);
 EXPORT_SYMBOL_GPL(HYPERVISOR_multicall);
 EXPORT_SYMBOL_GPL(HYPERVISOR_vm_assist);
 EXPORT_SYMBOL_GPL(HYPERVISOR_dm_op);

arch/arm/xen/mm.c+4−1

 	for_each_memblock(memory, reg) {
 		if (reg->base < (phys_addr_t)0xffffffff) {
-			flags |= __GFP_DMA;
+			if (IS_ENABLED(CONFIG_ZONE_DMA32))
+				flags |= __GFP_DMA32;
+			else
+				flags |= __GFP_DMA;
 			break;
 		}
 	}

arch/arm64/Kconfig+13−2

 	select GENERIC_STRNLEN_USER
 	select GENERIC_TIME_VSYSCALL
 	select GENERIC_GETTIMEOFDAY
-	select GENERIC_COMPAT_VDSO if (!CPU_BIG_ENDIAN && COMPAT)
 	select HANDLE_DOMAIN_IRQ
 	select HARDIRQS_SW_RESEND
 	select HAVE_PCI
 if COMPAT
 config KUSER_HELPERS
-	bool "Enable kuser helpers page for 32 bit applications"
+	bool "Enable kuser helpers page for 32-bit applications"
 	default y
 	help
 	  Warning: disabling this option may break 32-bit user programs.
 	  Say N here only if you are absolutely certain that you do not
 	  need these helpers; otherwise, the safe option is to say Y.
+config COMPAT_VDSO
+	bool "Enable vDSO for 32-bit applications"
+	depends on !CPU_BIG_ENDIAN && "$(CROSS_COMPILE_COMPAT)" != ""
+	select GENERIC_COMPAT_VDSO
+	default y
+	help
+	  Place in the process address space of 32-bit applications an
+	  ELF shared object providing fast implementations of gettimeofday
+	  and clock_gettime.
+	  You must have a 32-bit build of glibc 2.22 or later for programs
+	  to seamlessly take advantage of this.
 menuconfig ARMV8_DEPRECATED
 	bool "Emulate deprecated/obsolete ARMv8 instructions"

arch/arm64/Makefile+0−16

@@ -53,22 +53,6 @@ $(warning Detected assembler with broken .inst; disassembly will be unreliable) · 52 unmodified lines
53	endif	53	endif
54	endif	54	endif
55		55
56	ifeq ($(CONFIG_GENERIC_COMPAT_VDSO), y)
57	CROSS_COMPILE_COMPAT ?= $(CONFIG_CROSS_COMPILE_COMPAT_VDSO:"%"=%)
58
59	ifeq ($(CONFIG_CC_IS_CLANG), y)
60	$(warning CROSS_COMPILE_COMPAT is clang, the compat vDSO will not be built)
61	else ifeq ($(strip $(CROSS_COMPILE_COMPAT)),)
62	$(warning CROSS_COMPILE_COMPAT not defined or empty, the compat vDSO will not be built)
63	else ifeq ($(shell which $(CROSS_COMPILE_COMPAT)gcc 2> /dev/null),)
64	$(error $(CROSS_COMPILE_COMPAT)gcc not found, check CROSS_COMPILE_COMPAT)
65	else
66	export CROSS_COMPILE_COMPAT
67	export CONFIG_COMPAT_VDSO := y
68	compat_vdso := -DCONFIG_COMPAT_VDSO=1
69	endif
70	endif
71
72	KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst) \	56	KBUILD_CFLAGS += -mgeneral-regs-only $(lseinstr) $(brokengasinst) \
73	$(compat_vdso) $(cc_has_k_constraint)	57	$(compat_vdso) $(cc_has_k_constraint)
74	KBUILD_CFLAGS += -fno-asynchronous-unwind-tables	58	KBUILD_CFLAGS += -fno-asynchronous-unwind-tables

arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts+2−0

 &ehci0 {
 	phys = <&usbphy 0>;
+	phy-names = "usb";
 	status = "okay";
 };
 &ohci0 {
 	phys = <&usbphy 0>;
+	phy-names = "usb";
 	status = "okay";
 };

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi+2−0

 			resets = <&ccu RST_BUS_OHCI1>,
 				 <&ccu RST_BUS_EHCI1>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI1>;
 			resets = <&ccu RST_BUS_OHCI1>;
 			phys = <&usbphy 1>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi+2−0

 			resets = <&ccu RST_BUS_OHCI3>,
 				 <&ccu RST_BUS_EHCI3>;
 			phys = <&usb2phy 3>;
+			phy-names = "usb";
 			status = "disabled";
 		};
 				 <&ccu CLK_USB_OHCI3>;
 			resets = <&ccu RST_BUS_OHCI3>;
 			phys = <&usb2phy 3>;
+			phy-names = "usb";
 			status = "disabled";
 		};

arch/arm64/configs/defconfig+1−1

@@ -723,7 +723,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y · 722 unmodified lines
723	CONFIG_ARM_SMMU=y	723	CONFIG_ARM_SMMU=y
724	CONFIG_ARM_SMMU_V3=y	724	CONFIG_ARM_SMMU_V3=y
725	CONFIG_QCOM_IOMMU=y	725	CONFIG_QCOM_IOMMU=y
726	CONFIG_REMOTEPROC=m	726	CONFIG_REMOTEPROC=y
727	CONFIG_QCOM_Q6V5_MSS=m	727	CONFIG_QCOM_Q6V5_MSS=m
728	CONFIG_QCOM_Q6V5_PAS=m	728	CONFIG_QCOM_Q6V5_PAS=m
729	CONFIG_QCOM_SYSMON=m	729	CONFIG_QCOM_SYSMON=m

arch/arm64/include/asm/atomic_lse.h+4−2

 }
 #define __CMPXCHG_CASE(w, sfx, name, sz, mb, cl...)			\
-static inline u##sz __lse__cmpxchg_case_##name##sz(volatile void *ptr,	\
+static __always_inline u##sz						\
+__lse__cmpxchg_case_##name##sz(volatile void *ptr,			\
 					      u##sz old,		\
 					      u##sz new)		\
 {									\
 #undef __CMPXCHG_CASE
 #define __CMPXCHG_DBL(name, mb, cl...)					\
-static inline long __lse__cmpxchg_double##name(unsigned long old1,	\
+static __always_inline long						\
+__lse__cmpxchg_double##name(unsigned long old1,				\
 					 unsigned long old2,		\
 					 unsigned long new1,		\
 					 unsigned long new2,		\

arch/arm64/include/asm/kvm_hyp.h+0−24

@@ -47,30 +47,6 @@ · 46 unmodified lines
47	#define read_sysreg_el2(r) read_sysreg_elx(r, _EL2, _EL1)	47	#define read_sysreg_el2(r) read_sysreg_elx(r, _EL2, _EL1)
48	#define write_sysreg_el2(v,r) write_sysreg_elx(v, r, _EL2, _EL1)	48	#define write_sysreg_el2(v,r) write_sysreg_elx(v, r, _EL2, _EL1)
49		49
50	/**
51	* hyp_alternate_select - Generates patchable code sequences that are
52	* used to switch between two implementations of a function, depending
53	* on the availability of a feature.
54	*
55	* @fname: a symbol name that will be defined as a function returning a
56	* function pointer whose type will match @orig and @alt
57	* @orig: A pointer to the default function, as returned by @fname when
58	* @cond doesn't hold
59	* @alt: A pointer to the alternate function, as returned by @fname
60	* when @cond holds
61	* @cond: a CPU feature (as described in asm/cpufeature.h)
62	*/
63	#define hyp_alternate_select(fname, orig, alt, cond) \
64	typeof(orig) * __hyp_text fname(void) \
65	{ \
66	typeof(alt) *val = orig; \
67	asm volatile(ALTERNATIVE("nop \n", \
68	"mov %0, %1 \n", \
69	cond) \
70	: "+r" (val) : "r" (alt)); \
71	return val; \
72	}
73
74	int __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu);	50	int __vgic_v2_perform_cpuif_access(struct kvm_vcpu *vcpu);
75		51
76	void __vgic_v3_save_state(struct kvm_vcpu *vcpu);	52	void __vgic_v3_save_state(struct kvm_vcpu *vcpu);

arch/arm64/include/asm/vdso/compat_barrier.h+1−1

@@ -20,7 +20,7 @@ · 19 unmodified lines
20		20
21	#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")	21	#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
22		22
23	#if __LINUX_ARM_ARCH__ >= 8	23	#if __LINUX_ARM_ARCH__ >= 8 && defined(CONFIG_AS_DMB_ISHLD)
24	#define aarch32_smp_mb() dmb(ish)	24	#define aarch32_smp_mb() dmb(ish)
25	#define aarch32_smp_rmb() dmb(ishld)	25	#define aarch32_smp_rmb() dmb(ishld)
26	#define aarch32_smp_wmb() dmb(ishst)	26	#define aarch32_smp_wmb() dmb(ishst)

arch/arm64/include/asm/vdso_datapage.h+0−33

@@ -1,33 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0-only */
2	/*
3	* Copyright (C) 2012 ARM Limited
4	*/
5	#ifndef __ASM_VDSO_DATAPAGE_H
6	#define __ASM_VDSO_DATAPAGE_H
7
8	#ifndef __ASSEMBLY__
9
10	struct vdso_data {
11	__u64 cs_cycle_last; /* Timebase at clocksource init */
12	__u64 raw_time_sec; /* Raw time */
13	__u64 raw_time_nsec;
14	__u64 xtime_clock_sec; /* Kernel time */
15	__u64 xtime_clock_nsec;
16	__u64 xtime_coarse_sec; /* Coarse time */
17	__u64 xtime_coarse_nsec;
18	__u64 wtm_clock_sec; /* Wall to monotonic time */
19	__u64 wtm_clock_nsec;
20	__u32 tb_seq_count; /* Timebase sequence counter */
21	/* cs_* members must be adjacent and in this order (ldp accesses) */
22	__u32 cs_mono_mult; /* NTP-adjusted clocksource multiplier */
23	__u32 cs_shift; /* Clocksource shift (mono = raw) */
24	__u32 cs_raw_mult; /* Raw clocksource multiplier */
25	__u32 tz_minuteswest; /* Whacky timezone stuff */
26	__u32 tz_dsttime;
27	__u32 use_syscall;
28	__u32 hrtimer_res;
29	};
30
31	#endif /* !__ASSEMBLY__ */
32
33	#endif /* __ASM_VDSO_DATAPAGE_H */

arch/arm64/include/asm/xen/xen-ops.h+0−7

@@ -1,7 +0,0 @@
1	/* SPDX-License-Identifier: GPL-2.0 */
2	#ifndef _ASM_XEN_OPS_H
3	#define _ASM_XEN_OPS_H
4
5	void xen_efi_runtime_setup(void);
6
7	#endif /* _ASM_XEN_OPS_H */

arch/arm64/kernel/armv8_deprecated.c+5−0

 	struct insn_emulation *insn;
 	insn = kzalloc(sizeof(*insn), GFP_KERNEL);
+	if (!insn)
+		return;
 	insn->ops = ops;
 	insn->min = INSN_UNDEF;
 	insns_sysctl = kcalloc(nr_insn_emulated + 1, sizeof(*sysctl),
 			       GFP_KERNEL);
+	if (!insns_sysctl)
+		return;
 	raw_spin_lock_irqsave(&insn_emulation_lock, flags);
 	list_for_each_entry(insn, &insn_emulation, node) {

arch/arm64/kernel/cpu_errata.c+2−2

@@ -128,8 +128,8 @@ static void install_bp_hardening_cb(bp_hardening_cb_t fn, · 127 unmodified lines
128	int cpu, slot = -1;	128	int cpu, slot = -1;
129		129
130	/*	130	/*
131	* enable_smccc_arch_workaround_1() passes NULL for the hyp_vecs	131	* detect_harden_bp_fw() passes NULL for the hyp_vecs start/end if
132	* start/end if we're a guest. Skip the hyp-vectors work.	132	* we're a guest. Skip the hyp-vectors work.
133	*/	133	*/
134	if (!hyp_vecs_start) {	134	if (!hyp_vecs_start) {
135	__this_cpu_write(bp_hardening_data.fn, fn);	135	__this_cpu_write(bp_hardening_data.fn, fn);

arch/arm64/kernel/cpufeature.c+1−0

@@ -136,6 +136,7 @@ static const struct arm64_ftr_bits ftr_id_aa64isar0[] = { · 135 unmodified lines
136		136
137	static const struct arm64_ftr_bits ftr_id_aa64isar1[] = {	137	static const struct arm64_ftr_bits ftr_id_aa64isar1[] = {
138	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_SB_SHIFT, 4, 0),	138	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_SB_SHIFT, 4, 0),
		139	ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_FRINTTS_SHIFT, 4, 0),
139	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),	140	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),
140	FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_GPI_SHIFT, 4, 0),	141	FTR_STRICT, FTR_LOWER_SAFE, ID_AA64ISAR1_GPI_SHIFT, 4, 0),
141	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),	142	ARM64_FTR_BITS(FTR_VISIBLE_IF_IS_ENABLED(CONFIG_ARM64_PTR_AUTH),

arch/arm64/kernel/entry.S+1−0

@@ -775,6 +775,7 @@ el0_sync_compat: · 774 unmodified lines
775	b.ge el0_dbg	775	b.ge el0_dbg
776	b el0_inv	776	b el0_inv
777	el0_svc_compat:	777	el0_svc_compat:
		778	gic_prio_kentry_setup tmp=x1
778	mov x0, sp	779	mov x0, sp
779	bl el0_svc_compat_handler	780	bl el0_svc_compat_handler
780	b ret_to_user	781	b ret_to_user

arch/arm64/kernel/ftrace.c+9−3

 			/*
 			 * Ensure updated trampoline is visible to instruction
-			 * fetch before we patch in the branch.
+			 * fetch before we patch in the branch. Although the
+			 * architecture doesn't require an IPI in this case,
+			 * Neoverse-N1 erratum #1542419 does require one
+			 * if the TLB maintenance in module_enable_ro() is
+			 * skipped due to rodata_enabled. It doesn't seem worth
+			 * it to make it conditional given that this is
+			 * certainly not a fast-path.
 			 */
-			__flush_icache_range((unsigned long)&dst[0],
+			flush_icache_range((unsigned long)&dst[0],
-					     (unsigned long)&dst[1]);
+					   (unsigned long)&dst[1]);
 		}
 		addr = (unsigned long)dst;
 #else /* CONFIG_ARM64_MODULE_PLTS */

arch/arm64/kernel/process.c+15−17

 	fpsimd_release_task(tsk);
 }
-/*
- * src and dst may temporarily have aliased sve_state after task_struct
- * is copied.  We cannot fix this properly here, because src may have
- * live SVE state and dst's thread_info may not exist yet, so tweaking
- * either src's or dst's TIF_SVE is not safe.
- *
- * The unaliasing is done in copy_thread() instead.  This works because
- * dst is not schedulable or traceable until both of these functions
- * have been called.
- */
 int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
 {
 	if (current->mm)
 		fpsimd_preserve_current_state();
 	*dst = *src;
+	/* We rely on the above assignment to initialize dst's thread_flags: */
+	BUILD_BUG_ON(!IS_ENABLED(CONFIG_THREAD_INFO_IN_TASK));
+	/*
+	 * Detach src's sve_state (if any) from dst so that it does not
+	 * get erroneously used or freed prematurely.  dst's sve_state
+	 * will be allocated on demand later on if dst uses SVE.
+	 * For consistency, also clear TIF_SVE here: this could be done
+	 * later in copy_process(), but to avoid tripping up future
+	 * maintainers it is best not to leave TIF_SVE and sve_state in
+	 * an inconsistent state, even temporarily.
+	 */
+	dst->thread.sve_state = NULL;
+	clear_tsk_thread_flag(dst, TIF_SVE);
 	return 0;
 }
 	memset(&p->thread.cpu_context, 0, sizeof(struct cpu_context));
-	/*
-	 * Unalias p->thread.sve_state (if any) from the parent task
-	 * and disable discard SVE state for p:
-	 */
-	clear_tsk_thread_flag(p, TIF_SVE);
-	p->thread.sve_state = NULL;
 	/*
 	 * In case p was allocated the same task_struct pointer as some
 	 * other recently-exited task, make sure p is disassociated from

arch/arm64/kernel/vdso/gettimeofday.S+0−0

Empty file deleted.

arch/arm64/kernel/vdso32/Makefile+28−16

 ARCH_REL_TYPE_ABS := R_ARM_JUMP_SLOT|R_ARM_GLOB_DAT|R_ARM_ABS32
 include $(srctree)/lib/vdso/Makefile
-COMPATCC := $(CROSS_COMPILE_COMPAT)gcc
+# Same as cc-*option, but using CC_COMPAT instead of CC
+ifeq ($(CONFIG_CC_IS_CLANG), y)
+CC_COMPAT ?= $(CC)
+else
+CC_COMPAT ?= $(CROSS_COMPILE_COMPAT)gcc
+endif
-# Same as cc-*option, but using COMPATCC instead of CC
 cc32-option = $(call try-run,\
-        $(COMPATCC) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))
+        $(CC_COMPAT) $(1) -c -x c /dev/null -o "$$TMP",$(1),$(2))
 cc32-disable-warning = $(call try-run,\
-	$(COMPATCC) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
+	$(CC_COMPAT) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
 cc32-ldoption = $(call try-run,\
-        $(COMPATCC) $(1) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
+        $(CC_COMPAT) $(1) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
+cc32-as-instr = $(call try-run,\
+	printf "%b\n" "$(1)" | $(CC_COMPAT) $(VDSO_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
 # We cannot use the global flags to compile the vDSO files, the main reason
 # being that the 32-bit compiler may be older than the main (64-bit) compiler
 # arm64 one.
 # As a result we set our own flags here.
-# From top-level Makefile
+# KBUILD_CPPFLAGS and NOSTDINC_FLAGS from top-level Makefile
-# NOSTDINC_FLAGS
+VDSO_CPPFLAGS := -D__KERNEL__ -nostdinc -isystem $(shell $(CC_COMPAT) -print-file-name=include)
-VDSO_CPPFLAGS := -nostdinc -isystem $(shell $(COMPATCC) -print-file-name=include)
 VDSO_CPPFLAGS += $(LINUXINCLUDE)
-VDSO_CPPFLAGS += $(KBUILD_CPPFLAGS)
 # Common C and assembly flags
 # From top-level Makefile
 VDSO_CAFLAGS := $(VDSO_CPPFLAGS)
+ifneq ($(shell $(CC_COMPAT) --version 2>&1 | head -n 1 | grep clang),)
+VDSO_CAFLAGS += --target=$(notdir $(CROSS_COMPILE_COMPAT:%-=%))
+endif
 VDSO_CAFLAGS += $(call cc32-option,-fno-PIE)
 ifdef CONFIG_DEBUG_INFO
 VDSO_CAFLAGS += -g
 endif
-ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-goto.sh $(COMPATCC)), y)
-VDSO_CAFLAGS += -DCC_HAVE_ASM_GOTO
-endif
 # From arm Makefile
 VDSO_CAFLAGS += $(call cc32-option,-fno-dwarf2-cfi-asm)
 VDSO_CAFLAGS += -fPIC -fno-builtin -fno-stack-protector
 VDSO_CAFLAGS += -DDISABLE_BRANCH_PROFILING
 # Try to compile for ARMv8. If the compiler is too old and doesn't support it,
 # fall back to v7. There is no easy way to check for what architecture the code
 # is being compiled, so define a macro specifying that (see arch/arm/Makefile).
 VDSO_AFLAGS := $(VDSO_CAFLAGS)
 VDSO_AFLAGS += -D__ASSEMBLY__
+# Check for binutils support for dmb ishld
+dmbinstr := $(call cc32-as-instr,dmb ishld,-DCONFIG_AS_DMB_ISHLD=1)
+VDSO_CFLAGS += $(dmbinstr)
+VDSO_AFLAGS += $(dmbinstr)
 VDSO_LDFLAGS := $(VDSO_CPPFLAGS)
 # From arm vDSO Makefile
 VDSO_LDFLAGS += -Wl,-Bsymbolic -Wl,--no-undefined -Wl,-soname=linux-vdso.so.1
       cmd_vdsold_and_vdso_check = $(cmd_vdsold); $(cmd_vdso_check)
 quiet_cmd_vdsold = LD32    $@
-      cmd_vdsold = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_LDFLAGS) \
+      cmd_vdsold = $(CC_COMPAT) -Wp,-MD,$(depfile) $(VDSO_LDFLAGS) \
                    -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@
 quiet_cmd_vdsocc = CC32    $@
-      cmd_vdsocc = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) -c -o $@ $<
+      cmd_vdsocc = $(CC_COMPAT) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) -c -o $@ $<
 quiet_cmd_vdsocc_gettimeofday = CC32    $@
-      cmd_vdsocc_gettimeofday = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) $(VDSO_CFLAGS_gettimeofday_o) -c -o $@ $<
+      cmd_vdsocc_gettimeofday = $(CC_COMPAT) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) $(VDSO_CFLAGS_gettimeofday_o) -c -o $@ $<
 quiet_cmd_vdsoas = AS32    $@
-      cmd_vdsoas = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_AFLAGS) -c -o $@ $<
+      cmd_vdsoas = $(CC_COMPAT) -Wp,-MD,$(depfile) $(VDSO_AFLAGS) -c -o $@ $<
 quiet_cmd_vdsomunge = MUNGE   $@
       cmd_vdsomunge = $(obj)/$(munge) $< $@

arch/arm64/kvm/hyp/switch.c+2−15

 	}
 }
-static bool __hyp_text __true_value(void)
-{
-	return true;
-}
-static bool __hyp_text __false_value(void)
-{
-	return false;
-}
-static hyp_alternate_select(__check_arm_834220,
-			    __false_value, __true_value,
-			    ARM64_WORKAROUND_834220);
 static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar)
 {
 	u64 par, tmp;
 	 * resolve the IPA using the AT instruction.
 	 */
 	if (!(esr & ESR_ELx_S1PTW) &&
-	    (__check_arm_834220()() || (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {
+	    (cpus_have_const_cap(ARM64_WORKAROUND_834220) ||
+	     (esr & ESR_ELx_FSC_TYPE) == FSC_PERM)) {
 		if (!__translate_far_to_hpfar(far, &hpfar))
 			return false;
 	} else {

arch/arm64/kvm/hyp/tlb.c+22−14

 	isb();
 }
-static hyp_alternate_select(__tlb_switch_to_guest,
+static void __hyp_text __tlb_switch_to_guest(struct kvm *kvm,
-			    __tlb_switch_to_guest_nvhe,
+					     struct tlb_inv_context *cxt)
-			    __tlb_switch_to_guest_vhe,
+{
-			    ARM64_HAS_VIRT_HOST_EXTN);
+	if (has_vhe())
+		__tlb_switch_to_guest_vhe(kvm, cxt);
+	else
+		__tlb_switch_to_guest_nvhe(kvm, cxt);
+}
 static void __hyp_text __tlb_switch_to_host_vhe(struct kvm *kvm,
 						struct tlb_inv_context *cxt)
 	write_sysreg(0, vttbr_el2);
 }
-static hyp_alternate_select(__tlb_switch_to_host,
+static void __hyp_text __tlb_switch_to_host(struct kvm *kvm,
-			    __tlb_switch_to_host_nvhe,
+					    struct tlb_inv_context *cxt)
-			    __tlb_switch_to_host_vhe,
+{
-			    ARM64_HAS_VIRT_HOST_EXTN);
+	if (has_vhe())
+		__tlb_switch_to_host_vhe(kvm, cxt);
+	else
+		__tlb_switch_to_host_nvhe(kvm, cxt);
+}
 void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)
 {
 	/* Switch to requested VMID */
 	kvm = kern_hyp_va(kvm);
-	__tlb_switch_to_guest()(kvm, &cxt);
+	__tlb_switch_to_guest(kvm, &cxt);
 	/*
 	 * We could do so much better if we had the VA as well.
 	if (!has_vhe() && icache_is_vpipt())
 		__flush_icache_all();
-	__tlb_switch_to_host()(kvm, &cxt);
+	__tlb_switch_to_host(kvm, &cxt);
 }
 void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm)
 	/* Switch to requested VMID */
 	kvm = kern_hyp_va(kvm);
-	__tlb_switch_to_guest()(kvm, &cxt);
+	__tlb_switch_to_guest(kvm, &cxt);
 	__tlbi(vmalls12e1is);
 	dsb(ish);
 	isb();
-	__tlb_switch_to_host()(kvm, &cxt);
+	__tlb_switch_to_host(kvm, &cxt);
 }
 void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)
 	struct tlb_inv_context cxt;
 	/* Switch to requested VMID */
-	__tlb_switch_to_guest()(kvm, &cxt);
+	__tlb_switch_to_guest(kvm, &cxt);
 	__tlbi(vmalle1);
 	dsb(nsh);
 	isb();
-	__tlb_switch_to_host()(kvm, &cxt);
+	__tlb_switch_to_host(kvm, &cxt);
 }
 void __hyp_text __kvm_flush_vm_context(void)

arch/arm64/mm/fault.c+11−2

 	return arch_kasan_reset_tag(addr) >= PAGE_OFFSET;
 }
+static inline unsigned long mm_to_pgd_phys(struct mm_struct *mm)
+{
+	/* Either init_pg_dir or swapper_pg_dir */
+	if (mm == &init_mm)
+		return __pa_symbol(mm->pgd);
+	return (unsigned long)virt_to_phys(mm->pgd);
+}
 /*
  * Dump out the page tables associated with 'addr' in the currently active mm.
  */
 	pr_alert("%s pgtable: %luk pages, %llu-bit VAs, pgdp=%016lx\n",
 		 mm == &init_mm ? "swapper" : "user", PAGE_SIZE / SZ_1K,
-		 vabits_actual, (unsigned long)virt_to_phys(mm->pgd));
+		 vabits_actual, mm_to_pgd_phys(mm));
 	pgdp = pgd_offset(mm, addr);
 	pgd = READ_ONCE(*pgdp);
 	pr_alert("[%016lx] pgd=%016llx", addr, pgd_val(pgd));
 	 * If we got a different type of fault from the AT instruction,
 	 * treat the translation fault as spurious.
 	 */
-	dfsc = FIELD_PREP(SYS_PAR_EL1_FST, par);
+	dfsc = FIELD_GET(SYS_PAR_EL1_FST, par);
 	return (dfsc & ESR_ELx_FSC_TYPE) != ESR_ELx_FSC_FAULT;
 }

arch/arm64/xen/Makefile+0−1

@@ -1,4 +1,3 @@
1	# SPDX-License-Identifier: GPL-2.0-only	1	# SPDX-License-Identifier: GPL-2.0-only
2	xen-arm-y += $(addprefix ../../arm/xen/, enlighten.o grant-table.o p2m.o mm.o)	2	xen-arm-y += $(addprefix ../../arm/xen/, enlighten.o grant-table.o p2m.o mm.o)
3	obj-y := xen-arm.o hypercall.o	3	obj-y := xen-arm.o hypercall.o
4	obj-$(CONFIG_XEN_EFI) += $(addprefix ../../arm/xen/, efi.o)

arch/mips/boot/dts/qca/ar9331.dtsi+1−1

@@ -99,7 +99,7 @@ · 98 unmodified lines
99		99
100	miscintc: interrupt-controller@18060010 {	100	miscintc: interrupt-controller@18060010 {
101	compatible = "qca,ar7240-misc-intc";	101	compatible = "qca,ar7240-misc-intc";
102	reg = <0x18060010 0x4>;	102	reg = <0x18060010 0x8>;
103		103
104	interrupt-parent = <&cpuintc>;	104	interrupt-parent = <&cpuintc>;
105	interrupts = <6>;	105	interrupts = <6>;

arch/mips/configs/mtx1_defconfig+0−1

@@ -571,7 +571,6 @@ CONFIG_USB_SERIAL_OMNINET=m · 570 unmodified lines
571	CONFIG_USB_EMI62=m	571	CONFIG_USB_EMI62=m
572	CONFIG_USB_EMI26=m	572	CONFIG_USB_EMI26=m
573	CONFIG_USB_ADUTUX=m	573	CONFIG_USB_ADUTUX=m
574	CONFIG_USB_RIO500=m
575	CONFIG_USB_LEGOTOWER=m	574	CONFIG_USB_LEGOTOWER=m
576	CONFIG_USB_LCD=m	575	CONFIG_USB_LCD=m
577	CONFIG_USB_CYPRESS_CY7C63=m	576	CONFIG_USB_CYPRESS_CY7C63=m

arch/mips/configs/rm200_defconfig+0−1

@@ -314,7 +314,6 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y · 313 unmodified lines
314	CONFIG_USB_SERIAL_CYBERJACK=m	314	CONFIG_USB_SERIAL_CYBERJACK=m
315	CONFIG_USB_SERIAL_XIRCOM=m	315	CONFIG_USB_SERIAL_XIRCOM=m
316	CONFIG_USB_SERIAL_OMNINET=m	316	CONFIG_USB_SERIAL_OMNINET=m
317	CONFIG_USB_RIO500=m
318	CONFIG_USB_LEGOTOWER=m	317	CONFIG_USB_LEGOTOWER=m
319	CONFIG_USB_LCD=m	318	CONFIG_USB_LCD=m
320	CONFIG_USB_CYTHERM=m	319	CONFIG_USB_CYTHERM=m

arch/mips/fw/arc/memory.c+0−1

@@ -160,7 +160,6 @@ void __init prom_meminit(void) · 159 unmodified lines
160		160
161	void __init prom_free_prom_memory(void)	161	void __init prom_free_prom_memory(void)
162	{	162	{
163	unsigned long addr;
164	int i;	163	int i;
165		164
166	if (prom_flags & PROM_FLAG_DONT_FREE_TEMP)	165	if (prom_flags & PROM_FLAG_DONT_FREE_TEMP)

arch/mips/fw/sni/sniprom.c+1−1

@@ -43,7 +43,7 @@ · 42 unmodified lines
43		43
44	/* O32 stack has to be 8-byte aligned. */	44	/* O32 stack has to be 8-byte aligned. */
45	static u64 o32_stk[4096];	45	static u64 o32_stk[4096];
46	#define O32_STK &o32_stk[sizeof(o32_stk)]	46	#define O32_STK (&o32_stk[ARRAY_SIZE(o32_stk)])
47		47
48	#define __PROM_O32(fun, arg) fun arg __asm__(#fun); \	48	#define __PROM_O32(fun, arg) fun arg __asm__(#fun); \
49	__asm__(#fun " = call_o32")	49	__asm__(#fun " = call_o32")

arch/mips/include/asm/cmpxchg.h+5−4

 extern unsigned long __xchg_small(volatile void *ptr, unsigned long val,
 				  unsigned int size);
-static inline unsigned long __xchg(volatile void *ptr, unsigned long x,
+static __always_inline
-				   int size)
+unsigned long __xchg(volatile void *ptr, unsigned long x, int size)
 {
 	switch (size) {
 	case 1:
 extern unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old,
 				     unsigned long new, unsigned int size);
-static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
+static __always_inline
-				      unsigned long new, unsigned int size)
+unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
+			unsigned long new, unsigned int size)
 {
 	switch (size) {
 	case 1:

arch/mips/include/asm/octeon/cvmx-ipd.h+1−0

@@ -36,6 +36,7 @@ · 35 unmodified lines
36	#include <asm/octeon/octeon-feature.h>	36	#include <asm/octeon/octeon-feature.h>
37		37
38	#include <asm/octeon/cvmx-ipd-defs.h>	38	#include <asm/octeon/cvmx-ipd-defs.h>
		39	#include <asm/octeon/cvmx-pip-defs.h>
39		40
40	enum cvmx_ipd_mode {	41	enum cvmx_ipd_mode {
41	CVMX_IPD_OPC_MODE_STT = 0LL, /* All blocks DRAM, not cached in L2 */	42	CVMX_IPD_OPC_MODE_STT = 0LL, /* All blocks DRAM, not cached in L2 */

arch/mips/include/asm/unistd.h+1−0

@@ -52,6 +52,7 @@ · 51 unmodified lines
52	# endif	52	# endif
53	#define __ARCH_WANT_SYS_FORK	53	#define __ARCH_WANT_SYS_FORK
54	#define __ARCH_WANT_SYS_CLONE	54	#define __ARCH_WANT_SYS_CLONE
		55	#define __ARCH_WANT_SYS_CLONE3
55		56
56	/* whitelists for checksyscalls */	57	/* whitelists for checksyscalls */
57	#define __IGNORE_fadvise64_64	58	#define __IGNORE_fadvise64_64

arch/mips/include/uapi/asm/hwcap.h+11−0

@@ -6,5 +6,16 @@ · 5 unmodified lines
6	#define HWCAP_MIPS_R6 (1 << 0)	6	#define HWCAP_MIPS_R6 (1 << 0)
7	#define HWCAP_MIPS_MSA (1 << 1)	7	#define HWCAP_MIPS_MSA (1 << 1)
8	#define HWCAP_MIPS_CRC32 (1 << 2)	8	#define HWCAP_MIPS_CRC32 (1 << 2)
		9	#define HWCAP_MIPS_MIPS16 (1 << 3)
		10	#define HWCAP_MIPS_MDMX (1 << 4)
		11	#define HWCAP_MIPS_MIPS3D (1 << 5)
		12	#define HWCAP_MIPS_SMARTMIPS (1 << 6)
		13	#define HWCAP_MIPS_DSP (1 << 7)
		14	#define HWCAP_MIPS_DSP2 (1 << 8)
		15	#define HWCAP_MIPS_DSP3 (1 << 9)
		16	#define HWCAP_MIPS_MIPS16E2 (1 << 10)
		17	#define HWCAP_LOONGSON_MMI (1 << 11)
		18	#define HWCAP_LOONGSON_EXT (1 << 12)
		19	#define HWCAP_LOONGSON_EXT2 (1 << 13)
9		20
10	#endif /* _UAPI_ASM_HWCAP_H */	21	#endif /* _UAPI_ASM_HWCAP_H */

arch/mips/kernel/cpu-bugs64.c+8−6

 static char daddiwar[] __initdata =
 	"Enable CPU_DADDI_WORKAROUNDS to rectify.";
-static inline void align_mod(const int align, const int mod)
+static __always_inline __init
+void align_mod(const int align, const int mod)
 {
 	asm volatile(
 		".set	push\n\t"
 		: "n"(align), "n"(mod));
 }
-static __always_inline void mult_sh_align_mod(long *v1, long *v2, long *w,
+static __always_inline __init
-					      const int align, const int mod)
+void mult_sh_align_mod(long *v1, long *v2, long *w,
+		       const int align, const int mod)
 {
 	unsigned long flags;
 	int m1, m2;
 	*w = lw;
 }
-static inline void check_mult_sh(void)
+static __always_inline __init void check_mult_sh(void)
 {
 	long v1[8], v2[8], w[8];
 	int bug, fix, i;
 	exception_exit(prev_state);
 }
-static inline void check_daddi(void)
+static __init void check_daddi(void)
 {
 	extern asmlinkage void handle_daddi_ov(void);
 	unsigned long flags;
 int daddiu_bug	= IS_ENABLED(CONFIG_CPU_MIPSR6) ? 0 : -1;
-static inline void check_daddiu(void)
+static __init void check_daddiu(void)
 {
 	long v, w, tmp;

arch/mips/kernel/cpu-probe.c+33−0

@@ -2180,6 +2180,39 @@ void cpu_probe(void) · 2179 unmodified lines
2180	elf_hwcap \|= HWCAP_MIPS_MSA;	2180	elf_hwcap \|= HWCAP_MIPS_MSA;
2181	}	2181	}
2182		2182
		2183	if (cpu_has_mips16)
		2184	elf_hwcap \|= HWCAP_MIPS_MIPS16;
		2185
		2186	if (cpu_has_mdmx)
		2187	elf_hwcap \|= HWCAP_MIPS_MDMX;
		2188
		2189	if (cpu_has_mips3d)
		2190	elf_hwcap \|= HWCAP_MIPS_MIPS3D;
		2191
		2192	if (cpu_has_smartmips)
		2193	elf_hwcap \|= HWCAP_MIPS_SMARTMIPS;
		2194
		2195	if (cpu_has_dsp)
		2196	elf_hwcap \|= HWCAP_MIPS_DSP;
		2197
		2198	if (cpu_has_dsp2)
		2199	elf_hwcap \|= HWCAP_MIPS_DSP2;
		2200
		2201	if (cpu_has_dsp3)
		2202	elf_hwcap \|= HWCAP_MIPS_DSP3;
		2203
		2204	if (cpu_has_mips16e2)
		2205	elf_hwcap \|= HWCAP_MIPS_MIPS16E2;
		2206
		2207	if (cpu_has_loongson_mmi)
		2208	elf_hwcap \|= HWCAP_LOONGSON_MMI;
		2209
		2210	if (cpu_has_loongson_ext)
		2211	elf_hwcap \|= HWCAP_LOONGSON_EXT;
		2212
		2213	if (cpu_has_loongson_ext2)
		2214	elf_hwcap \|= HWCAP_LOONGSON_EXT2;
		2215
2183	if (cpu_has_vz)	2216	if (cpu_has_vz)
2184	cpu_probe_vz(c);	2217	cpu_probe_vz(c);
2185		2218

arch/mips/kernel/setup.c+4−1

 		return;
 	}
+	if (start < PHYS_OFFSET)
+		return;
 	memblock_add(start, size);
 	/* Reserve any memory except the ordinary RAM ranges. */
 	switch (type) {
 	 * Reserve any memory between the start of RAM and PHYS_OFFSET
 	 */
 	if (ramstart > PHYS_OFFSET)
-		memblock_reserve(PHYS_OFFSET, PFN_UP(ramstart) - PHYS_OFFSET);
+		memblock_reserve(PHYS_OFFSET, ramstart - PHYS_OFFSET);
 	if (PFN_UP(ramstart) > ARCH_PFN_OFFSET) {
 		pr_info("Wasting %lu bytes for tracking %lu unused pages\n",

arch/mips/kernel/syscall.c+1−0

@@ -80,6 +80,7 @@ SYSCALL_DEFINE6(mips_mmap2, unsigned long, addr, unsigned long, len, · 79 unmodified lines
80		80
81	save_static_function(sys_fork);	81	save_static_function(sys_fork);
82	save_static_function(sys_clone);	82	save_static_function(sys_clone);
		83	save_static_function(sys_clone3);
83		84
84	SYSCALL_DEFINE1(set_thread_area, unsigned long, addr)	85	SYSCALL_DEFINE1(set_thread_area, unsigned long, addr)
85	{	86	{

arch/mips/kernel/syscalls/syscall_n32.tbl+1−1

@@ -373,4 +373,4 @@ · 372 unmodified lines
373	432 n32 fsmount sys_fsmount	373	432 n32 fsmount sys_fsmount
374	433 n32 fspick sys_fspick	374	433 n32 fspick sys_fspick
375	434 n32 pidfd_open sys_pidfd_open	375	434 n32 pidfd_open sys_pidfd_open
376	# 435 reserved for clone3	376	435 n32 clone3 __sys_clone3

arch/mips/kernel/syscalls/syscall_n64.tbl+1−1

@@ -349,4 +349,4 @@ · 348 unmodified lines
349	432 n64 fsmount sys_fsmount	349	432 n64 fsmount sys_fsmount
350	433 n64 fspick sys_fspick	350	433 n64 fspick sys_fspick
351	434 n64 pidfd_open sys_pidfd_open	351	434 n64 pidfd_open sys_pidfd_open
352	# 435 reserved for clone3	352	435 n64 clone3 __sys_clone3

arch/mips/kernel/syscalls/syscall_o32.tbl+1−1

@@ -422,4 +422,4 @@ · 421 unmodified lines
422	432 o32 fsmount sys_fsmount	422	432 o32 fsmount sys_fsmount
423	433 o32 fspick sys_fspick	423	433 o32 fspick sys_fspick
424	434 o32 pidfd_open sys_pidfd_open	424	434 o32 pidfd_open sys_pidfd_open
425	# 435 reserved for clone3	425	435 o32 clone3 __sys_clone3

arch/mips/loongson64/Platform+4−0

       $(call cc-option,-march=mips64r2,-mips64r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS64)
 endif
+# Some -march= flags enable MMI instructions, and GCC complains about that
+# support being enabled alongside -msoft-float. Thus explicitly disable MMI.
+cflags-y += $(call cc-option,-mno-loongson-mmi)
 #
 # Loongson Machines' Support
 #

arch/mips/loongson64/common/mem.c+17−18

@@ -3,6 +3,7 @@ · 2 unmodified lines
3	*/	3	*/
4	#include <linux/fs.h>	4	#include <linux/fs.h>
5	#include <linux/fcntl.h>	5	#include <linux/fcntl.h>
		6	#include <linux/memblock.h>
6	#include <linux/mm.h>	7	#include <linux/mm.h>
7		8
8	#include <asm/bootinfo.h>	9	#include <asm/bootinfo.h>
@@ -64,24 +65,22 @@ void __init prom_init_memory(void) · 55 unmodified lines
64	node_id = loongson_memmap->map[i].node_id;	65	node_id = loongson_memmap->map[i].node_id;
65	mem_type = loongson_memmap->map[i].mem_type;	66	mem_type = loongson_memmap->map[i].mem_type;
66		67
67	if (node_id == 0) {	68	if (node_id != 0)
68	switch (mem_type) {	69	continue;
69	case SYSTEM_RAM_LOW:	70
70	add_memory_region(loongson_memmap->map[i].mem_start,	71	switch (mem_type) {
71	(u64)loongson_memmap->map[i].mem_size << 20,	72	case SYSTEM_RAM_LOW:
72	BOOT_MEM_RAM);	73	memblock_add(loongson_memmap->map[i].mem_start,
73	break;	74	(u64)loongson_memmap->map[i].mem_size << 20);
74	case SYSTEM_RAM_HIGH:	75	break;
75	add_memory_region(loongson_memmap->map[i].mem_start,	76	case SYSTEM_RAM_HIGH:
76	(u64)loongson_memmap->map[i].mem_size << 20,	77	memblock_add(loongson_memmap->map[i].mem_start,
77	BOOT_MEM_RAM);	78	(u64)loongson_memmap->map[i].mem_size << 20);
78	break;	79	break;
79	case SYSTEM_RAM_RESERVED:	80	case SYSTEM_RAM_RESERVED:
80	add_memory_region(loongson_memmap->map[i].mem_start,	81	memblock_reserve(loongson_memmap->map[i].mem_start,
81	(u64)loongson_memmap->map[i].mem_size << 20,	82	(u64)loongson_memmap->map[i].mem_size << 20);
82	BOOT_MEM_RESERVED);	83	break;
83	break;
84	}
85	}	84	}
86	}	85	}
87	}	86	}

arch/mips/loongson64/common/serial.c+1−1

@@ -110,7 +110,7 @@ static int __init serial_init(void) · 109 unmodified lines
110	}	110	}
111	module_init(serial_init);	111	module_init(serial_init);
112		112
113	static void __init serial_exit(void)	113	static void __exit serial_exit(void)
114	{	114	{
115	platform_device_unregister(&uart8250_device);	115	platform_device_unregister(&uart8250_device);
116	}	116	}

arch/mips/loongson64/loongson-3/numa.c+1−10

 				(u32)node_id, mem_type, mem_start, mem_size);
 			pr_info("       start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n",
 				start_pfn, end_pfn, num_physpages);
-			add_memory_region((node_id << 44) + mem_start,
-				(u64)mem_size << 20, BOOT_MEM_RAM);
 			memblock_add_node(PFN_PHYS(start_pfn),
 				PFN_PHYS(end_pfn - start_pfn), node);
 			break;
 				(u32)node_id, mem_type, mem_start, mem_size);
 			pr_info("       start_pfn:0x%llx, end_pfn:0x%llx, num_physpages:0x%lx\n",
 				start_pfn, end_pfn, num_physpages);
-			add_memory_region((node_id << 44) + mem_start,
-				(u64)mem_size << 20, BOOT_MEM_RAM);
 			memblock_add_node(PFN_PHYS(start_pfn),
 				PFN_PHYS(end_pfn - start_pfn), node);
 			break;
 		case SYSTEM_RAM_RESERVED:
 			pr_info("Node%d: mem_type:%d, mem_start:0x%llx, mem_size:0x%llx MB\n",
 				(u32)node_id, mem_type, mem_start, mem_size);
-			add_memory_region((node_id << 44) + mem_start,
-				(u64)mem_size << 20, BOOT_MEM_RESERVED);
 			memblock_reserve(((node_id << 44) + mem_start),
 				mem_size << 20);
 			break;
 	NODE_DATA(node)->node_start_pfn = start_pfn;
 	NODE_DATA(node)->node_spanned_pages = end_pfn - start_pfn;
-	free_bootmem_with_active_regions(node, end_pfn);
 	if (node == 0) {
 		/* kernel end address */
 		unsigned long kernel_end_pfn = PFN_UP(__pa_symbol(&_end));
 			memblock_reserve((node_addrspace_offset | 0xfe000000),
 					 32 << 20);
 	}
-	sparse_memory_present_with_active_regions(node);
 }
 static __init void prom_meminit(void)
 			cpumask_clear(&__node_data[(node)]->cpumask);
 		}
 	}
+	memblocks_present();
 	max_low_pfn = PHYS_PFN(memblock_end_of_DRAM());
 	for (cpu = 0; cpu < loongson_sysconf.nr_cpus; cpu++) {

arch/mips/pmcs-msp71xx/msp_prom.c+2−2

 /* memory blocks */
 struct prom_pmemblock mdesc[PROM_MAX_PMEMBLOCKS];
+#define MAX_PROM_MEM 5
 static phys_addr_t prom_mem_base[MAX_PROM_MEM] __initdata;
 static phys_addr_t prom_mem_size[MAX_PROM_MEM] __initdata;
 static unsigned int nr_prom_mem __initdata;
 		p++;
 		if (type == BOOT_MEM_ROM_DATA) {
-			if (nr_prom_mem >= 5) {
+			if (nr_prom_mem >= MAX_PROM_MEM) {
 				pr_err("Too many ROM DATA regions");
 				continue;
 			}
 	char	*ptr;
 	int	len = 0;
 	int	i;
-	unsigned long addr;
 	/*
 	 * preserve environment variables and command line from pmon/bbload

arch/mips/vdso/Makefile+2−1

 	$(filter -mmicromips,$(KBUILD_CFLAGS)) \
 	$(filter -march=%,$(KBUILD_CFLAGS)) \
 	$(filter -m%-float,$(KBUILD_CFLAGS)) \
+	$(filter -mno-loongson-%,$(KBUILD_CFLAGS)) \
 	-D__VDSO__
 ifdef CONFIG_CC_IS_CLANG
 ifndef CONFIG_CPU_MIPSR6
   ifeq ($(call ld-ifversion, -lt, 225000000, y),y)
     $(warning MIPS VDSO requires binutils >= 2.25)
-    obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))
+    obj-vdso-y := $(filter-out vgettimeofday.o, $(obj-vdso-y))
     ccflags-vdso += -DDISABLE_MIPS_VDSO
   endif
 endif

arch/mips/vdso/gettimeofday.c+0−269

@@ -1,269 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*
3	* Copyright (C) 2015 Imagination Technologies
4	* Author: Alex Smith <alex.smith@imgtec.com>
5	*/
6
7	#include "vdso.h"
8
9	#include <linux/compiler.h>
10	#include <linux/time.h>
11
12	#include <asm/clocksource.h>
13	#include <asm/io.h>
14	#include <asm/unistd.h>
15	#include <asm/vdso.h>
16
17	#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
18
19	static __always_inline long gettimeofday_fallback(struct timeval *_tv,
20	struct timezone *_tz)
21	{
22	register struct timezone *tz asm("a1") = _tz;
23	register struct timeval *tv asm("a0") = _tv;
24	register long ret asm("v0");
25	register long nr asm("v0") = __NR_gettimeofday;
26	register long error asm("a3");
27
28	asm volatile(
29	" syscall\n"
30	: "=r" (ret), "=r" (error)
31	: "r" (tv), "r" (tz), "r" (nr)
32	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
33	"$14", "$15", "$24", "$25", "hi", "lo", "memory");
34
35	return error ? -ret : ret;
36	}
37
38	#endif
39
40	static __always_inline long clock_gettime_fallback(clockid_t _clkid,
41	struct timespec *_ts)
42	{
43	register struct timespec *ts asm("a1") = _ts;
44	register clockid_t clkid asm("a0") = _clkid;
45	register long ret asm("v0");
46	register long nr asm("v0") = __NR_clock_gettime;
47	register long error asm("a3");
48
49	asm volatile(
50	" syscall\n"
51	: "=r" (ret), "=r" (error)
52	: "r" (clkid), "r" (ts), "r" (nr)
53	: "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13",
54	"$14", "$15", "$24", "$25", "hi", "lo", "memory");
55
56	return error ? -ret : ret;
57	}
58
59	static __always_inline int do_realtime_coarse(struct timespec *ts,
60	const union mips_vdso_data *data)
61	{
62	u32 start_seq;
63
64	do {
65	start_seq = vdso_data_read_begin(data);
66
67	ts->tv_sec = data->xtime_sec;
68	ts->tv_nsec = data->xtime_nsec >> data->cs_shift;
69	} while (vdso_data_read_retry(data, start_seq));
70
71	return 0;
72	}
73
74	static __always_inline int do_monotonic_coarse(struct timespec *ts,
75	const union mips_vdso_data *data)
76	{
77	u32 start_seq;
78	u64 to_mono_sec;
79	u64 to_mono_nsec;
80
81	do {
82	start_seq = vdso_data_read_begin(data);
83
84	ts->tv_sec = data->xtime_sec;
85	ts->tv_nsec = data->xtime_nsec >> data->cs_shift;
86
87	to_mono_sec = data->wall_to_mono_sec;
88	to_mono_nsec = data->wall_to_mono_nsec;
89	} while (vdso_data_read_retry(data, start_seq));
90
91	ts->tv_sec += to_mono_sec;
92	timespec_add_ns(ts, to_mono_nsec);
93
94	return 0;
95	}
96
97	#ifdef CONFIG_CSRC_R4K
98
99	static __always_inline u64 read_r4k_count(void)
100	{
101	unsigned int count;
102
103	__asm__ __volatile__(
104	" .set push\n"
105	" .set mips32r2\n"
106	" rdhwr %0, $2\n"
107	" .set pop\n"
108	: "=r" (count));
109
110	return count;
111	}
112
113	#endif
114
115	#ifdef CONFIG_CLKSRC_MIPS_GIC
116
117	static __always_inline u64 read_gic_count(const union mips_vdso_data *data)
118	{
119	void __iomem *gic = get_gic(data);
120	u32 hi, hi2, lo;
121
122	do {
123	hi = __raw_readl(gic + sizeof(lo));
124	lo = __raw_readl(gic);
125	hi2 = __raw_readl(gic + sizeof(lo));
126	} while (hi2 != hi);
127
128	return (((u64)hi) << 32) + lo;
129	}
130
131	#endif
132
133	static __always_inline u64 get_ns(const union mips_vdso_data *data)
134	{
135	u64 cycle_now, delta, nsec;
136
137	switch (data->clock_mode) {
138	#ifdef CONFIG_CSRC_R4K
139	case VDSO_CLOCK_R4K:
140	cycle_now = read_r4k_count();
141	break;
142	#endif
143	#ifdef CONFIG_CLKSRC_MIPS_GIC
144	case VDSO_CLOCK_GIC:
145	cycle_now = read_gic_count(data);
146	break;
147	#endif
148	default:
149	return 0;
150	}
151
152	delta = (cycle_now - data->cs_cycle_last) & data->cs_mask;
153
154	nsec = (delta * data->cs_mult) + data->xtime_nsec;
155	nsec >>= data->cs_shift;
156
157	return nsec;
158	}
159
160	static __always_inline int do_realtime(struct timespec *ts,
161	const union mips_vdso_data *data)
162	{
163	u32 start_seq;
164	u64 ns;
165
166	do {
167	start_seq = vdso_data_read_begin(data);
168
169	if (data->clock_mode == VDSO_CLOCK_NONE)
170	return -ENOSYS;
171
172	ts->tv_sec = data->xtime_sec;
173	ns = get_ns(data);
174	} while (vdso_data_read_retry(data, start_seq));
175
176	ts->tv_nsec = 0;
177	timespec_add_ns(ts, ns);
178
179	return 0;
180	}
181
182	static __always_inline int do_monotonic(struct timespec *ts,
183	const union mips_vdso_data *data)
184	{
185	u32 start_seq;
186	u64 ns;
187	u64 to_mono_sec;
188	u64 to_mono_nsec;
189
190	do {
191	start_seq = vdso_data_read_begin(data);
192
193	if (data->clock_mode == VDSO_CLOCK_NONE)
194	return -ENOSYS;
195
196	ts->tv_sec = data->xtime_sec;
197	ns = get_ns(data);
198
199	to_mono_sec = data->wall_to_mono_sec;
200	to_mono_nsec = data->wall_to_mono_nsec;
201	} while (vdso_data_read_retry(data, start_seq));
202
203	ts->tv_sec += to_mono_sec;
204	ts->tv_nsec = 0;
205	timespec_add_ns(ts, ns + to_mono_nsec);
206
207	return 0;
208	}
209
210	#ifdef CONFIG_MIPS_CLOCK_VSYSCALL
211
212	/*
213	* This is behind the ifdef so that we don't provide the symbol when there's no
214	* possibility of there being a usable clocksource, because there's nothing we
215	* can do without it. When libc fails the symbol lookup it should fall back on
216	* the standard syscall path.
217	*/
218	int __vdso_gettimeofday(struct timeval tv, struct timezone tz)
219	{
220	const union mips_vdso_data *data = get_vdso_data();
221	struct timespec ts;
222	int ret;
223
224	ret = do_realtime(&ts, data);
225	if (ret)
226	return gettimeofday_fallback(tv, tz);
227
228	if (tv) {
229	tv->tv_sec = ts.tv_sec;
230	tv->tv_usec = ts.tv_nsec / 1000;
231	}
232
233	if (tz) {
234	tz->tz_minuteswest = data->tz_minuteswest;
235	tz->tz_dsttime = data->tz_dsttime;
236	}
237
238	return 0;
239	}
240
241	#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */
242
243	int __vdso_clock_gettime(clockid_t clkid, struct timespec *ts)
244	{
245	const union mips_vdso_data *data = get_vdso_data();
246	int ret = -1;
247
248	switch (clkid) {
249	case CLOCK_REALTIME_COARSE:
250	ret = do_realtime_coarse(ts, data);
251	break;
252	case CLOCK_MONOTONIC_COARSE:
253	ret = do_monotonic_coarse(ts, data);
254	break;
255	case CLOCK_REALTIME:
256	ret = do_realtime(ts, data);
257	break;
258	case CLOCK_MONOTONIC:
259	ret = do_monotonic(ts, data);
260	break;
261	default:
262	break;
263	}
264
265	if (ret)
266	ret = clock_gettime_fallback(clkid, ts);
267
268	return ret;
269	}

arch/powerpc/boot/Makefile+1−1

@@ -50,7 +50,7 @@ endif · 49 unmodified lines
50		50
51	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc	51	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -nostdinc
52		52
53	BOOTARFLAGS := -cr$(KBUILD_ARFLAGS)	53	BOOTARFLAGS := -crD
54		54
55	ifdef CONFIG_CC_IS_CLANG	55	ifdef CONFIG_CC_IS_CLANG
56	BOOTCFLAGS += $(CLANG_FLAGS)	56	BOOTCFLAGS += $(CLANG_FLAGS)

arch/powerpc/include/asm/book3s/64/tlbflush-radix.h+4−0

 {
 	WARN_ON(1);
 }
+static inline void radix__flush_all_lpid_guest(unsigned int lpid)
+{
+	WARN_ON(1);
+}
 #endif
 extern void radix__flush_hugetlb_tlb_range(struct vm_area_struct *vma,

arch/powerpc/kvm/book3s.c+4−4

@@ -36,8 +36,8 @@ · 35 unmodified lines
36	#include "book3s.h"	36	#include "book3s.h"
37	#include "trace.h"	37	#include "trace.h"
38		38
39	#define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM	39	#define VM_STAT(x, ...) offsetof(struct kvm, stat.x), KVM_STAT_VM, ## __VA_ARGS__
40	#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU	40	#define VCPU_STAT(x, ...) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU, ## __VA_ARGS__
41		41
42	/* #define EXIT_DEBUG */	42	/* #define EXIT_DEBUG */
43		43
@@ -69,8 +69,8 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { · 25 unmodified lines
69	{ "pthru_all", VCPU_STAT(pthru_all) },	69	{ "pthru_all", VCPU_STAT(pthru_all) },
70	{ "pthru_host", VCPU_STAT(pthru_host) },	70	{ "pthru_host", VCPU_STAT(pthru_host) },
71	{ "pthru_bad_aff", VCPU_STAT(pthru_bad_aff) },	71	{ "pthru_bad_aff", VCPU_STAT(pthru_bad_aff) },
72	{ "largepages_2M", VM_STAT(num_2M_pages) },	72	{ "largepages_2M", VM_STAT(num_2M_pages, .mode = 0444) },
73	{ "largepages_1G", VM_STAT(num_1G_pages) },	73	{ "largepages_1G", VM_STAT(num_1G_pages, .mode = 0444) },
74	{ NULL }	74	{ NULL }
75	};	75	};
76		76

arch/powerpc/kvm/book3s_hv_rmhandlers.S+1−0

@@ -1921,6 +1921,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) · 1920 unmodified lines
1921	mtspr SPRN_PCR, r6	1921	mtspr SPRN_PCR, r6
1922	18:	1922	18:
1923	/* Signal secondary CPUs to continue */	1923	/* Signal secondary CPUs to continue */
		1924	li r0, 0
1924	stb r0,VCORE_IN_GUEST(r5)	1925	stb r0,VCORE_IN_GUEST(r5)
1925	19: lis r8,0x7fff /* MAX_INT@h */	1926	19: lis r8,0x7fff /* MAX_INT@h */
1926	mtspr SPRN_HDEC,r8	1927	mtspr SPRN_HDEC,r8

arch/powerpc/platforms/cell/spufs/inode.c+1−0

@@ -761,6 +761,7 @@ static int spufs_init_fs_context(struct fs_context *fc) · 760 unmodified lines
761	ctx->gid = current_gid();	761	ctx->gid = current_gid();
762	ctx->mode = 0755;	762	ctx->mode = 0755;
763		763
		764	fc->fs_private = ctx;
764	fc->s_fs_info = sbi;	765	fc->s_fs_info = sbi;
765	fc->ops = &spufs_context_ops;	766	fc->ops = &spufs_context_ops;
766	return 0;	767	return 0;

arch/powerpc/platforms/pseries/lpar.c+3−0

@@ -1419,6 +1419,9 @@ void __init pseries_lpar_read_hblkrm_characteristics(void) · 1418 unmodified lines
1419	unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];	1419	unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH];
1420	int call_status, len, idx, bpsize;	1420	int call_status, len, idx, bpsize;
1421		1421
		1422	if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE))
		1423	return;
		1424
1422	spin_lock(&rtas_data_buf_lock);	1425	spin_lock(&rtas_data_buf_lock);
1423	memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);	1426	memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE);
1424	call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,	1427	call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1,

arch/riscv/include/asm/asm.h+1−0

@@ -22,6 +22,7 @@ · 21 unmodified lines
22		22
23	#define REG_L __REG_SEL(ld, lw)	23	#define REG_L __REG_SEL(ld, lw)
24	#define REG_S __REG_SEL(sd, sw)	24	#define REG_S __REG_SEL(sd, sw)
		25	#define REG_SC __REG_SEL(sc.d, sc.w)
25	#define SZREG __REG_SEL(8, 4)	26	#define SZREG __REG_SEL(8, 4)
26	#define LGREG __REG_SEL(3, 2)	27	#define LGREG __REG_SEL(3, 2)
27		28

arch/riscv/kernel/entry.S+21−3

  */
 	.macro RESTORE_ALL
 	REG_L a0, PT_SSTATUS(sp)
-	REG_L a2, PT_SEPC(sp)
+	/*
+	 * The current load reservation is effectively part of the processor's
+	 * state, in the sense that load reservations cannot be shared between
+	 * different hart contexts.  We can't actually save and restore a load
+	 * reservation, so instead here we clear any existing reservation --
+	 * it's always legal for implementations to clear load reservations at
+	 * any point (as long as the forward progress guarantee is kept, but
+	 * we'll ignore that here).
+	 *
+	 * Dangling load reservations can be the result of taking a trap in the
+	 * middle of an LR/SC sequence, but can also be the result of a taken
+	 * forward branch around an SC -- which is how we implement CAS.  As a
+	 * result we need to clear reservations between the last CAS and the
+	 * jump back to the new context.  While it is unlikely the store
+	 * completes, implementations are allowed to expand reservations to be
+	 * arbitrarily large.
+	 */
+	REG_L  a2, PT_SEPC(sp)
+	REG_SC x0, a2, PT_SEPC(sp)
 	csrw CSR_SSTATUS, a0
 	csrw CSR_SEPC, a2
 resume_kernel:
 	REG_L s0, TASK_TI_PREEMPT_COUNT(tp)
 	bnez s0, restore_all
-need_resched:
 	REG_L s0, TASK_TI_FLAGS(tp)
 	andi s0, s0, _TIF_NEED_RESCHED
 	beqz s0, restore_all
 	call preempt_schedule_irq
-	j need_resched
+	j restore_all
 #endif
 work_pending:

arch/riscv/kernel/traps.c+7−7

 asmlinkage void do_trap_break(struct pt_regs *regs)
 {
-#ifdef CONFIG_GENERIC_BUG
 	if (!user_mode(regs)) {
 		enum bug_trap_type type;
 		type = report_bug(regs->sepc, regs);
 		switch (type) {
-		case BUG_TRAP_TYPE_NONE:
+#ifdef CONFIG_GENERIC_BUG
-			break;
 		case BUG_TRAP_TYPE_WARN:
 			regs->sepc += get_break_insn_length(regs->sepc);
-			break;
+			return;
 		case BUG_TRAP_TYPE_BUG:
+#endif /* CONFIG_GENERIC_BUG */
+		default:
 			die(regs, "Kernel BUG");
 		}
+	} else {
+		force_sig_fault(SIGTRAP, TRAP_BRKPT,
+				(void __user *)(regs->sepc));
 	}
-#endif /* CONFIG_GENERIC_BUG */
-	force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)(regs->sepc));
 }
 #ifdef CONFIG_GENERIC_BUG

arch/riscv/mm/init.c+11−1

 #include <linux/swap.h>
 #include <linux/sizes.h>
 #include <linux/of_fdt.h>
+#include <linux/libfdt.h>
 #include <asm/fixmap.h>
 #include <asm/tlbflush.h>
 }
 #endif /* CONFIG_BLK_DEV_INITRD */
+static phys_addr_t dtb_early_pa __initdata;
 void __init setup_bootmem(void)
 {
 	struct memblock_region *reg;
 	setup_initrd();
 #endif /* CONFIG_BLK_DEV_INITRD */
-	early_init_fdt_reserve_self();
+	/*
+	 * Avoid using early_init_fdt_reserve_self() since __pa() does
+	 * not work for DTB pointers that are fixmap addresses
+	 */
+	memblock_reserve(dtb_early_pa, fdt_totalsize(dtb_early_va));
 	early_init_fdt_scan_reserved_mem();
 	memblock_allow_resize();
 	memblock_dump_all();
 	/* Save pointer to DTB for early FDT parsing */
 	dtb_early_va = (void *)fix_to_virt(FIX_FDT) + (dtb_pa & ~PAGE_MASK);
+	/* Save physical address for memblock reservation */
+	dtb_early_pa = dtb_pa;
 }
 static void __init setup_vm_final(void)

arch/s390/configs/debug_defconfig+16−8

 CONFIG_NUMA=y
 CONFIG_HZ_100=y
 CONFIG_KEXEC_FILE=y
+CONFIG_KEXEC_SIG=y
 CONFIG_EXPOLINE=y
 CONFIG_EXPOLINE_AUTO=y
 CONFIG_CHSC_SCH=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODULE_SIG=y
 CONFIG_MODULE_SIG_SHA256=y
+CONFIG_UNUSED_SYMBOLS=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_BPF_JIT=y
 CONFIG_NET_PKTGEN=m
+# CONFIG_NET_DROP_MONITOR is not set
 CONFIG_PCI=y
 CONFIG_PCI_DEBUG=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_RAID=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_SWITCH=m
 CONFIG_NETDEVICES=y
 CONFIG_BONDING=m
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
 # CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_RDC is not set
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_DIAG288_WATCHDOG=m
-CONFIG_DRM=y
+CONFIG_FB=y
-CONFIG_DRM_VIRTIO_GPU=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
+CONFIG_SYNC_FILE=y
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_MDEV=m
 CONFIG_FS_DAX=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
 CONFIG_OVERLAY_FS=m
 CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_LOCKDOWN_LSM=y
+CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_IMA=y
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA_APPRAISE=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 CONFIG_CRYPTO_USER=m
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_GDB_SCRIPTS=y
 CONFIG_FRAME_WARN=1024
-CONFIG_UNUSED_SYMBOLS=y
 CONFIG_HEADERS_INSTALL=y
 CONFIG_HEADERS_CHECK=y
 CONFIG_DEBUG_SECTION_MISMATCH=y

arch/s390/configs/defconfig+16−9

 # CONFIG_NUMA_EMU is not set
 CONFIG_HZ_100=y
 CONFIG_KEXEC_FILE=y
+CONFIG_KEXEC_SIG=y
 CONFIG_EXPOLINE=y
 CONFIG_EXPOLINE_AUTO=y
 CONFIG_CHSC_SCH=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
-CONFIG_MODULE_SIG=y
 CONFIG_MODULE_SIG_SHA256=y
+CONFIG_UNUSED_SYMBOLS=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
+CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_CGROUP_NET_PRIO=y
 CONFIG_BPF_JIT=y
 CONFIG_NET_PKTGEN=m
+# CONFIG_NET_DROP_MONITOR is not set
 CONFIG_PCI=y
 CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_S390=y
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_WRITECACHE=m
+CONFIG_DM_CLONE=m
 CONFIG_DM_MIRROR=m
 CONFIG_DM_LOG_USERSPACE=m
 CONFIG_DM_RAID=m
 CONFIG_DM_UEVENT=y
 CONFIG_DM_FLAKEY=m
 CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_SWITCH=m
 CONFIG_DM_INTEGRITY=m
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
 # CONFIG_NET_VENDOR_PACKET_ENGINES is not set
+# CONFIG_NET_VENDOR_PENSANDO is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_RDC is not set
 CONFIG_WATCHDOG_NOWAYOUT=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_DIAG288_WATCHDOG=m
-CONFIG_DRM=y
+CONFIG_FB=y
-CONFIG_DRM_VIRTIO_GPU=y
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_INFINIBAND=m
 CONFIG_INFINIBAND_USER_ACCESS=m
 CONFIG_MLX4_INFINIBAND=m
 CONFIG_MLX5_INFINIBAND=m
+CONFIG_SYNC_FILE=y
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_MDEV=m
 CONFIG_FS_DAX=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 CONFIG_AUTOFS4_FS=m
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
 CONFIG_OVERLAY_FS=m
 CONFIG_FSCACHE=m
 CONFIG_CACHEFILES=m
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_LOCKDOWN_LSM=y
+CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
 CONFIG_INTEGRITY_SIGNATURE=y
 CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
 CONFIG_IMA=y
 CONFIG_IMA_DEFAULT_HASH_SHA256=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA_APPRAISE=y
+CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 CONFIG_CRYPTO_FIPS=y
 CONFIG_CRYPTO_USER=m
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
 CONFIG_CRYPTO_ECRDSA=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_AEGIS128=m
-CONFIG_CRYPTO_AEGIS128L=m
-CONFIG_CRYPTO_AEGIS256=m
-CONFIG_CRYPTO_MORUS640=m
-CONFIG_CRYPTO_MORUS1280=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_OFB=m
 CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_GDB_SCRIPTS=y
 CONFIG_FRAME_WARN=1024
-CONFIG_UNUSED_SYMBOLS=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_MEMORY_INIT=y

arch/s390/configs/zfcpdump_defconfig+1−1

@@ -61,7 +61,7 @@ CONFIG_RAW_DRIVER=y · 60 unmodified lines
61	CONFIG_CONFIGFS_FS=y	61	CONFIG_CONFIGFS_FS=y
62	# CONFIG_MISC_FILESYSTEMS is not set	62	# CONFIG_MISC_FILESYSTEMS is not set
63	# CONFIG_NETWORK_FILESYSTEMS is not set	63	# CONFIG_NETWORK_FILESYSTEMS is not set
64	# CONFIG_DIMLIB is not set	64	CONFIG_LSM="yama,loadpin,safesetid,integrity"
65	CONFIG_PRINTK_TIME=y	65	CONFIG_PRINTK_TIME=y
66	CONFIG_DEBUG_INFO=y	66	CONFIG_DEBUG_INFO=y
67	CONFIG_DEBUG_FS=y	67	CONFIG_DEBUG_FS=y

arch/s390/include/asm/atomic_ops.h+1−1

@@ -41,7 +41,7 @@ __ATOMIC_OPS(__atomic64_xor, long, "laxg") · 40 unmodified lines
41	#undef __ATOMIC_OP	41	#undef __ATOMIC_OP
42		42
43	#define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier) \	43	#define __ATOMIC_CONST_OP(op_name, op_type, op_string, op_barrier) \
44	static inline void op_name(op_type val, op_type *ptr) \	44	static __always_inline void op_name(op_type val, op_type *ptr) \
45	{ \	45	{ \
46	asm volatile( \	46	asm volatile( \
47	op_string " %[ptr],%[val]\n" \	47	op_string " %[ptr],%[val]\n" \

arch/s390/include/asm/bitops.h+4−4

@@ -56,7 +56,7 @@ __bitops_byte(unsigned long nr, volatile unsigned long *ptr) · 55 unmodified lines
56	return ((unsigned char *)ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);	56	return ((unsigned char *)ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
57	}	57	}
58		58
59	static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)	59	static __always_inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr)
60	{	60	{
61	unsigned long *addr = __bitops_word(nr, ptr);	61	unsigned long *addr = __bitops_word(nr, ptr);
62	unsigned long mask;	62	unsigned long mask;
@@ -77,7 +77,7 @@ static inline void arch_set_bit(unsigned long nr, volatile unsigned long *ptr) · 14 unmodified lines
77	__atomic64_or(mask, (long *)addr);	77	__atomic64_or(mask, (long *)addr);
78	}	78	}
79		79
80	static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)	80	static __always_inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr)
81	{	81	{
82	unsigned long *addr = __bitops_word(nr, ptr);	82	unsigned long *addr = __bitops_word(nr, ptr);
83	unsigned long mask;	83	unsigned long mask;
@@ -98,8 +98,8 @@ static inline void arch_clear_bit(unsigned long nr, volatile unsigned long *ptr) · 14 unmodified lines
98	__atomic64_and(mask, (long *)addr);	98	__atomic64_and(mask, (long *)addr);
99	}	99	}
100		100
101	static inline void arch_change_bit(unsigned long nr,	101	static __always_inline void arch_change_bit(unsigned long nr,
102	volatile unsigned long *ptr)	102	volatile unsigned long *ptr)
103	{	103	{
104	unsigned long *addr = __bitops_word(nr, ptr);	104	unsigned long *addr = __bitops_word(nr, ptr);
105	unsigned long mask;	105	unsigned long mask;

arch/s390/include/asm/cpacf.h+1−1

@@ -171,7 +171,7 @@ typedef struct { unsigned char bytes[16]; } cpacf_mask_t; · 170 unmodified lines
171	*	171	*
172	* Returns 1 if @func is available for @opcode, 0 otherwise	172	* Returns 1 if @func is available for @opcode, 0 otherwise
173	*/	173	*/
174	static inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)	174	static __always_inline void __cpacf_query(unsigned int opcode, cpacf_mask_t *mask)
175	{	175	{
176	register unsigned long r0 asm("0") = 0; /* query function */	176	register unsigned long r0 asm("0") = 0; /* query function */
177	register unsigned long r1 asm("1") = (unsigned long) mask;	177	register unsigned long r1 asm("1") = (unsigned long) mask;

arch/s390/include/asm/cpu_mf.h+6−2

@@ -28,6 +28,8 @@ asm(".include \"asm/cpu_mf-insn.h\"\n"); · 27 unmodified lines
28	CPU_MF_INT_SF_PRA\|CPU_MF_INT_SF_SACA\| \	28	CPU_MF_INT_SF_PRA\|CPU_MF_INT_SF_SACA\| \
29	CPU_MF_INT_SF_LSDA)	29	CPU_MF_INT_SF_LSDA)
30		30
		31	#define CPU_MF_SF_RIBM_NOTAV 0x1 /* Sampling unavailable */
		32
31	/* CPU measurement facility support */	33	/* CPU measurement facility support */
32	static inline int cpum_cf_avail(void)	34	static inline int cpum_cf_avail(void)
33	{	35	{
@@ -69,7 +71,8 @@ struct hws_qsi_info_block { /* Bit(s) */ · 35 unmodified lines
69	unsigned long max_sampl_rate; /* 16-23: maximum sampling interval*/	71	unsigned long max_sampl_rate; /* 16-23: maximum sampling interval*/
70	unsigned long tear; /* 24-31: TEAR contents */	72	unsigned long tear; /* 24-31: TEAR contents */
71	unsigned long dear; /* 32-39: DEAR contents */	73	unsigned long dear; /* 32-39: DEAR contents */
72	unsigned int rsvrd0; /* 40-43: reserved */	74	unsigned int rsvrd0:24; /* 40-42: reserved */
		75	unsigned int ribm:8; /* 43: Reserved by IBM */
73	unsigned int cpu_speed; /* 44-47: CPU speed */	76	unsigned int cpu_speed; /* 44-47: CPU speed */
74	unsigned long long rsvrd1; /* 48-55: reserved */	77	unsigned long long rsvrd1; /* 48-55: reserved */
75	unsigned long long rsvrd2; /* 56-63: reserved */	78	unsigned long long rsvrd2; /* 56-63: reserved */
@@ -220,7 +223,8 @@ enum stcctm_ctr_set { · 144 unmodified lines
220	MT_DIAG = 5,	223	MT_DIAG = 5,
221	MT_DIAG_CLEARING = 9, /* clears loss-of-MT-ctr-data alert */	224	MT_DIAG_CLEARING = 9, /* clears loss-of-MT-ctr-data alert */
222	};	225	};
223	static inline int stcctm(enum stcctm_ctr_set set, u64 range, u64 *dest)	226
		227	static __always_inline int stcctm(enum stcctm_ctr_set set, u64 range, u64 *dest)
224	{	228	{
225	int cc;	229	int cc;
226		230

arch/s390/include/asm/hugetlb.h+7−2

 #include <asm/page.h>
 #include <asm/pgtable.h>
-#define is_hugepage_only_range(mm, addr, len)	0
 #define hugetlb_free_pgd_range			free_pgd_range
 #define hugepages_supported()			(MACHINE_HAS_EDAT1)
 pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
 			      unsigned long addr, pte_t *ptep);
+static inline bool is_hugepage_only_range(struct mm_struct *mm,
+					  unsigned long addr,
+					  unsigned long len)
+{
+	return false;
+}
 /*
  * If the arch doesn't supply something else, assume that hugepage
  * size aligned regions are ok without further preparation.

arch/s390/include/asm/jump_label.h+2−2

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	* We use a brcl 0,2 instruction for jump labels at compile time so it	20	* We use a brcl 0,2 instruction for jump labels at compile time so it
21	* can be easily distinguished from a hotpatch generated instruction.	21	* can be easily distinguished from a hotpatch generated instruction.
22	*/	22	*/
23	static inline bool arch_static_branch(struct static_key *key, bool branch)	23	static __always_inline bool arch_static_branch(struct static_key *key, bool branch)
24	{	24	{
25	asm_volatile_goto("0: brcl 0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"	25	asm_volatile_goto("0: brcl 0,"__stringify(JUMP_LABEL_NOP_OFFSET)"\n"
26	".pushsection __jump_table,\"aw\"\n"	26	".pushsection __jump_table,\"aw\"\n"
@@ -34,7 +34,7 @@ label: · 7 unmodified lines
34	return true;	34	return true;
35	}	35	}
36		36
37	static inline bool arch_static_branch_jump(struct static_key *key, bool branch)	37	static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)
38	{	38	{
39	asm_volatile_goto("0: brcl 15,%l[label]\n"	39	asm_volatile_goto("0: brcl 15,%l[label]\n"
40	".pushsection __jump_table,\"aw\"\n"	40	".pushsection __jump_table,\"aw\"\n"

arch/s390/include/asm/pgtable.h+13−12

@@ -997,9 +997,9 @@ static inline pte_t pte_mkhuge(pte_t pte) · 996 unmodified lines
997	#define IPTE_NODAT 0x400	997	#define IPTE_NODAT 0x400
998	#define IPTE_GUEST_ASCE 0x800	998	#define IPTE_GUEST_ASCE 0x800
999		999
1000	static inline void __ptep_ipte(unsigned long address, pte_t *ptep,	1000	static __always_inline void __ptep_ipte(unsigned long address, pte_t *ptep,
1001	unsigned long opt, unsigned long asce,	1001	unsigned long opt, unsigned long asce,
1002	int local)	1002	int local)
1003	{	1003	{
1004	unsigned long pto = (unsigned long) ptep;	1004	unsigned long pto = (unsigned long) ptep;
1005		1005
@@ -1020,8 +1020,8 @@ static inline void __ptep_ipte(unsigned long address, pte_t *ptep, · 14 unmodified lines
1020	: [r1] "a" (pto), [m4] "i" (local) : "memory");	1020	: [r1] "a" (pto), [m4] "i" (local) : "memory");
1021	}	1021	}
1022		1022
1023	static inline void __ptep_ipte_range(unsigned long address, int nr,	1023	static __always_inline void __ptep_ipte_range(unsigned long address, int nr,
1024	pte_t *ptep, int local)	1024	pte_t *ptep, int local)
1025	{	1025	{
1026	unsigned long pto = (unsigned long) ptep;	1026	unsigned long pto = (unsigned long) ptep;
1027		1027
@@ -1269,7 +1269,8 @@ static inline pte_t pte_offset(pmd_t pmd, unsigned long address) · 241 unmodified lines
1269		1269
1270	#define pte_offset_kernel(pmd, address) pte_offset(pmd, address)	1270	#define pte_offset_kernel(pmd, address) pte_offset(pmd, address)
1271	#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)	1271	#define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
1272	#define pte_unmap(pte) do { } while (0)	1272
		1273	static inline void pte_unmap(pte_t *pte) { }
1273		1274
1274	static inline bool gup_fast_permitted(unsigned long start, unsigned long end)	1275	static inline bool gup_fast_permitted(unsigned long start, unsigned long end)
1275	{	1276	{
@@ -1435,9 +1436,9 @@ static inline void __pmdp_csp(pmd_t *pmdp) · 159 unmodified lines
1435	#define IDTE_NODAT 0x1000	1436	#define IDTE_NODAT 0x1000
1436	#define IDTE_GUEST_ASCE 0x2000	1437	#define IDTE_GUEST_ASCE 0x2000
1437		1438
1438	static inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,	1439	static __always_inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp,
1439	unsigned long opt, unsigned long asce,	1440	unsigned long opt, unsigned long asce,
1440	int local)	1441	int local)
1441	{	1442	{
1442	unsigned long sto;	1443	unsigned long sto;
1443		1444
@@ -1461,9 +1462,9 @@ static inline void __pmdp_idte(unsigned long addr, pmd_t *pmdp, · 17 unmodified lines
1461	}	1462	}
1462	}	1463	}
1463		1464
1464	static inline void __pudp_idte(unsigned long addr, pud_t *pudp,	1465	static __always_inline void __pudp_idte(unsigned long addr, pud_t *pudp,
1465	unsigned long opt, unsigned long asce,	1466	unsigned long opt, unsigned long asce,
1466	int local)	1467	int local)
1467	{	1468	{
1468	unsigned long r3o;	1469	unsigned long r3o;
1469		1470

arch/s390/include/asm/qdio.h+1−1

@@ -111,7 +111,7 @@ struct qib { · 110 unmodified lines
111	/* private: */	111	/* private: */
112	u8 res[88];	112	u8 res[88];
113	/* public: */	113	/* public: */
114	u8 parm[QDIO_MAX_BUFFERS_PER_Q];	114	u8 parm[128];
115	} __attribute__ ((packed, aligned(256)));	115	} __attribute__ ((packed, aligned(256)));
116		116
117	/**	117	/**

arch/s390/include/asm/uaccess.h+2−2

@@ -83,7 +83,7 @@ raw_copy_to_user(void __user to, const void from, unsigned long n); · 82 unmodified lines
83	__rc; \	83	__rc; \
84	})	84	})
85		85
86	static inline int __put_user_fn(void x, void __user ptr, unsigned long size)	86	static __always_inline int __put_user_fn(void x, void __user ptr, unsigned long size)
87	{	87	{
88	unsigned long spec = 0x010000UL;	88	unsigned long spec = 0x010000UL;
89	int rc;	89	int rc;
@@ -113,7 +113,7 @@ static inline int __put_user_fn(void x, void __user ptr, unsigned long size) · 23 unmodified lines
113	return rc;	113	return rc;
114	}	114	}
115		115
116	static inline int __get_user_fn(void x, const void __user ptr, unsigned long size)	116	static __always_inline int __get_user_fn(void x, const void __user ptr, unsigned long size)
117	{	117	{
118	unsigned long spec = 0x01UL;	118	unsigned long spec = 0x01UL;
119	int rc;	119	int rc;

arch/s390/kernel/perf_cpum_cf_diag.c+2−2

@@ -390,7 +390,7 @@ static size_t cf_diag_getctrset(struct cf_ctrset_entry *ctrdata, int ctrset, · 389 unmodified lines
390		390
391	debug_sprintf_event(cf_diag_dbg, 6,	391	debug_sprintf_event(cf_diag_dbg, 6,
392	"%s ctrset %d ctrset_size %zu cfvn %d csvn %d"	392	"%s ctrset %d ctrset_size %zu cfvn %d csvn %d"
393	" need %zd rc:%d\n",	393	" need %zd rc %d\n",
394	__func__, ctrset, ctrset_size, cpuhw->info.cfvn,	394	__func__, ctrset, ctrset_size, cpuhw->info.cfvn,
395	cpuhw->info.csvn, need, rc);	395	cpuhw->info.csvn, need, rc);
396	return need;	396	return need;
@@ -567,7 +567,7 @@ static int cf_diag_add(struct perf_event *event, int flags) · 170 unmodified lines
567	int err = 0;	567	int err = 0;
568		568
569	debug_sprintf_event(cf_diag_dbg, 5,	569	debug_sprintf_event(cf_diag_dbg, 5,
570	"%s event %p cpu %d flags %#x cpuhw:%p\n",	570	"%s event %p cpu %d flags %#x cpuhw %p\n",
571	__func__, event, event->cpu, flags, cpuhw);	571	__func__, event, event->cpu, flags, cpuhw);
572		572
573	if (cpuhw->flags & PMU_F_IN_USE) {	573	if (cpuhw->flags & PMU_F_IN_USE) {

arch/s390/kernel/perf_cpum_sf.c+7−1

 		goto out;
 	}
+	if (si.ribm & CPU_MF_SF_RIBM_NOTAV) {
+		pr_warn("CPU Measurement Facility sampling is temporarily not available\n");
+		err = -EBUSY;
+		goto out;
+	}
 	/* Always enable basic sampling */
 	SAMPL_FLAGS(hwc) = PERF_CPUM_SF_BASIC_MODE;
 	/* Check online status of the CPU to which the event is pinned */
 	if (event->cpu >= 0 && !cpu_online(event->cpu))
-			return -ENODEV;
+		return -ENODEV;
 	/* Force reset of idle/hv excludes regardless of what the
 	 * user requested.

arch/s390/kvm/kvm-s390.c+3−3

@@ -332,7 +332,7 @@ static inline int plo_test_bit(unsigned char nr) · 331 unmodified lines
332	return cc == 0;	332	return cc == 0;
333	}	333	}
334		334
335	static inline void __insn32_query(unsigned int opcode, u8 query[32])	335	static __always_inline void __insn32_query(unsigned int opcode, u8 *query)
336	{	336	{
337	register unsigned long r0 asm("0") = 0; /* query function */	337	register unsigned long r0 asm("0") = 0; /* query function */
338	register unsigned long r1 asm("1") = (unsigned long) query;	338	register unsigned long r1 asm("1") = (unsigned long) query;
@@ -340,9 +340,9 @@ static inline void __insn32_query(unsigned int opcode, u8 query[32]) · 1 unmodified line
340	asm volatile(	340	asm volatile(
341	/* Parameter regs are ignored */	341	/* Parameter regs are ignored */
342	" .insn rrf,%[opc] << 16,2,4,6,0\n"	342	" .insn rrf,%[opc] << 16,2,4,6,0\n"
343	: "=m" (*query)	343	:
344	: "d" (r0), "a" (r1), [opc] "i" (opcode)	344	: "d" (r0), "a" (r1), [opc] "i" (opcode)
345	: "cc");	345	: "cc", "memory");
346	}	346	}
347		347
348	#define INSN_SORTL 0xb938	348	#define INSN_SORTL 0xb938

arch/s390/pci/pci_clp.c+1−1

@@ -66,7 +66,7 @@ static inline int clp_get_ilp(unsigned long *ilp) · 65 unmodified lines
66	/*	66	/*
67	* Call Logical Processor with c=0, the give constant lps and an lpcb request.	67	* Call Logical Processor with c=0, the give constant lps and an lpcb request.
68	*/	68	*/
69	static inline int clp_req(void *data, unsigned int lps)	69	static __always_inline int clp_req(void *data, unsigned int lps)
70	{	70	{
71	struct { u8 _[CLP_BLK_SIZE]; } *req = data;	71	struct { u8 _[CLP_BLK_SIZE]; } *req = data;
72	u64 ignored;	72	u64 ignored;

arch/x86/events/amd/core.c+17−13

 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <asm/apicdef.h>
 #include <asm/nmi.h>
 #include "../perf_event.h"
-static DEFINE_PER_CPU(unsigned int, perf_nmi_counter);
+static DEFINE_PER_CPU(unsigned long, perf_nmi_tstamp);
+static unsigned long perf_nmi_window;
 static __initconst const u64 amd_hw_cache_event_ids
 				[PERF_COUNT_HW_CACHE_MAX]
  * handler when multiple PMCs are active or PMC overflow while handling some
  * other source of an NMI.
  *
- * Attempt to mitigate this by using the number of active PMCs to determine
+ * Attempt to mitigate this by creating an NMI window in which un-handled NMIs
- * whether to return NMI_HANDLED if the perf NMI handler did not handle/reset
+ * received during this window will be claimed. This prevents extending the
- * any PMCs. The per-CPU perf_nmi_counter variable is set to a minimum of the
+ * window past when it is possible that latent NMIs should be received. The
- * number of active PMCs or 2. The value of 2 is used in case an NMI does not
+ * per-CPU perf_nmi_tstamp will be set to the window end time whenever perf has
- * arrive at the LAPIC in time to be collapsed into an already pending NMI.
+ * handled a counter. When an un-handled NMI is received, it will be claimed
+ * only if arriving within that window.
  */
 static int amd_pmu_handle_irq(struct pt_regs *regs)
 {
 	handled = x86_pmu_handle_irq(regs);
 	/*
-	 * If a counter was handled, record the number of possible remaining
+	 * If a counter was handled, record a timestamp such that un-handled
-	 * NMIs that can occur.
+	 * NMIs will be claimed if arriving within that window.
 	 */
 	if (handled) {
-		this_cpu_write(perf_nmi_counter,
+		this_cpu_write(perf_nmi_tstamp,
-			       min_t(unsigned int, 2, active));
+			       jiffies + perf_nmi_window);
 		return handled;
 	}
-	if (!this_cpu_read(perf_nmi_counter))
+	if (time_after(jiffies, this_cpu_read(perf_nmi_tstamp)))
 		return NMI_DONE;
-	this_cpu_dec(perf_nmi_counter);
 	return NMI_HANDLED;
 }
 	if (!boot_cpu_has(X86_FEATURE_PERFCTR_CORE))
 		return 0;
+	/* Avoid calulating the value each time in the NMI handler */
+	perf_nmi_window = msecs_to_jiffies(100);
 	switch (boot_cpu_data.x86) {
 	case 0x15:
 		pr_cont("Fam15h ");

arch/x86/events/intel/core.c+4−0

 	case INTEL_FAM6_SKYLAKE:
 	case INTEL_FAM6_KABYLAKE_L:
 	case INTEL_FAM6_KABYLAKE:
+	case INTEL_FAM6_COMETLAKE_L:
+	case INTEL_FAM6_COMETLAKE:
 		x86_add_quirk(intel_pebs_isolation_quirk);
 		x86_pmu.late_ack = true;
 		memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));
 		/* fall through */
 	case INTEL_FAM6_ICELAKE_L:
 	case INTEL_FAM6_ICELAKE:
+	case INTEL_FAM6_TIGERLAKE_L:
+	case INTEL_FAM6_TIGERLAKE:
 		x86_pmu.late_ack = true;
 		memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));
 		memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));

arch/x86/events/intel/cstate.c+32−12

  *	MSR_CORE_C3_RESIDENCY: CORE C3 Residency Counter
  *			       perf code: 0x01
  *			       Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,GLM,
-						CNL
+ *						CNL,KBL,CML
  *			       Scope: Core
  *	MSR_CORE_C6_RESIDENCY: CORE C6 Residency Counter
  *			       perf code: 0x02
  *			       Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW,
- *						SKL,KNL,GLM,CNL
+ *						SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL
  *			       Scope: Core
  *	MSR_CORE_C7_RESIDENCY: CORE C7 Residency Counter
  *			       perf code: 0x03
- *			       Available model: SNB,IVB,HSW,BDW,SKL,CNL
+ *			       Available model: SNB,IVB,HSW,BDW,SKL,CNL,KBL,CML,
+ *						ICL,TGL
  *			       Scope: Core
  *	MSR_PKG_C2_RESIDENCY:  Package C2 Residency Counter.
  *			       perf code: 0x00
- *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL
+ *			       Available model: SNB,IVB,HSW,BDW,SKL,KNL,GLM,CNL,
+ *						KBL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *	MSR_PKG_C3_RESIDENCY:  Package C3 Residency Counter.
  *			       perf code: 0x01
  *			       Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,KNL,
- *						GLM,CNL
+ *						GLM,CNL,KBL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *	MSR_PKG_C6_RESIDENCY:  Package C6 Residency Counter.
  *			       perf code: 0x02
  *			       Available model: SLM,AMT,NHM,WSM,SNB,IVB,HSW,BDW
- *						SKL,KNL,GLM,CNL
+ *						SKL,KNL,GLM,CNL,KBL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *	MSR_PKG_C7_RESIDENCY:  Package C7 Residency Counter.
  *			       perf code: 0x03
- *			       Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL
+ *			       Available model: NHM,WSM,SNB,IVB,HSW,BDW,SKL,CNL,
+ *						KBL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *	MSR_PKG_C8_RESIDENCY:  Package C8 Residency Counter.
  *			       perf code: 0x04
- *			       Available model: HSW ULT,KBL,CNL
+ *			       Available model: HSW ULT,KBL,CNL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *	MSR_PKG_C9_RESIDENCY:  Package C9 Residency Counter.
  *			       perf code: 0x05
- *			       Available model: HSW ULT,KBL,CNL
+ *			       Available model: HSW ULT,KBL,CNL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *	MSR_PKG_C10_RESIDENCY: Package C10 Residency Counter.
  *			       perf code: 0x06
- *			       Available model: HSW ULT,KBL,GLM,CNL
+ *			       Available model: HSW ULT,KBL,GLM,CNL,CML,ICL,TGL
  *			       Scope: Package (physical package)
  *
  */
 				  BIT(PERF_CSTATE_PKG_C10_RES),
 };
+static const struct cstate_model icl_cstates __initconst = {
+	.core_events		= BIT(PERF_CSTATE_CORE_C6_RES) |
+				  BIT(PERF_CSTATE_CORE_C7_RES),
+	.pkg_events		= BIT(PERF_CSTATE_PKG_C2_RES) |
+				  BIT(PERF_CSTATE_PKG_C3_RES) |
+				  BIT(PERF_CSTATE_PKG_C6_RES) |
+				  BIT(PERF_CSTATE_PKG_C7_RES) |
+				  BIT(PERF_CSTATE_PKG_C8_RES) |
+				  BIT(PERF_CSTATE_PKG_C9_RES) |
+				  BIT(PERF_CSTATE_PKG_C10_RES),
+};
 static const struct cstate_model slm_cstates __initconst = {
 	.core_events		= BIT(PERF_CSTATE_CORE_C1_RES) |
 				  BIT(PERF_CSTATE_CORE_C6_RES),
 	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_L, hswult_cstates),
 	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE,   hswult_cstates),
+	X86_CSTATES_MODEL(INTEL_FAM6_COMETLAKE_L, hswult_cstates),
+	X86_CSTATES_MODEL(INTEL_FAM6_COMETLAKE, hswult_cstates),
 	X86_CSTATES_MODEL(INTEL_FAM6_CANNONLAKE_L, cnl_cstates),
 	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT_PLUS, glm_cstates),
-	X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, snb_cstates),
+	X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE_L, icl_cstates),
-	X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE,   snb_cstates),
+	X86_CSTATES_MODEL(INTEL_FAM6_ICELAKE,   icl_cstates),
+	X86_CSTATES_MODEL(INTEL_FAM6_TIGERLAKE_L, icl_cstates),
+	X86_CSTATES_MODEL(INTEL_FAM6_TIGERLAKE, icl_cstates),
 	{ },
 };
 MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

arch/x86/events/msr.c+7−0

 	case INTEL_FAM6_SKYLAKE_X:
 	case INTEL_FAM6_KABYLAKE_L:
 	case INTEL_FAM6_KABYLAKE:
+	case INTEL_FAM6_COMETLAKE_L:
+	case INTEL_FAM6_COMETLAKE:
 	case INTEL_FAM6_ICELAKE_L:
+	case INTEL_FAM6_ICELAKE:
+	case INTEL_FAM6_ICELAKE_X:
+	case INTEL_FAM6_ICELAKE_D:
+	case INTEL_FAM6_TIGERLAKE_L:
+	case INTEL_FAM6_TIGERLAKE:
 		if (idx == PERF_MSR_SMI || idx == PERF_MSR_PPERF)
 			return true;
 		break;

arch/x86/include/asm/cpu_entry_area.h+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	/* SPDX-License-Identifier: GPL-2.0 */
2		2
3	#ifndef _ASM_X86_CPU_ENTRY_AREA_H	3	#ifndef _ASM_X86_CPU_ENTRY_AREA_H
4	#define _ASM_X86_CPU_ENTRY_AREA_H	4	#define _ASM_X86_CPU_ENTRY_AREA_H

arch/x86/include/asm/intel-family.h+3−0

@@ -83,6 +83,9 @@ · 82 unmodified lines
83	#define INTEL_FAM6_TIGERLAKE_L 0x8C	83	#define INTEL_FAM6_TIGERLAKE_L 0x8C
84	#define INTEL_FAM6_TIGERLAKE 0x8D	84	#define INTEL_FAM6_TIGERLAKE 0x8D
85		85
		86	#define INTEL_FAM6_COMETLAKE 0xA5
		87	#define INTEL_FAM6_COMETLAKE_L 0xA6
		88
86	/* "Small Core" Processors (Atom) */	89	/* "Small Core" Processors (Atom) */
87		90
88	#define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */	91	#define INTEL_FAM6_ATOM_BONNELL 0x1C /* Diamondville, Pineview */

arch/x86/include/asm/kvm_host.h+0−7

@@ -219,13 +219,6 @@ enum { · 218 unmodified lines
219	PFERR_WRITE_MASK \| \	219	PFERR_WRITE_MASK \| \
220	PFERR_PRESENT_MASK)	220	PFERR_PRESENT_MASK)
221		221
222	/*
223	* The mask used to denote special SPTEs, which can be either MMIO SPTEs or
224	* Access Tracking SPTEs. We use bit 62 instead of bit 63 to avoid conflicting
225	* with the SVE bit in EPT PTEs.
226	*/
227	#define SPTE_SPECIAL_MASK (1ULL << 62)
228
229	/* apic attention bits */	222	/* apic attention bits */
230	#define KVM_APIC_CHECK_VAPIC 0	223	#define KVM_APIC_CHECK_VAPIC 0
231	/*	224	/*

arch/x86/include/asm/mwait.h+1−1

@@ -21,7 +21,7 @@ · 20 unmodified lines
21	#define MWAIT_ECX_INTERRUPT_BREAK 0x1	21	#define MWAIT_ECX_INTERRUPT_BREAK 0x1
22	#define MWAITX_ECX_TIMER_ENABLE BIT(1)	22	#define MWAITX_ECX_TIMER_ENABLE BIT(1)
23	#define MWAITX_MAX_LOOPS ((u32)-1)	23	#define MWAITX_MAX_LOOPS ((u32)-1)
24	#define MWAITX_DISABLE_CSTATES 0xf	24	#define MWAITX_DISABLE_CSTATES 0xf0
25		25
26	static inline void __monitor(const void *eax, unsigned long ecx,	26	static inline void __monitor(const void *eax, unsigned long ecx,
27	unsigned long edx)	27	unsigned long edx)

arch/x86/include/asm/pti.h+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	/* SPDX-License-Identifier: GPL-2.0 */
2	#ifndef _ASM_X86_PTI_H	2	#ifndef _ASM_X86_PTI_H
3	#define _ASM_X86_PTI_H	3	#define _ASM_X86_PTI_H
4	#ifndef __ASSEMBLY__	4	#ifndef __ASSEMBLY__

arch/x86/include/asm/uaccess.h+23−0

@@ -734,5 +734,28 @@ do { \ · 733 unmodified lines
734	if (unlikely(__gu_err)) goto err_label; \	734	if (unlikely(__gu_err)) goto err_label; \
735	} while (0)	735	} while (0)
736		736
		737	/*
		738	* We want the unsafe accessors to always be inlined and use
		739	* the error labels - thus the macro games.
		740	*/
		741	#define unsafe_copy_loop(dst, src, len, type, label) \
		742	while (len >= sizeof(type)) { \
		743	unsafe_put_user((type )src,(type __user *)dst,label); \
		744	dst += sizeof(type); \
		745	src += sizeof(type); \
		746	len -= sizeof(type); \
		747	}
		748
		749	#define unsafe_copy_to_user(_dst,_src,_len,label) \
		750	do { \
		751	char __user *__ucu_dst = (_dst); \
		752	const char *__ucu_src = (_src); \
		753	size_t __ucu_len = (_len); \
		754	unsafe_copy_loop(__ucu_dst, __ucu_src, __ucu_len, u64, label); \
		755	unsafe_copy_loop(__ucu_dst, __ucu_src, __ucu_len, u32, label); \
		756	unsafe_copy_loop(__ucu_dst, __ucu_src, __ucu_len, u16, label); \
		757	unsafe_copy_loop(__ucu_dst, __ucu_src, __ucu_len, u8, label); \
		758	} while (0)
		759
737	#endif /* _ASM_X86_UACCESS_H */	760	#endif /* _ASM_X86_UACCESS_H */
738		761

arch/x86/kernel/cpu/vmware.c+1−1

@@ -49,7 +49,7 @@ · 48 unmodified lines
49	#define VMWARE_CMD_VCPU_RESERVED 31	49	#define VMWARE_CMD_VCPU_RESERVED 31
50		50
51	#define VMWARE_PORT(cmd, eax, ebx, ecx, edx) \	51	#define VMWARE_PORT(cmd, eax, ebx, ecx, edx) \
52	__asm__("inl (%%dx)" : \	52	__asm__("inl (%%dx), %%eax" : \
53	"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \	53	"=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \
54	"a"(VMWARE_HYPERVISOR_MAGIC), \	54	"a"(VMWARE_HYPERVISOR_MAGIC), \
55	"c"(VMWARE_CMD_##cmd), \	55	"c"(VMWARE_CMD_##cmd), \

arch/x86/kernel/process.h+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	/* SPDX-License-Identifier: GPL-2.0 */
2	//	2	//
3	// Code shared between 32 and 64 bit	3	// Code shared between 32 and 64 bit
4		4

arch/x86/kvm/cpuid.c+60−42

@@ -485,6 +485,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, · 484 unmodified lines
485		485
486	/* cpuid 0x80000008.ebx */	486	/* cpuid 0x80000008.ebx */
487	const u32 kvm_cpuid_8000_0008_ebx_x86_features =	487	const u32 kvm_cpuid_8000_0008_ebx_x86_features =
		488	F(CLZERO) \| F(XSAVEERPTR) \|
488	F(WBNOINVD) \| F(AMD_IBPB) \| F(AMD_IBRS) \| F(AMD_SSBD) \| F(VIRT_SSBD) \|	489	F(WBNOINVD) \| F(AMD_IBPB) \| F(AMD_IBRS) \| F(AMD_SSBD) \| F(VIRT_SSBD) \|
489	F(AMD_SSB_NO) \| F(AMD_STIBP) \| F(AMD_STIBP_ALWAYS_ON);	490	F(AMD_SSB_NO) \| F(AMD_STIBP) \| F(AMD_STIBP_ALWAYS_ON);
490		491
@@ -618,16 +619,20 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, · 127 unmodified lines
618	*/	619	*/
619	case 0x1f:	620	case 0x1f:
620	case 0xb: {	621	case 0xb: {
621	int i, level_type;	622	int i;
622		623
623	/* read more entries until level_type is zero */	624	/*
624	for (i = 1; ; ++i) {	625	* We filled in entry[0] for CPUID(EAX=<function>,
		626	* ECX=00H) above. If its level type (ECX[15:8]) is
		627	* zero, then the leaf is unimplemented, and we're
		628	* done. Otherwise, continue to populate entries
		629	* until the level type (ECX[15:8]) of the previously
		630	* added entry is zero.
		631	*/
		632	for (i = 1; entry[i - 1].ecx & 0xff00; ++i) {
625	if (*nent >= maxnent)	633	if (*nent >= maxnent)
626	goto out;	634	goto out;
627		635
628	level_type = entry[i - 1].ecx & 0xff00;
629	if (!level_type)
630	break;
631	do_host_cpuid(&entry[i], function, i);	636	do_host_cpuid(&entry[i], function, i);
632	++*nent;	637	++*nent;
633	}	638	}
@@ -969,53 +974,66 @@ struct kvm_cpuid_entry2 kvm_find_cpuid_entry(struct kvm_vcpu vcpu, · 335 unmodified lines
969	EXPORT_SYMBOL_GPL(kvm_find_cpuid_entry);	974	EXPORT_SYMBOL_GPL(kvm_find_cpuid_entry);
970		975
971	/*	976	/*
972	* If no match is found, check whether we exceed the vCPU's limit	977	* If the basic or extended CPUID leaf requested is higher than the
973	* and return the content of the highest valid _standard_ leaf instead.	978	* maximum supported basic or extended leaf, respectively, then it is
974	* This is to satisfy the CPUID specification.	979	* out of range.
975	*/	980	*/
976	static struct kvm_cpuid_entry2* check_cpuid_limit(struct kvm_vcpu *vcpu,	981	static bool cpuid_function_in_range(struct kvm_vcpu *vcpu, u32 function)
977	u32 function, u32 index)
978	{	982	{
979	struct kvm_cpuid_entry2 *maxlevel;	983	struct kvm_cpuid_entry2 *max;
980		984
981	maxlevel = kvm_find_cpuid_entry(vcpu, function & 0x80000000, 0);	985	max = kvm_find_cpuid_entry(vcpu, function & 0x80000000, 0);
982	if (!maxlevel \|\| maxlevel->eax >= function)	986	return max && function <= max->eax;
983	return NULL;
984	if (function & 0x80000000) {
985	maxlevel = kvm_find_cpuid_entry(vcpu, 0, 0);
986	if (!maxlevel)
987	return NULL;
988	}
989	return kvm_find_cpuid_entry(vcpu, maxlevel->eax, index);
990	}	987	}
991		988
992	bool kvm_cpuid(struct kvm_vcpu vcpu, u32 eax, u32 *ebx,	989	bool kvm_cpuid(struct kvm_vcpu vcpu, u32 eax, u32 *ebx,
993	u32 ecx, u32 edx, bool check_limit)	990	u32 ecx, u32 edx, bool check_limit)
994	{	991	{
995	u32 function = eax, index = ecx;	992	u32 function = eax, index = ecx;
996	struct kvm_cpuid_entry2 *best;	993	struct kvm_cpuid_entry2 *entry;
997	bool entry_found = true;	994	struct kvm_cpuid_entry2 *max;
998		995	bool found;
999	best = kvm_find_cpuid_entry(vcpu, function, index);
1000
1001	if (!best) {
1002	entry_found = false;
1003	if (!check_limit)
1004	goto out;
1005		996
1006	best = check_cpuid_limit(vcpu, function, index);	997	entry = kvm_find_cpuid_entry(vcpu, function, index);
		998	found = entry;
		999	/*
		1000	* Intel CPUID semantics treats any query for an out-of-range
		1001	* leaf as if the highest basic leaf (i.e. CPUID.0H:EAX) were
		1002	* requested. AMD CPUID semantics returns all zeroes for any
		1003	* undefined leaf, whether or not the leaf is in range.
		1004	*/
		1005	if (!entry && check_limit && !guest_cpuid_is_amd(vcpu) &&
		1006	!cpuid_function_in_range(vcpu, function)) {
		1007	max = kvm_find_cpuid_entry(vcpu, 0, 0);
		1008	if (max) {
		1009	function = max->eax;
		1010	entry = kvm_find_cpuid_entry(vcpu, function, index);
		1011	}
1007	}	1012	}
1008		1013	if (entry) {
1009	out:	1014	*eax = entry->eax;
1010	if (best) {	1015	*ebx = entry->ebx;
1011	*eax = best->eax;	1016	*ecx = entry->ecx;
1012	*ebx = best->ebx;	1017	*edx = entry->edx;
1013	*ecx = best->ecx;	1018	} else {
1014	*edx = best->edx;
1015	} else
1016	eax = ebx = ecx = edx = 0;	1019	eax = ebx = ecx = edx = 0;
1017	trace_kvm_cpuid(function, eax, ebx, ecx, edx, entry_found);	1020	/*
1018	return entry_found;	1021	* When leaf 0BH or 1FH is defined, CL is pass-through
		1022	* and EDX is always the x2APIC ID, even for undefined
		1023	* subleaves. Index 1 will exist iff the leaf is
		1024	* implemented, so we pass through CL iff leaf 1
		1025	* exists. EDX can be copied from any existing index.
		1026	*/
		1027	if (function == 0xb \|\| function == 0x1f) {
		1028	entry = kvm_find_cpuid_entry(vcpu, function, 1);
		1029	if (entry) {
		1030	*ecx = index & 0xff;
		1031	*edx = entry->edx;
		1032	}
		1033	}
		1034	}
		1035	trace_kvm_cpuid(function, eax, ebx, ecx, edx, found);
		1036	return found;
1019	}	1037	}
1020	EXPORT_SYMBOL_GPL(kvm_cpuid);	1038	EXPORT_SYMBOL_GPL(kvm_cpuid);
1021		1039

arch/x86/kvm/lapic.c+7−6

 #define X2APIC_BROADCAST		0xFFFFFFFFul
 static bool lapic_timer_advance_dynamic __read_mostly;
-#define LAPIC_TIMER_ADVANCE_ADJUST_MIN 100
+#define LAPIC_TIMER_ADVANCE_ADJUST_MIN	100	/* clock cycles */
-#define LAPIC_TIMER_ADVANCE_ADJUST_MAX 5000
+#define LAPIC_TIMER_ADVANCE_ADJUST_MAX	10000	/* clock cycles */
-#define LAPIC_TIMER_ADVANCE_ADJUST_INIT 1000
+#define LAPIC_TIMER_ADVANCE_NS_INIT	1000
+#define LAPIC_TIMER_ADVANCE_NS_MAX     5000
 /* step-by-step approximation to mitigate fluctuation */
 #define LAPIC_TIMER_ADVANCE_ADJUST_STEP 8
 		timer_advance_ns += ns/LAPIC_TIMER_ADVANCE_ADJUST_STEP;
 	}
-	if (unlikely(timer_advance_ns > LAPIC_TIMER_ADVANCE_ADJUST_MAX))
+	if (unlikely(timer_advance_ns > LAPIC_TIMER_ADVANCE_NS_MAX))
-		timer_advance_ns = LAPIC_TIMER_ADVANCE_ADJUST_INIT;
+		timer_advance_ns = LAPIC_TIMER_ADVANCE_NS_INIT;
 	apic->lapic_timer.timer_advance_ns = timer_advance_ns;
 }
 		     HRTIMER_MODE_ABS_HARD);
 	apic->lapic_timer.timer.function = apic_timer_fn;
 	if (timer_advance_ns == -1) {
-		apic->lapic_timer.timer_advance_ns = LAPIC_TIMER_ADVANCE_ADJUST_INIT;
+		apic->lapic_timer.timer_advance_ns = LAPIC_TIMER_ADVANCE_NS_INIT;
 		lapic_timer_advance_dynamic = true;
 	} else {
 		apic->lapic_timer.timer_advance_ns = timer_advance_ns;

arch/x86/kvm/mmu.c+49−16

 #define PTE_PREFETCH_NUM		8
 #define PT_FIRST_AVAIL_BITS_SHIFT 10
-#define PT64_SECOND_AVAIL_BITS_SHIFT 52
+#define PT64_SECOND_AVAIL_BITS_SHIFT 54
+/*
+ * The mask used to denote special SPTEs, which can be either MMIO SPTEs or
+ * Access Tracking SPTEs.
+ */
+#define SPTE_SPECIAL_MASK (3ULL << 52)
+#define SPTE_AD_ENABLED_MASK (0ULL << 52)
+#define SPTE_AD_DISABLED_MASK (1ULL << 52)
+#define SPTE_AD_WRPROT_ONLY_MASK (2ULL << 52)
+#define SPTE_MMIO_MASK (3ULL << 52)
 #define PT64_LEVEL_BITS 9
 static u64 __read_mostly shadow_me_mask;
 /*
- * SPTEs used by MMUs without A/D bits are marked with shadow_acc_track_value.
+ * SPTEs used by MMUs without A/D bits are marked with SPTE_AD_DISABLED_MASK;
- * Non-present SPTEs with shadow_acc_track_value set are in place for access
+ * shadow_acc_track_mask is the set of bits to be cleared in non-accessed
- * tracking.
+ * pages.
  */
 static u64 __read_mostly shadow_acc_track_mask;
-static const u64 shadow_acc_track_value = SPTE_SPECIAL_MASK;
 /*
  * The mask/shift to use for saving the original R/X bits when marking the PTE
 {
 	BUG_ON((u64)(unsigned)access_mask != access_mask);
 	BUG_ON((mmio_mask & mmio_value) != mmio_value);
-	shadow_mmio_value = mmio_value | SPTE_SPECIAL_MASK;
+	shadow_mmio_value = mmio_value | SPTE_MMIO_MASK;
 	shadow_mmio_mask = mmio_mask | SPTE_SPECIAL_MASK;
 	shadow_mmio_access_mask = access_mask;
 }
 	return sp->role.ad_disabled;
 }
+static inline bool kvm_vcpu_ad_need_write_protect(struct kvm_vcpu *vcpu)
+{
+	/*
+	 * When using the EPT page-modification log, the GPAs in the log
+	 * would come from L2 rather than L1.  Therefore, we need to rely
+	 * on write protection to record dirty pages.  This also bypasses
+	 * PML, since writes now result in a vmexit.
+	 */
+	return vcpu->arch.mmu == &vcpu->arch.guest_mmu;
+}
 static inline bool spte_ad_enabled(u64 spte)
 {
 	MMU_WARN_ON(is_mmio_spte(spte));
-	return !(spte & shadow_acc_track_value);
+	return (spte & SPTE_SPECIAL_MASK) != SPTE_AD_DISABLED_MASK;
+}
+static inline bool spte_ad_need_write_protect(u64 spte)
+{
+	MMU_WARN_ON(is_mmio_spte(spte));
+	return (spte & SPTE_SPECIAL_MASK) != SPTE_AD_ENABLED_MASK;
 }
 static inline u64 spte_shadow_accessed_mask(u64 spte)
 {
 	BUG_ON(!dirty_mask != !accessed_mask);
 	BUG_ON(!accessed_mask && !acc_track_mask);
-	BUG_ON(acc_track_mask & shadow_acc_track_value);
+	BUG_ON(acc_track_mask & SPTE_SPECIAL_MASK);
 	shadow_user_mask = user_mask;
 	shadow_accessed_mask = accessed_mask;
 	rmap_printk("rmap_clear_dirty: spte %p %llx\n", sptep, *sptep);
+	MMU_WARN_ON(!spte_ad_enabled(spte));
 	spte &= ~shadow_dirty_mask;
 	return mmu_spte_update(sptep, spte);
 }
-static bool wrprot_ad_disabled_spte(u64 *sptep)
+static bool spte_wrprot_for_clear_dirty(u64 *sptep)
 {
 	bool was_writable = test_and_clear_bit(PT_WRITABLE_SHIFT,
 					       (unsigned long *)sptep);
-	if (was_writable)
+	if (was_writable && !spte_ad_enabled(*sptep))
 		kvm_set_pfn_dirty(spte_to_pfn(*sptep));
 	return was_writable;
 	bool flush = false;
 	for_each_rmap_spte(rmap_head, &iter, sptep)
-		if (spte_ad_enabled(*sptep))
+		if (spte_ad_need_write_protect(*sptep))
-			flush |= spte_clear_dirty(sptep);
+			flush |= spte_wrprot_for_clear_dirty(sptep);
 		else
-			flush |= wrprot_ad_disabled_spte(sptep);
+			flush |= spte_clear_dirty(sptep);
 	return flush;
 }
 	rmap_printk("rmap_set_dirty: spte %p %llx\n", sptep, *sptep);
+	/*
+	 * Similar to the !kvm_x86_ops->slot_disable_log_dirty case,
+	 * do not bother adding back write access to pages marked
+	 * SPTE_AD_WRPROT_ONLY_MASK.
+	 */
 	spte |= shadow_dirty_mask;
 	return mmu_spte_update(sptep, spte);
 	       shadow_user_mask | shadow_x_mask | shadow_me_mask;
 	if (sp_ad_disabled(sp))
-		spte |= shadow_acc_track_value;
+		spte |= SPTE_AD_DISABLED_MASK;
 	else
 		spte |= shadow_accessed_mask;
 	sp = page_header(__pa(sptep));
 	if (sp_ad_disabled(sp))
-		spte |= shadow_acc_track_value;
+		spte |= SPTE_AD_DISABLED_MASK;
+	else if (kvm_vcpu_ad_need_write_protect(vcpu))
+		spte |= SPTE_AD_WRPROT_ONLY_MASK;
 	/*
 	 * For the EPT case, shadow_present_mask is 0 if hardware

arch/x86/kvm/vmx/nested.c+1−1

@@ -2610,7 +2610,7 @@ static int nested_check_vm_entry_controls(struct kvm_vcpu *vcpu, · 2609 unmodified lines
2610		2610
2611	/* VM-entry exception error code */	2611	/* VM-entry exception error code */
2612	if (CC(has_error_code &&	2612	if (CC(has_error_code &&
2613	vmcs12->vm_entry_exception_error_code & GENMASK(31, 15)))	2613	vmcs12->vm_entry_exception_error_code & GENMASK(31, 16)))
2614	return -EINVAL;	2614	return -EINVAL;
2615		2615
2616	/* VM-entry interruption-info field: reserved bits */	2616	/* VM-entry interruption-info field: reserved bits */

arch/x86/kvm/vmx/pmu_intel.c+5−2

 static void intel_pmu_refresh(struct kvm_vcpu *vcpu)
 {
 	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
+	struct x86_pmu_capability x86_pmu;
 	struct kvm_cpuid_entry2 *entry;
 	union cpuid10_eax eax;
 	union cpuid10_edx edx;
 	if (!pmu->version)
 		return;
+	perf_get_x86_pmu_capability(&x86_pmu);
 	pmu->nr_arch_gp_counters = min_t(int, eax.split.num_counters,
-					INTEL_PMC_MAX_GENERIC);
+					 x86_pmu.num_counters_gp);
 	pmu->counter_bitmask[KVM_PMC_GP] = ((u64)1 << eax.split.bit_width) - 1;
 	pmu->available_event_types = ~entry->ebx &
 					((1ull << eax.split.mask_length) - 1);
 	} else {
 		pmu->nr_arch_fixed_counters =
 			min_t(int, edx.split.num_counters_fixed,
-				INTEL_PMC_MAX_FIXED);
+			      x86_pmu.num_counters_fixed);
 		pmu->counter_bitmask[KVM_PMC_FIXED] =
 			((u64)1 << edx.split.bit_width_fixed) - 1;
 	}

arch/x86/kvm/vmx/vmx.c+9−6

 	struct page *page;
 	unsigned int i;
+	if (!boot_cpu_has_bug(X86_BUG_L1TF)) {
+		l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_NOT_REQUIRED;
+		return 0;
+	}
 	if (!enable_ept) {
 		l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_EPT_DISABLED;
 		return 0;
 	 * contain 'auto' which will be turned into the default 'cond'
 	 * mitigation mode.
 	 */
-	if (boot_cpu_has(X86_BUG_L1TF)) {
+	r = vmx_setup_l1d_flush(vmentry_l1d_flush_param);
-		r = vmx_setup_l1d_flush(vmentry_l1d_flush_param);
+	if (r) {
-		if (r) {
+		vmx_exit();
-			vmx_exit();
+		return r;
-			return r;
-		}
 	}
 #ifdef CONFIG_KEXEC_CORE

arch/x86/kvm/x86.c+36−36

@@ -92,8 +92,8 @@ u64 __read_mostly efer_reserved_bits = ~((u64)(EFER_SCE \| EFER_LME \| EFER_LMA)); · 91 unmodified lines
92	static u64 __read_mostly efer_reserved_bits = ~((u64)EFER_SCE);	92	static u64 __read_mostly efer_reserved_bits = ~((u64)EFER_SCE);
93	#endif	93	#endif
94		94
95	#define VM_STAT(x) offsetof(struct kvm, stat.x), KVM_STAT_VM	95	#define VM_STAT(x, ...) offsetof(struct kvm, stat.x), KVM_STAT_VM, ## __VA_ARGS__
96	#define VCPU_STAT(x) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU	96	#define VCPU_STAT(x, ...) offsetof(struct kvm_vcpu, stat.x), KVM_STAT_VCPU, ## __VA_ARGS__
97		97
98	#define KVM_X2APIC_API_VALID_FLAGS (KVM_X2APIC_API_USE_32BIT_IDS \| \	98	#define KVM_X2APIC_API_VALID_FLAGS (KVM_X2APIC_API_USE_32BIT_IDS \| \
99	KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK)	99	KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK)
@@ -212,7 +212,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { · 112 unmodified lines
212	{ "mmu_cache_miss", VM_STAT(mmu_cache_miss) },	212	{ "mmu_cache_miss", VM_STAT(mmu_cache_miss) },
213	{ "mmu_unsync", VM_STAT(mmu_unsync) },	213	{ "mmu_unsync", VM_STAT(mmu_unsync) },
214	{ "remote_tlb_flush", VM_STAT(remote_tlb_flush) },	214	{ "remote_tlb_flush", VM_STAT(remote_tlb_flush) },
215	{ "largepages", VM_STAT(lpages) },	215	{ "largepages", VM_STAT(lpages, .mode = 0444) },
216	{ "max_mmu_page_hash_collisions",	216	{ "max_mmu_page_hash_collisions",
217	VM_STAT(max_mmu_page_hash_collisions) },	217	VM_STAT(max_mmu_page_hash_collisions) },
218	{ NULL }	218	{ NULL }
@@ -885,34 +885,42 @@ int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr) · 666 unmodified lines
885	}	885	}
886	EXPORT_SYMBOL_GPL(kvm_set_xcr);	886	EXPORT_SYMBOL_GPL(kvm_set_xcr);
887		887
888	int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)	888	static int kvm_valid_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
889	{	889	{
890	unsigned long old_cr4 = kvm_read_cr4(vcpu);
891	unsigned long pdptr_bits = X86_CR4_PGE \| X86_CR4_PSE \| X86_CR4_PAE \|
892	X86_CR4_SMEP \| X86_CR4_SMAP \| X86_CR4_PKE;
893
894	if (cr4 & CR4_RESERVED_BITS)	890	if (cr4 & CR4_RESERVED_BITS)
895	return 1;	891	return -EINVAL;
896		892
897	if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) && (cr4 & X86_CR4_OSXSAVE))	893	if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) && (cr4 & X86_CR4_OSXSAVE))
898	return 1;	894	return -EINVAL;
899		895
900	if (!guest_cpuid_has(vcpu, X86_FEATURE_SMEP) && (cr4 & X86_CR4_SMEP))	896	if (!guest_cpuid_has(vcpu, X86_FEATURE_SMEP) && (cr4 & X86_CR4_SMEP))
901	return 1;	897	return -EINVAL;
902		898
903	if (!guest_cpuid_has(vcpu, X86_FEATURE_SMAP) && (cr4 & X86_CR4_SMAP))	899	if (!guest_cpuid_has(vcpu, X86_FEATURE_SMAP) && (cr4 & X86_CR4_SMAP))
904	return 1;	900	return -EINVAL;
905		901
906	if (!guest_cpuid_has(vcpu, X86_FEATURE_FSGSBASE) && (cr4 & X86_CR4_FSGSBASE))	902	if (!guest_cpuid_has(vcpu, X86_FEATURE_FSGSBASE) && (cr4 & X86_CR4_FSGSBASE))
907	return 1;	903	return -EINVAL;
908		904
909	if (!guest_cpuid_has(vcpu, X86_FEATURE_PKU) && (cr4 & X86_CR4_PKE))	905	if (!guest_cpuid_has(vcpu, X86_FEATURE_PKU) && (cr4 & X86_CR4_PKE))
910	return 1;	906	return -EINVAL;
911		907
912	if (!guest_cpuid_has(vcpu, X86_FEATURE_LA57) && (cr4 & X86_CR4_LA57))	908	if (!guest_cpuid_has(vcpu, X86_FEATURE_LA57) && (cr4 & X86_CR4_LA57))
913	return 1;	909	return -EINVAL;
914		910
915	if (!guest_cpuid_has(vcpu, X86_FEATURE_UMIP) && (cr4 & X86_CR4_UMIP))	911	if (!guest_cpuid_has(vcpu, X86_FEATURE_UMIP) && (cr4 & X86_CR4_UMIP))
		912	return -EINVAL;
		913
		914	return 0;
		915	}
		916
		917	int kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
		918	{
		919	unsigned long old_cr4 = kvm_read_cr4(vcpu);
		920	unsigned long pdptr_bits = X86_CR4_PGE \| X86_CR4_PSE \| X86_CR4_PAE \|
		921	X86_CR4_SMEP \| X86_CR4_SMAP \| X86_CR4_PKE;
		922
		923	if (kvm_valid_cr4(vcpu, cr4))
916	return 1;	924	return 1;
917		925
918	if (is_long_mode(vcpu)) {	926	if (is_long_mode(vcpu)) {
@@ -1161,13 +1169,6 @@ static u32 msrs_to_save[] = { · 242 unmodified lines
1161	MSR_ARCH_PERFMON_PERFCTR0 + 12, MSR_ARCH_PERFMON_PERFCTR0 + 13,	1169	MSR_ARCH_PERFMON_PERFCTR0 + 12, MSR_ARCH_PERFMON_PERFCTR0 + 13,
1162	MSR_ARCH_PERFMON_PERFCTR0 + 14, MSR_ARCH_PERFMON_PERFCTR0 + 15,	1170	MSR_ARCH_PERFMON_PERFCTR0 + 14, MSR_ARCH_PERFMON_PERFCTR0 + 15,
1163	MSR_ARCH_PERFMON_PERFCTR0 + 16, MSR_ARCH_PERFMON_PERFCTR0 + 17,	1171	MSR_ARCH_PERFMON_PERFCTR0 + 16, MSR_ARCH_PERFMON_PERFCTR0 + 17,
1164	MSR_ARCH_PERFMON_PERFCTR0 + 18, MSR_ARCH_PERFMON_PERFCTR0 + 19,
1165	MSR_ARCH_PERFMON_PERFCTR0 + 20, MSR_ARCH_PERFMON_PERFCTR0 + 21,
1166	MSR_ARCH_PERFMON_PERFCTR0 + 22, MSR_ARCH_PERFMON_PERFCTR0 + 23,
1167	MSR_ARCH_PERFMON_PERFCTR0 + 24, MSR_ARCH_PERFMON_PERFCTR0 + 25,
1168	MSR_ARCH_PERFMON_PERFCTR0 + 26, MSR_ARCH_PERFMON_PERFCTR0 + 27,
1169	MSR_ARCH_PERFMON_PERFCTR0 + 28, MSR_ARCH_PERFMON_PERFCTR0 + 29,
1170	MSR_ARCH_PERFMON_PERFCTR0 + 30, MSR_ARCH_PERFMON_PERFCTR0 + 31,
1171	MSR_ARCH_PERFMON_EVENTSEL0, MSR_ARCH_PERFMON_EVENTSEL1,	1172	MSR_ARCH_PERFMON_EVENTSEL0, MSR_ARCH_PERFMON_EVENTSEL1,
1172	MSR_ARCH_PERFMON_EVENTSEL0 + 2, MSR_ARCH_PERFMON_EVENTSEL0 + 3,	1173	MSR_ARCH_PERFMON_EVENTSEL0 + 2, MSR_ARCH_PERFMON_EVENTSEL0 + 3,
1173	MSR_ARCH_PERFMON_EVENTSEL0 + 4, MSR_ARCH_PERFMON_EVENTSEL0 + 5,	1174	MSR_ARCH_PERFMON_EVENTSEL0 + 4, MSR_ARCH_PERFMON_EVENTSEL0 + 5,
@@ -1177,13 +1178,6 @@ static u32 msrs_to_save[] = { · 3 unmodified lines
1177	MSR_ARCH_PERFMON_EVENTSEL0 + 12, MSR_ARCH_PERFMON_EVENTSEL0 + 13,	1178	MSR_ARCH_PERFMON_EVENTSEL0 + 12, MSR_ARCH_PERFMON_EVENTSEL0 + 13,
1178	MSR_ARCH_PERFMON_EVENTSEL0 + 14, MSR_ARCH_PERFMON_EVENTSEL0 + 15,	1179	MSR_ARCH_PERFMON_EVENTSEL0 + 14, MSR_ARCH_PERFMON_EVENTSEL0 + 15,
1179	MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17,	1180	MSR_ARCH_PERFMON_EVENTSEL0 + 16, MSR_ARCH_PERFMON_EVENTSEL0 + 17,
1180	MSR_ARCH_PERFMON_EVENTSEL0 + 18, MSR_ARCH_PERFMON_EVENTSEL0 + 19,
1181	MSR_ARCH_PERFMON_EVENTSEL0 + 20, MSR_ARCH_PERFMON_EVENTSEL0 + 21,
1182	MSR_ARCH_PERFMON_EVENTSEL0 + 22, MSR_ARCH_PERFMON_EVENTSEL0 + 23,
1183	MSR_ARCH_PERFMON_EVENTSEL0 + 24, MSR_ARCH_PERFMON_EVENTSEL0 + 25,
1184	MSR_ARCH_PERFMON_EVENTSEL0 + 26, MSR_ARCH_PERFMON_EVENTSEL0 + 27,
1185	MSR_ARCH_PERFMON_EVENTSEL0 + 28, MSR_ARCH_PERFMON_EVENTSEL0 + 29,
1186	MSR_ARCH_PERFMON_EVENTSEL0 + 30, MSR_ARCH_PERFMON_EVENTSEL0 + 31,
1187	};	1181	};
1188		1182
1189	static unsigned num_msrs_to_save;	1183	static unsigned num_msrs_to_save;
@@ -5097,13 +5091,14 @@ out: · 3907 unmodified lines
5097		5091
5098	static void kvm_init_msr_list(void)	5092	static void kvm_init_msr_list(void)
5099	{	5093	{
		5094	struct x86_pmu_capability x86_pmu;
5100	u32 dummy[2];	5095	u32 dummy[2];
5101	unsigned i, j;	5096	unsigned i, j;
5102		5097
5103	BUILD_BUG_ON_MSG(INTEL_PMC_MAX_FIXED != 4,	5098	BUILD_BUG_ON_MSG(INTEL_PMC_MAX_FIXED != 4,
5104	"Please update the fixed PMCs in msrs_to_save[]");	5099	"Please update the fixed PMCs in msrs_to_save[]");
5105	BUILD_BUG_ON_MSG(INTEL_PMC_MAX_GENERIC != 32,	5100
5106	"Please update the generic perfctr/eventsel MSRs in msrs_to_save[]");	5101	perf_get_x86_pmu_capability(&x86_pmu);
5107		5102
5108	for (i = j = 0; i < ARRAY_SIZE(msrs_to_save); i++) {	5103	for (i = j = 0; i < ARRAY_SIZE(msrs_to_save); i++) {
5109	if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0)	5104	if (rdmsr_safe(msrs_to_save[i], &dummy[0], &dummy[1]) < 0)
@@ -5145,6 +5140,15 @@ static void kvm_init_msr_list(void) · 35 unmodified lines
5145	intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2)	5140	intel_pt_validate_hw_cap(PT_CAP_num_address_ranges) * 2)
5146	continue;	5141	continue;
5147	break;	5142	break;
		5143	case MSR_ARCH_PERFMON_PERFCTR0 ... MSR_ARCH_PERFMON_PERFCTR0 + 17:
		5144	if (msrs_to_save[i] - MSR_ARCH_PERFMON_PERFCTR0 >=
		5145	min(INTEL_PMC_MAX_GENERIC, x86_pmu.num_counters_gp))
		5146	continue;
		5147	break;
		5148	case MSR_ARCH_PERFMON_EVENTSEL0 ... MSR_ARCH_PERFMON_EVENTSEL0 + 17:
		5149	if (msrs_to_save[i] - MSR_ARCH_PERFMON_EVENTSEL0 >=
		5150	min(INTEL_PMC_MAX_GENERIC, x86_pmu.num_counters_gp))
		5151	continue;
5148	}	5152	}
5149	default:	5153	default:
5150	break;	5154	break;
@@ -8714,10 +8718,6 @@ EXPORT_SYMBOL_GPL(kvm_task_switch); · 3563 unmodified lines
8714		8718
8715	static int kvm_valid_sregs(struct kvm_vcpu vcpu, struct kvm_sregs sregs)	8719	static int kvm_valid_sregs(struct kvm_vcpu vcpu, struct kvm_sregs sregs)
8716	{	8720	{
8717	if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&
8718	(sregs->cr4 & X86_CR4_OSXSAVE))
8719	return -EINVAL;
8720
8721	if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {	8721	if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {
8722	/*	8722	/*
8723	* When EFER.LME and CR0.PG are set, the processor is in	8723	* When EFER.LME and CR0.PG are set, the processor is in
@@ -8736,7 +8736,7 @@ static int kvm_valid_sregs(struct kvm_vcpu vcpu, struct kvm_sregs sregs) · 12 unmodified lines
8736	return -EINVAL;	8736	return -EINVAL;
8737	}	8737	}
8738		8738
8739	return 0;	8739	return kvm_valid_cr4(vcpu, sregs->cr4);
8740	}	8740	}
8741		8741
8742	static int __set_sregs(struct kvm_vcpu vcpu, struct kvm_sregs sregs)	8742	static int __set_sregs(struct kvm_vcpu vcpu, struct kvm_sregs sregs)

arch/x86/lib/delay.c+2−2

@@ -113,8 +113,8 @@ static void delay_mwaitx(unsigned long __loops) · 112 unmodified lines
113	__monitorx(raw_cpu_ptr(&cpu_tss_rw), 0, 0);	113	__monitorx(raw_cpu_ptr(&cpu_tss_rw), 0, 0);
114		114
115	/*	115	/*
116	* AMD, like Intel, supports the EAX hint and EAX=0xf	116	* AMD, like Intel's MWAIT version, supports the EAX hint and
117	* means, do not enter any deep C-state and we use it	117	* EAX=0xf0 means, do not enter any deep C-state and we use it
118	* here in delay() to minimize wakeup latency.	118	* here in delay() to minimize wakeup latency.
119	*/	119	*/
120	__mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE);	120	__mwaitx(MWAITX_DISABLE_CSTATES, delay, MWAITX_ECX_TIMER_ENABLE);

arch/x86/platform/efi/efi.c+0−3

@@ -917,9 +917,6 @@ static void __init kexec_enter_virtual_mode(void) · 916 unmodified lines
917		917
918	if (efi_enabled(EFI_OLD_MEMMAP) && (__supported_pte_mask & _PAGE_NX))	918	if (efi_enabled(EFI_OLD_MEMMAP) && (__supported_pte_mask & _PAGE_NX))
919	runtime_code_page_mkexec();	919	runtime_code_page_mkexec();
920
921	/* clean DUMMY object */
922	efi_delete_dummy_variable();
923	#endif	920	#endif
924	}	921	}
925		922

arch/x86/xen/efi.c+1−13

@@ -57,19 +57,7 @@ static efi_system_table_t __init *xen_efi_probe(void) · 56 unmodified lines
57	return NULL;	57	return NULL;
58		58
59	/* Here we know that Xen runs on EFI platform. */	59	/* Here we know that Xen runs on EFI platform. */
60		60	xen_efi_runtime_setup();
61	efi.get_time = xen_efi_get_time;
62	efi.set_time = xen_efi_set_time;
63	efi.get_wakeup_time = xen_efi_get_wakeup_time;
64	efi.set_wakeup_time = xen_efi_set_wakeup_time;
65	efi.get_variable = xen_efi_get_variable;
66	efi.get_next_variable = xen_efi_get_next_variable;
67	efi.set_variable = xen_efi_set_variable;
68	efi.query_variable_info = xen_efi_query_variable_info;
69	efi.update_capsule = xen_efi_update_capsule;
70	efi.query_capsule_caps = xen_efi_query_capsule_caps;
71	efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
72	efi.reset_system = xen_efi_reset_system;
73		61
74	efi_systab_xen.tables = info->cfg.addr;	62	efi_systab_xen.tables = info->cfg.addr;
75	efi_systab_xen.nr_tables = info->cfg.nent;	63	efi_systab_xen.nr_tables = info->cfg.nent;

arch/x86/xen/enlighten.c+25−3

@@ -269,19 +269,41 @@ void xen_reboot(int reason) · 268 unmodified lines
269	BUG();	269	BUG();
270	}	270	}
271		271
		272	static int reboot_reason = SHUTDOWN_reboot;
		273	static bool xen_legacy_crash;
272	void xen_emergency_restart(void)	274	void xen_emergency_restart(void)
273	{	275	{
274	xen_reboot(SHUTDOWN_reboot);	276	xen_reboot(reboot_reason);
275	}	277	}
276		278
277	static int	279	static int
278	xen_panic_event(struct notifier_block this, unsigned long event, void ptr)	280	xen_panic_event(struct notifier_block this, unsigned long event, void ptr)
279	{	281	{
280	if (!kexec_crash_loaded())	282	if (!kexec_crash_loaded()) {
281	xen_reboot(SHUTDOWN_crash);	283	if (xen_legacy_crash)
		284	xen_reboot(SHUTDOWN_crash);
		285
		286	reboot_reason = SHUTDOWN_crash;
		287
		288	/*
		289	* If panic_timeout==0 then we are supposed to wait forever.
		290	* However, to preserve original dom0 behavior we have to drop
		291	* into hypervisor. (domU behavior is controlled by its
		292	* config file)
		293	*/
		294	if (panic_timeout == 0)
		295	panic_timeout = -1;
		296	}
282	return NOTIFY_DONE;	297	return NOTIFY_DONE;
283	}	298	}
284		299
		300	static int __init parse_xen_legacy_crash(char *arg)
		301	{
		302	xen_legacy_crash = true;
		303	return 0;
		304	}
		305	early_param("xen_legacy_crash", parse_xen_legacy_crash);
		306
285	static struct notifier_block xen_panic_block = {	307	static struct notifier_block xen_panic_block = {
286	.notifier_call = xen_panic_event,	308	.notifier_call = xen_panic_event,
287	.priority = INT_MIN	309	.priority = INT_MIN

block/blk-mq.c+9−3

 		/* bypass scheduler for flush rq */
 		blk_insert_flush(rq);
 		blk_mq_run_hw_queue(data.hctx, true);
-	} else if (plug && (q->nr_hw_queues == 1 || q->mq_ops->commit_rqs)) {
+	} else if (plug && (q->nr_hw_queues == 1 || q->mq_ops->commit_rqs ||
+				!blk_queue_nonrot(q))) {
 		/*
 		 * Use plugging if we have a ->commit_rqs() hook as well, as
 		 * we know the driver uses bd->last in a smart fashion.
+		 *
+		 * Use normal plugging if this disk is slow HDD, as sequential
+		 * IO may benefit a lot from plug merging.
 		 */
 		unsigned int request_count = plug->rq_count;
 		struct request *last = NULL;
 		}
 		blk_add_rq_to_plug(plug, rq);
+	} else if (q->elevator) {
+		blk_mq_sched_insert_request(rq, false, true, true);
 	} else if (plug && !blk_queue_nomerges(q)) {
 		/*
 		 * We do limited plugging. If the bio can be merged, do that.
 			blk_mq_try_issue_directly(data.hctx, same_queue_rq,
 					&cookie);
 		}
-	} else if ((q->nr_hw_queues > 1 && is_sync) || (!q->elevator &&
+	} else if ((q->nr_hw_queues > 1 && is_sync) ||
-			!data.hctx->dispatch_busy)) {
+			!data.hctx->dispatch_busy) {
 		blk_mq_try_issue_directly(data.hctx, rq, &cookie);
 	} else {
 		blk_mq_sched_insert_request(rq, false, true, true);

block/blk-rq-qos.c+9−5

 	return ret;
 }
-void rq_depth_scale_up(struct rq_depth *rqd)
+/* Returns true on success and false if scaling up wasn't possible */
+bool rq_depth_scale_up(struct rq_depth *rqd)
 {
 	/*
 	 * Hit max in previous round, stop here
 	 */
 	if (rqd->scaled_max)
-		return;
+		return false;
 	rqd->scale_step--;
 	rqd->scaled_max = rq_depth_calc_max_depth(rqd);
+	return true;
 }
 /*
  * Scale rwb down. If 'hard_throttle' is set, do it quicker, since we
- * had a latency violation.
+ * had a latency violation. Returns true on success and returns false if
+ * scaling down wasn't possible.
  */
-void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle)
+bool rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle)
 {
 	/*
 	 * Stop scaling down when we've hit the limit. This also prevents
 	 * keep up.
 	 */
 	if (rqd->max_depth == 1)
-		return;
+		return false;
 	if (rqd->scale_step < 0 && hard_throttle)
 		rqd->scale_step = 0;
 	rqd->scaled_max = false;
 	rq_depth_calc_max_depth(rqd);
+	return true;
 }
 struct rq_qos_wait_data {

block/blk-rq-qos.h+2−2

@@ -130,8 +130,8 @@ void rq_qos_wait(struct rq_wait rqw, void private_data, · 129 unmodified lines
130	acquire_inflight_cb_t *acquire_inflight_cb,	130	acquire_inflight_cb_t *acquire_inflight_cb,
131	cleanup_cb_t *cleanup_cb);	131	cleanup_cb_t *cleanup_cb);
132	bool rq_wait_inc_below(struct rq_wait *rq_wait, unsigned int limit);	132	bool rq_wait_inc_below(struct rq_wait *rq_wait, unsigned int limit);
133	void rq_depth_scale_up(struct rq_depth *rqd);	133	bool rq_depth_scale_up(struct rq_depth *rqd);
134	void rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle);	134	bool rq_depth_scale_down(struct rq_depth *rqd, bool hard_throttle);
135	bool rq_depth_calc_max_depth(struct rq_depth *rqd);	135	bool rq_depth_calc_max_depth(struct rq_depth *rqd);
136		136
137	void __rq_qos_cleanup(struct rq_qos rqos, struct bio bio);	137	void __rq_qos_cleanup(struct rq_qos rqos, struct bio bio);

block/blk-wbt.c+4−2

 static void scale_up(struct rq_wb *rwb)
 {
-	rq_depth_scale_up(&rwb->rq_depth);
+	if (!rq_depth_scale_up(&rwb->rq_depth))
+		return;
 	calc_wb_limits(rwb);
 	rwb->unknown_cnt = 0;
 	rwb_wake_all(rwb);
 static void scale_down(struct rq_wb *rwb, bool hard_throttle)
 {
-	rq_depth_scale_down(&rwb->rq_depth, hard_throttle);
+	if (!rq_depth_scale_down(&rwb->rq_depth, hard_throttle))
+		return;
 	calc_wb_limits(rwb);
 	rwb->unknown_cnt = 0;
 	rwb_trace_step(rwb, "scale down");

block/sed-opal.c+3−3

@@ -129,7 +129,7 @@ static const u8 opaluid[][OPAL_UID_LENGTH] = { · 128 unmodified lines
129	{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x84, 0x01 },	129	{ 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x84, 0x01 },
130		130
131	/* tables */	131	/* tables */
132	[OPAL_TABLE_TABLE]	132	[OPAL_TABLE_TABLE] =
133	{ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01 },	133	{ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01 },
134	[OPAL_LOCKINGRANGE_GLOBAL] =	134	[OPAL_LOCKINGRANGE_GLOBAL] =
135	{ 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x01 },	135	{ 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00, 0x01 },
@@ -372,8 +372,8 @@ static void check_geometry(struct opal_dev dev, const void data) · 236 unmodified lines
372	{	372	{
373	const struct d0_geometry_features *geo = data;	373	const struct d0_geometry_features *geo = data;
374		374
375	dev->align = geo->alignment_granularity;	375	dev->align = be64_to_cpu(geo->alignment_granularity);
376	dev->lowest_lba = geo->lowest_aligned_lba;	376	dev->lowest_lba = be64_to_cpu(geo->lowest_aligned_lba);
377	}	377	}
378		378
379	static int execute_step(struct opal_dev *dev,	379	static int execute_step(struct opal_dev *dev,

drivers/android/binder.c+3−1

 #include <linux/sched/signal.h>
 #include <linux/sched/mm.h>
 #include <linux/seq_file.h>
+#include <linux/string.h>
 #include <linux/uaccess.h>
 #include <linux/pid_namespace.h>
 #include <linux/security.h>
 #include <linux/task_work.h>
 #include <uapi/linux/android/binder.h>
+#include <uapi/linux/android/binderfs.h>
 #include <asm/cacheflush.h>
 	e->target_handle = tr->target.handle;
 	e->data_size = tr->data_size;
 	e->offsets_size = tr->offsets_size;
-	e->context_name = proc->context->name;
+	strscpy(e->context_name, proc->context->name, BINDERFS_MAX_NAME);
 	if (reply) {
 		binder_inner_proc_lock(proc);

drivers/android/binder_alloc.c+1−1

@@ -156,7 +156,7 @@ static struct binder_buffer *binder_alloc_prepare_to_free_locked( · 155 unmodified lines
156	}	156	}
157		157
158	/**	158	/**
159	* binder_alloc_buffer_lookup() - get buffer given user ptr	159	* binder_alloc_prepare_to_free() - get buffer given user ptr
160	* @alloc: binder_alloc for this proc	160	* @alloc: binder_alloc for this proc
161	* @user_ptr: User pointer to buffer data	161	* @user_ptr: User pointer to buffer data
162	*	162	*

drivers/android/binder_internal.h+1−1

@@ -130,7 +130,7 @@ struct binder_transaction_log_entry { · 129 unmodified lines
130	int return_error_line;	130	int return_error_line;
131	uint32_t return_error;	131	uint32_t return_error;
132	uint32_t return_error_param;	132	uint32_t return_error_param;
133	const char *context_name;	133	char context_name[BINDERFS_MAX_NAME + 1];
134	};	134	};
135		135
136	struct binder_transaction_log {	136	struct binder_transaction_log {

drivers/ata/libata-scsi.c+0−21

@@ -4791,27 +4791,6 @@ void ata_scsi_hotplug(struct work_struct *work) · 4790 unmodified lines
4791	return;	4791	return;
4792	}	4792	}
4793		4793
4794	/*
4795	* XXX - UGLY HACK
4796	*
4797	* The block layer suspend/resume path is fundamentally broken due
4798	* to freezable kthreads and workqueue and may deadlock if a block
4799	* device gets removed while resume is in progress. I don't know
4800	* what the solution is short of removing freezable kthreads and
4801	* workqueues altogether.
4802	*
4803	* The following is an ugly hack to avoid kicking off device
4804	* removal while freezer is active. This is a joke but does avoid
4805	* this particular deadlock scenario.
4806	*
4807	* https://bugzilla.kernel.org/show_bug.cgi?id=62801
4808	* http://marc.info/?l=linux-kernel&m=138695698516487
4809	*/
4810	#ifdef CONFIG_FREEZER
4811	while (pm_freezing)
4812	msleep(10);
4813	#endif
4814
4815	DPRINTK("ENTER\n");	4794	DPRINTK("ENTER\n");
4816	mutex_lock(&ap->scsi_scan_mutex);	4795	mutex_lock(&ap->scsi_scan_mutex);
4817		4796

drivers/base/platform.c+39−7

@@ -241,12 +241,8 @@ struct resource platform_get_resource_byname(struct platform_device dev, · 240 unmodified lines
241	}	241	}
242	EXPORT_SYMBOL_GPL(platform_get_resource_byname);	242	EXPORT_SYMBOL_GPL(platform_get_resource_byname);
243		243
244	/**	244	static int __platform_get_irq_byname(struct platform_device *dev,
245	* platform_get_irq_byname - get an IRQ for a device by name	245	const char *name)
246	* @dev: platform device
247	* @name: IRQ name
248	*/
249	int platform_get_irq_byname(struct platform_device dev, const char name)
250	{	246	{
251	struct resource *r;	247	struct resource *r;
252		248
@@ -262,11 +258,47 @@ int platform_get_irq_byname(struct platform_device dev, const char name) · 9 unmodified lines
262	if (r)	258	if (r)
263	return r->start;	259	return r->start;
264		260
265	dev_err(&dev->dev, "IRQ %s not found\n", name);
266	return -ENXIO;	261	return -ENXIO;
267	}	262	}
		263
		264	/**
		265	* platform_get_irq_byname - get an IRQ for a device by name
		266	* @dev: platform device
		267	* @name: IRQ name
		268	*
		269	* Get an IRQ like platform_get_irq(), but then by name rather then by index.
		270	*
		271	* Return: IRQ number on success, negative error number on failure.
		272	*/
		273	int platform_get_irq_byname(struct platform_device dev, const char name)
		274	{
		275	int ret;
		276
		277	ret = __platform_get_irq_byname(dev, name);
		278	if (ret < 0 && ret != -EPROBE_DEFER)
		279	dev_err(&dev->dev, "IRQ %s not found\n", name);
		280
		281	return ret;
		282	}
268	EXPORT_SYMBOL_GPL(platform_get_irq_byname);	283	EXPORT_SYMBOL_GPL(platform_get_irq_byname);
269		284
		285	/**
		286	* platform_get_irq_byname_optional - get an optional IRQ for a device by name
		287	* @dev: platform device
		288	* @name: IRQ name
		289	*
		290	* Get an optional IRQ by name like platform_get_irq_byname(). Except that it
		291	* does not print an error message if an IRQ can not be obtained.
		292	*
		293	* Return: IRQ number on success, negative error number on failure.
		294	*/
		295	int platform_get_irq_byname_optional(struct platform_device *dev,
		296	const char *name)
		297	{
		298	return __platform_get_irq_byname(dev, name);
		299	}
		300	EXPORT_SYMBOL_GPL(platform_get_irq_byname_optional);
		301
270	/**	302	/**
271	* platform_add_devices - add a numbers of platform devices	303	* platform_add_devices - add a numbers of platform devices
272	* @devs: array of platform devices to add	304	* @devs: array of platform devices to add

drivers/block/loop.c+10−0

@@ -994,6 +994,16 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode, · 993 unmodified lines
994	if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync)	994	if (!(lo_flags & LO_FLAGS_READ_ONLY) && file->f_op->fsync)
995	blk_queue_write_cache(lo->lo_queue, true, false);	995	blk_queue_write_cache(lo->lo_queue, true, false);
996		996
		997	if (io_is_direct(lo->lo_backing_file) && inode->i_sb->s_bdev) {
		998	/* In case of direct I/O, match underlying block size */
		999	unsigned short bsize = bdev_logical_block_size(
		1000	inode->i_sb->s_bdev);
		1001
		1002	blk_queue_logical_block_size(lo->lo_queue, bsize);
		1003	blk_queue_physical_block_size(lo->lo_queue, bsize);
		1004	blk_queue_io_min(lo->lo_queue, bsize);
		1005	}
		1006
997	loop_update_rotational(lo);	1007	loop_update_rotational(lo);
998	loop_update_dio(lo);	1008	loop_update_dio(lo);
999	set_capacity(lo->lo_disk, size);	1009	set_capacity(lo->lo_disk, size);

drivers/block/nbd.c+1−1

 	if (refcount_dec_and_mutex_lock(&nbd->refs,
 					&nbd_index_mutex)) {
 		idr_remove(&nbd_index_idr, nbd->index);
-		mutex_unlock(&nbd_index_mutex);
 		nbd_dev_remove(nbd);
+		mutex_unlock(&nbd_index_mutex);
 	}
 }

drivers/block/null_blk_zoned.c+1−2

 		zone->wp = zone->start;
 		break;
 	default:
-		cmd->error = BLK_STS_NOTSUPP;
+		return BLK_STS_NOTSUPP;
-		break;
 	}
 	return BLK_STS_OK;
 }

drivers/clk/ti/clk-7xx.c+3−3

drivers/firmware/efi/cper.c+1−1

@@ -381,7 +381,7 @@ static void cper_print_pcie(const char pfx, const struct cper_sec_pcie pcie, · 380 unmodified lines
381	printk("%s""vendor_id: 0x%04x, device_id: 0x%04x\n", pfx,	381	printk("%s""vendor_id: 0x%04x, device_id: 0x%04x\n", pfx,
382	pcie->device_id.vendor_id, pcie->device_id.device_id);	382	pcie->device_id.vendor_id, pcie->device_id.device_id);
383	p = pcie->device_id.class_code;	383	p = pcie->device_id.class_code;
384	printk("%s""class_code: %02x%02x%02x\n", pfx, p[0], p[1], p[2]);	384	printk("%s""class_code: %02x%02x%02x\n", pfx, p[2], p[1], p[0]);
385	}	385	}
386	if (pcie->validation_bits & CPER_PCIE_VALID_SERIAL_NUMBER)	386	if (pcie->validation_bits & CPER_PCIE_VALID_SERIAL_NUMBER)
387	printk("%s""serial number: 0x%04x, 0x%04x\n", pfx,	387	printk("%s""serial number: 0x%04x, 0x%04x\n", pfx,

drivers/firmware/efi/efi.c+3−0

@@ -267,6 +267,9 @@ static __init int efivar_ssdt_load(void) · 266 unmodified lines
267	void *data;	267	void *data;
268	int ret;	268	int ret;
269		269
		270	if (!efivar_ssdt[0])
		271	return 0;
		272
270	ret = efivar_init(efivar_ssdt_iter, &entries, true, &entries);	273	ret = efivar_init(efivar_ssdt_iter, &entries, true, &entries);
271		274
272	list_for_each_entry_safe(entry, aux, &entries, list) {	275	list_for_each_entry_safe(entry, aux, &entries, list) {

drivers/firmware/efi/rci2-table.c+1−1

@@ -76,7 +76,7 @@ static u16 checksum(void) · 75 unmodified lines
76	return chksum;	76	return chksum;
77	}	77	}
78		78
79	int __init efi_rci2_sysfs_init(void)	79	static int __init efi_rci2_sysfs_init(void)
80	{	80	{
81	struct kobject *tables_kobj;	81	struct kobject *tables_kobj;
82	int ret = -ENOMEM;	82	int ret = -ENOMEM;

drivers/firmware/efi/tpm.c+19−7

 {
 	struct linux_efi_tpm_eventlog *log_tbl;
 	struct efi_tcg2_final_events_table *final_tbl;
-	unsigned int tbl_size;
+	int tbl_size;
 	int ret = 0;
 	if (efi.tpm_log == EFI_INVALID_TABLE_ADDR) {
 		goto out;
 	}
-	tbl_size = tpm2_calc_event_log_size((void *)efi.tpm_final_log
+	tbl_size = 0;
-					    + sizeof(final_tbl->version)
+	if (final_tbl->nr_events != 0) {
-					    + sizeof(final_tbl->nr_events),
+		void *events = (void *)efi.tpm_final_log
-					    final_tbl->nr_events,
+				+ sizeof(final_tbl->version)
-					    log_tbl->log);
+				+ sizeof(final_tbl->nr_events);
+		tbl_size = tpm2_calc_event_log_size(events,
+						    final_tbl->nr_events,
+						    log_tbl->log);
+	}
+	if (tbl_size < 0) {
+		pr_err(FW_BUG "Failed to parse event in TPM Final Events Log\n");
+		goto out_calc;
+	}
 	memblock_reserve((unsigned long)final_tbl,
 			 tbl_size + sizeof(*final_tbl));
-	early_memunmap(final_tbl, sizeof(*final_tbl));
 	efi_tpm_final_log_size = tbl_size;
+out_calc:
+	early_memunmap(final_tbl, sizeof(*final_tbl));
 out:
 	early_memunmap(log_tbl, sizeof(*log_tbl));
 	return ret;

drivers/firmware/google/vpd_decode.c+1−1

@@ -52,7 +52,7 @@ static int vpd_decode_entry(const u32 max_len, const u8 *input_buf, · 51 unmodified lines
52	if (max_len - consumed < *entry_len)	52	if (max_len - consumed < *entry_len)
53	return VPD_FAIL;	53	return VPD_FAIL;
54		54
55	consumed += decoded_len;	55	consumed += *entry_len;
56	*_consumed = consumed;	56	*_consumed = consumed;
57	return VPD_OK;	57	return VPD_OK;
58	}	58	}

drivers/gpio/gpio-eic-sprd.c+4−3

@@ -530,11 +530,12 @@ static void sprd_eic_handle_one_type(struct gpio_chip *chip) · 529 unmodified lines
530	}	530	}
531		531
532	for_each_set_bit(n, &reg, SPRD_EIC_PER_BANK_NR) {	532	for_each_set_bit(n, &reg, SPRD_EIC_PER_BANK_NR) {
533	girq = irq_find_mapping(chip->irq.domain,	533	u32 offset = bank * SPRD_EIC_PER_BANK_NR + n;
534	bank * SPRD_EIC_PER_BANK_NR + n);	534
		535	girq = irq_find_mapping(chip->irq.domain, offset);
535		536
536	generic_handle_irq(girq);	537	generic_handle_irq(girq);
537	sprd_eic_toggle_trigger(chip, girq, n);	538	sprd_eic_toggle_trigger(chip, girq, offset);
538	}	539	}
539	}	540	}
540	}	541	}

drivers/gpio/gpio-max77620.c+3−3

@@ -192,13 +192,13 @@ static int max77620_gpio_set_debounce(struct max77620_gpio *mgpio, · 191 unmodified lines
192	case 0:	192	case 0:
193	val = MAX77620_CNFG_GPIO_DBNC_None;	193	val = MAX77620_CNFG_GPIO_DBNC_None;
194	break;	194	break;
195	case 1 ... 8:	195	case 1000 ... 8000:
196	val = MAX77620_CNFG_GPIO_DBNC_8ms;	196	val = MAX77620_CNFG_GPIO_DBNC_8ms;
197	break;	197	break;
198	case 9 ... 16:	198	case 9000 ... 16000:
199	val = MAX77620_CNFG_GPIO_DBNC_16ms;	199	val = MAX77620_CNFG_GPIO_DBNC_16ms;
200	break;	200	break;
201	case 17 ... 32:	201	case 17000 ... 32000:
202	val = MAX77620_CNFG_GPIO_DBNC_32ms;	202	val = MAX77620_CNFG_GPIO_DBNC_32ms;
203	break;	203	break;
204	default:	204	default:

drivers/gpio/gpiolib-of.c+1−1

@@ -317,7 +317,7 @@ struct gpio_desc gpiod_get_from_of_node(struct device_node node, · 316 unmodified lines
317	transitory = flags & OF_GPIO_TRANSITORY;	317	transitory = flags & OF_GPIO_TRANSITORY;
318		318
319	ret = gpiod_request(desc, label);	319	ret = gpiod_request(desc, label);
320	if (ret == -EBUSY && (flags & GPIOD_FLAGS_BIT_NONEXCLUSIVE))	320	if (ret == -EBUSY && (dflags & GPIOD_FLAGS_BIT_NONEXCLUSIVE))
321	return desc;	321	return desc;
322	if (ret)	322	if (ret)
323	return ERR_PTR(ret);	323	return ERR_PTR(ret);

drivers/gpio/gpiolib.c+19−8

 		if (!ret)
 			goto set_output_value;
 		/* Emulate open drain by not actively driving the line high */
-		if (value)
+		if (value) {
-			return gpiod_direction_input(desc);
+			ret = gpiod_direction_input(desc);
+			goto set_output_flag;
+		}
 	}
 	else if (test_bit(FLAG_OPEN_SOURCE, &desc->flags)) {
 		ret = gpio_set_config(gc, gpio_chip_hwgpio(desc),
 		if (!ret)
 			goto set_output_value;
 		/* Emulate open source by not actively driving the line low */
-		if (!value)
+		if (!value) {
-			return gpiod_direction_input(desc);
+			ret = gpiod_direction_input(desc);
+			goto set_output_flag;
+		}
 	} else {
 		gpio_set_config(gc, gpio_chip_hwgpio(desc),
 				PIN_CONFIG_DRIVE_PUSH_PULL);
 set_output_value:
 	return gpiod_direction_output_raw_commit(desc, value);
+set_output_flag:
+	/*
+	 * When emulating open-source or open-drain functionalities by not
+	 * actively driving the line (setting mode to input) we still need to
+	 * set the IS_OUT flag or otherwise we won't be able to set the line
+	 * value anymore.
+	 */
+	if (ret == 0)
+		set_bit(FLAG_IS_OUT, &desc->flags);
+	return ret;
 }
 EXPORT_SYMBOL_GPL(gpiod_direction_output);
 	if (value) {
 		ret = chip->direction_input(chip, offset);
-		if (!ret)
-			clear_bit(FLAG_IS_OUT, &desc->flags);
 	} else {
 		ret = chip->direction_output(chip, offset, 0);
 		if (!ret)
 			set_bit(FLAG_IS_OUT, &desc->flags);
 	} else {
 		ret = chip->direction_input(chip, offset);
-		if (!ret)
-			clear_bit(FLAG_IS_OUT, &desc->flags);
 	}
 	trace_gpio_direction(desc_to_gpio(desc), !value, ret);
 	if (ret < 0)

drivers/gpu/drm/amd/amdgpu/Makefile+1−1

@@ -54,7 +54,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ · 53 unmodified lines
54	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \	54	amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \
55	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \	55	amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \
56	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \	56	amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \
57	amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o	57	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o
58		58
59	amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o	59	amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o
60		60

drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c+22−12

 	u32 val = 0;
 	u32 count = 0;
 	struct device *dev;
-	struct i2s_platform_data *i2s_pdata;
+	struct i2s_platform_data *i2s_pdata = NULL;
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 	adev->acp.acp_cell = kcalloc(ACP_DEVS, sizeof(struct mfd_cell),
 							GFP_KERNEL);
-	if (adev->acp.acp_cell == NULL)
+	if (adev->acp.acp_cell == NULL) {
-		return -ENOMEM;
+		r = -ENOMEM;
+		goto failure;
+	}
 	adev->acp.acp_res = kcalloc(5, sizeof(struct resource), GFP_KERNEL);
 	if (adev->acp.acp_res == NULL) {
-		kfree(adev->acp.acp_cell);
+		r = -ENOMEM;
-		return -ENOMEM;
+		goto failure;
 	}
 	i2s_pdata = kcalloc(3, sizeof(struct i2s_platform_data), GFP_KERNEL);
 	if (i2s_pdata == NULL) {
-		kfree(adev->acp.acp_res);
+		r = -ENOMEM;
-		kfree(adev->acp.acp_cell);
+		goto failure;
-		return -ENOMEM;
 	}
 	switch (adev->asic_type) {
 	r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell,
 								ACP_DEVS);
 	if (r)
-		return r;
+		goto failure;
 	for (i = 0; i < ACP_DEVS ; i++) {
 		dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);
 		r = pm_genpd_add_device(&adev->acp.acp_genpd->gpd, dev);
 		if (r) {
 			dev_err(dev, "Failed to add dev to genpd\n");
-			return r;
+			goto failure;
 		}
 	}
 			break;
 		if (--count == 0) {
 			dev_err(&adev->pdev->dev, "Failed to reset ACP\n");
-			return -ETIMEDOUT;
+			r = -ETIMEDOUT;
+			goto failure;
 		}
 		udelay(100);
 	}
 			break;
 		if (--count == 0) {
 			dev_err(&adev->pdev->dev, "Failed to reset ACP\n");
-			return -ETIMEDOUT;
+			r = -ETIMEDOUT;
+			goto failure;
 		}
 		udelay(100);
 	}
 	val &= ~ACP_SOFT_RESET__SoftResetAud_MASK;
 	cgs_write_register(adev->acp.cgs_device, mmACP_SOFT_RESET, val);
 	return 0;
+failure:
+	kfree(i2s_pdata);
+	kfree(adev->acp.acp_res);
+	kfree(adev->acp.acp_cell);
+	kfree(adev->acp.acp_genpd);
+	return r;
 }
 /**

drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c+7−7

 	r = amdgpu_bo_create_list_entry_array(&args->in, &info);
 	if (r)
-		goto error_free;
+		return r;
 	switch (args->in.operation) {
 	case AMDGPU_BO_LIST_OP_CREATE:
 		r = idr_alloc(&fpriv->bo_list_handles, list, 1, 0, GFP_KERNEL);
 		mutex_unlock(&fpriv->bo_list_lock);
 		if (r < 0) {
-			amdgpu_bo_list_put(list);
+			goto error_put_list;
-			return r;
 		}
 		handle = r;
 		mutex_unlock(&fpriv->bo_list_lock);
 		if (IS_ERR(old)) {
-			amdgpu_bo_list_put(list);
 			r = PTR_ERR(old);
-			goto error_free;
+			goto error_put_list;
 		}
 		amdgpu_bo_list_put(old);
 	return 0;
+error_put_list:
+	amdgpu_bo_list_put(list);
 error_free:
-	if (info)
+	kvfree(info);
-		kvfree(info);
 	return r;
 }

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c+2−1

  * - 3.32.0 - Add syncobj timeline support to AMDGPU_CS.
  * - 3.33.0 - Fixes for GDS ENOMEM failures in AMDGPU_CS.
  * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches
+ * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask
  */
 #define KMS_DRIVER_MAJOR	3
-#define KMS_DRIVER_MINOR	34
+#define KMS_DRIVER_MINOR	35
 #define KMS_DRIVER_PATCHLEVEL	0
 #define AMDGPU_MAX_TIMEOUT_PARAM_LENTH	256

drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h+1−0

@@ -165,6 +165,7 @@ struct amdgpu_gfx_config { · 164 unmodified lines
165	uint32_t num_sc_per_sh;	165	uint32_t num_sc_per_sh;
166	uint32_t num_packer_per_sc;	166	uint32_t num_packer_per_sc;
167	uint32_t pa_sc_tile_steering_override;	167	uint32_t pa_sc_tile_steering_override;
		168	uint64_t tcc_disabled_mask;
168	};	169	};
169		170
170	struct amdgpu_cu_info {	171	struct amdgpu_cu_info {

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c+2−0

@@ -787,6 +787,8 @@ static int amdgpu_info_ioctl(struct drm_device dev, void data, struct drm_file · 786 unmodified lines
787	dev_info.pa_sc_tile_steering_override =	787	dev_info.pa_sc_tile_steering_override =
788	adev->gfx.config.pa_sc_tile_steering_override;	788	adev->gfx.config.pa_sc_tile_steering_override;
789		789
		790	dev_info.tcc_disabled_mask = adev->gfx.config.tcc_disabled_mask;
		791
790	return copy_to_user(out, &dev_info,	792	return copy_to_user(out, &dev_info,
791	min((size_t)size, sizeof(dev_info))) ? -EFAULT : 0;	793	min((size_t)size, sizeof(dev_info))) ? -EFAULT : 0;
792	}	794	}

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c+0−2

 	struct ttm_bo_global *glob = adev->mman.bdev.glob;
 	struct amdgpu_vm_bo_base *bo_base;
-#if 0
 	if (vm->bulk_moveable) {
 		spin_lock(&glob->lru_lock);
 		ttm_bo_bulk_move_lru_tail(&vm->lru_bulk_move);
 		spin_unlock(&glob->lru_lock);
 		return;
 	}
-#endif
 	memset(&vm->lru_bulk_move, 0, sizeof(vm->lru_bulk_move));

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c+12−0

 	}
 }
+static void gfx_v10_0_get_tcc_info(struct amdgpu_device *adev)
+{
+	/* TCCs are global (not instanced). */
+	uint32_t tcc_disable = RREG32_SOC15(GC, 0, mmCGTS_TCC_DISABLE) |
+			       RREG32_SOC15(GC, 0, mmCGTS_USER_TCC_DISABLE);
+	adev->gfx.config.tcc_disabled_mask =
+		REG_GET_FIELD(tcc_disable, CGTS_TCC_DISABLE, TCC_DISABLE) |
+		(REG_GET_FIELD(tcc_disable, CGTS_TCC_DISABLE, HI_TCC_DISABLE) << 16);
+}
 static void gfx_v10_0_constants_init(struct amdgpu_device *adev)
 {
 	u32 tmp;
 	gfx_v10_0_setup_rb(adev);
 	gfx_v10_0_get_cu_info(adev, &adev->gfx.cu_info);
+	gfx_v10_0_get_tcc_info(adev);
 	adev->gfx.config.pa_sc_tile_steering_override =
 		gfx_v10_0_init_pa_sc_tile_steering_override(adev);

drivers/gpu/drm/amd/amdgpu/nv.c+4−2

 	struct smu_context *smu = &adev->smu;
 	if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) {
-		amdgpu_inc_vram_lost(adev);
+		if (!adev->in_suspend)
+			amdgpu_inc_vram_lost(adev);
 		ret = smu_baco_reset(smu);
 	} else {
-		amdgpu_inc_vram_lost(adev);
+		if (!adev->in_suspend)
+			amdgpu_inc_vram_lost(adev);
 		ret = nv_asic_mode1_reset(adev);
 	}

drivers/gpu/drm/amd/amdgpu/soc15.c+4−4

 {
 	switch (soc15_asic_reset_method(adev)) {
 		case AMD_RESET_METHOD_BACO:
-			amdgpu_inc_vram_lost(adev);
+			if (!adev->in_suspend)
+				amdgpu_inc_vram_lost(adev);
 			return soc15_asic_baco_reset(adev);
 		case AMD_RESET_METHOD_MODE2:
 			return soc15_mode2_reset(adev);
 		default:
-			amdgpu_inc_vram_lost(adev);
+			if (!adev->in_suspend)
+				amdgpu_inc_vram_lost(adev);
 			return soc15_asic_mode1_reset(adev);
 	}
 }
 #if defined(CONFIG_DRM_AMD_DC)
                 else if (amdgpu_device_has_dc_support(adev))
                         amdgpu_device_ip_block_add(adev, &dm_ip_block);
-#else
-#       warning "Enable CONFIG_DRM_AMD_DC for display support on SOC15."
 #endif
 		amdgpu_device_ip_block_add(adev, &vcn_v2_0_ip_block);
 		break;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+2−2

 	if (adev->asic_type != CHIP_CARRIZO && adev->asic_type != CHIP_STONEY)
 		dm->dc->debug.disable_stutter = amdgpu_pp_feature_mask & PP_STUTTER_MODE ? false : true;
-	if (adev->asic_type == CHIP_RENOIR)
-		dm->dc->debug.disable_stutter = true;
 	return 0;
 fail:
 	struct drm_crtc *crtc;
 	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
 	int i;
+#ifdef CONFIG_DEBUG_FS
 	enum amdgpu_dm_pipe_crc_source source;
+#endif
 	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,
 				      new_crtc_state, i) {

drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c+1−0

@@ -668,6 +668,7 @@ struct clock_source *dce100_clock_source_create( · 667 unmodified lines
668	return &clk_src->base;	668	return &clk_src->base;
669	}	669	}
670		670
		671	kfree(clk_src);
671	BREAK_TO_DEBUGGER();	672	BREAK_TO_DEBUGGER();
672	return NULL;	673	return NULL;
673	}	674	}

drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c+1−0

@@ -714,6 +714,7 @@ struct clock_source *dce110_clock_source_create( · 713 unmodified lines
714	return &clk_src->base;	714	return &clk_src->base;
715	}	715	}
716		716
		717	kfree(clk_src);
717	BREAK_TO_DEBUGGER();	718	BREAK_TO_DEBUGGER();
718	return NULL;	719	return NULL;
719	}	720	}

drivers/gpu/drm/amd/display/dc/dce112/dce112_resource.c+1−0

@@ -687,6 +687,7 @@ struct clock_source *dce112_clock_source_create( · 686 unmodified lines
687	return &clk_src->base;	687	return &clk_src->base;
688	}	688	}
689		689
		690	kfree(clk_src);
690	BREAK_TO_DEBUGGER();	691	BREAK_TO_DEBUGGER();
691	return NULL;	692	return NULL;
692	}	693	}

drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c+1−0

@@ -500,6 +500,7 @@ static struct clock_source *dce120_clock_source_create( · 499 unmodified lines
500	return &clk_src->base;	500	return &clk_src->base;
501	}	501	}
502		502
		503	kfree(clk_src);
503	BREAK_TO_DEBUGGER();	504	BREAK_TO_DEBUGGER();
504	return NULL;	505	return NULL;
505	}	506	}

drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c+1−0

@@ -701,6 +701,7 @@ struct clock_source *dce80_clock_source_create( · 700 unmodified lines
701	return &clk_src->base;	701	return &clk_src->base;
702	}	702	}
703		703
		704	kfree(clk_src);
704	BREAK_TO_DEBUGGER();	705	BREAK_TO_DEBUGGER();
705	return NULL;	706	return NULL;
706	}	707	}

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c+1−0

@@ -786,6 +786,7 @@ struct clock_source *dcn10_clock_source_create( · 785 unmodified lines
786	return &clk_src->base;	786	return &clk_src->base;
787	}	787	}
788		788
		789	kfree(clk_src);
789	BREAK_TO_DEBUGGER();	790	BREAK_TO_DEBUGGER();
790	return NULL;	791	return NULL;
791	}	792	}

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c+1−0

@@ -1077,6 +1077,7 @@ struct clock_source *dcn20_clock_source_create( · 1076 unmodified lines
1077	return &clk_src->base;	1077	return &clk_src->base;
1078	}	1078	}
1079		1079
		1080	kfree(clk_src);
1080	BREAK_TO_DEBUGGER();	1081	BREAK_TO_DEBUGGER();
1081	return NULL;	1082	return NULL;
1082	}	1083	}

drivers/gpu/drm/amd/display/dc/dcn21/Makefile+11−1

@@ -3,7 +3,17 @@ · 2 unmodified lines
3		3
4	DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o	4	DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o
5		5
6	CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse -mpreferred-stack-boundary=4	6	ifneq ($(call cc-option, -mpreferred-stack-boundary=4),)
		7	cc_stack_align := -mpreferred-stack-boundary=4
		8	else ifneq ($(call cc-option, -mstack-alignment=16),)
		9	cc_stack_align := -mstack-alignment=16
		10	endif
		11
		12	CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse $(cc_stack_align)
		13
		14	ifdef CONFIG_CC_IS_CLANG
		15	CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o += -msse2
		16	endif
7		17
8	AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))	18	AMD_DAL_DCN21 = $(addprefix $(AMDDALPATH)/dc/dcn21/,$(DCN21))
9		19

drivers/gpu/drm/amd/display/dc/dml/dcn21/display_mode_vba_21.c+5−8

  * ways. Unless there is something clearly wrong with it the code should
  * remain as-is as it provides us with a guarantee from HW that it is correct.
  */
-typedef unsigned int uint;
 typedef struct {
 	double DPPCLK;
 	double DISPCLK;
 				mode_lib->vba.MaximumReadBandwidthWithoutPrefetch = 0.0;
 				mode_lib->vba.MaximumReadBandwidthWithPrefetch = 0.0;
 				for (k = 0; k <= mode_lib->vba.NumberOfActivePlanes - 1; k++) {
-					uint m;
+					unsigned int m;
 					locals->cursor_bw[k] = 0;
 					locals->cursor_bw_pre[k] = 0;
 	double SecondMinActiveDRAMClockChangeMarginOneDisplayInVBLank;
 	double FullDETBufferingTimeYStutterCriticalPlane = 0;
 	double TimeToFinishSwathTransferStutterCriticalPlane = 0;
-	uint k, j;
+	unsigned int k, j;
 	mode_lib->vba.TotalActiveDPP = 0;
 	mode_lib->vba.TotalDCCActiveDPP = 0;
 		double DPPCLK[],
 		double *DCFCLKDeepSleep)
 {
-	uint k;
+	unsigned int k;
 	double DisplayPipeLineDeliveryTimeLuma;
 	double DisplayPipeLineDeliveryTimeChroma;
 	//double   DCFCLKDeepSleepPerPlane[DC__NUM_DPP__MAX];
 		double DisplayPipeRequestDeliveryTimeChromaPrefetch[])
 {
 	double req_per_swath_ub;
-	uint k;
+	unsigned int k;
 	for (k = 0; k < NumberOfActivePlanes; ++k) {
 		if (VRatio[k] <= 1) {
 	unsigned int dpte_groups_per_row_chroma_ub;
 	unsigned int num_group_per_lower_vm_stage;
 	unsigned int num_req_per_lower_vm_stage;
-	uint k;
+	unsigned int k;
 	for (k = 0; k < NumberOfActivePlanes; ++k) {
 		if (GPUVMEnable == true) {

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c+2−0

@@ -843,6 +843,8 @@ static int smu_sw_init(void *handle) · 842 unmodified lines
843	smu->smu_baco.state = SMU_BACO_STATE_EXIT;	843	smu->smu_baco.state = SMU_BACO_STATE_EXIT;
844	smu->smu_baco.platform_support = false;	844	smu->smu_baco.platform_support = false;
845		845
		846	mutex_init(&smu->sensor_lock);
		847
846	smu->watermarks_bitmap = 0;	848	smu->watermarks_bitmap = 0;
847	smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;	849	smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
848	smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;	850	smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c+2−0

 	if (!data || !size)
 		return -EINVAL;
+	mutex_lock(&smu->sensor_lock);
 	switch (sensor) {
 	case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
 		*(uint32_t *)data = pptable->FanMaximumRpm;
 	default:
 		ret = smu_smc_read_sensor(smu, sensor, data, size);
 	}
+	mutex_unlock(&smu->sensor_lock);
 	return ret;
 }

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h+1−0

@@ -344,6 +344,7 @@ struct smu_context · 343 unmodified lines
344	const struct smu_funcs *funcs;	344	const struct smu_funcs *funcs;
345	const struct pptable_funcs *ppt_funcs;	345	const struct pptable_funcs *ppt_funcs;
346	struct mutex mutex;	346	struct mutex mutex;
		347	struct mutex sensor_lock;
347	uint64_t pool_size;	348	uint64_t pool_size;
348		349
349	struct smu_table_context smu_table;	350	struct smu_table_context smu_table;

drivers/gpu/drm/amd/powerplay/navi10_ppt.c+3−1

 	struct smu_table_context *smu_table= &smu->smu_table;
 	int ret = 0;
-	if (!smu_table->metrics_time || time_after(jiffies, smu_table->metrics_time + HZ / 1000)) {
+	if (!smu_table->metrics_time || time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(100))) {
 		ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, 0,
 				(void *)smu_table->metrics_table, false);
 		if (ret) {
 	if(!data || !size)
 		return -EINVAL;
+	mutex_lock(&smu->sensor_lock);
 	switch (sensor) {
 	case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
 		*(uint32_t *)data = pptable->FanMaximumRpm;
 	default:
 		ret = smu_smc_read_sensor(smu, sensor, data, size);
 	}
+	mutex_unlock(&smu->sensor_lock);
 	return ret;
 }

drivers/gpu/drm/amd/powerplay/vega20_ppt.c+2−0

 	if(!data || !size)
 		return -EINVAL;
+	mutex_lock(&smu->sensor_lock);
 	switch (sensor) {
 	case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
 		*(uint32_t *)data = pptable->FanMaximumRpm;
 	default:
 		ret = smu_smc_read_sensor(smu, sensor, data, size);
 	}
+	mutex_unlock(&smu->sensor_lock);
 	return ret;
 }

drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c+4−3

 	struct komeda_data_flow_cfg dflow;
 	int err;
-	if (!writeback_job || !writeback_job->fb) {
+	if (!writeback_job)
 		return 0;
-	}
 	if (!crtc_st->active) {
 		DRM_DEBUG_ATOMIC("Cannot write the composition result out on a inactive CRTC.\n");
 					   &komeda_wb_encoder_helper_funcs,
 					   formats, n_formats);
 	komeda_put_fourcc_list(formats);
-	if (err)
+	if (err) {
+		kfree(kwb_conn);
 		return err;
+	}
 	drm_connector_helper_add(&wb_conn->base, &komeda_wb_conn_helper_funcs);

drivers/gpu/drm/arm/malidp_mw.c+2−2

@@ -131,7 +131,7 @@ malidp_mw_encoder_atomic_check(struct drm_encoder *encoder, · 130 unmodified lines
131	struct drm_framebuffer *fb;	131	struct drm_framebuffer *fb;
132	int i, n_planes;	132	int i, n_planes;
133		133
134	if (!conn_state->writeback_job \|\| !conn_state->writeback_job->fb)	134	if (!conn_state->writeback_job)
135	return 0;	135	return 0;
136		136
137	fb = conn_state->writeback_job->fb;	137	fb = conn_state->writeback_job->fb;
@@ -248,7 +248,7 @@ void malidp_mw_atomic_commit(struct drm_device *drm, · 110 unmodified lines
248		248
249	mw_state = to_mw_state(conn_state);	249	mw_state = to_mw_state(conn_state);
250		250
251	if (conn_state->writeback_job && conn_state->writeback_job->fb) {	251	if (conn_state->writeback_job) {
252	struct drm_framebuffer *fb = conn_state->writeback_job->fb;	252	struct drm_framebuffer *fb = conn_state->writeback_job->fb;
253		253
254	DRM_DEV_DEBUG_DRIVER(drm->dev,	254	DRM_DEV_DEBUG_DRIVER(drm->dev,

drivers/gpu/drm/bridge/tc358767.c+6−1

@@ -728,6 +728,8 @@ static int tc_set_video_mode(struct tc_data *tc, · 727 unmodified lines
728	int lower_margin = mode->vsync_start - mode->vdisplay;	728	int lower_margin = mode->vsync_start - mode->vdisplay;
729	int vsync_len = mode->vsync_end - mode->vsync_start;	729	int vsync_len = mode->vsync_end - mode->vsync_start;
730	u32 dp0_syncval;	730	u32 dp0_syncval;
		731	u32 bits_per_pixel = 24;
		732	u32 in_bw, out_bw;
731		733
732	/*	734	/*
733	* Recommended maximum number of symbols transferred in a transfer unit:	735	* Recommended maximum number of symbols transferred in a transfer unit:
@@ -735,7 +737,10 @@ static int tc_set_video_mode(struct tc_data *tc, · 1 unmodified line
735	* (output active video bandwidth in bytes))	737	* (output active video bandwidth in bytes))
736	* Must be less than tu_size.	738	* Must be less than tu_size.
737	*/	739	*/
738	max_tu_symbol = TU_SIZE_RECOMMENDED - 1;	740
		741	in_bw = mode->clock * bits_per_pixel / 8;
		742	out_bw = tc->link.base.num_lanes * tc->link.base.rate;
		743	max_tu_symbol = DIV_ROUND_UP(in_bw * TU_SIZE_RECOMMENDED, out_bw);
739		744
740	dev_dbg(tc->dev, "set mode %dx%d\n",	745	dev_dbg(tc->dev, "set mode %dx%d\n",
741	mode->hdisplay, mode->vdisplay);	746	mode->hdisplay, mode->vdisplay);

drivers/gpu/drm/drm_atomic.c+9−4

 		return -EINVAL;
 	}
-	if (writeback_job->out_fence && !writeback_job->fb) {
+	if (!writeback_job->fb) {
-		DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n",
+		if (writeback_job->out_fence) {
-				 connector->base.id, connector->name);
+			DRM_DEBUG_ATOMIC("[CONNECTOR:%d:%s] requesting out-fence without framebuffer\n",
-		return -EINVAL;
+					 connector->base.id, connector->name);
+			return -EINVAL;
+		}
+		drm_writeback_cleanup_job(writeback_job);
+		state->writeback_job = NULL;
 	}
 	return 0;

drivers/gpu/drm/drm_writeback.c+15−8

@@ -324,6 +324,9 @@ void drm_writeback_cleanup_job(struct drm_writeback_job *job) · 323 unmodified lines
324	if (job->fb)	324	if (job->fb)
325	drm_framebuffer_put(job->fb);	325	drm_framebuffer_put(job->fb);
326		326
		327	if (job->out_fence)
		328	dma_fence_put(job->out_fence);
		329
327	kfree(job);	330	kfree(job);
328	}	331	}
329	EXPORT_SYMBOL(drm_writeback_cleanup_job);	332	EXPORT_SYMBOL(drm_writeback_cleanup_job);
@@ -366,25 +369,29 @@ drm_writeback_signal_completion(struct drm_writeback_connector *wb_connector, · 36 unmodified lines
366	{	369	{
367	unsigned long flags;	370	unsigned long flags;
368	struct drm_writeback_job *job;	371	struct drm_writeback_job *job;
		372	struct dma_fence *out_fence;
369		373
370	spin_lock_irqsave(&wb_connector->job_lock, flags);	374	spin_lock_irqsave(&wb_connector->job_lock, flags);
371	job = list_first_entry_or_null(&wb_connector->job_queue,	375	job = list_first_entry_or_null(&wb_connector->job_queue,
372	struct drm_writeback_job,	376	struct drm_writeback_job,
373	list_entry);	377	list_entry);
374	if (job) {	378	if (job)
375	list_del(&job->list_entry);	379	list_del(&job->list_entry);
376	if (job->out_fence) {	380
377	if (status)
378	dma_fence_set_error(job->out_fence, status);
379	dma_fence_signal(job->out_fence);
380	dma_fence_put(job->out_fence);
381	}
382	}
383	spin_unlock_irqrestore(&wb_connector->job_lock, flags);	381	spin_unlock_irqrestore(&wb_connector->job_lock, flags);
384		382
385	if (WARN_ON(!job))	383	if (WARN_ON(!job))
386	return;	384	return;
387		385
		386	out_fence = job->out_fence;
		387	if (out_fence) {
		388	if (status)
		389	dma_fence_set_error(out_fence, status);
		390	dma_fence_signal(out_fence);
		391	dma_fence_put(out_fence);
		392	job->out_fence = NULL;
		393	}
		394
388	INIT_WORK(&job->cleanup_work, cleanup_work);	395	INIT_WORK(&job->cleanup_work, cleanup_work);
389	queue_work(system_long_wq, &job->cleanup_work);	396	queue_work(system_long_wq, &job->cleanup_work);
390	}	397	}

drivers/gpu/drm/i915/display/intel_display.c+22−5

 	switch (fb->modifier) {
 	case DRM_FORMAT_MOD_LINEAR:
 	case I915_FORMAT_MOD_X_TILED:
-		return 4096;
+		/*
+		 * Validated limit is 4k, but has 5k should
+		 * work apart from the following features:
+		 * - Ytile (already limited to 4k)
+		 * - FP16 (already limited to 4k)
+		 * - render compression (already limited to 4k)
+		 * - KVMR sprite and cursor (don't care)
+		 * - horizontal panning (TODO verify this)
+		 * - pipe and plane scaling (TODO verify this)
+		 */
+		if (cpp == 8)
+			return 4096;
+		else
+			return 5120;
 	case I915_FORMAT_MOD_Y_TILED_CCS:
 	case I915_FORMAT_MOD_Yf_TILED_CCS:
 		/* FIXME AUX plane? */
 	pipe_config->fdi_lanes = lane;
 	intel_link_compute_m_n(pipe_config->pipe_bpp, lane, fdi_dotclock,
-			       link_bw, &pipe_config->fdi_m_n, false);
+			       link_bw, &pipe_config->fdi_m_n, false, false);
 	ret = ironlake_check_fdi_lanes(dev, intel_crtc->pipe, pipe_config);
 	if (ret == -EDEADLK)
 intel_link_compute_m_n(u16 bits_per_pixel, int nlanes,
 		       int pixel_clock, int link_clock,
 		       struct intel_link_m_n *m_n,
-		       bool constant_n)
+		       bool constant_n, bool fec_enable)
 {
-	m_n->tu = 64;
+	u32 data_clock = bits_per_pixel * pixel_clock;
-	compute_m_n(bits_per_pixel * pixel_clock,
+	if (fec_enable)
+		data_clock = intel_dp_mode_to_fec_clock(data_clock);
+	m_n->tu = 64;
+	compute_m_n(data_clock,
 		    link_clock * nlanes * 8,
 		    &m_n->gmch_m, &m_n->gmch_n,
 		    constant_n);

drivers/gpu/drm/i915/display/intel_display.h+1−1

@@ -414,7 +414,7 @@ enum phy_fia { · 413 unmodified lines
414	void intel_link_compute_m_n(u16 bpp, int nlanes,	414	void intel_link_compute_m_n(u16 bpp, int nlanes,
415	int pixel_clock, int link_clock,	415	int pixel_clock, int link_clock,
416	struct intel_link_m_n *m_n,	416	struct intel_link_m_n *m_n,
417	bool constant_n);	417	bool constant_n, bool fec_enable);
418	bool is_ccs_modifier(u64 modifier);	418	bool is_ccs_modifier(u64 modifier);
419	void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);	419	void lpt_disable_clkout_dp(struct drm_i915_private *dev_priv);
420	u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,	420	u32 intel_plane_fb_max_stride(struct drm_i915_private *dev_priv,

drivers/gpu/drm/i915/display/intel_dp.c+95−89

 #define DP_DSC_MAX_ENC_THROUGHPUT_0		340000
 #define DP_DSC_MAX_ENC_THROUGHPUT_1		400000
-/* DP DSC FEC Overhead factor = (100 - 2.4)/100 */
+/* DP DSC FEC Overhead factor = 1/(0.972261) */
-#define DP_DSC_FEC_OVERHEAD_FACTOR		976
+#define DP_DSC_FEC_OVERHEAD_FACTOR		972261
 /* Compliance test status bits  */
 #define INTEL_DP_RESOLUTION_SHIFT_MASK	0
 	return 0;
 }
+u32 intel_dp_mode_to_fec_clock(u32 mode_clock)
+{
+	return div_u64(mul_u32_u32(mode_clock, 1000000U),
+		       DP_DSC_FEC_OVERHEAD_FACTOR);
+}
+static u16 intel_dp_dsc_get_output_bpp(u32 link_clock, u32 lane_count,
+				       u32 mode_clock, u32 mode_hdisplay)
+{
+	u32 bits_per_pixel, max_bpp_small_joiner_ram;
+	int i;
+	/*
+	 * Available Link Bandwidth(Kbits/sec) = (NumberOfLanes)*
+	 * (LinkSymbolClock)* 8 * (TimeSlotsPerMTP)
+	 * for SST -> TimeSlotsPerMTP is 1,
+	 * for MST -> TimeSlotsPerMTP has to be calculated
+	 */
+	bits_per_pixel = (link_clock * lane_count * 8) /
+			 intel_dp_mode_to_fec_clock(mode_clock);
+	DRM_DEBUG_KMS("Max link bpp: %u\n", bits_per_pixel);
+	/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */
+	max_bpp_small_joiner_ram = DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER / mode_hdisplay;
+	DRM_DEBUG_KMS("Max small joiner bpp: %u\n", max_bpp_small_joiner_ram);
+	/*
+	 * Greatest allowed DSC BPP = MIN (output BPP from available Link BW
+	 * check, output bpp from small joiner RAM check)
+	 */
+	bits_per_pixel = min(bits_per_pixel, max_bpp_small_joiner_ram);
+	/* Error out if the max bpp is less than smallest allowed valid bpp */
+	if (bits_per_pixel < valid_dsc_bpp[0]) {
+		DRM_DEBUG_KMS("Unsupported BPP %u, min %u\n",
+			      bits_per_pixel, valid_dsc_bpp[0]);
+		return 0;
+	}
+	/* Find the nearest match in the array of known BPPs from VESA */
+	for (i = 0; i < ARRAY_SIZE(valid_dsc_bpp) - 1; i++) {
+		if (bits_per_pixel < valid_dsc_bpp[i + 1])
+			break;
+	}
+	bits_per_pixel = valid_dsc_bpp[i];
+	/*
+	 * Compressed BPP in U6.4 format so multiply by 16, for Gen 11,
+	 * fractional part is 0
+	 */
+	return bits_per_pixel << 4;
+}
+static u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,
+				       int mode_clock, int mode_hdisplay)
+{
+	u8 min_slice_count, i;
+	int max_slice_width;
+	if (mode_clock <= DP_DSC_PEAK_PIXEL_RATE)
+		min_slice_count = DIV_ROUND_UP(mode_clock,
+					       DP_DSC_MAX_ENC_THROUGHPUT_0);
+	else
+		min_slice_count = DIV_ROUND_UP(mode_clock,
+					       DP_DSC_MAX_ENC_THROUGHPUT_1);
+	max_slice_width = drm_dp_dsc_sink_max_slice_width(intel_dp->dsc_dpcd);
+	if (max_slice_width < DP_DSC_MIN_SLICE_WIDTH_VALUE) {
+		DRM_DEBUG_KMS("Unsupported slice width %d by DP DSC Sink device\n",
+			      max_slice_width);
+		return 0;
+	}
+	/* Also take into account max slice width */
+	min_slice_count = min_t(u8, min_slice_count,
+				DIV_ROUND_UP(mode_hdisplay,
+					     max_slice_width));
+	/* Find the closest match to the valid slice count values */
+	for (i = 0; i < ARRAY_SIZE(valid_dsc_slicecount); i++) {
+		if (valid_dsc_slicecount[i] >
+		    drm_dp_dsc_sink_max_slice_count(intel_dp->dsc_dpcd,
+						    false))
+			break;
+		if (min_slice_count  <= valid_dsc_slicecount[i])
+			return valid_dsc_slicecount[i];
+	}
+	DRM_DEBUG_KMS("Unsupported Slice Count %d\n", min_slice_count);
+	return 0;
+}
 static enum drm_mode_status
 intel_dp_mode_valid(struct drm_connector *connector,
 		    struct drm_display_mode *mode)
 			       adjusted_mode->crtc_clock,
 			       pipe_config->port_clock,
 			       &pipe_config->dp_m_n,
-			       constant_n);
+			       constant_n, pipe_config->fec_enable);
 	if (intel_connector->panel.downclock_mode != NULL &&
 		dev_priv->drrs.type == SEAMLESS_DRRS_SUPPORT) {
 					       intel_connector->panel.downclock_mode->clock,
 					       pipe_config->port_clock,
 					       &pipe_config->dp_m2_n2,
-					       constant_n);
+					       constant_n, pipe_config->fec_enable);
 	}
 	if (!HAS_DDI(dev_priv))
 		DP_DPRX_ESI_LEN;
 }
-u16 intel_dp_dsc_get_output_bpp(int link_clock, u8 lane_count,
-				int mode_clock, int mode_hdisplay)
-{
-	u16 bits_per_pixel, max_bpp_small_joiner_ram;
-	int i;
-	/*
-	 * Available Link Bandwidth(Kbits/sec) = (NumberOfLanes)*
-	 * (LinkSymbolClock)* 8 * ((100-FECOverhead)/100)*(TimeSlotsPerMTP)
-	 * FECOverhead = 2.4%, for SST -> TimeSlotsPerMTP is 1,
-	 * for MST -> TimeSlotsPerMTP has to be calculated
-	 */
-	bits_per_pixel = (link_clock * lane_count * 8 *
-			  DP_DSC_FEC_OVERHEAD_FACTOR) /
-		mode_clock;
-	/* Small Joiner Check: output bpp <= joiner RAM (bits) / Horiz. width */
-	max_bpp_small_joiner_ram = DP_DSC_MAX_SMALL_JOINER_RAM_BUFFER /
-		mode_hdisplay;
-	/*
-	 * Greatest allowed DSC BPP = MIN (output BPP from avaialble Link BW
-	 * check, output bpp from small joiner RAM check)
-	 */
-	bits_per_pixel = min(bits_per_pixel, max_bpp_small_joiner_ram);
-	/* Error out if the max bpp is less than smallest allowed valid bpp */
-	if (bits_per_pixel < valid_dsc_bpp[0]) {
-		DRM_DEBUG_KMS("Unsupported BPP %d\n", bits_per_pixel);
-		return 0;
-	}
-	/* Find the nearest match in the array of known BPPs from VESA */
-	for (i = 0; i < ARRAY_SIZE(valid_dsc_bpp) - 1; i++) {
-		if (bits_per_pixel < valid_dsc_bpp[i + 1])
-			break;
-	}
-	bits_per_pixel = valid_dsc_bpp[i];
-	/*
-	 * Compressed BPP in U6.4 format so multiply by 16, for Gen 11,
-	 * fractional part is 0
-	 */
-	return bits_per_pixel << 4;
-}
-u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp,
-				int mode_clock,
-				int mode_hdisplay)
-{
-	u8 min_slice_count, i;
-	int max_slice_width;
-	if (mode_clock <= DP_DSC_PEAK_PIXEL_RATE)
-		min_slice_count = DIV_ROUND_UP(mode_clock,
-					       DP_DSC_MAX_ENC_THROUGHPUT_0);
-	else
-		min_slice_count = DIV_ROUND_UP(mode_clock,
-					       DP_DSC_MAX_ENC_THROUGHPUT_1);
-	max_slice_width = drm_dp_dsc_sink_max_slice_width(intel_dp->dsc_dpcd);
-	if (max_slice_width < DP_DSC_MIN_SLICE_WIDTH_VALUE) {
-		DRM_DEBUG_KMS("Unsupported slice width %d by DP DSC Sink device\n",
-			      max_slice_width);
-		return 0;
-	}
-	/* Also take into account max slice width */
-	min_slice_count = min_t(u8, min_slice_count,
-				DIV_ROUND_UP(mode_hdisplay,
-					     max_slice_width));
-	/* Find the closest match to the valid slice count values */
-	for (i = 0; i < ARRAY_SIZE(valid_dsc_slicecount); i++) {
-		if (valid_dsc_slicecount[i] >
-		    drm_dp_dsc_sink_max_slice_count(intel_dp->dsc_dpcd,
-						    false))
-			break;
-		if (min_slice_count  <= valid_dsc_slicecount[i])
-			return valid_dsc_slicecount[i];
-	}
-	DRM_DEBUG_KMS("Unsupported Slice Count %d\n", min_slice_count);
-	return 0;
-}
 static void
 intel_pixel_encoding_setup_vsc(struct intel_dp *intel_dp,
 			       const struct intel_crtc_state *crtc_state)

drivers/gpu/drm/i915/display/intel_dp.h+2−4

 bool intel_dp_source_supports_hbr3(struct intel_dp *intel_dp);
 bool
 intel_dp_get_link_status(struct intel_dp *intel_dp, u8 *link_status);
-u16 intel_dp_dsc_get_output_bpp(int link_clock, u8 lane_count,
-				int mode_clock, int mode_hdisplay);
-u8 intel_dp_dsc_get_slice_count(struct intel_dp *intel_dp, int mode_clock,
-				int mode_hdisplay);
 bool intel_dp_read_dpcd(struct intel_dp *intel_dp);
 bool intel_dp_get_colorimetry_status(struct intel_dp *intel_dp);
 	return ~((1 << lane_count) - 1) & 0xf;
 }
+u32 intel_dp_mode_to_fec_clock(u32 mode_clock);
 #endif /* __INTEL_DP_H__ */

drivers/gpu/drm/i915/display/intel_dp_mst.c+2−2

@@ -81,7 +81,7 @@ static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder, · 80 unmodified lines
81	adjusted_mode->crtc_clock,	81	adjusted_mode->crtc_clock,
82	crtc_state->port_clock,	82	crtc_state->port_clock,
83	&crtc_state->dp_m_n,	83	&crtc_state->dp_m_n,
84	constant_n);	84	constant_n, crtc_state->fec_enable);
85	crtc_state->dp_m_n.tu = slots;	85	crtc_state->dp_m_n.tu = slots;
86		86
87	return 0;	87	return 0;
@@ -615,7 +615,7 @@ intel_dp_create_fake_mst_encoder(struct intel_digital_port *intel_dig_port, enum · 527 unmodified lines
615	intel_encoder->type = INTEL_OUTPUT_DP_MST;	615	intel_encoder->type = INTEL_OUTPUT_DP_MST;
616	intel_encoder->power_domain = intel_dig_port->base.power_domain;	616	intel_encoder->power_domain = intel_dig_port->base.power_domain;
617	intel_encoder->port = intel_dig_port->base.port;	617	intel_encoder->port = intel_dig_port->base.port;
618	intel_encoder->crtc_mask = BIT(pipe);	618	intel_encoder->crtc_mask = 0x7;
619	intel_encoder->cloneable = 0;	619	intel_encoder->cloneable = 0;
620		620
621	intel_encoder->compute_config = intel_dp_mst_compute_config;	621	intel_encoder->compute_config = intel_dp_mst_compute_config;

drivers/gpu/drm/i915/display/intel_sprite.c+3−2

 	int src_x, src_w, src_h, crtc_w, crtc_h;
 	const struct drm_display_mode *adjusted_mode =
 		&crtc_state->base.adjusted_mode;
+	unsigned int stride = plane_state->color_plane[0].stride;
 	unsigned int cpp = fb->format->cpp[0];
 	unsigned int width_bytes;
 	int min_width, min_height;
 		return -EINVAL;
 	}
-	if (width_bytes > 4096 || fb->pitches[0] > 4096) {
+	if (stride > 4096) {
 		DRM_DEBUG_KMS("Stride (%u) exceeds hardware max with scaling (%u)\n",
-			      fb->pitches[0], 4096);
+			      stride, 4096);
 		return -EINVAL;
 	}

drivers/gpu/drm/i915/gem/i915_gem_mman.c+7−5

 	wakeref = intel_runtime_pm_get(rpm);
-	srcu = intel_gt_reset_trylock(ggtt->vm.gt);
+	ret = intel_gt_reset_trylock(ggtt->vm.gt, &srcu);
-	if (srcu < 0) {
+	if (ret)
-		ret = srcu;
 		goto err_rpm;
-	}
 	ret = i915_mutex_lock_interruptible(dev);
 	if (ret)
 		intel_wakeref_auto(&i915->ggtt.userfault_wakeref,
 				   msecs_to_jiffies_timeout(CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND));
-	i915_vma_set_ggtt_write(vma);
+	if (write) {
+		GEM_BUG_ON(!i915_gem_object_has_pinned_pages(obj));
+		i915_vma_set_ggtt_write(vma);
+		obj->mm.dirty = true;
+	}
 err_fence:
 	i915_vma_unpin_fence(vma);

drivers/gpu/drm/i915/gem/i915_gem_pm.c+0−3

@@ -241,9 +241,6 @@ void i915_gem_resume(struct drm_i915_private *i915) · 240 unmodified lines
241	mutex_lock(&i915->drm.struct_mutex);	241	mutex_lock(&i915->drm.struct_mutex);
242	intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);	242	intel_uncore_forcewake_get(&i915->uncore, FORCEWAKE_ALL);
243		243
244	i915_gem_restore_gtt_mappings(i915);
245	i915_gem_restore_fences(i915);
246
247	if (i915_gem_init_hw(i915))	244	if (i915_gem_init_hw(i915))
248	goto err_wedged;	245	goto err_wedged;
249		246

drivers/gpu/drm/i915/gt/intel_engine.h+14−0

@@ -136,6 +136,20 @@ execlists_active(const struct intel_engine_execlists *execlists) · 135 unmodified lines
136	return READ_ONCE(*execlists->active);	136	return READ_ONCE(*execlists->active);
137	}	137	}
138		138
		139	static inline void
		140	execlists_active_lock_bh(struct intel_engine_execlists *execlists)
		141	{
		142	local_bh_disable(); /* prevent local softirq and lock recursion */
		143	tasklet_lock(&execlists->tasklet);
		144	}
		145
		146	static inline void
		147	execlists_active_unlock_bh(struct intel_engine_execlists *execlists)
		148	{
		149	tasklet_unlock(&execlists->tasklet);
		150	local_bh_enable(); /* restore softirq, and kick ksoftirqd! */
		151	}
		152
139	struct i915_request *	153	struct i915_request *
140	execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists);	154	execlists_unwind_incomplete_requests(struct intel_engine_execlists *execlists);
141		155

drivers/gpu/drm/i915/gt/intel_engine_cs.c+7−9

 					 struct drm_printer *m)
 {
 	struct drm_i915_private *dev_priv = engine->i915;
-	const struct intel_engine_execlists * const execlists =
+	struct intel_engine_execlists * const execlists = &engine->execlists;
-		&engine->execlists;
-	unsigned long flags;
 	u64 addr;
 	if (engine->id == RENDER_CLASS && IS_GEN_RANGE(dev_priv, 4, 7))
 				   idx, hws[idx * 2], hws[idx * 2 + 1]);
 		}
-		spin_lock_irqsave(&engine->active.lock, flags);
+		execlists_active_lock_bh(execlists);
 		for (port = execlists->active; (rq = *port); port++) {
 			char hdr[80];
 			int len;
 				 hwsp_seqno(rq));
 			print_request(m, rq, hdr);
 		}
-		spin_unlock_irqrestore(&engine->active.lock, flags);
+		execlists_active_unlock_bh(execlists);
 	} else if (INTEL_GEN(dev_priv) > 6) {
 		drm_printf(m, "\tPP_DIR_BASE: 0x%08x\n",
 			   ENGINE_READ(engine, RING_PP_DIR_BASE));
 	if (!intel_engine_supports_stats(engine))
 		return -ENODEV;
-	spin_lock_irqsave(&engine->active.lock, flags);
+	execlists_active_lock_bh(execlists);
-	write_seqlock(&engine->stats.lock);
+	write_seqlock_irqsave(&engine->stats.lock, flags);
 	if (unlikely(engine->stats.enabled == ~0)) {
 		err = -EBUSY;
 	}
 unlock:
-	write_sequnlock(&engine->stats.lock);
+	write_sequnlock_irqrestore(&engine->stats.lock, flags);
-	spin_unlock_irqrestore(&engine->active.lock, flags);
+	execlists_active_unlock_bh(execlists);
 	return err;
 }

drivers/gpu/drm/i915/gt/intel_lrc.c+63−38

@@ -631,7 +631,6 @@ execlists_schedule_out(struct i915_request *rq) · 630 unmodified lines
631	struct intel_engine_cs cur, old;	631	struct intel_engine_cs cur, old;
632		632
633	trace_i915_request_out(rq);	633	trace_i915_request_out(rq);
634	GEM_BUG_ON(intel_context_inflight(ce) != rq->engine);
635		634
636	old = READ_ONCE(ce->inflight);	635	old = READ_ONCE(ce->inflight);
637	do	636	do
@@ -797,6 +796,17 @@ static bool can_merge_rq(const struct i915_request *prev, · 159 unmodified lines
797	GEM_BUG_ON(prev == next);	796	GEM_BUG_ON(prev == next);
798	GEM_BUG_ON(!assert_priority_queue(prev, next));	797	GEM_BUG_ON(!assert_priority_queue(prev, next));
799		798
		799	/*
		800	* We do not submit known completed requests. Therefore if the next
		801	* request is already completed, we can pretend to merge it in
		802	* with the previous context (and we will skip updating the ELSP
		803	* and tracking). Thus hopefully keeping the ELSP full with active
		804	* contexts, despite the best efforts of preempt-to-busy to confuse
		805	* us.
		806	*/
		807	if (i915_request_completed(next))
		808	return true;
		809
800	if (!can_merge_ctx(prev->hw_context, next->hw_context))	810	if (!can_merge_ctx(prev->hw_context, next->hw_context))
801	return false;	811	return false;
802		812
@@ -893,7 +903,7 @@ static void virtual_xfer_breadcrumbs(struct virtual_engine *ve, · 90 unmodified lines
893	static struct i915_request *	903	static struct i915_request *
894	last_active(const struct intel_engine_execlists *execlists)	904	last_active(const struct intel_engine_execlists *execlists)
895	{	905	{
896	struct i915_request * const *last = execlists->active;	906	struct i915_request * const *last = READ_ONCE(execlists->active);
897		907
898	while (last && i915_request_completed(last))	908	while (last && i915_request_completed(last))
899	last++;	909	last++;
@@ -1172,21 +1182,6 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 272 unmodified lines
1172	continue;	1182	continue;
1173	}	1183	}
1174		1184
1175	if (i915_request_completed(rq)) {
1176	ve->request = NULL;
1177	ve->base.execlists.queue_priority_hint = INT_MIN;
1178	rb_erase_cached(rb, &execlists->virtual);
1179	RB_CLEAR_NODE(rb);
1180
1181	rq->engine = engine;
1182	__i915_request_submit(rq);
1183
1184	spin_unlock(&ve->base.active.lock);
1185
1186	rb = rb_first_cached(&execlists->virtual);
1187	continue;
1188	}
1189
1190	if (last && !can_merge_rq(last, rq)) {	1185	if (last && !can_merge_rq(last, rq)) {
1191	spin_unlock(&ve->base.active.lock);	1186	spin_unlock(&ve->base.active.lock);
1192	return; /* leave this for another */	1187	return; /* leave this for another */
@@ -1237,11 +1232,23 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 44 unmodified lines
1237	GEM_BUG_ON(ve->siblings[0] != engine);	1232	GEM_BUG_ON(ve->siblings[0] != engine);
1238	}	1233	}
1239		1234
1240	__i915_request_submit(rq);	1235	if (__i915_request_submit(rq)) {
1241	if (!i915_request_completed(rq)) {
1242	submit = true;	1236	submit = true;
1243	last = rq;	1237	last = rq;
1244	}	1238	}
		1239
		1240	/*
		1241	* Hmm, we have a bunch of virtual engine requests,
		1242	* but the first one was already completed (thanks
		1243	* preempt-to-busy!). Keep looking at the veng queue
		1244	* until we have no more relevant requests (i.e.
		1245	* the normal submit queue has higher priority).
		1246	*/
		1247	if (!submit) {
		1248	spin_unlock(&ve->base.active.lock);
		1249	rb = rb_first_cached(&execlists->virtual);
		1250	continue;
		1251	}
1245	}	1252	}
1246		1253
1247	spin_unlock(&ve->base.active.lock);	1254	spin_unlock(&ve->base.active.lock);
@@ -1254,8 +1261,7 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 6 unmodified lines
1254	int i;	1261	int i;
1255		1262
1256	priolist_for_each_request_consume(rq, rn, p, i) {	1263	priolist_for_each_request_consume(rq, rn, p, i) {
1257	if (i915_request_completed(rq))	1264	bool merge = true;
1258	goto skip;
1259		1265
1260	/*	1266	/*
1261	* Can we combine this request with the current port?	1267	* Can we combine this request with the current port?
@@ -1296,14 +1302,23 @@ static void execlists_dequeue(struct intel_engine_cs *engine) · 34 unmodified lines
1296	ctx_single_port_submission(rq->hw_context))	1302	ctx_single_port_submission(rq->hw_context))
1297	goto done;	1303	goto done;
1298		1304
1299	*port = execlists_schedule_in(last, port - execlists->pending);	1305	merge = false;
1300	port++;
1301	}	1306	}
1302		1307
1303	last = rq;	1308	if (__i915_request_submit(rq)) {
1304	submit = true;	1309	if (!merge) {
1305	skip:	1310	*port = execlists_schedule_in(last, port - execlists->pending);
1306	__i915_request_submit(rq);	1311	port++;
		1312	last = NULL;
		1313	}
		1314
		1315	GEM_BUG_ON(last &&
		1316	!can_merge_ctx(last->hw_context,
		1317	rq->hw_context));
		1318
		1319	submit = true;
		1320	last = rq;
		1321	}
1307	}	1322	}
1308		1323
1309	rb_erase_cached(&p->node, &execlists->queue);	1324	rb_erase_cached(&p->node, &execlists->queue);
@@ -1593,8 +1608,11 @@ static void process_csb(struct intel_engine_cs *engine) · 283 unmodified lines
1593	static void __execlists_submission_tasklet(struct intel_engine_cs *const engine)	1608	static void __execlists_submission_tasklet(struct intel_engine_cs *const engine)
1594	{	1609	{
1595	lockdep_assert_held(&engine->active.lock);	1610	lockdep_assert_held(&engine->active.lock);
1596	if (!engine->execlists.pending[0])	1611	if (!engine->execlists.pending[0]) {
		1612	rcu_read_lock(); /* protect peeking at execlists->active */
1597	execlists_dequeue(engine);	1613	execlists_dequeue(engine);
		1614	rcu_read_unlock();
		1615	}
1598	}	1616	}
1599		1617
1600	/*	1618	/*
@@ -2399,10 +2417,14 @@ static void reset_csb_pointers(struct intel_engine_cs *engine) · 798 unmodified lines
2399		2417
2400	static struct i915_request active_request(struct i915_request rq)	2418	static struct i915_request active_request(struct i915_request rq)
2401	{	2419	{
2402	const struct list_head * const list = &rq->timeline->requests;
2403	const struct intel_context * const ce = rq->hw_context;	2420	const struct intel_context * const ce = rq->hw_context;
2404	struct i915_request *active = NULL;	2421	struct i915_request *active = NULL;
		2422	struct list_head *list;
		2423
		2424	if (!i915_request_is_active(rq)) /* unwound, but incomplete! */
		2425	return rq;
2405		2426
		2427	list = &rq->timeline->requests;
2406	list_for_each_entry_from_reverse(rq, list, link) {	2428	list_for_each_entry_from_reverse(rq, list, link) {
2407	if (i915_request_completed(rq))	2429	if (i915_request_completed(rq))
2408	break;	2430	break;
@@ -2565,7 +2587,6 @@ static void execlists_cancel_requests(struct intel_engine_cs *engine) · 156 unmodified lines
2565	int i;	2587	int i;
2566		2588
2567	priolist_for_each_request_consume(rq, rn, p, i) {	2589	priolist_for_each_request_consume(rq, rn, p, i) {
2568	list_del_init(&rq->sched.link);
2569	__i915_request_submit(rq);	2590	__i915_request_submit(rq);
2570	dma_fence_set_error(&rq->fence, -EIO);	2591	dma_fence_set_error(&rq->fence, -EIO);
2571	i915_request_mark_complete(rq);	2592	i915_request_mark_complete(rq);
@@ -3631,18 +3652,22 @@ static void · 1059 unmodified lines
3631	virtual_bond_execute(struct i915_request rq, struct dma_fence signal)	3652	virtual_bond_execute(struct i915_request rq, struct dma_fence signal)
3632	{	3653	{
3633	struct virtual_engine *ve = to_virtual_engine(rq->engine);	3654	struct virtual_engine *ve = to_virtual_engine(rq->engine);
		3655	intel_engine_mask_t allowed, exec;
3634	struct ve_bond *bond;	3656	struct ve_bond *bond;
3635		3657
		3658	allowed = ~to_request(signal)->engine->mask;
		3659
3636	bond = virtual_find_bond(ve, to_request(signal)->engine);	3660	bond = virtual_find_bond(ve, to_request(signal)->engine);
3637	if (bond) {	3661	if (bond)
3638	intel_engine_mask_t old, new, cmp;	3662	allowed &= bond->sibling_mask;
3639		3663
3640	cmp = READ_ONCE(rq->execution_mask);	3664	/* Restrict the bonded request to run on only the available engines */
3641	do {	3665	exec = READ_ONCE(rq->execution_mask);
3642	old = cmp;	3666	while (!try_cmpxchg(&rq->execution_mask, &exec, exec & allowed))
3643	new = cmp & bond->sibling_mask;	3667	;
3644	} while ((cmp = cmpxchg(&rq->execution_mask, old, new)) != old);	3668
3645	}	3669	/* Prevent the master from being re-run on the bonded engines */
		3670	to_request(signal)->execution_mask &= ~allowed;
3646	}	3671	}
3647		3672
3648	struct intel_context *	3673	struct intel_context *

drivers/gpu/drm/i915/gt/intel_reset.c+4−8

 	struct intel_engine_cs *engine = rq->engine;
 	struct i915_gem_context *hung_ctx = rq->gem_context;
-	lockdep_assert_held(&engine->active.lock);
 	if (!i915_request_is_active(rq))
 		return;
+	lockdep_assert_held(&engine->active.lock);
 	list_for_each_entry_continue(rq, &engine->active.requests, sched.link)
 		if (rq->gem_context == hung_ctx)
 			i915_request_skip(rq, -EIO);
 		  rq->fence.seqno,
 		  yesno(guilty));
-	lockdep_assert_held(&rq->engine->active.lock);
 	GEM_BUG_ON(i915_request_completed(rq));
 	if (guilty) {
 	intel_runtime_pm_put(&gt->i915->runtime_pm, wakeref);
 }
-int intel_gt_reset_trylock(struct intel_gt *gt)
+int intel_gt_reset_trylock(struct intel_gt *gt, int *srcu)
 {
-	int srcu;
 	might_lock(&gt->reset.backoff_srcu);
 	might_sleep();
 		rcu_read_lock();
 	}
-	srcu = srcu_read_lock(&gt->reset.backoff_srcu);
+	*srcu = srcu_read_lock(&gt->reset.backoff_srcu);
 	rcu_read_unlock();
-	return srcu;
+	return 0;
 }
 void intel_gt_reset_unlock(struct intel_gt *gt, int tag)

drivers/gpu/drm/i915/gt/intel_reset.h+1−1

@@ -38,7 +38,7 @@ int intel_engine_reset(struct intel_engine_cs *engine, · 37 unmodified lines
38		38
39	void __i915_request_reset(struct i915_request *rq, bool guilty);	39	void __i915_request_reset(struct i915_request *rq, bool guilty);
40		40
41	int __must_check intel_gt_reset_trylock(struct intel_gt *gt);	41	int __must_check intel_gt_reset_trylock(struct intel_gt gt, int srcu);
42	void intel_gt_reset_unlock(struct intel_gt *gt, int tag);	42	void intel_gt_reset_unlock(struct intel_gt *gt, int tag);
43		43
44	void intel_gt_set_wedged(struct intel_gt *gt);	44	void intel_gt_set_wedged(struct intel_gt *gt);

drivers/gpu/drm/i915/gt/intel_ringbuffer.c+1−1

@@ -1573,7 +1573,7 @@ static inline int mi_set_context(struct i915_request *rq, u32 flags) · 1572 unmodified lines
1573	struct intel_engine_cs *engine = rq->engine;	1573	struct intel_engine_cs *engine = rq->engine;
1574	enum intel_engine_id id;	1574	enum intel_engine_id id;
1575	const int num_engines =	1575	const int num_engines =
1576	IS_HSW_GT1(i915) ? RUNTIME_INFO(i915)->num_engines - 1 : 0;	1576	IS_HASWELL(i915) ? RUNTIME_INFO(i915)->num_engines - 1 : 0;
1577	bool force_restore = false;	1577	bool force_restore = false;
1578	int len;	1578	int len;
1579	u32 *cs;	1579	u32 *cs;

drivers/gpu/drm/i915/gt/intel_workarounds.c+3−0

@@ -1063,6 +1063,9 @@ static void gen9_whitelist_build(struct i915_wa_list *w) · 1062 unmodified lines
1063		1063
1064	/* WaAllowUMDToModifyHDCChicken1:skl,bxt,kbl,glk,cfl */	1064	/* WaAllowUMDToModifyHDCChicken1:skl,bxt,kbl,glk,cfl */
1065	whitelist_reg(w, GEN8_HDC_CHICKEN1);	1065	whitelist_reg(w, GEN8_HDC_CHICKEN1);
		1066
		1067	/* WaSendPushConstantsFromMMIO:skl,bxt */
		1068	whitelist_reg(w, COMMON_SLICE_CHICKEN2);
1066	}	1069	}
1067		1070
1068	static void skl_whitelist_build(struct intel_engine_cs *engine)	1071	static void skl_whitelist_build(struct intel_engine_cs *engine)

drivers/gpu/drm/i915/i915_drv.c+5−0

 	if (ret)
 		DRM_ERROR("failed to re-enable GGTT\n");
+	mutex_lock(&dev_priv->drm.struct_mutex);
+	i915_gem_restore_gtt_mappings(dev_priv);
+	i915_gem_restore_fences(dev_priv);
+	mutex_unlock(&dev_priv->drm.struct_mutex);
 	intel_csr_ucode_resume(dev_priv);
 	i915_restore_state(dev_priv);

drivers/gpu/drm/i915/i915_gem.h+6−0

 #define I915_GEM_IDLE_TIMEOUT (HZ / 5)
+static inline void tasklet_lock(struct tasklet_struct *t)
+{
+	while (!tasklet_trylock(t))
+		cpu_relax();
+}
 static inline void __tasklet_disable_sync_once(struct tasklet_struct *t)
 {
 	if (!atomic_fetch_inc(&t->count))

drivers/gpu/drm/i915/i915_request.c+54−15

 	}
 }
+static void remove_from_engine(struct i915_request *rq)
+{
+	struct intel_engine_cs *engine, *locked;
+	/*
+	 * Virtual engines complicate acquiring the engine timeline lock,
+	 * as their rq->engine pointer is not stable until under that
+	 * engine lock. The simple ploy we use is to take the lock then
+	 * check that the rq still belongs to the newly locked engine.
+	 */
+	locked = READ_ONCE(rq->engine);
+	spin_lock(&locked->active.lock);
+	while (unlikely(locked != (engine = READ_ONCE(rq->engine)))) {
+		spin_unlock(&locked->active.lock);
+		spin_lock(&engine->active.lock);
+		locked = engine;
+	}
+	list_del(&rq->sched.link);
+	spin_unlock(&locked->active.lock);
+}
 static bool i915_request_retire(struct i915_request *rq)
 {
 	struct i915_active_request *active, *next;
 	 * request that we have removed from the HW and put back on a run
 	 * queue.
 	 */
-	spin_lock(&rq->engine->active.lock);
+	remove_from_engine(rq);
-	list_del(&rq->sched.link);
-	spin_unlock(&rq->engine->active.lock);
 	spin_lock(&rq->lock);
 	i915_request_mark_complete(rq);
 	return 0;
 }
-void __i915_request_submit(struct i915_request *request)
+bool __i915_request_submit(struct i915_request *request)
 {
 	struct intel_engine_cs *engine = request->engine;
+	bool result = false;
 	GEM_TRACE("%s fence %llx:%lld, current %d\n",
 		  engine->name,
 	GEM_BUG_ON(!irqs_disabled());
 	lockdep_assert_held(&engine->active.lock);
+	/*
+	 * With the advent of preempt-to-busy, we frequently encounter
+	 * requests that we have unsubmitted from HW, but left running
+	 * until the next ack and so have completed in the meantime. On
+	 * resubmission of that completed request, we can skip
+	 * updating the payload, and execlists can even skip submitting
+	 * the request.
+	 *
+	 * We must remove the request from the caller's priority queue,
+	 * and the caller must only call us when the request is in their
+	 * priority queue, under the active.lock. This ensures that the
+	 * request has *not* yet been retired and we can safely move
+	 * the request into the engine->active.list where it will be
+	 * dropped upon retiring. (Otherwise if resubmit a *retired*
+	 * request, this would be a horrible use-after-free.)
+	 */
+	if (i915_request_completed(request))
+		goto xfer;
 	if (i915_gem_context_is_banned(request->gem_context))
 		i915_request_skip(request, -EIO);
 	    i915_sw_fence_signaled(&request->semaphore))
 		engine->saturated |= request->sched.semaphores;
-	/* We may be recursing from the signal callback of another i915 fence */
+	engine->emit_fini_breadcrumb(request,
-	spin_lock_nested(&request->lock, SINGLE_DEPTH_NESTING);
+				     request->ring->vaddr + request->postfix);
-	list_move_tail(&request->sched.link, &engine->active.requests);
+	trace_i915_request_execute(request);
+	engine->serial++;
+	result = true;
+xfer:	/* We may be recursing from the signal callback of another i915 fence */
+	spin_lock_nested(&request->lock, SINGLE_DEPTH_NESTING);
-	GEM_BUG_ON(test_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags));
+	if (!test_and_set_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags))
-	set_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags);
+		list_move_tail(&request->sched.link, &engine->active.requests);
 	if (test_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT, &request->fence.flags) &&
 	    !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &request->fence.flags) &&
 	spin_unlock(&request->lock);
-	engine->emit_fini_breadcrumb(request,
+	return result;
-				     request->ring->vaddr + request->postfix);
-	engine->serial++;
-	trace_i915_request_execute(request);
 }
 void i915_request_submit(struct i915_request *request)

drivers/gpu/drm/i915/i915_request.h+1−1

@@ -292,7 +292,7 @@ int i915_request_await_execution(struct i915_request *rq, · 291 unmodified lines
292		292
293	void i915_request_add(struct i915_request *rq);	293	void i915_request_add(struct i915_request *rq);
294		294
295	void __i915_request_submit(struct i915_request *request);	295	bool __i915_request_submit(struct i915_request *request);
296	void i915_request_submit(struct i915_request *request);	296	void i915_request_submit(struct i915_request *request);
297		297
298	void i915_request_skip(struct i915_request *request, int error);	298	void i915_request_skip(struct i915_request *request, int error);

drivers/gpu/drm/i915/intel_pch.c+1−0

@@ -69,6 +69,7 @@ intel_pch_type(const struct drm_i915_private *dev_priv, unsigned short id) · 68 unmodified lines
69	WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));	69	WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
70	return PCH_CNP;	70	return PCH_CNP;
71	case INTEL_PCH_CMP_DEVICE_ID_TYPE:	71	case INTEL_PCH_CMP_DEVICE_ID_TYPE:
		72	case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
72	DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");	73	DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
73	WARN_ON(!IS_COFFEELAKE(dev_priv));	74	WARN_ON(!IS_COFFEELAKE(dev_priv));
74	/* CometPoint is CNP Compatible */	75	/* CometPoint is CNP Compatible */

drivers/gpu/drm/i915/intel_pch.h+1−0

@@ -41,6 +41,7 @@ enum intel_pch { · 40 unmodified lines
41	#define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300	41	#define INTEL_PCH_CNP_DEVICE_ID_TYPE 0xA300
42	#define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE 0x9D80	42	#define INTEL_PCH_CNP_LP_DEVICE_ID_TYPE 0x9D80
43	#define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280	43	#define INTEL_PCH_CMP_DEVICE_ID_TYPE 0x0280
		44	#define INTEL_PCH_CMP2_DEVICE_ID_TYPE 0x0680
44	#define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480	45	#define INTEL_PCH_ICP_DEVICE_ID_TYPE 0x3480
45	#define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00	46	#define INTEL_PCH_MCC_DEVICE_ID_TYPE 0x4B00
46	#define INTEL_PCH_MCC2_DEVICE_ID_TYPE 0x3880	47	#define INTEL_PCH_MCC2_DEVICE_ID_TYPE 0x3880

drivers/gpu/drm/i915/selftests/i915_gem.c+6−0

 	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
 		intel_gt_sanitize(&i915->gt, false);
 		i915_gem_sanitize(i915);
+		mutex_lock(&i915->drm.struct_mutex);
+		i915_gem_restore_gtt_mappings(i915);
+		i915_gem_restore_fences(i915);
+		mutex_unlock(&i915->drm.struct_mutex);
 		i915_gem_resume(i915);
 	}
 }

drivers/gpu/drm/omapdrm/dss/dss.c+1−1

@@ -1083,7 +1083,7 @@ static const struct dss_features omap34xx_dss_feats = { · 1082 unmodified lines
1083		1083
1084	static const struct dss_features omap3630_dss_feats = {	1084	static const struct dss_features omap3630_dss_feats = {
1085	.model = DSS_MODEL_OMAP3,	1085	.model = DSS_MODEL_OMAP3,
1086	.fck_div_max = 32,	1086	.fck_div_max = 31,
1087	.fck_freq_max = 173000000,	1087	.fck_freq_max = 173000000,
1088	.dss_fck_multiplier = 1,	1088	.dss_fck_multiplier = 1,
1089	.parent_clk_name = "dpll4_ck",	1089	.parent_clk_name = "dpll4_ck",

drivers/gpu/drm/panel/panel-lg-lb035q02.c+8−1

 MODULE_DEVICE_TABLE(of, lb035q02_of_match);
+static const struct spi_device_id lb035q02_ids[] = {
+	{ "lb035q02", 0 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, lb035q02_ids);
 static struct spi_driver lb035q02_driver = {
 	.probe		= lb035q02_probe,
 	.remove		= lb035q02_remove,
+	.id_table	= lb035q02_ids,
 	.driver		= {
 		.name	= "panel-lg-lb035q02",
 		.of_match_table = lb035q02_of_match,
 module_spi_driver(lb035q02_driver);
-MODULE_ALIAS("spi:lgphilips,lb035q02");
 MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
 MODULE_DESCRIPTION("LG.Philips LB035Q02 LCD Panel driver");
 MODULE_LICENSE("GPL");

drivers/gpu/drm/panel/panel-nec-nl8048hl11.c+8−1

 MODULE_DEVICE_TABLE(of, nl8048_of_match);
+static const struct spi_device_id nl8048_ids[] = {
+	{ "nl8048hl11", 0 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, nl8048_ids);
 static struct spi_driver nl8048_driver = {
 	.probe		= nl8048_probe,
 	.remove		= nl8048_remove,
+	.id_table	= nl8048_ids,
 	.driver		= {
 		.name	= "panel-nec-nl8048hl11",
 		.pm	= &nl8048_pm_ops,
 module_spi_driver(nl8048_driver);
-MODULE_ALIAS("spi:nec,nl8048hl11");
 MODULE_AUTHOR("Erik Gilling <konkers@android.com>");
 MODULE_DESCRIPTION("NEC-NL8048HL11 Driver");
 MODULE_LICENSE("GPL");

drivers/gpu/drm/panel/panel-sony-acx565akm.c+8−1

 MODULE_DEVICE_TABLE(of, acx565akm_of_match);
+static const struct spi_device_id acx565akm_ids[] = {
+	{ "acx565akm", 0 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, acx565akm_ids);
 static struct spi_driver acx565akm_driver = {
 	.probe		= acx565akm_probe,
 	.remove		= acx565akm_remove,
+	.id_table	= acx565akm_ids,
 	.driver		= {
 		.name	= "panel-sony-acx565akm",
 		.of_match_table = acx565akm_of_match,
 module_spi_driver(acx565akm_driver);
-MODULE_ALIAS("spi:sony,acx565akm");
 MODULE_AUTHOR("Nokia Corporation");
 MODULE_DESCRIPTION("Sony ACX565AKM LCD Panel Driver");
 MODULE_LICENSE("GPL");

drivers/gpu/drm/panel/panel-tpo-td028ttec1.c+1−2

@@ -375,8 +375,7 @@ static const struct of_device_id td028ttec1_of_match[] = { · 374 unmodified lines
375	MODULE_DEVICE_TABLE(of, td028ttec1_of_match);	375	MODULE_DEVICE_TABLE(of, td028ttec1_of_match);
376		376
377	static const struct spi_device_id td028ttec1_ids[] = {	377	static const struct spi_device_id td028ttec1_ids[] = {
378	{ "tpo,td028ttec1", 0},	378	{ "td028ttec1", 0 },
379	{ "toppoly,td028ttec1", 0 },
380	{ /* sentinel */ }	379	{ /* sentinel */ }
381	};	380	};
382		381

drivers/gpu/drm/panel/panel-tpo-td043mtea1.c+8−1

 MODULE_DEVICE_TABLE(of, td043mtea1_of_match);
+static const struct spi_device_id td043mtea1_ids[] = {
+	{ "td043mtea1", 0 },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(spi, td043mtea1_ids);
 static struct spi_driver td043mtea1_driver = {
 	.probe		= td043mtea1_probe,
 	.remove		= td043mtea1_remove,
+	.id_table	= td043mtea1_ids,
 	.driver		= {
 		.name	= "panel-tpo-td043mtea1",
 		.pm	= &td043mtea1_pm_ops,
 module_spi_driver(td043mtea1_driver);
-MODULE_ALIAS("spi:tpo,td043mtea1");
 MODULE_AUTHOR("Gražvydas Ignotas <notasas@gmail.com>");
 MODULE_DESCRIPTION("TPO TD043MTEA1 Panel Driver");
 MODULE_LICENSE("GPL");

drivers/gpu/drm/rcar-du/rcar_du_writeback.c+2−2

@@ -147,7 +147,7 @@ static int rcar_du_wb_enc_atomic_check(struct drm_encoder *encoder, · 146 unmodified lines
147	struct drm_device *dev = encoder->dev;	147	struct drm_device *dev = encoder->dev;
148	struct drm_framebuffer *fb;	148	struct drm_framebuffer *fb;
149		149
150	if (!conn_state->writeback_job \|\| !conn_state->writeback_job->fb)	150	if (!conn_state->writeback_job)
151	return 0;	151	return 0;
152		152
153	fb = conn_state->writeback_job->fb;	153	fb = conn_state->writeback_job->fb;
@@ -221,7 +221,7 @@ void rcar_du_writeback_setup(struct rcar_du_crtc *rcrtc, · 67 unmodified lines
221	unsigned int i;	221	unsigned int i;
222		222
223	state = rcrtc->writeback.base.state;	223	state = rcrtc->writeback.base.state;
224	if (!state \|\| !state->writeback_job \|\| !state->writeback_job->fb)	224	if (!state \|\| !state->writeback_job)
225	return;	225	return;
226		226
227	fb = state->writeback_job->fb;	227	fb = state->writeback_job->fb;

drivers/gpu/drm/tilcdc/tilcdc_tfp410.c+1−0

@@ -7,6 +7,7 @@ · 6 unmodified lines
7	#include <linux/gpio.h>	7	#include <linux/gpio.h>
8	#include <linux/mod_devicetable.h>	8	#include <linux/mod_devicetable.h>
9	#include <linux/of_gpio.h>	9	#include <linux/of_gpio.h>
		10	#include <linux/pinctrl/consumer.h>
10	#include <linux/platform_device.h>	11	#include <linux/platform_device.h>
11		12
12	#include <drm/drm_atomic_helper.h>	13	#include <drm/drm_atomic_helper.h>

drivers/gpu/drm/vc4/vc4_txp.c+2−3

 	int i;
 	conn_state = drm_atomic_get_new_connector_state(state, conn);
-	if (!conn_state->writeback_job || !conn_state->writeback_job->fb)
+	if (!conn_state->writeback_job)
 		return 0;
 	crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc);
 	u32 ctrl;
 	int i;
-	if (WARN_ON(!conn_state->writeback_job ||
+	if (WARN_ON(!conn_state->writeback_job))
-		    !conn_state->writeback_job->fb))
 		return;
 	mode = &conn_state->crtc->state->adjusted_mode;

drivers/gpu/drm/xen/xen_drm_front.c+2−10

 	struct device *dev = &xb_dev->dev;
 	int ret;
-	/*
+	ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64));
-	 * The device is not spawn from a device tree, so arch_setup_dma_ops
-	 * is not called, thus leaving the device with dummy DMA ops.
-	 * This makes the device return error on PRIME buffer import, which
-	 * is not correct: to fix this call of_dma_configure() with a NULL
-	 * node to set default DMA ops.
-	 */
-	dev->coherent_dma_mask = DMA_BIT_MASK(32);
-	ret = of_dma_configure(dev, NULL, true);
 	if (ret < 0) {
-		DRM_ERROR("Cannot setup DMA ops, ret %d", ret);
+		DRM_ERROR("Cannot setup DMA mask, ret %d", ret);
 		return ret;
 	}

drivers/hid/hid-hyperv.c+10−46

@@ -314,60 +314,24 @@ static void mousevsc_on_receive(struct hv_device *device, · 313 unmodified lines
314		314
315	static void mousevsc_on_channel_callback(void *context)	315	static void mousevsc_on_channel_callback(void *context)
316	{	316	{
317	const int packet_size = 0x100;
318	int ret;
319	struct hv_device *device = context;	317	struct hv_device *device = context;
320	u32 bytes_recvd;
321	u64 req_id;
322	struct vmpacket_descriptor *desc;	318	struct vmpacket_descriptor *desc;
323	unsigned char *buffer;
324	int bufferlen = packet_size;
325
326	buffer = kmalloc(bufferlen, GFP_ATOMIC);
327	if (!buffer)
328	return;
329
330	do {
331	ret = vmbus_recvpacket_raw(device->channel, buffer,
332	bufferlen, &bytes_recvd, &req_id);
333
334	switch (ret) {
335	case 0:
336	if (bytes_recvd <= 0) {
337	kfree(buffer);
338	return;
339	}
340	desc = (struct vmpacket_descriptor *)buffer;
341
342	switch (desc->type) {
343	case VM_PKT_COMP:
344	break;
345
346	case VM_PKT_DATA_INBAND:
347	mousevsc_on_receive(device, desc);
348	break;
349
350	default:
351	pr_err("unhandled packet type %d, tid %llx len %d\n",
352	desc->type, req_id, bytes_recvd);
353	break;
354	}
355		319
		320	foreach_vmbus_pkt(desc, device->channel) {
		321	switch (desc->type) {
		322	case VM_PKT_COMP:
356	break;	323	break;
357		324
358	case -ENOBUFS:	325	case VM_PKT_DATA_INBAND:
359	kfree(buffer);	326	mousevsc_on_receive(device, desc);
360	/* Handle large packet */	327	break;
361	bufferlen = bytes_recvd;
362	buffer = kmalloc(bytes_recvd, GFP_ATOMIC);
363
364	if (!buffer)
365	return;
366		328
		329	default:
		330	pr_err("Unhandled packet type %d, tid %llx len %d\n",
		331	desc->type, desc->trans_id, desc->len8 * 8);
367	break;	332	break;
368	}	333	}
369	} while (1);	334	}
370
371	}	335	}
372		336
373	static int mousevsc_connect_to_vsp(struct hv_device *device)	337	static int mousevsc_connect_to_vsp(struct hv_device *device)

drivers/hv/vmbus_drv.c+6−0

 		drv->shutdown(dev);
 }
+#ifdef CONFIG_PM_SLEEP
 /*
  * vmbus_suspend - Suspend a vmbus device
  */
 	return drv->resume(dev);
 }
+#endif /* CONFIG_PM_SLEEP */
 /*
  * vmbus_device_release - Final callback release of the vmbus child device
 	vmbus_signal_eom(msg, message_type);
 }
+#ifdef CONFIG_PM_SLEEP
 /*
  * Fake RESCIND_CHANNEL messages to clean up hv_sock channels by force for
  * hibernation, because hv_sock connections can not persist across hibernation.
 		      vmbus_connection.work_queue,
 		      &ctx->work);
 }
+#endif /* CONFIG_PM_SLEEP */
 /*
  * Direct callback for channels using other deferred processing
 	return ret_val;
 }
+#ifdef CONFIG_PM_SLEEP
 static int vmbus_bus_suspend(struct device *dev)
 {
 	struct vmbus_channel *channel, *sc;
 	return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 static const struct acpi_device_id vmbus_acpi_device_ids[] = {
 	{"VMBUS", 0},

drivers/hwmon/nct7904.c+27−6

 	u8 enable_dts;
 	u8 has_dts;
 	u8 temp_mode; /* 0: TR mode, 1: TD mode */
+	u8 fan_alarm[2];
+	u8 vsen_alarm[3];
 };
 /* Access functions */
 				       SMI_STS5_REG + (channel >> 3));
 		if (ret < 0)
 			return ret;
-		*val = (ret >> (channel & 0x07)) & 1;
+		if (!data->fan_alarm[channel >> 3])
+			data->fan_alarm[channel >> 3] = ret & 0xff;
+		else
+			/* If there is new alarm showing up */
+			data->fan_alarm[channel >> 3] |= (ret & 0xff);
+		*val = (data->fan_alarm[channel >> 3] >> (channel & 0x07)) & 1;
+		/* Needs to clean the alarm if alarm existing */
+		if (*val)
+			data->fan_alarm[channel >> 3] ^= 1 << (channel & 0x07);
 		return 0;
 	default:
 		return -EOPNOTSUPP;
 				       SMI_STS1_REG + (index >> 3));
 		if (ret < 0)
 			return ret;
-		*val = (ret >> (index & 0x07)) & 1;
+		if (!data->vsen_alarm[index >> 3])
+			data->vsen_alarm[index >> 3] = ret & 0xff;
+		else
+			/* If there is new alarm showing up */
+			data->vsen_alarm[index >> 3] |= (ret & 0xff);
+		*val = (data->vsen_alarm[index >> 3] >> (index & 0x07)) & 1;
+		/* Needs to clean the alarm if alarm existing */
+		if (*val)
+			data->vsen_alarm[index >> 3] ^= 1 << (index & 0x07);
 		return 0;
 	default:
 		return -EOPNOTSUPP;
 	data->temp_mode = 0;
 	for (i = 0; i < 4; i++) {
-		val = (ret & (0x03 << i)) >> (i * 2);
+		val = (ret >> (i * 2)) & 0x03;
 		bit = (1 << i);
-		if (val == 0)
+		if (val == 0) {
 			data->tcpu_mask &= ~bit;
-		else if (val == 0x1 || val == 0x2)
+		} else {
-			data->temp_mode |= bit;
+			if (val == 0x1 || val == 0x2)
+				data->temp_mode |= bit;
+			data->vsen_mask &= ~(0x06 << (i * 2));
+		}
 	}
 	/* PECI */

drivers/iio/accel/adxl372.c+17−5

 	if (ret < 0)
 		return ret;
-	fifo_samples = st->watermark & 0xFF;
+	/*
+	 * watermark stores the number of sets; we need to write the FIFO
+	 * registers with the number of samples
+	 */
+	fifo_samples = (st->watermark * st->fifo_set_size);
 	fifo_ctl = ADXL372_FIFO_CTL_FORMAT_MODE(st->fifo_format) |
 		   ADXL372_FIFO_CTL_MODE_MODE(st->fifo_mode) |
-		   ADXL372_FIFO_CTL_SAMPLES_MODE(st->watermark);
+		   ADXL372_FIFO_CTL_SAMPLES_MODE(fifo_samples);
-	ret = regmap_write(st->regmap, ADXL372_FIFO_SAMPLES, fifo_samples);
+	ret = regmap_write(st->regmap,
+			   ADXL372_FIFO_SAMPLES, fifo_samples & 0xFF);
 	if (ret < 0)
 		return ret;
 			goto err;
 		/* Each sample is 2 bytes */
-		for (i = 0; i < fifo_entries * sizeof(u16);
+		for (i = 0; i < fifo_entries; i += st->fifo_set_size)
-		     i += st->fifo_set_size * sizeof(u16))
 			iio_push_to_buffers(indio_dev, &st->fifo_buf[i]);
 	}
 err:
 		return -ENODEV;
 	}
+	/*
+	 * Perform a software reset to make sure the device is in a consistent
+	 * state after start up.
+	 */
+	ret = regmap_write(st->regmap, ADXL372_RESET, ADXL372_RESET_CODE);
+	if (ret < 0)
+		return ret;
 	ret = adxl372_set_op_mode(st, ADXL372_STANDBY);
 	if (ret < 0)
 		return ret;

drivers/iio/accel/bmc150-accel-core.c+1−1

@@ -117,7 +117,7 @@ · 116 unmodified lines
117	#define BMC150_ACCEL_SLEEP_1_SEC 0x0F	117	#define BMC150_ACCEL_SLEEP_1_SEC 0x0F
118		118
119	#define BMC150_ACCEL_REG_TEMP 0x08	119	#define BMC150_ACCEL_REG_TEMP 0x08
120	#define BMC150_ACCEL_TEMP_CENTER_VAL 24	120	#define BMC150_ACCEL_TEMP_CENTER_VAL 23
121		121
122	#define BMC150_ACCEL_AXIS_TO_REG(axis) (BMC150_ACCEL_REG_XOUT_L + (axis * 2))	122	#define BMC150_ACCEL_AXIS_TO_REG(axis) (BMC150_ACCEL_REG_XOUT_L + (axis * 2))
123	#define BMC150_AUTO_SUSPEND_DELAY_MS 2000	123	#define BMC150_AUTO_SUSPEND_DELAY_MS 2000

drivers/iio/adc/ad799x.c+2−2

@@ -810,10 +810,10 @@ static int ad799x_probe(struct i2c_client *client, · 809 unmodified lines
810		810
811	ret = ad799x_write_config(st, st->chip_config->default_config);	811	ret = ad799x_write_config(st, st->chip_config->default_config);
812	if (ret < 0)	812	if (ret < 0)
813	goto error_disable_reg;	813	goto error_disable_vref;
814	ret = ad799x_read_config(st);	814	ret = ad799x_read_config(st);
815	if (ret < 0)	815	if (ret < 0)
816	goto error_disable_reg;	816	goto error_disable_vref;
817	st->config = ret;	817	st->config = ret;
818		818
819	ret = iio_triggered_buffer_setup(indio_dev, NULL,	819	ret = iio_triggered_buffer_setup(indio_dev, NULL,

drivers/iio/adc/axp288_adc.c+32−0

@@ -7,6 +7,7 @@ · 6 unmodified lines
7	* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	7	* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8	*/	8	*/
9		9
		10	#include <linux/dmi.h>
10	#include <linux/module.h>	11	#include <linux/module.h>
11	#include <linux/kernel.h>	12	#include <linux/kernel.h>
12	#include <linux/device.h>	13	#include <linux/device.h>
@@ -25,6 +26,11 @@ · 12 unmodified lines
25	#define AXP288_ADC_EN_MASK 0xF0	26	#define AXP288_ADC_EN_MASK 0xF0
26	#define AXP288_ADC_TS_ENABLE 0x01	27	#define AXP288_ADC_TS_ENABLE 0x01
27		28
		29	#define AXP288_ADC_TS_BIAS_MASK GENMASK(5, 4)
		30	#define AXP288_ADC_TS_BIAS_20UA (0 << 4)
		31	#define AXP288_ADC_TS_BIAS_40UA (1 << 4)
		32	#define AXP288_ADC_TS_BIAS_60UA (2 << 4)
		33	#define AXP288_ADC_TS_BIAS_80UA (3 << 4)
28	#define AXP288_ADC_TS_CURRENT_ON_OFF_MASK GENMASK(1, 0)	34	#define AXP288_ADC_TS_CURRENT_ON_OFF_MASK GENMASK(1, 0)
29	#define AXP288_ADC_TS_CURRENT_OFF (0 << 0)	35	#define AXP288_ADC_TS_CURRENT_OFF (0 << 0)
30	#define AXP288_ADC_TS_CURRENT_ON_WHEN_CHARGING (1 << 0)	36	#define AXP288_ADC_TS_CURRENT_ON_WHEN_CHARGING (1 << 0)
@@ -177,10 +183,36 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev, · 146 unmodified lines
177	return ret;	183	return ret;
178	}	184	}
179		185
		186	/*
		187	* We rely on the machine's firmware to correctly setup the TS pin bias current
		188	* at boot. This lists systems with broken fw where we need to set it ourselves.
		189	*/
		190	static const struct dmi_system_id axp288_adc_ts_bias_override[] = {
		191	{
		192	/* Lenovo Ideapad 100S (11 inch) */
		193	.matches = {
		194	DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
		195	DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad 100S-11IBY"),
		196	},
		197	.driver_data = (void *)(uintptr_t)AXP288_ADC_TS_BIAS_80UA,
		198	},
		199	{}
		200	};
		201
180	static int axp288_adc_initialize(struct axp288_adc_info *info)	202	static int axp288_adc_initialize(struct axp288_adc_info *info)
181	{	203	{
		204	const struct dmi_system_id *bias_override;
182	int ret, adc_enable_val;	205	int ret, adc_enable_val;
183		206
		207	bias_override = dmi_first_match(axp288_adc_ts_bias_override);
		208	if (bias_override) {
		209	ret = regmap_update_bits(info->regmap, AXP288_ADC_TS_PIN_CTRL,
		210	AXP288_ADC_TS_BIAS_MASK,
		211	(uintptr_t)bias_override->driver_data);
		212	if (ret)
		213	return ret;
		214	}
		215
184	/*	216	/*
185	* Determine if the TS pin is enabled and set the TS current-source	217	* Determine if the TS pin is enabled and set the TS current-source
186	* accordingly.	218	* accordingly.

drivers/iio/adc/hx711.c+5−5

 static int hx711_cycle(struct hx711_data *hx711_data)
 {
-	int val;
+	unsigned long flags;
 	/*
 	 * if preempted for more then 60us while PD_SCK is high:
 	 * hx711 is going in reset
 	 * ==> measuring is false
 	 */
-	preempt_disable();
+	local_irq_save(flags);
 	gpiod_set_value(hx711_data->gpiod_pd_sck, 1);
 	/*
 	 */
 	ndelay(hx711_data->data_ready_delay_ns);
-	val = gpiod_get_value(hx711_data->gpiod_dout);
 	/*
 	 * here we are not waiting for 0.2 us as suggested by the datasheet,
 	 * because the oscilloscope showed in a test scenario
 	 * and 0.56 us for PD_SCK low on TI Sitara with 800 MHz
 	 */
 	gpiod_set_value(hx711_data->gpiod_pd_sck, 0);
-	preempt_enable();
+	local_irq_restore(flags);
 	/*
 	 * make it a square wave for addressing cases with capacitance on
 	 */
 	ndelay(hx711_data->data_ready_delay_ns);
-	return val;
+	/* sample as late as possible */
+	return gpiod_get_value(hx711_data->gpiod_dout);
 }
 static int hx711_read(struct hx711_data *hx711_data)

drivers/iio/adc/meson_saradc.c+5−5

 	if (IS_ERR(base))
 		return PTR_ERR(base);
+	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
+					     priv->param->regmap_config);
+	if (IS_ERR(priv->regmap))
+		return PTR_ERR(priv->regmap);
 	irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
 	if (!irq)
 		return -EINVAL;
 	if (ret)
 		return ret;
-	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
-					     priv->param->regmap_config);
-	if (IS_ERR(priv->regmap))
-		return PTR_ERR(priv->regmap);
 	priv->clkin = devm_clk_get(&pdev->dev, "clkin");
 	if (IS_ERR(priv->clkin)) {
 		dev_err(&pdev->dev, "failed to get clkin\n");

drivers/iio/adc/stm32-adc-core.c+40−30

 #include "stm32-adc-core.h"
-/* STM32F4 - common registers for all ADC instances: 1, 2 & 3 */
-#define STM32F4_ADC_CSR			(STM32_ADCX_COMN_OFFSET + 0x00)
-#define STM32F4_ADC_CCR			(STM32_ADCX_COMN_OFFSET + 0x04)
-/* STM32F4_ADC_CSR - bit fields */
-#define STM32F4_EOC3			BIT(17)
-#define STM32F4_EOC2			BIT(9)
-#define STM32F4_EOC1			BIT(1)
-/* STM32F4_ADC_CCR - bit fields */
-#define STM32F4_ADC_ADCPRE_SHIFT	16
-#define STM32F4_ADC_ADCPRE_MASK		GENMASK(17, 16)
-/* STM32H7 - common registers for all ADC instances */
-#define STM32H7_ADC_CSR			(STM32_ADCX_COMN_OFFSET + 0x00)
-#define STM32H7_ADC_CCR			(STM32_ADCX_COMN_OFFSET + 0x08)
-/* STM32H7_ADC_CSR - bit fields */
-#define STM32H7_EOC_SLV			BIT(18)
-#define STM32H7_EOC_MST			BIT(2)
-/* STM32H7_ADC_CCR - bit fields */
-#define STM32H7_PRESC_SHIFT		18
-#define STM32H7_PRESC_MASK		GENMASK(21, 18)
-#define STM32H7_CKMODE_SHIFT		16
-#define STM32H7_CKMODE_MASK		GENMASK(17, 16)
 #define STM32_ADC_CORE_SLEEP_DELAY_MS	2000
 /* SYSCFG registers */
  * @eoc1:	adc1 end of conversion flag in @csr
  * @eoc2:	adc2 end of conversion flag in @csr
  * @eoc3:	adc3 end of conversion flag in @csr
+ * @ier:	interrupt enable register offset for each adc
+ * @eocie_msk:	end of conversion interrupt enable mask in @ier
  */
 struct stm32_adc_common_regs {
 	u32 csr;
 	u32 eoc1_msk;
 	u32 eoc2_msk;
 	u32 eoc3_msk;
+	u32 ier;
+	u32 eocie_msk;
 };
 struct stm32_adc_priv;
 	.eoc1_msk = STM32F4_EOC1,
 	.eoc2_msk = STM32F4_EOC2,
 	.eoc3_msk = STM32F4_EOC3,
+	.ier = STM32F4_ADC_CR1,
+	.eocie_msk = STM32F4_EOCIE,
 };
 /* STM32H7 common registers definitions */
 	.ccr = STM32H7_ADC_CCR,
 	.eoc1_msk = STM32H7_EOC_MST,
 	.eoc2_msk = STM32H7_EOC_SLV,
+	.ier = STM32H7_ADC_IER,
+	.eocie_msk = STM32H7_EOCIE,
+};
+static const unsigned int stm32_adc_offset[STM32_ADC_MAX_ADCS] = {
+	0, STM32_ADC_OFFSET, STM32_ADC_OFFSET * 2,
 };
+static unsigned int stm32_adc_eoc_enabled(struct stm32_adc_priv *priv,
+					  unsigned int adc)
+{
+	u32 ier, offset = stm32_adc_offset[adc];
+	ier = readl_relaxed(priv->common.base + offset + priv->cfg->regs->ier);
+	return ier & priv->cfg->regs->eocie_msk;
+}
 /* ADC common interrupt for all instances */
 static void stm32_adc_irq_handler(struct irq_desc *desc)
 {
 	chained_irq_enter(chip, desc);
 	status = readl_relaxed(priv->common.base + priv->cfg->regs->csr);
-	if (status & priv->cfg->regs->eoc1_msk)
+	/*
+	 * End of conversion may be handled by using IRQ or DMA. There may be a
+	 * race here when two conversions complete at the same time on several
+	 * ADCs. EOC may be read 'set' for several ADCs, with:
+	 * - an ADC configured to use DMA (EOC triggers the DMA request, and
+	 *   is then automatically cleared by DR read in hardware)
+	 * - an ADC configured to use IRQs (EOCIE bit is set. The handler must
+	 *   be called in this case)
+	 * So both EOC status bit in CSR and EOCIE control bit must be checked
+	 * before invoking the interrupt handler (e.g. call ISR only for
+	 * IRQ-enabled ADCs).
+	 */
+	if (status & priv->cfg->regs->eoc1_msk &&
+	    stm32_adc_eoc_enabled(priv, 0))
 		generic_handle_irq(irq_find_mapping(priv->domain, 0));
-	if (status & priv->cfg->regs->eoc2_msk)
+	if (status & priv->cfg->regs->eoc2_msk &&
+	    stm32_adc_eoc_enabled(priv, 1))
 		generic_handle_irq(irq_find_mapping(priv->domain, 1));
-	if (status & priv->cfg->regs->eoc3_msk)
+	if (status & priv->cfg->regs->eoc3_msk &&
+	    stm32_adc_eoc_enabled(priv, 2))
 		generic_handle_irq(irq_find_mapping(priv->domain, 2));
 	chained_irq_exit(chip, desc);

drivers/iio/adc/stm32-adc-core.h+137−0

@@ -25,8 +25,145 @@ · 24 unmodified lines
25	* --------------------------------------------------------	25	* --------------------------------------------------------
26	*/	26	*/
27	#define STM32_ADC_MAX_ADCS 3	27	#define STM32_ADC_MAX_ADCS 3
		28	#define STM32_ADC_OFFSET 0x100
28	#define STM32_ADCX_COMN_OFFSET 0x300	29	#define STM32_ADCX_COMN_OFFSET 0x300
29		30
		31	/* STM32F4 - Registers for each ADC instance */
		32	#define STM32F4_ADC_SR 0x00
		33	#define STM32F4_ADC_CR1 0x04
		34	#define STM32F4_ADC_CR2 0x08
		35	#define STM32F4_ADC_SMPR1 0x0C
		36	#define STM32F4_ADC_SMPR2 0x10
		37	#define STM32F4_ADC_HTR 0x24
		38	#define STM32F4_ADC_LTR 0x28
		39	#define STM32F4_ADC_SQR1 0x2C
		40	#define STM32F4_ADC_SQR2 0x30
		41	#define STM32F4_ADC_SQR3 0x34
		42	#define STM32F4_ADC_JSQR 0x38
		43	#define STM32F4_ADC_JDR1 0x3C
		44	#define STM32F4_ADC_JDR2 0x40
		45	#define STM32F4_ADC_JDR3 0x44
		46	#define STM32F4_ADC_JDR4 0x48
		47	#define STM32F4_ADC_DR 0x4C
		48
		49	/* STM32F4 - common registers for all ADC instances: 1, 2 & 3 */
		50	#define STM32F4_ADC_CSR (STM32_ADCX_COMN_OFFSET + 0x00)
		51	#define STM32F4_ADC_CCR (STM32_ADCX_COMN_OFFSET + 0x04)
		52
		53	/* STM32F4_ADC_SR - bit fields */
		54	#define STM32F4_STRT BIT(4)
		55	#define STM32F4_EOC BIT(1)
		56
		57	/* STM32F4_ADC_CR1 - bit fields */
		58	#define STM32F4_RES_SHIFT 24
		59	#define STM32F4_RES_MASK GENMASK(25, 24)
		60	#define STM32F4_SCAN BIT(8)
		61	#define STM32F4_EOCIE BIT(5)
		62
		63	/* STM32F4_ADC_CR2 - bit fields */
		64	#define STM32F4_SWSTART BIT(30)
		65	#define STM32F4_EXTEN_SHIFT 28
		66	#define STM32F4_EXTEN_MASK GENMASK(29, 28)
		67	#define STM32F4_EXTSEL_SHIFT 24
		68	#define STM32F4_EXTSEL_MASK GENMASK(27, 24)
		69	#define STM32F4_EOCS BIT(10)
		70	#define STM32F4_DDS BIT(9)
		71	#define STM32F4_DMA BIT(8)
		72	#define STM32F4_ADON BIT(0)
		73
		74	/* STM32F4_ADC_CSR - bit fields */
		75	#define STM32F4_EOC3 BIT(17)
		76	#define STM32F4_EOC2 BIT(9)
		77	#define STM32F4_EOC1 BIT(1)
		78
		79	/* STM32F4_ADC_CCR - bit fields */
		80	#define STM32F4_ADC_ADCPRE_SHIFT 16
		81	#define STM32F4_ADC_ADCPRE_MASK GENMASK(17, 16)
		82
		83	/* STM32H7 - Registers for each ADC instance */
		84	#define STM32H7_ADC_ISR 0x00
		85	#define STM32H7_ADC_IER 0x04
		86	#define STM32H7_ADC_CR 0x08
		87	#define STM32H7_ADC_CFGR 0x0C
		88	#define STM32H7_ADC_SMPR1 0x14
		89	#define STM32H7_ADC_SMPR2 0x18
		90	#define STM32H7_ADC_PCSEL 0x1C
		91	#define STM32H7_ADC_SQR1 0x30
		92	#define STM32H7_ADC_SQR2 0x34
		93	#define STM32H7_ADC_SQR3 0x38
		94	#define STM32H7_ADC_SQR4 0x3C
		95	#define STM32H7_ADC_DR 0x40
		96	#define STM32H7_ADC_DIFSEL 0xC0
		97	#define STM32H7_ADC_CALFACT 0xC4
		98	#define STM32H7_ADC_CALFACT2 0xC8
		99
		100	/* STM32H7 - common registers for all ADC instances */
		101	#define STM32H7_ADC_CSR (STM32_ADCX_COMN_OFFSET + 0x00)
		102	#define STM32H7_ADC_CCR (STM32_ADCX_COMN_OFFSET + 0x08)
		103
		104	/* STM32H7_ADC_ISR - bit fields */
		105	#define STM32MP1_VREGREADY BIT(12)
		106	#define STM32H7_EOC BIT(2)
		107	#define STM32H7_ADRDY BIT(0)
		108
		109	/* STM32H7_ADC_IER - bit fields */
		110	#define STM32H7_EOCIE STM32H7_EOC
		111
		112	/* STM32H7_ADC_CR - bit fields */
		113	#define STM32H7_ADCAL BIT(31)
		114	#define STM32H7_ADCALDIF BIT(30)
		115	#define STM32H7_DEEPPWD BIT(29)
		116	#define STM32H7_ADVREGEN BIT(28)
		117	#define STM32H7_LINCALRDYW6 BIT(27)
		118	#define STM32H7_LINCALRDYW5 BIT(26)
		119	#define STM32H7_LINCALRDYW4 BIT(25)
		120	#define STM32H7_LINCALRDYW3 BIT(24)
		121	#define STM32H7_LINCALRDYW2 BIT(23)
		122	#define STM32H7_LINCALRDYW1 BIT(22)
		123	#define STM32H7_ADCALLIN BIT(16)
		124	#define STM32H7_BOOST BIT(8)
		125	#define STM32H7_ADSTP BIT(4)
		126	#define STM32H7_ADSTART BIT(2)
		127	#define STM32H7_ADDIS BIT(1)
		128	#define STM32H7_ADEN BIT(0)
		129
		130	/* STM32H7_ADC_CFGR bit fields */
		131	#define STM32H7_EXTEN_SHIFT 10
		132	#define STM32H7_EXTEN_MASK GENMASK(11, 10)
		133	#define STM32H7_EXTSEL_SHIFT 5
		134	#define STM32H7_EXTSEL_MASK GENMASK(9, 5)
		135	#define STM32H7_RES_SHIFT 2
		136	#define STM32H7_RES_MASK GENMASK(4, 2)
		137	#define STM32H7_DMNGT_SHIFT 0
		138	#define STM32H7_DMNGT_MASK GENMASK(1, 0)
		139
		140	enum stm32h7_adc_dmngt {
		141	STM32H7_DMNGT_DR_ONLY, /* Regular data in DR only */
		142	STM32H7_DMNGT_DMA_ONESHOT, /* DMA one shot mode */
		143	STM32H7_DMNGT_DFSDM, /* DFSDM mode */
		144	STM32H7_DMNGT_DMA_CIRC, /* DMA circular mode */
		145	};
		146
		147	/* STM32H7_ADC_CALFACT - bit fields */
		148	#define STM32H7_CALFACT_D_SHIFT 16
		149	#define STM32H7_CALFACT_D_MASK GENMASK(26, 16)
		150	#define STM32H7_CALFACT_S_SHIFT 0
		151	#define STM32H7_CALFACT_S_MASK GENMASK(10, 0)
		152
		153	/* STM32H7_ADC_CALFACT2 - bit fields */
		154	#define STM32H7_LINCALFACT_SHIFT 0
		155	#define STM32H7_LINCALFACT_MASK GENMASK(29, 0)
		156
		157	/* STM32H7_ADC_CSR - bit fields */
		158	#define STM32H7_EOC_SLV BIT(18)
		159	#define STM32H7_EOC_MST BIT(2)
		160
		161	/* STM32H7_ADC_CCR - bit fields */
		162	#define STM32H7_PRESC_SHIFT 18
		163	#define STM32H7_PRESC_MASK GENMASK(21, 18)
		164	#define STM32H7_CKMODE_SHIFT 16
		165	#define STM32H7_CKMODE_MASK GENMASK(17, 16)
		166
30	/**	167	/**
31	* struct stm32_adc_common - stm32 ADC driver common data (for all instances)	168	* struct stm32_adc_common - stm32 ADC driver common data (for all instances)
32	* @base: control registers base cpu addr	169	* @base: control registers base cpu addr

drivers/iio/adc/stm32-adc.c+0−109

@@ -28,115 +28,6 @@ · 27 unmodified lines
28		28
29	#include "stm32-adc-core.h"	29	#include "stm32-adc-core.h"
30		30
31	/* STM32F4 - Registers for each ADC instance */
32	#define STM32F4_ADC_SR 0x00
33	#define STM32F4_ADC_CR1 0x04
34	#define STM32F4_ADC_CR2 0x08
35	#define STM32F4_ADC_SMPR1 0x0C
36	#define STM32F4_ADC_SMPR2 0x10
37	#define STM32F4_ADC_HTR 0x24
38	#define STM32F4_ADC_LTR 0x28
39	#define STM32F4_ADC_SQR1 0x2C
40	#define STM32F4_ADC_SQR2 0x30
41	#define STM32F4_ADC_SQR3 0x34
42	#define STM32F4_ADC_JSQR 0x38
43	#define STM32F4_ADC_JDR1 0x3C
44	#define STM32F4_ADC_JDR2 0x40
45	#define STM32F4_ADC_JDR3 0x44
46	#define STM32F4_ADC_JDR4 0x48
47	#define STM32F4_ADC_DR 0x4C
48
49	/* STM32F4_ADC_SR - bit fields */
50	#define STM32F4_STRT BIT(4)
51	#define STM32F4_EOC BIT(1)
52
53	/* STM32F4_ADC_CR1 - bit fields */
54	#define STM32F4_RES_SHIFT 24
55	#define STM32F4_RES_MASK GENMASK(25, 24)
56	#define STM32F4_SCAN BIT(8)
57	#define STM32F4_EOCIE BIT(5)
58
59	/* STM32F4_ADC_CR2 - bit fields */
60	#define STM32F4_SWSTART BIT(30)
61	#define STM32F4_EXTEN_SHIFT 28
62	#define STM32F4_EXTEN_MASK GENMASK(29, 28)
63	#define STM32F4_EXTSEL_SHIFT 24
64	#define STM32F4_EXTSEL_MASK GENMASK(27, 24)
65	#define STM32F4_EOCS BIT(10)
66	#define STM32F4_DDS BIT(9)
67	#define STM32F4_DMA BIT(8)
68	#define STM32F4_ADON BIT(0)
69
70	/* STM32H7 - Registers for each ADC instance */
71	#define STM32H7_ADC_ISR 0x00
72	#define STM32H7_ADC_IER 0x04
73	#define STM32H7_ADC_CR 0x08
74	#define STM32H7_ADC_CFGR 0x0C
75	#define STM32H7_ADC_SMPR1 0x14
76	#define STM32H7_ADC_SMPR2 0x18
77	#define STM32H7_ADC_PCSEL 0x1C
78	#define STM32H7_ADC_SQR1 0x30
79	#define STM32H7_ADC_SQR2 0x34
80	#define STM32H7_ADC_SQR3 0x38
81	#define STM32H7_ADC_SQR4 0x3C
82	#define STM32H7_ADC_DR 0x40
83	#define STM32H7_ADC_DIFSEL 0xC0
84	#define STM32H7_ADC_CALFACT 0xC4
85	#define STM32H7_ADC_CALFACT2 0xC8
86
87	/* STM32H7_ADC_ISR - bit fields */
88	#define STM32MP1_VREGREADY BIT(12)
89	#define STM32H7_EOC BIT(2)
90	#define STM32H7_ADRDY BIT(0)
91
92	/* STM32H7_ADC_IER - bit fields */
93	#define STM32H7_EOCIE STM32H7_EOC
94
95	/* STM32H7_ADC_CR - bit fields */
96	#define STM32H7_ADCAL BIT(31)
97	#define STM32H7_ADCALDIF BIT(30)
98	#define STM32H7_DEEPPWD BIT(29)
99	#define STM32H7_ADVREGEN BIT(28)
100	#define STM32H7_LINCALRDYW6 BIT(27)
101	#define STM32H7_LINCALRDYW5 BIT(26)
102	#define STM32H7_LINCALRDYW4 BIT(25)
103	#define STM32H7_LINCALRDYW3 BIT(24)
104	#define STM32H7_LINCALRDYW2 BIT(23)
105	#define STM32H7_LINCALRDYW1 BIT(22)
106	#define STM32H7_ADCALLIN BIT(16)
107	#define STM32H7_BOOST BIT(8)
108	#define STM32H7_ADSTP BIT(4)
109	#define STM32H7_ADSTART BIT(2)
110	#define STM32H7_ADDIS BIT(1)
111	#define STM32H7_ADEN BIT(0)
112
113	/* STM32H7_ADC_CFGR bit fields */
114	#define STM32H7_EXTEN_SHIFT 10
115	#define STM32H7_EXTEN_MASK GENMASK(11, 10)
116	#define STM32H7_EXTSEL_SHIFT 5
117	#define STM32H7_EXTSEL_MASK GENMASK(9, 5)
118	#define STM32H7_RES_SHIFT 2
119	#define STM32H7_RES_MASK GENMASK(4, 2)
120	#define STM32H7_DMNGT_SHIFT 0
121	#define STM32H7_DMNGT_MASK GENMASK(1, 0)
122
123	enum stm32h7_adc_dmngt {
124	STM32H7_DMNGT_DR_ONLY, /* Regular data in DR only */
125	STM32H7_DMNGT_DMA_ONESHOT, /* DMA one shot mode */
126	STM32H7_DMNGT_DFSDM, /* DFSDM mode */
127	STM32H7_DMNGT_DMA_CIRC, /* DMA circular mode */
128	};
129
130	/* STM32H7_ADC_CALFACT - bit fields */
131	#define STM32H7_CALFACT_D_SHIFT 16
132	#define STM32H7_CALFACT_D_MASK GENMASK(26, 16)
133	#define STM32H7_CALFACT_S_SHIFT 0
134	#define STM32H7_CALFACT_S_MASK GENMASK(10, 0)
135
136	/* STM32H7_ADC_CALFACT2 - bit fields */
137	#define STM32H7_LINCALFACT_SHIFT 0
138	#define STM32H7_LINCALFACT_MASK GENMASK(29, 0)
139
140	/* Number of linear calibration shadow registers / LINCALRDYW control bits */	31	/* Number of linear calibration shadow registers / LINCALRDYW control bits */
141	#define STM32H7_LINCALFACT_NUM 6	32	#define STM32H7_LINCALFACT_NUM 6
142		33

drivers/iio/imu/adis_buffer.c+8−2

 		return -ENOMEM;
 	adis->buffer = kzalloc(burst_length + sizeof(u16), GFP_KERNEL);
-	if (!adis->buffer)
+	if (!adis->buffer) {
+		kfree(adis->xfer);
+		adis->xfer = NULL;
 		return -ENOMEM;
+	}
 	tx = adis->buffer + burst_length;
 	tx[0] = ADIS_READ_REG(adis->burst->reg_cmd);
 		return -ENOMEM;
 	adis->buffer = kcalloc(indio_dev->scan_bytes, 2, GFP_KERNEL);
-	if (!adis->buffer)
+	if (!adis->buffer) {
+		kfree(adis->xfer);
+		adis->xfer = NULL;
 		return -ENOMEM;
+	}
 	rx = adis->buffer;
 	tx = rx + scan_count;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h+2−0

@@ -99,7 +99,9 @@ struct st_lsm6dsx_fs { · 98 unmodified lines
99	#define ST_LSM6DSX_FS_LIST_SIZE 4	99	#define ST_LSM6DSX_FS_LIST_SIZE 4
100	struct st_lsm6dsx_fs_table_entry {	100	struct st_lsm6dsx_fs_table_entry {
101	struct st_lsm6dsx_reg reg;	101	struct st_lsm6dsx_reg reg;
		102
102	struct st_lsm6dsx_fs fs_avl[ST_LSM6DSX_FS_LIST_SIZE];	103	struct st_lsm6dsx_fs fs_avl[ST_LSM6DSX_FS_LIST_SIZE];
		104	int fs_len;
103	};	105	};
104		106
105	/**	107	/**

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c+19−9

 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(732), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[0] = {  IIO_DEGREE_TO_RAD(245), 0x0 },
 				.fs_avl[1] = {  IIO_DEGREE_TO_RAD(500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(2000), 0x3 },
+				.fs_len = 3,
 			},
 		},
 	},
 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
 				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+				.fs_len = 4,
 			},
 		},
 		.decimator = {
 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
 				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+				.fs_len = 4,
 			},
 		},
 		.decimator = {
 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
 				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+				.fs_len = 4,
 			},
 		},
 		.decimator = {
 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
 				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+				.fs_len = 4,
 			},
 		},
 		.batch = {
 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
 				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+				.fs_len = 4,
 			},
 		},
 		.batch = {
 				.fs_avl[1] = { IIO_G_TO_M_S_2(122), 0x2 },
 				.fs_avl[2] = { IIO_G_TO_M_S_2(244), 0x3 },
 				.fs_avl[3] = { IIO_G_TO_M_S_2(488), 0x1 },
+				.fs_len = 4,
 			},
 			[ST_LSM6DSX_ID_GYRO] = {
 				.reg = {
 				.fs_avl[1] = { IIO_DEGREE_TO_RAD(17500), 0x1 },
 				.fs_avl[2] = { IIO_DEGREE_TO_RAD(35000), 0x2 },
 				.fs_avl[3] = { IIO_DEGREE_TO_RAD(70000), 0x3 },
+				.fs_len = 4,
 			},
 		},
 		.batch = {
 	int i, err;
 	fs_table = &sensor->hw->settings->fs_table[sensor->id];
-	for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++)
+	for (i = 0; i < fs_table->fs_len; i++) {
 		if (fs_table->fs_avl[i].gain == gain)
 			break;
+	}
-	if (i == ST_LSM6DSX_FS_LIST_SIZE)
+	if (i == fs_table->fs_len)
 		return -EINVAL;
 	data = ST_LSM6DSX_SHIFT_VAL(fs_table->fs_avl[i].val,
 {
 	struct st_lsm6dsx_sensor *sensor = iio_priv(dev_get_drvdata(dev));
 	const struct st_lsm6dsx_fs_table_entry *fs_table;
-	enum st_lsm6dsx_sensor_id id = sensor->id;
 	struct st_lsm6dsx_hw *hw = sensor->hw;
 	int i, len = 0;
-	fs_table = &hw->settings->fs_table[id];
+	fs_table = &hw->settings->fs_table[sensor->id];
-	for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++) {
+	for (i = 0; i < fs_table->fs_len; i++)
-		if (!fs_table->fs_avl[i].gain)
-			break;
 		len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
 				 fs_table->fs_avl[i].gain);
-	}
 	buf[len - 1] = '\n';
 	return len;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c+7−8

@@ -61,6 +61,7 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { · 60 unmodified lines
61	.gain = 1500,	61	.gain = 1500,
62	.val = 0x0,	62	.val = 0x0,
63	}, /* 1500 uG/LSB */	63	}, /* 1500 uG/LSB */
		64	.fs_len = 1,
64	},	65	},
65	.temp_comp = {	66	.temp_comp = {
66	.addr = 0x60,	67	.addr = 0x60,
@@ -92,9 +93,11 @@ static const struct st_lsm6dsx_ext_dev_settings st_lsm6dsx_ext_dev_table[] = { · 25 unmodified lines
92	static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw)	93	static void st_lsm6dsx_shub_wait_complete(struct st_lsm6dsx_hw *hw)
93	{	94	{
94	struct st_lsm6dsx_sensor *sensor;	95	struct st_lsm6dsx_sensor *sensor;
		96	u16 odr;
95		97
96	sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_ACC]);	98	sensor = iio_priv(hw->iio_devs[ST_LSM6DSX_ID_ACC]);
97	msleep((2000U / sensor->odr) + 1);	99	odr = (hw->enable_mask & BIT(ST_LSM6DSX_ID_ACC)) ? sensor->odr : 13;
		100	msleep((2000U / odr) + 1);
98	}	101	}
99		102
100	/**	103	/**
@@ -555,13 +558,9 @@ static ssize_t st_lsm6dsx_shub_scale_avail(struct device *dev, · 454 unmodified lines
555	int i, len = 0;	558	int i, len = 0;
556		559
557	settings = sensor->ext_info.settings;	560	settings = sensor->ext_info.settings;
558	for (i = 0; i < ST_LSM6DSX_FS_LIST_SIZE; i++) {	561	for (i = 0; i < settings->fs_table.fs_len; i++)
559	u16 val = settings->fs_table.fs_avl[i].gain;	562	len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
560		563	settings->fs_table.fs_avl[i].gain);
561	if (val > 0)
562	len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
563	val);
564	}
565	buf[len - 1] = '\n';	564	buf[len - 1] = '\n';
566		565
567	return len;	566	return len;

drivers/iio/light/Kconfig+1−0

@@ -314,6 +314,7 @@ config MAX44009 · 313 unmodified lines
314	config NOA1305	314	config NOA1305
315	tristate "ON Semiconductor NOA1305 ambient light sensor"	315	tristate "ON Semiconductor NOA1305 ambient light sensor"
316	depends on I2C	316	depends on I2C
		317	select REGMAP_I2C
317	help	318	help
318	Say Y here if you want to build support for the ON Semiconductor	319	Say Y here if you want to build support for the ON Semiconductor
319	NOA1305 ambient light sensor.	320	NOA1305 ambient light sensor.

drivers/iio/light/opt3001.c+5−1

 	struct iio_dev *iio = _iio;
 	struct opt3001 *opt = iio_priv(iio);
 	int ret;
+	bool wake_result_ready_queue = false;
 	if (!opt->ok_to_ignore_lock)
 		mutex_lock(&opt->lock);
 		}
 		opt->result = ret;
 		opt->result_ready = true;
-		wake_up(&opt->result_ready_queue);
+		wake_result_ready_queue = true;
 	}
 out:
 	if (!opt->ok_to_ignore_lock)
 		mutex_unlock(&opt->lock);
+	if (wake_result_ready_queue)
+		wake_up(&opt->result_ready_queue);
 	return IRQ_HANDLED;
 }

drivers/iio/light/vcnl4000.c+9−5

 static const struct of_device_id vcnl_4000_of_match[] = {
 	{
 		.compatible = "vishay,vcnl4000",
-		.data = "VCNL4000",
+		.data = (void *)VCNL4000,
 	},
 	{
 		.compatible = "vishay,vcnl4010",
-		.data = "VCNL4010",
+		.data = (void *)VCNL4010,
 	},
 	{
-		.compatible = "vishay,vcnl4010",
+		.compatible = "vishay,vcnl4020",
-		.data = "VCNL4020",
+		.data = (void *)VCNL4010,
+	},
+	{
+		.compatible = "vishay,vcnl4040",
+		.data = (void *)VCNL4040,
 	},
 	{
 		.compatible = "vishay,vcnl4200",
-		.data = "VCNL4200",
+		.data = (void *)VCNL4200,
 	},
 	{},
 };

drivers/infiniband/core/cm.c+3−0

 error1:
 	port_modify.set_port_cap_mask = 0;
 	port_modify.clr_port_cap_mask = IB_PORT_CM_SUP;
+	kfree(port);
 	while (--i) {
 		if (!rdma_cap_ib_cm(ib_device, i))
 			continue;
 		ib_modify_port(ib_device, port->port_num, 0, &port_modify);
 		ib_unregister_mad_agent(port->mad_agent);
 		cm_remove_port_fs(port);
+		kfree(port);
 	}
 free:
 	kfree(cm_dev);
 		spin_unlock_irq(&cm.state_lock);
 		ib_unregister_mad_agent(cur_mad_agent);
 		cm_remove_port_fs(port);
+		kfree(port);
 	}
 	kfree(cm_dev);

drivers/infiniband/core/cma.c+2−1

 		conn_id->cm_id.iw = NULL;
 		cma_exch(conn_id, RDMA_CM_DESTROYING);
 		mutex_unlock(&conn_id->handler_mutex);
+		mutex_unlock(&listen_id->handler_mutex);
 		cma_deref_id(conn_id);
 		rdma_destroy_id(&conn_id->id);
-		goto out;
+		return ret;
 	}
 	mutex_unlock(&conn_id->handler_mutex);

drivers/infiniband/core/device.c+5−4

 	if (!netdev)
 		return -ENODEV;
-	dev_put(netdev);
 	port_attr->max_mtu = IB_MTU_4096;
 	port_attr->active_mtu = ib_mtu_int_to_enum(netdev->mtu);
 		port_attr->state = IB_PORT_DOWN;
 		port_attr->phys_state = IB_PORT_PHYS_STATE_DISABLED;
 	} else {
-		inetdev = in_dev_get(netdev);
+		rcu_read_lock();
+		inetdev = __in_dev_get_rcu(netdev);
 		if (inetdev && inetdev->ifa_list) {
 			port_attr->state = IB_PORT_ACTIVE;
 			port_attr->phys_state = IB_PORT_PHYS_STATE_LINK_UP;
-			in_dev_put(inetdev);
 		} else {
 			port_attr->state = IB_PORT_INIT;
 			port_attr->phys_state =
 				IB_PORT_PHYS_STATE_PORT_CONFIGURATION_TRAINING;
 		}
+		rcu_read_unlock();
 	}
+	dev_put(netdev);
 	err = device->ops.query_port(device, port_num, port_attr);
 	if (err)
 		return err;

drivers/infiniband/core/nldev.c+5−7

 	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
 	if (!msg) {
 		ret = -ENOMEM;
-		goto err;
+		goto err_get;
 	}
 	nlh = nlmsg_put(msg, NETLINK_CB(skb).portid, nlh->nlmsg_seq,
 	cntn = nla_get_u32(tb[RDMA_NLDEV_ATTR_STAT_COUNTER_ID]);
 	qpn = nla_get_u32(tb[RDMA_NLDEV_ATTR_RES_LQPN]);
-	ret = rdma_counter_unbind_qpn(device, port, qpn, cntn);
-	if (ret)
-		goto err_unbind;
 	if (fill_nldev_handle(msg, device) ||
 	    nla_put_u32(msg, RDMA_NLDEV_ATTR_PORT_INDEX, port) ||
 	    nla_put_u32(msg, RDMA_NLDEV_ATTR_STAT_COUNTER_ID, cntn) ||
 		goto err_fill;
 	}
+	ret = rdma_counter_unbind_qpn(device, port, qpn, cntn);
+	if (ret)
+		goto err_fill;
 	nlmsg_end(msg, nlh);
 	ib_device_put(device);
 	return rdma_nl_unicast(sock_net(skb->sk), msg, NETLINK_CB(skb).portid);
 err_fill:
-	rdma_counter_bind_qpn(device, port, qpn, cntn);
-err_unbind:
 	nlmsg_free(msg);
 err:
 	ib_device_put(device);

drivers/infiniband/core/security.c+1−1

@@ -426,7 +426,7 @@ int ib_create_qp_security(struct ib_qp qp, struct ib_device dev) · 425 unmodified lines
426	int ret;	426	int ret;
427		427
428	rdma_for_each_port (dev, i) {	428	rdma_for_each_port (dev, i) {
429	is_ib = rdma_protocol_ib(dev, i++);	429	is_ib = rdma_protocol_ib(dev, i);
430	if (is_ib)	430	if (is_ib)
431	break;	431	break;
432	}	432	}

drivers/infiniband/core/umem_odp.c+4−2

 	 * that the hardware will not attempt to access the MR any more.
 	 */
 	if (!umem_odp->is_implicit_odp) {
+		mutex_lock(&umem_odp->umem_mutex);
 		ib_umem_odp_unmap_dma_pages(umem_odp, ib_umem_start(umem_odp),
 					    ib_umem_end(umem_odp));
+		mutex_unlock(&umem_odp->umem_mutex);
 		kvfree(umem_odp->dma_list);
 		kvfree(umem_odp->page_list);
 	}
 	u64 addr;
 	struct ib_device *dev = umem_odp->umem.ibdev;
+	lockdep_assert_held(&umem_odp->umem_mutex);
 	virt = max_t(u64, virt, ib_umem_start(umem_odp));
 	bound = min_t(u64, bound, ib_umem_end(umem_odp));
 	/* Note that during the run of this function, the
 	 * faults from completion. We might be racing with other
 	 * invalidations, so we must make sure we free each page only
 	 * once. */
-	mutex_lock(&umem_odp->umem_mutex);
 	for (addr = virt; addr < bound; addr += BIT(umem_odp->page_shift)) {
 		idx = (addr - ib_umem_start(umem_odp)) >> umem_odp->page_shift;
 		if (umem_odp->page_list[idx]) {
 			umem_odp->npages--;
 		}
 	}
-	mutex_unlock(&umem_odp->umem_mutex);
 }
 EXPORT_SYMBOL(ib_umem_odp_unmap_dma_pages);

drivers/infiniband/hw/cxgb4/device.c+5−2

 	}
 }
-static int dump_qp(struct c4iw_qp *qp, struct c4iw_debugfs_data *qpd)
+static int dump_qp(unsigned long id, struct c4iw_qp *qp,
+		   struct c4iw_debugfs_data *qpd)
 {
 	int space;
 	int cc;
+	if (id != qp->wq.sq.qid)
+		return 0;
 	space = qpd->bufsize - qpd->pos - 1;
 	if (space == 0)
 	xa_lock_irq(&qpd->devp->qps);
 	xa_for_each(&qpd->devp->qps, index, qp)
-		dump_qp(qp, qpd);
+		dump_qp(index, qp, qpd);
 	xa_unlock_irq(&qpd->devp->qps);
 	qpd->buf[qpd->pos++] = 0;

drivers/infiniband/hw/cxgb4/mem.c+17−11

 			   struct sk_buff *skb, struct c4iw_wr_wait *wr_waitp)
 {
 	int err;
-	struct fw_ri_tpte tpt;
+	struct fw_ri_tpte *tpt;
 	u32 stag_idx;
 	static atomic_t key;
 	if (c4iw_fatal_error(rdev))
 		return -EIO;
+	tpt = kmalloc(sizeof(*tpt), GFP_KERNEL);
+	if (!tpt)
+		return -ENOMEM;
 	stag_state = stag_state > 0;
 	stag_idx = (*stag) >> 8;
 			mutex_lock(&rdev->stats.lock);
 			rdev->stats.stag.fail++;
 			mutex_unlock(&rdev->stats.lock);
+			kfree(tpt);
 			return -ENOMEM;
 		}
 		mutex_lock(&rdev->stats.lock);
 	/* write TPT entry */
 	if (reset_tpt_entry)
-		memset(&tpt, 0, sizeof(tpt));
+		memset(tpt, 0, sizeof(*tpt));
 	else {
-		tpt.valid_to_pdid = cpu_to_be32(FW_RI_TPTE_VALID_F |
+		tpt->valid_to_pdid = cpu_to_be32(FW_RI_TPTE_VALID_F |
 			FW_RI_TPTE_STAGKEY_V((*stag & FW_RI_TPTE_STAGKEY_M)) |
 			FW_RI_TPTE_STAGSTATE_V(stag_state) |
 			FW_RI_TPTE_STAGTYPE_V(type) | FW_RI_TPTE_PDID_V(pdid));
-		tpt.locread_to_qpid = cpu_to_be32(FW_RI_TPTE_PERM_V(perm) |
+		tpt->locread_to_qpid = cpu_to_be32(FW_RI_TPTE_PERM_V(perm) |
 			(bind_enabled ? FW_RI_TPTE_MWBINDEN_F : 0) |
 			FW_RI_TPTE_ADDRTYPE_V((zbva ? FW_RI_ZERO_BASED_TO :
 						      FW_RI_VA_BASED_TO))|
 			FW_RI_TPTE_PS_V(page_size));
-		tpt.nosnoop_pbladdr = !pbl_size ? 0 : cpu_to_be32(
+		tpt->nosnoop_pbladdr = !pbl_size ? 0 : cpu_to_be32(
 			FW_RI_TPTE_PBLADDR_V(PBL_OFF(rdev, pbl_addr)>>3));
-		tpt.len_lo = cpu_to_be32((u32)(len & 0xffffffffUL));
+		tpt->len_lo = cpu_to_be32((u32)(len & 0xffffffffUL));
-		tpt.va_hi = cpu_to_be32((u32)(to >> 32));
+		tpt->va_hi = cpu_to_be32((u32)(to >> 32));
-		tpt.va_lo_fbo = cpu_to_be32((u32)(to & 0xffffffffUL));
+		tpt->va_lo_fbo = cpu_to_be32((u32)(to & 0xffffffffUL));
-		tpt.dca_mwbcnt_pstag = cpu_to_be32(0);
+		tpt->dca_mwbcnt_pstag = cpu_to_be32(0);
-		tpt.len_hi = cpu_to_be32((u32)(len >> 32));
+		tpt->len_hi = cpu_to_be32((u32)(len >> 32));
 	}
 	err = write_adapter_mem(rdev, stag_idx +
 				(rdev->lldi.vr->stag.start >> 5),
-				sizeof(tpt), &tpt, skb, wr_waitp);
+				sizeof(*tpt), tpt, skb, wr_waitp);
 	if (reset_tpt_entry) {
 		c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
 		rdev->stats.stag.cur -= 32;
 		mutex_unlock(&rdev->stats.lock);
 	}
+	kfree(tpt);
 	return err;
 }

drivers/infiniband/hw/cxgb4/qp.c+1−9

 	if (CHELSIO_CHIP_VERSION(rhp->rdev.lldi.adapter_type) > CHELSIO_T6)
 		srq->flags = T4_SRQ_LIMIT_SUPPORT;
-	ret = xa_insert_irq(&rhp->qps, srq->wq.qid, srq, GFP_KERNEL);
-	if (ret)
-		goto err_free_queue;
 	if (udata) {
 		srq_key_mm = kmalloc(sizeof(*srq_key_mm), GFP_KERNEL);
 		if (!srq_key_mm) {
 			ret = -ENOMEM;
-			goto err_remove_handle;
+			goto err_free_queue;
 		}
 		srq_db_key_mm = kmalloc(sizeof(*srq_db_key_mm), GFP_KERNEL);
 		if (!srq_db_key_mm) {
 	kfree(srq_db_key_mm);
 err_free_srq_key_mm:
 	kfree(srq_key_mm);
-err_remove_handle:
-	xa_erase_irq(&rhp->qps, srq->wq.qid);
 err_free_queue:
 	free_srq_queue(srq, ucontext ? &ucontext->uctx : &rhp->rdev.uctx,
 		       srq->wr_waitp);
 	rhp = srq->rhp;
 	pr_debug("%s id %d\n", __func__, srq->wq.qid);
-	xa_erase_irq(&rhp->qps, srq->wq.qid);
 	ucontext = rdma_udata_to_drv_context(udata, struct c4iw_ucontext,
 					     ibucontext);
 	free_srq_queue(srq, ucontext ? &ucontext->uctx : &rhp->rdev.uctx,

drivers/infiniband/hw/hfi1/sdma.c+4−1

 	}
 	ret = rhashtable_init(tmp_sdma_rht, &sdma_rht_params);
-	if (ret < 0)
+	if (ret < 0) {
+		kfree(tmp_sdma_rht);
 		goto bail;
+	}
 	dd->sdma_rht = tmp_sdma_rht;
 	dd_dev_info(dd, "SDMA num_sdma: %u\n", dd->num_sdma);

drivers/infiniband/hw/i40iw/i40iw_verbs.c+4−0

 		return -ENOMEM;
 	iwibdev = iwdev->iwibdev;
 	rdma_set_device_sysfs_group(&iwibdev->ibdev, &i40iw_attr_group);
+	ret = ib_device_set_netdev(&iwibdev->ibdev, iwdev->netdev, 1);
+	if (ret)
+		goto error;
 	ret = ib_register_device(&iwibdev->ibdev, "i40iw%d");
 	if (ret)
 		goto error;

drivers/infiniband/hw/mlx5/devx.c+16−42

 	return 0;
 }
-static void devx_free_indirect_mkey(struct rcu_head *rcu)
-{
-	kfree(container_of(rcu, struct devx_obj, devx_mr.rcu));
-}
-/* This function to delete from the radix tree needs to be called before
- * destroying the underlying mkey. Otherwise a race might occur in case that
- * other thread will get the same mkey before this one will be deleted,
- * in that case it will fail via inserting to the tree its own data.
- *
- * Note:
- * An error in the destroy is not expected unless there is some other indirect
- * mkey which points to this one. In a kernel cleanup flow it will be just
- * destroyed in the iterative destruction call. In a user flow, in case
- * the application didn't close in the expected order it's its own problem,
- * the mkey won't be part of the tree, in both cases the kernel is safe.
- */
-static void devx_cleanup_mkey(struct devx_obj *obj)
-{
-	xa_erase(&obj->ib_dev->mdev->priv.mkey_table,
-		 mlx5_base_mkey(obj->devx_mr.mmkey.key));
-}
 static void devx_cleanup_subscription(struct mlx5_ib_dev *dev,
 				      struct devx_event_subscription *sub)
 {
 	int ret;
 	dev = mlx5_udata_to_mdev(&attrs->driver_udata);
-	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY)
+	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY) {
-		devx_cleanup_mkey(obj);
+		/*
+		 * The pagefault_single_data_segment() does commands against
+		 * the mmkey, we must wait for that to stop before freeing the
+		 * mkey, as another allocation could get the same mkey #.
+		 */
+		xa_erase(&obj->ib_dev->mdev->priv.mkey_table,
+			 mlx5_base_mkey(obj->devx_mr.mmkey.key));
+		synchronize_srcu(&dev->mr_srcu);
+	}
 	if (obj->flags & DEVX_OBJ_FLAGS_DCT)
 		ret = mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);
 		devx_cleanup_subscription(dev, sub_entry);
 	mutex_unlock(&devx_event_table->event_xa_lock);
-	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY) {
-		call_srcu(&dev->mr_srcu, &obj->devx_mr.rcu,
-			  devx_free_indirect_mkey);
-		return ret;
-	}
 	kfree(obj);
 	return ret;
 }
 				   &obj_id);
 	WARN_ON(obj->dinlen > MLX5_MAX_DESTROY_INBOX_SIZE_DW * sizeof(u32));
-	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY) {
-		err = devx_handle_mkey_indirect(obj, dev, cmd_in, cmd_out);
-		if (err)
-			goto obj_destroy;
-	}
 	err = uverbs_copy_to(attrs, MLX5_IB_ATTR_DEVX_OBJ_CREATE_CMD_OUT, cmd_out, cmd_out_len);
 	if (err)
-		goto err_copy;
+		goto obj_destroy;
 	if (opcode == MLX5_CMD_OP_CREATE_GENERAL_OBJECT)
 		obj_type = MLX5_GET(general_obj_in_cmd_hdr, cmd_in, obj_type);
 	obj->obj_id = get_enc_obj_id(opcode | obj_type << 16, obj_id);
+	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY) {
+		err = devx_handle_mkey_indirect(obj, dev, cmd_in, cmd_out);
+		if (err)
+			goto obj_destroy;
+	}
 	return 0;
-err_copy:
-	if (obj->flags & DEVX_OBJ_FLAGS_INDIRECT_MKEY)
-		devx_cleanup_mkey(obj);
 obj_destroy:
 	if (obj->flags & DEVX_OBJ_FLAGS_DCT)
 		mlx5_core_destroy_dct(obj->ib_dev->mdev, &obj->core_dct);

drivers/infiniband/hw/mlx5/mlx5_ib.h+1−2

 	struct mlx5_ib_dev     *dev;
 	u32 out[MLX5_ST_SZ_DW(create_mkey_out)];
 	struct mlx5_core_sig_ctx    *sig;
-	int			live;
+	unsigned int		live;
 	void			*descs_alloc;
 	int			access_flags; /* Needed for rereg MR */
 struct mlx5_ib_devx_mr {
 	struct mlx5_core_mkey	mmkey;
 	int			ndescs;
-	struct rcu_head		rcu;
 };
 struct mlx5_ib_umr_context {

drivers/infiniband/hw/mlx5/mr.c+27−41

 		length + (start & (MLX5_ADAPTER_PAGE_SIZE - 1));
 }
-static void update_odp_mr(struct mlx5_ib_mr *mr)
-{
-	if (is_odp_mr(mr)) {
-		/*
-		 * This barrier prevents the compiler from moving the
-		 * setting of umem->odp_data->private to point to our
-		 * MR, before reg_umr finished, to ensure that the MR
-		 * initialization have finished before starting to
-		 * handle invalidations.
-		 */
-		smp_wmb();
-		to_ib_umem_odp(mr->umem)->private = mr;
-		/*
-		 * Make sure we will see the new
-		 * umem->odp_data->private value in the invalidation
-		 * routines, before we can get page faults on the
-		 * MR. Page faults can happen once we put the MR in
-		 * the tree, below this line. Without the barrier,
-		 * there can be a fault handling and an invalidation
-		 * before umem->odp_data->private == mr is visible to
-		 * the invalidation handler.
-		 */
-		smp_wmb();
-	}
-}
 static void reg_mr_callback(int status, struct mlx5_async_work *context)
 {
 	struct mlx5_ib_mr *mr =
 	mr->umem = umem;
 	set_mr_fields(dev, mr, npages, length, access_flags);
-	update_odp_mr(mr);
 	if (use_umr) {
 		int update_xlt_flags = MLX5_IB_UPD_XLT_ENABLE;
 		}
 	}
-	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING)) {
+	if (is_odp_mr(mr)) {
-		mr->live = 1;
+		to_ib_umem_odp(mr->umem)->private = mr;
 		atomic_set(&mr->num_pending_prefetch, 0);
 	}
+	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING))
+		smp_store_release(&mr->live, 1);
 	return &mr->ibmr;
 error:
 	if (!mr->umem)
 		return -EINVAL;
+	if (is_odp_mr(mr))
+		return -EOPNOTSUPP;
 	if (flags & IB_MR_REREG_TRANS) {
 		addr = virt_addr;
 		len = length;
 		}
 		mr->allocated_from_cache = 0;
-		if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING))
-			mr->live = 1;
 	} else {
 		/*
 		 * Send a UMR WQE
 	set_mr_fields(dev, mr, npages, len, access_flags);
-	update_odp_mr(mr);
 	return 0;
 err:
 		/* Prevent new page faults and
 		 * prefetch requests from succeeding
 		 */
-		mr->live = 0;
+		WRITE_ONCE(mr->live, 0);
+		/* Wait for all running page-fault handlers to finish. */
+		synchronize_srcu(&dev->mr_srcu);
 		/* dequeue pending prefetch requests for the mr */
 		if (atomic_read(&mr->num_pending_prefetch))
 			flush_workqueue(system_unbound_wq);
 		WARN_ON(atomic_read(&mr->num_pending_prefetch));
-		/* Wait for all running page-fault handlers to finish. */
-		synchronize_srcu(&dev->mr_srcu);
 		/* Destroy all page mappings */
 		if (!umem_odp->is_implicit_odp)
 			mlx5_ib_invalidate_range(umem_odp,
 int mlx5_ib_dealloc_mw(struct ib_mw *mw)
 {
+	struct mlx5_ib_dev *dev = to_mdev(mw->device);
 	struct mlx5_ib_mw *mmw = to_mmw(mw);
 	int err;
-	err =  mlx5_core_destroy_mkey((to_mdev(mw->device))->mdev,
+	if (IS_ENABLED(CONFIG_INFINIBAND_ON_DEMAND_PAGING)) {
-				      &mmw->mmkey);
+		xa_erase(&dev->mdev->priv.mkey_table,
-	if (!err)
+			 mlx5_base_mkey(mmw->mmkey.key));
-		kfree(mmw);
+		/*
-	return err;
+		 * pagefault_single_data_segment() may be accessing mmw under
+		 * SRCU if the user bound an ODP MR to this MW.
+		 */
+		synchronize_srcu(&dev->mr_srcu);
+	}
+	err = mlx5_core_destroy_mkey(dev->mdev, &mmw->mmkey);
+	if (err)
+		return err;
+	kfree(mmw);
+	return 0;
 }
 int mlx5_ib_check_mr_status(struct ib_mr *ibmr, u32 check_mask,

drivers/infiniband/hw/mlx5/odp.c+47−11

 		return;
 	}
+	/*
+	 * The locking here is pretty subtle. Ideally the implicit children
+	 * list would be protected by the umem_mutex, however that is not
+	 * possible. Instead this uses a weaker update-then-lock pattern:
+	 *
+	 *  srcu_read_lock()
+	 *    <change children list>
+	 *    mutex_lock(umem_mutex)
+	 *     mlx5_ib_update_xlt()
+	 *    mutex_unlock(umem_mutex)
+	 *    destroy lkey
+	 *
+	 * ie any change the children list must be followed by the locked
+	 * update_xlt before destroying.
+	 *
+	 * The umem_mutex provides the acquire/release semantic needed to make
+	 * the children list visible to a racing thread. While SRCU is not
+	 * technically required, using it gives consistent use of the SRCU
+	 * locking around the children list.
+	 */
+	lockdep_assert_held(&to_ib_umem_odp(mr->umem)->umem_mutex);
+	lockdep_assert_held(&mr->dev->mr_srcu);
 	odp = odp_lookup(offset * MLX5_IMR_MTT_SIZE,
 			 nentries * MLX5_IMR_MTT_SIZE, mr);
 	struct ib_umem_odp *odp = container_of(work, struct ib_umem_odp, work);
 	int idx = ib_umem_start(odp) >> MLX5_IMR_MTT_SHIFT;
 	struct mlx5_ib_mr *mr = odp->private, *imr = mr->parent;
+	struct ib_umem_odp *odp_imr = to_ib_umem_odp(imr->umem);
+	int srcu_key;
 	mr->parent = NULL;
 	synchronize_srcu(&mr->dev->mr_srcu);
-	ib_umem_odp_release(odp);
+	if (smp_load_acquire(&imr->live)) {
-	if (imr->live)
+		srcu_key = srcu_read_lock(&mr->dev->mr_srcu);
+		mutex_lock(&odp_imr->umem_mutex);
 		mlx5_ib_update_xlt(imr, idx, 1, 0,
 				   MLX5_IB_UPD_XLT_INDIRECT |
 				   MLX5_IB_UPD_XLT_ATOMIC);
+		mutex_unlock(&odp_imr->umem_mutex);
+		srcu_read_unlock(&mr->dev->mr_srcu, srcu_key);
+	}
+	ib_umem_odp_release(odp);
 	mlx5_mr_cache_free(mr->dev, mr);
 	if (atomic_dec_and_test(&imr->num_leaf_free))
 				   idx - blk_start_idx + 1, 0,
 				   MLX5_IB_UPD_XLT_ZAP |
 				   MLX5_IB_UPD_XLT_ATOMIC);
-	mutex_unlock(&umem_odp->umem_mutex);
 	/*
 	 * We are now sure that the device will not access the
 	 * memory. We can safely unmap it, and mark it as dirty if
 	if (unlikely(!umem_odp->npages && mr->parent &&
 		     !umem_odp->dying)) {
-		WRITE_ONCE(umem_odp->dying, 1);
+		WRITE_ONCE(mr->live, 0);
+		umem_odp->dying = 1;
 		atomic_inc(&mr->parent->num_leaf_free);
 		schedule_work(&umem_odp->work);
 	}
+	mutex_unlock(&umem_odp->umem_mutex);
 }
 void mlx5_ib_internal_fill_odp_caps(struct mlx5_ib_dev *dev)
 	mr->ibmr.lkey = mr->mmkey.key;
 	mr->ibmr.rkey = mr->mmkey.key;
-	mr->live = 1;
 	mlx5_ib_dbg(dev, "key %x dev %p mr %p\n",
 		    mr->mmkey.key, dev->mdev, mr);
 		mtt->parent = mr;
 		INIT_WORK(&odp->work, mr_leaf_free_action);
+		smp_store_release(&mtt->live, 1);
 		if (!nentries)
 			start_idx = addr >> MLX5_IMR_MTT_SHIFT;
 		nentries++;
 	init_waitqueue_head(&imr->q_leaf_free);
 	atomic_set(&imr->num_leaf_free, 0);
 	atomic_set(&imr->num_pending_prefetch, 0);
+	smp_store_release(&imr->live, 1);
 	return imr;
 }
 		if (mr->parent != imr)
 			continue;
+		mutex_lock(&umem_odp->umem_mutex);
 		ib_umem_odp_unmap_dma_pages(umem_odp, ib_umem_start(umem_odp),
 					    ib_umem_end(umem_odp));
-		if (umem_odp->dying)
+		if (umem_odp->dying) {
+			mutex_unlock(&umem_odp->umem_mutex);
 			continue;
+		}
-		WRITE_ONCE(umem_odp->dying, 1);
+		umem_odp->dying = 1;
 		atomic_inc(&imr->num_leaf_free);
 		schedule_work(&umem_odp->work);
+		mutex_unlock(&umem_odp->umem_mutex);
 	}
 	up_read(&per_mm->umem_rwsem);
 	switch (mmkey->type) {
 	case MLX5_MKEY_MR:
 		mr = container_of(mmkey, struct mlx5_ib_mr, mmkey);
-		if (!mr->live || !mr->ibmr.pd) {
+		if (!smp_load_acquire(&mr->live) || !mr->ibmr.pd) {
 			mlx5_ib_dbg(dev, "got dead MR\n");
 			ret = -EFAULT;
 			goto srcu_unlock;
 		mr = container_of(mmkey, struct mlx5_ib_mr, mmkey);
-		if (mr->ibmr.pd != pd) {
+		if (!smp_load_acquire(&mr->live)) {
 			ret = false;
 			break;
 		}
-		if (!mr->live) {
+		if (mr->ibmr.pd != pd) {
 			ret = false;
 			break;
 		}

drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c+0−2

@@ -230,8 +230,6 @@ static void pvrdma_free_srq(struct pvrdma_dev dev, struct pvrdma_srq srq) · 229 unmodified lines
230		230
231	pvrdma_page_dir_cleanup(dev, &srq->pdir);	231	pvrdma_page_dir_cleanup(dev, &srq->pdir);
232		232
233	kfree(srq);
234
235	atomic_dec(&dev->num_srqs);	233	atomic_dec(&dev->num_srqs);
236	}	234	}
237		235

drivers/infiniband/sw/siw/siw_qp.c+11−4

  */
 void siw_qp_llp_write_space(struct sock *sk)
 {
-	struct siw_cep *cep = sk_to_cep(sk);
+	struct siw_cep *cep;
-	cep->sk_write_space(sk);
+	read_lock(&sk->sk_callback_lock);
+	cep  = sk_to_cep(sk);
+	if (cep) {
+		cep->sk_write_space(sk);
-	if (!test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
+		if (!test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
-		(void)siw_sq_start(cep->qp);
+			(void)siw_sq_start(cep->qp);
+	}
+	read_unlock(&sk->sk_callback_lock);
 }
 static int siw_qp_readq_init(struct siw_qp *qp, int irq_size, int orq_size)

drivers/media/usb/stkwebcam/stk-webcam.c+1−2

@@ -643,8 +643,7 @@ static int v4l_stk_release(struct file *fp) · 642 unmodified lines
643	dev->owner = NULL;	643	dev->owner = NULL;
644	}	644	}
645		645
646	if (is_present(dev))	646	usb_autopm_put_interface(dev->interface);
647	usb_autopm_put_interface(dev->interface);
648	mutex_unlock(&dev->lock);	647	mutex_unlock(&dev->lock);
649	return v4l2_fh_release(fp);	648	return v4l2_fh_release(fp);
650	}	649	}

drivers/misc/fastrpc.c+1−0

@@ -527,6 +527,7 @@ static int fastrpc_dma_buf_attach(struct dma_buf *dmabuf, · 526 unmodified lines
527	FASTRPC_PHYS(buffer->phys), buffer->size);	527	FASTRPC_PHYS(buffer->phys), buffer->size);
528	if (ret < 0) {	528	if (ret < 0) {
529	dev_err(buffer->dev, "failed to get scatterlist from DMA API\n");	529	dev_err(buffer->dev, "failed to get scatterlist from DMA API\n");
		530	kfree(a);
530	return -EINVAL;	531	return -EINVAL;
531	}	532	}
532		533

drivers/misc/mei/bus-fixup.c+11−3

 {
 	int ret;
+	/* No need to enable the client if nothing is needed from it */
+	if (!cldev->bus->fw_f_fw_ver_supported &&
+	    !cldev->bus->hbm_f_os_supported)
+		return;
 	ret = mei_cldev_enable(cldev);
 	if (ret)
 		return;
-	ret = mei_fwver(cldev);
+	if (cldev->bus->fw_f_fw_ver_supported) {
-	if (ret < 0)
+		ret = mei_fwver(cldev);
-		dev_err(&cldev->dev, "FW version command failed %d\n", ret);
+		if (ret < 0)
+			dev_err(&cldev->dev, "FW version command failed %d\n",
+				ret);
+	}
 	if (cldev->bus->hbm_f_os_supported) {
 		ret = mei_osver(cldev);

drivers/misc/mei/hw-me-regs.h+3−0

@@ -79,6 +79,9 @@ · 78 unmodified lines
79	#define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */	79	#define MEI_DEV_ID_CNP_H 0xA360 /* Cannon Point H */
80	#define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */	80	#define MEI_DEV_ID_CNP_H_4 0xA364 /* Cannon Point H 4 (iTouch) */
81		81
		82	#define MEI_DEV_ID_CMP_LP 0x02e0 /* Comet Point LP */
		83	#define MEI_DEV_ID_CMP_LP_3 0x02e4 /* Comet Point LP 3 (iTouch) */
		84
82	#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */	85	#define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */
83		86
84	#define MEI_DEV_ID_TGP_LP 0xA0E0 /* Tiger Lake Point LP */	87	#define MEI_DEV_ID_TGP_LP 0xA0E0 /* Tiger Lake Point LP */

drivers/misc/mei/hw-me.c+18−3

 #define MEI_CFG_FW_SPS                           \
 	.quirk_probe = mei_me_fw_type_sps
+#define MEI_CFG_FW_VER_SUPP                     \
+	.fw_ver_supported = 1
 #define MEI_CFG_ICH_HFS                      \
 	.fw_status.count = 0
 	MEI_CFG_ICH10_HFS,
 };
-/* PCH devices */
+/* PCH6 devices */
-static const struct mei_cfg mei_me_pch_cfg = {
+static const struct mei_cfg mei_me_pch6_cfg = {
 	MEI_CFG_PCH_HFS,
 };
+/* PCH7 devices */
+static const struct mei_cfg mei_me_pch7_cfg = {
+	MEI_CFG_PCH_HFS,
+	MEI_CFG_FW_VER_SUPP,
+};
 /* PCH Cougar Point and Patsburg with quirk for Node Manager exclusion */
 static const struct mei_cfg mei_me_pch_cpt_pbg_cfg = {
 	MEI_CFG_PCH_HFS,
+	MEI_CFG_FW_VER_SUPP,
 	MEI_CFG_FW_NM,
 };
 /* PCH8 Lynx Point and newer devices */
 static const struct mei_cfg mei_me_pch8_cfg = {
 	MEI_CFG_PCH8_HFS,
+	MEI_CFG_FW_VER_SUPP,
 };
 /* PCH8 Lynx Point with quirk for SPS Firmware exclusion */
 static const struct mei_cfg mei_me_pch8_sps_cfg = {
 	MEI_CFG_PCH8_HFS,
+	MEI_CFG_FW_VER_SUPP,
 	MEI_CFG_FW_SPS,
 };
 /* Cannon Lake and newer devices */
 static const struct mei_cfg mei_me_pch12_cfg = {
 	MEI_CFG_PCH8_HFS,
+	MEI_CFG_FW_VER_SUPP,
 	MEI_CFG_DMA_128,
 };
 	[MEI_ME_UNDEF_CFG] = NULL,
 	[MEI_ME_ICH_CFG] = &mei_me_ich_cfg,
 	[MEI_ME_ICH10_CFG] = &mei_me_ich10_cfg,
-	[MEI_ME_PCH_CFG] = &mei_me_pch_cfg,
+	[MEI_ME_PCH6_CFG] = &mei_me_pch6_cfg,
+	[MEI_ME_PCH7_CFG] = &mei_me_pch7_cfg,
 	[MEI_ME_PCH_CPT_PBG_CFG] = &mei_me_pch_cpt_pbg_cfg,
 	[MEI_ME_PCH8_CFG] = &mei_me_pch8_cfg,
 	[MEI_ME_PCH8_SPS_CFG] = &mei_me_pch8_sps_cfg,
 	mei_device_init(dev, &pdev->dev, &mei_me_hw_ops);
 	hw->cfg = cfg;
+	dev->fw_f_fw_ver_supported = cfg->fw_ver_supported;
 	return dev;
 }

drivers/misc/mei/hw-me.h+6−2

  * @fw_status: FW status
  * @quirk_probe: device exclusion quirk
  * @dma_size: device DMA buffers size
+ * @fw_ver_supported: is fw version retrievable from FW
  */
 struct mei_cfg {
 	const struct mei_fw_status fw_status;
 	bool (*quirk_probe)(struct pci_dev *pdev);
 	size_t dma_size[DMA_DSCR_NUM];
+	u32 fw_ver_supported:1;
 };
  * @MEI_ME_UNDEF_CFG:      Lower sentinel.
  * @MEI_ME_ICH_CFG:        I/O Controller Hub legacy devices.
  * @MEI_ME_ICH10_CFG:      I/O Controller Hub platforms Gen10
- * @MEI_ME_PCH_CFG:        Platform Controller Hub platforms (Up to Gen8).
+ * @MEI_ME_PCH6_CFG:       Platform Controller Hub platforms (Gen6).
+ * @MEI_ME_PCH7_CFG:       Platform Controller Hub platforms (Gen7).
  * @MEI_ME_PCH_CPT_PBG_CFG:Platform Controller Hub workstations
  *                         with quirk for Node Manager exclusion.
  * @MEI_ME_PCH8_CFG:       Platform Controller Hub Gen8 and newer
 	MEI_ME_UNDEF_CFG,
 	MEI_ME_ICH_CFG,
 	MEI_ME_ICH10_CFG,
-	MEI_ME_PCH_CFG,
+	MEI_ME_PCH6_CFG,
+	MEI_ME_PCH7_CFG,
 	MEI_ME_PCH_CPT_PBG_CFG,
 	MEI_ME_PCH8_CFG,
 	MEI_ME_PCH8_SPS_CFG,

drivers/misc/mei/mei_dev.h+4−0

  *
  * @fw_ver : FW versions
  *
+ * @fw_f_fw_ver_supported : fw feature: fw version supported
+ *
  * @me_clients_rwsem: rw lock over me_clients list
  * @me_clients  : list of FW clients
  * @me_clients_map : FW clients bit map
 	struct mei_fw_version fw_ver[MEI_MAX_FW_VER_BLOCKS];
+	unsigned int fw_f_fw_ver_supported:1;
 	struct rw_semaphore me_clients_rwsem;
 	struct list_head me_clients;
 	DECLARE_BITMAP(me_clients_map, MEI_CLIENTS_MAX);

drivers/misc/mei/pci-me.c+8−5

 	{MEI_PCI_DEVICE(MEI_DEV_ID_ICH10_3, MEI_ME_ICH10_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_ICH10_4, MEI_ME_ICH10_CFG)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_1, MEI_ME_PCH_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_1, MEI_ME_PCH6_CFG)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_2, MEI_ME_PCH_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_2, MEI_ME_PCH6_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_CPT_1, MEI_ME_PCH_CPT_PBG_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_PBG_1, MEI_ME_PCH_CPT_PBG_CFG)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_PPT_1, MEI_ME_PCH_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_PPT_1, MEI_ME_PCH7_CFG)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_PPT_2, MEI_ME_PCH_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_PPT_2, MEI_ME_PCH7_CFG)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_PPT_3, MEI_ME_PCH_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_PPT_3, MEI_ME_PCH7_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_LPT_H, MEI_ME_PCH8_SPS_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_LPT_W, MEI_ME_PCH8_SPS_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_LPT_LP, MEI_ME_PCH8_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_LP, MEI_ME_PCH12_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_LP_3, MEI_ME_PCH8_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)},

drivers/mtd/nand/raw/au1550nd.c+2−3

 /**
  * au_read_buf16 -  read chip data into buffer
- * @mtd:	MTD device structure
+ * @this:	NAND chip object
  * @buf:	buffer to store date
  * @len:	number of bytes to read
  *
  * read function for 16bit buswidth
  */
-static void au_read_buf16(struct mtd_info *mtd, u_char *buf, int len)
+static void au_read_buf16(struct nand_chip *this, u_char *buf, int len)
 {
 	int i;
-	struct nand_chip *this = mtd_to_nand(mtd);
 	u16 *p = (u16 *) buf;
 	len >>= 1;

drivers/mtd/spi-nor/spi-nor.c+1−1

@@ -487,7 +487,7 @@ static int write_sr(struct spi_nor *nor, u8 val) · 486 unmodified lines
487	SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WRSR, 1),	487	SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WRSR, 1),
488	SPI_MEM_OP_NO_ADDR,	488	SPI_MEM_OP_NO_ADDR,
489	SPI_MEM_OP_NO_DUMMY,	489	SPI_MEM_OP_NO_DUMMY,
490	SPI_MEM_OP_DATA_IN(1, nor->bouncebuf, 1));	490	SPI_MEM_OP_DATA_OUT(1, nor->bouncebuf, 1));
491		491
492	return spi_mem_exec_op(nor->spimem, &op);	492	return spi_mem_exec_op(nor->spimem, &op);
493	}	493	}

drivers/net/dsa/qca8k.c+2−2

@@ -705,7 +705,7 @@ qca8k_setup(struct dsa_switch *ds) · 704 unmodified lines
705	BIT(0) << QCA8K_GLOBAL_FW_CTRL1_UC_DP_S);	705	BIT(0) << QCA8K_GLOBAL_FW_CTRL1_UC_DP_S);
706		706
707	/* Setup connection between CPU port & user ports */	707	/* Setup connection between CPU port & user ports */
708	for (i = 0; i < DSA_MAX_PORTS; i++) {	708	for (i = 0; i < QCA8K_NUM_PORTS; i++) {
709	/* CPU port gets connected to all user ports of the switch */	709	/* CPU port gets connected to all user ports of the switch */
710	if (dsa_is_cpu_port(ds, i)) {	710	if (dsa_is_cpu_port(ds, i)) {
711	qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),	711	qca8k_rmw(priv, QCA8K_PORT_LOOKUP_CTRL(QCA8K_CPU_PORT),
@@ -1077,7 +1077,7 @@ qca8k_sw_probe(struct mdio_device *mdiodev) · 365 unmodified lines
1077	if (id != QCA8K_ID_QCA8337)	1077	if (id != QCA8K_ID_QCA8337)
1078	return -ENODEV;	1078	return -ENODEV;
1079		1079
1080	priv->ds = dsa_switch_alloc(&mdiodev->dev, DSA_MAX_PORTS);	1080	priv->ds = dsa_switch_alloc(&mdiodev->dev, QCA8K_NUM_PORTS);
1081	if (!priv->ds)	1081	if (!priv->ds)
1082	return -ENOMEM;	1082	return -ENOMEM;
1083		1083

drivers/net/dsa/rtl8366.c+7−4

 			 const struct switchdev_obj_port_vlan *vlan)
 {
 	struct realtek_smi *smi = ds->priv;
+	u16 vid;
 	int ret;
-	if (!smi->ops->is_vlan_valid(smi, port))
+	for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++)
-		return -EINVAL;
+		if (!smi->ops->is_vlan_valid(smi, vid))
+			return -EINVAL;
 	dev_info(smi->dev, "prepare VLANs %04x..%04x\n",
 		 vlan->vid_begin, vlan->vid_end);
 	u16 vid;
 	int ret;
-	if (!smi->ops->is_vlan_valid(smi, port))
+	for (vid = vlan->vid_begin; vid < vlan->vid_end; vid++)
-		return;
+		if (!smi->ops->is_vlan_valid(smi, vid))
+			return;
 	dev_info(smi->dev, "add VLAN on port %d, %s, %s\n",
 		 port,

drivers/net/dsa/rtl8366rb.c+10−6

 	irq = of_irq_get(intc, 0);
 	if (irq <= 0) {
 		dev_err(smi->dev, "failed to get parent IRQ\n");
-		return irq ? irq : -EINVAL;
+		ret = irq ? irq : -EINVAL;
+		goto out_put_node;
 	}
 	/* This clears the IRQ status register */
 			  &val);
 	if (ret) {
 		dev_err(smi->dev, "can't read interrupt status\n");
-		return ret;
+		goto out_put_node;
 	}
 	/* Fetch IRQ edge information from the descriptor */
 				 val);
 	if (ret) {
 		dev_err(smi->dev, "could not configure IRQ polarity\n");
-		return ret;
+		goto out_put_node;
 	}
 	ret = devm_request_threaded_irq(smi->dev, irq, NULL,
 					"RTL8366RB", smi);
 	if (ret) {
 		dev_err(smi->dev, "unable to request irq: %d\n", ret);
-		return ret;
+		goto out_put_node;
 	}
 	smi->irqdomain = irq_domain_add_linear(intc,
 					       RTL8366RB_NUM_INTERRUPT,
 					       smi);
 	if (!smi->irqdomain) {
 		dev_err(smi->dev, "failed to create IRQ domain\n");
-		return -EINVAL;
+		ret = -EINVAL;
+		goto out_put_node;
 	}
 	for (i = 0; i < smi->num_ports; i++)
 		irq_set_parent(irq_create_mapping(smi->irqdomain, i), irq);
-	return 0;
+out_put_node:
+	of_node_put(intc);
+	return ret;
 }
 static int rtl8366rb_set_addr(struct realtek_smi *smi)

drivers/net/dsa/sja1105/sja1105_main.c+14−10

 	return sja1105_static_config_reload(priv);
 }
-/* Caller must hold priv->tagger_data.meta_lock */
+/* Must be called only with priv->tagger_data.state bit
+ * SJA1105_HWTS_RX_EN cleared
+ */
 static int sja1105_change_rxtstamping(struct sja1105_private *priv,
 				      bool on)
 {
 		break;
 	}
-	if (rx_on != priv->tagger_data.hwts_rx_en) {
+	if (rx_on != test_bit(SJA1105_HWTS_RX_EN, &priv->tagger_data.state)) {
-		spin_lock(&priv->tagger_data.meta_lock);
+		clear_bit(SJA1105_HWTS_RX_EN, &priv->tagger_data.state);
 		rc = sja1105_change_rxtstamping(priv, rx_on);
-		spin_unlock(&priv->tagger_data.meta_lock);
 		if (rc < 0) {
 			dev_err(ds->dev,
 				"Failed to change RX timestamping: %d\n", rc);
-			return -EFAULT;
+			return rc;
 		}
-		priv->tagger_data.hwts_rx_en = rx_on;
+		if (rx_on)
+			set_bit(SJA1105_HWTS_RX_EN, &priv->tagger_data.state);
 	}
 	if (copy_to_user(ifr->ifr_data, &config, sizeof(config)))
 		config.tx_type = HWTSTAMP_TX_ON;
 	else
 		config.tx_type = HWTSTAMP_TX_OFF;
-	if (priv->tagger_data.hwts_rx_en)
+	if (test_bit(SJA1105_HWTS_RX_EN, &priv->tagger_data.state))
 		config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
 	else
 		config.rx_filter = HWTSTAMP_FILTER_NONE;
 	mutex_lock(&priv->ptp_lock);
-	now = priv->tstamp_cc.read(&priv->tstamp_cc);
 	while ((skb = skb_dequeue(&data->skb_rxtstamp_queue)) != NULL) {
 		struct skb_shared_hwtstamps *shwt = skb_hwtstamps(skb);
 		u64 ts;
+		now = priv->tstamp_cc.read(&priv->tstamp_cc);
 		*shwt = (struct skb_shared_hwtstamps) {0};
 		ts = SJA1105_SKB_CB(skb)->meta_tstamp;
 	struct sja1105_private *priv = ds->priv;
 	struct sja1105_tagger_data *data = &priv->tagger_data;
-	if (!data->hwts_rx_en)
+	if (!test_bit(SJA1105_HWTS_RX_EN, &data->state))
 		return false;
 	/* We need to read the full PTP clock to reconstruct the Rx
 	tagger_data = &priv->tagger_data;
 	skb_queue_head_init(&tagger_data->skb_rxtstamp_queue);
 	INIT_WORK(&tagger_data->rxtstamp_work, sja1105_rxtstamp_work);
+	spin_lock_init(&tagger_data->meta_lock);
 	/* Connections between dsa_port and sja1105_port */
 	for (i = 0; i < SJA1105_NUM_PORTS; i++) {

drivers/net/dsa/sja1105/sja1105_spi.c+4−2

 	rc = static_config_buf_prepare_for_upload(priv, config_buf, buf_len);
 	if (rc < 0) {
 		dev_err(dev, "Invalid config, cannot upload\n");
-		return -EINVAL;
+		rc = -EINVAL;
+		goto out;
 	}
 	/* Prevent PHY jabbering during switch reset by inhibiting
 	 * Tx on all ports and waiting for current packet to drain.
 	rc = sja1105_inhibit_tx(priv, port_bitmap, true);
 	if (rc < 0) {
 		dev_err(dev, "Failed to inhibit Tx on ports\n");
-		return -ENXIO;
+		rc = -ENXIO;
+		goto out;
 	}
 	/* Wait for an eventual egress packet to finish transmission
 	 * (reach IFG). It is guaranteed that a second one will not

drivers/net/ethernet/atheros/ag71xx.c+4−2

 	struct device *dev = &ag->pdev->dev;
 	struct net_device *ndev = ag->ndev;
 	static struct mii_bus *mii_bus;
-	struct device_node *np;
+	struct device_node *np, *mnp;
 	int err;
 	np = dev->of_node;
 		msleep(200);
 	}
-	err = of_mdiobus_register(mii_bus, np);
+	mnp = of_get_child_by_name(np, "mdio");
+	err = of_mdiobus_register(mii_bus, mnp);
+	of_node_put(mnp);
 	if (err)
 		goto mdio_err_put_clk;

drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c+6−3

 static int alloc_uld_rxqs(struct adapter *adap,
 			  struct sge_uld_rxq_info *rxq_info, bool lro)
 {
-	struct sge *s = &adap->sge;
 	unsigned int nq = rxq_info->nrxq + rxq_info->nciq;
+	int i, err, msi_idx, que_idx = 0, bmap_idx = 0;
 	struct sge_ofld_rxq *q = rxq_info->uldrxq;
 	unsigned short *ids = rxq_info->rspq_id;
-	unsigned int bmap_idx = 0;
+	struct sge *s = &adap->sge;
 	unsigned int per_chan;
-	int i, err, msi_idx, que_idx = 0;
 	per_chan = rxq_info->nrxq / adap->params.nports;
 		if (msi_idx >= 0) {
 			bmap_idx = get_msix_idx_from_bmap(adap);
+			if (bmap_idx < 0) {
+				err = -ENOSPC;
+				goto freeout;
+			}
 			msi_idx = adap->msix_info_ulds[bmap_idx].idx;
 		}
 		err = t4_sge_alloc_rxq(adap, &q->rspq, false,

drivers/net/ethernet/hisilicon/hns_mdio.c+5−1

 {
 	u32 time_cnt;
 	u32 reg_value;
+	int ret;
 	regmap_write(mdio_dev->subctrl_vbase, cfg_reg, set_val);
 	for (time_cnt = MDIO_TIMEOUT; time_cnt; time_cnt--) {
-		regmap_read(mdio_dev->subctrl_vbase, st_reg, &reg_value);
+		ret = regmap_read(mdio_dev->subctrl_vbase, st_reg, &reg_value);
+		if (ret)
+			return ret;
 		reg_value &= st_msk;
 		if ((!!check_st) == (!!reg_value))
 			break;

drivers/net/ethernet/mellanox/mlx5/core/mr.c+1−7

 	u32 out[MLX5_ST_SZ_DW(destroy_mkey_out)] = {0};
 	u32 in[MLX5_ST_SZ_DW(destroy_mkey_in)]   = {0};
 	struct xarray *mkeys = &dev->priv.mkey_table;
-	struct mlx5_core_mkey *deleted_mkey;
 	unsigned long flags;
 	xa_lock_irqsave(mkeys, flags);
-	deleted_mkey = __xa_erase(mkeys, mlx5_base_mkey(mkey->key));
+	__xa_erase(mkeys, mlx5_base_mkey(mkey->key));
 	xa_unlock_irqrestore(mkeys, flags);
-	if (!deleted_mkey) {
-		mlx5_core_dbg(dev, "failed xarray delete of mkey 0x%x\n",
-			      mlx5_base_mkey(mkey->key));
-		return -ENOENT;
-	}
 	MLX5_SET(destroy_mkey_in, in, opcode, MLX5_CMD_OP_DESTROY_MKEY);
 	MLX5_SET(destroy_mkey_in, in, mkey_index, mlx5_mkey_to_idx(mkey->key));

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_icm_pool.c+2−1

@@ -137,7 +137,8 @@ dr_icm_pool_mr_create(struct mlx5dr_icm_pool *pool, · 136 unmodified lines
137		137
138	icm_mr->icm_start_addr = icm_mr->dm.addr;	138	icm_mr->icm_start_addr = icm_mr->dm.addr;
139		139
140	align_diff = icm_mr->icm_start_addr % align_base;	140	/* align_base is always a power of 2 */
		141	align_diff = icm_mr->icm_start_addr & (align_base - 1);
141	if (align_diff)	142	if (align_diff)
142	icm_mr->used_length = align_base - align_diff;	143	icm_mr->used_length = align_base - align_diff;
143		144

drivers/net/ethernet/mscc/ocelot_board.c+8−6

@@ -388,13 +388,14 @@ static int mscc_ocelot_probe(struct platform_device *pdev) · 387 unmodified lines
388	continue;	388	continue;
389		389
390	phy = of_phy_find_device(phy_node);	390	phy = of_phy_find_device(phy_node);
		391	of_node_put(phy_node);
391	if (!phy)	392	if (!phy)
392	continue;	393	continue;
393		394
394	err = ocelot_probe_port(ocelot, port, regs, phy);	395	err = ocelot_probe_port(ocelot, port, regs, phy);
395	if (err) {	396	if (err) {
396	of_node_put(portnp);	397	of_node_put(portnp);
397	return err;	398	goto out_put_ports;
398	}	399	}
399		400
400	phy_mode = of_get_phy_mode(portnp);	401	phy_mode = of_get_phy_mode(portnp);
@@ -422,7 +423,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) · 21 unmodified lines
422	"invalid phy mode for port%d, (Q)SGMII only\n",	423	"invalid phy mode for port%d, (Q)SGMII only\n",
423	port);	424	port);
424	of_node_put(portnp);	425	of_node_put(portnp);
425	return -EINVAL;	426	err = -EINVAL;
		427	goto out_put_ports;
426	}	428	}
427		429
428	serdes = devm_of_phy_get(ocelot->dev, portnp, NULL);	430	serdes = devm_of_phy_get(ocelot->dev, portnp, NULL);
@@ -435,7 +437,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) · 6 unmodified lines
435	"missing SerDes phys for port%d\n",	437	"missing SerDes phys for port%d\n",
436	port);	438	port);
437		439
438	goto err_probe_ports;	440	of_node_put(portnp);
		441	goto out_put_ports;
439	}	442	}
440		443
441	ocelot->ports[port]->serdes = serdes;	444	ocelot->ports[port]->serdes = serdes;
@@ -447,9 +450,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) · 5 unmodified lines
447		450
448	dev_info(&pdev->dev, "Ocelot switch probed\n");	451	dev_info(&pdev->dev, "Ocelot switch probed\n");
449		452
450	return 0;	453	out_put_ports:
451		454	of_node_put(ports);
452	err_probe_ports:
453	return err;	455	return err;
454	}	456	}
455		457

drivers/net/ethernet/pensando/Kconfig+1−0

@@ -20,6 +20,7 @@ if NET_VENDOR_PENSANDO · 19 unmodified lines
20	config IONIC	20	config IONIC
21	tristate "Pensando Ethernet IONIC Support"	21	tristate "Pensando Ethernet IONIC Support"
22	depends on 64BIT && PCI	22	depends on 64BIT && PCI
		23	select NET_DEVLINK
23	help	24	help
24	This enables the support for the Pensando family of Ethernet	25	This enables the support for the Pensando family of Ethernet
25	adapters. More specific information on this driver can be	26	adapters. More specific information on this driver can be

drivers/net/ethernet/qlogic/qla3xxx.c+1−0

@@ -2787,6 +2787,7 @@ static int ql_alloc_large_buffers(struct ql3_adapter *qdev) · 2786 unmodified lines
2787	netdev_err(qdev->ndev,	2787	netdev_err(qdev->ndev,
2788	"PCI mapping failed with error: %d\n",	2788	"PCI mapping failed with error: %d\n",
2789	err);	2789	err);
		2790	dev_kfree_skb_irq(skb);
2790	ql_free_large_buffers(qdev);	2791	ql_free_large_buffers(qdev);
2791	return -ENOMEM;	2792	return -ENOMEM;
2792	}	2793	}

drivers/net/ethernet/socionext/netsec.c+7−23

@@ -282,7 +282,6 @@ struct netsec_desc_ring { · 281 unmodified lines
282	void *vaddr;	282	void *vaddr;
283	u16 head, tail;	283	u16 head, tail;
284	u16 xdp_xmit; /* netsec_xdp_xmit packets */	284	u16 xdp_xmit; /* netsec_xdp_xmit packets */
285	bool is_xdp;
286	struct page_pool *page_pool;	285	struct page_pool *page_pool;
287	struct xdp_rxq_info xdp_rxq;	286	struct xdp_rxq_info xdp_rxq;
288	spinlock_t lock; /* XDP tx queue locking */	287	spinlock_t lock; /* XDP tx queue locking */
@@ -634,8 +633,7 @@ static bool netsec_clean_tx_dring(struct netsec_priv *priv) · 345 unmodified lines
634	unsigned int bytes;	633	unsigned int bytes;
635	int cnt = 0;	634	int cnt = 0;
636		635
637	if (dring->is_xdp)	636	spin_lock(&dring->lock);
638	spin_lock(&dring->lock);
639		637
640	bytes = 0;	638	bytes = 0;
641	entry = dring->vaddr + DESC_SZ * tail;	639	entry = dring->vaddr + DESC_SZ * tail;
@@ -682,8 +680,8 @@ next: · 40 unmodified lines
682	entry = dring->vaddr + DESC_SZ * tail;	680	entry = dring->vaddr + DESC_SZ * tail;
683	cnt++;	681	cnt++;
684	}	682	}
685	if (dring->is_xdp)	683
686	spin_unlock(&dring->lock);	684	spin_unlock(&dring->lock);
687		685
688	if (!cnt)	686	if (!cnt)
689	return false;	687	return false;
@@ -799,9 +797,6 @@ static void netsec_set_tx_de(struct netsec_priv *priv, · 109 unmodified lines
799	de->data_buf_addr_lw = lower_32_bits(desc->dma_addr);	797	de->data_buf_addr_lw = lower_32_bits(desc->dma_addr);
800	de->buf_len_info = (tx_ctrl->tcp_seg_len << 16) \| desc->len;	798	de->buf_len_info = (tx_ctrl->tcp_seg_len << 16) \| desc->len;
801	de->attr = attr;	799	de->attr = attr;
802	/* under spin_lock if using XDP */
803	if (!dring->is_xdp)
804	dma_wmb();
805		800
806	dring->desc[idx] = *desc;	801	dring->desc[idx] = *desc;
807	if (desc->buf_type == TYPE_NETSEC_SKB)	802	if (desc->buf_type == TYPE_NETSEC_SKB)
@@ -1123,12 +1118,10 @@ static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb, · 315 unmodified lines
1123	u16 tso_seg_len = 0;	1118	u16 tso_seg_len = 0;
1124	int filled;	1119	int filled;
1125		1120
1126	if (dring->is_xdp)	1121	spin_lock_bh(&dring->lock);
1127	spin_lock_bh(&dring->lock);
1128	filled = netsec_desc_used(dring);	1122	filled = netsec_desc_used(dring);
1129	if (netsec_check_stop_tx(priv, filled)) {	1123	if (netsec_check_stop_tx(priv, filled)) {
1130	if (dring->is_xdp)	1124	spin_unlock_bh(&dring->lock);
1131	spin_unlock_bh(&dring->lock);
1132	net_warn_ratelimited("%s %s Tx queue full\n",	1125	net_warn_ratelimited("%s %s Tx queue full\n",
1133	dev_name(priv->dev), ndev->name);	1126	dev_name(priv->dev), ndev->name);
1134	return NETDEV_TX_BUSY;	1127	return NETDEV_TX_BUSY;
@@ -1161,8 +1154,7 @@ static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb, · 26 unmodified lines
1161	tx_desc.dma_addr = dma_map_single(priv->dev, skb->data,	1154	tx_desc.dma_addr = dma_map_single(priv->dev, skb->data,
1162	skb_headlen(skb), DMA_TO_DEVICE);	1155	skb_headlen(skb), DMA_TO_DEVICE);
1163	if (dma_mapping_error(priv->dev, tx_desc.dma_addr)) {	1156	if (dma_mapping_error(priv->dev, tx_desc.dma_addr)) {
1164	if (dring->is_xdp)	1157	spin_unlock_bh(&dring->lock);
1165	spin_unlock_bh(&dring->lock);
1166	netif_err(priv, drv, priv->ndev,	1158	netif_err(priv, drv, priv->ndev,
1167	"%s: DMA mapping failed\n", __func__);	1159	"%s: DMA mapping failed\n", __func__);
1168	ndev->stats.tx_dropped++;	1160	ndev->stats.tx_dropped++;
@@ -1177,8 +1169,7 @@ static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb, · 8 unmodified lines
1177	netdev_sent_queue(priv->ndev, skb->len);	1169	netdev_sent_queue(priv->ndev, skb->len);
1178		1170
1179	netsec_set_tx_de(priv, dring, &tx_ctrl, &tx_desc, skb);	1171	netsec_set_tx_de(priv, dring, &tx_ctrl, &tx_desc, skb);
1180	if (dring->is_xdp)	1172	spin_unlock_bh(&dring->lock);
1181	spin_unlock_bh(&dring->lock);
1182	netsec_write(priv, NETSEC_REG_NRM_TX_PKTCNT, 1); /* submit another tx */	1173	netsec_write(priv, NETSEC_REG_NRM_TX_PKTCNT, 1); /* submit another tx */
1183		1174
1184	return NETDEV_TX_OK;	1175	return NETDEV_TX_OK;
@@ -1262,7 +1253,6 @@ err: · 77 unmodified lines
1262	static void netsec_setup_tx_dring(struct netsec_priv *priv)	1253	static void netsec_setup_tx_dring(struct netsec_priv *priv)
1263	{	1254	{
1264	struct netsec_desc_ring *dring = &priv->desc_ring[NETSEC_RING_TX];	1255	struct netsec_desc_ring *dring = &priv->desc_ring[NETSEC_RING_TX];
1265	struct bpf_prog *xdp_prog = READ_ONCE(priv->xdp_prog);
1266	int i;	1256	int i;
1267		1257
1268	for (i = 0; i < DESC_NUM; i++) {	1258	for (i = 0; i < DESC_NUM; i++) {
@@ -1275,12 +1265,6 @@ static void netsec_setup_tx_dring(struct netsec_priv *priv) · 6 unmodified lines
1275	*/	1265	*/
1276	de->attr = 1U << NETSEC_TX_SHIFT_OWN_FIELD;	1266	de->attr = 1U << NETSEC_TX_SHIFT_OWN_FIELD;
1277	}	1267	}
1278
1279	if (xdp_prog)
1280	dring->is_xdp = true;
1281	else
1282	dring->is_xdp = false;
1283
1284	}	1268	}
1285		1269
1286	static int netsec_setup_rx_dring(struct netsec_priv *priv)	1270	static int netsec_setup_rx_dring(struct netsec_priv *priv)

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c+7−6

 	int numhashregs = (hw->multicast_filter_bins >> 5);
 	int mcbitslog2 = hw->mcast_bits_log2;
 	unsigned int value;
+	u32 mc_filter[8];
 	int i;
+	memset(mc_filter, 0, sizeof(mc_filter));
 	value = readl(ioaddr + GMAC_PACKET_FILTER);
 	value &= ~GMAC_PACKET_FILTER_HMC;
 	value &= ~GMAC_PACKET_FILTER_HPF;
 		/* Pass all multi */
 		value |= GMAC_PACKET_FILTER_PM;
 		/* Set all the bits of the HASH tab */
-		for (i = 0; i < numhashregs; i++)
+		memset(mc_filter, 0xff, sizeof(mc_filter));
-			writel(0xffffffff, ioaddr + GMAC_HASH_TAB(i));
 	} else if (!netdev_mc_empty(dev)) {
 		struct netdev_hw_addr *ha;
-		u32 mc_filter[8];
 		/* Hash filter for multicast */
 		value |= GMAC_PACKET_FILTER_HMC;
-		memset(mc_filter, 0, sizeof(mc_filter));
 		netdev_for_each_mc_addr(ha, dev) {
 			/* The upper n bits of the calculated CRC are used to
 			 * index the contents of the hash table. The number of
 			 */
 			mc_filter[bit_nr >> 5] |= (1 << (bit_nr & 0x1f));
 		}
-		for (i = 0; i < numhashregs; i++)
-			writel(mc_filter[i], ioaddr + GMAC_HASH_TAB(i));
 	}
+	for (i = 0; i < numhashregs; i++)
+		writel(mc_filter[i], ioaddr + GMAC_HASH_TAB(i));
 	value |= GMAC_PACKET_FILTER_HPF;
 	/* Handle multiple unicast addresses */

drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h+2−1

 #define XGMAC_TSIE			BIT(12)
 #define XGMAC_LPIIE			BIT(5)
 #define XGMAC_PMTIE			BIT(4)
-#define XGMAC_INT_DEFAULT_EN		(XGMAC_LPIIE | XGMAC_PMTIE | XGMAC_TSIE)
+#define XGMAC_INT_DEFAULT_EN		(XGMAC_LPIIE | XGMAC_PMTIE)
 #define XGMAC_Qx_TX_FLOW_CTRL(x)	(0x00000070 + (x) * 4)
 #define XGMAC_PT			GENMASK(31, 16)
 #define XGMAC_PT_SHIFT			16
 #define XGMAC_HWFEAT_GMIISEL		BIT(1)
 #define XGMAC_HW_FEATURE1		0x00000120
 #define XGMAC_HWFEAT_L3L4FNUM		GENMASK(30, 27)
+#define XGMAC_HWFEAT_HASHTBLSZ		GENMASK(25, 24)
 #define XGMAC_HWFEAT_RSSEN		BIT(20)
 #define XGMAC_HWFEAT_TSOEN		BIT(18)
 #define XGMAC_HWFEAT_SPHEN		BIT(17)

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c+5−4

 	dwxgmac2_set_mchash(ioaddr, mc_filter, mcbitslog2);
 	/* Handle multiple unicast addresses */
-	if (netdev_uc_count(dev) > XGMAC_ADDR_MAX) {
+	if (netdev_uc_count(dev) > hw->unicast_filter_entries) {
 		value |= XGMAC_FILTER_PR;
 	} else {
 		struct netdev_hw_addr *ha;
 				  struct stmmac_rss *cfg, u32 num_rxq)
 {
 	void __iomem *ioaddr = hw->pcsr;
+	u32 value, *key;
 	int i, ret;
-	u32 value;
 	value = readl(ioaddr + XGMAC_RSS_CTRL);
 	if (!cfg || !cfg->enable) {
 		return 0;
 	}
-	for (i = 0; i < (sizeof(cfg->key) / sizeof(u32)); i++) {
+	key = (u32 *)cfg->key;
-		ret = dwxgmac2_rss_write_reg(ioaddr, true, i, cfg->key[i]);
+	for (i = 0; i < (ARRAY_SIZE(cfg->key) / sizeof(u32)); i++) {
+		ret = dwxgmac2_rss_write_reg(ioaddr, true, i, key[i]);
 		if (ret)
 			return ret;
 	}

drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c+1−0

@@ -380,6 +380,7 @@ static void dwxgmac2_get_hw_feature(void __iomem *ioaddr, · 379 unmodified lines
380	/* MAC HW feature 1 */	380	/* MAC HW feature 1 */
381	hw_cap = readl(ioaddr + XGMAC_HW_FEATURE1);	381	hw_cap = readl(ioaddr + XGMAC_HW_FEATURE1);
382	dma_cap->l3l4fnum = (hw_cap & XGMAC_HWFEAT_L3L4FNUM) >> 27;	382	dma_cap->l3l4fnum = (hw_cap & XGMAC_HWFEAT_L3L4FNUM) >> 27;
		383	dma_cap->hash_tb_sz = (hw_cap & XGMAC_HWFEAT_HASHTBLSZ) >> 24;
383	dma_cap->rssen = (hw_cap & XGMAC_HWFEAT_RSSEN) >> 20;	384	dma_cap->rssen = (hw_cap & XGMAC_HWFEAT_RSSEN) >> 20;
384	dma_cap->tsoen = (hw_cap & XGMAC_HWFEAT_TSOEN) >> 18;	385	dma_cap->tsoen = (hw_cap & XGMAC_HWFEAT_TSOEN) >> 18;
385	dma_cap->sphen = (hw_cap & XGMAC_HWFEAT_SPHEN) >> 17;	386	dma_cap->sphen = (hw_cap & XGMAC_HWFEAT_SPHEN) >> 17;

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+17−8

 			config.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
 			ptp_v2 = PTP_TCR_TSVER2ENA;
 			snap_type_sel = PTP_TCR_SNAPTYPSEL_1;
+			ts_event_en = PTP_TCR_TSEVNTENA;
 			ptp_over_ipv4_udp = PTP_TCR_TSIPV4ENA;
 			ptp_over_ipv6_udp = PTP_TCR_TSIPV6ENA;
 			ptp_over_ethernet = PTP_TCR_TSIPENA;
 	if (!ndev || !netif_running(ndev))
 		return 0;
-	mutex_lock(&priv->lock);
+	phylink_mac_change(priv->phylink, false);
-	rtnl_lock();
+	mutex_lock(&priv->lock);
-	phylink_stop(priv->phylink);
-	rtnl_unlock();
 	netif_device_detach(ndev);
 	stmmac_stop_all_queues(priv);
 		stmmac_pmt(priv, priv->hw, priv->wolopts);
 		priv->irq_wake = 1;
 	} else {
+		mutex_unlock(&priv->lock);
+		rtnl_lock();
+		phylink_stop(priv->phylink);
+		rtnl_unlock();
+		mutex_lock(&priv->lock);
 		stmmac_mac_set(priv, priv->ioaddr, false);
 		pinctrl_pm_select_sleep_state(priv->device);
 		/* Disable clock in case of PWM is off */
 	stmmac_start_all_queues(priv);
-	rtnl_lock();
-	phylink_start(priv->phylink);
-	rtnl_unlock();
 	mutex_unlock(&priv->lock);
+	if (!device_may_wakeup(priv->device)) {
+		rtnl_lock();
+		phylink_start(priv->phylink);
+		rtnl_unlock();
+	}
+	phylink_mac_change(priv->phylink, true);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(stmmac_resume);

drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c+0−4

 	struct stmmac_packet_attrs attr = { };
 	int size = priv->dma_buf_sz;
-	/* Only XGMAC has SW support for multiple RX descs in same packet */
-	if (priv->plat->has_xgmac)
-		size = priv->dev->max_mtu;
 	attr.dst = priv->dev->dev_addr;
 	attr.max_size = size - ETH_FCS_LEN;
 	attr.queue_mapping = queue;

drivers/net/ieee802154/atusb.c+2−1

@@ -1137,10 +1137,11 @@ static void atusb_disconnect(struct usb_interface *interface) · 1136 unmodified lines
1137		1137
1138	ieee802154_unregister_hw(atusb->hw);	1138	ieee802154_unregister_hw(atusb->hw);
1139		1139
		1140	usb_put_dev(atusb->usb_dev);
		1141
1140	ieee802154_free_hw(atusb->hw);	1142	ieee802154_free_hw(atusb->hw);
1141		1143
1142	usb_set_intfdata(interface, NULL);	1144	usb_set_intfdata(interface, NULL);
1143	usb_put_dev(atusb->usb_dev);
1144		1145
1145	pr_debug("%s done\n", __func__);	1146	pr_debug("%s done\n", __func__);
1146	}	1147	}

drivers/net/ieee802154/ca8210.c+1−1

 		goto error;
 	}
+	priv->spi->dev.platform_data = pdata;
 	ret = ca8210_get_platform_data(priv->spi, pdata);
 	if (ret) {
 		dev_crit(&spi_device->dev, "ca8210_get_platform_data failed\n");
 		goto error;
 	}
-	priv->spi->dev.platform_data = pdata;
 	ret = ca8210_dev_com_init(priv);
 	if (ret) {

drivers/net/ieee802154/mcr20a.c+1−1

@@ -800,7 +800,7 @@ mcr20a_handle_rx_read_buf_complete(void *context) · 799 unmodified lines
800	if (!skb)	800	if (!skb)
801	return;	801	return;
802		802
803	memcpy(skb_put(skb, len), lp->rx_buf, len);	803	__skb_put_data(skb, lp->rx_buf, len);
804	ieee802154_rx_irqsafe(lp->hw, skb, lp->rx_lqi[0]);	804	ieee802154_rx_irqsafe(lp->hw, skb, lp->rx_lqi[0]);
805		805
806	print_hex_dump_debug("mcr20a rx: ", DUMP_PREFIX_OFFSET, 16, 1,	806	print_hex_dump_debug("mcr20a rx: ", DUMP_PREFIX_OFFSET, 16, 1,

drivers/net/phy/at803x.c+69−0

@@ -15,6 +15,15 @@ · 14 unmodified lines
15	#include <linux/of_gpio.h>	15	#include <linux/of_gpio.h>
16	#include <linux/gpio/consumer.h>	16	#include <linux/gpio/consumer.h>
17		17
		18	#define AT803X_SPECIFIC_STATUS 0x11
		19	#define AT803X_SS_SPEED_MASK (3 << 14)
		20	#define AT803X_SS_SPEED_1000 (2 << 14)
		21	#define AT803X_SS_SPEED_100 (1 << 14)
		22	#define AT803X_SS_SPEED_10 (0 << 14)
		23	#define AT803X_SS_DUPLEX BIT(13)
		24	#define AT803X_SS_SPEED_DUPLEX_RESOLVED BIT(11)
		25	#define AT803X_SS_MDIX BIT(6)
		26
18	#define AT803X_INTR_ENABLE 0x12	27	#define AT803X_INTR_ENABLE 0x12
19	#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)	28	#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
20	#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)	29	#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)
@@ -357,6 +366,64 @@ static int at803x_aneg_done(struct phy_device *phydev) · 336 unmodified lines
357	return aneg_done;	366	return aneg_done;
358	}	367	}
359		368
		369	static int at803x_read_status(struct phy_device *phydev)
		370	{
		371	int ss, err, old_link = phydev->link;
		372
		373	/* Update the link, but return if there was an error */
		374	err = genphy_update_link(phydev);
		375	if (err)
		376	return err;
		377
		378	/* why bother the PHY if nothing can have changed */
		379	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
		380	return 0;
		381
		382	phydev->speed = SPEED_UNKNOWN;
		383	phydev->duplex = DUPLEX_UNKNOWN;
		384	phydev->pause = 0;
		385	phydev->asym_pause = 0;
		386
		387	err = genphy_read_lpa(phydev);
		388	if (err < 0)
		389	return err;
		390
		391	/* Read the AT8035 PHY-Specific Status register, which indicates the
		392	* speed and duplex that the PHY is actually using, irrespective of
		393	* whether we are in autoneg mode or not.
		394	*/
		395	ss = phy_read(phydev, AT803X_SPECIFIC_STATUS);
		396	if (ss < 0)
		397	return ss;
		398
		399	if (ss & AT803X_SS_SPEED_DUPLEX_RESOLVED) {
		400	switch (ss & AT803X_SS_SPEED_MASK) {
		401	case AT803X_SS_SPEED_10:
		402	phydev->speed = SPEED_10;
		403	break;
		404	case AT803X_SS_SPEED_100:
		405	phydev->speed = SPEED_100;
		406	break;
		407	case AT803X_SS_SPEED_1000:
		408	phydev->speed = SPEED_1000;
		409	break;
		410	}
		411	if (ss & AT803X_SS_DUPLEX)
		412	phydev->duplex = DUPLEX_FULL;
		413	else
		414	phydev->duplex = DUPLEX_HALF;
		415	if (ss & AT803X_SS_MDIX)
		416	phydev->mdix = ETH_TP_MDI_X;
		417	else
		418	phydev->mdix = ETH_TP_MDI;
		419	}
		420
		421	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
		422	phy_resolve_aneg_pause(phydev);
		423
		424	return 0;
		425	}
		426
360	static struct phy_driver at803x_driver[] = {	427	static struct phy_driver at803x_driver[] = {
361	{	428	{
362	/* ATHEROS 8035 */	429	/* ATHEROS 8035 */
@@ -370,6 +437,7 @@ static struct phy_driver at803x_driver[] = { · 7 unmodified lines
370	.suspend = at803x_suspend,	437	.suspend = at803x_suspend,
371	.resume = at803x_resume,	438	.resume = at803x_resume,
372	/* PHY_GBIT_FEATURES */	439	/* PHY_GBIT_FEATURES */
		440	.read_status = at803x_read_status,
373	.ack_interrupt = at803x_ack_interrupt,	441	.ack_interrupt = at803x_ack_interrupt,
374	.config_intr = at803x_config_intr,	442	.config_intr = at803x_config_intr,
375	}, {	443	}, {
@@ -399,6 +467,7 @@ static struct phy_driver at803x_driver[] = { · 23 unmodified lines
399	.suspend = at803x_suspend,	467	.suspend = at803x_suspend,
400	.resume = at803x_resume,	468	.resume = at803x_resume,
401	/* PHY_GBIT_FEATURES */	469	/* PHY_GBIT_FEATURES */
		470	.read_status = at803x_read_status,
402	.aneg_done = at803x_aneg_done,	471	.aneg_done = at803x_aneg_done,
403	.ack_interrupt = &at803x_ack_interrupt,	472	.ack_interrupt = &at803x_ack_interrupt,
404	.config_intr = &at803x_config_intr,	473	.config_intr = &at803x_config_intr,

drivers/net/phy/mdio_device.c+1−1

@@ -121,7 +121,7 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value) · 120 unmodified lines
121	return;	121	return;
122		122
123	if (mdiodev->reset_gpio)	123	if (mdiodev->reset_gpio)
124	gpiod_set_value(mdiodev->reset_gpio, value);	124	gpiod_set_value_cansleep(mdiodev->reset_gpio, value);
125		125
126	if (mdiodev->reset_ctrl) {	126	if (mdiodev->reset_ctrl) {
127	if (value)	127	if (value)

drivers/net/phy/phy-core.c+13−7

 	phydev->eee_broken_modes = broken;
 }
+void phy_resolve_aneg_pause(struct phy_device *phydev)
+{
+	if (phydev->duplex == DUPLEX_FULL) {
+		phydev->pause = linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
+						  phydev->lp_advertising);
+		phydev->asym_pause = linkmode_test_bit(
+			ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+			phydev->lp_advertising);
+	}
+}
+EXPORT_SYMBOL_GPL(phy_resolve_aneg_pause);
 /**
  * phy_resolve_aneg_linkmode - resolve the advertisements into phy settings
  * @phydev: The phy_device struct
 			break;
 		}
-	if (phydev->duplex == DUPLEX_FULL) {
+	phy_resolve_aneg_pause(phydev);
-		phydev->pause = linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
-						  phydev->lp_advertising);
-		phydev->asym_pause = linkmode_test_bit(
-			ETHTOOL_LINK_MODE_Asym_Pause_BIT,
-			phydev->lp_advertising);
-	}
 }
 EXPORT_SYMBOL_GPL(phy_resolve_aneg_linkmode);

drivers/net/phy/phy.c+5−0

 							   val);
 				change_autoneg = true;
 				break;
+			case MII_CTRL1000:
+				mii_ctrl1000_mod_linkmode_adv_t(phydev->advertising,
+							        val);
+				change_autoneg = true;
+				break;
 			default:
 				/* do nothing */
 				break;

drivers/net/phy/phy_device.c+40−25

 }
 EXPORT_SYMBOL(genphy_update_link);
-/**
+int genphy_read_lpa(struct phy_device *phydev)
- * genphy_read_status - check the link status and update current link state
- * @phydev: target phy_device struct
- *
- * Description: Check the link, then figure out the current state
- *   by comparing what we advertise with what the link partner
- *   advertises.  Start by checking the gigabit possibilities,
- *   then move on to 10/100.
- */
-int genphy_read_status(struct phy_device *phydev)
 {
-	int lpa, lpagb, err, old_link = phydev->link;
+	int lpa, lpagb;
-	/* Update the link, but return if there was an error */
-	err = genphy_update_link(phydev);
-	if (err)
-		return err;
-	/* why bother the PHY if nothing can have changed */
-	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
-		return 0;
-	phydev->speed = SPEED_UNKNOWN;
-	phydev->duplex = DUPLEX_UNKNOWN;
-	phydev->pause = 0;
-	phydev->asym_pause = 0;
 	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {
 		if (phydev->is_gigabit_capable) {
 			return lpa;
 		mii_lpa_mod_linkmode_lpa_t(phydev->lp_advertising, lpa);
+	}
+	return 0;
+}
+EXPORT_SYMBOL(genphy_read_lpa);
+/**
+ * genphy_read_status - check the link status and update current link state
+ * @phydev: target phy_device struct
+ *
+ * Description: Check the link, then figure out the current state
+ *   by comparing what we advertise with what the link partner
+ *   advertises.  Start by checking the gigabit possibilities,
+ *   then move on to 10/100.
+ */
+int genphy_read_status(struct phy_device *phydev)
+{
+	int err, old_link = phydev->link;
+	/* Update the link, but return if there was an error */
+	err = genphy_update_link(phydev);
+	if (err)
+		return err;
+	/* why bother the PHY if nothing can have changed */
+	if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+		return 0;
+	phydev->speed = SPEED_UNKNOWN;
+	phydev->duplex = DUPLEX_UNKNOWN;
+	phydev->pause = 0;
+	phydev->asym_pause = 0;
+	err = genphy_read_lpa(phydev);
+	if (err < 0)
+		return err;
+	if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {
 		phy_resolve_aneg_linkmode(phydev);
 	} else if (phydev->autoneg == AUTONEG_DISABLE) {
 		int bmcr = phy_read(phydev, MII_BMCR);

drivers/net/ppp/pptp.c+2−2

@@ -238,7 +238,7 @@ static int pptp_xmit(struct ppp_channel chan, struct sk_buff skb) · 237 unmodified lines
238	skb_dst_drop(skb);	238	skb_dst_drop(skb);
239	skb_dst_set(skb, &rt->dst);	239	skb_dst_set(skb, &rt->dst);
240		240
241	nf_reset(skb);	241	nf_reset_ct(skb);
242		242
243	skb->ip_summed = CHECKSUM_NONE;	243	skb->ip_summed = CHECKSUM_NONE;
244	ip_select_ident(net, skb, NULL);	244	ip_select_ident(net, skb, NULL);
@@ -358,7 +358,7 @@ static int pptp_rcv(struct sk_buff *skb) · 113 unmodified lines
358	po = lookup_chan(htons(header->call_id), iph->saddr);	358	po = lookup_chan(htons(header->call_id), iph->saddr);
359	if (po) {	359	if (po) {
360	skb_dst_drop(skb);	360	skb_dst_drop(skb);
361	nf_reset(skb);	361	nf_reset_ct(skb);
362	return sk_receive_skb(sk_pppox(po), skb, 0);	362	return sk_receive_skb(sk_pppox(po), skb, 0);
363	}	363	}
364	drop:	364	drop:

drivers/net/tun.c+1−1

@@ -1104,7 +1104,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff skb, struct net_device dev) · 1103 unmodified lines
1104	*/	1104	*/
1105	skb_orphan(skb);	1105	skb_orphan(skb);
1106		1106
1107	nf_reset(skb);	1107	nf_reset_ct(skb);
1108		1108
1109	if (ptr_ring_produce(&tfile->tx_ring, skb))	1109	if (ptr_ring_produce(&tfile->tx_ring, skb))
1110	goto drop;	1110	goto drop;

drivers/net/usb/hso.c+8−4

 		 */
 		if (serial->tiocmget) {
 			tiocmget = serial->tiocmget;
+			tiocmget->endp = hso_get_ep(interface,
+						    USB_ENDPOINT_XFER_INT,
+						    USB_DIR_IN);
+			if (!tiocmget->endp) {
+				dev_err(&interface->dev, "Failed to find INT IN ep\n");
+				goto exit;
+			}
 			tiocmget->urb = usb_alloc_urb(0, GFP_KERNEL);
 			if (tiocmget->urb) {
 				mutex_init(&tiocmget->mutex);
 				init_waitqueue_head(&tiocmget->waitq);
-				tiocmget->endp = hso_get_ep(
-					interface,
-					USB_ENDPOINT_XFER_INT,
-					USB_DIR_IN);
 			} else
 				hso_free_tiomget(serial);
 		}

drivers/net/usb/qmi_wwan.c+1−0

@@ -1350,6 +1350,7 @@ static const struct usb_device_id products[] = { · 1349 unmodified lines
1350	{QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */	1350	{QMI_FIXED_INTF(0x1e2d, 0x0082, 4)}, /* Cinterion PHxx,PXxx (2 RmNet) */
1351	{QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */	1351	{QMI_FIXED_INTF(0x1e2d, 0x0082, 5)}, /* Cinterion PHxx,PXxx (2 RmNet) */
1352	{QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/	1352	{QMI_FIXED_INTF(0x1e2d, 0x0083, 4)}, /* Cinterion PHxx,PXxx (1 RmNet + USB Audio)*/
		1353	{QMI_QUIRK_SET_DTR(0x1e2d, 0x00b0, 4)}, /* Cinterion CLS8 */
1353	{QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */	1354	{QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
1354	{QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */	1355	{QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
1355	{QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */	1356	{QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */

drivers/net/usb/r8152.c+1−2

 	struct r8152 *tp = usb_get_intfdata(intf);
 	clear_bit(SELECTIVE_SUSPEND, &tp->flags);
-	mutex_lock(&tp->control);
 	tp->rtl_ops.init(tp);
 	queue_delayed_work(system_long_wq, &tp->hw_phy_work, 0);
-	mutex_unlock(&tp->control);
+	set_ethernet_addr(tp);
 	return rtl8152_resume(intf);
 }

drivers/net/virtio_net.c+1−1

@@ -1585,7 +1585,7 @@ static netdev_tx_t start_xmit(struct sk_buff skb, struct net_device dev) · 1584 unmodified lines
1585	/* Don't wait up for transmitted skbs to be freed. */	1585	/* Don't wait up for transmitted skbs to be freed. */
1586	if (!use_napi) {	1586	if (!use_napi) {
1587	skb_orphan(skb);	1587	skb_orphan(skb);
1588	nf_reset(skb);	1588	nf_reset_ct(skb);
1589	}	1589	}
1590		1590
1591	/* If running out of space, stop queue to avoid getting packets that we	1591	/* If running out of space, stop queue to avoid getting packets that we

drivers/net/vrf.c+4−4

@@ -366,7 +366,7 @@ static int vrf_finish_output6(struct net net, struct sock sk, · 365 unmodified lines
366	struct neighbour *neigh;	366	struct neighbour *neigh;
367	int ret;	367	int ret;
368		368
369	nf_reset(skb);	369	nf_reset_ct(skb);
370		370
371	skb->protocol = htons(ETH_P_IPV6);	371	skb->protocol = htons(ETH_P_IPV6);
372	skb->dev = dev;	372	skb->dev = dev;
@@ -459,7 +459,7 @@ static struct sk_buff vrf_ip6_out_direct(struct net_device vrf_dev, · 86 unmodified lines
459		459
460	/* reset skb device */	460	/* reset skb device */
461	if (likely(err == 1))	461	if (likely(err == 1))
462	nf_reset(skb);	462	nf_reset_ct(skb);
463	else	463	else
464	skb = NULL;	464	skb = NULL;
465		465
@@ -560,7 +560,7 @@ static int vrf_finish_output(struct net net, struct sock sk, struct sk_buff *s · 94 unmodified lines
560	bool is_v6gw = false;	560	bool is_v6gw = false;
561	int ret = -EINVAL;	561	int ret = -EINVAL;
562		562
563	nf_reset(skb);	563	nf_reset_ct(skb);
564		564
565	/* Be paranoid, rather than too clever. */	565	/* Be paranoid, rather than too clever. */
566	if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {	566	if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {
@@ -670,7 +670,7 @@ static struct sk_buff vrf_ip_out_direct(struct net_device vrf_dev, · 103 unmodified lines
670		670
671	/* reset skb device */	671	/* reset skb device */
672	if (likely(err == 1))	672	if (likely(err == 1))
673	nf_reset(skb);	673	nf_reset_ct(skb);
674	else	674	else
675	skb = NULL;	675	skb = NULL;
676		676

drivers/net/wireless/mac80211_hwsim.c+2−2

@@ -1261,8 +1261,8 @@ static bool mac80211_hwsim_tx_frame_no_nl(struct ieee80211_hw *hw, · 1260 unmodified lines
1261	skb_orphan(skb);	1261	skb_orphan(skb);
1262	skb_dst_drop(skb);	1262	skb_dst_drop(skb);
1263	skb->mark = 0;	1263	skb->mark = 0;
1264	secpath_reset(skb);	1264	skb_ext_reset(skb);
1265	nf_reset(skb);	1265	nf_reset_ct(skb);
1266		1266
1267	/*	1267	/*
1268	* Get absolute mactime here so all HWs RX at the "same time", and	1268	* Get absolute mactime here so all HWs RX at the "same time", and

drivers/net/xen-netfront.c+9−8

 	return 0;
 }
-static RING_IDX xennet_fill_frags(struct netfront_queue *queue,
+static int xennet_fill_frags(struct netfront_queue *queue,
-				  struct sk_buff *skb,
+			     struct sk_buff *skb,
-				  struct sk_buff_head *list)
+			     struct sk_buff_head *list)
 {
 	RING_IDX cons = queue->rx.rsp_cons;
 	struct sk_buff *nskb;
 		if (unlikely(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) {
 			queue->rx.rsp_cons = ++cons + skb_queue_len(list);
 			kfree_skb(nskb);
-			return ~0U;
+			return -ENOENT;
 		}
 		skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
 		kfree_skb(nskb);
 	}
-	return cons;
+	queue->rx.rsp_cons = cons;
+	return 0;
 }
 static int checksum_setup(struct net_device *dev, struct sk_buff *skb)
 		skb->data_len = rx->status;
 		skb->len += rx->status;
-		i = xennet_fill_frags(queue, skb, &tmpq);
+		if (unlikely(xennet_fill_frags(queue, skb, &tmpq)))
-		if (unlikely(i == ~0U))
 			goto err;
 		if (rx->flags & XEN_NETRXF_csum_blank)
 		__skb_queue_tail(&rxq, skb);
-		queue->rx.rsp_cons = ++i;
+		i = ++queue->rx.rsp_cons;
 		work_done++;
 	}

drivers/nvme/host/core.c+113−19

@@ -102,10 +102,13 @@ static void nvme_set_queue_dying(struct nvme_ns *ns) · 101 unmodified lines
102	*/	102	*/
103	if (!ns->disk \|\| test_and_set_bit(NVME_NS_DEAD, &ns->flags))	103	if (!ns->disk \|\| test_and_set_bit(NVME_NS_DEAD, &ns->flags))
104	return;	104	return;
105	revalidate_disk(ns->disk);
106	blk_set_queue_dying(ns->queue);	105	blk_set_queue_dying(ns->queue);
107	/* Forcibly unquiesce queues to avoid blocking dispatch */	106	/* Forcibly unquiesce queues to avoid blocking dispatch */
108	blk_mq_unquiesce_queue(ns->queue);	107	blk_mq_unquiesce_queue(ns->queue);
		108	/*
		109	* Revalidate after unblocking dispatchers that may be holding bd_butex
		110	*/
		111	revalidate_disk(ns->disk);
109	}	112	}
110		113
111	static void nvme_queue_scan(struct nvme_ctrl *ctrl)	114	static void nvme_queue_scan(struct nvme_ctrl *ctrl)
@@ -847,7 +850,7 @@ out: · 735 unmodified lines
847	static int nvme_submit_user_cmd(struct request_queue *q,	850	static int nvme_submit_user_cmd(struct request_queue *q,
848	struct nvme_command cmd, void __user ubuffer,	851	struct nvme_command cmd, void __user ubuffer,
849	unsigned bufflen, void __user *meta_buffer, unsigned meta_len,	852	unsigned bufflen, void __user *meta_buffer, unsigned meta_len,
850	u32 meta_seed, u32 *result, unsigned timeout)	853	u32 meta_seed, u64 *result, unsigned timeout)
851	{	854	{
852	bool write = nvme_is_write(cmd);	855	bool write = nvme_is_write(cmd);
853	struct nvme_ns *ns = q->queuedata;	856	struct nvme_ns *ns = q->queuedata;
@@ -888,7 +891,7 @@ static int nvme_submit_user_cmd(struct request_queue *q, · 34 unmodified lines
888	else	891	else
889	ret = nvme_req(req)->status;	892	ret = nvme_req(req)->status;
890	if (result)	893	if (result)
891	*result = le32_to_cpu(nvme_req(req)->result.u32);	894	*result = le64_to_cpu(nvme_req(req)->result.u64);
892	if (meta && !ret && !write) {	895	if (meta && !ret && !write) {
893	if (copy_to_user(meta_buffer, meta, meta_len))	896	if (copy_to_user(meta_buffer, meta, meta_len))
894	ret = -EFAULT;	897	ret = -EFAULT;
@@ -1335,6 +1338,54 @@ static int nvme_user_cmd(struct nvme_ctrl ctrl, struct nvme_ns ns, · 440 unmodified lines
1335	struct nvme_command c;	1338	struct nvme_command c;
1336	unsigned timeout = 0;	1339	unsigned timeout = 0;
1337	u32 effects;	1340	u32 effects;
		1341	u64 result;
		1342	int status;
		1343
		1344	if (!capable(CAP_SYS_ADMIN))
		1345	return -EACCES;
		1346	if (copy_from_user(&cmd, ucmd, sizeof(cmd)))
		1347	return -EFAULT;
		1348	if (cmd.flags)
		1349	return -EINVAL;
		1350
		1351	memset(&c, 0, sizeof(c));
		1352	c.common.opcode = cmd.opcode;
		1353	c.common.flags = cmd.flags;
		1354	c.common.nsid = cpu_to_le32(cmd.nsid);
		1355	c.common.cdw2[0] = cpu_to_le32(cmd.cdw2);
		1356	c.common.cdw2[1] = cpu_to_le32(cmd.cdw3);
		1357	c.common.cdw10 = cpu_to_le32(cmd.cdw10);
		1358	c.common.cdw11 = cpu_to_le32(cmd.cdw11);
		1359	c.common.cdw12 = cpu_to_le32(cmd.cdw12);
		1360	c.common.cdw13 = cpu_to_le32(cmd.cdw13);
		1361	c.common.cdw14 = cpu_to_le32(cmd.cdw14);
		1362	c.common.cdw15 = cpu_to_le32(cmd.cdw15);
		1363
		1364	if (cmd.timeout_ms)
		1365	timeout = msecs_to_jiffies(cmd.timeout_ms);
		1366
		1367	effects = nvme_passthru_start(ctrl, ns, cmd.opcode);
		1368	status = nvme_submit_user_cmd(ns ? ns->queue : ctrl->admin_q, &c,
		1369	(void __user *)(uintptr_t)cmd.addr, cmd.data_len,
		1370	(void __user *)(uintptr_t)cmd.metadata,
		1371	cmd.metadata_len, 0, &result, timeout);
		1372	nvme_passthru_end(ctrl, effects);
		1373
		1374	if (status >= 0) {
		1375	if (put_user(result, &ucmd->result))
		1376	return -EFAULT;
		1377	}
		1378
		1379	return status;
		1380	}
		1381
		1382	static int nvme_user_cmd64(struct nvme_ctrl ctrl, struct nvme_ns ns,
		1383	struct nvme_passthru_cmd64 __user *ucmd)
		1384	{
		1385	struct nvme_passthru_cmd64 cmd;
		1386	struct nvme_command c;
		1387	unsigned timeout = 0;
		1388	u32 effects;
1338	int status;	1389	int status;
1339		1390
1340	if (!capable(CAP_SYS_ADMIN))	1391	if (!capable(CAP_SYS_ADMIN))
@@ -1405,6 +1456,41 @@ static void nvme_put_ns_from_disk(struct nvme_ns_head *head, int idx) · 64 unmodified lines
1405	srcu_read_unlock(&head->srcu, idx);	1456	srcu_read_unlock(&head->srcu, idx);
1406	}	1457	}
1407		1458
		1459	static bool is_ctrl_ioctl(unsigned int cmd)
		1460	{
		1461	if (cmd == NVME_IOCTL_ADMIN_CMD \|\| cmd == NVME_IOCTL_ADMIN64_CMD)
		1462	return true;
		1463	if (is_sed_ioctl(cmd))
		1464	return true;
		1465	return false;
		1466	}
		1467
		1468	static int nvme_handle_ctrl_ioctl(struct nvme_ns *ns, unsigned int cmd,
		1469	void __user *argp,
		1470	struct nvme_ns_head *head,
		1471	int srcu_idx)
		1472	{
		1473	struct nvme_ctrl *ctrl = ns->ctrl;
		1474	int ret;
		1475
		1476	nvme_get_ctrl(ns->ctrl);
		1477	nvme_put_ns_from_disk(head, srcu_idx);
		1478
		1479	switch (cmd) {
		1480	case NVME_IOCTL_ADMIN_CMD:
		1481	ret = nvme_user_cmd(ctrl, NULL, argp);
		1482	break;
		1483	case NVME_IOCTL_ADMIN64_CMD:
		1484	ret = nvme_user_cmd64(ctrl, NULL, argp);
		1485	break;
		1486	default:
		1487	ret = sed_ioctl(ctrl->opal_dev, cmd, argp);
		1488	break;
		1489	}
		1490	nvme_put_ctrl(ctrl);
		1491	return ret;
		1492	}
		1493
1408	static int nvme_ioctl(struct block_device *bdev, fmode_t mode,	1494	static int nvme_ioctl(struct block_device *bdev, fmode_t mode,
1409	unsigned int cmd, unsigned long arg)	1495	unsigned int cmd, unsigned long arg)
1410	{	1496	{
@@ -1422,20 +1508,8 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, · 11 unmodified lines
1422	* seperately and drop the ns SRCU reference early. This avoids a	1508	* seperately and drop the ns SRCU reference early. This avoids a
1423	* deadlock when deleting namespaces using the passthrough interface.	1509	* deadlock when deleting namespaces using the passthrough interface.
1424	*/	1510	*/
1425	if (cmd == NVME_IOCTL_ADMIN_CMD \|\| is_sed_ioctl(cmd)) {	1511	if (is_ctrl_ioctl(cmd))
1426	struct nvme_ctrl *ctrl = ns->ctrl;	1512	return nvme_handle_ctrl_ioctl(ns, cmd, argp, head, srcu_idx);
1427
1428	nvme_get_ctrl(ns->ctrl);
1429	nvme_put_ns_from_disk(head, srcu_idx);
1430
1431	if (cmd == NVME_IOCTL_ADMIN_CMD)
1432	ret = nvme_user_cmd(ctrl, NULL, argp);
1433	else
1434	ret = sed_ioctl(ctrl->opal_dev, cmd, argp);
1435
1436	nvme_put_ctrl(ctrl);
1437	return ret;
1438	}
1439		1513
1440	switch (cmd) {	1514	switch (cmd) {
1441	case NVME_IOCTL_ID:	1515	case NVME_IOCTL_ID:
@@ -1448,6 +1522,9 @@ static int nvme_ioctl(struct block_device *bdev, fmode_t mode, · 6 unmodified lines
1448	case NVME_IOCTL_SUBMIT_IO:	1522	case NVME_IOCTL_SUBMIT_IO:
1449	ret = nvme_submit_io(ns, argp);	1523	ret = nvme_submit_io(ns, argp);
1450	break;	1524	break;
		1525	case NVME_IOCTL_IO64_CMD:
		1526	ret = nvme_user_cmd64(ns->ctrl, ns, argp);
		1527	break;
1451	default:	1528	default:
1452	if (ns->ndev)	1529	if (ns->ndev)
1453	ret = nvme_nvm_ioctl(ns, cmd, arg);	1530	ret = nvme_nvm_ioctl(ns, cmd, arg);
@@ -2289,6 +2366,16 @@ static const struct nvme_core_quirk_entry core_quirks[] = { · 835 unmodified lines
2289	.vid = 0x14a4,	2366	.vid = 0x14a4,
2290	.fr = "22301111",	2367	.fr = "22301111",
2291	.quirks = NVME_QUIRK_SIMPLE_SUSPEND,	2368	.quirks = NVME_QUIRK_SIMPLE_SUSPEND,
		2369	},
		2370	{
		2371	/*
		2372	* This Kingston E8FK11.T firmware version has no interrupt
		2373	* after resume with actions related to suspend to idle
		2374	* https://bugzilla.kernel.org/show_bug.cgi?id=204887
		2375	*/
		2376	.vid = 0x2646,
		2377	.fr = "E8FK11.T",
		2378	.quirks = NVME_QUIRK_SIMPLE_SUSPEND,
2292	}	2379	}
2293	};	2380	};
2294		2381
@@ -2540,8 +2627,9 @@ static int nvme_init_subsystem(struct nvme_ctrl ctrl, struct nvme_id_ctrl id) · 245 unmodified lines
2540	list_add_tail(&subsys->entry, &nvme_subsystems);	2627	list_add_tail(&subsys->entry, &nvme_subsystems);
2541	}	2628	}
2542		2629
2543	if (sysfs_create_link(&subsys->dev.kobj, &ctrl->device->kobj,	2630	ret = sysfs_create_link(&subsys->dev.kobj, &ctrl->device->kobj,
2544	dev_name(ctrl->device))) {	2631	dev_name(ctrl->device));
		2632	if (ret) {
2545	dev_err(ctrl->device,	2633	dev_err(ctrl->device,
2546	"failed to create sysfs link from subsystem.\n");	2634	"failed to create sysfs link from subsystem.\n");
2547	goto out_put_subsystem;	2635	goto out_put_subsystem;
@@ -2838,6 +2926,8 @@ static long nvme_dev_ioctl(struct file *file, unsigned int cmd, · 290 unmodified lines
2838	switch (cmd) {	2926	switch (cmd) {
2839	case NVME_IOCTL_ADMIN_CMD:	2927	case NVME_IOCTL_ADMIN_CMD:
2840	return nvme_user_cmd(ctrl, NULL, argp);	2928	return nvme_user_cmd(ctrl, NULL, argp);
		2929	case NVME_IOCTL_ADMIN64_CMD:
		2930	return nvme_user_cmd64(ctrl, NULL, argp);
2841	case NVME_IOCTL_IO_CMD:	2931	case NVME_IOCTL_IO_CMD:
2842	return nvme_dev_user_cmd(ctrl, argp);	2932	return nvme_dev_user_cmd(ctrl, argp);
2843	case NVME_IOCTL_RESET:	2933	case NVME_IOCTL_RESET:
@@ -3045,6 +3135,8 @@ static DEVICE_ATTR(field, S_IRUGO, field##_show, NULL); · 201 unmodified lines
3045		3135
3046	nvme_show_int_function(cntlid);	3136	nvme_show_int_function(cntlid);
3047	nvme_show_int_function(numa_node);	3137	nvme_show_int_function(numa_node);
		3138	nvme_show_int_function(queue_count);
		3139	nvme_show_int_function(sqsize);
3048		3140
3049	static ssize_t nvme_sysfs_delete(struct device *dev,	3141	static ssize_t nvme_sysfs_delete(struct device *dev,
3050	struct device_attribute attr, const char buf,	3142	struct device_attribute attr, const char buf,
@@ -3125,6 +3217,8 @@ static struct attribute *nvme_dev_attrs[] = { · 74 unmodified lines
3125	&dev_attr_address.attr,	3217	&dev_attr_address.attr,
3126	&dev_attr_state.attr,	3218	&dev_attr_state.attr,
3127	&dev_attr_numa_node.attr,	3219	&dev_attr_numa_node.attr,
		3220	&dev_attr_queue_count.attr,
		3221	&dev_attr_sqsize.attr,
3128	NULL	3222	NULL
3129	};	3223	};
3130		3224

drivers/nvme/host/nvme.h+1−1

 	u16 oacs;
 	u16 nssa;
 	u16 nr_streams;
+	u16 sqsize;
 	u32 max_namespaces;
 	atomic_t abort_limit;
 	u8 vwc;
 	u16 hmmaxd;
 	/* Fabrics only */
-	u16 sqsize;
 	u32 ioccsz;
 	u32 iorcsz;
 	u16 icdoff;

drivers/nvme/host/pci.c+13−7

 	if (ret < 0)
 		goto unfreeze;
+	/*
+	 * A saved state prevents pci pm from generically controlling the
+	 * device's power. If we're using protocol specific settings, we don't
+	 * want pci interfering.
+	 */
+	pci_save_state(pdev);
 	ret = nvme_set_power_state(ctrl, ctrl->npss);
 	if (ret < 0)
 		goto unfreeze;
 	if (ret) {
+		/* discard the saved state */
+		pci_load_saved_state(pdev, NULL);
 		/*
 		 * Clearing npss forces a controller reset on resume. The
 		 * correct value will be resdicovered then.
 		nvme_dev_disable(ndev, true);
 		ctrl->npss = 0;
 		ret = 0;
-		goto unfreeze;
 	}
-	/*
-	 * A saved state prevents pci pm from generically controlling the
-	 * device's power. If we're using protocol specific settings, we don't
-	 * want pci interfering.
-	 */
-	pci_save_state(pdev);
 unfreeze:
 	nvme_unfreeze(ctrl);
 	return ret;
 		.driver_data = NVME_QUIRK_LIGHTNVM, },
 	{ PCI_DEVICE(0x10ec, 0x5762),   /* ADATA SX6000LNP */
 		.driver_data = NVME_QUIRK_IGNORE_DEV_SUBNQN, },
+	{ PCI_DEVICE(0x1cc1, 0x8201),   /* ADATA SX8200PNP 512GB */
+		.driver_data = NVME_QUIRK_NO_DEEPEST_PS |
+				NVME_QUIRK_IGNORE_DEV_SUBNQN, },
 	{ PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2003) },

drivers/nvme/host/rdma.c+13−6

 static int nvme_rdma_get_max_fr_pages(struct ib_device *ibdev)
 {
 	return min_t(u32, NVME_RDMA_MAX_SEGMENTS,
-		     ibdev->attrs.max_fast_reg_page_list_len);
+		     ibdev->attrs.max_fast_reg_page_list_len - 1);
 }
 static int nvme_rdma_create_queue_ib(struct nvme_rdma_queue *queue)
 	const int cq_factor = send_wr_factor + 1;	/* + RECV */
 	int comp_vector, idx = nvme_rdma_queue_idx(queue);
 	enum ib_poll_context poll_ctx;
-	int ret;
+	int ret, pages_per_mr;
 	queue->device = nvme_rdma_find_get_device(queue->cm_id);
 	if (!queue->device) {
 		goto out_destroy_qp;
 	}
+	/*
+	 * Currently we don't use SG_GAPS MR's so if the first entry is
+	 * misaligned we'll end up using two entries for a single data page,
+	 * so one additional entry is required.
+	 */
+	pages_per_mr = nvme_rdma_get_max_fr_pages(ibdev) + 1;
 	ret = ib_mr_pool_init(queue->qp, &queue->qp->rdma_mrs,
 			      queue->queue_size,
 			      IB_MR_TYPE_MEM_REG,
-			      nvme_rdma_get_max_fr_pages(ibdev), 0);
+			      pages_per_mr, 0);
 	if (ret) {
 		dev_err(queue->ctrl->ctrl.device,
 			"failed to initialize MR pool sized %d for QID %d\n",
 	if (!ret) {
 		set_bit(NVME_RDMA_Q_LIVE, &queue->flags);
 	} else {
-		__nvme_rdma_stop_queue(queue);
+		if (test_bit(NVME_RDMA_Q_ALLOCATED, &queue->flags))
+			__nvme_rdma_stop_queue(queue);
 		dev_info(ctrl->ctrl.device,
 			"failed to connect queue: %d ret=%d\n", idx, ret);
 	}
 	if (error)
 		goto out_stop_queue;
-	ctrl->ctrl.max_hw_sectors =
+	ctrl->ctrl.max_segments = ctrl->max_fr_pages;
-		(ctrl->max_fr_pages - 1) << (ilog2(SZ_4K) - 9);
+	ctrl->ctrl.max_hw_sectors = ctrl->max_fr_pages << (ilog2(SZ_4K) - 9);
 	blk_mq_unquiesce_queue(ctrl->ctrl.admin_q);

drivers/nvme/host/tcp.c+2−2

@@ -1042,7 +1042,7 @@ static void nvme_tcp_io_work(struct work_struct *w) · 1041 unmodified lines
1042	{	1042	{
1043	struct nvme_tcp_queue *queue =	1043	struct nvme_tcp_queue *queue =
1044	container_of(w, struct nvme_tcp_queue, io_work);	1044	container_of(w, struct nvme_tcp_queue, io_work);
1045	unsigned long start = jiffies + msecs_to_jiffies(1);	1045	unsigned long deadline = jiffies + msecs_to_jiffies(1);
1046		1046
1047	do {	1047	do {
1048	bool pending = false;	1048	bool pending = false;
@@ -1067,7 +1067,7 @@ static void nvme_tcp_io_work(struct work_struct *w) · 18 unmodified lines
1067	if (!pending)	1067	if (!pending)
1068	return;	1068	return;
1069		1069
1070	} while (time_after(jiffies, start)); /* quota is exhausted */	1070	} while (!time_after(jiffies, deadline)); /* quota is exhausted */
1071		1071
1072	queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work);	1072	queue_work_on(queue->io_cpu, nvme_tcp_wq, &queue->io_work);
1073	}	1073	}

drivers/nvme/target/io-cmd-bdev.c+8−8

@@ -11,10 +11,10 @@ · 10 unmodified lines
11	void nvmet_bdev_set_limits(struct block_device bdev, struct nvme_id_ns id)	11	void nvmet_bdev_set_limits(struct block_device bdev, struct nvme_id_ns id)
12	{	12	{
13	const struct queue_limits *ql = &bdev_get_queue(bdev)->limits;	13	const struct queue_limits *ql = &bdev_get_queue(bdev)->limits;
14	/* Number of physical blocks per logical block. */	14	/* Number of logical blocks per physical block. */
15	const u32 ppl = ql->physical_block_size / ql->logical_block_size;	15	const u32 lpp = ql->physical_block_size / ql->logical_block_size;
16	/* Physical blocks per logical block, 0's based. */	16	/* Logical blocks per physical block, 0's based. */
17	const __le16 ppl0b = to0based(ppl);	17	const __le16 lpp0b = to0based(lpp);
18		18
19	/*	19	/*
20	* For NVMe 1.2 and later, bit 1 indicates that the fields NAWUN,	20	* For NVMe 1.2 and later, bit 1 indicates that the fields NAWUN,
@@ -25,9 +25,9 @@ void nvmet_bdev_set_limits(struct block_device bdev, struct nvme_id_ns id) · 4 unmodified lines
25	* field from the identify controller data structure should be used.	25	* field from the identify controller data structure should be used.
26	*/	26	*/
27	id->nsfeat \|= 1 << 1;	27	id->nsfeat \|= 1 << 1;
28	id->nawun = ppl0b;	28	id->nawun = lpp0b;
29	id->nawupf = ppl0b;	29	id->nawupf = lpp0b;
30	id->nacwu = ppl0b;	30	id->nacwu = lpp0b;
31		31
32	/*	32	/*
33	* Bit 4 indicates that the fields NPWG, NPWA, NPDG, NPDA, and	33	* Bit 4 indicates that the fields NPWG, NPWA, NPDG, NPDA, and
@@ -36,7 +36,7 @@ void nvmet_bdev_set_limits(struct block_device bdev, struct nvme_id_ns id) · 2 unmodified lines
36	*/	36	*/
37	id->nsfeat \|= 1 << 4;	37	id->nsfeat \|= 1 << 4;
38	/* NPWG = Namespace Preferred Write Granularity. 0's based */	38	/* NPWG = Namespace Preferred Write Granularity. 0's based */
39	id->npwg = ppl0b;	39	id->npwg = lpp0b;
40	/* NPWA = Namespace Preferred Write Alignment. 0's based */	40	/* NPWA = Namespace Preferred Write Alignment. 0's based */
41	id->npwa = id->npwg;	41	id->npwa = id->npwg;
42	/* NPDG = Namespace Preferred Deallocate Granularity. 0's based */	42	/* NPDG = Namespace Preferred Deallocate Granularity. 0's based */

drivers/nvme/target/tcp.c+4−8

 	return 0;
 err:
-	if (cmd->req.sg_cnt)
+	sgl_free(cmd->req.sg);
-		sgl_free(cmd->req.sg);
 	return NVME_SC_INTERNAL;
 }
 	if (queue->nvme_sq.sqhd_disabled) {
 		kfree(cmd->iov);
-		if (cmd->req.sg_cnt)
+		sgl_free(cmd->req.sg);
-			sgl_free(cmd->req.sg);
 	}
 	return 1;
 		return -EAGAIN;
 	kfree(cmd->iov);
-	if (cmd->req.sg_cnt)
+	sgl_free(cmd->req.sg);
-		sgl_free(cmd->req.sg);
 	cmd->queue->snd_cmd = NULL;
 	nvmet_tcp_put_cmd(cmd);
 	return 1;
 	nvmet_req_uninit(&cmd->req);
 	nvmet_tcp_unmap_pdu_iovec(cmd);
 	kfree(cmd->iov);
-	if (cmd->req.sg_cnt)
+	sgl_free(cmd->req.sg);
-		sgl_free(cmd->req.sg);
 }
 static void nvmet_tcp_uninit_data_in_cmds(struct nvmet_tcp_queue *queue)

drivers/ptp/ptp_qoriq.c+2−1

 		ptp_qoriq->regs.etts_regs = base + ETTS_REGS_OFFSET;
 	}
+	spin_lock_init(&ptp_qoriq->lock);
 	ktime_get_real_ts64(&now);
 	ptp_qoriq_settime(&ptp_qoriq->caps, &now);
 	  (ptp_qoriq->tclk_period & TCLK_PERIOD_MASK) << TCLK_PERIOD_SHIFT |
 	  (ptp_qoriq->cksel & CKSEL_MASK) << CKSEL_SHIFT;
-	spin_lock_init(&ptp_qoriq->lock);
 	spin_lock_irqsave(&ptp_qoriq->lock, flags);
 	regs = &ptp_qoriq->regs;

drivers/s390/block/dasd_eckd.c+11−70

 	if (rc == 0) {
 		memcpy(&private->vsq, vsq, sizeof(*vsq));
 	} else {
-		dev_warn(&device->cdev->dev,
+		DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
-			 "Reading the volume storage information failed with rc=%d\n", rc);
+				"Reading the volume storage information failed with rc=%d", rc);
 	}
 	if (useglobal)
 	if (rc == 0) {
 		dasd_eckd_cpy_ext_pool_data(device, lcq);
 	} else {
-		dev_warn(&device->cdev->dev,
+		DBF_EVENT_DEVID(DBF_WARNING, device->cdev,
-			 "Reading the logical configuration failed with rc=%d\n", rc);
+				"Reading the logical configuration failed with rc=%d", rc);
 	}
 	dasd_sfree_request(cqr, cqr->memdev);
 	dasd_eckd_read_features(device);
 	/* Read Volume Information */
-	rc = dasd_eckd_read_vol_info(device);
+	dasd_eckd_read_vol_info(device);
-	if (rc)
-		goto out_err3;
 	/* Read Extent Pool Information */
-	rc = dasd_eckd_read_ext_pool_info(device);
+	dasd_eckd_read_ext_pool_info(device);
-	if (rc)
-		goto out_err3;
 	/* Read Device Characteristics */
 	rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
 	if (readonly)
 		set_bit(DASD_FLAG_DEVICE_RO, &device->flags);
-	if (dasd_eckd_is_ese(device))
-		dasd_set_feature(device->cdev, DASD_FEATURE_DISCARD, 1);
 	dev_info(&device->cdev->dev, "New DASD %04X/%02X (CU %04X/%02X) "
 		 "with %d cylinders, %d heads, %d sectors%s\n",
 		 private->rdc_data.dev_type,
 		return -EINVAL;
 }
-static struct dasd_ccw_req *
-dasd_eckd_build_cp_discard(struct dasd_device *device, struct dasd_block *block,
-			   struct request *req, sector_t first_trk,
-			   sector_t last_trk)
-{
-	return dasd_eckd_dso_ras(device, block, req, first_trk, last_trk, 1);
-}
 static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
 					       struct dasd_device *startdev,
 					       struct dasd_block *block,
 	cmdwtd = private->features.feature[12] & 0x40;
 	use_prefix = private->features.feature[8] & 0x01;
-	if (req_op(req) == REQ_OP_DISCARD)
-		return dasd_eckd_build_cp_discard(startdev, block, req,
-						  first_trk, last_trk);
 	cqr = NULL;
 	if (cdlspecial || dasd_page_cache) {
 		/* do nothing, just fall through to the cmd mode single case */
 						     struct dasd_block *block,
 						     struct request *req)
 {
-	struct dasd_device *startdev = NULL;
 	struct dasd_eckd_private *private;
-	struct dasd_ccw_req *cqr;
+	struct dasd_device *startdev;
 	unsigned long flags;
+	struct dasd_ccw_req *cqr;
-	/* Discard requests can only be processed on base devices */
+	startdev = dasd_alias_get_start_dev(base);
-	if (req_op(req) != REQ_OP_DISCARD)
-		startdev = dasd_alias_get_start_dev(base);
 	if (!startdev)
 		startdev = base;
 	private = startdev->private;
 	dasd_eckd_read_features(device);
 	/* Read Volume Information */
-	rc = dasd_eckd_read_vol_info(device);
+	dasd_eckd_read_vol_info(device);
-	if (rc)
-		goto out_err2;
 	/* Read Extent Pool Information */
-	rc = dasd_eckd_read_ext_pool_info(device);
+	dasd_eckd_read_ext_pool_info(device);
-	if (rc)
-		goto out_err2;
 	/* Read Device Characteristics */
 	rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
 	unsigned int logical_block_size = block->bp_block;
 	struct request_queue *q = block->request_queue;
 	struct dasd_device *device = block->base;
-	struct dasd_eckd_private *private;
-	unsigned int max_discard_sectors;
-	unsigned int max_bytes;
-	unsigned int ext_bytes; /* Extent Size in Bytes */
-	int recs_per_trk;
-	int trks_per_cyl;
-	int ext_limit;
-	int ext_size; /* Extent Size in Cylinders */
 	int max;
-	private = device->private;
-	trks_per_cyl = private->rdc_data.trk_per_cyl;
-	recs_per_trk = recs_per_track(&private->rdc_data, 0, logical_block_size);
 	if (device->features & DASD_FEATURE_USERAW) {
 		/*
 		 * the max_blocks value for raw_track access is 256
 	/* With page sized segments each segment can be translated into one idaw/tidaw */
 	blk_queue_max_segment_size(q, PAGE_SIZE);
 	blk_queue_segment_boundary(q, PAGE_SIZE - 1);
-	if (dasd_eckd_is_ese(device)) {
-		/*
-		 * Depending on the extent size, up to UINT_MAX bytes can be
-		 * accepted. However, neither DASD_ECKD_RAS_EXTS_MAX nor the
-		 * device limits should be exceeded.
-		 */
-		ext_size = dasd_eckd_ext_size(device);
-		ext_limit = min(private->real_cyl / ext_size, DASD_ECKD_RAS_EXTS_MAX);
-		ext_bytes = ext_size * trks_per_cyl * recs_per_trk *
-			logical_block_size;
-		max_bytes = UINT_MAX - (UINT_MAX % ext_bytes);
-		if (max_bytes / ext_bytes > ext_limit)
-			max_bytes = ext_bytes * ext_limit;
-		max_discard_sectors = max_bytes / 512;
-		blk_queue_max_discard_sectors(q, max_discard_sectors);
-		blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
-		q->limits.discard_granularity = ext_bytes;
-		q->limits.discard_alignment = ext_bytes;
-	}
 }
 static struct ccw_driver dasd_eckd_driver = {

drivers/s390/cio/cio.h+1−0

@@ -113,6 +113,7 @@ struct subchannel { · 112 unmodified lines
113	enum sch_todo todo;	113	enum sch_todo todo;
114	struct work_struct todo_work;	114	struct work_struct todo_work;
115	struct schib_config config;	115	struct schib_config config;
		116	u64 dma_mask;
116	char driver_override; / Driver name to force a match */	117	char driver_override; / Driver name to force a match */
117	} __attribute__ ((aligned(8)));	118	} __attribute__ ((aligned(8)));
118		119

drivers/s390/cio/css.c+6−1

 	 * belong to a subchannel need to fit 31 bit width (e.g. ccw).
 	 */
 	sch->dev.coherent_dma_mask = DMA_BIT_MASK(31);
-	sch->dev.dma_mask = &sch->dev.coherent_dma_mask;
+	/*
+	 * But we don't have such restrictions imposed on the stuff that
+	 * is handled by the streaming API.
+	 */
+	sch->dma_mask = DMA_BIT_MASK(64);
+	sch->dev.dma_mask = &sch->dma_mask;
 	return sch;
 err:

drivers/s390/cio/device.c+1−1

@@ -710,7 +710,7 @@ static struct ccw_device * io_subchannel_allocate_dev(struct subchannel *sch) · 709 unmodified lines
710	if (!cdev->private)	710	if (!cdev->private)
711	goto err_priv;	711	goto err_priv;
712	cdev->dev.coherent_dma_mask = sch->dev.coherent_dma_mask;	712	cdev->dev.coherent_dma_mask = sch->dev.coherent_dma_mask;
713	cdev->dev.dma_mask = &cdev->dev.coherent_dma_mask;	713	cdev->dev.dma_mask = sch->dev.dma_mask;
714	dma_pool = cio_gp_dma_create(&cdev->dev, 1);	714	dma_pool = cio_gp_dma_create(&cdev->dev, 1);
715	if (!dma_pool)	715	if (!dma_pool)
716	goto err_dma_pool;	716	goto err_dma_pool;

drivers/s390/cio/qdio_setup.c+1−1

@@ -113,7 +113,7 @@ static void set_impl_params(struct qdio_irq *irq_ptr, · 112 unmodified lines
113	irq_ptr->qib.pfmt = qib_param_field_format;	113	irq_ptr->qib.pfmt = qib_param_field_format;
114	if (qib_param_field)	114	if (qib_param_field)
115	memcpy(irq_ptr->qib.parm, qib_param_field,	115	memcpy(irq_ptr->qib.parm, qib_param_field,
116	QDIO_MAX_BUFFERS_PER_Q);	116	sizeof(irq_ptr->qib.parm));
117		117
118	if (!input_slib_elements)	118	if (!input_slib_elements)
119	goto output;	119	goto output;

drivers/s390/net/qeth_core_main.c+1−2

@@ -4715,8 +4715,7 @@ static int qeth_qdio_establish(struct qeth_card *card) · 4714 unmodified lines
4715		4715
4716	QETH_CARD_TEXT(card, 2, "qdioest");	4716	QETH_CARD_TEXT(card, 2, "qdioest");
4717		4717
4718	qib_param_field = kzalloc(QDIO_MAX_BUFFERS_PER_Q,	4718	qib_param_field = kzalloc(FIELD_SIZEOF(struct qib, parm), GFP_KERNEL);
4719	GFP_KERNEL);
4720	if (!qib_param_field) {	4719	if (!qib_param_field) {
4721	rc = -ENOMEM;	4720	rc = -ENOMEM;
4722	goto out_free_nothing;	4721	goto out_free_nothing;

drivers/scsi/bnx2fc/bnx2fc_io.c+24−5

@@ -1923,6 +1923,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, · 1922 unmodified lines
1923	struct fcoe_fcp_rsp_payload *fcp_rsp;	1923	struct fcoe_fcp_rsp_payload *fcp_rsp;
1924	struct bnx2fc_rport *tgt = io_req->tgt;	1924	struct bnx2fc_rport *tgt = io_req->tgt;
1925	struct scsi_cmnd *sc_cmd;	1925	struct scsi_cmnd *sc_cmd;
		1926	u16 scope = 0, qualifier = 0;
1926		1927
1927	/* scsi_cmd_cmpl is called with tgt lock held */	1928	/* scsi_cmd_cmpl is called with tgt lock held */
1928		1929
@@ -1990,12 +1991,30 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, · 61 unmodified lines
1990		1991
1991	if (io_req->cdb_status == SAM_STAT_TASK_SET_FULL \|\|	1992	if (io_req->cdb_status == SAM_STAT_TASK_SET_FULL \|\|
1992	io_req->cdb_status == SAM_STAT_BUSY) {	1993	io_req->cdb_status == SAM_STAT_BUSY) {
1993	/* Set the jiffies + retry_delay_timer * 100ms	1994	/* Newer array firmware with BUSY or
1994	for the rport/tgt */	1995	* TASK_SET_FULL may return a status that needs
1995	tgt->retry_delay_timestamp = jiffies +	1996	* the scope bits masked.
1996	fcp_rsp->retry_delay_timer * HZ / 10;	1997	* Or a huge delay timestamp up to 27 minutes
		1998	* can result.
		1999	*/
		2000	if (fcp_rsp->retry_delay_timer) {
		2001	/* Upper 2 bits */
		2002	scope = fcp_rsp->retry_delay_timer
		2003	& 0xC000;
		2004	/* Lower 14 bits */
		2005	qualifier = fcp_rsp->retry_delay_timer
		2006	& 0x3FFF;
		2007	}
		2008	if (scope > 0 && qualifier > 0 &&
		2009	qualifier <= 0x3FEF) {
		2010	/* Set the jiffies +
		2011	* retry_delay_timer * 100ms
		2012	* for the rport/tgt
		2013	*/
		2014	tgt->retry_delay_timestamp = jiffies +
		2015	(qualifier * HZ / 10);
		2016	}
1997	}	2017	}
1998
1999	}	2018	}
2000	if (io_req->fcp_resid)	2019	if (io_req->fcp_resid)
2001	scsi_set_resid(sc_cmd, io_req->fcp_resid);	2020	scsi_set_resid(sc_cmd, io_req->fcp_resid);

drivers/scsi/hisi_sas/hisi_sas_main.c+3−3

drivers/scsi/megaraid.c+2−2

@@ -4183,11 +4183,11 @@ megaraid_probe_one(struct pci_dev pdev, const struct pci_device_id id) · 4182 unmodified lines
4183	*/	4183	*/
4184	if (pdev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ &&	4184	if (pdev->subsystem_vendor == PCI_VENDOR_ID_COMPAQ &&
4185	pdev->subsystem_device == 0xC000)	4185	pdev->subsystem_device == 0xC000)
4186	return -ENODEV;	4186	goto out_disable_device;
4187	/* Now check the magic signature byte */	4187	/* Now check the magic signature byte */
4188	pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic);	4188	pci_read_config_word(pdev, PCI_CONF_AMISIG, &magic);
4189	if (magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE)	4189	if (magic != HBA_SIGNATURE_471 && magic != HBA_SIGNATURE)
4190	return -ENODEV;	4190	goto out_disable_device;
4191	/* Ok it is probably a megaraid */	4191	/* Ok it is probably a megaraid */
4192	}	4192	}
4193		4193

drivers/scsi/qedf/qedf_main.c+1−1

@@ -596,7 +596,7 @@ static void qedf_dcbx_handler(void dev, struct qed_dcbx_get get, u32 mib_type) · 595 unmodified lines
596	tmp_prio = get->operational.app_prio.fcoe;	596	tmp_prio = get->operational.app_prio.fcoe;
597	if (qedf_default_prio > -1)	597	if (qedf_default_prio > -1)
598	qedf->prio = qedf_default_prio;	598	qedf->prio = qedf_default_prio;
599	else if (tmp_prio < 0 \|\| tmp_prio > 7) {	599	else if (tmp_prio > 7) {
600	QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC,	600	QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC,
601	"FIP/FCoE prio %d out of range, setting to %d.\n",	601	"FIP/FCoE prio %d out of range, setting to %d.\n",
602	tmp_prio, QEDF_DEFAULT_PRIO);	602	tmp_prio, QEDF_DEFAULT_PRIO);

drivers/scsi/qla2xxx/qla_attr.c+2−0

@@ -2920,6 +2920,8 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) · 2919 unmodified lines
2920	struct qla_hw_data *ha = vha->hw;	2920	struct qla_hw_data *ha = vha->hw;
2921	uint16_t id = vha->vp_idx;	2921	uint16_t id = vha->vp_idx;
2922		2922
		2923	set_bit(VPORT_DELETE, &vha->dpc_flags);
		2924
2923	while (test_bit(LOOP_RESYNC_ACTIVE, &vha->dpc_flags) \|\|	2925	while (test_bit(LOOP_RESYNC_ACTIVE, &vha->dpc_flags) \|\|
2924	test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))	2926	test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))
2925	msleep(1000);	2927	msleep(1000);

drivers/scsi/qla2xxx/qla_def.h+3−1

 	unsigned int query:1;
 	unsigned int id_changed:1;
 	unsigned int scan_needed:1;
+	unsigned int n2n_flag:1;
 	struct completion nvme_del_done;
 	uint32_t nvme_prli_service_param;
 	uint8_t fc4_type;
 	uint8_t	fc4f_nvme;
 	uint8_t scan_state;
-	uint8_t n2n_flag;
 	unsigned long last_queue_full;
 	unsigned long last_ramp_up;
 enum fc4type_t {
 	FS_FC4TYPE_FCP	= BIT_0,
 	FS_FC4TYPE_NVME	= BIT_1,
+	FS_FCP_IS_N2N = BIT_7,
 };
 struct fab_scan_rp {
 #define IOCB_WORK_ACTIVE	31
 #define SET_ZIO_THRESHOLD_NEEDED 32
 #define ISP_ABORT_TO_ROM	33
+#define VPORT_DELETE		34
 	unsigned long	pci_flags;
 #define PFLG_DISCONNECTED	0	/* PCI device removed */

drivers/scsi/qla2xxx/qla_gs.c+2−1

@@ -3102,7 +3102,8 @@ int qla24xx_post_gpnid_work(struct scsi_qla_host vha, port_id_t id) · 3101 unmodified lines
3102	{	3102	{
3103	struct qla_work_evt *e;	3103	struct qla_work_evt *e;
3104		3104
3105	if (test_bit(UNLOADING, &vha->dpc_flags))	3105	if (test_bit(UNLOADING, &vha->dpc_flags) \|\|
		3106	(vha->vp_idx && test_bit(VPORT_DELETE, &vha->dpc_flags)))
3106	return 0;	3107	return 0;
3107		3108
3108	e = qla2x00_alloc_work(vha, QLA_EVT_GPNID);	3109	e = qla2x00_alloc_work(vha, QLA_EVT_GPNID);

drivers/scsi/qla2xxx/qla_init.c+78−31

@@ -746,12 +746,15 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, · 745 unmodified lines
746	break;	746	break;
747	default:	747	default:
748	if ((id.b24 != fcport->d_id.b24 &&	748	if ((id.b24 != fcport->d_id.b24 &&
749	fcport->d_id.b24) \|\|	749	fcport->d_id.b24 &&
		750	fcport->loop_id != FC_NO_LOOP_ID) \|\|
750	(fcport->loop_id != FC_NO_LOOP_ID &&	751	(fcport->loop_id != FC_NO_LOOP_ID &&
751	fcport->loop_id != loop_id)) {	752	fcport->loop_id != loop_id)) {
752	ql_dbg(ql_dbg_disc, vha, 0x20e3,	753	ql_dbg(ql_dbg_disc, vha, 0x20e3,
753	"%s %d %8phC post del sess\n",	754	"%s %d %8phC post del sess\n",
754	__func__, __LINE__, fcport->port_name);	755	__func__, __LINE__, fcport->port_name);
		756	if (fcport->n2n_flag)
		757	fcport->d_id.b24 = 0;
755	qlt_schedule_sess_for_deletion(fcport);	758	qlt_schedule_sess_for_deletion(fcport);
756	return;	759	return;
757	}	760	}
@@ -759,6 +762,8 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, · 1 unmodified line
759	}	762	}
760		763
761	fcport->loop_id = loop_id;	764	fcport->loop_id = loop_id;
		765	if (fcport->n2n_flag)
		766	fcport->d_id.b24 = id.b24;
762		767
763	wwn = wwn_to_u64(fcport->port_name);	768	wwn = wwn_to_u64(fcport->port_name);
764	qlt_find_sess_invalidate_other(vha, wwn,	769	qlt_find_sess_invalidate_other(vha, wwn,
@@ -972,7 +977,7 @@ static void qla24xx_async_gnl_sp_done(srb_t *sp, int res) · 207 unmodified lines
972	wwn = wwn_to_u64(e->port_name);	977	wwn = wwn_to_u64(e->port_name);
973		978
974	ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20e8,	979	ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20e8,
975	"%s %8phC %02x:%02x:%02x state %d/%d lid %x \n",	980	"%s %8phC %02x:%02x:%02x CLS %x/%x lid %x \n",
976	__func__, (void *)&wwn, e->port_id[2], e->port_id[1],	981	__func__, (void *)&wwn, e->port_id[2], e->port_id[1],
977	e->port_id[0], e->current_login_state, e->last_login_state,	982	e->port_id[0], e->current_login_state, e->last_login_state,
978	(loop_id & 0x7fff));	983	(loop_id & 0x7fff));
@@ -1499,7 +1504,8 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host vha, fc_port_t fcport) · 520 unmodified lines
1499	(fcport->fw_login_state == DSC_LS_PRLI_PEND)))	1504	(fcport->fw_login_state == DSC_LS_PRLI_PEND)))
1500	return 0;	1505	return 0;
1501		1506
1502	if (fcport->fw_login_state == DSC_LS_PLOGI_COMP) {	1507	if (fcport->fw_login_state == DSC_LS_PLOGI_COMP &&
		1508	!N2N_TOPO(vha->hw)) {
1503	if (time_before_eq(jiffies, fcport->plogi_nack_done_deadline)) {	1509	if (time_before_eq(jiffies, fcport->plogi_nack_done_deadline)) {
1504	set_bit(RELOGIN_NEEDED, &vha->dpc_flags);	1510	set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
1505	return 0;	1511	return 0;
@@ -1570,8 +1576,9 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host vha, fc_port_t fcport) · 64 unmodified lines
1570	qla24xx_post_gpdb_work(vha, fcport, 0);	1576	qla24xx_post_gpdb_work(vha, fcport, 0);
1571	} else {	1577	} else {
1572	ql_dbg(ql_dbg_disc, vha, 0x2118,	1578	ql_dbg(ql_dbg_disc, vha, 0x2118,
1573	"%s %d %8phC post NVMe PRLI\n",	1579	"%s %d %8phC post %s PRLI\n",
1574	__func__, __LINE__, fcport->port_name);	1580	__func__, __LINE__, fcport->port_name,
		1581	fcport->fc4f_nvme ? "NVME" : "FC");
1575	qla24xx_post_prli_work(vha, fcport);	1582	qla24xx_post_prli_work(vha, fcport);
1576	}	1583	}
1577	break;	1584	break;
@@ -1853,17 +1860,38 @@ qla24xx_handle_prli_done_event(struct scsi_qla_host vha, struct event_arg ea) · 275 unmodified lines
1853	break;	1860	break;
1854	}	1861	}
1855		1862
1856	if (ea->fcport->n2n_flag) {	1863	if (ea->fcport->fc4f_nvme) {
1857	ql_dbg(ql_dbg_disc, vha, 0x2118,	1864	ql_dbg(ql_dbg_disc, vha, 0x2118,
1858	"%s %d %8phC post fc4 prli\n",	1865	"%s %d %8phC post fc4 prli\n",
1859	__func__, __LINE__, ea->fcport->port_name);	1866	__func__, __LINE__, ea->fcport->port_name);
1860	ea->fcport->fc4f_nvme = 0;	1867	ea->fcport->fc4f_nvme = 0;
1861	ea->fcport->n2n_flag = 0;
1862	qla24xx_post_prli_work(vha, ea->fcport);	1868	qla24xx_post_prli_work(vha, ea->fcport);
		1869	return;
		1870	}
		1871
		1872	/* at this point both PRLI NVME & PRLI FCP failed */
		1873	if (N2N_TOPO(vha->hw)) {
		1874	if (ea->fcport->n2n_link_reset_cnt < 3) {
		1875	ea->fcport->n2n_link_reset_cnt++;
		1876	/*
		1877	* remote port is not sending Plogi. Reset
		1878	* link to kick start his state machine
		1879	*/
		1880	set_bit(N2N_LINK_RESET, &vha->dpc_flags);
		1881	} else {
		1882	ql_log(ql_log_warn, vha, 0x2119,
		1883	"%s %d %8phC Unable to reconnect\n",
		1884	__func__, __LINE__, ea->fcport->port_name);
		1885	}
		1886	} else {
		1887	/*
		1888	* switch connect. login failed. Take connection
		1889	* down and allow relogin to retrigger
		1890	*/
		1891	ea->fcport->flags &= ~FCF_ASYNC_SENT;
		1892	ea->fcport->keep_nport_handle = 0;
		1893	qlt_schedule_sess_for_deletion(ea->fcport);
1863	}	1894	}
1864	ql_dbg(ql_dbg_disc, vha, 0x2119,
1865	"%s %d %8phC unhandle event of %x\n",
1866	__func__, __LINE__, ea->fcport->port_name, ea->data[0]);
1867	break;	1895	break;
1868	}	1896	}
1869	}	1897	}
@@ -3190,7 +3218,7 @@ qla2x00_alloc_fw_dump(scsi_qla_host_t *vha) · 1320 unmodified lines
3190		3218
3191	for (j = 0; j < 2; j++, fwdt++) {	3219	for (j = 0; j < 2; j++, fwdt++) {
3192	if (!fwdt->template) {	3220	if (!fwdt->template) {
3193	ql_log(ql_log_warn, vha, 0x00ba,	3221	ql_dbg(ql_dbg_init, vha, 0x00ba,
3194	"-> fwdt%u no template\n", j);	3222	"-> fwdt%u no template\n", j);
3195	continue;	3223	continue;
3196	}	3224	}
@@ -4986,28 +5014,47 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) · 1789 unmodified lines
4986	unsigned long flags;	5014	unsigned long flags;
4987		5015
4988	/* Inititae N2N login. */	5016	/* Inititae N2N login. */
4989	if (test_and_clear_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags)) {	5017	if (N2N_TOPO(ha)) {
4990	/* borrowing */	5018	if (test_and_clear_bit(N2N_LOGIN_NEEDED, &vha->dpc_flags)) {
4991	u32 *bp, i, sz;	5019	/* borrowing */
4992		5020	u32 *bp, i, sz;
4993	memset(ha->init_cb, 0, ha->init_cb_size);	5021
4994	sz = min_t(int, sizeof(struct els_plogi_payload),	5022	memset(ha->init_cb, 0, ha->init_cb_size);
4995	ha->init_cb_size);	5023	sz = min_t(int, sizeof(struct els_plogi_payload),
4996	rval = qla24xx_get_port_login_templ(vha, ha->init_cb_dma,	5024	ha->init_cb_size);
4997	(void *)ha->init_cb, sz);	5025	rval = qla24xx_get_port_login_templ(vha,
4998	if (rval == QLA_SUCCESS) {	5026	ha->init_cb_dma, (void *)ha->init_cb, sz);
4999	bp = (uint32_t *)ha->init_cb;	5027	if (rval == QLA_SUCCESS) {
5000	for (i = 0; i < sz/4 ; i++, bp++)	5028	bp = (uint32_t *)ha->init_cb;
5001	bp = cpu_to_be32(bp);	5029	for (i = 0; i < sz/4 ; i++, bp++)
		5030	bp = cpu_to_be32(bp);
5002		5031
5003	memcpy(&ha->plogi_els_payld.data, (void *)ha->init_cb,	5032	memcpy(&ha->plogi_els_payld.data,
5004	sizeof(ha->plogi_els_payld.data));	5033	(void *)ha->init_cb,
5005	set_bit(RELOGIN_NEEDED, &vha->dpc_flags);	5034	sizeof(ha->plogi_els_payld.data));
5006	} else {	5035	set_bit(RELOGIN_NEEDED, &vha->dpc_flags);
5007	ql_dbg(ql_dbg_init, vha, 0x00d1,	5036	} else {
5008	"PLOGI ELS param read fail.\n");	5037	ql_dbg(ql_dbg_init, vha, 0x00d1,
		5038	"PLOGI ELS param read fail.\n");
		5039	goto skip_login;
		5040	}
		5041	}
		5042
		5043	list_for_each_entry(fcport, &vha->vp_fcports, list) {
		5044	if (fcport->n2n_flag) {
		5045	qla24xx_fcport_handle_login(vha, fcport);
		5046	return QLA_SUCCESS;
		5047	}
		5048	}
		5049	skip_login:
		5050	spin_lock_irqsave(&vha->work_lock, flags);
		5051	vha->scan.scan_retry++;
		5052	spin_unlock_irqrestore(&vha->work_lock, flags);
		5053
		5054	if (vha->scan.scan_retry < MAX_SCAN_RETRIES) {
		5055	set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags);
		5056	set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags);
5009	}	5057	}
5010	return QLA_SUCCESS;
5011	}	5058	}
5012		5059
5013	found_devs = 0;	5060	found_devs = 0;

drivers/scsi/qla2xxx/qla_iocb.c+4−3

 	els_iocb->port_id[0] = sp->fcport->d_id.b.al_pa;
 	els_iocb->port_id[1] = sp->fcport->d_id.b.area;
 	els_iocb->port_id[2] = sp->fcport->d_id.b.domain;
-	els_iocb->s_id[0] = vha->d_id.b.al_pa;
+	/* For SID the byte order is different than DID */
-	els_iocb->s_id[1] = vha->d_id.b.area;
+	els_iocb->s_id[1] = vha->d_id.b.al_pa;
-	els_iocb->s_id[2] = vha->d_id.b.domain;
+	els_iocb->s_id[2] = vha->d_id.b.area;
+	els_iocb->s_id[0] = vha->d_id.b.domain;
 	if (elsio->u.els_logo.els_cmd == ELS_DCMD_PLOGI) {
 		els_iocb->control_flags = 0;

drivers/scsi/qla2xxx/qla_mbx.c+22−3

 	mbx_cmd_t mc;
 	mbx_cmd_t *mcp = &mc;
-	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x105a,
+	ql_dbg(ql_dbg_disc, vha, 0x105a,
 	    "Entered %s.\n", __func__);
 	if (IS_CNA_CAPABLE(vha->hw)) {
 		case TOPO_N2N:
 			ha->current_topology = ISP_CFG_N;
 			spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
+			list_for_each_entry(fcport, &vha->vp_fcports, list) {
+				fcport->scan_state = QLA_FCPORT_SCAN;
+				fcport->n2n_flag = 0;
+			}
 			fcport = qla2x00_find_fcport_by_wwpn(vha,
 			    rptid_entry->u.f1.port_name, 1);
 			spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
 			if (fcport) {
 				fcport->plogi_nack_done_deadline = jiffies + HZ;
-				fcport->dm_login_expire = jiffies + 3*HZ;
+				fcport->dm_login_expire = jiffies + 2*HZ;
 				fcport->scan_state = QLA_FCPORT_FOUND;
+				fcport->n2n_flag = 1;
+				fcport->keep_nport_handle = 1;
+				if (vha->flags.nvme_enabled)
+					fcport->fc4f_nvme = 1;
 				switch (fcport->disc_state) {
 				case DSC_DELETED:
 					set_bit(RELOGIN_NEEDED,
 				    rptid_entry->u.f1.port_name,
 				    rptid_entry->u.f1.node_name,
 				    NULL,
-				    FC4_TYPE_UNKNOWN);
+				    FS_FCP_IS_N2N);
 			}
 			/* if our portname is higher then initiate N2N login */
 		list_for_each_entry(fcport, &vha->vp_fcports, list) {
 			fcport->scan_state = QLA_FCPORT_SCAN;
+			fcport->n2n_flag = 0;
 		}
 		fcport = qla2x00_find_fcport_by_wwpn(vha,
 			fcport->login_retry = vha->hw->login_retry_count;
 			fcport->plogi_nack_done_deadline = jiffies + HZ;
 			fcport->scan_state = QLA_FCPORT_FOUND;
+			fcport->keep_nport_handle = 1;
+			fcport->n2n_flag = 1;
+			fcport->d_id.b.domain =
+				rptid_entry->u.f2.remote_nport_id[2];
+			fcport->d_id.b.area =
+				rptid_entry->u.f2.remote_nport_id[1];
+			fcport->d_id.b.al_pa =
+				rptid_entry->u.f2.remote_nport_id[0];
 		}
 	}
 }

drivers/scsi/qla2xxx/qla_mid.c+22−10

 	uint16_t vp_id;
 	struct qla_hw_data *ha = vha->hw;
 	unsigned long flags = 0;
+	u8 i;
 	mutex_lock(&ha->vport_lock);
 	/*
 	 * ensures no active vp_list traversal while the vport is removed
 	 * from the queue)
 	 */
-	wait_event_timeout(vha->vref_waitq, !atomic_read(&vha->vref_count),
+	for (i = 0; i < 10 && atomic_read(&vha->vref_count); i++)
-	    10*HZ);
+		wait_event_timeout(vha->vref_waitq,
+		    atomic_read(&vha->vref_count), HZ);
 	spin_lock_irqsave(&ha->vport_slock, flags);
 	if (atomic_read(&vha->vref_count)) {
 	spin_lock_irqsave(&ha->vport_slock, flags);
 	list_for_each_entry(vha, &ha->vp_list, list) {
 		if (vha->vp_idx) {
+			if (test_bit(VPORT_DELETE, &vha->dpc_flags))
+				continue;
 			atomic_inc(&vha->vref_count);
 			spin_unlock_irqrestore(&ha->vport_slock, flags);
 int
 qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
 {
+	fc_port_t *fcport;
+	/*
+	 * To exclusively reset vport, we need to log it out first.
+	 * Note: This control_vp can fail if ISP reset is already
+	 * issued, this is expected, as the vp would be already
+	 * logged out due to ISP reset.
+	 */
+	if (!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags)) {
+		qla24xx_control_vp(vha, VCE_COMMAND_DISABLE_VPS_LOGO_ALL);
+		list_for_each_entry(fcport, &vha->vp_fcports, list)
+			fcport->logout_on_delete = 0;
+	}
 	/*
 	 * Physical port will do most of the abort and recovery work. We can
 	 * just treat it as a loop down
 			atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
 	}
-	/*
-	 * To exclusively reset vport, we need to log it out first.  Note: this
-	 * control_vp can fail if ISP reset is already issued, this is
-	 * expected, as the vp would be already logged out due to ISP reset.
-	 */
-	if (!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
-		qla24xx_control_vp(vha, VCE_COMMAND_DISABLE_VPS_LOGO_ALL);
 	ql_dbg(ql_dbg_taskm, vha, 0x801d,
 	    "Scheduling enable of Vport %d.\n", vha->vp_idx);
 	return qla24xx_enable_vp(vha);
 }

drivers/scsi/qla2xxx/qla_os.c+13−5

 void
 qla2x00_wait_for_sess_deletion(scsi_qla_host_t *vha)
 {
+	u8 i;
 	qla2x00_mark_all_devices_lost(vha, 0);
-	wait_event_timeout(vha->fcport_waitQ, test_fcport_count(vha), 10*HZ);
+	for (i = 0; i < 10; i++)
+		wait_event_timeout(vha->fcport_waitQ, test_fcport_count(vha),
+		    HZ);
+	flush_workqueue(vha->hw->wq);
 }
 /*
 			memcpy(fcport->port_name, e->u.new_sess.port_name,
 			    WWN_SIZE);
+			if (e->u.new_sess.fc4_type & FS_FCP_IS_N2N)
+				fcport->n2n_flag = 1;
 		} else {
 			ql_dbg(ql_dbg_disc, vha, 0xffff,
 				   "%s %8phC mem alloc fail.\n",
 			if (dfcp)
 				qlt_schedule_sess_for_deletion(tfcp);
-			if (N2N_TOPO(vha->hw))
-				fcport->flags &= ~FCF_FABRIC_DEVICE;
 			if (N2N_TOPO(vha->hw)) {
+				fcport->flags &= ~FCF_FABRIC_DEVICE;
+				fcport->keep_nport_handle = 1;
 				if (vha->flags.nvme_enabled) {
 					fcport->fc4f_nvme = 1;
 					fcport->n2n_flag = 1;

drivers/scsi/qla2xxx/qla_target.c+13−13

@@ -953,7 +953,7 @@ void qlt_free_session_done(struct work_struct *work) · 952 unmodified lines
953	struct qla_hw_data *ha = vha->hw;	953	struct qla_hw_data *ha = vha->hw;
954	unsigned long flags;	954	unsigned long flags;
955	bool logout_started = false;	955	bool logout_started = false;
956	scsi_qla_host_t *base_vha;	956	scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
957	struct qlt_plogi_ack_t *own =	957	struct qlt_plogi_ack_t *own =
958	sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN];	958	sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN];
959		959
@@ -1020,6 +1020,7 @@ void qlt_free_session_done(struct work_struct *work) · 60 unmodified lines
1020		1020
1021	if (logout_started) {	1021	if (logout_started) {
1022	bool traced = false;	1022	bool traced = false;
		1023	u16 cnt = 0;
1023		1024
1024	while (!READ_ONCE(sess->logout_completed)) {	1025	while (!READ_ONCE(sess->logout_completed)) {
1025	if (!traced) {	1026	if (!traced) {
@@ -1029,6 +1030,9 @@ void qlt_free_session_done(struct work_struct *work) · 3 unmodified lines
1029	traced = true;	1030	traced = true;
1030	}	1031	}
1031	msleep(100);	1032	msleep(100);
		1033	cnt++;
		1034	if (cnt > 200)
		1035	break;
1032	}	1036	}
1033		1037
1034	ql_dbg(ql_dbg_disc, vha, 0xf087,	1038	ql_dbg(ql_dbg_disc, vha, 0xf087,
@@ -1101,6 +1105,7 @@ void qlt_free_session_done(struct work_struct *work) · 66 unmodified lines
1101	}	1105	}
1102		1106
1103	spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);	1107	spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
		1108	sess->free_pending = 0;
1104		1109
1105	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001,	1110	ql_dbg(ql_dbg_tgt_mgt, vha, 0xf001,
1106	"Unregistration of sess %p %8phC finished fcp_cnt %d\n",	1111	"Unregistration of sess %p %8phC finished fcp_cnt %d\n",
@@ -1109,17 +1114,9 @@ void qlt_free_session_done(struct work_struct *work) · 2 unmodified lines
1109	if (tgt && (tgt->sess_count == 0))	1114	if (tgt && (tgt->sess_count == 0))
1110	wake_up_all(&tgt->waitQ);	1115	wake_up_all(&tgt->waitQ);
1111		1116
1112	if (vha->fcport_count == 0)	1117	if (!test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags) &&
1113	wake_up_all(&vha->fcport_waitQ);	1118	!(vha->vp_idx && test_bit(VPORT_DELETE, &vha->dpc_flags)) &&
1114		1119	(!tgt \|\| !tgt->tgt_stop) && !LOOP_TRANSITION(vha)) {
1115	base_vha = pci_get_drvdata(ha->pdev);
1116
1117	sess->free_pending = 0;
1118
1119	if (test_bit(PFLG_DRIVER_REMOVING, &base_vha->pci_flags))
1120	return;
1121
1122	if ((!tgt \|\| !tgt->tgt_stop) && !LOOP_TRANSITION(vha)) {
1123	switch (vha->host->active_mode) {	1120	switch (vha->host->active_mode) {
1124	case MODE_INITIATOR:	1121	case MODE_INITIATOR:
1125	case MODE_DUAL:	1122	case MODE_DUAL:
@@ -1132,6 +1129,9 @@ void qlt_free_session_done(struct work_struct *work) · 6 unmodified lines
1132	break;	1129	break;
1133	}	1130	}
1134	}	1131	}
		1132
		1133	if (vha->fcport_count == 0)
		1134	wake_up_all(&vha->fcport_waitQ);
1135	}	1135	}
1136		1136
1137	/* ha->tgt.sess_lock supposed to be held on entry */	1137	/* ha->tgt.sess_lock supposed to be held on entry */
@@ -1161,7 +1161,7 @@ void qlt_unreg_sess(struct fc_port *sess) · 23 unmodified lines
1161	sess->last_login_gen = sess->login_gen;	1161	sess->last_login_gen = sess->login_gen;
1162		1162
1163	INIT_WORK(&sess->free_work, qlt_free_session_done);	1163	INIT_WORK(&sess->free_work, qlt_free_session_done);
1164	schedule_work(&sess->free_work);	1164	queue_work(sess->vha->hw->wq, &sess->free_work);
1165	}	1165	}
1166	EXPORT_SYMBOL(qlt_unreg_sess);	1166	EXPORT_SYMBOL(qlt_unreg_sess);
1167		1167

drivers/scsi/storvsc_drv.c+1−2

@@ -1837,8 +1837,7 @@ static int storvsc_probe(struct hv_device *device, · 1836 unmodified lines
1837	/*	1837	/*
1838	* Set the number of HW queues we are supporting.	1838	* Set the number of HW queues we are supporting.
1839	*/	1839	*/
1840	if (stor_device->num_sc != 0)	1840	host->nr_hw_queues = num_present_cpus();
1841	host->nr_hw_queues = stor_device->num_sc + 1;
1842		1841
1843	/*	1842	/*
1844	* Set the error handler work queue.	1843	* Set the error handler work queue.

drivers/scsi/ufs/ufshcd.c+3−0

@@ -8143,6 +8143,9 @@ int ufshcd_shutdown(struct ufs_hba *hba) · 8142 unmodified lines
8143	{	8143	{
8144	int ret = 0;	8144	int ret = 0;
8145		8145
		8146	if (!hba->is_powered)
		8147	goto out;
		8148
8146	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba))	8149	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba))
8147	goto out;	8150	goto out;
8148		8151

drivers/staging/exfat/Kconfig+2−1

+# SPDX-License-Identifier: GPL-2.0
 config EXFAT_FS
 	tristate "exFAT fs support"
 	depends on BLOCK
 	  This adds support for the exFAT file system.
 config EXFAT_DONT_MOUNT_VFAT
-	bool "Prohibit mounting of fat/vfat filesysems by exFAT"
+	bool "Prohibit mounting of fat/vfat filesystems by exFAT"
 	depends on EXFAT_FS
 	default y
 	help

drivers/staging/exfat/Makefile+1−1

@@ -1,4 +1,4 @@
1	# SPDX-License-Identifier: GPL-2.0	1	# SPDX-License-Identifier: GPL-2.0-or-later
2		2
3	obj-$(CONFIG_EXFAT_FS) += exfat.o	3	obj-$(CONFIG_EXFAT_FS) += exfat.o
4		4

drivers/staging/exfat/exfat.h+1−1

@@ -1,4 +1,4 @@
1	/* SPDX-License-Identifier: GPL-2.0 */	1	/* SPDX-License-Identifier: GPL-2.0-or-later */
2	/*	2	/*
3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.	3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
4	*/	4	*/

drivers/staging/exfat/exfat_blkdev.c+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*	2	/*
3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.	3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
4	*/	4	*/

drivers/staging/exfat/exfat_cache.c+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*	2	/*
3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.	3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
4	*/	4	*/

drivers/staging/exfat/exfat_core.c+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*	2	/*
3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.	3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
4	*/	4	*/

drivers/staging/exfat/exfat_nls.c+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*	2	/*
3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.	3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
4	*/	4	*/

drivers/staging/exfat/exfat_super.c+4−3

-// SPDX-License-Identifier: GPL-2.0
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
  */
 #include <linux/init.h>
 #include <linux/time.h>
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/seq_file.h>
 #include <linux/pagemap.h>
 #include <linux/mpage.h>
 		kfree(sbi->options.iocharset);
 	/* mutex_init is in exfat_fill_super function. only for 3.7+ */
 	mutex_destroy(&sbi->s_lock);
-	kfree(sbi);
+	kvfree(sbi);
 }
 static void exfat_put_super(struct super_block *sb)
 	 * the filesystem, since we're only just about to mount
 	 * it and have no inodes etc active!
 	 */
-	sbi = kzalloc(sizeof(struct exfat_sb_info), GFP_KERNEL);
+	sbi = kvzalloc(sizeof(*sbi), GFP_KERNEL);
 	if (!sbi)
 		return -ENOMEM;
 	mutex_init(&sbi->s_lock);

drivers/staging/exfat/exfat_upcase.c+1−1

@@ -1,4 +1,4 @@
1	// SPDX-License-Identifier: GPL-2.0	1	// SPDX-License-Identifier: GPL-2.0-or-later
2	/*	2	/*
3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.	3	* Copyright (C) 2012-2013 Samsung Electronics Co., Ltd.
4	*/	4	*/

drivers/staging/fbtft/Kconfig+1−11

 # SPDX-License-Identifier: GPL-2.0
 menuconfig FB_TFT
 	tristate "Support for small TFT LCD display modules"
-	depends on FB && SPI
+	depends on FB && SPI && OF
 	depends on GPIOLIB || COMPILE_TEST
 	select FB_SYS_FILLRECT
 	select FB_SYS_COPYAREA
 	depends on FB_TFT
 	help
 	  Generic Framebuffer support for WATTEROTT
-config FB_FLEX
-	tristate "Generic FB driver for TFT LCD displays"
-	depends on FB_TFT
-	help
-	  Generic Framebuffer support for TFT LCD displays.
-config FB_TFT_FBTFT_DEVICE
-	tristate "Module to for adding FBTFT devices"
-	depends on FB_TFT

drivers/staging/fbtft/Makefile+0−4

@@ -36,7 +36,3 @@ obj-$(CONFIG_FB_TFT_UC1611) += fb_uc1611.o · 35 unmodified lines
36	obj-$(CONFIG_FB_TFT_UC1701) += fb_uc1701.o	36	obj-$(CONFIG_FB_TFT_UC1701) += fb_uc1701.o
37	obj-$(CONFIG_FB_TFT_UPD161704) += fb_upd161704.o	37	obj-$(CONFIG_FB_TFT_UPD161704) += fb_upd161704.o
38	obj-$(CONFIG_FB_TFT_WATTEROTT) += fb_watterott.o	38	obj-$(CONFIG_FB_TFT_WATTEROTT) += fb_watterott.o
39	obj-$(CONFIG_FB_FLEX) += flexfb.o
40
41	# Device modules
42	obj-$(CONFIG_FB_TFT_FBTFT_DEVICE) += fbtft_device.o

drivers/staging/fbtft/fbtft-core.c+5−2

 	if (par->gamma.curves && gamma) {
 		if (fbtft_gamma_parse_str(par, par->gamma.curves, gamma,
 					  strlen(gamma)))
-			goto alloc_fail;
+			goto release_framebuf;
 	}
 	/* Transmit buffer */
 	if (txbuflen > 0) {
 		txbuf = devm_kzalloc(par->info->device, txbuflen, GFP_KERNEL);
 		if (!txbuf)
-			goto alloc_fail;
+			goto release_framebuf;
 		par->txbuf.buf = txbuf;
 		par->txbuf.len = txbuflen;
 	}
 	return info;
+release_framebuf:
+	framebuffer_release(info);
 alloc_fail:
 	vfree(vmem);

drivers/staging/fbtft/fbtft_device.c+0−1261

@@ -1,1261 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0+
2	/*
3	*
4	* Copyright (C) 2013, Noralf Tronnes
5	*/
6
7	#define pr_fmt(fmt) "fbtft_device: " fmt
8	#include <linux/module.h>
9	#include <linux/kernel.h>
10	#include <linux/init.h>
11	#include <linux/gpio/consumer.h>
12	#include <linux/spi/spi.h>
13	#include <video/mipi_display.h>
14
15	#include "fbtft.h"
16
17	#define MAX_GPIOS 32
18
19	static struct spi_device *spi_device;
20	static struct platform_device *p_device;
21
22	static char *name;
23	module_param(name, charp, 0000);
24	MODULE_PARM_DESC(name,
25	"Devicename (required). name=list => list all supported devices.");
26
27	static unsigned int rotate;
28	module_param(rotate, uint, 0000);
29	MODULE_PARM_DESC(rotate,
30	"Angle to rotate display counter clockwise: 0, 90, 180, 270");
31
32	static unsigned int busnum;
33	module_param(busnum, uint, 0000);
34	MODULE_PARM_DESC(busnum, "SPI bus number (default=0)");
35
36	static unsigned int cs;
37	module_param(cs, uint, 0000);
38	MODULE_PARM_DESC(cs, "SPI chip select (default=0)");
39
40	static unsigned int speed;
41	module_param(speed, uint, 0000);
42	MODULE_PARM_DESC(speed, "SPI speed (override device default)");
43
44	static int mode = -1;
45	module_param(mode, int, 0000);
46	MODULE_PARM_DESC(mode, "SPI mode (override device default)");
47
48	static unsigned int fps;
49	module_param(fps, uint, 0000);
50	MODULE_PARM_DESC(fps, "Frames per second (override driver default)");
51
52	static char *gamma;
53	module_param(gamma, charp, 0000);
54	MODULE_PARM_DESC(gamma,
55	"String representation of Gamma Curve(s). Driver specific.");
56
57	static int txbuflen;
58	module_param(txbuflen, int, 0000);
59	MODULE_PARM_DESC(txbuflen, "txbuflen (override driver default)");
60
61	static int bgr = -1;
62	module_param(bgr, int, 0000);
63	MODULE_PARM_DESC(bgr,
64	"BGR bit (supported by some drivers).");
65
66	static unsigned int startbyte;
67	module_param(startbyte, uint, 0000);
68	MODULE_PARM_DESC(startbyte, "Sets the Start byte used by some SPI displays.");
69
70	static bool custom;
71	module_param(custom, bool, 0000);
72	MODULE_PARM_DESC(custom, "Add a custom display device. Use speed= argument to make it a SPI device, else platform_device");
73
74	static unsigned int width;
75	module_param(width, uint, 0000);
76	MODULE_PARM_DESC(width, "Display width, used with the custom argument");
77
78	static unsigned int height;
79	module_param(height, uint, 0000);
80	MODULE_PARM_DESC(height, "Display height, used with the custom argument");
81
82	static unsigned int buswidth = 8;
83	module_param(buswidth, uint, 0000);
84	MODULE_PARM_DESC(buswidth, "Display bus width, used with the custom argument");
85
86	static s16 init[FBTFT_MAX_INIT_SEQUENCE];
87	static int init_num;
88	module_param_array(init, short, &init_num, 0000);
89	MODULE_PARM_DESC(init, "Init sequence, used with the custom argument");
90
91	static unsigned long debug;
92	module_param(debug, ulong, 0000);
93	MODULE_PARM_DESC(debug,
94	"level: 0-7 (the remaining 29 bits is for advanced usage)");
95
96	static unsigned int verbose = 3;
97	module_param(verbose, uint, 0000);
98	MODULE_PARM_DESC(verbose,
99	"0 silent, >1 show devices, >2 show devices before (default=3)");
100
101	struct fbtft_device_display {
102	char *name;
103	struct spi_board_info *spi;
104	struct platform_device *pdev;
105	};
106
107	static void fbtft_device_pdev_release(struct device *dev);
108
109	static int write_gpio16_wr_slow(struct fbtft_par par, void buf, size_t len);
110	static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par,
111	int xs, int ys, int xe, int ye);
112
113	#define ADAFRUIT18_GAMMA \
114	"02 1c 07 12 37 32 29 2d 29 25 2B 39 00 01 03 10\n" \
115	"03 1d 07 06 2E 2C 29 2D 2E 2E 37 3F 00 00 02 10"
116
117	#define CBERRY28_GAMMA \
118	"D0 00 14 15 13 2C 42 43 4E 09 16 14 18 21\n" \
119	"D0 00 14 15 13 0B 43 55 53 0C 17 14 23 20"
120
121	static const s16 cberry28_init_sequence[] = {
122	/* turn off sleep mode */
123	-1, MIPI_DCS_EXIT_SLEEP_MODE,
124	-2, 120,
125
126	/* set pixel format to RGB-565 */
127	-1, MIPI_DCS_SET_PIXEL_FORMAT, MIPI_DCS_PIXEL_FMT_16BIT,
128
129	-1, 0xB2, 0x0C, 0x0C, 0x00, 0x33, 0x33,
130
131	/*
132	* VGH = 13.26V
133	* VGL = -10.43V
134	*/
135	-1, 0xB7, 0x35,
136
137	/*
138	* VDV and VRH register values come from command write
139	* (instead of NVM)
140	*/
141	-1, 0xC2, 0x01, 0xFF,
142
143	/*
144	* VAP = 4.7V + (VCOM + VCOM offset + 0.5 * VDV)
145	* VAN = -4.7V + (VCOM + VCOM offset + 0.5 * VDV)
146	*/
147	-1, 0xC3, 0x17,
148
149	/* VDV = 0V */
150	-1, 0xC4, 0x20,
151
152	/* VCOM = 0.675V */
153	-1, 0xBB, 0x17,
154
155	/* VCOM offset = 0V */
156	-1, 0xC5, 0x20,
157
158	/*
159	* AVDD = 6.8V
160	* AVCL = -4.8V
161	* VDS = 2.3V
162	*/
163	-1, 0xD0, 0xA4, 0xA1,
164
165	-1, MIPI_DCS_SET_DISPLAY_ON,
166
167	-3,
168	};
169
170	static const s16 hy28b_init_sequence[] = {
171	-1, 0x00e7, 0x0010, -1, 0x0000, 0x0001,
172	-1, 0x0001, 0x0100, -1, 0x0002, 0x0700,
173	-1, 0x0003, 0x1030, -1, 0x0004, 0x0000,
174	-1, 0x0008, 0x0207, -1, 0x0009, 0x0000,
175	-1, 0x000a, 0x0000, -1, 0x000c, 0x0001,
176	-1, 0x000d, 0x0000, -1, 0x000f, 0x0000,
177	-1, 0x0010, 0x0000, -1, 0x0011, 0x0007,
178	-1, 0x0012, 0x0000, -1, 0x0013, 0x0000,
179	-2, 50, -1, 0x0010, 0x1590, -1, 0x0011,
180	0x0227, -2, 50, -1, 0x0012, 0x009c, -2, 50,
181	-1, 0x0013, 0x1900, -1, 0x0029, 0x0023,
182	-1, 0x002b, 0x000e, -2, 50,
183	-1, 0x0020, 0x0000, -1, 0x0021, 0x0000,
184	-2, 50, -1, 0x0050, 0x0000,
185	-1, 0x0051, 0x00ef, -1, 0x0052, 0x0000,
186	-1, 0x0053, 0x013f, -1, 0x0060, 0xa700,
187	-1, 0x0061, 0x0001, -1, 0x006a, 0x0000,
188	-1, 0x0080, 0x0000, -1, 0x0081, 0x0000,
189	-1, 0x0082, 0x0000, -1, 0x0083, 0x0000,
190	-1, 0x0084, 0x0000, -1, 0x0085, 0x0000,
191	-1, 0x0090, 0x0010, -1, 0x0092, 0x0000,
192	-1, 0x0093, 0x0003, -1, 0x0095, 0x0110,
193	-1, 0x0097, 0x0000, -1, 0x0098, 0x0000,
194	-1, 0x0007, 0x0133, -1, 0x0020, 0x0000,
195	-1, 0x0021, 0x0000, -2, 100, -3 };
196
197	#define HY28B_GAMMA \
198	"04 1F 4 7 7 0 7 7 6 0\n" \
199	"0F 00 1 7 4 0 0 0 6 7"
200
201	static const s16 pitft_init_sequence[] = {
202	-1, MIPI_DCS_SOFT_RESET,
203	-2, 5,
204	-1, MIPI_DCS_SET_DISPLAY_OFF,
205	-1, 0xEF, 0x03, 0x80, 0x02,
206	-1, 0xCF, 0x00, 0xC1, 0x30,
207	-1, 0xED, 0x64, 0x03, 0x12, 0x81,
208	-1, 0xE8, 0x85, 0x00, 0x78,
209	-1, 0xCB, 0x39, 0x2C, 0x00, 0x34, 0x02,
210	-1, 0xF7, 0x20,
211	-1, 0xEA, 0x00, 0x00,
212	-1, 0xC0, 0x23,
213	-1, 0xC1, 0x10,
214	-1, 0xC5, 0x3E, 0x28,
215	-1, 0xC7, 0x86,
216	-1, MIPI_DCS_SET_PIXEL_FORMAT, 0x55,
217	-1, 0xB1, 0x00, 0x18,
218	-1, 0xB6, 0x08, 0x82, 0x27,
219	-1, 0xF2, 0x00,
220	-1, MIPI_DCS_SET_GAMMA_CURVE, 0x01,
221	-1, 0xE0, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, 0x4E,
222	0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00,
223	-1, 0xE1, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31,
224	0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F,
225	-1, MIPI_DCS_EXIT_SLEEP_MODE,
226	-2, 100,
227	-1, MIPI_DCS_SET_DISPLAY_ON,
228	-2, 20,
229	-3
230	};
231
232	static const s16 waveshare32b_init_sequence[] = {
233	-1, 0xCB, 0x39, 0x2C, 0x00, 0x34, 0x02,
234	-1, 0xCF, 0x00, 0xC1, 0x30,
235	-1, 0xE8, 0x85, 0x00, 0x78,
236	-1, 0xEA, 0x00, 0x00,
237	-1, 0xED, 0x64, 0x03, 0x12, 0x81,
238	-1, 0xF7, 0x20,
239	-1, 0xC0, 0x23,
240	-1, 0xC1, 0x10,
241	-1, 0xC5, 0x3E, 0x28,
242	-1, 0xC7, 0x86,
243	-1, MIPI_DCS_SET_ADDRESS_MODE, 0x28,
244	-1, MIPI_DCS_SET_PIXEL_FORMAT, 0x55,
245	-1, 0xB1, 0x00, 0x18,
246	-1, 0xB6, 0x08, 0x82, 0x27,
247	-1, 0xF2, 0x00,
248	-1, MIPI_DCS_SET_GAMMA_CURVE, 0x01,
249	-1, 0xE0, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, 0x4E,
250	0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00,
251	-1, 0xE1, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31,
252	0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F,
253	-1, MIPI_DCS_EXIT_SLEEP_MODE,
254	-2, 120,
255	-1, MIPI_DCS_SET_DISPLAY_ON,
256	-1, MIPI_DCS_WRITE_MEMORY_START,
257	-3
258	};
259
260	#define PIOLED_GAMMA "0 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 " \
261	"2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 " \
262	"3 3 3 4 4 4 4 4 4 4 4 4 4 4 4"
263
264	/* Supported displays in alphabetical order */
265	static struct fbtft_device_display displays[] = {
266	{
267	.name = "adafruit18",
268	.spi = &(struct spi_board_info) {
269	.modalias = "fb_st7735r",
270	.max_speed_hz = 32000000,
271	.mode = SPI_MODE_0,
272	.platform_data = &(struct fbtft_platform_data) {
273	.display = {
274	.buswidth = 8,
275	.backlight = 1,
276	},
277	.gamma = ADAFRUIT18_GAMMA,
278	}
279	}
280	}, {
281	.name = "adafruit18_green",
282	.spi = &(struct spi_board_info) {
283	.modalias = "fb_st7735r",
284	.max_speed_hz = 4000000,
285	.mode = SPI_MODE_0,
286	.platform_data = &(struct fbtft_platform_data) {
287	.display = {
288	.buswidth = 8,
289	.backlight = 1,
290	.fbtftops.set_addr_win =
291	adafruit18_green_tab_set_addr_win,
292	},
293	.bgr = true,
294	.gamma = ADAFRUIT18_GAMMA,
295	}
296	}
297	}, {
298	.name = "adafruit22",
299	.spi = &(struct spi_board_info) {
300	.modalias = "fb_hx8340bn",
301	.max_speed_hz = 32000000,
302	.mode = SPI_MODE_0,
303	.platform_data = &(struct fbtft_platform_data) {
304	.display = {
305	.buswidth = 9,
306	.backlight = 1,
307	},
308	.bgr = true,
309	}
310	}
311	}, {
312	.name = "adafruit22a",
313	.spi = &(struct spi_board_info) {
314	.modalias = "fb_ili9340",
315	.max_speed_hz = 32000000,
316	.mode = SPI_MODE_0,
317	.platform_data = &(struct fbtft_platform_data) {
318	.display = {
319	.buswidth = 8,
320	.backlight = 1,
321	},
322	.bgr = true,
323	}
324	}
325	}, {
326	.name = "adafruit28",
327	.spi = &(struct spi_board_info) {
328	.modalias = "fb_ili9341",
329	.max_speed_hz = 32000000,
330	.mode = SPI_MODE_0,
331	.platform_data = &(struct fbtft_platform_data) {
332	.display = {
333	.buswidth = 8,
334	.backlight = 1,
335	},
336	.bgr = true,
337	}
338	}
339	}, {
340	.name = "adafruit13m",
341	.spi = &(struct spi_board_info) {
342	.modalias = "fb_ssd1306",
343	.max_speed_hz = 16000000,
344	.mode = SPI_MODE_0,
345	.platform_data = &(struct fbtft_platform_data) {
346	.display = {
347	.buswidth = 8,
348	},
349	}
350	}
351	}, {
352	.name = "admatec_c-berry28",
353	.spi = &(struct spi_board_info) {
354	.modalias = "fb_st7789v",
355	.max_speed_hz = 48000000,
356	.mode = SPI_MODE_0,
357	.platform_data = &(struct fbtft_platform_data) {
358	.display = {
359	.buswidth = 8,
360	.backlight = 1,
361	.init_sequence = cberry28_init_sequence,
362	},
363	.gamma = CBERRY28_GAMMA,
364	}
365	}
366	}, {
367	.name = "agm1264k-fl",
368	.pdev = &(struct platform_device) {
369	.name = "fb_agm1264k-fl",
370	.id = 0,
371	.dev = {
372	.release = fbtft_device_pdev_release,
373	.platform_data = &(struct fbtft_platform_data) {
374	.display = {
375	.buswidth = 8,
376	.backlight = FBTFT_ONBOARD_BACKLIGHT,
377	},
378	},
379	}
380	}
381	}, {
382	.name = "dogs102",
383	.spi = &(struct spi_board_info) {
384	.modalias = "fb_uc1701",
385	.max_speed_hz = 8000000,
386	.mode = SPI_MODE_0,
387	.platform_data = &(struct fbtft_platform_data) {
388	.display = {
389	.buswidth = 8,
390	},
391	.bgr = true,
392	}
393	}
394	}, {
395	.name = "er_tftm050_2",
396	.spi = &(struct spi_board_info) {
397	.modalias = "fb_ra8875",
398	.max_speed_hz = 5000000,
399	.mode = SPI_MODE_3,
400	.platform_data = &(struct fbtft_platform_data) {
401	.display = {
402	.buswidth = 8,
403	.backlight = 1,
404	.width = 480,
405	.height = 272,
406	},
407	.bgr = true,
408	}
409	}
410	}, {
411	.name = "er_tftm070_5",
412	.spi = &(struct spi_board_info) {
413	.modalias = "fb_ra8875",
414	.max_speed_hz = 5000000,
415	.mode = SPI_MODE_3,
416	.platform_data = &(struct fbtft_platform_data) {
417	.display = {
418	.buswidth = 8,
419	.backlight = 1,
420	.width = 800,
421	.height = 480,
422	},
423	.bgr = true,
424	}
425	}
426	}, {
427	.name = "ew24ha0",
428	.spi = &(struct spi_board_info) {
429	.modalias = "fb_uc1611",
430	.max_speed_hz = 32000000,
431	.mode = SPI_MODE_3,
432	.platform_data = &(struct fbtft_platform_data) {
433	.display = {
434	.buswidth = 8,
435	},
436	}
437	}
438	}, {
439	.name = "ew24ha0_9bit",
440	.spi = &(struct spi_board_info) {
441	.modalias = "fb_uc1611",
442	.max_speed_hz = 32000000,
443	.mode = SPI_MODE_3,
444	.platform_data = &(struct fbtft_platform_data) {
445	.display = {
446	.buswidth = 9,
447	},
448	}
449	}
450	}, {
451	.name = "flexfb",
452	.spi = &(struct spi_board_info) {
453	.modalias = "flexfb",
454	.max_speed_hz = 32000000,
455	.mode = SPI_MODE_0,
456	}
457	}, {
458	.name = "flexpfb",
459	.pdev = &(struct platform_device) {
460	.name = "flexpfb",
461	.id = 0,
462	.dev = {
463	.release = fbtft_device_pdev_release,
464	}
465	}
466	}, {
467	.name = "freetronicsoled128",
468	.spi = &(struct spi_board_info) {
469	.modalias = "fb_ssd1351",
470	.max_speed_hz = 20000000,
471	.mode = SPI_MODE_0,
472	.platform_data = &(struct fbtft_platform_data) {
473	.display = {
474	.buswidth = 8,
475	.backlight = FBTFT_ONBOARD_BACKLIGHT,
476	},
477	.bgr = true,
478	}
479	}
480	}, {
481	.name = "hx8353d",
482	.spi = &(struct spi_board_info) {
483	.modalias = "fb_hx8353d",
484	.max_speed_hz = 16000000,
485	.mode = SPI_MODE_0,
486	.platform_data = &(struct fbtft_platform_data) {
487	.display = {
488	.buswidth = 8,
489	.backlight = 1,
490	},
491	}
492	}
493	}, {
494	.name = "hy28a",
495	.spi = &(struct spi_board_info) {
496	.modalias = "fb_ili9320",
497	.max_speed_hz = 32000000,
498	.mode = SPI_MODE_3,
499	.platform_data = &(struct fbtft_platform_data) {
500	.display = {
501	.buswidth = 8,
502	.backlight = 1,
503	},
504	.startbyte = 0x70,
505	.bgr = true,
506	}
507	}
508	}, {
509	.name = "hy28b",
510	.spi = &(struct spi_board_info) {
511	.modalias = "fb_ili9325",
512	.max_speed_hz = 48000000,
513	.mode = SPI_MODE_3,
514	.platform_data = &(struct fbtft_platform_data) {
515	.display = {
516	.buswidth = 8,
517	.backlight = 1,
518	.init_sequence = hy28b_init_sequence,
519	},
520	.startbyte = 0x70,
521	.bgr = true,
522	.fps = 50,
523	.gamma = HY28B_GAMMA,
524	}
525	}
526	}, {
527	.name = "ili9481",
528	.spi = &(struct spi_board_info) {
529	.modalias = "fb_ili9481",
530	.max_speed_hz = 32000000,
531	.mode = SPI_MODE_0,
532	.platform_data = &(struct fbtft_platform_data) {
533	.display = {
534	.regwidth = 16,
535	.buswidth = 8,
536	.backlight = 1,
537	},
538	.bgr = true,
539	}
540	}
541	}, {
542	.name = "itdb24",
543	.pdev = &(struct platform_device) {
544	.name = "fb_s6d1121",
545	.id = 0,
546	.dev = {
547	.release = fbtft_device_pdev_release,
548	.platform_data = &(struct fbtft_platform_data) {
549	.display = {
550	.buswidth = 8,
551	.backlight = 1,
552	},
553	.bgr = false,
554	},
555	}
556	}
557	}, {
558	.name = "itdb28",
559	.pdev = &(struct platform_device) {
560	.name = "fb_ili9325",
561	.id = 0,
562	.dev = {
563	.release = fbtft_device_pdev_release,
564	.platform_data = &(struct fbtft_platform_data) {
565	.display = {
566	.buswidth = 8,
567	.backlight = 1,
568	},
569	.bgr = true,
570	},
571	}
572	}
573	}, {
574	.name = "itdb28_spi",
575	.spi = &(struct spi_board_info) {
576	.modalias = "fb_ili9325",
577	.max_speed_hz = 32000000,
578	.mode = SPI_MODE_0,
579	.platform_data = &(struct fbtft_platform_data) {
580	.display = {
581	.buswidth = 8,
582	.backlight = 1,
583	},
584	.bgr = true,
585	}
586	}
587	}, {
588	.name = "mi0283qt-2",
589	.spi = &(struct spi_board_info) {
590	.modalias = "fb_hx8347d",
591	.max_speed_hz = 32000000,
592	.mode = SPI_MODE_0,
593	.platform_data = &(struct fbtft_platform_data) {
594	.display = {
595	.buswidth = 8,
596	.backlight = 1,
597	},
598	.startbyte = 0x70,
599	.bgr = true,
600	}
601	}
602	}, {
603	.name = "mi0283qt-9a",
604	.spi = &(struct spi_board_info) {
605	.modalias = "fb_ili9341",
606	.max_speed_hz = 32000000,
607	.mode = SPI_MODE_0,
608	.platform_data = &(struct fbtft_platform_data) {
609	.display = {
610	.buswidth = 9,
611	.backlight = 1,
612	},
613	.bgr = true,
614	}
615	}
616	}, {
617	.name = "mi0283qt-v2",
618	.spi = &(struct spi_board_info) {
619	.modalias = "fb_watterott",
620	.max_speed_hz = 4000000,
621	.mode = SPI_MODE_3,
622	.platform_data = &(struct fbtft_platform_data) {
623	}
624	}
625	}, {
626	.name = "nokia3310",
627	.spi = &(struct spi_board_info) {
628	.modalias = "fb_pcd8544",
629	.max_speed_hz = 400000,
630	.mode = SPI_MODE_0,
631	.platform_data = &(struct fbtft_platform_data) {
632	.display = {
633	.buswidth = 8,
634	},
635	}
636	}
637	}, {
638	.name = "nokia3310a",
639	.spi = &(struct spi_board_info) {
640	.modalias = "fb_tls8204",
641	.max_speed_hz = 1000000,
642	.mode = SPI_MODE_0,
643	.platform_data = &(struct fbtft_platform_data) {
644	.display = {
645	.buswidth = 8,
646	},
647	}
648	}
649	}, {
650	.name = "nokia5110",
651	.spi = &(struct spi_board_info) {
652	.modalias = "fb_ili9163",
653	.max_speed_hz = 12000000,
654	.mode = SPI_MODE_0,
655	.platform_data = &(struct fbtft_platform_data) {
656	.display = {
657	.buswidth = 8,
658	.backlight = 1,
659	},
660	.bgr = true,
661	}
662	}
663	}, {
664	.name = "piscreen",
665	.spi = &(struct spi_board_info) {
666	.modalias = "fb_ili9486",
667	.max_speed_hz = 32000000,
668	.mode = SPI_MODE_0,
669	.platform_data = &(struct fbtft_platform_data) {
670	.display = {
671	.regwidth = 16,
672	.buswidth = 8,
673	.backlight = 1,
674	},
675	.bgr = true,
676	}
677	}
678	}, {
679	.name = "pitft",
680	.spi = &(struct spi_board_info) {
681	.modalias = "fb_ili9340",
682	.max_speed_hz = 32000000,
683	.mode = SPI_MODE_0,
684	.chip_select = 0,
685	.platform_data = &(struct fbtft_platform_data) {
686	.display = {
687	.buswidth = 8,
688	.backlight = 1,
689	.init_sequence = pitft_init_sequence,
690	},
691	.bgr = true,
692	}
693	}
694	}, {
695	.name = "pioled",
696	.spi = &(struct spi_board_info) {
697	.modalias = "fb_ssd1351",
698	.max_speed_hz = 20000000,
699	.mode = SPI_MODE_0,
700	.platform_data = &(struct fbtft_platform_data) {
701	.display = {
702	.buswidth = 8,
703	},
704	.bgr = true,
705	.gamma = PIOLED_GAMMA
706	}
707	}
708	}, {
709	.name = "rpi-display",
710	.spi = &(struct spi_board_info) {
711	.modalias = "fb_ili9341",
712	.max_speed_hz = 32000000,
713	.mode = SPI_MODE_0,
714	.platform_data = &(struct fbtft_platform_data) {
715	.display = {
716	.buswidth = 8,
717	.backlight = 1,
718	},
719	.bgr = true,
720	}
721	}
722	}, {
723	.name = "s6d02a1",
724	.spi = &(struct spi_board_info) {
725	.modalias = "fb_s6d02a1",
726	.max_speed_hz = 32000000,
727	.mode = SPI_MODE_0,
728	.platform_data = &(struct fbtft_platform_data) {
729	.display = {
730	.buswidth = 8,
731	.backlight = 1,
732	},
733	.bgr = true,
734	}
735	}
736	}, {
737	.name = "sainsmart18",
738	.spi = &(struct spi_board_info) {
739	.modalias = "fb_st7735r",
740	.max_speed_hz = 32000000,
741	.mode = SPI_MODE_0,
742	.platform_data = &(struct fbtft_platform_data) {
743	.display = {
744	.buswidth = 8,
745	},
746	}
747	}
748	}, {
749	.name = "sainsmart32",
750	.pdev = &(struct platform_device) {
751	.name = "fb_ssd1289",
752	.id = 0,
753	.dev = {
754	.release = fbtft_device_pdev_release,
755	.platform_data = &(struct fbtft_platform_data) {
756	.display = {
757	.buswidth = 16,
758	.txbuflen = -2, /* disable buffer */
759	.backlight = 1,
760	.fbtftops.write = write_gpio16_wr_slow,
761	},
762	.bgr = true,
763	},
764	},
765	}
766	}, {
767	.name = "sainsmart32_fast",
768	.pdev = &(struct platform_device) {
769	.name = "fb_ssd1289",
770	.id = 0,
771	.dev = {
772	.release = fbtft_device_pdev_release,
773	.platform_data = &(struct fbtft_platform_data) {
774	.display = {
775	.buswidth = 16,
776	.txbuflen = -2, /* disable buffer */
777	.backlight = 1,
778	},
779	.bgr = true,
780	},
781	},
782	}
783	}, {
784	.name = "sainsmart32_latched",
785	.pdev = &(struct platform_device) {
786	.name = "fb_ssd1289",
787	.id = 0,
788	.dev = {
789	.release = fbtft_device_pdev_release,
790	.platform_data = &(struct fbtft_platform_data) {
791	.display = {
792	.buswidth = 16,
793	.txbuflen = -2, /* disable buffer */
794	.backlight = 1,
795	.fbtftops.write =
796	fbtft_write_gpio16_wr_latched,
797	},
798	.bgr = true,
799	},
800	},
801	}
802	}, {
803	.name = "sainsmart32_spi",
804	.spi = &(struct spi_board_info) {
805	.modalias = "fb_ssd1289",
806	.max_speed_hz = 16000000,
807	.mode = SPI_MODE_0,
808	.platform_data = &(struct fbtft_platform_data) {
809	.display = {
810	.buswidth = 8,
811	.backlight = 1,
812	},
813	.bgr = true,
814	}
815	}
816	}, {
817	.name = "spidev",
818	.spi = &(struct spi_board_info) {
819	.modalias = "spidev",
820	.max_speed_hz = 500000,
821	.bus_num = 0,
822	.chip_select = 0,
823	.mode = SPI_MODE_0,
824	.platform_data = &(struct fbtft_platform_data) {
825	}
826	}
827	}, {
828	.name = "ssd1331",
829	.spi = &(struct spi_board_info) {
830	.modalias = "fb_ssd1331",
831	.max_speed_hz = 20000000,
832	.mode = SPI_MODE_3,
833	.platform_data = &(struct fbtft_platform_data) {
834	.display = {
835	.buswidth = 8,
836	},
837	}
838	}
839	}, {
840	.name = "tinylcd35",
841	.spi = &(struct spi_board_info) {
842	.modalias = "fb_tinylcd",
843	.max_speed_hz = 32000000,
844	.mode = SPI_MODE_0,
845	.platform_data = &(struct fbtft_platform_data) {
846	.display = {
847	.buswidth = 8,
848	.backlight = 1,
849	},
850	.bgr = true,
851	}
852	}
853	}, {
854	.name = "tm022hdh26",
855	.spi = &(struct spi_board_info) {
856	.modalias = "fb_ili9341",
857	.max_speed_hz = 32000000,
858	.mode = SPI_MODE_0,
859	.platform_data = &(struct fbtft_platform_data) {
860	.display = {
861	.buswidth = 8,
862	.backlight = 1,
863	},
864	.bgr = true,
865	}
866	}
867	}, {
868	.name = "tontec35_9481", /* boards before 02 July 2014 */
869	.spi = &(struct spi_board_info) {
870	.modalias = "fb_ili9481",
871	.max_speed_hz = 128000000,
872	.mode = SPI_MODE_3,
873	.platform_data = &(struct fbtft_platform_data) {
874	.display = {
875	.buswidth = 8,
876	.backlight = 1,
877	},
878	.bgr = true,
879	}
880	}
881	}, {
882	.name = "tontec35_9486", /* boards after 02 July 2014 */
883	.spi = &(struct spi_board_info) {
884	.modalias = "fb_ili9486",
885	.max_speed_hz = 128000000,
886	.mode = SPI_MODE_3,
887	.platform_data = &(struct fbtft_platform_data) {
888	.display = {
889	.buswidth = 8,
890	.backlight = 1,
891	},
892	.bgr = true,
893	}
894	}
895	}, {
896	.name = "upd161704",
897	.spi = &(struct spi_board_info) {
898	.modalias = "fb_upd161704",
899	.max_speed_hz = 32000000,
900	.mode = SPI_MODE_0,
901	.platform_data = &(struct fbtft_platform_data) {
902	.display = {
903	.buswidth = 8,
904	},
905	}
906	}
907	}, {
908	.name = "waveshare32b",
909	.spi = &(struct spi_board_info) {
910	.modalias = "fb_ili9340",
911	.max_speed_hz = 48000000,
912	.mode = SPI_MODE_0,
913	.platform_data = &(struct fbtft_platform_data) {
914	.display = {
915	.buswidth = 8,
916	.backlight = 1,
917	.init_sequence =
918	waveshare32b_init_sequence,
919	},
920	.bgr = true,
921	}
922	}
923	}, {
924	.name = "waveshare22",
925	.spi = &(struct spi_board_info) {
926	.modalias = "fb_bd663474",
927	.max_speed_hz = 32000000,
928	.mode = SPI_MODE_3,
929	.platform_data = &(struct fbtft_platform_data) {
930	.display = {
931	.buswidth = 8,
932	},
933	}
934	}
935	}, {
936	/* This should be the last item.
937	* Used with the custom argument
938	*/
939	.name = "",
940	.spi = &(struct spi_board_info) {
941	.modalias = "",
942	.max_speed_hz = 0,
943	.mode = SPI_MODE_0,
944	.platform_data = &(struct fbtft_platform_data) {
945	}
946	},
947	.pdev = &(struct platform_device) {
948	.name = "",
949	.id = 0,
950	.dev = {
951	.release = fbtft_device_pdev_release,
952	.platform_data = &(struct fbtft_platform_data) {
953	},
954	},
955	},
956	}
957	};
958
959	static int write_gpio16_wr_slow(struct fbtft_par par, void buf, size_t len)
960	{
961	u16 data;
962	int i;
963	#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO
964	static u16 prev_data;
965	#endif
966
967	fbtft_par_dbg_hex(DEBUG_WRITE, par, par->info->device, u8, buf, len,
968	"%s(len=%zu): ", __func__, len);
969
970	while (len) {
971	data = (u16 )buf;
972
973	/* Start writing by pulling down /WR */
974	gpiod_set_value(par->gpio.wr, 0);
975
976	/* Set data */
977	#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO
978	if (data == prev_data) {
979	gpiod_set_value(par->gpio.wr, 0); /* used as delay */
980	} else {
981	for (i = 0; i < 16; i++) {
982	if ((data & 1) != (prev_data & 1))
983	gpiod_set_value(par->gpio.db[i],
984	data & 1);
985	data >>= 1;
986	prev_data >>= 1;
987	}
988	}
989	#else
990	for (i = 0; i < 16; i++) {
991	gpiod_set_value(par->gpio.db[i], data & 1);
992	data >>= 1;
993	}
994	#endif
995
996	/* Pullup /WR */
997	gpiod_set_value(par->gpio.wr, 1);
998
999	#ifndef DO_NOT_OPTIMIZE_FBTFT_WRITE_GPIO
1000	prev_data = (u16 )buf;
1001	#endif
1002	buf += 2;
1003	len -= 2;
1004	}
1005
1006	return 0;
1007	}
1008
1009	static void adafruit18_green_tab_set_addr_win(struct fbtft_par *par,
1010	int xs, int ys, int xe, int ye)
1011	{
1012	write_reg(par, 0x2A, 0, xs + 2, 0, xe + 2);
1013	write_reg(par, 0x2B, 0, ys + 1, 0, ye + 1);
1014	write_reg(par, 0x2C);
1015	}
1016
1017	static void fbtft_device_pdev_release(struct device *dev)
1018	{
1019	/* Needed to silence this message:
1020	* Device 'xxx' does not have a release() function,
1021	* it is broken and must be fixed
1022	*/
1023	}
1024
1025	static int spi_device_found(struct device dev, void data)
1026	{
1027	struct spi_device *spi = to_spi_device(dev);
1028
1029	dev_info(dev, "%s %s %dkHz %d bits mode=0x%02X\n", spi->modalias,
1030	dev_name(dev), spi->max_speed_hz / 1000, spi->bits_per_word,
1031	spi->mode);
1032
1033	return 0;
1034	}
1035
1036	static void pr_spi_devices(void)
1037	{
1038	pr_debug("SPI devices registered:\n");
1039	bus_for_each_dev(&spi_bus_type, NULL, NULL, spi_device_found);
1040	}
1041
1042	static int p_device_found(struct device dev, void data)
1043	{
1044	struct platform_device
1045	*pdev = to_platform_device(dev);
1046
1047	if (strstr(pdev->name, "fb"))
1048	dev_info(dev, "%s id=%d pdata? %s\n", pdev->name, pdev->id,
1049	pdev->dev.platform_data ? "yes" : "no");
1050
1051	return 0;
1052	}
1053
1054	static void pr_p_devices(void)
1055	{
1056	pr_debug("'fb' Platform devices registered:\n");
1057	bus_for_each_dev(&platform_bus_type, NULL, NULL, p_device_found);
1058	}
1059
1060	#ifdef MODULE
1061	static void fbtft_device_spi_delete(struct spi_master *master, unsigned int cs)
1062	{
1063	struct device *dev;
1064	char str[32];
1065
1066	snprintf(str, sizeof(str), "%s.%u", dev_name(&master->dev), cs);
1067
1068	dev = bus_find_device_by_name(&spi_bus_type, NULL, str);
1069	if (dev) {
1070	if (verbose)
1071	dev_info(dev, "Deleting %s\n", str);
1072	device_del(dev);
1073	}
1074	}
1075
1076	static int fbtft_device_spi_device_register(struct spi_board_info *spi)
1077	{
1078	struct spi_master *master;
1079
1080	master = spi_busnum_to_master(spi->bus_num);
1081	if (!master) {
1082	pr_err("spi_busnum_to_master(%d) returned NULL\n",
1083	spi->bus_num);
1084	return -EINVAL;
1085	}
1086	/* make sure it's available */
1087	fbtft_device_spi_delete(master, spi->chip_select);
1088	spi_device = spi_new_device(master, spi);
1089	put_device(&master->dev);
1090	if (!spi_device) {
1091	dev_err(&master->dev, "spi_new_device() returned NULL\n");
1092	return -EPERM;
1093	}
1094	return 0;
1095	}
1096	#else
1097	static int fbtft_device_spi_device_register(struct spi_board_info *spi)
1098	{
1099	return spi_register_board_info(spi, 1);
1100	}
1101	#endif
1102
1103	static int __init fbtft_device_init(void)
1104	{
1105	struct spi_board_info *spi = NULL;
1106	struct fbtft_platform_data *pdata;
1107	bool found = false;
1108	int i = 0;
1109	int ret = 0;
1110
1111	if (!name) {
1112	#ifdef MODULE
1113	pr_err("missing module parameter: 'name'\n");
1114	return -EINVAL;
1115	#else
1116	return 0;
1117	#endif
1118	}
1119
1120	if (init_num > FBTFT_MAX_INIT_SEQUENCE) {
1121	pr_err("init parameter: exceeded max array size: %d\n",
1122	FBTFT_MAX_INIT_SEQUENCE);
1123	return -EINVAL;
1124	}
1125
1126	if (verbose > 2) {
1127	pr_spi_devices(); /* print list of registered SPI devices */
1128	pr_p_devices(); /* print list of 'fb' platform devices */
1129	}
1130
1131	pr_debug("name='%s', busnum=%d, cs=%d\n", name, busnum, cs);
1132
1133	if (rotate > 0 && rotate < 4) {
1134	rotate = (4 - rotate) * 90;
1135	pr_warn("argument 'rotate' should be an angle. Values 1-3 is deprecated. Setting it to %d.\n",
1136	rotate);
1137	}
1138	if (rotate != 0 && rotate != 90 && rotate != 180 && rotate != 270) {
1139	pr_warn("argument 'rotate' illegal value: %d. Setting it to 0.\n",
1140	rotate);
1141	rotate = 0;
1142	}
1143
1144	/* name=list lists all supported displays */
1145	if (strcmp(name, "list") == 0) {
1146	pr_info("Supported displays:\n");
1147
1148	for (i = 0; i < ARRAY_SIZE(displays); i++)
1149	pr_info("%s\n", displays[i].name);
1150	return -ECANCELED;
1151	}
1152
1153	if (custom) {
1154	i = ARRAY_SIZE(displays) - 1;
1155	displays[i].name = name;
1156	if (speed == 0) {
1157	displays[i].pdev->name = name;
1158	displays[i].spi = NULL;
1159	} else {
1160	size_t len;
1161
1162	len = strlcpy(displays[i].spi->modalias, name,
1163	SPI_NAME_SIZE);
1164	if (len >= SPI_NAME_SIZE)
1165	pr_warn("modalias (name) truncated to: %s\n",
1166	displays[i].spi->modalias);
1167	displays[i].pdev = NULL;
1168	}
1169	}
1170
1171	for (i = 0; i < ARRAY_SIZE(displays); i++) {
1172	if (strncmp(name, displays[i].name, SPI_NAME_SIZE) == 0) {
1173	if (displays[i].spi) {
1174	spi = displays[i].spi;
1175	spi->chip_select = cs;
1176	spi->bus_num = busnum;
1177	if (speed)
1178	spi->max_speed_hz = speed;
1179	if (mode != -1)
1180	spi->mode = mode;
1181	pdata = (void *)spi->platform_data;
1182	} else if (displays[i].pdev) {
1183	p_device = displays[i].pdev;
1184	pdata = p_device->dev.platform_data;
1185	} else {
1186	pr_err("broken displays array\n");
1187	return -EINVAL;
1188	}
1189
1190	pdata->rotate = rotate;
1191	if (bgr == 0)
1192	pdata->bgr = false;
1193	else if (bgr == 1)
1194	pdata->bgr = true;
1195	if (startbyte)
1196	pdata->startbyte = startbyte;
1197	if (gamma)
1198	pdata->gamma = gamma;
1199	pdata->display.debug = debug;
1200	if (fps)
1201	pdata->fps = fps;
1202	if (txbuflen)
1203	pdata->txbuflen = txbuflen;
1204	if (init_num)
1205	pdata->display.init_sequence = init;
1206	if (custom) {
1207	pdata->display.width = width;
1208	pdata->display.height = height;
1209	pdata->display.buswidth = buswidth;
1210	pdata->display.backlight = 1;
1211	}
1212
1213	if (displays[i].spi) {
1214	ret = fbtft_device_spi_device_register(spi);
1215	if (ret) {
1216	pr_err("failed to register SPI device\n");
1217	return ret;
1218	}
1219	} else {
1220	ret = platform_device_register(p_device);
1221	if (ret < 0) {
1222	pr_err("platform_device_register() returned %d\n",
1223	ret);
1224	return ret;
1225	}
1226	}
1227	found = true;
1228	break;
1229	}
1230	}
1231
1232	if (!found) {
1233	pr_err("display not supported: '%s'\n", name);
1234	return -EINVAL;
1235	}
1236
1237	if (spi_device && (verbose > 1))
1238	pr_spi_devices();
1239	if (p_device && (verbose > 1))
1240	pr_p_devices();
1241
1242	return 0;
1243	}
1244
1245	static void __exit fbtft_device_exit(void)
1246	{
1247	if (spi_device) {
1248	device_del(&spi_device->dev);
1249	kfree(spi_device);
1250	}
1251
1252	if (p_device)
1253	platform_device_unregister(p_device);
1254	}
1255
1256	arch_initcall(fbtft_device_init);
1257	module_exit(fbtft_device_exit);
1258
1259	MODULE_DESCRIPTION("Add a FBTFT device.");
1260	MODULE_AUTHOR("Noralf Tronnes");
1261	MODULE_LICENSE("GPL");

drivers/staging/fbtft/flexfb.c+0−851

@@ -1,851 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0+
2	/*
3	* Generic FB driver for TFT LCD displays
4	*
5	* Copyright (C) 2013 Noralf Tronnes
6	*/
7
8	#include <linux/module.h>
9	#include <linux/kernel.h>
10	#include <linux/init.h>
11	#include <linux/vmalloc.h>
12	#include <linux/gpio/consumer.h>
13	#include <linux/spi/spi.h>
14	#include <linux/delay.h>
15
16	#include "fbtft.h"
17
18	#define DRVNAME "flexfb"
19
20	static char *chip;
21	module_param(chip, charp, 0000);
22	MODULE_PARM_DESC(chip, "LCD controller");
23
24	static unsigned int width;
25	module_param(width, uint, 0000);
26	MODULE_PARM_DESC(width, "Display width");
27
28	static unsigned int height;
29	module_param(height, uint, 0000);
30	MODULE_PARM_DESC(height, "Display height");
31
32	static s16 init[512];
33	static int init_num;
34	module_param_array(init, short, &init_num, 0000);
35	MODULE_PARM_DESC(init, "Init sequence");
36
37	static unsigned int setaddrwin;
38	module_param(setaddrwin, uint, 0000);
39	MODULE_PARM_DESC(setaddrwin, "Which set_addr_win() implementation to use");
40
41	static unsigned int buswidth = 8;
42	module_param(buswidth, uint, 0000);
43	MODULE_PARM_DESC(buswidth, "Width of databus (default: 8)");
44
45	static unsigned int regwidth = 8;
46	module_param(regwidth, uint, 0000);
47	MODULE_PARM_DESC(regwidth, "Width of controller register (default: 8)");
48
49	static bool nobacklight;
50	module_param(nobacklight, bool, 0000);
51	MODULE_PARM_DESC(nobacklight, "Turn off backlight functionality.");
52
53	static bool latched;
54	module_param(latched, bool, 0000);
55	MODULE_PARM_DESC(latched, "Use with latched 16-bit databus");
56
57	static const s16 *initp;
58	static int initp_num;
59
60	/* default init sequences */
61	static const s16 st7735r_init[] = {
62	-1, 0x01,
63	-2, 150,
64	-1, 0x11,
65	-2, 500,
66	-1, 0xB1, 0x01, 0x2C, 0x2D,
67	-1, 0xB2, 0x01, 0x2C, 0x2D,
68	-1, 0xB3, 0x01, 0x2C, 0x2D, 0x01, 0x2C, 0x2D,
69	-1, 0xB4, 0x07,
70	-1, 0xC0, 0xA2, 0x02, 0x84,
71	-1, 0xC1, 0xC5,
72	-1, 0xC2, 0x0A, 0x00,
73	-1, 0xC3, 0x8A, 0x2A,
74	-1, 0xC4, 0x8A, 0xEE,
75	-1, 0xC5, 0x0E,
76	-1, 0x20,
77	-1, 0x36, 0xC0,
78	-1, 0x3A, 0x05,
79	-1, 0xE0, 0x0f, 0x1a, 0x0f, 0x18, 0x2f, 0x28, 0x20, 0x22,
80	0x1f, 0x1b, 0x23, 0x37, 0x00, 0x07, 0x02, 0x10,
81	-1, 0xE1, 0x0f, 0x1b, 0x0f, 0x17, 0x33, 0x2c, 0x29, 0x2e,
82	0x30, 0x30, 0x39, 0x3f, 0x00, 0x07, 0x03, 0x10,
83	-1, 0x29,
84	-2, 100,
85	-1, 0x13,
86	-2, 10,
87	-3
88	};
89
90	static const s16 ssd1289_init[] = {
91	-1, 0x00, 0x0001,
92	-1, 0x03, 0xA8A4,
93	-1, 0x0C, 0x0000,
94	-1, 0x0D, 0x080C,
95	-1, 0x0E, 0x2B00,
96	-1, 0x1E, 0x00B7,
97	-1, 0x01, 0x2B3F,
98	-1, 0x02, 0x0600,
99	-1, 0x10, 0x0000,
100	-1, 0x11, 0x6070,
101	-1, 0x05, 0x0000,
102	-1, 0x06, 0x0000,
103	-1, 0x16, 0xEF1C,
104	-1, 0x17, 0x0003,
105	-1, 0x07, 0x0233,
106	-1, 0x0B, 0x0000,
107	-1, 0x0F, 0x0000,
108	-1, 0x41, 0x0000,
109	-1, 0x42, 0x0000,
110	-1, 0x48, 0x0000,
111	-1, 0x49, 0x013F,
112	-1, 0x4A, 0x0000,
113	-1, 0x4B, 0x0000,
114	-1, 0x44, 0xEF00,
115	-1, 0x45, 0x0000,
116	-1, 0x46, 0x013F,
117	-1, 0x30, 0x0707,
118	-1, 0x31, 0x0204,
119	-1, 0x32, 0x0204,
120	-1, 0x33, 0x0502,
121	-1, 0x34, 0x0507,
122	-1, 0x35, 0x0204,
123	-1, 0x36, 0x0204,
124	-1, 0x37, 0x0502,
125	-1, 0x3A, 0x0302,
126	-1, 0x3B, 0x0302,
127	-1, 0x23, 0x0000,
128	-1, 0x24, 0x0000,
129	-1, 0x25, 0x8000,
130	-1, 0x4f, 0x0000,
131	-1, 0x4e, 0x0000,
132	-1, 0x22,
133	-3
134	};
135
136	static const s16 hx8340bn_init[] = {
137	-1, 0xC1, 0xFF, 0x83, 0x40,
138	-1, 0x11,
139	-2, 150,
140	-1, 0xCA, 0x70, 0x00, 0xD9,
141	-1, 0xB0, 0x01, 0x11,
142	-1, 0xC9, 0x90, 0x49, 0x10, 0x28, 0x28, 0x10, 0x00, 0x06,
143	-2, 20,
144	-1, 0xC2, 0x60, 0x71, 0x01, 0x0E, 0x05, 0x02, 0x09, 0x31, 0x0A,
145	-1, 0xC3, 0x67, 0x30, 0x61, 0x17, 0x48, 0x07, 0x05, 0x33,
146	-2, 10,
147	-1, 0xB5, 0x35, 0x20, 0x45,
148	-1, 0xB4, 0x33, 0x25, 0x4C,
149	-2, 10,
150	-1, 0x3A, 0x05,
151	-1, 0x29,
152	-2, 10,
153	-3
154	};
155
156	static const s16 ili9225_init[] = {
157	-1, 0x0001, 0x011C,
158	-1, 0x0002, 0x0100,
159	-1, 0x0003, 0x1030,
160	-1, 0x0008, 0x0808,
161	-1, 0x000C, 0x0000,
162	-1, 0x000F, 0x0A01,
163	-1, 0x0020, 0x0000,
164	-1, 0x0021, 0x0000,
165	-2, 50,
166	-1, 0x0010, 0x0A00,
167	-1, 0x0011, 0x1038,
168	-2, 50,
169	-1, 0x0012, 0x1121,
170	-1, 0x0013, 0x004E,
171	-1, 0x0014, 0x676F,
172	-1, 0x0030, 0x0000,
173	-1, 0x0031, 0x00DB,
174	-1, 0x0032, 0x0000,
175	-1, 0x0033, 0x0000,
176	-1, 0x0034, 0x00DB,
177	-1, 0x0035, 0x0000,
178	-1, 0x0036, 0x00AF,
179	-1, 0x0037, 0x0000,
180	-1, 0x0038, 0x00DB,
181	-1, 0x0039, 0x0000,
182	-1, 0x0050, 0x0000,
183	-1, 0x0051, 0x060A,
184	-1, 0x0052, 0x0D0A,
185	-1, 0x0053, 0x0303,
186	-1, 0x0054, 0x0A0D,
187	-1, 0x0055, 0x0A06,
188	-1, 0x0056, 0x0000,
189	-1, 0x0057, 0x0303,
190	-1, 0x0058, 0x0000,
191	-1, 0x0059, 0x0000,
192	-2, 50,
193	-1, 0x0007, 0x1017,
194	-2, 50,
195	-3
196	};
197
198	static const s16 ili9320_init[] = {
199	-1, 0x00E5, 0x8000,
200	-1, 0x0000, 0x0001,
201	-1, 0x0001, 0x0100,
202	-1, 0x0002, 0x0700,
203	-1, 0x0003, 0x1030,
204	-1, 0x0004, 0x0000,
205	-1, 0x0008, 0x0202,
206	-1, 0x0009, 0x0000,
207	-1, 0x000A, 0x0000,
208	-1, 0x000C, 0x0000,
209	-1, 0x000D, 0x0000,
210	-1, 0x000F, 0x0000,
211	-1, 0x0010, 0x0000,
212	-1, 0x0011, 0x0007,
213	-1, 0x0012, 0x0000,
214	-1, 0x0013, 0x0000,
215	-2, 200,
216	-1, 0x0010, 0x17B0,
217	-1, 0x0011, 0x0031,
218	-2, 50,
219	-1, 0x0012, 0x0138,
220	-2, 50,
221	-1, 0x0013, 0x1800,
222	-1, 0x0029, 0x0008,
223	-2, 50,
224	-1, 0x0020, 0x0000,
225	-1, 0x0021, 0x0000,
226	-1, 0x0030, 0x0000,
227	-1, 0x0031, 0x0505,
228	-1, 0x0032, 0x0004,
229	-1, 0x0035, 0x0006,
230	-1, 0x0036, 0x0707,
231	-1, 0x0037, 0x0105,
232	-1, 0x0038, 0x0002,
233	-1, 0x0039, 0x0707,
234	-1, 0x003C, 0x0704,
235	-1, 0x003D, 0x0807,
236	-1, 0x0050, 0x0000,
237	-1, 0x0051, 0x00EF,
238	-1, 0x0052, 0x0000,
239	-1, 0x0053, 0x013F,
240	-1, 0x0060, 0x2700,
241	-1, 0x0061, 0x0001,
242	-1, 0x006A, 0x0000,
243	-1, 0x0080, 0x0000,
244	-1, 0x0081, 0x0000,
245	-1, 0x0082, 0x0000,
246	-1, 0x0083, 0x0000,
247	-1, 0x0084, 0x0000,
248	-1, 0x0085, 0x0000,
249	-1, 0x0090, 0x0010,
250	-1, 0x0092, 0x0000,
251	-1, 0x0093, 0x0003,
252	-1, 0x0095, 0x0110,
253	-1, 0x0097, 0x0000,
254	-1, 0x0098, 0x0000,
255	-1, 0x0007, 0x0173,
256	-3
257	};
258
259	static const s16 ili9325_init[] = {
260	-1, 0x00E3, 0x3008,
261	-1, 0x00E7, 0x0012,
262	-1, 0x00EF, 0x1231,
263	-1, 0x0001, 0x0100,
264	-1, 0x0002, 0x0700,
265	-1, 0x0003, 0x1030,
266	-1, 0x0004, 0x0000,
267	-1, 0x0008, 0x0207,
268	-1, 0x0009, 0x0000,
269	-1, 0x000A, 0x0000,
270	-1, 0x000C, 0x0000,
271	-1, 0x000D, 0x0000,
272	-1, 0x000F, 0x0000,
273	-1, 0x0010, 0x0000,
274	-1, 0x0011, 0x0007,
275	-1, 0x0012, 0x0000,
276	-1, 0x0013, 0x0000,
277	-2, 200,
278	-1, 0x0010, 0x1690,
279	-1, 0x0011, 0x0223,
280	-2, 50,
281	-1, 0x0012, 0x000D,
282	-2, 50,
283	-1, 0x0013, 0x1200,
284	-1, 0x0029, 0x000A,
285	-1, 0x002B, 0x000C,
286	-2, 50,
287	-1, 0x0020, 0x0000,
288	-1, 0x0021, 0x0000,
289	-1, 0x0030, 0x0000,
290	-1, 0x0031, 0x0506,
291	-1, 0x0032, 0x0104,
292	-1, 0x0035, 0x0207,
293	-1, 0x0036, 0x000F,
294	-1, 0x0037, 0x0306,
295	-1, 0x0038, 0x0102,
296	-1, 0x0039, 0x0707,
297	-1, 0x003C, 0x0702,
298	-1, 0x003D, 0x1604,
299	-1, 0x0050, 0x0000,
300	-1, 0x0051, 0x00EF,
301	-1, 0x0052, 0x0000,
302	-1, 0x0053, 0x013F,
303	-1, 0x0060, 0xA700,
304	-1, 0x0061, 0x0001,
305	-1, 0x006A, 0x0000,
306	-1, 0x0080, 0x0000,
307	-1, 0x0081, 0x0000,
308	-1, 0x0082, 0x0000,
309	-1, 0x0083, 0x0000,
310	-1, 0x0084, 0x0000,
311	-1, 0x0085, 0x0000,
312	-1, 0x0090, 0x0010,
313	-1, 0x0092, 0x0600,
314	-1, 0x0007, 0x0133,
315	-3
316	};
317
318	static const s16 ili9341_init[] = {
319	-1, 0x28,
320	-2, 20,
321	-1, 0xCF, 0x00, 0x83, 0x30,
322	-1, 0xED, 0x64, 0x03, 0x12, 0x81,
323	-1, 0xE8, 0x85, 0x01, 0x79,
324	-1, 0xCB, 0x39, 0x2c, 0x00, 0x34, 0x02,
325	-1, 0xF7, 0x20,
326	-1, 0xEA, 0x00, 0x00,
327	-1, 0xC0, 0x26,
328	-1, 0xC1, 0x11,
329	-1, 0xC5, 0x35, 0x3E,
330	-1, 0xC7, 0xBE,
331	-1, 0xB1, 0x00, 0x1B,
332	-1, 0xB6, 0x0a, 0x82, 0x27, 0x00,
333	-1, 0xB7, 0x07,
334	-1, 0x3A, 0x55,
335	-1, 0x36, 0x48,
336	-1, 0x11,
337	-2, 120,
338	-1, 0x29,
339	-2, 20,
340	-3
341	};
342
343	static const s16 ssd1351_init[] = {
344	-1, 0xfd, 0x12,
345	-1, 0xfd, 0xb1,
346	-1, 0xae,
347	-1, 0xb3, 0xf1,
348	-1, 0xca, 0x7f,
349	-1, 0xa0, 0x74,
350	-1, 0x15, 0x00, 0x7f,
351	-1, 0x75, 0x00, 0x7f,
352	-1, 0xa1, 0x00,
353	-1, 0xa2, 0x00,
354	-1, 0xb5, 0x00,
355	-1, 0xab, 0x01,
356	-1, 0xb1, 0x32,
357	-1, 0xb4, 0xa0, 0xb5, 0x55,
358	-1, 0xbb, 0x17,
359	-1, 0xbe, 0x05,
360	-1, 0xc1, 0xc8, 0x80, 0xc8,
361	-1, 0xc7, 0x0f,
362	-1, 0xb6, 0x01,
363	-1, 0xa6,
364	-1, 0xaf,
365	-3
366	};
367
368	/**
369	* struct flexfb_lcd_controller - Describes the LCD controller properties
370	* @name: Model name of the chip
371	* @width: Width of display in pixels
372	* @height: Height of display in pixels
373	* @setaddrwin: Which set_addr_win() implementation to use
374	* @regwidth: LCD Controller Register width in bits
375	* @init_seq: LCD initialization sequence
376	* @init_seq_sz: Size of LCD initialization sequence
377	*/
378	struct flexfb_lcd_controller {
379	const char *name;
380	unsigned int width;
381	unsigned int height;
382	unsigned int setaddrwin;
383	unsigned int regwidth;
384	const s16 *init_seq;
385	int init_seq_sz;
386	};
387
388	static const struct flexfb_lcd_controller flexfb_chip_table[] = {
389	{
390	.name = "st7735r",
391	.width = 120,
392	.height = 160,
393	.init_seq = st7735r_init,
394	.init_seq_sz = ARRAY_SIZE(st7735r_init),
395	},
396	{
397	.name = "hx8340bn",
398	.width = 176,
399	.height = 220,
400	.init_seq = hx8340bn_init,
401	.init_seq_sz = ARRAY_SIZE(hx8340bn_init),
402	},
403	{
404	.name = "ili9225",
405	.width = 176,
406	.height = 220,
407	.regwidth = 16,
408	.init_seq = ili9225_init,
409	.init_seq_sz = ARRAY_SIZE(ili9225_init),
410	},
411	{
412	.name = "ili9320",
413	.width = 240,
414	.height = 320,
415	.setaddrwin = 1,
416	.regwidth = 16,
417	.init_seq = ili9320_init,
418	.init_seq_sz = ARRAY_SIZE(ili9320_init),
419	},
420	{
421	.name = "ili9325",
422	.width = 240,
423	.height = 320,
424	.setaddrwin = 1,
425	.regwidth = 16,
426	.init_seq = ili9325_init,
427	.init_seq_sz = ARRAY_SIZE(ili9325_init),
428	},
429	{
430	.name = "ili9341",
431	.width = 240,
432	.height = 320,
433	.init_seq = ili9341_init,
434	.init_seq_sz = ARRAY_SIZE(ili9341_init),
435	},
436	{
437	.name = "ssd1289",
438	.width = 240,
439	.height = 320,
440	.setaddrwin = 2,
441	.regwidth = 16,
442	.init_seq = ssd1289_init,
443	.init_seq_sz = ARRAY_SIZE(ssd1289_init),
444	},
445	{
446	.name = "ssd1351",
447	.width = 128,
448	.height = 128,
449	.setaddrwin = 3,
450	.init_seq = ssd1351_init,
451	.init_seq_sz = ARRAY_SIZE(ssd1351_init),
452	},
453	};
454
455	/* ili9320, ili9325 */
456	static void flexfb_set_addr_win_1(struct fbtft_par *par,
457	int xs, int ys, int xe, int ye)
458	{
459	switch (par->info->var.rotate) {
460	/* R20h = Horizontal GRAM Start Address */
461	/* R21h = Vertical GRAM Start Address */
462	case 0:
463	write_reg(par, 0x0020, xs);
464	write_reg(par, 0x0021, ys);
465	break;
466	case 180:
467	write_reg(par, 0x0020, width - 1 - xs);
468	write_reg(par, 0x0021, height - 1 - ys);
469	break;
470	case 270:
471	write_reg(par, 0x0020, width - 1 - ys);
472	write_reg(par, 0x0021, xs);
473	break;
474	case 90:
475	write_reg(par, 0x0020, ys);
476	write_reg(par, 0x0021, height - 1 - xs);
477	break;
478	}
479	write_reg(par, 0x0022); /* Write Data to GRAM */
480	}
481
482	/* ssd1289 */
483	static void flexfb_set_addr_win_2(struct fbtft_par *par,
484	int xs, int ys, int xe, int ye)
485	{
486	switch (par->info->var.rotate) {
487	/* R4Eh - Set GDDRAM X address counter */
488	/* R4Fh - Set GDDRAM Y address counter */
489	case 0:
490	write_reg(par, 0x4e, xs);
491	write_reg(par, 0x4f, ys);
492	break;
493	case 180:
494	write_reg(par, 0x4e, par->info->var.xres - 1 - xs);
495	write_reg(par, 0x4f, par->info->var.yres - 1 - ys);
496	break;
497	case 270:
498	write_reg(par, 0x4e, par->info->var.yres - 1 - ys);
499	write_reg(par, 0x4f, xs);
500	break;
501	case 90:
502	write_reg(par, 0x4e, ys);
503	write_reg(par, 0x4f, par->info->var.xres - 1 - xs);
504	break;
505	}
506
507	/* R22h - RAM data write */
508	write_reg(par, 0x22, 0);
509	}
510
511	/* ssd1351 */
512	static void set_addr_win_3(struct fbtft_par *par,
513	int xs, int ys, int xe, int ye)
514	{
515	write_reg(par, 0x15, xs, xe);
516	write_reg(par, 0x75, ys, ye);
517	write_reg(par, 0x5C);
518	}
519
520	static int flexfb_verify_gpios_dc(struct fbtft_par *par)
521	{
522	fbtft_par_dbg(DEBUG_VERIFY_GPIOS, par, "%s()\n", __func__);
523
524	if (!par->gpio.dc) {
525	dev_err(par->info->device,
526	"Missing info about 'dc' gpio. Aborting.\n");
527	return -EINVAL;
528	}
529
530	return 0;
531	}
532
533	static int flexfb_verify_gpios_db(struct fbtft_par *par)
534	{
535	int i;
536	int num_db = buswidth;
537
538	fbtft_par_dbg(DEBUG_VERIFY_GPIOS, par, "%s()\n", __func__);
539
540	if (!par->gpio.dc) {
541	dev_err(par->info->device, "Missing info about 'dc' gpio. Aborting.\n");
542	return -EINVAL;
543	}
544	if (!par->gpio.wr) {
545	dev_err(par->info->device, "Missing info about 'wr' gpio. Aborting.\n");
546	return -EINVAL;
547	}
548	if (latched && !par->gpio.latch) {
549	dev_err(par->info->device, "Missing info about 'latch' gpio. Aborting.\n");
550	return -EINVAL;
551	}
552	if (latched)
553	num_db = buswidth / 2;
554	for (i = 0; i < num_db; i++) {
555	if (!par->gpio.db[i]) {
556	dev_err(par->info->device,
557	"Missing info about 'db%02d' gpio. Aborting.\n",
558	i);
559	return -EINVAL;
560	}
561	}
562
563	return 0;
564	}
565
566	static void flexfb_chip_load_param(const struct flexfb_lcd_controller *chip)
567	{
568	if (!width)
569	width = chip->width;
570	if (!height)
571	height = chip->height;
572	setaddrwin = chip->setaddrwin;
573	if (chip->regwidth)
574	regwidth = chip->regwidth;
575	if (!init_num) {
576	initp = chip->init_seq;
577	initp_num = chip->init_seq_sz;
578	}
579	}
580
581	static struct fbtft_display flex_display = { };
582
583	static int flexfb_chip_init(const struct device *dev)
584	{
585	int i;
586
587	for (i = 0; i < ARRAY_SIZE(flexfb_chip_table); i++)
588	if (!strcmp(chip, flexfb_chip_table[i].name)) {
589	flexfb_chip_load_param(&flexfb_chip_table[i]);
590	return 0;
591	}
592
593	dev_err(dev, "chip=%s is not supported\n", chip);
594
595	return -EINVAL;
596	}
597
598	static int flexfb_probe_common(struct spi_device *sdev,
599	struct platform_device *pdev)
600	{
601	struct device *dev;
602	struct fb_info *info;
603	struct fbtft_par *par;
604	int ret;
605
606	initp = init;
607	initp_num = init_num;
608
609	if (sdev)
610	dev = &sdev->dev;
611	else
612	dev = &pdev->dev;
613
614	fbtft_init_dbg(dev, "%s(%s)\n", __func__,
615	sdev ? "'SPI device'" : "'Platform device'");
616
617	if (chip) {
618	ret = flexfb_chip_init(dev);
619	if (ret)
620	return ret;
621	}
622
623	if (width == 0 \|\| height == 0) {
624	dev_err(dev, "argument(s) missing: width and height has to be set.\n");
625	return -EINVAL;
626	}
627	flex_display.width = width;
628	flex_display.height = height;
629	fbtft_init_dbg(dev, "Display resolution: %dx%d\n", width, height);
630	fbtft_init_dbg(dev, "chip = %s\n", chip ? chip : "not set");
631	fbtft_init_dbg(dev, "setaddrwin = %d\n", setaddrwin);
632	fbtft_init_dbg(dev, "regwidth = %d\n", regwidth);
633	fbtft_init_dbg(dev, "buswidth = %d\n", buswidth);
634
635	info = fbtft_framebuffer_alloc(&flex_display, dev, dev->platform_data);
636	if (!info)
637	return -ENOMEM;
638
639	par = info->par;
640	if (sdev)
641	par->spi = sdev;
642	else
643	par->pdev = pdev;
644	if (!par->init_sequence)
645	par->init_sequence = initp;
646	par->fbtftops.init_display = fbtft_init_display;
647
648	/* registerwrite functions */
649	switch (regwidth) {
650	case 8:
651	par->fbtftops.write_register = fbtft_write_reg8_bus8;
652	break;
653	case 16:
654	par->fbtftops.write_register = fbtft_write_reg16_bus8;
655	break;
656	default:
657	dev_err(dev,
658	"argument 'regwidth': %d is not supported.\n",
659	regwidth);
660	return -EINVAL;
661	}
662
663	/* bus functions */
664	if (sdev) {
665	par->fbtftops.write = fbtft_write_spi;
666	switch (buswidth) {
667	case 8:
668	par->fbtftops.write_vmem = fbtft_write_vmem16_bus8;
669	if (!par->startbyte)
670	par->fbtftops.verify_gpios = flexfb_verify_gpios_dc;
671	break;
672	case 9:
673	if (regwidth == 16) {
674	dev_err(dev, "argument 'regwidth': %d is not supported with buswidth=%d and SPI.\n",
675	regwidth, buswidth);
676	return -EINVAL;
677	}
678	par->fbtftops.write_register = fbtft_write_reg8_bus9;
679	par->fbtftops.write_vmem = fbtft_write_vmem16_bus9;
680	if (par->spi->master->bits_per_word_mask
681	& SPI_BPW_MASK(9)) {
682	par->spi->bits_per_word = 9;
683	break;
684	}
685
686	dev_warn(dev,
687	"9-bit SPI not available, emulating using 8-bit.\n");
688	/* allocate buffer with room for dc bits */
689	par->extra = devm_kzalloc(par->info->device,
690	par->txbuf.len
691	+ (par->txbuf.len / 8) + 8,
692	GFP_KERNEL);
693	if (!par->extra) {
694	ret = -ENOMEM;
695	goto out_release;
696	}
697	par->fbtftops.write = fbtft_write_spi_emulate_9;
698
699	break;
700	default:
701	dev_err(dev,
702	"argument 'buswidth': %d is not supported with SPI.\n",
703	buswidth);
704	return -EINVAL;
705	}
706	} else {
707	par->fbtftops.verify_gpios = flexfb_verify_gpios_db;
708	switch (buswidth) {
709	case 8:
710	par->fbtftops.write = fbtft_write_gpio8_wr;
711	par->fbtftops.write_vmem = fbtft_write_vmem16_bus8;
712	break;
713	case 16:
714	par->fbtftops.write_register = fbtft_write_reg16_bus16;
715	if (latched)
716	par->fbtftops.write = fbtft_write_gpio16_wr_latched;
717	else
718	par->fbtftops.write = fbtft_write_gpio16_wr;
719	par->fbtftops.write_vmem = fbtft_write_vmem16_bus16;
720	break;
721	default:
722	dev_err(dev,
723	"argument 'buswidth': %d is not supported with parallel.\n",
724	buswidth);
725	return -EINVAL;
726	}
727	}
728
729	/* set_addr_win function */
730	switch (setaddrwin) {
731	case 0:
732	/* use default */
733	break;
734	case 1:
735	par->fbtftops.set_addr_win = flexfb_set_addr_win_1;
736	break;
737	case 2:
738	par->fbtftops.set_addr_win = flexfb_set_addr_win_2;
739	break;
740	case 3:
741	par->fbtftops.set_addr_win = set_addr_win_3;
742	break;
743	default:
744	dev_err(dev, "argument 'setaddrwin': unknown value %d.\n",
745	setaddrwin);
746	return -EINVAL;
747	}
748
749	if (!nobacklight)
750	par->fbtftops.register_backlight = fbtft_register_backlight;
751
752	ret = fbtft_register_framebuffer(info);
753	if (ret < 0)
754	goto out_release;
755
756	return 0;
757
758	out_release:
759	fbtft_framebuffer_release(info);
760
761	return ret;
762	}
763
764	static int flexfb_remove_common(struct device dev, struct fb_info info)
765	{
766	struct fbtft_par *par;
767
768	if (!info)
769	return -EINVAL;
770	par = info->par;
771	if (par)
772	fbtft_par_dbg(DEBUG_DRIVER_INIT_FUNCTIONS, par, "%s()\n",
773	__func__);
774	fbtft_unregister_framebuffer(info);
775	fbtft_framebuffer_release(info);
776
777	return 0;
778	}
779
780	static int flexfb_probe_spi(struct spi_device *spi)
781	{
782	return flexfb_probe_common(spi, NULL);
783	}
784
785	static int flexfb_remove_spi(struct spi_device *spi)
786	{
787	struct fb_info *info = spi_get_drvdata(spi);
788
789	return flexfb_remove_common(&spi->dev, info);
790	}
791
792	static int flexfb_probe_pdev(struct platform_device *pdev)
793	{
794	return flexfb_probe_common(NULL, pdev);
795	}
796
797	static int flexfb_remove_pdev(struct platform_device *pdev)
798	{
799	struct fb_info *info = platform_get_drvdata(pdev);
800
801	return flexfb_remove_common(&pdev->dev, info);
802	}
803
804	static struct spi_driver flexfb_spi_driver = {
805	.driver = {
806	.name = DRVNAME,
807	},
808	.probe = flexfb_probe_spi,
809	.remove = flexfb_remove_spi,
810	};
811
812	static const struct platform_device_id flexfb_platform_ids[] = {
813	{ "flexpfb", 0 },
814	{ },
815	};
816	MODULE_DEVICE_TABLE(platform, flexfb_platform_ids);
817
818	static struct platform_driver flexfb_platform_driver = {
819	.driver = {
820	.name = DRVNAME,
821	},
822	.id_table = flexfb_platform_ids,
823	.probe = flexfb_probe_pdev,
824	.remove = flexfb_remove_pdev,
825	};
826
827	static int __init flexfb_init(void)
828	{
829	int ret, ret2;
830
831	ret = spi_register_driver(&flexfb_spi_driver);
832	ret2 = platform_driver_register(&flexfb_platform_driver);
833	if (ret < 0)
834	return ret;
835	return ret2;
836	}
837
838	static void __exit flexfb_exit(void)
839	{
840	spi_unregister_driver(&flexfb_spi_driver);
841	platform_driver_unregister(&flexfb_platform_driver);
842	}
843
844	/* ------------------------------------------------------------------------- */
845
846	module_init(flexfb_init);
847	module_exit(flexfb_exit);
848
849	MODULE_DESCRIPTION("Generic FB driver for TFT LCD displays");
850	MODULE_AUTHOR("Noralf Tronnes");
851	MODULE_LICENSE("GPL");

drivers/staging/octeon/ethernet-tx.c+7−8

 	/* Build the PKO buffer pointer */
 	hw_buffer.u64 = 0;
 	if (skb_shinfo(skb)->nr_frags == 0) {
-		hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)skb->data);
+		hw_buffer.s.addr = XKPHYS_TO_PHYS((uintptr_t)skb->data);
 		hw_buffer.s.pool = 0;
 		hw_buffer.s.size = skb->len;
 	} else {
-		hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)skb->data);
+		hw_buffer.s.addr = XKPHYS_TO_PHYS((uintptr_t)skb->data);
 		hw_buffer.s.pool = 0;
 		hw_buffer.s.size = skb_headlen(skb);
 		CVM_OCT_SKB_CB(skb)[0] = hw_buffer.u64;
 			skb_frag_t *fs = skb_shinfo(skb)->frags + i;
 			hw_buffer.s.addr =
-				XKPHYS_TO_PHYS((u64)skb_frag_address(fs));
+				XKPHYS_TO_PHYS((uintptr_t)skb_frag_address(fs));
 			hw_buffer.s.size = skb_frag_size(fs);
 			CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
 		}
-		hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb));
+		hw_buffer.s.addr =
+			XKPHYS_TO_PHYS((uintptr_t)CVM_OCT_SKB_CB(skb));
 		hw_buffer.s.size = skb_shinfo(skb)->nr_frags + 1;
 		pko_command.s.segs = skb_shinfo(skb)->nr_frags + 1;
 		pko_command.s.gather = 1;
 	 */
 	dst_release(skb_dst(skb));
 	skb_dst_set(skb, NULL);
-#ifdef CONFIG_XFRM
+	skb_ext_reset(skb);
-	secpath_reset(skb);
+	nf_reset_ct(skb);
-#endif
-	nf_reset(skb);
 #ifdef CONFIG_NET_SCHED
 	skb->tc_index = 0;

drivers/staging/octeon/octeon-stubs.h+1−1

@@ -1202,7 +1202,7 @@ static inline int cvmx_wqe_get_grp(cvmx_wqe_t *work) · 1201 unmodified lines
1202		1202
1203	static inline void *cvmx_phys_to_ptr(uint64_t physical_address)	1203	static inline void *cvmx_phys_to_ptr(uint64_t physical_address)
1204	{	1204	{
1205	return (void *)(physical_address);	1205	return (void *)(uintptr_t)(physical_address);
1206	}	1206	}
1207		1207
1208	static inline uint64_t cvmx_ptr_to_phys(void *ptr)	1208	static inline uint64_t cvmx_ptr_to_phys(void *ptr)

drivers/staging/rtl8188eu/hal/hal8188e_rate_adaptive.c+1−1

@@ -409,7 +409,7 @@ static int odm_ARFBRefresh_8188E(struct odm_dm_struct *dm_odm, struct odm_ra_inf · 408 unmodified lines
409	pRaInfo->PTModeSS = 3;	409	pRaInfo->PTModeSS = 3;
410	else if (pRaInfo->HighestRate > 0x0b)	410	else if (pRaInfo->HighestRate > 0x0b)
411	pRaInfo->PTModeSS = 2;	411	pRaInfo->PTModeSS = 2;
412	else if (pRaInfo->HighestRate > 0x0b)	412	else if (pRaInfo->HighestRate > 0x03)
413	pRaInfo->PTModeSS = 1;	413	pRaInfo->PTModeSS = 1;
414	else	414	else
415	pRaInfo->PTModeSS = 0;	415	pRaInfo->PTModeSS = 0;

drivers/staging/rtl8188eu/os_dep/usb_intf.c+4−2

 	}
 	padapter->HalData = kzalloc(sizeof(struct hal_data_8188e), GFP_KERNEL);
-	if (!padapter->HalData)
+	if (!padapter->HalData) {
-		DBG_88E("cant not alloc memory for HAL DATA\n");
+		DBG_88E("Failed to allocate memory for HAL data\n");
+		goto free_adapter;
+	}
 	/* step read_chip_version */
 	rtw_hal_read_chip_version(padapter);

drivers/staging/speakup/sysfs-driver-speakup+369−0

@@ -0,0 +1,369 @@
	1	What: /sys/accessibility/speakup/attrib_bleep
	2	KernelVersion: 2.6
	3	Contact: speakup@linux-speakup.org
	4	Description: Beeps the PC speaker when there is an attribute change such as
	5	foreground or background color when using speakup review
	6	commands. One = on, zero = off.
	7
	8	What: /sys/accessibility/speakup/bell_pos
	9	KernelVersion: 2.6
	10	Contact: speakup@linux-speakup.org
	11	Description: This works much like a typewriter bell. If for example 72 is
	12	echoed to bell_pos, it will beep the PC speaker when typing on
	13	a line past character 72.
	14
	15	What: /sys/accessibility/speakup/bleeps
	16	KernelVersion: 2.6
	17	Contact: speakup@linux-speakup.org
	18	Description: This controls whether one hears beeps through the PC speaker
	19	when using speakup's review commands.
	20	TODO: what values does it accept?
	21
	22	What: /sys/accessibility/speakup/bleep_time
	23	KernelVersion: 2.6
	24	Contact: speakup@linux-speakup.org
	25	Description: This controls the duration of the PC speaker beeps speakup
	26	produces.
	27	TODO: What are the units? Jiffies?
	28
	29	What: /sys/accessibility/speakup/cursor_time
	30	KernelVersion: 2.6
	31	Contact: speakup@linux-speakup.org
	32	Description: This controls cursor delay when using arrow keys. When a
	33	connection is very slow, with the default setting, when moving
	34	with the arrows, or backspacing etc. speakup says the incorrect
	35	characters. Set this to a higher value to adjust for the delay
	36	and better synchronisation between cursor position and speech.
	37
	38	What: /sys/accessibility/speakup/delimiters
	39	KernelVersion: 2.6
	40	Contact: speakup@linux-speakup.org
	41	Description: Delimit a word from speakup.
	42	TODO: add more info
	43
	44	What: /sys/accessibility/speakup/ex_num
	45	KernelVersion: 2.6
	46	Contact: speakup@linux-speakup.org
	47	Description: TODO:
	48
	49	What: /sys/accessibility/speakup/key_echo
	50	KernelVersion: 2.6
	51	Contact: speakup@linux-speakup.org
	52	Description: Controls if speakup speaks keys when they are typed. One = on,
	53	zero = off or don't echo keys.
	54
	55	What: /sys/accessibility/speakup/keymap
	56	KernelVersion: 2.6
	57	Contact: speakup@linux-speakup.org
	58	Description: Speakup keymap remaps keys to Speakup functions.
	59	It uses a binary
	60	format. A special program called genmap is needed to compile a
	61	textual keymap into the binary format which is then loaded into
	62	/sys/accessibility/speakup/keymap.
	63
	64	What: /sys/accessibility/speakup/no_interrupt
	65	KernelVersion: 2.6
	66	Contact: speakup@linux-speakup.org
	67	Description: Controls if typing interrupts output from speakup. With
	68	no_interrupt set to zero, typing on the keyboard will interrupt
	69	speakup if for example
	70	the say screen command is used before the
	71	entire screen is read.
	72	With no_interrupt set to one, if the say
	73	screen command is used, and one then types on the keyboard,
	74	speakup will continue to say the whole screen regardless until
	75	it finishes.
	76
	77	What: /sys/accessibility/speakup/punc_all
	78	KernelVersion: 2.6
	79	Contact: speakup@linux-speakup.org
	80	Description: This is a list of all the punctuation speakup should speak when
	81	punc_level is set to four.
	82
	83	What: /sys/accessibility/speakup/punc_level
	84	KernelVersion: 2.6
	85	Contact: speakup@linux-speakup.org
	86	Description: Controls the level of punctuation spoken as the screen is
	87	displayed, not reviewed. Levels range from zero no punctuation,
	88	to four, all punctuation. One corresponds to punc_some, two
	89	corresponds to punc_most, and three as well as four both
	90	correspond to punc_all. Some hardware synthesizers may have
	91	different levels each corresponding to three and four for
	92	punc_level. Also note that if punc_level is set to zero, and
	93	key_echo is set to one, typed punctuation is still spoken as it
	94	is typed.
	95
	96	What: /sys/accessibility/speakup/punc_most
	97	KernelVersion: 2.6
	98	Contact: speakup@linux-speakup.org
	99	Description: This is a list of all the punctuation speakup should speak when
	100	punc_level is set to two.
	101
	102	What: /sys/accessibility/speakup/punc_some
	103	KernelVersion: 2.6
	104	Contact: speakup@linux-speakup.org
	105	Description: This is a list of all the punctuation speakup should speak when
	106	punc_level is set to one.
	107
	108	What: /sys/accessibility/speakup/reading_punc
	109	KernelVersion: 2.6
	110	Contact: speakup@linux-speakup.org
	111	Description: Almost the same as punc_level, the differences being that
	112	reading_punc controls the level of punctuation when reviewing
	113	the screen with speakup's screen review commands. The other
	114	difference is that reading_punc set to three speaks punc_all,
	115	and reading_punc set to four speaks all punctuation, including
	116	spaces.
	117
	118	What: /sys/accessibility/speakup/repeats
	119	KernelVersion: 2.6
	120	Contact: speakup@linux-speakup.org
	121	Description: A list of characters speakup repeats. Normally, when there are
	122	more than three characters in a row, speakup
	123	just reads three of
	124	those characters. For example, "......" would be read as dot,
	125	dot, dot. If a . is added to the list of characters in repeats,
	126	"......" would be read as dot, dot, dot, times six.
	127
	128	What: /sys/accessibility/speakup/say_control
	129	KernelVersion: 2.6
	130	Contact: speakup@linux-speakup.org
	131	Description: If set to one, speakup speaks shift, alt and control when those
	132	keys are pressed. If say_control is set to zero, shift, ctrl,
	133	and alt are not spoken when they are pressed.
	134
	135	What: /sys/accessibility/speakup/say_word_ctl
	136	KernelVersion: 2.6
	137	Contact: speakup@linux-speakup.org
	138	Description: TODO:
	139
	140	What: /sys/accessibility/speakup/silent
	141	KernelVersion: 2.6
	142	Contact: speakup@linux-speakup.org
	143	Description: TODO:
	144
	145	What: /sys/accessibility/speakup/spell_delay
	146	KernelVersion: 2.6
	147	Contact: speakup@linux-speakup.org
	148	Description: This controls how fast a word is spelled
	149	when speakup's say word
	150	review command is pressed twice quickly to speak the current
	151	word being reviewed. Zero just speaks the letters one after
	152	another, while values one through four
	153	seem to introduce more of
	154	a pause between the spelling of each letter by speakup.
	155
	156	What: /sys/accessibility/speakup/synth
	157	KernelVersion: 2.6
	158	Contact: speakup@linux-speakup.org
	159	Description: Gets or sets the synthesizer driver currently in use. Reading
	160	synth returns the synthesizer driver currently in use. Writing
	161	synth switches to the given synthesizer driver, provided it is
	162	either built into the kernel, or already loaded as a module.
	163
	164	What: /sys/accessibility/speakup/synth_direct
	165	KernelVersion: 2.6
	166	Contact: speakup@linux-speakup.org
	167	Description: Sends whatever is written to synth_direct
	168	directly to the speech synthesizer in use, bypassing speakup.
	169	This could be used to make the synthesizer speak
	170	a string, or to
	171	send control sequences to the synthesizer to change how the
	172	synthesizer behaves.
	173
	174	What: /sys/accessibility/speakup/version
	175	KernelVersion: 2.6
	176	Contact: speakup@linux-speakup.org
	177	Description: Reading version returns the version of speakup, and the version
	178	of the synthesizer driver currently in use.
	179
	180	What: /sys/accessibility/speakup/i18n/announcements
	181	KernelVersion: 2.6
	182	Contact: speakup@linux-speakup.org
	183	Description: This file contains various general announcements, most of which
	184	cannot be categorized. You will find messages such as "You
	185	killed Speakup", "I'm alive", "leaving help", "parked",
	186	"unparked", and others. You will also find the names of the
	187	screen edges and cursor tracking modes here.
	188
	189	What: /sys/accessibility/speakup/i18n/chartab
	190	KernelVersion: 2.6
	191	Contact: speakup@linux-speakup.org
	192	Description: TODO
	193
	194	What: /sys/accessibility/speakup/i18n/ctl_keys
	195	KernelVersion: 2.6
	196	Contact: speakup@linux-speakup.org
	197	Description: Here, you will find names of control keys. These are used with
	198	Speakup's say_control feature.
	199
	200	What: /sys/accessibility/speakup/i18n/function_names
	201	KernelVersion: 2.6
	202	Contact: speakup@linux-speakup.org
	203	Description: Here, you will find a list of names for Speakup functions.
	204	These are used by the help system. For example, suppose that
	205	you have activated help mode, and you pressed
	206	keypad 3. Speakup
	207	says: "keypad 3 is character, say next."
	208	The message "character, say next" names a Speakup function, and
	209	it comes from this function_names file.
	210
	211	What: /sys/accessibility/speakup/i18n/states
	212	KernelVersion: 2.6
	213	Contact: speakup@linux-speakup.org
	214	Description: This file contains names for key states.
	215	Again, these are part of the help system. For instance, if you
	216	had pressed speakup + keypad 3, you would hear:
	217	"speakup keypad 3 is go to bottom edge."
	218	The speakup key is depressed, so the name of the key state is
	219	speakup.
	220	This part of the message comes from the states collection.
	221
	222	What: /sys/accessibility/speakup/i18n/characters
	223	KernelVersion: 2.6
	224	Contact: speakup@linux-speakup.org
	225	Description: Through this sys entry, Speakup gives you the ability to change
	226	how Speakup pronounces a given character. You could, for
	227	example, change how some punctuation characters are spoken. You
	228	can even change how Speakup will pronounce certain letters. For
	229	further details see '12. Changing the Pronunciation of
	230	Characters' in Speakup User's Guide (file spkguide.txt in
	231	source).
	232
	233	What: /sys/accessibility/speakup/i18n/colors
	234	KernelVersion: 2.6
	235	Contact: speakup@linux-speakup.org
	236	Description: When you use the "say attributes" function, Speakup says the
	237	name of the foreground and background colors. These names come
	238	from the i18n/colors file.
	239
	240	What: /sys/accessibility/speakup/i18n/formatted
	241	KernelVersion: 2.6
	242	Contact: speakup@linux-speakup.org
	243	Description: This group of messages contains embedded formatting codes, to
	244	specify the type and width of displayed data. If you change
	245	these, you must preserve all of the formatting codes, and they
	246	must appear in the order used by the default messages.
	247
	248	What: /sys/accessibility/speakup/i18n/key_names
	249	KernelVersion: 2.6
	250	Contact: speakup@linux-speakup.org
	251	Description: Again, key_names is used by Speakup's help system. In the
	252	previous example, Speakup said that you pressed "keypad 3."
	253	This name came from the key_names file.
	254
	255	What: /sys/accessibility/speakup/<synth-name>/
	256	KernelVersion: 2.6
	257	Contact: speakup@linux-speakup.org
	258	Description: In `/sys/accessibility/speakup` is a directory corresponding to
	259	the synthesizer driver currently in use (E.G) `soft` for the
	260	soft driver. This directory contains files which control the
	261	speech synthesizer itself,
	262	as opposed to controlling the speakup
	263	screen reader. The parameters in this directory have the same
	264	names and functions across all
	265	supported synthesizers. The range
	266	of values for freq, pitch, rate, and vol is the same for all
	267	supported synthesizers, with the given range being internally
	268	mapped by the driver to more or less fit the range of values
	269	supported for a given parameter by the individual synthesizer.
	270	Below is a description of values and parameters for soft
	271	synthesizer, which is currently the most commonly used.
	272
	273	What: /sys/accessibility/speakup/soft/caps_start
	274	KernelVersion: 2.6
	275	Contact: speakup@linux-speakup.org
	276	Description: This is the string that is sent to the synthesizer to cause it
	277	to start speaking uppercase letters. For the soft synthesizer
	278	and most others, this causes the pitch of the voice to rise
	279	above the currently set pitch.
	280
	281	What: /sys/accessibility/speakup/soft/caps_stop
	282	KernelVersion: 2.6
	283	Contact: speakup@linux-speakup.org
	284	Description: This is the string sent to the synthesizer to cause it to stop
	285	speaking uppercase letters. In the case of the soft synthesizer
	286	and most others, this returns the pitch of the voice
	287	down to the
	288	currently set pitch.
	289
	290	What: /sys/accessibility/speakup/soft/delay_time
	291	KernelVersion: 2.6
	292	Contact: speakup@linux-speakup.org
	293	Description: TODO:
	294
	295	What: /sys/accessibility/speakup/soft/direct
	296	KernelVersion: 2.6
	297	Contact: speakup@linux-speakup.org
	298	Description: Controls if punctuation is spoken by speakup, or by the
	299	synthesizer.
	300	For example, speakup speaks ">" as "greater", while
	301	the espeak synthesizer used by the soft driver speaks "greater
	302	than". Zero lets speakup speak the punctuation. One lets the
	303	synthesizer itself speak punctuation.
	304
	305	What: /sys/accessibility/speakup/soft/freq
	306	KernelVersion: 2.6
	307	Contact: speakup@linux-speakup.org
	308	Description: Gets or sets the frequency of the speech synthesizer. Range is
	309	0-9.
	310
	311	What: /sys/accessibility/speakup/soft/full_time
	312	KernelVersion: 2.6
	313	Contact: speakup@linux-speakup.org
	314	Description: TODO:
	315
	316	What: /sys/accessibility/speakup/soft/jiffy_delta
	317	KernelVersion: 2.6
	318	Contact: speakup@linux-speakup.org
	319	Description: This controls how many jiffys the kernel gives to the
	320	synthesizer. Setting this too high can make a system unstable,
	321	or even crash it.
	322
	323	What: /sys/accessibility/speakup/soft/pitch
	324	KernelVersion: 2.6
	325	Contact: speakup@linux-speakup.org
	326	Description: Gets or sets the pitch of the synthesizer. The range is 0-9.
	327
	328	What: /sys/accessibility/speakup/soft/punct
	329	KernelVersion: 2.6
	330	Contact: speakup@linux-speakup.org
	331	Description: Gets or sets the amount of punctuation spoken by the
	332	synthesizer. The range for the soft driver seems to be 0-2.
	333	TODO: How is this related to speakup's punc_level, or
	334	reading_punc.
	335
	336	What: /sys/accessibility/speakup/soft/rate
	337	KernelVersion: 2.6
	338	Contact: speakup@linux-speakup.org
	339	Description: Gets or sets the rate of the synthesizer. Range is from zero
	340	slowest, to nine fastest.
	341
	342	What: /sys/accessibility/speakup/soft/tone
	343	KernelVersion: 2.6
	344	Contact: speakup@linux-speakup.org
	345	Description: Gets or sets the tone of the speech synthesizer. The range for
	346	the soft driver seems to be 0-2. This seems to make no
	347	difference if using espeak and the espeakup connector.
	348	TODO: does espeakup support different tonalities?
	349
	350	What: /sys/accessibility/speakup/soft/trigger_time
	351	KernelVersion: 2.6
	352	Contact: speakup@linux-speakup.org
	353	Description: TODO:
	354
	355	What: /sys/accessibility/speakup/soft/voice
	356	KernelVersion: 2.6
	357	Contact: speakup@linux-speakup.org
	358	Description: Gets or sets the voice used by the synthesizer if the
	359	synthesizer can speak in more than one voice. The range for the
	360	soft driver is 0-7. Note that while espeak supports multiple
	361	voices, this parameter will not set the voice when the espeakup
	362	connector is used between speakup and espeak.
	363
	364	What: /sys/accessibility/speakup/soft/vol
	365	KernelVersion: 2.6
	366	Contact: speakup@linux-speakup.org
	367	Description: Gets or sets the volume of the speech synthesizer. Range is 0-9,
	368	with zero being the softest, and nine being the loudest.
	369

drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c+2−2

drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c+1−0

@@ -289,6 +289,7 @@ int bcm2835_audio_stop(struct bcm2835_alsa_stream *alsa_stream) · 288 unmodified lines
289	VC_AUDIO_MSG_TYPE_STOP, false);	289	VC_AUDIO_MSG_TYPE_STOP, false);
290	}	290	}
291		291
		292	/* FIXME: this doesn't seem working as expected for "draining" */
292	int bcm2835_audio_drain(struct bcm2835_alsa_stream *alsa_stream)	293	int bcm2835_audio_drain(struct bcm2835_alsa_stream *alsa_stream)
293	{	294	{
294	struct vc_audio_msg m = {	295	struct vc_audio_msg m = {

drivers/staging/vt6655/device_main.c+3−1

@@ -1748,8 +1748,10 @@ vt6655_probe(struct pci_dev pcid, const struct pci_device_id ent) · 1747 unmodified lines
1748		1748
1749	priv->hw->max_signal = 100;	1749	priv->hw->max_signal = 100;
1750		1750
1751	if (vnt_init(priv))	1751	if (vnt_init(priv)) {
		1752	device_free_info(priv);
1752	return -ENODEV;	1753	return -ENODEV;
		1754	}
1753		1755
1754	device_print_info(priv);	1756	device_print_info(priv);
1755	pci_set_drvdata(pcid, priv);	1757	pci_set_drvdata(pcid, priv);

drivers/tty/n_hdlc.c+5−0

 }	/* end of init_module() */
+#ifdef CONFIG_SPARC
+#undef __exitdata
+#define __exitdata
+#endif
 static const char hdlc_unregister_ok[] __exitdata =
 	KERN_INFO "N_HDLC: line discipline unregistered\n";
 static const char hdlc_unregister_fail[] __exitdata =

drivers/tty/serial/8250/8250_omap.c+3−2

 	serial8250_do_set_mctrl(port, mctrl);
-	if (!up->gpios) {
+	if (!mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_RTS)) {
 		/*
 		 * Turn off autoRTS if RTS is lowered and restore autoRTS
 		 * setting if RTS is raised
 	up->port.status &= ~(UPSTAT_AUTOCTS | UPSTAT_AUTORTS | UPSTAT_AUTOXOFF);
 	if (termios->c_cflag & CRTSCTS && up->port.flags & UPF_HARD_FLOW &&
-	    !up->gpios) {
+	    !mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_RTS) &&
+	    !mctrl_gpio_to_gpiod(up->gpios, UART_GPIO_CTS)) {
 		/* Enable AUTOCTS (autoRTS is enabled when RTS is raised) */
 		up->port.status |= UPSTAT_AUTOCTS | UPSTAT_AUTORTS;
 		priv->efr |= UART_EFR_CTS;

drivers/tty/serial/Kconfig+1−0

@@ -1032,6 +1032,7 @@ config SERIAL_SIFIVE_CONSOLE · 1031 unmodified lines
1032	bool "Console on SiFive UART"	1032	bool "Console on SiFive UART"
1033	depends on SERIAL_SIFIVE=y	1033	depends on SERIAL_SIFIVE=y
1034	select SERIAL_CORE_CONSOLE	1034	select SERIAL_CORE_CONSOLE
		1035	select SERIAL_EARLYCON
1035	help	1036	help
1036	Select this option if you would like to use a SiFive UART as the	1037	Select this option if you would like to use a SiFive UART as the
1037	system console.	1038	system console.

drivers/tty/serial/fsl_linflexuart.c+14−7

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	* Freescale linflexuart serial port driver	3	* Freescale linflexuart serial port driver
4	*	4	*
5	* Copyright 2012-2016 Freescale Semiconductor, Inc.	5	* Copyright 2012-2016 Freescale Semiconductor, Inc.
6	* Copyright 2017-2018 NXP	6	* Copyright 2017-2019 NXP
7	*/	7	*/
8		8
9	#if defined(CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE) && \	9	#if defined(CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE) && \
@@ -246,12 +246,14 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id) · 236 unmodified lines
246	struct tty_port *port = &sport->state->port;	246	struct tty_port *port = &sport->state->port;
247	unsigned long flags, status;	247	unsigned long flags, status;
248	unsigned char rx;	248	unsigned char rx;
		249	bool brk;
249		250
250	spin_lock_irqsave(&sport->lock, flags);	251	spin_lock_irqsave(&sport->lock, flags);
251		252
252	status = readl(sport->membase + UARTSR);	253	status = readl(sport->membase + UARTSR);
253	while (status & LINFLEXD_UARTSR_RMB) {	254	while (status & LINFLEXD_UARTSR_RMB) {
254	rx = readb(sport->membase + BDRM);	255	rx = readb(sport->membase + BDRM);
		256	brk = false;
255	flg = TTY_NORMAL;	257	flg = TTY_NORMAL;
256	sport->icount.rx++;	258	sport->icount.rx++;
257		259
@@ -261,8 +263,11 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id) · 3 unmodified lines
261	status \|= LINFLEXD_UARTSR_SZF;	263	status \|= LINFLEXD_UARTSR_SZF;
262	if (status & LINFLEXD_UARTSR_BOF)	264	if (status & LINFLEXD_UARTSR_BOF)
263	status \|= LINFLEXD_UARTSR_BOF;	265	status \|= LINFLEXD_UARTSR_BOF;
264	if (status & LINFLEXD_UARTSR_FEF)	266	if (status & LINFLEXD_UARTSR_FEF) {
		267	if (!rx)
		268	brk = true;
265	status \|= LINFLEXD_UARTSR_FEF;	269	status \|= LINFLEXD_UARTSR_FEF;
		270	}
266	if (status & LINFLEXD_UARTSR_PE)	271	if (status & LINFLEXD_UARTSR_PE)
267	status \|= LINFLEXD_UARTSR_PE;	272	status \|= LINFLEXD_UARTSR_PE;
268	}	273	}
@@ -271,13 +276,15 @@ static irqreturn_t linflex_rxint(int irq, void *dev_id) · 2 unmodified lines
271	sport->membase + UARTSR);	276	sport->membase + UARTSR);
272	status = readl(sport->membase + UARTSR);	277	status = readl(sport->membase + UARTSR);
273		278
274	if (uart_handle_sysrq_char(sport, (unsigned char)rx))	279	if (brk) {
275	continue;	280	uart_handle_break(sport);
276		281	} else {
277	#ifdef SUPPORT_SYSRQ	282	#ifdef SUPPORT_SYSRQ
278	sport->sysrq = 0;	283	if (uart_handle_sysrq_char(sport, (unsigned char)rx))
		284	continue;
279	#endif	285	#endif
280	tty_insert_flip_char(port, rx, flg);	286	tty_insert_flip_char(port, rx, flg);
		287	}
281	}	288	}
282		289
283	spin_unlock_irqrestore(&sport->lock, flags);	290	spin_unlock_irqrestore(&sport->lock, flags);

drivers/tty/serial/fsl_lpuart.c+1−1

@@ -548,7 +548,7 @@ static void lpuart_flush_buffer(struct uart_port *port) · 547 unmodified lines
548	val \|= UARTFIFO_TXFLUSH \| UARTFIFO_RXFLUSH;	548	val \|= UARTFIFO_TXFLUSH \| UARTFIFO_RXFLUSH;
549	lpuart32_write(&sport->port, val, UARTFIFO);	549	lpuart32_write(&sport->port, val, UARTFIFO);
550	} else {	550	} else {
551	val = readb(sport->port.membase + UARTPFIFO);	551	val = readb(sport->port.membase + UARTCFIFO);
552	val \|= UARTCFIFO_TXFLUSH \| UARTCFIFO_RXFLUSH;	552	val \|= UARTCFIFO_TXFLUSH \| UARTCFIFO_RXFLUSH;
553	writeb(val, sport->port.membase + UARTCFIFO);	553	writeb(val, sport->port.membase + UARTCFIFO);
554	}	554	}

drivers/tty/serial/imx.c+2−2

@@ -2222,8 +2222,8 @@ static int imx_uart_probe(struct platform_device *pdev) · 2221 unmodified lines
2222	return PTR_ERR(base);	2222	return PTR_ERR(base);
2223		2223
2224	rxirq = platform_get_irq(pdev, 0);	2224	rxirq = platform_get_irq(pdev, 0);
2225	txirq = platform_get_irq(pdev, 1);	2225	txirq = platform_get_irq_optional(pdev, 1);
2226	rtsirq = platform_get_irq(pdev, 2);	2226	rtsirq = platform_get_irq_optional(pdev, 2);
2227		2227
2228	sport->port.dev = &pdev->dev;	2228	sport->port.dev = &pdev->dev;
2229	sport->port.mapbase = res->start;	2229	sport->port.mapbase = res->start;

drivers/tty/serial/owl-uart.c+1−1

@@ -740,7 +740,7 @@ static int __init owl_uart_init(void) · 739 unmodified lines
740	return ret;	740	return ret;
741	}	741	}
742		742
743	static void __init owl_uart_exit(void)	743	static void __exit owl_uart_exit(void)
744	{	744	{
745	platform_driver_unregister(&owl_uart_platform_driver);	745	platform_driver_unregister(&owl_uart_platform_driver);
746	uart_unregister_driver(&owl_uart_driver);	746	uart_unregister_driver(&owl_uart_driver);

drivers/tty/serial/rda-uart.c+1−1

@@ -815,7 +815,7 @@ static int __init rda_uart_init(void) · 814 unmodified lines
815	return ret;	815	return ret;
816	}	816	}
817		817
818	static void __init rda_uart_exit(void)	818	static void __exit rda_uart_exit(void)
819	{	819	{
820	platform_driver_unregister(&rda_uart_platform_driver);	820	platform_driver_unregister(&rda_uart_platform_driver);
821	uart_unregister_driver(&rda_uart_driver);	821	uart_unregister_driver(&rda_uart_driver);

drivers/tty/serial/serial_core.c+2−0

  *	   console=<name>,io|mmio|mmio16|mmio32|mmio32be|mmio32native,<addr>,<options>
  *
  *	The optional form
+ *
  *	   earlycon=<name>,0x<addr>,<options>
  *	   console=<name>,0x<addr>,<options>
+ *
  *	is also accepted; the returned @iotype will be UPIO_MEM.
  *
  *	Returns 0 on success or -EINVAL on failure

drivers/tty/serial/serial_mctrl_gpio.c+3−0

 struct gpio_desc *mctrl_gpio_to_gpiod(struct mctrl_gpios *gpios,
 				      enum mctrl_gpio_idx gidx)
 {
+	if (gpios == NULL)
+		return NULL;
 	return gpios->gpio[gidx];
 }
 EXPORT_SYMBOL_GPL(mctrl_gpio_to_gpiod);

drivers/tty/serial/sh-sci.c+6−2

 	port->mapbase = res->start;
 	sci_port->reg_size = resource_size(res);
-	for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i)
+	for (i = 0; i < ARRAY_SIZE(sci_port->irqs); ++i) {
-		sci_port->irqs[i] = platform_get_irq(dev, i);
+		if (i)
+			sci_port->irqs[i] = platform_get_irq_optional(dev, i);
+		else
+			sci_port->irqs[i] = platform_get_irq(dev, i);
+	}
 	/* The SCI generates several interrupts. They can be muxed together or
 	 * connected to different interrupt lines. In the muxed case only one

drivers/tty/serial/uartlite.c+2−1

@@ -897,7 +897,8 @@ static int __init ulite_init(void) · 896 unmodified lines
897	static void __exit ulite_exit(void)	897	static void __exit ulite_exit(void)
898	{	898	{
899	platform_driver_unregister(&ulite_platform_driver);	899	platform_driver_unregister(&ulite_platform_driver);
900	uart_unregister_driver(&ulite_uart_driver);	900	if (ulite_uart_driver.state)
		901	uart_unregister_driver(&ulite_uart_driver);
901	}	902	}
902		903
903	module_init(ulite_init);	904	module_init(ulite_init);

drivers/tty/serial/xilinx_uartps.c+7−1

 		goto err_out_id;
 	}
-	uartps_major = cdns_uart_uart_driver->tty_driver->major;
 	cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver;
 	/*
 		console_port = NULL;
 #endif
+	uartps_major = cdns_uart_uart_driver->tty_driver->major;
 	cdns_uart_data->cts_override = of_property_read_bool(pdev->dev.of_node,
 							     "cts-override");
 	return 0;
 		console_port = NULL;
 #endif
+	/* If this is last instance major number should be initialized */
+	mutex_lock(&bitmap_lock);
+	if (bitmap_empty(bitmap, MAX_UART_INSTANCES))
+		uartps_major = 0;
+	mutex_unlock(&bitmap_lock);
 	uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
 	return rc;
 }

drivers/usb/cdns3/cdns3-pci-wrap.c+2−1

 		wrap->plat_dev = platform_device_register_full(&plat_info);
 		if (IS_ERR(wrap->plat_dev)) {
 			pci_disable_device(pdev);
+			err = PTR_ERR(wrap->plat_dev);
 			kfree(wrap);
-			return PTR_ERR(wrap->plat_dev);
+			return err;
 		}
 	}

drivers/usb/cdns3/core.c+19−1

@@ -160,10 +160,28 @@ static int cdns3_core_init_role(struct cdns3 *cdns) · 159 unmodified lines
160	if (ret)	160	if (ret)
161	goto err;	161	goto err;
162		162
163	if (cdns->dr_mode != USB_DR_MODE_OTG) {	163	/* Initialize idle role to start with */
		164	ret = cdns3_role_start(cdns, USB_ROLE_NONE);
		165	if (ret)
		166	goto err;
		167
		168	switch (cdns->dr_mode) {
		169	case USB_DR_MODE_UNKNOWN:
		170	case USB_DR_MODE_OTG:
164	ret = cdns3_hw_role_switch(cdns);	171	ret = cdns3_hw_role_switch(cdns);
165	if (ret)	172	if (ret)
166	goto err;	173	goto err;
		174	break;
		175	case USB_DR_MODE_PERIPHERAL:
		176	ret = cdns3_role_start(cdns, USB_ROLE_DEVICE);
		177	if (ret)
		178	goto err;
		179	break;
		180	case USB_DR_MODE_HOST:
		181	ret = cdns3_role_start(cdns, USB_ROLE_HOST);
		182	if (ret)
		183	goto err;
		184	break;
167	}	185	}
168		186
169	return ret;	187	return ret;

drivers/usb/cdns3/ep0.c+9−3

 static int cdns3_req_ep0_get_status(struct cdns3_device *priv_dev,
 				    struct usb_ctrlrequest *ctrl)
 {
+	struct cdns3_endpoint *priv_ep;
 	__le16 *response_pkt;
 	u16 usb_status = 0;
 	u32 recip;
+	u8 index;
 	recip = ctrl->bRequestType & USB_RECIP_MASK;
 	case USB_RECIP_INTERFACE:
 		return cdns3_ep0_delegate_req(priv_dev, ctrl);
 	case USB_RECIP_ENDPOINT:
-		/* check if endpoint is stalled */
+		index = cdns3_ep_addr_to_index(ctrl->wIndex);
+		priv_ep = priv_dev->eps[index];
+		/* check if endpoint is stalled or stall is pending */
 		cdns3_select_ep(priv_dev, ctrl->wIndex);
-		if (EP_STS_STALL(readl(&priv_dev->regs->ep_sts)))
+		if (EP_STS_STALL(readl(&priv_dev->regs->ep_sts)) ||
+		    (priv_ep->flags & EP_STALL_PENDING))
 			usb_status =  BIT(USB_ENDPOINT_HALT);
 		break;
 	default:
 			 * for sending status stage.
 			 * This time should be less then 3ms.
 			 */
-			usleep_range(1000, 2000);
+			mdelay(1);
 			cdns3_set_register_bit(&priv_dev->regs->usb_cmd,
 					       USB_CMD_STMODE |
 					       USB_STS_TMODE_SEL(tmode - 1));

drivers/usb/cdns3/gadget.c+8−0

 	switch (max_speed) {
 	case USB_SPEED_FULL:
 		writel(USB_CONF_SFORCE_FS, &priv_dev->regs->usb_conf);
+		writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);
 		break;
 	case USB_SPEED_HIGH:
 		writel(USB_CONF_USB3DIS, &priv_dev->regs->usb_conf);
 {
 	int ret = 0;
+	/* Ensure 32-bit DMA Mask in case we switched back from Host mode */
+	ret = dma_set_mask_and_coherent(cdns->dev, DMA_BIT_MASK(32));
+	if (ret) {
+		dev_err(cdns->dev, "Failed to set dma mask: %d\n", ret);
+		return ret;
+	}
 	cdns3_drd_switch_gadget(cdns, 1);
 	pm_runtime_get_sync(cdns->dev);

drivers/usb/class/usblp.c+5−3

@@ -461,10 +461,12 @@ static int usblp_release(struct inode inode, struct file file) · 460 unmodified lines
461		461
462	mutex_lock(&usblp_mutex);	462	mutex_lock(&usblp_mutex);
463	usblp->used = 0;	463	usblp->used = 0;
464	if (usblp->present) {	464	if (usblp->present)
465	usblp_unlink_urbs(usblp);	465	usblp_unlink_urbs(usblp);
466	usb_autopm_put_interface(usblp->intf);	466
467	} else /* finish cleanup from disconnect */	467	usb_autopm_put_interface(usblp->intf);
		468
		469	if (!usblp->present) /* finish cleanup from disconnect */
468	usblp_cleanup(usblp);	470	usblp_cleanup(usblp);
469	mutex_unlock(&usblp_mutex);	471	mutex_unlock(&usblp_mutex);
470	return 0;	472	return 0;

drivers/usb/dwc3/drd.c+2−5

 	struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
 	int irq;
-	irq = platform_get_irq_byname(dwc3_pdev, "otg");
+	irq = platform_get_irq_byname_optional(dwc3_pdev, "otg");
 	if (irq > 0)
 		goto out;
 	if (irq == -EPROBE_DEFER)
 		goto out;
-	irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
+	irq = platform_get_irq_byname_optional(dwc3_pdev, "dwc_usb3");
 	if (irq > 0)
 		goto out;
 	if (irq > 0)
 		goto out;
-	if (irq != -EPROBE_DEFER)
-		dev_err(dwc->dev, "missing OTG IRQ\n");
 	if (!irq)
 		irq = -EINVAL;

drivers/usb/dwc3/gadget.c+2−5

 	struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
 	int irq;
-	irq = platform_get_irq_byname(dwc3_pdev, "peripheral");
+	irq = platform_get_irq_byname_optional(dwc3_pdev, "peripheral");
 	if (irq > 0)
 		goto out;
 	if (irq == -EPROBE_DEFER)
 		goto out;
-	irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
+	irq = platform_get_irq_byname_optional(dwc3_pdev, "dwc_usb3");
 	if (irq > 0)
 		goto out;
 	if (irq > 0)
 		goto out;
-	if (irq != -EPROBE_DEFER)
-		dev_err(dwc->dev, "missing peripheral IRQ\n");
 	if (!irq)
 		irq = -EINVAL;

drivers/usb/dwc3/host.c+2−5

 	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
 	int irq;
-	irq = platform_get_irq_byname(dwc3_pdev, "host");
+	irq = platform_get_irq_byname_optional(dwc3_pdev, "host");
 	if (irq > 0)
 		goto out;
 	if (irq == -EPROBE_DEFER)
 		goto out;
-	irq = platform_get_irq_byname(dwc3_pdev, "dwc_usb3");
+	irq = platform_get_irq_byname_optional(dwc3_pdev, "dwc_usb3");
 	if (irq > 0)
 		goto out;
 	if (irq > 0)
 		goto out;
-	if (irq != -EPROBE_DEFER)
-		dev_err(dwc->dev, "missing host IRQ\n");
 	if (!irq)
 		irq = -EINVAL;

drivers/usb/gadget/udc/Kconfig+1−1

@@ -45,7 +45,7 @@ config USB_AT91 · 44 unmodified lines
45		45
46	config USB_LPC32XX	46	config USB_LPC32XX
47	tristate "LPC32XX USB Peripheral Controller"	47	tristate "LPC32XX USB Peripheral Controller"
48	depends on ARCH_LPC32XX	48	depends on ARCH_LPC32XX \|\| COMPILE_TEST
49	depends on I2C	49	depends on I2C
50	select USB_ISP1301	50	select USB_ISP1301
51	help	51	help

drivers/usb/gadget/udc/dummy_hcd.c+2−1

 #define DRIVER_VERSION	"02 May 2005"
 #define POWER_BUDGET	500	/* in mA; use 8 for low-power port testing */
+#define POWER_BUDGET_3	900	/* in mA */
 static const char	driver_name[] = "dummy_hcd";
 static const char	driver_desc[] = "USB Host+Gadget Emulator";
 	dum_hcd->rh_state = DUMMY_RH_RUNNING;
 	dum_hcd->stream_en_ep = 0;
 	INIT_LIST_HEAD(&dum_hcd->urbp_list);
-	dummy_hcd_to_hcd(dum_hcd)->power_budget = POWER_BUDGET;
+	dummy_hcd_to_hcd(dum_hcd)->power_budget = POWER_BUDGET_3;
 	dummy_hcd_to_hcd(dum_hcd)->state = HC_STATE_RUNNING;
 	dummy_hcd_to_hcd(dum_hcd)->uses_new_polling = 1;
 #ifdef CONFIG_USB_OTG

drivers/usb/gadget/udc/lpc32xx_udc.c+2−2

@@ -1151,7 +1151,7 @@ static void udc_pop_fifo(struct lpc32xx_udc udc, u8 data, u32 bytes) · 1150 unmodified lines
1151	u32 *p32, tmp, cbytes;	1151	u32 *p32, tmp, cbytes;
1152		1152
1153	/* Use optimal data transfer method based on source address and size */	1153	/* Use optimal data transfer method based on source address and size */
1154	switch (((u32) data) & 0x3) {	1154	switch (((uintptr_t) data) & 0x3) {
1155	case 0: /* 32-bit aligned */	1155	case 0: /* 32-bit aligned */
1156	p32 = (u32 *) data;	1156	p32 = (u32 *) data;
1157	cbytes = (bytes & ~0x3);	1157	cbytes = (bytes & ~0x3);
@@ -1252,7 +1252,7 @@ static void udc_stuff_fifo(struct lpc32xx_udc udc, u8 data, u32 bytes) · 94 unmodified lines
1252	u32 *p32, tmp, cbytes;	1252	u32 *p32, tmp, cbytes;
1253		1253
1254	/* Use optimal data transfer method based on source address and size */	1254	/* Use optimal data transfer method based on source address and size */
1255	switch (((u32) data) & 0x3) {	1255	switch (((uintptr_t) data) & 0x3) {
1256	case 0: /* 32-bit aligned */	1256	case 0: /* 32-bit aligned */
1257	p32 = (u32 *) data;	1257	p32 = (u32 *) data;
1258	cbytes = (bytes & ~0x3);	1258	cbytes = (bytes & ~0x3);

drivers/usb/host/xhci-ext-caps.c+1−0

@@ -57,6 +57,7 @@ static int xhci_create_intel_xhci_sw_pdev(struct xhci_hcd *xhci, u32 cap_offset) · 56 unmodified lines
57	ret = platform_device_add_properties(pdev, role_switch_props);	57	ret = platform_device_add_properties(pdev, role_switch_props);
58	if (ret) {	58	if (ret) {
59	dev_err(dev, "failed to register device properties\n");	59	dev_err(dev, "failed to register device properties\n");
		60	platform_device_put(pdev);
60	return ret;	61	return ret;
61	}	62	}
62	}	63	}

drivers/usb/host/xhci-ring.c+2−2

@@ -3202,10 +3202,10 @@ static int xhci_align_td(struct xhci_hcd xhci, struct urb urb, u32 enqd_len, · 3201 unmodified lines
3202	if (usb_urb_dir_out(urb)) {	3202	if (usb_urb_dir_out(urb)) {
3203	len = sg_pcopy_to_buffer(urb->sg, urb->num_sgs,	3203	len = sg_pcopy_to_buffer(urb->sg, urb->num_sgs,
3204	seg->bounce_buf, new_buff_len, enqd_len);	3204	seg->bounce_buf, new_buff_len, enqd_len);
3205	if (len != seg->bounce_len)	3205	if (len != new_buff_len)
3206	xhci_warn(xhci,	3206	xhci_warn(xhci,
3207	"WARN Wrong bounce buffer write length: %zu != %d\n",	3207	"WARN Wrong bounce buffer write length: %zu != %d\n",
3208	len, seg->bounce_len);	3208	len, new_buff_len);
3209	seg->bounce_dma = dma_map_single(dev, seg->bounce_buf,	3209	seg->bounce_dma = dma_map_single(dev, seg->bounce_buf,
3210	max_pkt, DMA_TO_DEVICE);	3210	max_pkt, DMA_TO_DEVICE);
3211	} else {	3211	} else {

drivers/usb/host/xhci.c+63−15

@@ -1032,7 +1032,7 @@ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup) · 1031 unmodified lines
1032	writel(command, &xhci->op_regs->command);	1032	writel(command, &xhci->op_regs->command);
1033	xhci->broken_suspend = 0;	1033	xhci->broken_suspend = 0;
1034	if (xhci_handshake(&xhci->op_regs->status,	1034	if (xhci_handshake(&xhci->op_regs->status,
1035	STS_SAVE, 0, 10 * 1000)) {	1035	STS_SAVE, 0, 20 * 1000)) {
1036	/*	1036	/*
1037	* AMD SNPS xHC 3.0 occasionally does not clear the	1037	* AMD SNPS xHC 3.0 occasionally does not clear the
1038	* SSS bit of USBSTS and when driver tries to poll	1038	* SSS bit of USBSTS and when driver tries to poll
@@ -1108,6 +1108,18 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) · 69 unmodified lines
1108	hibernated = true;	1108	hibernated = true;
1109		1109
1110	if (!hibernated) {	1110	if (!hibernated) {
		1111	/*
		1112	* Some controllers might lose power during suspend, so wait
		1113	* for controller not ready bit to clear, just as in xHC init.
		1114	*/
		1115	retval = xhci_handshake(&xhci->op_regs->status,
		1116	STS_CNR, 0, 10 * 1000 * 1000);
		1117	if (retval) {
		1118	xhci_warn(xhci, "Controller not ready at resume %d\n",
		1119	retval);
		1120	spin_unlock_irq(&xhci->lock);
		1121	return retval;
		1122	}
1111	/* step 1: restore register */	1123	/* step 1: restore register */
1112	xhci_restore_registers(xhci);	1124	xhci_restore_registers(xhci);
1113	/* step 2: initialize command ring buffer */	1125	/* step 2: initialize command ring buffer */
@@ -3083,6 +3095,7 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd, · 1969 unmodified lines
3083	unsigned int ep_index;	3095	unsigned int ep_index;
3084	unsigned long flags;	3096	unsigned long flags;
3085	u32 ep_flag;	3097	u32 ep_flag;
		3098	int err;
3086		3099
3087	xhci = hcd_to_xhci(hcd);	3100	xhci = hcd_to_xhci(hcd);
3088	if (!host_ep->hcpriv)	3101	if (!host_ep->hcpriv)
@@ -3142,7 +3155,17 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd, · 53 unmodified lines
3142	xhci_free_command(xhci, cfg_cmd);	3155	xhci_free_command(xhci, cfg_cmd);
3143	goto cleanup;	3156	goto cleanup;
3144	}	3157	}
3145	xhci_queue_stop_endpoint(xhci, stop_cmd, udev->slot_id, ep_index, 0);	3158
		3159	err = xhci_queue_stop_endpoint(xhci, stop_cmd, udev->slot_id,
		3160	ep_index, 0);
		3161	if (err < 0) {
		3162	spin_unlock_irqrestore(&xhci->lock, flags);
		3163	xhci_free_command(xhci, cfg_cmd);
		3164	xhci_dbg(xhci, "%s: Failed to queue stop ep command, %d ",
		3165	__func__, err);
		3166	goto cleanup;
		3167	}
		3168
3146	xhci_ring_cmd_db(xhci);	3169	xhci_ring_cmd_db(xhci);
3147	spin_unlock_irqrestore(&xhci->lock, flags);	3170	spin_unlock_irqrestore(&xhci->lock, flags);
3148		3171
@@ -3156,8 +3179,16 @@ static void xhci_endpoint_reset(struct usb_hcd *hcd, · 7 unmodified lines
3156	ctrl_ctx, ep_flag, ep_flag);	3179	ctrl_ctx, ep_flag, ep_flag);
3157	xhci_endpoint_copy(xhci, cfg_cmd->in_ctx, vdev->out_ctx, ep_index);	3180	xhci_endpoint_copy(xhci, cfg_cmd->in_ctx, vdev->out_ctx, ep_index);
3158		3181
3159	xhci_queue_configure_endpoint(xhci, cfg_cmd, cfg_cmd->in_ctx->dma,	3182	err = xhci_queue_configure_endpoint(xhci, cfg_cmd, cfg_cmd->in_ctx->dma,
3160	udev->slot_id, false);	3183	udev->slot_id, false);
		3184	if (err < 0) {
		3185	spin_unlock_irqrestore(&xhci->lock, flags);
		3186	xhci_free_command(xhci, cfg_cmd);
		3187	xhci_dbg(xhci, "%s: Failed to queue config ep command, %d ",
		3188	__func__, err);
		3189	goto cleanup;
		3190	}
		3191
3161	xhci_ring_cmd_db(xhci);	3192	xhci_ring_cmd_db(xhci);
3162	spin_unlock_irqrestore(&xhci->lock, flags);	3193	spin_unlock_irqrestore(&xhci->lock, flags);
3163		3194
@@ -4674,12 +4705,12 @@ static int xhci_update_timeout_for_endpoint(struct xhci_hcd *xhci, · 1510 unmodified lines
4674	alt_timeout = xhci_call_host_update_timeout_for_endpoint(xhci, udev,	4705	alt_timeout = xhci_call_host_update_timeout_for_endpoint(xhci, udev,
4675	desc, state, timeout);	4706	desc, state, timeout);
4676		4707
4677	/* If we found we can't enable hub-initiated LPM, or	4708	/* If we found we can't enable hub-initiated LPM, and
4678	* the U1 or U2 exit latency was too high to allow	4709	* the U1 or U2 exit latency was too high to allow
4679	* device-initiated LPM as well, just stop searching.	4710	* device-initiated LPM as well, then we will disable LPM
		4711	* for this device, so stop searching any further.
4680	*/	4712	*/
4681	if (alt_timeout == USB3_LPM_DISABLED \|\|	4713	if (alt_timeout == USB3_LPM_DISABLED) {
4682	alt_timeout == USB3_LPM_DEVICE_INITIATED) {
4683	*timeout = alt_timeout;	4714	*timeout = alt_timeout;
4684	return -E2BIG;	4715	return -E2BIG;
4685	}	4716	}
@@ -4790,10 +4821,12 @@ static u16 xhci_calculate_lpm_timeout(struct usb_hcd *hcd, · 104 unmodified lines
4790	if (intf->dev.driver) {	4821	if (intf->dev.driver) {
4791	driver = to_usb_driver(intf->dev.driver);	4822	driver = to_usb_driver(intf->dev.driver);
4792	if (driver && driver->disable_hub_initiated_lpm) {	4823	if (driver && driver->disable_hub_initiated_lpm) {
4793	dev_dbg(&udev->dev, "Hub-initiated %s disabled "	4824	dev_dbg(&udev->dev, "Hub-initiated %s disabled at request of driver %s\n",
4794	"at request of driver %s\n",	4825	state_name, driver->name);
4795	state_name, driver->name);	4826	timeout = xhci_get_timeout_no_hub_lpm(udev,
4796	return xhci_get_timeout_no_hub_lpm(udev, state);	4827	state);
		4828	if (timeout == USB3_LPM_DISABLED)
		4829	return timeout;
4797	}	4830	}
4798	}	4831	}
4799		4832
@@ -5077,11 +5110,18 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) · 277 unmodified lines
5077	hcd->has_tt = 1;	5110	hcd->has_tt = 1;
5078	} else {	5111	} else {
5079	/*	5112	/*
5080	* Some 3.1 hosts return sbrn 0x30, use xhci supported protocol	5113	* Early xHCI 1.1 spec did not mention USB 3.1 capable hosts
5081	* minor revision instead of sbrn. Minor revision is a two digit	5114	* should return 0x31 for sbrn, or that the minor revision
5082	* BCD containing minor and sub-minor numbers, only show minor.	5115	* is a two digit BCD containig minor and sub-minor numbers.
		5116	* This was later clarified in xHCI 1.2.
		5117	*
		5118	* Some USB 3.1 capable hosts therefore have sbrn 0x30, and
		5119	* minor revision set to 0x1 instead of 0x10.
5083	*/	5120	*/
5084	minor_rev = xhci->usb3_rhub.min_rev / 0x10;	5121	if (xhci->usb3_rhub.min_rev == 0x1)
		5122	minor_rev = 1;
		5123	else
		5124	minor_rev = xhci->usb3_rhub.min_rev / 0x10;
5085		5125
5086	switch (minor_rev) {	5126	switch (minor_rev) {
5087	case 2:	5127	case 2:
@@ -5198,8 +5238,16 @@ static void xhci_clear_tt_buffer_complete(struct usb_hcd *hcd, · 110 unmodified lines
5198	unsigned int ep_index;	5238	unsigned int ep_index;
5199	unsigned long flags;	5239	unsigned long flags;
5200		5240
		5241	/*
		5242	* udev might be NULL if tt buffer is cleared during a failed device
		5243	* enumeration due to a halted control endpoint. Usb core might
		5244	* have allocated a new udev for the next enumeration attempt.
		5245	*/
		5246
5201	xhci = hcd_to_xhci(hcd);	5247	xhci = hcd_to_xhci(hcd);
5202	udev = (struct usb_device *)ep->hcpriv;	5248	udev = (struct usb_device *)ep->hcpriv;
		5249	if (!udev)
		5250	return;
5203	slot_id = udev->slot_id;	5251	slot_id = udev->slot_id;
5204	ep_index = xhci_get_endpoint_index(&ep->desc);	5252	ep_index = xhci_get_endpoint_index(&ep->desc);
5205		5253

drivers/usb/image/microtek.c+4−0

@@ -716,6 +716,10 @@ static int mts_usb_probe(struct usb_interface *intf, · 715 unmodified lines
716		716
717	}	717	}
718		718
		719	if (ep_in_current != &ep_in_set[2]) {
		720	MTS_WARNING("couldn't find two input bulk endpoints. Bailing out.\n");
		721	return -ENODEV;
		722	}
719		723
720	if ( ep_out == -1 ) {	724	if ( ep_out == -1 ) {
721	MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" );	725	MTS_WARNING( "couldn't find an output bulk endpoint. Bailing out.\n" );

drivers/usb/misc/Kconfig+0−10

@@ -47,16 +47,6 @@ config USB_SEVSEG · 46 unmodified lines
47	To compile this driver as a module, choose M here: the	47	To compile this driver as a module, choose M here: the
48	module will be called usbsevseg.	48	module will be called usbsevseg.
49		49
50	config USB_RIO500
51	tristate "USB Diamond Rio500 support"
52	help
53	Say Y here if you want to connect a USB Rio500 mp3 player to your
54	computer's USB port. Please read <file:Documentation/usb/rio.rst>
55	for more information.
56
57	To compile this driver as a module, choose M here: the
58	module will be called rio500.
59
60	config USB_LEGOTOWER	50	config USB_LEGOTOWER
61	tristate "USB Lego Infrared Tower support"	51	tristate "USB Lego Infrared Tower support"
62	help	52	help

drivers/usb/misc/Makefile+0−1

@@ -17,7 +17,6 @@ obj-$(CONFIG_USB_ISIGHTFW) += isight_firmware.o · 16 unmodified lines
17	obj-$(CONFIG_USB_LCD) += usblcd.o	17	obj-$(CONFIG_USB_LCD) += usblcd.o
18	obj-$(CONFIG_USB_LD) += ldusb.o	18	obj-$(CONFIG_USB_LD) += ldusb.o
19	obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o	19	obj-$(CONFIG_USB_LEGOTOWER) += legousbtower.o
20	obj-$(CONFIG_USB_RIO500) += rio500.o
21	obj-$(CONFIG_USB_TEST) += usbtest.o	20	obj-$(CONFIG_USB_TEST) += usbtest.o
22	obj-$(CONFIG_USB_EHSET_TEST_FIXTURE) += ehset.o	21	obj-$(CONFIG_USB_EHSET_TEST_FIXTURE) += ehset.o
23	obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o	22	obj-$(CONFIG_USB_TRANCEVIBRATOR) += trancevibrator.o

drivers/usb/misc/adutux.c+15−9

@@ -75,6 +75,7 @@ struct adu_device { · 74 unmodified lines
75	char serial_number[8];	75	char serial_number[8];
76		76
77	int open_count; /* number of times this port has been opened */	77	int open_count; /* number of times this port has been opened */
		78	unsigned long disconnected:1;
78		79
79	char *read_buffer_primary;	80	char *read_buffer_primary;
80	int read_buffer_length;	81	int read_buffer_length;
@@ -116,7 +117,7 @@ static void adu_abort_transfers(struct adu_device *dev) · 35 unmodified lines
116	{	117	{
117	unsigned long flags;	118	unsigned long flags;
118		119
119	if (dev->udev == NULL)	120	if (dev->disconnected)
120	return;	121	return;
121		122
122	/* shutdown transfer */	123	/* shutdown transfer */
@@ -148,6 +149,7 @@ static void adu_delete(struct adu_device *dev) · 25 unmodified lines
148	kfree(dev->read_buffer_secondary);	149	kfree(dev->read_buffer_secondary);
149	kfree(dev->interrupt_in_buffer);	150	kfree(dev->interrupt_in_buffer);
150	kfree(dev->interrupt_out_buffer);	151	kfree(dev->interrupt_out_buffer);
		152	usb_put_dev(dev->udev);
151	kfree(dev);	153	kfree(dev);
152	}	154	}
153		155
@@ -243,7 +245,7 @@ static int adu_open(struct inode inode, struct file file) · 89 unmodified lines
243	}	245	}
244		246
245	dev = usb_get_intfdata(interface);	247	dev = usb_get_intfdata(interface);
246	if (!dev \|\| !dev->udev) {	248	if (!dev) {
247	retval = -ENODEV;	249	retval = -ENODEV;
248	goto exit_no_device;	250	goto exit_no_device;
249	}	251	}
@@ -326,7 +328,7 @@ static int adu_release(struct inode inode, struct file file) · 76 unmodified lines
326	}	328	}
327		329
328	adu_release_internal(dev);	330	adu_release_internal(dev);
329	if (dev->udev == NULL) {	331	if (dev->disconnected) {
330	/* the device was unplugged before the file was released */	332	/* the device was unplugged before the file was released */
331	if (!dev->open_count) /* ... and we're the last user */	333	if (!dev->open_count) /* ... and we're the last user */
332	adu_delete(dev);	334	adu_delete(dev);
@@ -354,7 +356,7 @@ static ssize_t adu_read(struct file file, __user char buffer, size_t count, · 21 unmodified lines
354	return -ERESTARTSYS;	356	return -ERESTARTSYS;
355		357
356	/* verify that the device wasn't unplugged */	358	/* verify that the device wasn't unplugged */
357	if (dev->udev == NULL) {	359	if (dev->disconnected) {
358	retval = -ENODEV;	360	retval = -ENODEV;
359	pr_err("No device or device unplugged %d\n", retval);	361	pr_err("No device or device unplugged %d\n", retval);
360	goto exit;	362	goto exit;
@@ -518,7 +520,7 @@ static ssize_t adu_write(struct file file, const __user char buffer, · 157 unmodified lines
518	goto exit_nolock;	520	goto exit_nolock;
519		521
520	/* verify that the device wasn't unplugged */	522	/* verify that the device wasn't unplugged */
521	if (dev->udev == NULL) {	523	if (dev->disconnected) {
522	retval = -ENODEV;	524	retval = -ENODEV;
523	pr_err("No device or device unplugged %d\n", retval);	525	pr_err("No device or device unplugged %d\n", retval);
524	goto exit;	526	goto exit;
@@ -663,7 +665,7 @@ static int adu_probe(struct usb_interface *interface, · 138 unmodified lines
663		665
664	mutex_init(&dev->mtx);	666	mutex_init(&dev->mtx);
665	spin_lock_init(&dev->buflock);	667	spin_lock_init(&dev->buflock);
666	dev->udev = udev;	668	dev->udev = usb_get_dev(udev);
667	init_waitqueue_head(&dev->read_wait);	669	init_waitqueue_head(&dev->read_wait);
668	init_waitqueue_head(&dev->write_wait);	670	init_waitqueue_head(&dev->write_wait);
669		671
@@ -762,14 +764,18 @@ static void adu_disconnect(struct usb_interface *interface) · 92 unmodified lines
762		764
763	dev = usb_get_intfdata(interface);	765	dev = usb_get_intfdata(interface);
764		766
765	mutex_lock(&dev->mtx); /* not interruptible */
766	dev->udev = NULL; /* poison */
767	usb_deregister_dev(interface, &adu_class);	767	usb_deregister_dev(interface, &adu_class);
768	mutex_unlock(&dev->mtx);	768
		769	usb_poison_urb(dev->interrupt_in_urb);
		770	usb_poison_urb(dev->interrupt_out_urb);
769		771
770	mutex_lock(&adutux_mutex);	772	mutex_lock(&adutux_mutex);
771	usb_set_intfdata(interface, NULL);	773	usb_set_intfdata(interface, NULL);
772		774
		775	mutex_lock(&dev->mtx); /* not interruptible */
		776	dev->disconnected = 1;
		777	mutex_unlock(&dev->mtx);
		778
773	/* if the device is not opened, then we clean up right now */	779	/* if the device is not opened, then we clean up right now */
774	if (!dev->open_count)	780	if (!dev->open_count)
775	adu_delete(dev);	781	adu_delete(dev);

drivers/usb/misc/chaoskey.c+3−2

 		usb_free_urb(dev->urb);
 		kfree(dev->name);
 		kfree(dev->buf);
+		usb_put_intf(dev->interface);
 		kfree(dev);
 	}
 }
 	if (dev == NULL)
 		goto out;
+	dev->interface = usb_get_intf(interface);
 	dev->buf = kmalloc(size, GFP_KERNEL);
 	if (dev->buf == NULL)
 			goto out;
 	}
-	dev->interface = interface;
 	dev->in_ep = in_ep;
 	if (le16_to_cpu(udev->descriptor.idVendor) != ALEA_VENDOR_ID)

drivers/usb/misc/iowarrior.c+15−33

@@ -54,11 +54,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR); · 53 unmodified lines
54	MODULE_DESCRIPTION(DRIVER_DESC);	54	MODULE_DESCRIPTION(DRIVER_DESC);
55	MODULE_LICENSE("GPL");	55	MODULE_LICENSE("GPL");
56		56
57	/* Module parameters */
58	static DEFINE_MUTEX(iowarrior_mutex);
59
60	static struct usb_driver iowarrior_driver;	57	static struct usb_driver iowarrior_driver;
61	static DEFINE_MUTEX(iowarrior_open_disc_lock);
62		58
63	/--------------/	59	/--------------/
64	/* data */	60	/* data */
@@ -87,6 +83,7 @@ struct iowarrior { · 22 unmodified lines
87	char chip_serial[9]; /* the serial number string of the chip connected */	83	char chip_serial[9]; /* the serial number string of the chip connected */
88	int report_size; /* number of bytes in a report */	84	int report_size; /* number of bytes in a report */
89	u16 product_id;	85	u16 product_id;
		86	struct usb_anchor submitted;
90	};	87	};
91		88
92	/--------------/	89	/--------------/
@@ -243,6 +240,7 @@ static inline void iowarrior_delete(struct iowarrior *dev) · 150 unmodified lines
243	kfree(dev->int_in_buffer);	240	kfree(dev->int_in_buffer);
244	usb_free_urb(dev->int_in_urb);	241	usb_free_urb(dev->int_in_urb);
245	kfree(dev->read_queue);	242	kfree(dev->read_queue);
		243	usb_put_intf(dev->interface);
246	kfree(dev);	244	kfree(dev);
247	}	245	}
248		246
@@ -424,11 +422,13 @@ static ssize_t iowarrior_write(struct file *file, · 175 unmodified lines
424	retval = -EFAULT;	422	retval = -EFAULT;
425	goto error;	423	goto error;
426	}	424	}
		425	usb_anchor_urb(int_out_urb, &dev->submitted);
427	retval = usb_submit_urb(int_out_urb, GFP_KERNEL);	426	retval = usb_submit_urb(int_out_urb, GFP_KERNEL);
428	if (retval) {	427	if (retval) {
429	dev_dbg(&dev->interface->dev,	428	dev_dbg(&dev->interface->dev,
430	"submit error %d for urb nr.%d\n",	429	"submit error %d for urb nr.%d\n",
431	retval, atomic_read(&dev->write_busy));	430	retval, atomic_read(&dev->write_busy));
		431	usb_unanchor_urb(int_out_urb);
432	goto error;	432	goto error;
433	}	433	}
434	/* submit was ok */	434	/* submit was ok */
@@ -477,8 +477,6 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd, · 42 unmodified lines
477	if (!buffer)	477	if (!buffer)
478	return -ENOMEM;	478	return -ENOMEM;
479		479
480	/* lock this object */
481	mutex_lock(&iowarrior_mutex);
482	mutex_lock(&dev->mutex);	480	mutex_lock(&dev->mutex);
483		481
484	/* verify that the device wasn't unplugged */	482	/* verify that the device wasn't unplugged */
@@ -571,7 +569,6 @@ static long iowarrior_ioctl(struct file *file, unsigned int cmd, · 86 unmodified lines
571	error_out:	569	error_out:
572	/* unlock the device */	570	/* unlock the device */
573	mutex_unlock(&dev->mutex);	571	mutex_unlock(&dev->mutex);
574	mutex_unlock(&iowarrior_mutex);
575	kfree(buffer);	572	kfree(buffer);
576	return retval;	573	return retval;
577	}	574	}
@@ -586,27 +583,20 @@ static int iowarrior_open(struct inode inode, struct file file) · 8 unmodified lines
586	int subminor;	583	int subminor;
587	int retval = 0;	584	int retval = 0;
588		585
589	mutex_lock(&iowarrior_mutex);
590	subminor = iminor(inode);	586	subminor = iminor(inode);
591		587
592	interface = usb_find_interface(&iowarrior_driver, subminor);	588	interface = usb_find_interface(&iowarrior_driver, subminor);
593	if (!interface) {	589	if (!interface) {
594	mutex_unlock(&iowarrior_mutex);	590	pr_err("%s - error, can't find device for minor %d\n",
595	printk(KERN_ERR "%s - error, can't find device for minor %d\n",
596	__func__, subminor);	591	__func__, subminor);
597	return -ENODEV;	592	return -ENODEV;
598	}	593	}
599		594
600	mutex_lock(&iowarrior_open_disc_lock);
601	dev = usb_get_intfdata(interface);	595	dev = usb_get_intfdata(interface);
602	if (!dev) {	596	if (!dev)
603	mutex_unlock(&iowarrior_open_disc_lock);
604	mutex_unlock(&iowarrior_mutex);
605	return -ENODEV;	597	return -ENODEV;
606	}
607		598
608	mutex_lock(&dev->mutex);	599	mutex_lock(&dev->mutex);
609	mutex_unlock(&iowarrior_open_disc_lock);
610		600
611	/* Only one process can open each device, no sharing. */	601	/* Only one process can open each device, no sharing. */
612	if (dev->opened) {	602	if (dev->opened) {
@@ -628,7 +618,6 @@ static int iowarrior_open(struct inode inode, struct file file) · 15 unmodified lines
628		618
629	out:	619	out:
630	mutex_unlock(&dev->mutex);	620	mutex_unlock(&dev->mutex);
631	mutex_unlock(&iowarrior_mutex);
632	return retval;	621	return retval;
633	}	622	}
634		623
@@ -764,11 +753,13 @@ static int iowarrior_probe(struct usb_interface *interface, · 129 unmodified lines
764	init_waitqueue_head(&dev->write_wait);	753	init_waitqueue_head(&dev->write_wait);
765		754
766	dev->udev = udev;	755	dev->udev = udev;
767	dev->interface = interface;	756	dev->interface = usb_get_intf(interface);
768		757
769	iface_desc = interface->cur_altsetting;	758	iface_desc = interface->cur_altsetting;
770	dev->product_id = le16_to_cpu(udev->descriptor.idProduct);	759	dev->product_id = le16_to_cpu(udev->descriptor.idProduct);
771		760
		761	init_usb_anchor(&dev->submitted);
		762
772	res = usb_find_last_int_in_endpoint(iface_desc, &dev->int_in_endpoint);	763	res = usb_find_last_int_in_endpoint(iface_desc, &dev->int_in_endpoint);
773	if (res) {	764	if (res) {
774	dev_err(&interface->dev, "no interrupt-in endpoint found\n");	765	dev_err(&interface->dev, "no interrupt-in endpoint found\n");
@@ -836,7 +827,6 @@ static int iowarrior_probe(struct usb_interface *interface, · 61 unmodified lines
836	if (retval) {	827	if (retval) {
837	/* something prevented us from registering this driver */	828	/* something prevented us from registering this driver */
838	dev_err(&interface->dev, "Not able to get a minor for this device.\n");	829	dev_err(&interface->dev, "Not able to get a minor for this device.\n");
839	usb_set_intfdata(interface, NULL);
840	goto error;	830	goto error;
841	}	831	}
842		832
@@ -860,26 +850,15 @@ error: · 17 unmodified lines
860	*/	850	*/
861	static void iowarrior_disconnect(struct usb_interface *interface)	851	static void iowarrior_disconnect(struct usb_interface *interface)
862	{	852	{
863	struct iowarrior *dev;	853	struct iowarrior *dev = usb_get_intfdata(interface);
864	int minor;	854	int minor = dev->minor;
865
866	dev = usb_get_intfdata(interface);
867	mutex_lock(&iowarrior_open_disc_lock);
868	usb_set_intfdata(interface, NULL);
869	/* prevent device read, write and ioctl */
870	dev->present = 0;
871
872	minor = dev->minor;
873	mutex_unlock(&iowarrior_open_disc_lock);
874	/* give back our minor - this will call close() locks need to be dropped at this point*/
875		855
876	usb_deregister_dev(interface, &iowarrior_class);	856	usb_deregister_dev(interface, &iowarrior_class);
877		857
878	mutex_lock(&dev->mutex);	858	mutex_lock(&dev->mutex);
879		859
880	/* prevent device read, write and ioctl */	860	/* prevent device read, write and ioctl */
881		861	dev->present = 0;
882	mutex_unlock(&dev->mutex);
883		862
884	if (dev->opened) {	863	if (dev->opened) {
885	/* There is a process that holds a filedescriptor to the device ,	864	/* There is a process that holds a filedescriptor to the device ,
@@ -887,10 +866,13 @@ static void iowarrior_disconnect(struct usb_interface *interface) · 1 unmodified line
887	Deleting the device is postponed until close() was called.	866	Deleting the device is postponed until close() was called.
888	*/	867	*/
889	usb_kill_urb(dev->int_in_urb);	868	usb_kill_urb(dev->int_in_urb);
		869	usb_kill_anchored_urbs(&dev->submitted);
890	wake_up_interruptible(&dev->read_wait);	870	wake_up_interruptible(&dev->read_wait);
891	wake_up_interruptible(&dev->write_wait);	871	wake_up_interruptible(&dev->write_wait);
		872	mutex_unlock(&dev->mutex);
892	} else {	873	} else {
893	/* no process is using the device, cleanup now */	874	/* no process is using the device, cleanup now */
		875	mutex_unlock(&dev->mutex);
894	iowarrior_delete(dev);	876	iowarrior_delete(dev);
895	}	877	}
896		878

drivers/usb/misc/ldusb.c+12−12

 struct ld_usb {
 	struct mutex		mutex;		/* locks this structure */
 	struct usb_interface	*intf;		/* save off the usb interface pointer */
+	unsigned long		disconnected:1;
 	int			open_count;	/* number of times this port has been opened */
 	/* shutdown transfer */
 	if (dev->interrupt_in_running) {
 		dev->interrupt_in_running = 0;
-		if (dev->intf)
+		usb_kill_urb(dev->interrupt_in_urb);
-			usb_kill_urb(dev->interrupt_in_urb);
 	}
 	if (dev->interrupt_out_busy)
-		if (dev->intf)
+		usb_kill_urb(dev->interrupt_out_urb);
-			usb_kill_urb(dev->interrupt_out_urb);
 }
 /**
  */
 static void ld_usb_delete(struct ld_usb *dev)
 {
-	ld_usb_abort_transfers(dev);
 	/* free data structures */
 	usb_free_urb(dev->interrupt_in_urb);
 	usb_free_urb(dev->interrupt_out_urb);
 resubmit:
 	/* resubmit if we're still running */
-	if (dev->interrupt_in_running && !dev->buffer_overflow && dev->intf) {
+	if (dev->interrupt_in_running && !dev->buffer_overflow) {
 		retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC);
 		if (retval) {
 			dev_err(&dev->intf->dev,
 		retval = -ENODEV;
 		goto unlock_exit;
 	}
-	if (dev->intf == NULL) {
+	if (dev->disconnected) {
 		/* the device was unplugged before the file was released */
 		mutex_unlock(&dev->mutex);
 		/* unlock here as ld_usb_delete frees dev */
 	dev = file->private_data;
-	if (!dev->intf)
+	if (dev->disconnected)
 		return EPOLLERR | EPOLLHUP;
 	poll_wait(file, &dev->read_wait, wait);
 	}
 	/* verify that the device wasn't unplugged */
-	if (dev->intf == NULL) {
+	if (dev->disconnected) {
 		retval = -ENODEV;
 		printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval);
 		goto unlock_exit;
 	}
 	/* verify that the device wasn't unplugged */
-	if (dev->intf == NULL) {
+	if (dev->disconnected) {
 		retval = -ENODEV;
 		printk(KERN_ERR "ldusb: No device or device unplugged %d\n", retval);
 		goto unlock_exit;
 	/* give back our minor */
 	usb_deregister_dev(intf, &ld_usb_class);
+	usb_poison_urb(dev->interrupt_in_urb);
+	usb_poison_urb(dev->interrupt_out_urb);
 	mutex_lock(&dev->mutex);
 	/* if the device is not opened, then we clean up right now */
 		mutex_unlock(&dev->mutex);
 		ld_usb_delete(dev);
 	} else {
-		dev->intf = NULL;
+		dev->disconnected = 1;
 		/* wake up pollers */
 		wake_up_interruptible_all(&dev->read_wait);
 		wake_up_interruptible_all(&dev->write_wait);

drivers/usb/misc/legousbtower.c+25−33

@@ -179,7 +179,6 @@ static const struct usb_device_id tower_table[] = { · 178 unmodified lines
179	};	179	};
180		180
181	MODULE_DEVICE_TABLE (usb, tower_table);	181	MODULE_DEVICE_TABLE (usb, tower_table);
182	static DEFINE_MUTEX(open_disc_mutex);
183		182
184	#define LEGO_USB_TOWER_MINOR_BASE 160	183	#define LEGO_USB_TOWER_MINOR_BASE 160
185		184
@@ -191,6 +190,7 @@ struct lego_usb_tower { · 5 unmodified lines
191	unsigned char minor; /* the starting minor number for this device */	190	unsigned char minor; /* the starting minor number for this device */
192		191
193	int open_count; /* number of times this port has been opened */	192	int open_count; /* number of times this port has been opened */
		193	unsigned long disconnected:1;
194		194
195	char* read_buffer;	195	char* read_buffer;
196	size_t read_buffer_length; /* this much came in */	196	size_t read_buffer_length; /* this much came in */
@@ -290,14 +290,13 @@ static inline void lego_usb_tower_debug_data(struct device *dev, · 93 unmodified lines
290	*/	290	*/
291	static inline void tower_delete (struct lego_usb_tower *dev)	291	static inline void tower_delete (struct lego_usb_tower *dev)
292	{	292	{
293	tower_abort_transfers (dev);
294
295	/* free data structures */	293	/* free data structures */
296	usb_free_urb(dev->interrupt_in_urb);	294	usb_free_urb(dev->interrupt_in_urb);
297	usb_free_urb(dev->interrupt_out_urb);	295	usb_free_urb(dev->interrupt_out_urb);
298	kfree (dev->read_buffer);	296	kfree (dev->read_buffer);
299	kfree (dev->interrupt_in_buffer);	297	kfree (dev->interrupt_in_buffer);
300	kfree (dev->interrupt_out_buffer);	298	kfree (dev->interrupt_out_buffer);
		299	usb_put_dev(dev->udev);
301	kfree (dev);	300	kfree (dev);
302	}	301	}
303		302
@@ -332,18 +331,14 @@ static int tower_open (struct inode inode, struct file file) · 28 unmodified lines
332	goto exit;	331	goto exit;
333	}	332	}
334		333
335	mutex_lock(&open_disc_mutex);
336	dev = usb_get_intfdata(interface);	334	dev = usb_get_intfdata(interface);
337
338	if (!dev) {	335	if (!dev) {
339	mutex_unlock(&open_disc_mutex);
340	retval = -ENODEV;	336	retval = -ENODEV;
341	goto exit;	337	goto exit;
342	}	338	}
343		339
344	/* lock this device */	340	/* lock this device */
345	if (mutex_lock_interruptible(&dev->lock)) {	341	if (mutex_lock_interruptible(&dev->lock)) {
346	mutex_unlock(&open_disc_mutex);
347	retval = -ERESTARTSYS;	342	retval = -ERESTARTSYS;
348	goto exit;	343	goto exit;
349	}	344	}
@@ -351,12 +346,9 @@ static int tower_open (struct inode inode, struct file file) · 1 unmodified line
351		346
352	/* allow opening only once */	347	/* allow opening only once */
353	if (dev->open_count) {	348	if (dev->open_count) {
354	mutex_unlock(&open_disc_mutex);
355	retval = -EBUSY;	349	retval = -EBUSY;
356	goto unlock_exit;	350	goto unlock_exit;
357	}	351	}
358	dev->open_count = 1;
359	mutex_unlock(&open_disc_mutex);
360		352
361	/* reset the tower */	353	/* reset the tower */
362	result = usb_control_msg (dev->udev,	354	result = usb_control_msg (dev->udev,
@@ -396,13 +388,14 @@ static int tower_open (struct inode inode, struct file file) · 33 unmodified lines
396	dev_err(&dev->udev->dev,	388	dev_err(&dev->udev->dev,
397	"Couldn't submit interrupt_in_urb %d\n", retval);	389	"Couldn't submit interrupt_in_urb %d\n", retval);
398	dev->interrupt_in_running = 0;	390	dev->interrupt_in_running = 0;
399	dev->open_count = 0;
400	goto unlock_exit;	391	goto unlock_exit;
401	}	392	}
402		393
403	/* save device in the file's private structure */	394	/* save device in the file's private structure */
404	file->private_data = dev;	395	file->private_data = dev;
405		396
		397	dev->open_count = 1;
		398
406	unlock_exit:	399	unlock_exit:
407	mutex_unlock(&dev->lock);	400	mutex_unlock(&dev->lock);
408		401
@@ -423,10 +416,9 @@ static int tower_release (struct inode inode, struct file file) · 14 unmodified lines
423		416
424	if (dev == NULL) {	417	if (dev == NULL) {
425	retval = -ENODEV;	418	retval = -ENODEV;
426	goto exit_nolock;	419	goto exit;
427	}	420	}
428		421
429	mutex_lock(&open_disc_mutex);
430	if (mutex_lock_interruptible(&dev->lock)) {	422	if (mutex_lock_interruptible(&dev->lock)) {
431	retval = -ERESTARTSYS;	423	retval = -ERESTARTSYS;
432	goto exit;	424	goto exit;
@@ -438,7 +430,8 @@ static int tower_release (struct inode inode, struct file file) · 5 unmodified lines
438	retval = -ENODEV;	430	retval = -ENODEV;
439	goto unlock_exit;	431	goto unlock_exit;
440	}	432	}
441	if (dev->udev == NULL) {	433
		434	if (dev->disconnected) {
442	/* the device was unplugged before the file was released */	435	/* the device was unplugged before the file was released */
443		436
444	/* unlock here as tower_delete frees dev */	437	/* unlock here as tower_delete frees dev */
@@ -456,10 +449,7 @@ static int tower_release (struct inode inode, struct file file) · 11 unmodified lines
456		449
457	unlock_exit:	450	unlock_exit:
458	mutex_unlock(&dev->lock);	451	mutex_unlock(&dev->lock);
459
460	exit:	452	exit:
461	mutex_unlock(&open_disc_mutex);
462	exit_nolock:
463	return retval;	453	return retval;
464	}	454	}
465		455
@@ -477,10 +467,9 @@ static void tower_abort_transfers (struct lego_usb_tower *dev) · 11 unmodified lines
477	if (dev->interrupt_in_running) {	467	if (dev->interrupt_in_running) {
478	dev->interrupt_in_running = 0;	468	dev->interrupt_in_running = 0;
479	mb();	469	mb();
480	if (dev->udev)	470	usb_kill_urb(dev->interrupt_in_urb);
481	usb_kill_urb (dev->interrupt_in_urb);
482	}	471	}
483	if (dev->interrupt_out_busy && dev->udev)	472	if (dev->interrupt_out_busy)
484	usb_kill_urb(dev->interrupt_out_urb);	473	usb_kill_urb(dev->interrupt_out_urb);
485	}	474	}
486		475
@@ -516,7 +505,7 @@ static __poll_t tower_poll (struct file file, poll_table wait) · 29 unmodified lines
516		505
517	dev = file->private_data;	506	dev = file->private_data;
518		507
519	if (!dev->udev)	508	if (dev->disconnected)
520	return EPOLLERR \| EPOLLHUP;	509	return EPOLLERR \| EPOLLHUP;
521		510
522	poll_wait(file, &dev->read_wait, wait);	511	poll_wait(file, &dev->read_wait, wait);
@@ -563,7 +552,7 @@ static ssize_t tower_read (struct file file, char __user buffer, size_t count, · 40 unmodified lines
563	}	552	}
564		553
565	/* verify that the device wasn't unplugged */	554	/* verify that the device wasn't unplugged */
566	if (dev->udev == NULL) {	555	if (dev->disconnected) {
567	retval = -ENODEV;	556	retval = -ENODEV;
568	pr_err("No device or device unplugged %d\n", retval);	557	pr_err("No device or device unplugged %d\n", retval);
569	goto unlock_exit;	558	goto unlock_exit;
@@ -649,7 +638,7 @@ static ssize_t tower_write (struct file file, const char __user buffer, size_t · 79 unmodified lines
649	}	638	}
650		639
651	/* verify that the device wasn't unplugged */	640	/* verify that the device wasn't unplugged */
652	if (dev->udev == NULL) {	641	if (dev->disconnected) {
653	retval = -ENODEV;	642	retval = -ENODEV;
654	pr_err("No device or device unplugged %d\n", retval);	643	pr_err("No device or device unplugged %d\n", retval);
655	goto unlock_exit;	644	goto unlock_exit;
@@ -759,7 +748,7 @@ static void tower_interrupt_in_callback (struct urb *urb) · 103 unmodified lines
759		748
760	resubmit:	749	resubmit:
761	/* resubmit if we're still running */	750	/* resubmit if we're still running */
762	if (dev->interrupt_in_running && dev->udev) {	751	if (dev->interrupt_in_running) {
763	retval = usb_submit_urb (dev->interrupt_in_urb, GFP_ATOMIC);	752	retval = usb_submit_urb (dev->interrupt_in_urb, GFP_ATOMIC);
764	if (retval)	753	if (retval)
765	dev_err(&dev->udev->dev,	754	dev_err(&dev->udev->dev,
@@ -822,8 +811,9 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device · 56 unmodified lines
822		811
823	mutex_init(&dev->lock);	812	mutex_init(&dev->lock);
824		813
825	dev->udev = udev;	814	dev->udev = usb_get_dev(udev);
826	dev->open_count = 0;	815	dev->open_count = 0;
		816	dev->disconnected = 0;
827		817
828	dev->read_buffer = NULL;	818	dev->read_buffer = NULL;
829	dev->read_buffer_length = 0;	819	dev->read_buffer_length = 0;
@@ -891,8 +881,10 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device · 61 unmodified lines
891	get_version_reply,	881	get_version_reply,
892	sizeof(*get_version_reply),	882	sizeof(*get_version_reply),
893	1000);	883	1000);
894	if (result < 0) {	884	if (result < sizeof(*get_version_reply)) {
895	dev_err(idev, "LEGO USB Tower get version control request failed\n");	885	if (result >= 0)
		886	result = -EIO;
		887	dev_err(idev, "get version request failed: %d\n", result);
896	retval = result;	888	retval = result;
897	goto error;	889	goto error;
898	}	890	}
@@ -910,7 +902,6 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device · 11 unmodified lines
910	if (retval) {	902	if (retval) {
911	/* something prevented us from registering this driver */	903	/* something prevented us from registering this driver */
912	dev_err(idev, "Not able to get a minor for this device.\n");	904	dev_err(idev, "Not able to get a minor for this device.\n");
913	usb_set_intfdata (interface, NULL);
914	goto error;	905	goto error;
915	}	906	}
916	dev->minor = interface->minor;	907	dev->minor = interface->minor;
@@ -942,23 +933,24 @@ static void tower_disconnect (struct usb_interface *interface) · 25 unmodified lines
942	int minor;	933	int minor;
943		934
944	dev = usb_get_intfdata (interface);	935	dev = usb_get_intfdata (interface);
945	mutex_lock(&open_disc_mutex);
946	usb_set_intfdata (interface, NULL);
947		936
948	minor = dev->minor;	937	minor = dev->minor;
949		938
950	/* give back our minor */	939	/* give back our minor and prevent further open() */
951	usb_deregister_dev (interface, &tower_class);	940	usb_deregister_dev (interface, &tower_class);
952		941
		942	/* stop I/O */
		943	usb_poison_urb(dev->interrupt_in_urb);
		944	usb_poison_urb(dev->interrupt_out_urb);
		945
953	mutex_lock(&dev->lock);	946	mutex_lock(&dev->lock);
954	mutex_unlock(&open_disc_mutex);
955		947
956	/* if the device is not opened, then we clean up right now */	948	/* if the device is not opened, then we clean up right now */
957	if (!dev->open_count) {	949	if (!dev->open_count) {
958	mutex_unlock(&dev->lock);	950	mutex_unlock(&dev->lock);
959	tower_delete (dev);	951	tower_delete (dev);
960	} else {	952	} else {
961	dev->udev = NULL;	953	dev->disconnected = 1;
962	/* wake up pollers */	954	/* wake up pollers */
963	wake_up_interruptible_all(&dev->read_wait);	955	wake_up_interruptible_all(&dev->read_wait);
964	wake_up_interruptible_all(&dev->write_wait);	956	wake_up_interruptible_all(&dev->write_wait);

drivers/usb/misc/rio500.c+0−554

@@ -1,554 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0+
2	/* -- linux-c -- */
3
4	/*
5	* Driver for USB Rio 500
6	*
7	* Cesar Miquel (miquel@df.uba.ar)
8	*
9	* based on hp_scanner.c by David E. Nelson (dnelson@jump.net)
10	*
11	* Based upon mouse.c (Brad Keryan) and printer.c (Michael Gee).
12	*
13	* Changelog:
14	* 30/05/2003 replaced lock/unlock kernel with up/down
15	* Daniele Bellucci bellucda@tiscali.it
16	* */
17
18	#include <linux/module.h>
19	#include <linux/kernel.h>
20	#include <linux/signal.h>
21	#include <linux/sched/signal.h>
22	#include <linux/mutex.h>
23	#include <linux/errno.h>
24	#include <linux/random.h>
25	#include <linux/poll.h>
26	#include <linux/slab.h>
27	#include <linux/spinlock.h>
28	#include <linux/usb.h>
29	#include <linux/wait.h>
30
31	#include "rio500_usb.h"
32
33	#define DRIVER_AUTHOR "Cesar Miquel <miquel@df.uba.ar>"
34	#define DRIVER_DESC "USB Rio 500 driver"
35
36	#define RIO_MINOR 64
37
38	/* stall/wait timeout for rio */
39	#define NAK_TIMEOUT (HZ)
40
41	#define IBUF_SIZE 0x1000
42
43	/* Size of the rio buffer */
44	#define OBUF_SIZE 0x10000
45
46	struct rio_usb_data {
47	struct usb_device rio_dev; / init: probe_rio */
48	unsigned int ifnum; /* Interface number of the USB device */
49	int isopen; /* nz if open */
50	int present; /* Device is present on the bus */
51	char obuf, ibuf; /* transfer buffers */
52	char bulk_in_ep, bulk_out_ep; /* Endpoint assignments */
53	wait_queue_head_t wait_q; /* for timeouts */
54	};
55
56	static DEFINE_MUTEX(rio500_mutex);
57	static struct rio_usb_data rio_instance;
58
59	static int open_rio(struct inode inode, struct file file)
60	{
61	struct rio_usb_data *rio = &rio_instance;
62
63	/* against disconnect() */
64	mutex_lock(&rio500_mutex);
65
66	if (rio->isopen \|\| !rio->present) {
67	mutex_unlock(&rio500_mutex);
68	return -EBUSY;
69	}
70	rio->isopen = 1;
71
72	init_waitqueue_head(&rio->wait_q);
73
74
75	dev_info(&rio->rio_dev->dev, "Rio opened.\n");
76	mutex_unlock(&rio500_mutex);
77
78	return 0;
79	}
80
81	static int close_rio(struct inode inode, struct file file)
82	{
83	struct rio_usb_data *rio = &rio_instance;
84
85	/* against disconnect() */
86	mutex_lock(&rio500_mutex);
87
88	rio->isopen = 0;
89	if (!rio->present) {
90	/* cleanup has been delayed */
91	kfree(rio->ibuf);
92	kfree(rio->obuf);
93	rio->ibuf = NULL;
94	rio->obuf = NULL;
95	} else {
96	dev_info(&rio->rio_dev->dev, "Rio closed.\n");
97	}
98	mutex_unlock(&rio500_mutex);
99	return 0;
100	}
101
102	static long ioctl_rio(struct file *file, unsigned int cmd, unsigned long arg)
103	{
104	struct RioCommand rio_cmd;
105	struct rio_usb_data *rio = &rio_instance;
106	void __user *data;
107	unsigned char *buffer;
108	int result, requesttype;
109	int retries;
110	int retval=0;
111
112	mutex_lock(&rio500_mutex);
113	/* Sanity check to make sure rio is connected, powered, etc */
114	if (rio->present == 0 \|\| rio->rio_dev == NULL) {
115	retval = -ENODEV;
116	goto err_out;
117	}
118
119	switch (cmd) {
120	case RIO_RECV_COMMAND:
121	data = (void __user *) arg;
122	if (data == NULL)
123	break;
124	if (copy_from_user(&rio_cmd, data, sizeof(struct RioCommand))) {
125	retval = -EFAULT;
126	goto err_out;
127	}
128	if (rio_cmd.length < 0 \|\| rio_cmd.length > PAGE_SIZE) {
129	retval = -EINVAL;
130	goto err_out;
131	}
132	buffer = (unsigned char *) __get_free_page(GFP_KERNEL);
133	if (buffer == NULL) {
134	retval = -ENOMEM;
135	goto err_out;
136	}
137	if (copy_from_user(buffer, rio_cmd.buffer, rio_cmd.length)) {
138	retval = -EFAULT;
139	free_page((unsigned long) buffer);
140	goto err_out;
141	}
142
143	requesttype = rio_cmd.requesttype \| USB_DIR_IN \|
144	USB_TYPE_VENDOR \| USB_RECIP_DEVICE;
145	dev_dbg(&rio->rio_dev->dev,
146	"sending command:reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n",
147	requesttype, rio_cmd.request, rio_cmd.value,
148	rio_cmd.index, rio_cmd.length);
149	/* Send rio control message */
150	retries = 3;
151	while (retries) {
152	result = usb_control_msg(rio->rio_dev,
153	usb_rcvctrlpipe(rio-> rio_dev, 0),
154	rio_cmd.request,
155	requesttype,
156	rio_cmd.value,
157	rio_cmd.index, buffer,
158	rio_cmd.length,
159	jiffies_to_msecs(rio_cmd.timeout));
160	if (result == -ETIMEDOUT)
161	retries--;
162	else if (result < 0) {
163	dev_err(&rio->rio_dev->dev,
164	"Error executing ioctrl. code = %d\n",
165	result);
166	retries = 0;
167	} else {
168	dev_dbg(&rio->rio_dev->dev,
169	"Executed ioctl. Result = %d (data=%02x)\n",
170	result, buffer[0]);
171	if (copy_to_user(rio_cmd.buffer, buffer,
172	rio_cmd.length)) {
173	free_page((unsigned long) buffer);
174	retval = -EFAULT;
175	goto err_out;
176	}
177	retries = 0;
178	}
179
180	/* rio_cmd.buffer contains a raw stream of single byte
181	data which has been returned from rio. Data is
182	interpreted at application level. For data that
183	will be cast to data types longer than 1 byte, data
184	will be little_endian and will potentially need to
185	be swapped at the app level */
186
187	}
188	free_page((unsigned long) buffer);
189	break;
190
191	case RIO_SEND_COMMAND:
192	data = (void __user *) arg;
193	if (data == NULL)
194	break;
195	if (copy_from_user(&rio_cmd, data, sizeof(struct RioCommand))) {
196	retval = -EFAULT;
197	goto err_out;
198	}
199	if (rio_cmd.length < 0 \|\| rio_cmd.length > PAGE_SIZE) {
200	retval = -EINVAL;
201	goto err_out;
202	}
203	buffer = (unsigned char *) __get_free_page(GFP_KERNEL);
204	if (buffer == NULL) {
205	retval = -ENOMEM;
206	goto err_out;
207	}
208	if (copy_from_user(buffer, rio_cmd.buffer, rio_cmd.length)) {
209	free_page((unsigned long)buffer);
210	retval = -EFAULT;
211	goto err_out;
212	}
213
214	requesttype = rio_cmd.requesttype \| USB_DIR_OUT \|
215	USB_TYPE_VENDOR \| USB_RECIP_DEVICE;
216	dev_dbg(&rio->rio_dev->dev,
217	"sending command: reqtype=%0x req=%0x value=%0x index=%0x len=%0x\n",
218	requesttype, rio_cmd.request, rio_cmd.value,
219	rio_cmd.index, rio_cmd.length);
220	/* Send rio control message */
221	retries = 3;
222	while (retries) {
223	result = usb_control_msg(rio->rio_dev,
224	usb_sndctrlpipe(rio-> rio_dev, 0),
225	rio_cmd.request,
226	requesttype,
227	rio_cmd.value,
228	rio_cmd.index, buffer,
229	rio_cmd.length,
230	jiffies_to_msecs(rio_cmd.timeout));
231	if (result == -ETIMEDOUT)
232	retries--;
233	else if (result < 0) {
234	dev_err(&rio->rio_dev->dev,
235	"Error executing ioctrl. code = %d\n",
236	result);
237	retries = 0;
238	} else {
239	dev_dbg(&rio->rio_dev->dev,
240	"Executed ioctl. Result = %d\n", result);
241	retries = 0;
242
243	}
244
245	}
246	free_page((unsigned long) buffer);
247	break;
248
249	default:
250	retval = -ENOTTY;
251	break;
252	}
253
254
255	err_out:
256	mutex_unlock(&rio500_mutex);
257	return retval;
258	}
259
260	static ssize_t
261	write_rio(struct file file, const char __user buffer,
262	size_t count, loff_t * ppos)
263	{
264	DEFINE_WAIT(wait);
265	struct rio_usb_data *rio = &rio_instance;
266
267	unsigned long copy_size;
268	unsigned long bytes_written = 0;
269	unsigned int partial;
270
271	int result = 0;
272	int maxretry;
273	int errn = 0;
274	int intr;
275
276	intr = mutex_lock_interruptible(&rio500_mutex);
277	if (intr)
278	return -EINTR;
279	/* Sanity check to make sure rio is connected, powered, etc */
280	if (rio->present == 0 \|\| rio->rio_dev == NULL) {
281	mutex_unlock(&rio500_mutex);
282	return -ENODEV;
283	}
284
285
286
287	do {
288	unsigned long thistime;
289	char *obuf = rio->obuf;
290
291	thistime = copy_size =
292	(count >= OBUF_SIZE) ? OBUF_SIZE : count;
293	if (copy_from_user(rio->obuf, buffer, copy_size)) {
294	errn = -EFAULT;
295	goto error;
296	}
297	maxretry = 5;
298	while (thistime) {
299	if (!rio->rio_dev) {
300	errn = -ENODEV;
301	goto error;
302	}
303	if (signal_pending(current)) {
304	mutex_unlock(&rio500_mutex);
305	return bytes_written ? bytes_written : -EINTR;
306	}
307
308	result = usb_bulk_msg(rio->rio_dev,
309	usb_sndbulkpipe(rio->rio_dev, 2),
310	obuf, thistime, &partial, 5000);
311
312	dev_dbg(&rio->rio_dev->dev,
313	"write stats: result:%d thistime:%lu partial:%u\n",
314	result, thistime, partial);
315
316	if (result == -ETIMEDOUT) { /* NAK - so hold for a while */
317	if (!maxretry--) {
318	errn = -ETIME;
319	goto error;
320	}
321	prepare_to_wait(&rio->wait_q, &wait, TASK_INTERRUPTIBLE);
322	schedule_timeout(NAK_TIMEOUT);
323	finish_wait(&rio->wait_q, &wait);
324	continue;
325	} else if (!result && partial) {
326	obuf += partial;
327	thistime -= partial;
328	} else
329	break;
330	}
331	if (result) {
332	dev_err(&rio->rio_dev->dev, "Write Whoops - %x\n",
333	result);
334	errn = -EIO;
335	goto error;
336	}
337	bytes_written += copy_size;
338	count -= copy_size;
339	buffer += copy_size;
340	} while (count > 0);
341
342	mutex_unlock(&rio500_mutex);
343
344	return bytes_written ? bytes_written : -EIO;
345
346	error:
347	mutex_unlock(&rio500_mutex);
348	return errn;
349	}
350
351	static ssize_t
352	read_rio(struct file file, char __user buffer, size_t count, loff_t * ppos)
353	{
354	DEFINE_WAIT(wait);
355	struct rio_usb_data *rio = &rio_instance;
356	ssize_t read_count;
357	unsigned int partial;
358	int this_read;
359	int result;
360	int maxretry = 10;
361	char *ibuf;
362	int intr;
363
364	intr = mutex_lock_interruptible(&rio500_mutex);
365	if (intr)
366	return -EINTR;
367	/* Sanity check to make sure rio is connected, powered, etc */
368	if (rio->present == 0 \|\| rio->rio_dev == NULL) {
369	mutex_unlock(&rio500_mutex);
370	return -ENODEV;
371	}
372
373	ibuf = rio->ibuf;
374
375	read_count = 0;
376
377
378	while (count > 0) {
379	if (signal_pending(current)) {
380	mutex_unlock(&rio500_mutex);
381	return read_count ? read_count : -EINTR;
382	}
383	if (!rio->rio_dev) {
384	mutex_unlock(&rio500_mutex);
385	return -ENODEV;
386	}
387	this_read = (count >= IBUF_SIZE) ? IBUF_SIZE : count;
388
389	result = usb_bulk_msg(rio->rio_dev,
390	usb_rcvbulkpipe(rio->rio_dev, 1),
391	ibuf, this_read, &partial,
392	8000);
393
394	dev_dbg(&rio->rio_dev->dev,
395	"read stats: result:%d this_read:%u partial:%u\n",
396	result, this_read, partial);
397
398	if (partial) {
399	count = this_read = partial;
400	} else if (result == -ETIMEDOUT \|\| result == 15) { /* FIXME: 15 ??? */
401	if (!maxretry--) {
402	mutex_unlock(&rio500_mutex);
403	dev_err(&rio->rio_dev->dev,
404	"read_rio: maxretry timeout\n");
405	return -ETIME;
406	}
407	prepare_to_wait(&rio->wait_q, &wait, TASK_INTERRUPTIBLE);
408	schedule_timeout(NAK_TIMEOUT);
409	finish_wait(&rio->wait_q, &wait);
410	continue;
411	} else if (result != -EREMOTEIO) {
412	mutex_unlock(&rio500_mutex);
413	dev_err(&rio->rio_dev->dev,
414	"Read Whoops - result:%d partial:%u this_read:%u\n",
415	result, partial, this_read);
416	return -EIO;
417	} else {
418	mutex_unlock(&rio500_mutex);
419	return (0);
420	}
421
422	if (this_read) {
423	if (copy_to_user(buffer, ibuf, this_read)) {
424	mutex_unlock(&rio500_mutex);
425	return -EFAULT;
426	}
427	count -= this_read;
428	read_count += this_read;
429	buffer += this_read;
430	}
431	}
432	mutex_unlock(&rio500_mutex);
433	return read_count;
434	}
435
436	static const struct file_operations usb_rio_fops = {
437	.owner = THIS_MODULE,
438	.read = read_rio,
439	.write = write_rio,
440	.unlocked_ioctl = ioctl_rio,
441	.open = open_rio,
442	.release = close_rio,
443	.llseek = noop_llseek,
444	};
445
446	static struct usb_class_driver usb_rio_class = {
447	.name = "rio500%d",
448	.fops = &usb_rio_fops,
449	.minor_base = RIO_MINOR,
450	};
451
452	static int probe_rio(struct usb_interface *intf,
453	const struct usb_device_id *id)
454	{
455	struct usb_device *dev = interface_to_usbdev(intf);
456	struct rio_usb_data *rio = &rio_instance;
457	int retval = -ENOMEM;
458	char ibuf, obuf;
459
460	if (rio->present) {
461	dev_info(&intf->dev, "Second USB Rio at address %d refused\n", dev->devnum);
462	return -EBUSY;
463	}
464	dev_info(&intf->dev, "USB Rio found at address %d\n", dev->devnum);
465
466	obuf = kmalloc(OBUF_SIZE, GFP_KERNEL);
467	if (!obuf) {
468	dev_err(&dev->dev,
469	"probe_rio: Not enough memory for the output buffer\n");
470	goto err_obuf;
471	}
472	dev_dbg(&intf->dev, "obuf address: %p\n", obuf);
473
474	ibuf = kmalloc(IBUF_SIZE, GFP_KERNEL);
475	if (!ibuf) {
476	dev_err(&dev->dev,
477	"probe_rio: Not enough memory for the input buffer\n");
478	goto err_ibuf;
479	}
480	dev_dbg(&intf->dev, "ibuf address: %p\n", ibuf);
481
482	mutex_lock(&rio500_mutex);
483	rio->rio_dev = dev;
484	rio->ibuf = ibuf;
485	rio->obuf = obuf;
486	rio->present = 1;
487	mutex_unlock(&rio500_mutex);
488
489	retval = usb_register_dev(intf, &usb_rio_class);
490	if (retval) {
491	dev_err(&dev->dev,
492	"Not able to get a minor for this device.\n");
493	goto err_register;
494	}
495
496	usb_set_intfdata(intf, rio);
497	return retval;
498
499	err_register:
500	mutex_lock(&rio500_mutex);
501	rio->present = 0;
502	mutex_unlock(&rio500_mutex);
503	err_ibuf:
504	kfree(obuf);
505	err_obuf:
506	return retval;
507	}
508
509	static void disconnect_rio(struct usb_interface *intf)
510	{
511	struct rio_usb_data *rio = usb_get_intfdata (intf);
512
513	usb_set_intfdata (intf, NULL);
514	if (rio) {
515	usb_deregister_dev(intf, &usb_rio_class);
516
517	mutex_lock(&rio500_mutex);
518	if (rio->isopen) {
519	rio->isopen = 0;
520	/* better let it finish - the release will do whats needed */
521	rio->rio_dev = NULL;
522	mutex_unlock(&rio500_mutex);
523	return;
524	}
525	kfree(rio->ibuf);
526	kfree(rio->obuf);
527
528	dev_info(&intf->dev, "USB Rio disconnected.\n");
529
530	rio->present = 0;
531	mutex_unlock(&rio500_mutex);
532	}
533	}
534
535	static const struct usb_device_id rio_table[] = {
536	{ USB_DEVICE(0x0841, 1) }, /* Rio 500 */
537	{ } /* Terminating entry */
538	};
539
540	MODULE_DEVICE_TABLE (usb, rio_table);
541
542	static struct usb_driver rio_driver = {
543	.name = "rio500",
544	.probe = probe_rio,
545	.disconnect = disconnect_rio,
546	.id_table = rio_table,
547	};
548
549	module_usb_driver(rio_driver);
550
551	MODULE_AUTHOR( DRIVER_AUTHOR );
552	MODULE_DESCRIPTION( DRIVER_DESC );
553	MODULE_LICENSE("GPL");
554

drivers/usb/misc/rio500_usb.h+0−20

@@ -1,20 +0,0 @@
1	// SPDX-License-Identifier: GPL-2.0+
2	/* ----------------------------------------------------------------------
3	Copyright (C) 2000 Cesar Miquel (miquel@df.uba.ar)
4	---------------------------------------------------------------------- */
5
6	#define RIO_SEND_COMMAND 0x1
7	#define RIO_RECV_COMMAND 0x2
8
9	#define RIO_DIR_OUT 0x0
10	#define RIO_DIR_IN 0x1
11
12	struct RioCommand {
13	short length;
14	int request;
15	int requesttype;
16	int value;
17	int index;
18	void __user *buffer;
19	int timeout;
20	};

drivers/usb/misc/usblcd.c+33−27

 #include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/mutex.h>
+#include <linux/rwsem.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
 #define IOCTL_GET_DRV_VERSION	2
-static DEFINE_MUTEX(lcd_mutex);
 static const struct usb_device_id id_table[] = {
 	{ .idVendor = 0x10D2, .match_flags = USB_DEVICE_ID_MATCH_VENDOR, },
 	{ },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
-static DEFINE_MUTEX(open_disc_mutex);
 struct usb_lcd {
 	struct usb_device	*udev;			/* init: probe_lcd */
 	struct usb_interface	*interface;		/* the interface for
 							   using up all RAM */
 	struct usb_anchor	submitted;		/* URBs to wait for
 							   before suspend */
+	struct rw_semaphore	io_rwsem;
+	unsigned long		disconnected:1;
 };
 #define to_lcd_dev(d) container_of(d, struct usb_lcd, kref)
 	struct usb_interface *interface;
 	int subminor, r;
-	mutex_lock(&lcd_mutex);
 	subminor = iminor(inode);
 	interface = usb_find_interface(&lcd_driver, subminor);
 	if (!interface) {
-		mutex_unlock(&lcd_mutex);
+		pr_err("USBLCD: %s - error, can't find device for minor %d\n",
-		printk(KERN_ERR "USBLCD: %s - error, can't find device for minor %d\n",
 		       __func__, subminor);
 		return -ENODEV;
 	}
-	mutex_lock(&open_disc_mutex);
 	dev = usb_get_intfdata(interface);
-	if (!dev) {
-		mutex_unlock(&open_disc_mutex);
-		mutex_unlock(&lcd_mutex);
-		return -ENODEV;
-	}
 	/* increment our usage count for the device */
 	kref_get(&dev->kref);
-	mutex_unlock(&open_disc_mutex);
 	/* grab a power reference */
 	r = usb_autopm_get_interface(interface);
 	if (r < 0) {
 		kref_put(&dev->kref, lcd_delete);
-		mutex_unlock(&lcd_mutex);
 		return r;
 	}
 	/* save our object in the file's private structure */
 	file->private_data = dev;
-	mutex_unlock(&lcd_mutex);
 	return 0;
 }
 	dev = file->private_data;
+	down_read(&dev->io_rwsem);
+	if (dev->disconnected) {
+		retval = -ENODEV;
+		goto out_up_io;
+	}
 	/* do a blocking bulk read to get data from the device */
 	retval = usb_bulk_msg(dev->udev,
 			      usb_rcvbulkpipe(dev->udev,
 			retval = bytes_read;
 	}
+out_up_io:
+	up_read(&dev->io_rwsem);
 	return retval;
 }
 	switch (cmd) {
 	case IOCTL_GET_HARD_VERSION:
-		mutex_lock(&lcd_mutex);
 		bcdDevice = le16_to_cpu((dev->udev)->descriptor.bcdDevice);
 		sprintf(buf, "%1d%1d.%1d%1d",
 			(bcdDevice & 0xF000)>>12,
 			(bcdDevice & 0xF00)>>8,
 			(bcdDevice & 0xF0)>>4,
 			(bcdDevice & 0xF));
-		mutex_unlock(&lcd_mutex);
 		if (copy_to_user((void __user *)arg, buf, strlen(buf)) != 0)
 			return -EFAULT;
 		break;
 	if (r < 0)
 		return -EINTR;
+	down_read(&dev->io_rwsem);
+	if (dev->disconnected) {
+		retval = -ENODEV;
+		goto err_up_io;
+	}
 	/* create a urb, and a buffer for it, and copy the data to the urb */
 	urb = usb_alloc_urb(0, GFP_KERNEL);
 	if (!urb) {
 		retval = -ENOMEM;
-		goto err_no_buf;
+		goto err_up_io;
 	}
 	buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL,
 	   the USB core will eventually free it entirely */
 	usb_free_urb(urb);
+	up_read(&dev->io_rwsem);
 exit:
 	return count;
 error_unanchor:
 error:
 	usb_free_coherent(dev->udev, count, buf, urb->transfer_dma);
 	usb_free_urb(urb);
-err_no_buf:
+err_up_io:
+	up_read(&dev->io_rwsem);
 	up(&dev->limit_sem);
 	return retval;
 }
 	kref_init(&dev->kref);
 	sema_init(&dev->limit_sem, USB_LCD_CONCURRENT_WRITES);
+	init_rwsem(&dev->io_rwsem);
 	init_usb_anchor(&dev->submitted);
 	dev->udev = usb_get_dev(interface_to_usbdev(interface));
 		/* something prevented us from registering this driver */
 		dev_err(&interface->dev,
 			"Not able to get a minor for this device.\n");
-		usb_set_intfdata(interface, NULL);
 		goto error;
 	}
 static void lcd_disconnect(struct usb_interface *interface)
 {
-	struct usb_lcd *dev;
+	struct usb_lcd *dev = usb_get_intfdata(interface);
 	int minor = interface->minor;
-	mutex_lock(&open_disc_mutex);
-	dev = usb_get_intfdata(interface);
-	usb_set_intfdata(interface, NULL);
-	mutex_unlock(&open_disc_mutex);
 	/* give back our minor */
 	usb_deregister_dev(interface, &lcd_class);
+	down_write(&dev->io_rwsem);
+	dev->disconnected = 1;
+	up_write(&dev->io_rwsem);
+	usb_kill_anchored_urbs(&dev->submitted);
 	/* decrement our usage count */
 	kref_put(&dev->kref, lcd_delete);

drivers/usb/misc/yurex.c+11−7

 	struct kref		kref;
 	struct mutex		io_mutex;
+	unsigned long		disconnected:1;
 	struct fasync_struct	*async_queue;
 	wait_queue_head_t	waitq;
 				dev->int_buffer, dev->urb->transfer_dma);
 		usb_free_urb(dev->urb);
 	}
+	usb_put_intf(dev->interface);
 	usb_put_dev(dev->udev);
 	kfree(dev);
 }
 	switch (status) {
 	case 0: /*success*/
 		break;
+	/* The device is terminated or messed up, give up */
 	case -EOVERFLOW:
 		dev_err(&dev->interface->dev,
 			"%s - overflow with length %d, actual length is %d\n",
 	case -ENOENT:
 	case -ESHUTDOWN:
 	case -EILSEQ:
-		/* The device is terminated, clean up */
+	case -EPROTO:
+	case -ETIME:
 		return;
 	default:
 		dev_err(&dev->interface->dev,
 			"%s - unknown status received: %d\n", __func__, status);
-		goto exit;
+		return;
 	}
 	/* handle received message */
 		break;
 	}
-exit:
 	retval = usb_submit_urb(dev->urb, GFP_ATOMIC);
 	if (retval) {
 		dev_err(&dev->interface->dev, "%s - usb_submit_urb failed: %d\n",
 	init_waitqueue_head(&dev->waitq);
 	dev->udev = usb_get_dev(interface_to_usbdev(interface));
-	dev->interface = interface;
+	dev->interface = usb_get_intf(interface);
 	/* set up the endpoint information */
 	iface_desc = interface->cur_altsetting;
 	/* prevent more I/O from starting */
 	usb_poison_urb(dev->urb);
+	usb_poison_urb(dev->cntl_urb);
 	mutex_lock(&dev->io_mutex);
-	dev->interface = NULL;
+	dev->disconnected = 1;
 	mutex_unlock(&dev->io_mutex);
 	/* wakeup waiters */
 	dev = file->private_data;
 	mutex_lock(&dev->io_mutex);
-	if (!dev->interface) {		/* already disconnected */
+	if (dev->disconnected) {		/* already disconnected */
 		mutex_unlock(&dev->io_mutex);
 		return -ENODEV;
 	}
 		goto error;
 	mutex_lock(&dev->io_mutex);
-	if (!dev->interface) {		/* already disconnected */
+	if (dev->disconnected) {		/* already disconnected */
 		mutex_unlock(&dev->io_mutex);
 		retval = -ENODEV;
 		goto error;

drivers/usb/renesas_usbhs/common.h+1−0

@@ -211,6 +211,7 @@ struct usbhs_priv; · 210 unmodified lines
211	/* DCPCTR */	211	/* DCPCTR */
212	#define BSTS (1 << 15) /* Buffer Status */	212	#define BSTS (1 << 15) /* Buffer Status */
213	#define SUREQ (1 << 14) /* Sending SETUP Token */	213	#define SUREQ (1 << 14) /* Sending SETUP Token */
		214	#define INBUFM (1 << 14) /* (PIPEnCTR) Transfer Buffer Monitor */
214	#define CSSTS (1 << 12) /* CSSTS Status */	215	#define CSSTS (1 << 12) /* CSSTS Status */
215	#define ACLRM (1 << 9) /* Buffer Auto-Clear Mode */	216	#define ACLRM (1 << 9) /* Buffer Auto-Clear Mode */
216	#define SQCLR (1 << 8) /* Toggle Bit Clear */	217	#define SQCLR (1 << 8) /* Toggle Bit Clear */

drivers/usb/renesas_usbhs/fifo.c+1−1

@@ -89,7 +89,7 @@ static void __usbhsf_pkt_del(struct usbhs_pkt *pkt) · 88 unmodified lines
89	list_del_init(&pkt->node);	89	list_del_init(&pkt->node);
90	}	90	}
91		91
92	static struct usbhs_pkt __usbhsf_pkt_get(struct usbhs_pipe pipe)	92	struct usbhs_pkt __usbhsf_pkt_get(struct usbhs_pipe pipe)
93	{	93	{
94	return list_first_entry_or_null(&pipe->list, struct usbhs_pkt, node);	94	return list_first_entry_or_null(&pipe->list, struct usbhs_pkt, node);
95	}	95	}

drivers/usb/renesas_usbhs/fifo.h+1−0

@@ -97,5 +97,6 @@ void usbhs_pkt_push(struct usbhs_pipe pipe, struct usbhs_pkt pkt, · 96 unmodified lines
97	void *buf, int len, int zero, int sequence);	97	void *buf, int len, int zero, int sequence);
98	struct usbhs_pkt usbhs_pkt_pop(struct usbhs_pipe pipe, struct usbhs_pkt *pkt);	98	struct usbhs_pkt usbhs_pkt_pop(struct usbhs_pipe pipe, struct usbhs_pkt *pkt);
99	void usbhs_pkt_start(struct usbhs_pipe *pipe);	99	void usbhs_pkt_start(struct usbhs_pipe *pipe);
		100	struct usbhs_pkt __usbhsf_pkt_get(struct usbhs_pipe pipe);
100		101
101	#endif /* RENESAS_USB_FIFO_H */	102	#endif /* RENESAS_USB_FIFO_H */

drivers/usb/renesas_usbhs/mod_gadget.c+15−3

@@ -722,8 +722,7 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) · 721 unmodified lines
722	struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);	722	struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
723	struct device *dev = usbhsg_gpriv_to_dev(gpriv);	723	struct device *dev = usbhsg_gpriv_to_dev(gpriv);
724	unsigned long flags;	724	unsigned long flags;
725		725	int ret = 0;
726	usbhsg_pipe_disable(uep);
727		726
728	dev_dbg(dev, "set halt %d (pipe %d)\n",	727	dev_dbg(dev, "set halt %d (pipe %d)\n",
729	halt, usbhs_pipe_number(pipe));	728	halt, usbhs_pipe_number(pipe));
@@ -731,6 +730,18 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) · 1 unmodified line
731	/****************** spin lock ******************/	730	/****************** spin lock ******************/
732	usbhs_lock(priv, flags);	731	usbhs_lock(priv, flags);
733		732
		733	/*
		734	* According to usb_ep_set_halt()'s description, this function should
		735	* return -EAGAIN if the IN endpoint has any queue or data. Note
		736	* that the usbhs_pipe_is_dir_in() returns false if the pipe is an
		737	* IN endpoint in the gadget mode.
		738	*/
		739	if (!usbhs_pipe_is_dir_in(pipe) && (__usbhsf_pkt_get(pipe) \|\|
		740	usbhs_pipe_contains_transmittable_data(pipe))) {
		741	ret = -EAGAIN;
		742	goto out;
		743	}
		744
734	if (halt)	745	if (halt)
735	usbhs_pipe_stall(pipe);	746	usbhs_pipe_stall(pipe);
736	else	747	else
@@ -741,10 +752,11 @@ static int __usbhsg_ep_set_halt_wedge(struct usb_ep *ep, int halt, int wedge) · 4 unmodified lines
741	else	752	else
742	usbhsg_status_clr(gpriv, USBHSG_STATUS_WEDGE);	753	usbhsg_status_clr(gpriv, USBHSG_STATUS_WEDGE);
743		754
		755	out:
744	usbhs_unlock(priv, flags);	756	usbhs_unlock(priv, flags);
745	/****************** spin unlock ****************/	757	/****************** spin unlock ****************/
746		758
747	return 0;	759	return ret;
748	}	760	}
749		761
750	static int usbhsg_ep_set_halt(struct usb_ep *ep, int value)	762	static int usbhsg_ep_set_halt(struct usb_ep *ep, int value)

drivers/usb/renesas_usbhs/pipe.c+15−0

@@ -277,6 +277,21 @@ int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe) · 276 unmodified lines
277	return -EBUSY;	277	return -EBUSY;
278	}	278	}
279		279
		280	bool usbhs_pipe_contains_transmittable_data(struct usbhs_pipe *pipe)
		281	{
		282	u16 val;
		283
		284	/* Do not support for DCP pipe */
		285	if (usbhs_pipe_is_dcp(pipe))
		286	return false;
		287
		288	val = usbhsp_pipectrl_get(pipe);
		289	if (val & INBUFM)
		290	return true;
		291
		292	return false;
		293	}
		294
280	/*	295	/*
281	* PID ctrl	296	* PID ctrl
282	*/	297	*/

drivers/usb/renesas_usbhs/pipe.h+1−0

@@ -83,6 +83,7 @@ void usbhs_pipe_clear(struct usbhs_pipe *pipe); · 82 unmodified lines
83	void usbhs_pipe_clear_without_sequence(struct usbhs_pipe *pipe,	83	void usbhs_pipe_clear_without_sequence(struct usbhs_pipe *pipe,
84	int needs_bfre, int bfre_enable);	84	int needs_bfre, int bfre_enable);
85	int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);	85	int usbhs_pipe_is_accessible(struct usbhs_pipe *pipe);
		86	bool usbhs_pipe_contains_transmittable_data(struct usbhs_pipe *pipe);
86	void usbhs_pipe_enable(struct usbhs_pipe *pipe);	87	void usbhs_pipe_enable(struct usbhs_pipe *pipe);
87	void usbhs_pipe_disable(struct usbhs_pipe *pipe);	88	void usbhs_pipe_disable(struct usbhs_pipe *pipe);
88	void usbhs_pipe_stall(struct usbhs_pipe *pipe);	89	void usbhs_pipe_stall(struct usbhs_pipe *pipe);

drivers/usb/serial/ftdi_sio.c+3−0

 	/* EZPrototypes devices */
 	{ USB_DEVICE(EZPROTOTYPES_VID, HJELMSLUND_USB485_ISO_PID) },
 	{ USB_DEVICE_INTERFACE_NUMBER(UNJO_VID, UNJO_ISODEBUG_V1_PID, 1) },
+	/* Sienna devices */
+	{ USB_DEVICE(FTDI_VID, FTDI_SIENNA_PID) },
+	{ USB_DEVICE(ECHELON_VID, ECHELON_U20_PID) },
 	{ }					/* Terminating entry */
 };

drivers/usb/serial/ftdi_sio_ids.h+9−0

 #define FTDI_LUMEL_PD12_PID	0x6002
+/* Sienna Serial Interface by Secyourit GmbH */
+#define FTDI_SIENNA_PID		0x8348
 /* Cyber Cortex AV by Fabulous Silicon (http://fabuloussilicon.com) */
 #define CYBER_CORTEX_AV_PID	0x8698
 #define BANDB_TTL3USB9M_PID	0xAC50
 #define BANDB_ZZ_PROG1_USB_PID	0xBA02
+/*
+ * Echelon USB Serial Interface
+ */
+#define ECHELON_VID		0x0920
+#define ECHELON_U20_PID		0x7500
 /*
  * Intrepid Control Systems (http://www.intrepidcs.com/) ValueCAN and NeoVI
  */

drivers/usb/serial/keyspan.c+2−2

@@ -1741,8 +1741,8 @@ static struct urb keyspan_setup_urb(struct usb_serial serial, int endpoint, · 1740 unmodified lines
1741		1741
1742	ep_desc = find_ep(serial, endpoint);	1742	ep_desc = find_ep(serial, endpoint);
1743	if (!ep_desc) {	1743	if (!ep_desc) {
1744	/* leak the urb, something's wrong and the callers don't care */	1744	usb_free_urb(urb);
1745	return urb;	1745	return NULL;
1746	}	1746	}
1747	if (usb_endpoint_xfer_int(ep_desc)) {	1747	if (usb_endpoint_xfer_int(ep_desc)) {
1748	ep_type_name = "INT";	1748	ep_type_name = "INT";

drivers/usb/serial/option.c+11−0

 #define CINTERION_PRODUCT_PH8_AUDIO		0x0083
 #define CINTERION_PRODUCT_AHXX_2RMNET		0x0084
 #define CINTERION_PRODUCT_AHXX_AUDIO		0x0085
+#define CINTERION_PRODUCT_CLS8			0x00b0
 /* Olivetti products */
 #define OLIVETTI_VENDOR_ID			0x0b3c
 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
 	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),
 	  .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1050, 0xff),	/* Telit FN980 (rmnet) */
+	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1051, 0xff),	/* Telit FN980 (MBIM) */
+	  .driver_info = NCTRL(0) | RSVD(1) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1052, 0xff),	/* Telit FN980 (RNDIS) */
+	  .driver_info = NCTRL(2) | RSVD(3) },
+	{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1053, 0xff),	/* Telit FN980 (ECM) */
+	  .driver_info = NCTRL(0) | RSVD(1) },
 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
 	  .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
 	{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
 	  .driver_info = RSVD(4) },
 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) },
 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) },
+	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_CLS8, 0xff),
+	  .driver_info = RSVD(0) | RSVD(4) },
 	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },
 	{ USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
 	{ USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },

drivers/usb/serial/usb-serial.c+1−4

 	serial = port->serial;
 	owner = serial->type->driver.owner;
-	mutex_lock(&serial->disc_mutex);
+	usb_autopm_put_interface(serial->interface);
-	if (!serial->disconnected)
-		usb_autopm_put_interface(serial->interface);
-	mutex_unlock(&serial->disc_mutex);
 	usb_serial_put(serial);
 	module_put(owner);

drivers/usb/typec/tcpm/tcpm.c+8−6

 	/* USB data support is optional */
 	ret = fwnode_property_read_string(fwnode, "data-role", &cap_str);
 	if (ret == 0) {
-		port->typec_caps.data = typec_find_port_data_role(cap_str);
+		ret = typec_find_port_data_role(cap_str);
-		if (port->typec_caps.data < 0)
+		if (ret < 0)
-			return -EINVAL;
+			return ret;
+		port->typec_caps.data = ret;
 	}
 	ret = fwnode_property_read_string(fwnode, "power-role", &cap_str);
 	if (ret < 0)
 		return ret;
-	port->typec_caps.type = typec_find_port_power_role(cap_str);
+	ret = typec_find_port_power_role(cap_str);
-	if (port->typec_caps.type < 0)
+	if (ret < 0)
-		return -EINVAL;
+		return ret;
+	port->typec_caps.type = ret;
 	port->port_type = port->typec_caps.type;
 	if (port->port_type == TYPEC_PORT_SNK)

drivers/usb/typec/ucsi/displayport.c+2−0

@@ -75,6 +75,8 @@ static int ucsi_displayport_enter(struct typec_altmode *alt) · 74 unmodified lines
75		75
76	if (cur != 0xff) {	76	if (cur != 0xff) {
77	mutex_unlock(&dp->con->lock);	77	mutex_unlock(&dp->con->lock);
		78	if (dp->con->port_altmode[cur] == alt)
		79	return 0;
78	return -EBUSY;	80	return -EBUSY;
79	}	81	}
80		82

drivers/usb/typec/ucsi/ucsi_ccg.c+4−38

 	/* fw build with vendor information */
 	u16 fw_build;
-	bool run_isr; /* flag to call ISR routine during resume */
 	struct work_struct pm_work;
 };
 	if (quirks && quirks->max_read_len)
 		max_read_len = quirks->max_read_len;
-	if (uc->fw_build == CCG_FW_BUILD_NVIDIA &&
-	    uc->fw_version <= CCG_OLD_FW_VERSION) {
-		mutex_lock(&uc->lock);
-		/*
-		 * Do not schedule pm_work to run ISR in
-		 * ucsi_ccg_runtime_resume() after pm_runtime_get_sync()
-		 * since we are already in ISR path.
-		 */
-		uc->run_isr = false;
-		mutex_unlock(&uc->lock);
-	}
 	pm_runtime_get_sync(uc->dev);
 	while (rem_len > 0) {
 		msgs[1].buf = &data[len - rem_len];
 	msgs[0].len = len + sizeof(rab);
 	msgs[0].buf = buf;
-	if (uc->fw_build == CCG_FW_BUILD_NVIDIA &&
-	    uc->fw_version <= CCG_OLD_FW_VERSION) {
-		mutex_lock(&uc->lock);
-		/*
-		 * Do not schedule pm_work to run ISR in
-		 * ucsi_ccg_runtime_resume() after pm_runtime_get_sync()
-		 * since we are already in ISR path.
-		 */
-		uc->run_isr = false;
-		mutex_unlock(&uc->lock);
-	}
 	pm_runtime_get_sync(uc->dev);
 	status = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
 	if (status < 0) {
 	uc->ppm.sync = ucsi_ccg_sync;
 	uc->dev = dev;
 	uc->client = client;
-	uc->run_isr = true;
 	mutex_init(&uc->lock);
 	INIT_WORK(&uc->work, ccg_update_firmware);
 	INIT_WORK(&uc->pm_work, ccg_pm_workaround_work);
 	pm_runtime_set_active(uc->dev);
 	pm_runtime_enable(uc->dev);
+	pm_runtime_use_autosuspend(uc->dev);
+	pm_runtime_set_autosuspend_delay(uc->dev, 5000);
 	pm_runtime_idle(uc->dev);
 	return 0;
 {
 	struct i2c_client *client = to_i2c_client(dev);
 	struct ucsi_ccg *uc = i2c_get_clientdata(client);
-	bool schedule = true;
 	/*
 	 * Firmware version 3.1.10 or earlier, built for NVIDIA has known issue
 	 * Schedule a work to call ISR as a workaround.
 	 */
 	if (uc->fw_build == CCG_FW_BUILD_NVIDIA &&
-	    uc->fw_version <= CCG_OLD_FW_VERSION) {
+	    uc->fw_version <= CCG_OLD_FW_VERSION)
-		mutex_lock(&uc->lock);
+		schedule_work(&uc->pm_work);
-		if (!uc->run_isr) {
-			uc->run_isr = true;
-			schedule = false;
-		}
-		mutex_unlock(&uc->lock);
-		if (schedule)
-			schedule_work(&uc->pm_work);
-	}
 	return 0;
 }

drivers/usb/usb-skeleton.c+9−10

 	spinlock_t		err_lock;		/* lock for errors */
 	struct kref		kref;
 	struct mutex		io_mutex;		/* synchronize I/O with disconnect */
+	unsigned long		disconnected:1;
 	wait_queue_head_t	bulk_in_wait;		/* to wait for an ongoing read */
 };
 #define to_skel_dev(d) container_of(d, struct usb_skel, kref)
 	struct usb_skel *dev = to_skel_dev(kref);
 	usb_free_urb(dev->bulk_in_urb);
+	usb_put_intf(dev->interface);
 	usb_put_dev(dev->udev);
 	kfree(dev->bulk_in_buffer);
 	kfree(dev);
 		return -ENODEV;
 	/* allow the device to be autosuspended */
-	mutex_lock(&dev->io_mutex);
+	usb_autopm_put_interface(dev->interface);
-	if (dev->interface)
-		usb_autopm_put_interface(dev->interface);
-	mutex_unlock(&dev->io_mutex);
 	/* decrement the count on our device */
 	kref_put(&dev->kref, skel_delete);
 	dev = file->private_data;
-	/* if we cannot read at all, return EOF */
+	if (!count)
-	if (!dev->bulk_in_urb || !count)
 		return 0;
 	/* no concurrent readers */
 	if (rv < 0)
 		return rv;
-	if (!dev->interface) {		/* disconnect() was called */
+	if (dev->disconnected) {		/* disconnect() was called */
 		rv = -ENODEV;
 		goto exit;
 	}
 	/* this lock makes sure we don't submit URBs to gone devices */
 	mutex_lock(&dev->io_mutex);
-	if (!dev->interface) {		/* disconnect() was called */
+	if (dev->disconnected) {		/* disconnect() was called */
 		mutex_unlock(&dev->io_mutex);
 		retval = -ENODEV;
 		goto error;
 	init_waitqueue_head(&dev->bulk_in_wait);
 	dev->udev = usb_get_dev(interface_to_usbdev(interface));
-	dev->interface = interface;
+	dev->interface = usb_get_intf(interface);
 	/* set up the endpoint information */
 	/* use only the first bulk-in and bulk-out endpoints */
 	/* prevent more I/O from starting */
 	mutex_lock(&dev->io_mutex);
-	dev->interface = NULL;
+	dev->disconnected = 1;
 	mutex_unlock(&dev->io_mutex);
+	usb_kill_urb(dev->bulk_in_urb);
 	usb_kill_anchored_urbs(&dev->submitted);
 	/* decrement our usage count */

drivers/usb/usbip/vhci_hcd.c+2−2

@@ -1195,12 +1195,12 @@ static int vhci_start(struct usb_hcd *hcd) · 1194 unmodified lines
1195	if (id == 0 && usb_hcd_is_primary_hcd(hcd)) {	1195	if (id == 0 && usb_hcd_is_primary_hcd(hcd)) {
1196	err = vhci_init_attr_group();	1196	err = vhci_init_attr_group();
1197	if (err) {	1197	if (err) {
1198	pr_err("init attr group\n");	1198	dev_err(hcd_dev(hcd), "init attr group failed, err = %d\n", err);
1199	return err;	1199	return err;
1200	}	1200	}
1201	err = sysfs_create_group(&hcd_dev(hcd)->kobj, &vhci_attr_group);	1201	err = sysfs_create_group(&hcd_dev(hcd)->kobj, &vhci_attr_group);
1202	if (err) {	1202	if (err) {
1203	pr_err("create sysfs files\n");	1203	dev_err(hcd_dev(hcd), "create sysfs files failed, err = %d\n", err);
1204	vhci_finish_attr_group();	1204	vhci_finish_attr_group();
1205	return err;	1205	return err;
1206	}	1206	}

drivers/video/logo/Makefile+2−19

@@ -18,23 +18,6 @@ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o · 17 unmodified lines
18		18
19	# How to generate logo's	19	# How to generate logo's
20		20
21	# Use logo-cfiles to retrieve list of .c files to be built
22	logo-cfiles = $(notdir $(patsubst %.$(2), %.c, \
23	$(wildcard $(srctree)/$(src)/*$(1).$(2))))
24
25
26	# Mono logos
27	extra-y += $(call logo-cfiles,_mono,pbm)
28
29	# VGA16 logos
30	extra-y += $(call logo-cfiles,_vga16,ppm)
31
32	# 224 Logos
33	extra-y += $(call logo-cfiles,_clut224,ppm)
34
35	# Gray 256
36	extra-y += $(call logo-cfiles,_gray256,pgm)
37
38	pnmtologo := scripts/pnmtologo	21	pnmtologo := scripts/pnmtologo
39		22
40	# Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."	23	# Create commands like "pnmtologo -t mono -n logo_mac_mono -o ..."
@@ -55,5 +38,5 @@ $(obj)/%_clut224.c: $(src)/%_clut224.ppm $(pnmtologo) FORCE · 14 unmodified lines
55	$(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE	38	$(obj)/%_gray256.c: $(src)/%_gray256.pgm $(pnmtologo) FORCE
56	$(call if_changed,logo)	39	$(call if_changed,logo)
57		40
58	# Files generated that shall be removed upon make clean	41	# generated C files
59	clean-files := .o _mono.c _vga16.c _clut224.c *_gray256.c	42	targets += _mono.c _vga16.c _clut224.c _gray256.c

drivers/virt/vboxguest/vboxguest_utils.c+2−1

 	if (!bounce_buf)
 		return -ENOMEM;
+	*bounce_buf_ret = bounce_buf;
 	if (copy_in) {
 		ret = copy_from_user(bounce_buf, (void __user *)buf, len);
 		if (ret)
 		memset(bounce_buf, 0, len);
 	}
-	*bounce_buf_ret = bounce_buf;
 	hgcm_call_add_pagelist_size(bounce_buf, len, extra);
 	return 0;
 }

drivers/w1/slaves/Kconfig+1−0

@@ -103,6 +103,7 @@ config W1_SLAVE_DS2438 · 102 unmodified lines
103		103
104	config W1_SLAVE_DS250X	104	config W1_SLAVE_DS250X
105	tristate "512b/1kb/16kb EPROM family support"	105	tristate "512b/1kb/16kb EPROM family support"
		106	select CRC16
106	help	107	help
107	Say Y here if you want to use a 1-wire	108	Say Y here if you want to use a 1-wire
108	512b/1kb/16kb EPROM family device (DS250x).	109	512b/1kb/16kb EPROM family device (DS250x).

drivers/xen/balloon.c+7−17

 	(GFP_HIGHUSER | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC)
 /* balloon_append: add the given page to the balloon. */
-static void __balloon_append(struct page *page)
+static void balloon_append(struct page *page)
 {
+	__SetPageOffline(page);
 	/* Lowmem is re-populated first, so highmem pages go at list tail. */
 	if (PageHighMem(page)) {
 		list_add_tail(&page->lru, &ballooned_pages);
 	wake_up(&balloon_wq);
 }
-static void balloon_append(struct page *page)
-{
-	__balloon_append(page);
-}
 /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */
 static struct page *balloon_retrieve(bool require_lowmem)
 {
 	else
 		balloon_stats.balloon_low--;
+	__ClearPageOffline(page);
 	return page;
 }
 	for (i = 0; i < size; i++) {
 		p = pfn_to_page(start_pfn + i);
 		__online_page_set_limits(p);
-		__SetPageOffline(p);
+		balloon_append(p);
-		__balloon_append(p);
 	}
 	mutex_unlock(&balloon_mutex);
 }
 		xenmem_reservation_va_mapping_update(1, &page, &frame_list[i]);
 		/* Relinquish the page back to the allocator. */
-		__ClearPageOffline(page);
 		free_reserved_page(page);
 	}
 			state = BP_EAGAIN;
 			break;
 		}
-		__SetPageOffline(page);
 		adjust_managed_page_count(page, -1);
 		xenmem_reservation_scrub_page(page);
 		list_add(&page->lru, &pages);
 	while (pgno < nr_pages) {
 		page = balloon_retrieve(true);
 		if (page) {
-			__ClearPageOffline(page);
 			pages[pgno++] = page;
 #ifdef CONFIG_XEN_HAVE_PVMMU
 			/*
 	mutex_lock(&balloon_mutex);
 	for (i = 0; i < nr_pages; i++) {
-		if (pages[i]) {
+		if (pages[i])
-			__SetPageOffline(pages[i]);
 			balloon_append(pages[i]);
-		}
 	}
 	balloon_stats.target_unpopulated -= nr_pages;
 				      unsigned long pages)
 {
 	unsigned long pfn, extra_pfn_end;
-	struct page *page;
 	/*
 	 * If the amount of usable memory has been limited (e.g., with
 	extra_pfn_end = min(max_pfn, start_pfn + pages);
 	for (pfn = start_pfn; pfn < extra_pfn_end; pfn++) {
-		page = pfn_to_page(pfn);
 		/* totalram_pages and totalhigh_pages do not
 		   include the boot-time balloon extension, so
 		   don't subtract from it. */
-		__balloon_append(page);
+		balloon_append(pfn_to_page(pfn));
 	}
 	balloon_stats.total_pages += extra_pfn_end - start_pfn;

drivers/xen/efi.c+47−37

@@ -40,7 +40,7 @@ · 39 unmodified lines
40		40
41	#define efi_data(op) (op.u.efi_runtime_call)	41	#define efi_data(op) (op.u.efi_runtime_call)
42		42
43	efi_status_t xen_efi_get_time(efi_time_t tm, efi_time_cap_t tc)	43	static efi_status_t xen_efi_get_time(efi_time_t tm, efi_time_cap_t tc)
44	{	44	{
45	struct xen_platform_op op = INIT_EFI_OP(get_time);	45	struct xen_platform_op op = INIT_EFI_OP(get_time);
46		46
@@ -61,9 +61,8 @@ efi_status_t xen_efi_get_time(efi_time_t tm, efi_time_cap_t tc) · 14 unmodified lines
61		61
62	return efi_data(op).status;	62	return efi_data(op).status;
63	}	63	}
64	EXPORT_SYMBOL_GPL(xen_efi_get_time);
65		64
66	efi_status_t xen_efi_set_time(efi_time_t *tm)	65	static efi_status_t xen_efi_set_time(efi_time_t *tm)
67	{	66	{
68	struct xen_platform_op op = INIT_EFI_OP(set_time);	67	struct xen_platform_op op = INIT_EFI_OP(set_time);
69		68
@@ -75,10 +74,10 @@ efi_status_t xen_efi_set_time(efi_time_t *tm) · 5 unmodified lines
75		74
76	return efi_data(op).status;	75	return efi_data(op).status;
77	}	76	}
78	EXPORT_SYMBOL_GPL(xen_efi_set_time);
79		77
80	efi_status_t xen_efi_get_wakeup_time(efi_bool_t enabled, efi_bool_t pending,	78	static efi_status_t xen_efi_get_wakeup_time(efi_bool_t *enabled,
81	efi_time_t *tm)	79	efi_bool_t *pending,
		80	efi_time_t *tm)
82	{	81	{
83	struct xen_platform_op op = INIT_EFI_OP(get_wakeup_time);	82	struct xen_platform_op op = INIT_EFI_OP(get_wakeup_time);
84		83
@@ -98,9 +97,8 @@ efi_status_t xen_efi_get_wakeup_time(efi_bool_t enabled, efi_bool_t pending, · 13 unmodified lines
98		97
99	return efi_data(op).status;	98	return efi_data(op).status;
100	}	99	}
101	EXPORT_SYMBOL_GPL(xen_efi_get_wakeup_time);
102		100
103	efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)	101	static efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
104	{	102	{
105	struct xen_platform_op op = INIT_EFI_OP(set_wakeup_time);	103	struct xen_platform_op op = INIT_EFI_OP(set_wakeup_time);
106		104
@@ -117,11 +115,10 @@ efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm) · 10 unmodified lines
117		115
118	return efi_data(op).status;	116	return efi_data(op).status;
119	}	117	}
120	EXPORT_SYMBOL_GPL(xen_efi_set_wakeup_time);
121		118
122	efi_status_t xen_efi_get_variable(efi_char16_t name, efi_guid_t vendor,	119	static efi_status_t xen_efi_get_variable(efi_char16_t name, efi_guid_t vendor,
123	u32 attr, unsigned long data_size,	120	u32 attr, unsigned long data_size,
124	void *data)	121	void *data)
125	{	122	{
126	struct xen_platform_op op = INIT_EFI_OP(get_variable);	123	struct xen_platform_op op = INIT_EFI_OP(get_variable);
127		124
@@ -141,11 +138,10 @@ efi_status_t xen_efi_get_variable(efi_char16_t name, efi_guid_t vendor, · 13 unmodified lines
141		138
142	return efi_data(op).status;	139	return efi_data(op).status;
143	}	140	}
144	EXPORT_SYMBOL_GPL(xen_efi_get_variable);
145		141
146	efi_status_t xen_efi_get_next_variable(unsigned long *name_size,	142	static efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
147	efi_char16_t *name,	143	efi_char16_t *name,
148	efi_guid_t *vendor)	144	efi_guid_t *vendor)
149	{	145	{
150	struct xen_platform_op op = INIT_EFI_OP(get_next_variable_name);	146	struct xen_platform_op op = INIT_EFI_OP(get_next_variable_name);
151		147
@@ -165,11 +161,10 @@ efi_status_t xen_efi_get_next_variable(unsigned long *name_size, · 13 unmodified lines
165		161
166	return efi_data(op).status;	162	return efi_data(op).status;
167	}	163	}
168	EXPORT_SYMBOL_GPL(xen_efi_get_next_variable);
169		164
170	efi_status_t xen_efi_set_variable(efi_char16_t name, efi_guid_t vendor,	165	static efi_status_t xen_efi_set_variable(efi_char16_t name, efi_guid_t vendor,
171	u32 attr, unsigned long data_size,	166	u32 attr, unsigned long data_size,
172	void *data)	167	void *data)
173	{	168	{
174	struct xen_platform_op op = INIT_EFI_OP(set_variable);	169	struct xen_platform_op op = INIT_EFI_OP(set_variable);
175		170
@@ -186,11 +181,10 @@ efi_status_t xen_efi_set_variable(efi_char16_t name, efi_guid_t vendor, · 10 unmodified lines
186		181
187	return efi_data(op).status;	182	return efi_data(op).status;
188	}	183	}
189	EXPORT_SYMBOL_GPL(xen_efi_set_variable);
190		184
191	efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,	185	static efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
192	u64 *remaining_space,	186	u64 *remaining_space,
193	u64 *max_variable_size)	187	u64 *max_variable_size)
194	{	188	{
195	struct xen_platform_op op = INIT_EFI_OP(query_variable_info);	189	struct xen_platform_op op = INIT_EFI_OP(query_variable_info);
196		190
@@ -208,9 +202,8 @@ efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space, · 11 unmodified lines
208		202
209	return efi_data(op).status;	203	return efi_data(op).status;
210	}	204	}
211	EXPORT_SYMBOL_GPL(xen_efi_query_variable_info);
212		205
213	efi_status_t xen_efi_get_next_high_mono_count(u32 *count)	206	static efi_status_t xen_efi_get_next_high_mono_count(u32 *count)
214	{	207	{
215	struct xen_platform_op op = INIT_EFI_OP(get_next_high_monotonic_count);	208	struct xen_platform_op op = INIT_EFI_OP(get_next_high_monotonic_count);
216		209
@@ -221,10 +214,9 @@ efi_status_t xen_efi_get_next_high_mono_count(u32 *count) · 4 unmodified lines
221		214
222	return efi_data(op).status;	215	return efi_data(op).status;
223	}	216	}
224	EXPORT_SYMBOL_GPL(xen_efi_get_next_high_mono_count);
225		217
226	efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,	218	static efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
227	unsigned long count, unsigned long sg_list)	219	unsigned long count, unsigned long sg_list)
228	{	220	{
229	struct xen_platform_op op = INIT_EFI_OP(update_capsule);	221	struct xen_platform_op op = INIT_EFI_OP(update_capsule);
230		222
@@ -241,11 +233,9 @@ efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules, · 10 unmodified lines
241		233
242	return efi_data(op).status;	234	return efi_data(op).status;
243	}	235	}
244	EXPORT_SYMBOL_GPL(xen_efi_update_capsule);
245		236
246	efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,	237	static efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
247	unsigned long count, u64 *max_size,	238	unsigned long count, u64 max_size, int reset_type)
248	int *reset_type)
249	{	239	{
250	struct xen_platform_op op = INIT_EFI_OP(query_capsule_capabilities);	240	struct xen_platform_op op = INIT_EFI_OP(query_capsule_capabilities);
251		241
@@ -264,10 +254,9 @@ efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules, · 12 unmodified lines
264		254
265	return efi_data(op).status;	255	return efi_data(op).status;
266	}	256	}
267	EXPORT_SYMBOL_GPL(xen_efi_query_capsule_caps);
268		257
269	void xen_efi_reset_system(int reset_type, efi_status_t status,	258	static void xen_efi_reset_system(int reset_type, efi_status_t status,
270	unsigned long data_size, efi_char16_t *data)	259	unsigned long data_size, efi_char16_t *data)
271	{	260	{
272	switch (reset_type) {	261	switch (reset_type) {
273	case EFI_RESET_COLD:	262	case EFI_RESET_COLD:
@@ -281,4 +270,25 @@ void xen_efi_reset_system(int reset_type, efi_status_t status, · 7 unmodified lines
281	BUG();	270	BUG();
282	}	271	}
283	}	272	}
284	EXPORT_SYMBOL_GPL(xen_efi_reset_system);	273
		274	/*
		275	* Set XEN EFI runtime services function pointers. Other fields of struct efi,
		276	* e.g. efi.systab, will be set like normal EFI.
		277	*/
		278	void __init xen_efi_runtime_setup(void)
		279	{
		280	efi.get_time = xen_efi_get_time;
		281	efi.set_time = xen_efi_set_time;
		282	efi.get_wakeup_time = xen_efi_get_wakeup_time;
		283	efi.set_wakeup_time = xen_efi_set_wakeup_time;
		284	efi.get_variable = xen_efi_get_variable;
		285	efi.get_next_variable = xen_efi_get_next_variable;
		286	efi.set_variable = xen_efi_set_variable;
		287	efi.set_variable_nonblocking = xen_efi_set_variable;
		288	efi.query_variable_info = xen_efi_query_variable_info;
		289	efi.query_variable_info_nonblocking = xen_efi_query_variable_info;
		290	efi.update_capsule = xen_efi_update_capsule;
		291	efi.query_capsule_caps = xen_efi_query_capsule_caps;
		292	efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count;
		293	efi.reset_system = xen_efi_reset_system;
		294	}

drivers/xen/gntdev.c+2−11

@@ -22,6 +22,7 @@ · 21 unmodified lines
22		22
23	#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt	23	#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
24		24
		25	#include <linux/dma-mapping.h>
25	#include <linux/module.h>	26	#include <linux/module.h>
26	#include <linux/kernel.h>	27	#include <linux/kernel.h>
27	#include <linux/init.h>	28	#include <linux/init.h>
@@ -34,9 +35,6 @@ · 6 unmodified lines
34	#include <linux/slab.h>	35	#include <linux/slab.h>
35	#include <linux/highmem.h>	36	#include <linux/highmem.h>
36	#include <linux/refcount.h>	37	#include <linux/refcount.h>
37	#ifdef CONFIG_XEN_GRANT_DMA_ALLOC
38	#include <linux/of_device.h>
39	#endif
40		38
41	#include <xen/xen.h>	39	#include <xen/xen.h>
42	#include <xen/grant_table.h>	40	#include <xen/grant_table.h>
@@ -625,14 +623,7 @@ static int gntdev_open(struct inode inode, struct file flip) · 582 unmodified lines
625	flip->private_data = priv;	623	flip->private_data = priv;
626	#ifdef CONFIG_XEN_GRANT_DMA_ALLOC	624	#ifdef CONFIG_XEN_GRANT_DMA_ALLOC
627	priv->dma_dev = gntdev_miscdev.this_device;	625	priv->dma_dev = gntdev_miscdev.this_device;
628		626	dma_coerce_mask_and_coherent(priv->dma_dev, DMA_BIT_MASK(64));
629	/*
630	* The device is not spawn from a device tree, so arch_setup_dma_ops
631	* is not called, thus leaving the device with dummy DMA ops.
632	* Fix this by calling of_dma_configure() with a NULL node to set
633	* default DMA ops.
634	*/
635	of_dma_configure(priv->dma_dev, NULL, true);
636	#endif	627	#endif
637	pr_debug("priv %p\n", priv);	628	pr_debug("priv %p\n", priv);
638		629

drivers/xen/grant-table.c+1−2

 	if (xen_feature(XENFEAT_auto_translated_physmap) && gnttab_shared.addr == NULL) {
 		gnttab_shared.addr = xen_auto_xlat_grant_frames.vaddr;
 		if (gnttab_shared.addr == NULL) {
-			pr_warn("gnttab share frames (addr=0x%08lx) is not mapped!\n",
+			pr_warn("gnttab share frames is not mapped!\n");
-				(unsigned long)xen_auto_xlat_grant_frames.vaddr);
 			return -ENOMEM;
 		}
 	}

drivers/xen/xenbus/xenbus_dev_frontend.c+18−2

 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/miscdevice.h>
+#include <linux/workqueue.h>
 #include <xen/xenbus.h>
 #include <xen/xen.h>
 	wait_queue_head_t read_waitq;
 	struct kref kref;
+	struct work_struct wq;
 };
 /* Read out any raw xenbus messages queued up. */
 	mutex_unlock(&adap->dev_data->reply_mutex);
 }
-static void xenbus_file_free(struct kref *kref)
+static void xenbus_worker(struct work_struct *wq)
 {
 	struct xenbus_file_priv *u;
 	struct xenbus_transaction_holder *trans, *tmp;
 	struct watch_adapter *watch, *tmp_watch;
 	struct read_buffer *rb, *tmp_rb;
-	u = container_of(kref, struct xenbus_file_priv, kref);
+	u = container_of(wq, struct xenbus_file_priv, wq);
 	/*
 	 * No need for locking here because there are no other users,
 	kfree(u);
 }
+static void xenbus_file_free(struct kref *kref)
+{
+	struct xenbus_file_priv *u;
+	/*
+	 * We might be called in xenbus_thread().
+	 * Use workqueue to avoid deadlock.
+	 */
+	u = container_of(kref, struct xenbus_file_priv, kref);
+	schedule_work(&u->wq);
+}
 static struct xenbus_transaction_holder *xenbus_get_transaction(
 	struct xenbus_file_priv *u, uint32_t tx_id)
 {
 	INIT_LIST_HEAD(&u->watches);
 	INIT_LIST_HEAD(&u->read_buffers);
 	init_waitqueue_head(&u->read_waitq);
+	INIT_WORK(&u->wq, xenbus_worker);
 	mutex_init(&u->reply_mutex);
 	mutex_init(&u->msgbuffer_mutex);

fs/binfmt_elf.c+3−10

 	   the correct location in memory. */
 	for(i = 0, elf_ppnt = elf_phdata;
 	    i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
-		int elf_prot, elf_flags, elf_fixed = MAP_FIXED_NOREPLACE;
+		int elf_prot, elf_flags;
 		unsigned long k, vaddr;
 		unsigned long total_size = 0;
 					 */
 				}
 			}
-			/*
-			 * Some binaries have overlapping elf segments and then
-			 * we have to forcefully map over an existing mapping
-			 * e.g. over this newly established brk mapping.
-			 */
-			elf_fixed = MAP_FIXED;
 		}
 		elf_prot = make_prot(elf_ppnt->p_flags);
 		 * the ET_DYN load_addr calculations, proceed normally.
 		 */
 		if (loc->elf_ex.e_type == ET_EXEC || load_addr_set) {
-			elf_flags |= elf_fixed;
+			elf_flags |= MAP_FIXED;
 		} else if (loc->elf_ex.e_type == ET_DYN) {
 			/*
 			 * This logic is run once for the first LOAD Program
 				load_bias = ELF_ET_DYN_BASE;
 				if (current->flags & PF_RANDOMIZE)
 					load_bias += arch_mmap_rnd();
-				elf_flags |= elf_fixed;
+				elf_flags |= MAP_FIXED;
 			} else
 				load_bias = 0;

fs/btrfs/file.c+12−1

 	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	struct page **pages = NULL;
-	struct extent_state *cached_state = NULL;
 	struct extent_changeset *data_reserved = NULL;
 	u64 release_bytes = 0;
 	u64 lockstart;
 		return -ENOMEM;
 	while (iov_iter_count(i) > 0) {
+		struct extent_state *cached_state = NULL;
 		size_t offset = offset_in_page(pos);
 		size_t sector_offset;
 		size_t write_bytes = min(iov_iter_count(i),
 		if (copied > 0)
 			ret = btrfs_dirty_pages(inode, pages, dirty_pages,
 						pos, copied, &cached_state);
+		/*
+		 * If we have not locked the extent range, because the range's
+		 * start offset is >= i_size, we might still have a non-NULL
+		 * cached extent state, acquired while marking the extent range
+		 * as delalloc through btrfs_dirty_pages(). Therefore free any
+		 * possible cached extent state to avoid a memory leak.
+		 */
 		if (extents_locked)
 			unlock_extent_cached(&BTRFS_I(inode)->io_tree,
 					     lockstart, lockend, &cached_state);
+		else
+			free_extent_state(cached_state);
 		btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes,
 					       true);
 		if (ret) {

fs/btrfs/inode.c+3−0

 	u32 sizes[2];
 	int nitems = name ? 2 : 1;
 	unsigned long ptr;
+	unsigned int nofs_flag;
 	int ret;
 	path = btrfs_alloc_path();
 	if (!path)
 		return ERR_PTR(-ENOMEM);
+	nofs_flag = memalloc_nofs_save();
 	inode = new_inode(fs_info->sb);
+	memalloc_nofs_restore(nofs_flag);
 	if (!inode) {
 		btrfs_free_path(path);
 		return ERR_PTR(-ENOMEM);

fs/btrfs/ref-verify.c+1−1

@@ -500,7 +500,7 @@ static int process_leaf(struct btrfs_root *root, · 499 unmodified lines
500	struct btrfs_extent_data_ref *dref;	500	struct btrfs_extent_data_ref *dref;
501	struct btrfs_shared_data_ref *sref;	501	struct btrfs_shared_data_ref *sref;
502	u32 count;	502	u32 count;
503	int i = 0, tree_block_level = 0, ret;	503	int i = 0, tree_block_level = 0, ret = 0;
504	struct btrfs_key key;	504	struct btrfs_key key;
505	int nritems = btrfs_header_nritems(leaf);	505	int nritems = btrfs_header_nritems(leaf);
506		506

fs/btrfs/send.c+1−1

@@ -5085,7 +5085,7 @@ static int clone_range(struct send_ctx *sctx, · 5084 unmodified lines
5085	struct btrfs_path *path;	5085	struct btrfs_path *path;
5086	struct btrfs_key key;	5086	struct btrfs_key key;
5087	int ret;	5087	int ret;
5088	u64 clone_src_i_size;	5088	u64 clone_src_i_size = 0;
5089		5089
5090	/*	5090	/*
5091	* Prevent cloning from a zero offset with a length matching the sector	5091	* Prevent cloning from a zero offset with a length matching the sector

fs/btrfs/tree-log.c+27−9

  * in the tree of log roots
  */
 static int update_log_root(struct btrfs_trans_handle *trans,
-			   struct btrfs_root *log)
+			   struct btrfs_root *log,
+			   struct btrfs_root_item *root_item)
 {
 	struct btrfs_fs_info *fs_info = log->fs_info;
 	int ret;
 	if (log->log_transid == 1) {
 		/* insert root item on the first sync */
 		ret = btrfs_insert_root(trans, fs_info->log_root_tree,
-				&log->root_key, &log->root_item);
+				&log->root_key, root_item);
 	} else {
 		ret = btrfs_update_root(trans, fs_info->log_root_tree,
-				&log->root_key, &log->root_item);
+				&log->root_key, root_item);
 	}
 	return ret;
 }
 	struct btrfs_fs_info *fs_info = root->fs_info;
 	struct btrfs_root *log = root->log_root;
 	struct btrfs_root *log_root_tree = fs_info->log_root_tree;
+	struct btrfs_root_item new_root_item;
 	int log_transid = 0;
 	struct btrfs_log_ctx root_log_ctx;
 	struct blk_plug plug;
 		goto out;
 	}
+	/*
+	 * We _must_ update under the root->log_mutex in order to make sure we
+	 * have a consistent view of the log root we are trying to commit at
+	 * this moment.
+	 *
+	 * We _must_ copy this into a local copy, because we are not holding the
+	 * log_root_tree->log_mutex yet.  This is important because when we
+	 * commit the log_root_tree we must have a consistent view of the
+	 * log_root_tree when we update the super block to point at the
+	 * log_root_tree bytenr.  If we update the log_root_tree here we'll race
+	 * with the commit and possibly point at the new block which we may not
+	 * have written out.
+	 */
 	btrfs_set_root_node(&log->root_item, log->node);
+	memcpy(&new_root_item, &log->root_item, sizeof(new_root_item));
 	root->log_transid++;
 	log->log_transid = root->log_transid;
 	root->log_start_pid = 0;
-	/*
-	 * Update or create log root item under the root's log_mutex to prevent
-	 * races with concurrent log syncs that can lead to failure to update
-	 * log root item because it was not created yet.
-	 */
-	ret = update_log_root(trans, log);
 	/*
 	 * IO has been started, blocks of the log tree have WRITTEN flag set
 	 * in their headers. new modifications of the log will be written to
 	mutex_unlock(&log_root_tree->log_mutex);
 	mutex_lock(&log_root_tree->log_mutex);
+	/*
+	 * Now we are safe to update the log_root_tree because we're under the
+	 * log_mutex, and we're a current writer so we're holding the commit
+	 * open until we drop the log_mutex.
+	 */
+	ret = update_log_root(trans, log, &new_root_item);
 	if (atomic_dec_and_test(&log_root_tree->log_writers)) {
 		/* atomic_dec_and_test implies a barrier */
 		cond_wake_up_nomb(&log_root_tree->log_writer_wait);

fs/btrfs/volumes.c+5−1

 		return !extended; /* "0" is valid for usual profiles */
 	/* true if exactly one bit set */
-	return is_power_of_2(flags);
+	/*
+	 * Don't use is_power_of_2(unsigned long) because it won't work
+	 * for the single profile (1ULL << 48) on 32-bit CPUs.
+	 */
+	return flags != 0 && (flags & (flags - 1)) == 0;
 }
 static inline int balance_need_close(struct btrfs_fs_info *fs_info)

fs/cifs/cifsfs.c+16−8

@@ -169,18 +169,26 @@ cifs_read_super(struct super_block *sb) · 168 unmodified lines
169	else	169	else
170	sb->s_maxbytes = MAX_NON_LFS;	170	sb->s_maxbytes = MAX_NON_LFS;
171		171
172	/* BB FIXME fix time_gran to be larger for LANMAN sessions */	172	/* Some very old servers like DOS and OS/2 used 2 second granularity */
173	sb->s_time_gran = 100;	173	if ((tcon->ses->server->vals->protocol_id == SMB10_PROT_ID) &&
174		174	((tcon->ses->capabilities &
175	if (tcon->unix_ext) {	175	tcon->ses->server->vals->cap_nt_find) == 0) &&
176	ts = cifs_NTtimeToUnix(0);	176	!tcon->unix_ext) {
		177	sb->s_time_gran = 1000000000; /* 1 second is max allowed gran */
		178	ts = cnvrtDosUnixTm(cpu_to_le16(SMB_DATE_MIN), 0, 0);
177	sb->s_time_min = ts.tv_sec;	179	sb->s_time_min = ts.tv_sec;
178	ts = cifs_NTtimeToUnix(cpu_to_le64(S64_MAX));	180	ts = cnvrtDosUnixTm(cpu_to_le16(SMB_DATE_MAX),
		181	cpu_to_le16(SMB_TIME_MAX), 0);
179	sb->s_time_max = ts.tv_sec;	182	sb->s_time_max = ts.tv_sec;
180	} else {	183	} else {
181	ts = cnvrtDosUnixTm(cpu_to_le16(SMB_DATE_MIN), 0, 0);	184	/*
		185	* Almost every server, including all SMB2+, uses DCE TIME
		186	* ie 100 nanosecond units, since 1601. See MS-DTYP and MS-FSCC
		187	*/
		188	sb->s_time_gran = 100;
		189	ts = cifs_NTtimeToUnix(0);
182	sb->s_time_min = ts.tv_sec;	190	sb->s_time_min = ts.tv_sec;
183	ts = cnvrtDosUnixTm(cpu_to_le16(SMB_DATE_MAX), cpu_to_le16(SMB_TIME_MAX), 0);	191	ts = cifs_NTtimeToUnix(cpu_to_le64(S64_MAX));
184	sb->s_time_max = ts.tv_sec;	192	sb->s_time_max = ts.tv_sec;
185	}	193	}
186		194

fs/cifs/cifsglob.h+1−1

@@ -1210,7 +1210,7 @@ struct cifs_search_info { · 1209 unmodified lines
1210	bool smallBuf:1; /* so we know which buf_release function to call */	1210	bool smallBuf:1; /* so we know which buf_release function to call */
1211	};	1211	};
1212		1212
1213	#define ACL_NO_MODE -1	1213	#define ACL_NO_MODE ((umode_t)(-1))
1214	struct cifs_open_parms {	1214	struct cifs_open_parms {
1215	struct cifs_tcon *tcon;	1215	struct cifs_tcon *tcon;
1216	struct cifs_sb_info *cifs_sb;	1216	struct cifs_sb_info *cifs_sb;

fs/cifs/connect.c+2−2

@@ -4264,7 +4264,7 @@ static int mount_get_conns(struct smb_vol vol, struct cifs_sb_info cifs_sb, · 4263 unmodified lines
4264	server->ops->qfs_tcon(*xid, tcon);	4264	server->ops->qfs_tcon(*xid, tcon);
4265	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RO_CACHE) {	4265	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RO_CACHE) {
4266	if (tcon->fsDevInfo.DeviceCharacteristics &	4266	if (tcon->fsDevInfo.DeviceCharacteristics &
4267	FILE_READ_ONLY_DEVICE)	4267	cpu_to_le32(FILE_READ_ONLY_DEVICE))
4268	cifs_dbg(VFS, "mounted to read only share\n");	4268	cifs_dbg(VFS, "mounted to read only share\n");
4269	else if ((cifs_sb->mnt_cifs_flags &	4269	else if ((cifs_sb->mnt_cifs_flags &
4270	CIFS_MOUNT_RW_CACHE) == 0)	4270	CIFS_MOUNT_RW_CACHE) == 0)
@@ -4445,7 +4445,7 @@ static int setup_dfs_tgt_conn(const char *path, · 174 unmodified lines
4445	int rc;	4445	int rc;
4446	struct dfs_info3_param ref = {0};	4446	struct dfs_info3_param ref = {0};
4447	char mdata = NULL, fake_devname = NULL;	4447	char mdata = NULL, fake_devname = NULL;
4448	struct smb_vol fake_vol = {0};	4448	struct smb_vol fake_vol = {NULL};
4449		4449
4450	cifs_dbg(FYI, "%s: dfs path: %s\n", __func__, path);	4450	cifs_dbg(FYI, "%s: dfs path: %s\n", __func__, path);
4451		4451

fs/cifs/dir.c+7−1

 static int
 cifs_d_revalidate(struct dentry *direntry, unsigned int flags)
 {
+	struct inode *inode;
 	if (flags & LOOKUP_RCU)
 		return -ECHILD;
 	if (d_really_is_positive(direntry)) {
+		inode = d_inode(direntry);
+		if ((flags & LOOKUP_REVAL) && !CIFS_CACHE_READ(CIFS_I(inode)))
+			CIFS_I(inode)->time = 0; /* force reval */
 		if (cifs_revalidate_dentry(direntry))
 			return 0;
 		else {
 			 * attributes will have been updated by
 			 * cifs_revalidate_dentry().
 			 */
-			if (IS_AUTOMOUNT(d_inode(direntry)) &&
+			if (IS_AUTOMOUNT(inode) &&
 			   !(direntry->d_flags & DCACHE_NEED_AUTOMOUNT)) {
 				spin_lock(&direntry->d_lock);
 				direntry->d_flags |= DCACHE_NEED_AUTOMOUNT;

fs/cifs/file.c+17−16

 		rc = cifs_get_inode_info(&inode, full_path, buf, inode->i_sb,
 					 xid, fid);
+	if (rc) {
+		server->ops->close(xid, tcon, fid);
+		if (rc == -ESTALE)
+			rc = -EOPENSTALE;
+	}
 out:
 	kfree(buf);
 	return rc;
 {
 	struct cifsFileInfo *open_file = NULL;
 	struct cifs_sb_info *cifs_sb = CIFS_SB(cifs_inode->vfs_inode.i_sb);
-	struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb);
 	/* only filter by fsuid on multiuser mounts */
 	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))
 		fsuid_only = false;
-	spin_lock(&tcon->open_file_lock);
+	spin_lock(&cifs_inode->open_file_lock);
 	/* we could simply get the first_list_entry since write-only entries
 	   are always at the end of the list but since the first entry might
 	   have a close pending, we go through the whole list */
 				/* found a good file */
 				/* lock it so it will not be closed on us */
 				cifsFileInfo_get(open_file);
-				spin_unlock(&tcon->open_file_lock);
+				spin_unlock(&cifs_inode->open_file_lock);
 				return open_file;
 			} /* else might as well continue, and look for
 			     another, or simply have the caller reopen it
 		} else /* write only file */
 			break; /* write only files are last so must be done */
 	}
-	spin_unlock(&tcon->open_file_lock);
+	spin_unlock(&cifs_inode->open_file_lock);
 	return NULL;
 }
 {
 	struct cifsFileInfo *open_file, *inv_file = NULL;
 	struct cifs_sb_info *cifs_sb;
-	struct cifs_tcon *tcon;
 	bool any_available = false;
 	int rc = -EBADF;
 	unsigned int refind = 0;
 	}
 	cifs_sb = CIFS_SB(cifs_inode->vfs_inode.i_sb);
-	tcon = cifs_sb_master_tcon(cifs_sb);
 	/* only filter by fsuid on multiuser mounts */
 	if (!(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER))
 		fsuid_only = false;
-	spin_lock(&tcon->open_file_lock);
+	spin_lock(&cifs_inode->open_file_lock);
 refind_writable:
 	if (refind > MAX_REOPEN_ATT) {
-		spin_unlock(&tcon->open_file_lock);
+		spin_unlock(&cifs_inode->open_file_lock);
 		return rc;
 	}
 	list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
 			if (!open_file->invalidHandle) {
 				/* found a good writable file */
 				cifsFileInfo_get(open_file);
-				spin_unlock(&tcon->open_file_lock);
+				spin_unlock(&cifs_inode->open_file_lock);
 				*ret_file = open_file;
 				return 0;
 			} else {
 		cifsFileInfo_get(inv_file);
 	}
-	spin_unlock(&tcon->open_file_lock);
+	spin_unlock(&cifs_inode->open_file_lock);
 	if (inv_file) {
 		rc = cifs_reopen_file(inv_file, false);
 		cifsFileInfo_put(inv_file);
 		++refind;
 		inv_file = NULL;
-		spin_lock(&tcon->open_file_lock);
+		spin_lock(&cifs_inode->open_file_lock);
 		goto refind_writable;
 	}
 static int is_inode_writable(struct cifsInodeInfo *cifs_inode)
 {
 	struct cifsFileInfo *open_file;
-	struct cifs_tcon *tcon =
-		cifs_sb_master_tcon(CIFS_SB(cifs_inode->vfs_inode.i_sb));
-	spin_lock(&tcon->open_file_lock);
+	spin_lock(&cifs_inode->open_file_lock);
 	list_for_each_entry(open_file, &cifs_inode->openFileList, flist) {
 		if (OPEN_FMODE(open_file->f_flags) & FMODE_WRITE) {
-			spin_unlock(&tcon->open_file_lock);
+			spin_unlock(&cifs_inode->open_file_lock);
 			return 1;
 		}
 	}
-	spin_unlock(&tcon->open_file_lock);
+	spin_unlock(&cifs_inode->open_file_lock);
 	return 0;
 }

fs/cifs/inode.c+4−0

 		/* if uniqueid is different, return error */
 		if (unlikely(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM &&
 		    CIFS_I(*pinode)->uniqueid != fattr.cf_uniqueid)) {
+			CIFS_I(*pinode)->time = 0; /* force reval */
 			rc = -ESTALE;
 			goto cgiiu_exit;
 		}
 		/* if filetype is different, return error */
 		if (unlikely(((*pinode)->i_mode & S_IFMT) !=
 		    (fattr.cf_mode & S_IFMT))) {
+			CIFS_I(*pinode)->time = 0; /* force reval */
 			rc = -ESTALE;
 			goto cgiiu_exit;
 		}
 		/* if uniqueid is different, return error */
 		if (unlikely(cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM &&
 		    CIFS_I(*inode)->uniqueid != fattr.cf_uniqueid)) {
+			CIFS_I(*inode)->time = 0; /* force reval */
 			rc = -ESTALE;
 			goto cgii_exit;
 		}
 		/* if filetype is different, return error */
 		if (unlikely(((*inode)->i_mode & S_IFMT) !=
 		    (fattr.cf_mode & S_IFMT))) {
+			CIFS_I(*inode)->time = 0; /* force reval */
 			rc = -ESTALE;
 			goto cgii_exit;
 		}

fs/cifs/netmisc.c+0−4

 	{0, 0}
 };
-static const struct smb_to_posix_error mapping_table_ERRHRD[] = {
-	{0, 0}
-};
 /*
  * Convert a string containing text IPv4 or IPv6 address to binary form.
  *

fs/cifs/smb2pdu.c+6−8

 	unsigned int num = *num_iovec;
 	iov[num].iov_base = create_posix_buf(mode);
-	if (mode == -1)
+	if (mode == ACL_NO_MODE)
-		cifs_dbg(VFS, "illegal mode\n"); /* BB REMOVEME */
+		cifs_dbg(FYI, "illegal mode\n");
 	if (iov[num].iov_base == NULL)
 		return -ENOMEM;
 	iov[num].iov_len = sizeof(struct create_posix);
 			return rc;
 	}
-	/* TODO: add handling for the mode on create */
+	if ((oparms->disposition == FILE_CREATE) &&
-	if (oparms->disposition == FILE_CREATE)
+	    (oparms->mode != ACL_NO_MODE)) {
-		cifs_dbg(VFS, "mode is 0x%x\n", oparms->mode); /* BB REMOVEME */
-	if ((oparms->disposition == FILE_CREATE) && (oparms->mode != -1)) {
 		if (n_iov > 2) {
 			struct create_context *ccontext =
 			    (struct create_context *)iov[n_iov-1].iov_base;
 	req->PersistentFileId = persistent_fid;
 	req->VolatileFileId = volatile_fid;
-	req->OutputBufferLength = SMB2_MAX_BUFFER_SIZE - MAX_SMB2_HDR_SIZE;
+	req->OutputBufferLength =
+		cpu_to_le32(SMB2_MAX_BUFFER_SIZE - MAX_SMB2_HDR_SIZE);
 	req->CompletionFilter = cpu_to_le32(completion_filter);
 	if (watch_tree)
 		req->Flags = cpu_to_le16(SMB2_WATCH_TREE);

fs/cifs/smb2proto.h+4−0

 			   bool is_fsctl, char *in_data, u32 indatalen,
 			   __u32 max_response_size);
 extern void SMB2_ioctl_free(struct smb_rqst *rqst);
+extern int SMB2_change_notify(const unsigned int xid, struct cifs_tcon *tcon,
+			u64 persistent_fid, u64 volatile_fid, bool watch_tree,
+			u32 completion_filter);
 extern int SMB2_close(const unsigned int xid, struct cifs_tcon *tcon,
 		      u64 persistent_file_id, u64 volatile_file_id);
 extern int SMB2_close_flags(const unsigned int xid, struct cifs_tcon *tcon,

fs/direct-io.c+1−2

 	}
 }
-/**
+/*
  * dio_complete() - called when all DIO BIO I/O has been completed
- * @offset: the byte offset in the file of the completed operation
  *
  * This drops i_dio_count, lets interested parties know that a DIO operation
  * has completed, and calculates the resulting return code for the operation.

fs/ext4/super.c+1−1

@@ -5835,7 +5835,7 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id, · 5834 unmodified lines
5835	/* Don't account quota for quota files to avoid recursion */	5835	/* Don't account quota for quota files to avoid recursion */
5836	qf_inode->i_flags \|= S_NOQUOTA;	5836	qf_inode->i_flags \|= S_NOQUOTA;
5837	lockdep_set_quota_inode(qf_inode, I_DATA_SEM_QUOTA);	5837	lockdep_set_quota_inode(qf_inode, I_DATA_SEM_QUOTA);
5838	err = dquot_enable(qf_inode, type, format_id, flags);	5838	err = dquot_load_quota_inode(qf_inode, type, format_id, flags);
5839	if (err)	5839	if (err)
5840	lockdep_set_quota_inode(qf_inode, I_DATA_SEM_NORMAL);	5840	lockdep_set_quota_inode(qf_inode, I_DATA_SEM_NORMAL);
5841	iput(qf_inode);	5841	iput(qf_inode);

fs/f2fs/super.c+1−1

@@ -1932,7 +1932,7 @@ static int f2fs_quota_enable(struct super_block *sb, int type, int format_id, · 1931 unmodified lines
1932		1932
1933	/* Don't account quota for quota files to avoid recursion */	1933	/* Don't account quota for quota files to avoid recursion */
1934	qf_inode->i_flags \|= S_NOQUOTA;	1934	qf_inode->i_flags \|= S_NOQUOTA;
1935	err = dquot_enable(qf_inode, type, format_id, flags);	1935	err = dquot_load_quota_inode(qf_inode, type, format_id, flags);
1936	iput(qf_inode);	1936	iput(qf_inode);
1937	return err;	1937	return err;
1938	}	1938	}

fs/fs-writeback.c+8−3

 	if (work->auto_free)
 		kfree(work);
-	if (done && atomic_dec_and_test(&done->cnt))
+	if (done) {
-		wake_up_all(done->waitq);
+		wait_queue_head_t *waitq = done->waitq;
+		/* @done can't be accessed after the following dec */
+		if (atomic_dec_and_test(&done->cnt))
+			wake_up_all(waitq);
+	}
 }
 static void wb_queue_work(struct bdi_writeback *wb,
  * cgroup_writeback_by_id - initiate cgroup writeback from bdi and memcg IDs
  * @bdi_id: target bdi id
  * @memcg_id: target memcg css id
- * @nr_pages: number of pages to write, 0 for best-effort dirty flushing
+ * @nr: number of pages to write, 0 for best-effort dirty flushing
  * @reason: reason why some writeback work initiated
  * @done: target wb_completion
  *

fs/io_uring.c+34−35

@@ -415,27 +415,27 @@ static struct io_ring_ctx io_ring_ctx_alloc(struct io_uring_params p) · 414 unmodified lines
415	return ctx;	415	return ctx;
416	}	416	}
417		417
		418	static inline bool __io_sequence_defer(struct io_ring_ctx *ctx,
		419	struct io_kiocb *req)
		420	{
		421	return req->sequence != ctx->cached_cq_tail + ctx->rings->sq_dropped;
		422	}
		423
418	static inline bool io_sequence_defer(struct io_ring_ctx *ctx,	424	static inline bool io_sequence_defer(struct io_ring_ctx *ctx,
419	struct io_kiocb *req)	425	struct io_kiocb *req)
420	{	426	{
421	/* timeout requests always honor sequence */	427	if ((req->flags & (REQ_F_IO_DRAIN\|REQ_F_IO_DRAINED)) != REQ_F_IO_DRAIN)
422	if (!(req->flags & REQ_F_TIMEOUT) &&
423	(req->flags & (REQ_F_IO_DRAIN\|REQ_F_IO_DRAINED)) != REQ_F_IO_DRAIN)
424	return false;	428	return false;
425		429
426	return req->sequence != ctx->cached_cq_tail + ctx->rings->sq_dropped;	430	return __io_sequence_defer(ctx, req);
427	}	431	}
428		432
429	static struct io_kiocb __io_get_deferred_req(struct io_ring_ctx ctx,	433	static struct io_kiocb io_get_deferred_req(struct io_ring_ctx ctx)
430	struct list_head *list)
431	{	434	{
432	struct io_kiocb *req;	435	struct io_kiocb *req;
433		436
434	if (list_empty(list))	437	req = list_first_entry_or_null(&ctx->defer_list, struct io_kiocb, list);
435	return NULL;	438	if (req && !io_sequence_defer(ctx, req)) {
436
437	req = list_first_entry(list, struct io_kiocb, list);
438	if (!io_sequence_defer(ctx, req)) {
439	list_del_init(&req->list);	439	list_del_init(&req->list);
440	return req;	440	return req;
441	}	441	}
@@ -443,14 +443,17 @@ static struct io_kiocb __io_get_deferred_req(struct io_ring_ctx ctx, · 1 unmodified line
443	return NULL;	443	return NULL;
444	}	444	}
445		445
446	static struct io_kiocb io_get_deferred_req(struct io_ring_ctx ctx)
447	{
448	return __io_get_deferred_req(ctx, &ctx->defer_list);
449	}
450
451	static struct io_kiocb io_get_timeout_req(struct io_ring_ctx ctx)	446	static struct io_kiocb io_get_timeout_req(struct io_ring_ctx ctx)
452	{	447	{
453	return __io_get_deferred_req(ctx, &ctx->timeout_list);	448	struct io_kiocb *req;
		449
		450	req = list_first_entry_or_null(&ctx->timeout_list, struct io_kiocb, list);
		451	if (req && !__io_sequence_defer(ctx, req)) {
		452	list_del_init(&req->list);
		453	return req;
		454	}
		455
		456	return NULL;
454	}	457	}
455		458
456	static void __io_commit_cqring(struct io_ring_ctx *ctx)	459	static void __io_commit_cqring(struct io_ring_ctx *ctx)
@@ -591,14 +594,6 @@ static void io_cqring_add_event(struct io_ring_ctx *ctx, u64 user_data, · 134 unmodified lines
591	io_cqring_ev_posted(ctx);	594	io_cqring_ev_posted(ctx);
592	}	595	}
593		596
594	static void io_ring_drop_ctx_refs(struct io_ring_ctx *ctx, unsigned refs)
595	{
596	percpu_ref_put_many(&ctx->refs, refs);
597
598	if (waitqueue_active(&ctx->wait))
599	wake_up(&ctx->wait);
600	}
601
602	static struct io_kiocb io_get_req(struct io_ring_ctx ctx,	597	static struct io_kiocb io_get_req(struct io_ring_ctx ctx,
603	struct io_submit_state *state)	598	struct io_submit_state *state)
604	{	599	{
@@ -646,7 +641,7 @@ static struct io_kiocb io_get_req(struct io_ring_ctx ctx, · 41 unmodified lines
646	req->result = 0;	641	req->result = 0;
647	return req;	642	return req;
648	out:	643	out:
649	io_ring_drop_ctx_refs(ctx, 1);	644	percpu_ref_put(&ctx->refs);
650	return NULL;	645	return NULL;
651	}	646	}
652		647
@@ -654,7 +649,7 @@ static void io_free_req_many(struct io_ring_ctx ctx, void reqs, int nr) · 1 unmodified line
654	{	649	{
655	if (*nr) {	650	if (*nr) {
656	kmem_cache_free_bulk(req_cachep, *nr, reqs);	651	kmem_cache_free_bulk(req_cachep, *nr, reqs);
657	io_ring_drop_ctx_refs(ctx, *nr);	652	percpu_ref_put_many(&ctx->refs, *nr);
658	*nr = 0;	653	*nr = 0;
659	}	654	}
660	}	655	}
@@ -663,7 +658,7 @@ static void __io_free_req(struct io_kiocb *req) · 2 unmodified lines
663	{	658	{
664	if (req->file && !(req->flags & REQ_F_FIXED_FILE))	659	if (req->file && !(req->flags & REQ_F_FIXED_FILE))
665	fput(req->file);	660	fput(req->file);
666	io_ring_drop_ctx_refs(req->ctx, 1);	661	percpu_ref_put(&req->ctx->refs);
667	kmem_cache_free(req_cachep, req);	662	kmem_cache_free(req_cachep, req);
668	}	663	}
669		664
@@ -1892,15 +1887,15 @@ static int io_timeout(struct io_kiocb req, const struct io_uring_sqe sqe) · 1222 unmodified lines
1892	unsigned count, req_dist, tail_index;	1887	unsigned count, req_dist, tail_index;
1893	struct io_ring_ctx *ctx = req->ctx;	1888	struct io_ring_ctx *ctx = req->ctx;
1894	struct list_head *entry;	1889	struct list_head *entry;
1895	struct timespec ts;	1890	struct timespec64 ts;
1896		1891
1897	if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))	1892	if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))
1898	return -EINVAL;	1893	return -EINVAL;
1899	if (sqe->flags \|\| sqe->ioprio \|\| sqe->buf_index \|\| sqe->timeout_flags \|\|	1894	if (sqe->flags \|\| sqe->ioprio \|\| sqe->buf_index \|\| sqe->timeout_flags \|\|
1900	sqe->len != 1)	1895	sqe->len != 1)
1901	return -EINVAL;	1896	return -EINVAL;
1902	if (copy_from_user(&ts, (void __user *) (unsigned long) sqe->addr,	1897
1903	sizeof(ts)))	1898	if (get_timespec64(&ts, u64_to_user_ptr(sqe->addr)))
1904	return -EFAULT;	1899	return -EFAULT;
1905		1900
1906	/*	1901	/*
@@ -1934,7 +1929,7 @@ static int io_timeout(struct io_kiocb req, const struct io_uring_sqe sqe) · 27 unmodified lines
1934		1929
1935	hrtimer_init(&req->timeout.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);	1930	hrtimer_init(&req->timeout.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
1936	req->timeout.timer.function = io_timeout_fn;	1931	req->timeout.timer.function = io_timeout_fn;
1937	hrtimer_start(&req->timeout.timer, timespec_to_ktime(ts),	1932	hrtimer_start(&req->timeout.timer, timespec64_to_ktime(ts),
1938	HRTIMER_MODE_REL);	1933	HRTIMER_MODE_REL);
1939	return 0;	1934	return 0;
1940	}	1935	}
@@ -2761,7 +2756,7 @@ out: · 820 unmodified lines
2761		2756
2762	if (link)	2757	if (link)
2763	io_queue_link_head(ctx, link, &link->submit, shadow_req,	2758	io_queue_link_head(ctx, link, &link->submit, shadow_req,
2764	block_for_last);	2759	!block_for_last);
2765	if (statep)	2760	if (statep)
2766	io_submit_state_end(statep);	2761	io_submit_state_end(statep);
2767		2762
@@ -2920,8 +2915,12 @@ static void io_finish_async(struct io_ring_ctx *ctx) · 152 unmodified lines
2920	static void io_destruct_skb(struct sk_buff *skb)	2915	static void io_destruct_skb(struct sk_buff *skb)
2921	{	2916	{
2922	struct io_ring_ctx *ctx = skb->sk->sk_user_data;	2917	struct io_ring_ctx *ctx = skb->sk->sk_user_data;
		2918	int i;
		2919
		2920	for (i = 0; i < ARRAY_SIZE(ctx->sqo_wq); i++)
		2921	if (ctx->sqo_wq[i])
		2922	flush_workqueue(ctx->sqo_wq[i]);
2923		2923
2924	io_finish_async(ctx);
2925	unix_destruct_scm(skb);	2924	unix_destruct_scm(skb);
2926	}	2925	}
2927		2926
@@ -3630,7 +3629,7 @@ SYSCALL_DEFINE6(io_uring_enter, unsigned int, fd, u32, to_submit, · 702 unmodified lines
3630	}	3629	}
3631	}	3630	}
3632		3631
3633	io_ring_drop_ctx_refs(ctx, 1);	3632	percpu_ref_put(&ctx->refs);
3634	out_fput:	3633	out_fput:
3635	fdput(f);	3634	fdput(f);
3636	return submitted ? submitted : ret;	3635	return submitted ? submitted : ret;

fs/libfs.c+72−68

@@ -89,58 +89,45 @@ int dcache_dir_close(struct inode inode, struct file file) · 88 unmodified lines
89	EXPORT_SYMBOL(dcache_dir_close);	89	EXPORT_SYMBOL(dcache_dir_close);
90		90
91	/* parent is locked at least shared */	91	/* parent is locked at least shared */
92	static struct dentry next_positive(struct dentry parent,	92	/*
93	struct list_head *from,	93	* Returns an element of siblings' list.
94	int count)	94	* We are looking for <count>th positive after <p>; if
		95	* found, dentry is grabbed and returned to caller.
		96	* If no such element exists, NULL is returned.
		97	*/
		98	static struct dentry scan_positives(struct dentry cursor,
		99	struct list_head *p,
		100	loff_t count,
		101	struct dentry *last)
95	{	102	{
96	unsigned *seq = &parent->d_inode->i_dir_seq, n;	103	struct dentry dentry = cursor->d_parent, found = NULL;
97	struct dentry *res;
98	struct list_head *p;
99	bool skipped;
100	int i;
101		104
102	retry:	105	spin_lock(&dentry->d_lock);
103	i = count;	106	while ((p = p->next) != &dentry->d_subdirs) {
104	skipped = false;
105	n = smp_load_acquire(seq) & ~1;
106	res = NULL;
107	rcu_read_lock();
108	for (p = from->next; p != &parent->d_subdirs; p = p->next) {
109	struct dentry *d = list_entry(p, struct dentry, d_child);	107	struct dentry *d = list_entry(p, struct dentry, d_child);
110	if (!simple_positive(d)) {	108	// we must at least skip cursors, to avoid livelocks
111	skipped = true;	109	if (d->d_flags & DCACHE_DENTRY_CURSOR)
112	} else if (!--i) {	110	continue;
113	res = d;	111	if (simple_positive(d) && !--count) {
114	break;	112	spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
		113	if (simple_positive(d))
		114	found = dget_dlock(d);
		115	spin_unlock(&d->d_lock);
		116	if (likely(found))
		117	break;
		118	count = 1;
		119	}
		120	if (need_resched()) {
		121	list_move(&cursor->d_child, p);
		122	p = &cursor->d_child;
		123	spin_unlock(&dentry->d_lock);
		124	cond_resched();
		125	spin_lock(&dentry->d_lock);
115	}	126	}
116	}	127	}
117	rcu_read_unlock();	128	spin_unlock(&dentry->d_lock);
118	if (skipped) {	129	dput(last);
119	smp_rmb();	130	return found;
120	if (unlikely(*seq != n))
121	goto retry;
122	}
123	return res;
124	}
125
126	static void move_cursor(struct dentry cursor, struct list_head after)
127	{
128	struct dentry *parent = cursor->d_parent;
129	unsigned n, *seq = &parent->d_inode->i_dir_seq;
130	spin_lock(&parent->d_lock);
131	for (;;) {
132	n = *seq;
133	if (!(n & 1) && cmpxchg(seq, n, n + 1) == n)
134	break;
135	cpu_relax();
136	}
137	__list_del(cursor->d_child.prev, cursor->d_child.next);
138	if (after)
139	list_add(&cursor->d_child, after);
140	else
141	list_add_tail(&cursor->d_child, &parent->d_subdirs);
142	smp_store_release(seq, n + 2);
143	spin_unlock(&parent->d_lock);
144	}	131	}
145		132
146	loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)	133	loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence)
@@ -158,17 +145,25 @@ loff_t dcache_dir_lseek(struct file *file, loff_t offset, int whence) · 11 unmodified lines
158	return -EINVAL;	145	return -EINVAL;
159	}	146	}
160	if (offset != file->f_pos) {	147	if (offset != file->f_pos) {
		148	struct dentry *cursor = file->private_data;
		149	struct dentry *to = NULL;
		150
		151	inode_lock_shared(dentry->d_inode);
		152
		153	if (offset > 2)
		154	to = scan_positives(cursor, &dentry->d_subdirs,
		155	offset - 2, NULL);
		156	spin_lock(&dentry->d_lock);
		157	if (to)
		158	list_move(&cursor->d_child, &to->d_child);
		159	else
		160	list_del_init(&cursor->d_child);
		161	spin_unlock(&dentry->d_lock);
		162	dput(to);
		163
161	file->f_pos = offset;	164	file->f_pos = offset;
162	if (file->f_pos >= 2) {	165
163	struct dentry *cursor = file->private_data;	166	inode_unlock_shared(dentry->d_inode);
164	struct dentry *to;
165	loff_t n = file->f_pos - 2;
166
167	inode_lock_shared(dentry->d_inode);
168	to = next_positive(dentry, &dentry->d_subdirs, n);
169	move_cursor(cursor, to ? &to->d_child : NULL);
170	inode_unlock_shared(dentry->d_inode);
171	}
172	}	167	}
173	return offset;	168	return offset;
174	}	169	}
@@ -190,25 +185,35 @@ int dcache_readdir(struct file file, struct dir_context ctx) · 15 unmodified lines
190	{	185	{
191	struct dentry *dentry = file->f_path.dentry;	186	struct dentry *dentry = file->f_path.dentry;
192	struct dentry *cursor = file->private_data;	187	struct dentry *cursor = file->private_data;
193	struct list_head *p = &cursor->d_child;	188	struct list_head *anchor = &dentry->d_subdirs;
194	struct dentry *next;	189	struct dentry *next = NULL;
195	bool moved = false;	190	struct list_head *p;
196		191
197	if (!dir_emit_dots(file, ctx))	192	if (!dir_emit_dots(file, ctx))
198	return 0;	193	return 0;
199		194
200	if (ctx->pos == 2)	195	if (ctx->pos == 2)
201	p = &dentry->d_subdirs;	196	p = anchor;
202	while ((next = next_positive(dentry, p, 1)) != NULL) {	197	else if (!list_empty(&cursor->d_child))
		198	p = &cursor->d_child;
		199	else
		200	return 0;
		201
		202	while ((next = scan_positives(cursor, p, 1, next)) != NULL) {
203	if (!dir_emit(ctx, next->d_name.name, next->d_name.len,	203	if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
204	d_inode(next)->i_ino, dt_type(d_inode(next))))	204	d_inode(next)->i_ino, dt_type(d_inode(next))))
205	break;	205	break;
206	moved = true;
207	p = &next->d_child;
208	ctx->pos++;	206	ctx->pos++;
		207	p = &next->d_child;
209	}	208	}
210	if (moved)	209	spin_lock(&dentry->d_lock);
211	move_cursor(cursor, p);	210	if (next)
		211	list_move_tail(&cursor->d_child, &next->d_child);
		212	else
		213	list_del_init(&cursor->d_child);
		214	spin_unlock(&dentry->d_lock);
		215	dput(next);
		216
212	return 0;	217	return 0;
213	}	218	}
214	EXPORT_SYMBOL(dcache_readdir);	219	EXPORT_SYMBOL(dcache_readdir);
@@ -468,8 +473,7 @@ EXPORT_SYMBOL(simple_write_begin); · 253 unmodified lines
468		473
469	/**	474	/**
470	* simple_write_end - .write_end helper for non-block-device FSes	475	* simple_write_end - .write_end helper for non-block-device FSes
471	* @available: See .write_end of address_space_operations	476	* @file: See .write_end of address_space_operations
472	* @file: "
473	* @mapping: "	477	* @mapping: "
474	* @pos: "	478	* @pos: "
475	* @len: "	479	* @len: "

fs/nfs/direct.c+36−70

 static struct kmem_cache *nfs_direct_cachep;
-/*
- * This represents a set of asynchronous requests that we're waiting on
- */
-struct nfs_direct_mirror {
-	ssize_t count;
-};
 struct nfs_direct_req {
 	struct kref		kref;		/* release manager */
 	atomic_t		io_count;	/* i/os we're waiting for */
 	spinlock_t		lock;		/* protect completion state */
-	struct nfs_direct_mirror mirrors[NFS_PAGEIO_DESCRIPTOR_MIRROR_MAX];
-	int			mirror_count;
 	loff_t			io_start;	/* Start offset for I/O */
 	ssize_t			count,		/* bytes actually processed */
 				max_count,	/* max expected count */
 }
 static void
-nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr)
+nfs_direct_handle_truncated(struct nfs_direct_req *dreq,
+			    const struct nfs_pgio_header *hdr,
+			    ssize_t dreq_len)
 {
-	int i;
+	if (!(test_bit(NFS_IOHDR_ERROR, &hdr->flags) ||
-	ssize_t count;
+	      test_bit(NFS_IOHDR_EOF, &hdr->flags)))
+		return;
+	if (dreq->max_count >= dreq_len) {
+		dreq->max_count = dreq_len;
+		if (dreq->count > dreq_len)
+			dreq->count = dreq_len;
+		if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))
+			dreq->error = hdr->error;
+		else /* Clear outstanding error if this is EOF */
+			dreq->error = 0;
+	}
+}
-	WARN_ON_ONCE(dreq->count >= dreq->max_count);
+static void
+nfs_direct_count_bytes(struct nfs_direct_req *dreq,
+		       const struct nfs_pgio_header *hdr)
+{
+	loff_t hdr_end = hdr->io_start + hdr->good_bytes;
+	ssize_t dreq_len = 0;
-	if (dreq->mirror_count == 1) {
+	if (hdr_end > dreq->io_start)
-		dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;
+		dreq_len = hdr_end - dreq->io_start;
-		dreq->count += hdr->good_bytes;
-	} else {
-		/* mirrored writes */
-		count = dreq->mirrors[hdr->pgio_mirror_idx].count;
-		if (count + dreq->io_start < hdr->io_start + hdr->good_bytes) {
-			count = hdr->io_start + hdr->good_bytes - dreq->io_start;
-			dreq->mirrors[hdr->pgio_mirror_idx].count = count;
-		}
-		/* update the dreq->count by finding the minimum agreed count from all
-		 * mirrors */
-		count = dreq->mirrors[0].count;
-		for (i = 1; i < dreq->mirror_count; i++)
+	nfs_direct_handle_truncated(dreq, hdr, dreq_len);
-			count = min(count, dreq->mirrors[i].count);
-		dreq->count = count;
+	if (dreq_len > dreq->max_count)
-	}
+		dreq_len = dreq->max_count;
+	if (dreq->count < dreq_len)
+		dreq->count = dreq_len;
 }
 /*
 	cinfo->completion_ops = &nfs_direct_commit_completion_ops;
 }
-static inline void nfs_direct_setup_mirroring(struct nfs_direct_req *dreq,
-					     struct nfs_pageio_descriptor *pgio,
-					     struct nfs_page *req)
-{
-	int mirror_count = 1;
-	if (pgio->pg_ops->pg_get_mirror_count)
-		mirror_count = pgio->pg_ops->pg_get_mirror_count(pgio, req);
-	dreq->mirror_count = mirror_count;
-}
 static inline struct nfs_direct_req *nfs_direct_req_alloc(void)
 {
 	struct nfs_direct_req *dreq;
 	INIT_LIST_HEAD(&dreq->mds_cinfo.list);
 	dreq->verf.committed = NFS_INVALID_STABLE_HOW;	/* not set yet */
 	INIT_WORK(&dreq->work, nfs_direct_write_schedule_work);
-	dreq->mirror_count = 1;
 	spin_lock_init(&dreq->lock);
 	return dreq;
 	struct nfs_direct_req *dreq = hdr->dreq;
 	spin_lock(&dreq->lock);
-	if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))
-		dreq->error = hdr->error;
 	if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) {
 		spin_unlock(&dreq->lock);
 		goto out_put;
 	}
-	if (hdr->good_bytes != 0)
+	nfs_direct_count_bytes(dreq, hdr);
-		nfs_direct_good_bytes(dreq, hdr);
-	if (test_bit(NFS_IOHDR_EOF, &hdr->flags))
-		dreq->error = 0;
 	spin_unlock(&dreq->lock);
 	while (!list_empty(&hdr->pages)) {
 	LIST_HEAD(reqs);
 	struct nfs_commit_info cinfo;
 	LIST_HEAD(failed);
-	int i;
 	nfs_init_cinfo_from_dreq(&cinfo, dreq);
 	nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo);
 	dreq->count = 0;
+	dreq->max_count = 0;
+	list_for_each_entry(req, &reqs, wb_list)
+		dreq->max_count += req->wb_bytes;
 	dreq->verf.committed = NFS_INVALID_STABLE_HOW;
 	nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo);
-	for (i = 0; i < dreq->mirror_count; i++)
-		dreq->mirrors[i].count = 0;
 	get_dreq(dreq);
 	nfs_pageio_init_write(&desc, dreq->inode, FLUSH_STABLE, false,
 			      &nfs_direct_write_completion_ops);
 	desc.pg_dreq = dreq;
-	req = nfs_list_entry(reqs.next);
-	nfs_direct_setup_mirroring(dreq, &desc, req);
-	if (desc.pg_error < 0) {
-		list_splice_init(&reqs, &failed);
-		goto out_failed;
-	}
 	list_for_each_entry_safe(req, tmp, &reqs, wb_list) {
 		/* Bump the transmission count */
 		req->wb_nio++;
 	}
 	nfs_pageio_complete(&desc);
-out_failed:
 	while (!list_empty(&failed)) {
 		req = nfs_list_entry(failed.next);
 		nfs_list_remove_request(req);
 	nfs_init_cinfo_from_dreq(&cinfo, dreq);
 	spin_lock(&dreq->lock);
-	if (test_bit(NFS_IOHDR_ERROR, &hdr->flags))
-		dreq->error = hdr->error;
 	if (test_bit(NFS_IOHDR_REDO, &hdr->flags)) {
 		spin_unlock(&dreq->lock);
 		goto out_put;
 	}
+	nfs_direct_count_bytes(dreq, hdr);
 	if (hdr->good_bytes != 0) {
-		nfs_direct_good_bytes(dreq, hdr);
 		if (nfs_write_need_commit(hdr)) {
 			if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES)
 				request_commit = true;
 				break;
 			}
-			nfs_direct_setup_mirroring(dreq, &desc, req);
 			if (desc.pg_error < 0) {
 				nfs_free_request(req);
 				result = desc.pg_error;

fs/nfs/nfs4proc.c+1−0

@@ -6106,6 +6106,7 @@ int nfs4_proc_setclientid(struct nfs_client *clp, u32 program, · 6105 unmodified lines
6106		6106
6107	status = nfs4_call_sync_custom(&task_setup_data);	6107	status = nfs4_call_sync_custom(&task_setup_data);
6108	if (setclientid.sc_cred) {	6108	if (setclientid.sc_cred) {
		6109	kfree(clp->cl_acceptor);
6109	clp->cl_acceptor = rpcauth_stringify_acceptor(setclientid.sc_cred);	6110	clp->cl_acceptor = rpcauth_stringify_acceptor(setclientid.sc_cred);
6110	put_rpccred(setclientid.sc_cred);	6111	put_rpccred(setclientid.sc_cred);
6111	}	6112	}

fs/nfs/write.c+3−2

 	struct nfs_inode *nfsi = NFS_I(inode);
 	struct nfs_page *head;
-	atomic_long_dec(&nfsi->nrequests);
 	if (nfs_page_group_sync_on_bit(req, PG_REMOVE)) {
 		head = req->wb_head;
 		spin_unlock(&mapping->private_lock);
 	}
-	if (test_and_clear_bit(PG_INODE_REF, &req->wb_flags))
+	if (test_and_clear_bit(PG_INODE_REF, &req->wb_flags)) {
 		nfs_release_request(req);
+		atomic_long_dec(&nfsi->nrequests);
+	}
 }
 static void

fs/ocfs2/aops.c+23−2

 		inode->i_mtime = inode->i_ctime = current_time(inode);
 		di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
 		di->i_mtime_nsec = di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
-		ocfs2_update_inode_fsync_trans(handle, inode, 1);
+		if (handle)
+			ocfs2_update_inode_fsync_trans(handle, inode, 1);
 	}
 	if (handle)
 		ocfs2_journal_dirty(handle, wc->w_di_bh);
 	struct ocfs2_dio_write_ctxt *dwc = NULL;
 	struct buffer_head *di_bh = NULL;
 	u64 p_blkno;
-	loff_t pos = iblock << inode->i_sb->s_blocksize_bits;
+	unsigned int i_blkbits = inode->i_sb->s_blocksize_bits;
+	loff_t pos = iblock << i_blkbits;
+	sector_t endblk = (i_size_read(inode) - 1) >> i_blkbits;
 	unsigned len, total_len = bh_result->b_size;
 	int ret = 0, first_get_block = 0;
 	len = osb->s_clustersize - (pos & (osb->s_clustersize - 1));
 	len = min(total_len, len);
+	/*
+	 * bh_result->b_size is count in get_more_blocks according to write
+	 * "pos" and "end", we need map twice to return different buffer state:
+	 * 1. area in file size, not set NEW;
+	 * 2. area out file size, set  NEW.
+	 *
+	 *		   iblock    endblk
+	 * |--------|---------|---------|---------
+	 * |<-------area in file------->|
+	 */
+	if ((iblock <= endblk) &&
+	    ((iblock + ((len - 1) >> i_blkbits)) > endblk))
+		len = (endblk - iblock + 1) << i_blkbits;
 	mlog(0, "get block of %lu at %llu:%u req %u\n",
 			inode->i_ino, pos, len, total_len);
 	if (desc->c_needs_zero)
 		set_buffer_new(bh_result);
+	if (iblock > endblk)
+		set_buffer_new(bh_result);
 	/* May sleep in end_io. It should not happen in a irq context. So defer
 	 * it to dio work queue. */
 	set_buffer_defer_completion(bh_result);

fs/ocfs2/ioctl.c+1−1

@@ -283,7 +283,7 @@ static int ocfs2_info_scan_inode_alloc(struct ocfs2_super *osb, · 282 unmodified lines
283	if (inode_alloc)	283	if (inode_alloc)
284	inode_lock(inode_alloc);	284	inode_lock(inode_alloc);
285		285
286	if (o2info_coherent(&fi->ifi_req)) {	286	if (inode_alloc && o2info_coherent(&fi->ifi_req)) {
287	status = ocfs2_inode_lock(inode_alloc, &bh, 0);	287	status = ocfs2_inode_lock(inode_alloc, &bh, 0);
288	if (status < 0) {	288	if (status < 0) {
289	mlog_errno(status);	289	mlog_errno(status);

fs/ocfs2/super.c+2−2

@@ -926,8 +926,8 @@ static int ocfs2_enable_quotas(struct ocfs2_super *osb) · 925 unmodified lines
926	status = -ENOENT;	926	status = -ENOENT;
927	goto out_quota_off;	927	goto out_quota_off;
928	}	928	}
929	status = dquot_enable(inode[type], type, QFMT_OCFS2,	929	status = dquot_load_quota_inode(inode[type], type, QFMT_OCFS2,
930	DQUOT_USAGE_ENABLED);	930	DQUOT_USAGE_ENABLED);
931	if (status < 0)	931	if (status < 0)
932	goto out_quota_off;	932	goto out_quota_off;
933	}	933	}

fs/ocfs2/xattr.c+23−33

@@ -1490,18 +1490,6 @@ static int ocfs2_xa_check_space(struct ocfs2_xa_loc *loc, · 1489 unmodified lines
1490	return loc->xl_ops->xlo_check_space(loc, xi);	1490	return loc->xl_ops->xlo_check_space(loc, xi);
1491	}	1491	}
1492		1492
1493	static void ocfs2_xa_add_entry(struct ocfs2_xa_loc *loc, u32 name_hash)
1494	{
1495	loc->xl_ops->xlo_add_entry(loc, name_hash);
1496	loc->xl_entry->xe_name_hash = cpu_to_le32(name_hash);
1497	/*
1498	* We can't leave the new entry's xe_name_offset at zero or
1499	* add_namevalue() will go nuts. We set it to the size of our
1500	* storage so that it can never be less than any other entry.
1501	*/
1502	loc->xl_entry->xe_name_offset = cpu_to_le16(loc->xl_size);
1503	}
1504
1505	static void ocfs2_xa_add_namevalue(struct ocfs2_xa_loc *loc,	1493	static void ocfs2_xa_add_namevalue(struct ocfs2_xa_loc *loc,
1506	struct ocfs2_xattr_info *xi)	1494	struct ocfs2_xattr_info *xi)
1507	{	1495	{
@@ -2133,29 +2121,31 @@ static int ocfs2_xa_prepare_entry(struct ocfs2_xa_loc *loc, · 625 unmodified lines
2133	if (rc)	2121	if (rc)
2134	goto out;	2122	goto out;
2135		2123
2136	if (loc->xl_entry) {	2124	if (!loc->xl_entry) {
2137	if (ocfs2_xa_can_reuse_entry(loc, xi)) {	2125	rc = -EINVAL;
2138	orig_value_size = loc->xl_entry->xe_value_size;	2126	goto out;
2139	rc = ocfs2_xa_reuse_entry(loc, xi, ctxt);	2127	}
2140	if (rc)
2141	goto out;
2142	goto alloc_value;
2143	}
2144		2128
2145	if (!ocfs2_xattr_is_local(loc->xl_entry)) {	2129	if (ocfs2_xa_can_reuse_entry(loc, xi)) {
2146	orig_clusters = ocfs2_xa_value_clusters(loc);	2130	orig_value_size = loc->xl_entry->xe_value_size;
2147	rc = ocfs2_xa_value_truncate(loc, 0, ctxt);	2131	rc = ocfs2_xa_reuse_entry(loc, xi, ctxt);
2148	if (rc) {	2132	if (rc)
2149	mlog_errno(rc);	2133	goto out;
2150	ocfs2_xa_cleanup_value_truncate(loc,	2134	goto alloc_value;
2151	"overwriting",	2135	}
2152	orig_clusters);	2136
2153	goto out;	2137	if (!ocfs2_xattr_is_local(loc->xl_entry)) {
2154	}	2138	orig_clusters = ocfs2_xa_value_clusters(loc);
		2139	rc = ocfs2_xa_value_truncate(loc, 0, ctxt);
		2140	if (rc) {
		2141	mlog_errno(rc);
		2142	ocfs2_xa_cleanup_value_truncate(loc,
		2143	"overwriting",
		2144	orig_clusters);
		2145	goto out;
2155	}	2146	}
2156	ocfs2_xa_wipe_namevalue(loc);	2147	}
2157	} else	2148	ocfs2_xa_wipe_namevalue(loc);
2158	ocfs2_xa_add_entry(loc, name_hash);
2159		2149
2160	/*	2150	/*
2161	* If we get here, we have a blank entry. Fill it. We grow our	2151	* If we get here, we have a blank entry. Fill it. We grow our

fs/quota/dquot.c+115−126

@@ -2161,14 +2161,29 @@ int dquot_file_open(struct inode inode, struct file file) · 2160 unmodified lines
2161	}	2161	}
2162	EXPORT_SYMBOL(dquot_file_open);	2162	EXPORT_SYMBOL(dquot_file_open);
2163		2163
		2164	static void vfs_cleanup_quota_inode(struct super_block *sb, int type)
		2165	{
		2166	struct quota_info *dqopt = sb_dqopt(sb);
		2167	struct inode *inode = dqopt->files[type];
		2168
		2169	if (!inode)
		2170	return;
		2171	if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) {
		2172	inode_lock(inode);
		2173	inode->i_flags &= ~S_NOQUOTA;
		2174	inode_unlock(inode);
		2175	}
		2176	dqopt->files[type] = NULL;
		2177	iput(inode);
		2178	}
		2179
2164	/*	2180	/*
2165	* Turn quota off on a device. type == -1 ==> quotaoff for all types (umount)	2181	* Turn quota off on a device. type == -1 ==> quotaoff for all types (umount)
2166	*/	2182	*/
2167	int dquot_disable(struct super_block *sb, int type, unsigned int flags)	2183	int dquot_disable(struct super_block *sb, int type, unsigned int flags)
2168	{	2184	{
2169	int cnt, ret = 0;	2185	int cnt;
2170	struct quota_info *dqopt = sb_dqopt(sb);	2186	struct quota_info *dqopt = sb_dqopt(sb);
2171	struct inode *toputinode[MAXQUOTAS];
2172		2187
2173	/* s_umount should be held in exclusive mode */	2188	/* s_umount should be held in exclusive mode */
2174	if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount)))	2189	if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount)))
@@ -2190,7 +2205,6 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) · 15 unmodified lines
2190	return 0;	2205	return 0;
2191		2206
2192	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {	2207	for (cnt = 0; cnt < MAXQUOTAS; cnt++) {
2193	toputinode[cnt] = NULL;
2194	if (type != -1 && cnt != type)	2208	if (type != -1 && cnt != type)
2195	continue;	2209	continue;
2196	if (!sb_has_quota_loaded(sb, cnt))	2210	if (!sb_has_quota_loaded(sb, cnt))
@@ -2210,8 +2224,7 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) · 13 unmodified lines
2210	dqopt->flags &= ~dquot_state_flag(	2224	dqopt->flags &= ~dquot_state_flag(
2211	DQUOT_SUSPENDED, cnt);	2225	DQUOT_SUSPENDED, cnt);
2212	spin_unlock(&dq_state_lock);	2226	spin_unlock(&dq_state_lock);
2213	iput(dqopt->files[cnt]);	2227	vfs_cleanup_quota_inode(sb, cnt);
2214	dqopt->files[cnt] = NULL;
2215	continue;	2228	continue;
2216	}	2229	}
2217	spin_unlock(&dq_state_lock);	2230	spin_unlock(&dq_state_lock);
@@ -2233,10 +2246,6 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) · 15 unmodified lines
2233	if (dqopt->ops[cnt]->free_file_info)	2246	if (dqopt->ops[cnt]->free_file_info)
2234	dqopt->ops[cnt]->free_file_info(sb, cnt);	2247	dqopt->ops[cnt]->free_file_info(sb, cnt);
2235	put_quota_format(dqopt->info[cnt].dqi_format);	2248	put_quota_format(dqopt->info[cnt].dqi_format);
2236
2237	toputinode[cnt] = dqopt->files[cnt];
2238	if (!sb_has_quota_loaded(sb, cnt))
2239	dqopt->files[cnt] = NULL;
2240	dqopt->info[cnt].dqi_flags = 0;	2249	dqopt->info[cnt].dqi_flags = 0;
2241	dqopt->info[cnt].dqi_igrace = 0;	2250	dqopt->info[cnt].dqi_igrace = 0;
2242	dqopt->info[cnt].dqi_bgrace = 0;	2251	dqopt->info[cnt].dqi_bgrace = 0;
@@ -2258,32 +2267,22 @@ int dquot_disable(struct super_block *sb, int type, unsigned int flags) · 15 unmodified lines
2258	* must also discard the blockdev buffers so that we see the	2267	* must also discard the blockdev buffers so that we see the
2259	* changes done by userspace on the next quotaon() */	2268	* changes done by userspace on the next quotaon() */
2260	for (cnt = 0; cnt < MAXQUOTAS; cnt++)	2269	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
2261	/* This can happen when suspending quotas on remount-ro... */	2270	if (!sb_has_quota_loaded(sb, cnt) && dqopt->files[cnt]) {
2262	if (toputinode[cnt] && !sb_has_quota_loaded(sb, cnt)) {	2271	inode_lock(dqopt->files[cnt]);
2263	inode_lock(toputinode[cnt]);	2272	truncate_inode_pages(&dqopt->files[cnt]->i_data, 0);
2264	toputinode[cnt]->i_flags &= ~S_NOQUOTA;	2273	inode_unlock(dqopt->files[cnt]);
2265	truncate_inode_pages(&toputinode[cnt]->i_data, 0);
2266	inode_unlock(toputinode[cnt]);
2267	mark_inode_dirty_sync(toputinode[cnt]);
2268	}	2274	}
2269	if (sb->s_bdev)	2275	if (sb->s_bdev)
2270	invalidate_bdev(sb->s_bdev);	2276	invalidate_bdev(sb->s_bdev);
2271	put_inodes:	2277	put_inodes:
		2278	/* We are done when suspending quotas */
		2279	if (flags & DQUOT_SUSPENDED)
		2280	return 0;
		2281
2272	for (cnt = 0; cnt < MAXQUOTAS; cnt++)	2282	for (cnt = 0; cnt < MAXQUOTAS; cnt++)
2273	if (toputinode[cnt]) {	2283	if (!sb_has_quota_loaded(sb, cnt))
2274	/* On remount RO, we keep the inode pointer so that we	2284	vfs_cleanup_quota_inode(sb, cnt);
2275	* can reenable quota on the subsequent remount RW. We	2285	return 0;
2276	* have to check 'flags' variable and not use sb_has_
2277	* function because another quotaon / quotaoff could
2278	* change global state before we got here. We refuse
2279	* to suspend quotas when there is pending delete on
2280	* the quota file... */
2281	if (!(flags & DQUOT_SUSPENDED))
2282	iput(toputinode[cnt]);
2283	else if (!toputinode[cnt]->i_nlink)
2284	ret = -EBUSY;
2285	}
2286	return ret;
2287	}	2286	}
2288	EXPORT_SYMBOL(dquot_disable);	2287	EXPORT_SYMBOL(dquot_disable);
2289		2288
@@ -2298,28 +2297,52 @@ EXPORT_SYMBOL(dquot_quota_off); · 8 unmodified lines
2298	* Turn quotas on on a device	2297	* Turn quotas on on a device
2299	*/	2298	*/
2300		2299
2301	/*	2300	static int vfs_setup_quota_inode(struct inode *inode, int type)
2302	* Helper function to turn quotas on when we already have the inode of	2301	{
2303	* quota file and no quota information is loaded.	2302	struct super_block *sb = inode->i_sb;
2304	*/	2303	struct quota_info *dqopt = sb_dqopt(sb);
2305	static int vfs_load_quota_inode(struct inode *inode, int type, int format_id,	2304
		2305	if (!S_ISREG(inode->i_mode))
		2306	return -EACCES;
		2307	if (IS_RDONLY(inode))
		2308	return -EROFS;
		2309	if (sb_has_quota_loaded(sb, type))
		2310	return -EBUSY;
		2311
		2312	dqopt->files[type] = igrab(inode);
		2313	if (!dqopt->files[type])
		2314	return -EIO;
		2315	if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) {
		2316	/* We don't want quota and atime on quota files (deadlocks
		2317	* possible) Also nobody should write to the file - we use
		2318	* special IO operations which ignore the immutable bit. */
		2319	inode_lock(inode);
		2320	inode->i_flags \|= S_NOQUOTA;
		2321	inode_unlock(inode);
		2322	/*
		2323	* When S_NOQUOTA is set, remove dquot references as no more
		2324	* references can be added
		2325	*/
		2326	__dquot_drop(inode);
		2327	}
		2328	return 0;
		2329	}
		2330
		2331	int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,
2306	unsigned int flags)	2332	unsigned int flags)
2307	{	2333	{
2308	struct quota_format_type *fmt = find_quota_format(format_id);	2334	struct quota_format_type *fmt = find_quota_format(format_id);
2309	struct super_block *sb = inode->i_sb;
2310	struct quota_info *dqopt = sb_dqopt(sb);	2335	struct quota_info *dqopt = sb_dqopt(sb);
2311	int error;	2336	int error;
2312		2337
		2338	/* Just unsuspend quotas? */
		2339	BUG_ON(flags & DQUOT_SUSPENDED);
		2340	/* s_umount should be held in exclusive mode */
		2341	if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount)))
		2342	up_read(&sb->s_umount);
		2343
2313	if (!fmt)	2344	if (!fmt)
2314	return -ESRCH;	2345	return -ESRCH;
2315	if (!S_ISREG(inode->i_mode)) {
2316	error = -EACCES;
2317	goto out_fmt;
2318	}
2319	if (IS_RDONLY(inode)) {
2320	error = -EROFS;
2321	goto out_fmt;
2322	}
2323	if (!sb->s_op->quota_write \|\| !sb->s_op->quota_read \|\|	2346	if (!sb->s_op->quota_write \|\| !sb->s_op->quota_read \|\|
2324	(type == PRJQUOTA && sb->dq_op->get_projid == NULL)) {	2347	(type == PRJQUOTA && sb->dq_op->get_projid == NULL)) {
2325	error = -EINVAL;	2348	error = -EINVAL;
@@ -2351,27 +2374,9 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, · 25 unmodified lines
2351	invalidate_bdev(sb->s_bdev);	2374	invalidate_bdev(sb->s_bdev);
2352	}	2375	}
2353		2376
2354	if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) {
2355	/* We don't want quota and atime on quota files (deadlocks
2356	* possible) Also nobody should write to the file - we use
2357	* special IO operations which ignore the immutable bit. */
2358	inode_lock(inode);
2359	inode->i_flags \|= S_NOQUOTA;
2360	inode_unlock(inode);
2361	/*
2362	* When S_NOQUOTA is set, remove dquot references as no more
2363	* references can be added
2364	*/
2365	__dquot_drop(inode);
2366	}
2367
2368	error = -EIO;
2369	dqopt->files[type] = igrab(inode);
2370	if (!dqopt->files[type])
2371	goto out_file_flags;
2372	error = -EINVAL;	2377	error = -EINVAL;
2373	if (!fmt->qf_ops->check_quota_file(sb, type))	2378	if (!fmt->qf_ops->check_quota_file(sb, type))
2374	goto out_file_init;	2379	goto out_fmt;
2375		2380
2376	dqopt->ops[type] = fmt->qf_ops;	2381	dqopt->ops[type] = fmt->qf_ops;
2377	dqopt->info[type].dqi_format = fmt;	2382	dqopt->info[type].dqi_format = fmt;
@@ -2379,7 +2384,7 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, · 1 unmodified line
2379	INIT_LIST_HEAD(&dqopt->info[type].dqi_dirty_list);	2384	INIT_LIST_HEAD(&dqopt->info[type].dqi_dirty_list);
2380	error = dqopt->ops[type]->read_file_info(sb, type);	2385	error = dqopt->ops[type]->read_file_info(sb, type);
2381	if (error < 0)	2386	if (error < 0)
2382	goto out_file_init;	2387	goto out_fmt;
2383	if (dqopt->flags & DQUOT_QUOTA_SYS_FILE) {	2388	if (dqopt->flags & DQUOT_QUOTA_SYS_FILE) {
2384	spin_lock(&dq_data_lock);	2389	spin_lock(&dq_data_lock);
2385	dqopt->info[type].dqi_flags \|= DQF_SYS_FILE;	2390	dqopt->info[type].dqi_flags \|= DQF_SYS_FILE;
@@ -2394,24 +2399,36 @@ static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, · 8 unmodified lines
2394	dquot_disable(sb, type, flags);	2399	dquot_disable(sb, type, flags);
2395		2400
2396	return error;	2401	return error;
2397	out_file_init:
2398	dqopt->files[type] = NULL;
2399	iput(inode);
2400	out_file_flags:
2401	inode_lock(inode);
2402	inode->i_flags &= ~S_NOQUOTA;
2403	inode_unlock(inode);
2404	out_fmt:	2402	out_fmt:
2405	put_quota_format(fmt);	2403	put_quota_format(fmt);
2406		2404
2407	return error;	2405	return error;
2408	}	2406	}
		2407	EXPORT_SYMBOL(dquot_load_quota_sb);
		2408
		2409	/*
		2410	* More powerful function for turning on quotas on given quota inode allowing
		2411	* setting of individual quota flags
		2412	*/
		2413	int dquot_load_quota_inode(struct inode *inode, int type, int format_id,
		2414	unsigned int flags)
		2415	{
		2416	int err;
		2417
		2418	err = vfs_setup_quota_inode(inode, type);
		2419	if (err < 0)
		2420	return err;
		2421	err = dquot_load_quota_sb(inode->i_sb, type, format_id, flags);
		2422	if (err < 0)
		2423	vfs_cleanup_quota_inode(inode->i_sb, type);
		2424	return err;
		2425	}
		2426	EXPORT_SYMBOL(dquot_load_quota_inode);
2409		2427
2410	/* Reenable quotas on remount RW */	2428	/* Reenable quotas on remount RW */
2411	int dquot_resume(struct super_block *sb, int type)	2429	int dquot_resume(struct super_block *sb, int type)
2412	{	2430	{
2413	struct quota_info *dqopt = sb_dqopt(sb);	2431	struct quota_info *dqopt = sb_dqopt(sb);
2414	struct inode *inode;
2415	int ret = 0, cnt;	2432	int ret = 0, cnt;
2416	unsigned int flags;	2433	unsigned int flags;
2417		2434
@@ -2425,8 +2442,6 @@ int dquot_resume(struct super_block *sb, int type) · 7 unmodified lines
2425	if (!sb_has_quota_suspended(sb, cnt))	2442	if (!sb_has_quota_suspended(sb, cnt))
2426	continue;	2443	continue;
2427		2444
2428	inode = dqopt->files[cnt];
2429	dqopt->files[cnt] = NULL;
2430	spin_lock(&dq_state_lock);	2445	spin_lock(&dq_state_lock);
2431	flags = dqopt->flags & dquot_state_flag(DQUOT_USAGE_ENABLED \|	2446	flags = dqopt->flags & dquot_state_flag(DQUOT_USAGE_ENABLED \|
2432	DQUOT_LIMITS_ENABLED,	2447	DQUOT_LIMITS_ENABLED,
@@ -2435,9 +2450,10 @@ int dquot_resume(struct super_block *sb, int type) · 2 unmodified lines
2435	spin_unlock(&dq_state_lock);	2450	spin_unlock(&dq_state_lock);
2436		2451
2437	flags = dquot_generic_flag(flags, cnt);	2452	flags = dquot_generic_flag(flags, cnt);
2438	ret = vfs_load_quota_inode(inode, cnt,	2453	ret = dquot_load_quota_sb(sb, cnt, dqopt->info[cnt].dqi_fmt_id,
2439	dqopt->info[cnt].dqi_fmt_id, flags);	2454	flags);
2440	iput(inode);	2455	if (ret < 0)
		2456	vfs_cleanup_quota_inode(sb, type);
2441	}	2457	}
2442		2458
2443	return ret;	2459	return ret;
@@ -2454,48 +2470,13 @@ int dquot_quota_on(struct super_block *sb, int type, int format_id, · 10 unmodified lines
2454	if (path->dentry->d_sb != sb)	2470	if (path->dentry->d_sb != sb)
2455	error = -EXDEV;	2471	error = -EXDEV;
2456	else	2472	else
2457	error = vfs_load_quota_inode(d_inode(path->dentry), type,	2473	error = dquot_load_quota_inode(d_inode(path->dentry), type,
2458	format_id, DQUOT_USAGE_ENABLED \|	2474	format_id, DQUOT_USAGE_ENABLED \|
2459	DQUOT_LIMITS_ENABLED);	2475	DQUOT_LIMITS_ENABLED);
2460	return error;	2476	return error;
2461	}	2477	}
2462	EXPORT_SYMBOL(dquot_quota_on);	2478	EXPORT_SYMBOL(dquot_quota_on);
2463		2479
2464	/*
2465	* More powerful function for turning on quotas allowing setting
2466	* of individual quota flags
2467	*/
2468	int dquot_enable(struct inode *inode, int type, int format_id,
2469	unsigned int flags)
2470	{
2471	struct super_block *sb = inode->i_sb;
2472
2473	/* Just unsuspend quotas? */
2474	BUG_ON(flags & DQUOT_SUSPENDED);
2475	/* s_umount should be held in exclusive mode */
2476	if (WARN_ON_ONCE(down_read_trylock(&sb->s_umount)))
2477	up_read(&sb->s_umount);
2478
2479	if (!flags)
2480	return 0;
2481	/* Just updating flags needed? */
2482	if (sb_has_quota_loaded(sb, type)) {
2483	if (flags & DQUOT_USAGE_ENABLED &&
2484	sb_has_quota_usage_enabled(sb, type))
2485	return -EBUSY;
2486	if (flags & DQUOT_LIMITS_ENABLED &&
2487	sb_has_quota_limits_enabled(sb, type))
2488	return -EBUSY;
2489	spin_lock(&dq_state_lock);
2490	sb_dqopt(sb)->flags \|= dquot_state_flag(flags, type);
2491	spin_unlock(&dq_state_lock);
2492	return 0;
2493	}
2494
2495	return vfs_load_quota_inode(inode, type, format_id, flags);
2496	}
2497	EXPORT_SYMBOL(dquot_enable);
2498
2499	/*	2480	/*
2500	* This function is used when filesystem needs to initialize quotas	2481	* This function is used when filesystem needs to initialize quotas
2501	* during mount time.	2482	* during mount time.
@@ -2517,7 +2498,7 @@ int dquot_quota_on_mount(struct super_block sb, char qf_name, · 15 unmodified lines
2517		2498
2518	error = security_quota_on(dentry);	2499	error = security_quota_on(dentry);
2519	if (!error)	2500	if (!error)
2520	error = vfs_load_quota_inode(d_inode(dentry), type, format_id,	2501	error = dquot_load_quota_inode(d_inode(dentry), type, format_id,
2521	DQUOT_USAGE_ENABLED \| DQUOT_LIMITS_ENABLED);	2502	DQUOT_USAGE_ENABLED \| DQUOT_LIMITS_ENABLED);
2522		2503
2523	out:	2504	out:
@@ -2542,13 +2523,17 @@ static int dquot_quota_enable(struct super_block *sb, unsigned int flags) · 18 unmodified lines
2542	if (!(flags & qtype_enforce_flag(type)))	2523	if (!(flags & qtype_enforce_flag(type)))
2543	continue;	2524	continue;
2544	/* Can't enforce without accounting */	2525	/* Can't enforce without accounting */
2545	if (!sb_has_quota_usage_enabled(sb, type))	2526	if (!sb_has_quota_usage_enabled(sb, type)) {
2546	return -EINVAL;	2527	ret = -EINVAL;
2547	ret = dquot_enable(dqopt->files[type], type,	2528	goto out_err;
2548	dqopt->info[type].dqi_fmt_id,	2529	}
2549	DQUOT_LIMITS_ENABLED);	2530	if (sb_has_quota_limits_enabled(sb, type)) {
2550	if (ret < 0)	2531	ret = -EBUSY;
2551	goto out_err;	2532	goto out_err;
		2533	}
		2534	spin_lock(&dq_state_lock);
		2535	dqopt->flags \|= dquot_state_flag(DQUOT_LIMITS_ENABLED, type);
		2536	spin_unlock(&dq_state_lock);
2552	}	2537	}
2553	return 0;	2538	return 0;
2554	out_err:	2539	out_err:
@@ -2598,10 +2583,12 @@ static int dquot_quota_disable(struct super_block *sb, unsigned int flags) · 43 unmodified lines
2598	out_err:	2583	out_err:
2599	/* Backout enforcement disabling we already did */	2584	/* Backout enforcement disabling we already did */
2600	for (type--; type >= 0; type--) {	2585	for (type--; type >= 0; type--) {
2601	if (flags & qtype_enforce_flag(type))	2586	if (flags & qtype_enforce_flag(type)) {
2602	dquot_enable(dqopt->files[type], type,	2587	spin_lock(&dq_state_lock);
2603	dqopt->info[type].dqi_fmt_id,	2588	dqopt->flags \|=
2604	DQUOT_LIMITS_ENABLED);	2589	dquot_state_flag(DQUOT_LIMITS_ENABLED, type);
		2590	spin_unlock(&dq_state_lock);
		2591	}
2605	}	2592	}
2606	return ret;	2593	return ret;
2607	}	2594	}
@@ -2799,8 +2786,10 @@ int dquot_get_state(struct super_block sb, struct qc_state state) · 191 unmodified lines
2799	tstate->flags \|= QCI_LIMITS_ENFORCED;	2786	tstate->flags \|= QCI_LIMITS_ENFORCED;
2800	tstate->spc_timelimit = mi->dqi_bgrace;	2787	tstate->spc_timelimit = mi->dqi_bgrace;
2801	tstate->ino_timelimit = mi->dqi_igrace;	2788	tstate->ino_timelimit = mi->dqi_igrace;
2802	tstate->ino = dqopt->files[type]->i_ino;	2789	if (dqopt->files[type]) {
2803	tstate->blocks = dqopt->files[type]->i_blocks;	2790	tstate->ino = dqopt->files[type]->i_ino;
		2791	tstate->blocks = dqopt->files[type]->i_blocks;
		2792	}
2804	tstate->nextents = 1; /* We don't know... */	2793	tstate->nextents = 1; /* We don't know... */
2805	spin_unlock(&dq_data_lock);	2794	spin_unlock(&dq_data_lock);
2806	}	2795	}

fs/readdir.c+93−35

@@ -20,9 +20,23 @@ · 19 unmodified lines
20	#include <linux/syscalls.h>	20	#include <linux/syscalls.h>
21	#include <linux/unistd.h>	21	#include <linux/unistd.h>
22	#include <linux/compat.h>	22	#include <linux/compat.h>
23
24	#include <linux/uaccess.h>	23	#include <linux/uaccess.h>
25		24
		25	#include <asm/unaligned.h>
		26
		27	/*
		28	* Note the "unsafe_put_user() semantics: we goto a
		29	* label for errors.
		30	*/
		31	#define unsafe_copy_dirent_name(_dst, _src, _len, label) do { \
		32	char __user *dst = (_dst); \
		33	const char *src = (_src); \
		34	size_t len = (_len); \
		35	unsafe_put_user(0, dst+len, label); \
		36	unsafe_copy_to_user(dst, src, len, label); \
		37	} while (0)
		38
		39
26	int iterate_dir(struct file file, struct dir_context ctx)	40	int iterate_dir(struct file file, struct dir_context ctx)
27	{	41	{
28	struct inode *inode = file_inode(file);	42	struct inode *inode = file_inode(file);
@@ -64,6 +78,40 @@ out: · 35 unmodified lines
64	}	78	}
65	EXPORT_SYMBOL(iterate_dir);	79	EXPORT_SYMBOL(iterate_dir);
66		80
		81	/*
		82	* POSIX says that a dirent name cannot contain NULL or a '/'.
		83	*
		84	* It's not 100% clear what we should really do in this case.
		85	* The filesystem is clearly corrupted, but returning a hard
		86	* error means that you now don't see any of the other names
		87	* either, so that isn't a perfect alternative.
		88	*
		89	* And if you return an error, what error do you use? Several
		90	* filesystems seem to have decided on EUCLEAN being the error
		91	* code for EFSCORRUPTED, and that may be the error to use. Or
		92	* just EIO, which is perhaps more obvious to users.
		93	*
		94	* In order to see the other file names in the directory, the
		95	* caller might want to make this a "soft" error: skip the
		96	* entry, and return the error at the end instead.
		97	*
		98	* Note that this should likely do a "memchr(name, 0, len)"
		99	* check too, since that would be filesystem corruption as
		100	* well. However, that case can't actually confuse user space,
		101	* which has to do a strlen() on the name anyway to find the
		102	* filename length, and the above "soft error" worry means
		103	* that it's probably better left alone until we have that
		104	* issue clarified.
		105	*/
		106	static int verify_dirent_name(const char *name, int len)
		107	{
		108	if (WARN_ON_ONCE(!len))
		109	return -EIO;
		110	if (WARN_ON_ONCE(memchr(name, '/', len)))
		111	return -EIO;
		112	return 0;
		113	}
		114
67	/*	115	/*
68	* Traditional linux readdir() handling..	116	* Traditional linux readdir() handling..
69	*	117	*
@@ -173,6 +221,9 @@ static int filldir(struct dir_context ctx, const char name, int namlen, · 103 unmodified lines
173	int reclen = ALIGN(offsetof(struct linux_dirent, d_name) + namlen + 2,	221	int reclen = ALIGN(offsetof(struct linux_dirent, d_name) + namlen + 2,
174	sizeof(long));	222	sizeof(long));
175		223
		224	buf->error = verify_dirent_name(name, namlen);
		225	if (unlikely(buf->error))
		226	return buf->error;
176	buf->error = -EINVAL; /* only used if we fail.. */	227	buf->error = -EINVAL; /* only used if we fail.. */
177	if (reclen > buf->count)	228	if (reclen > buf->count)
178	return -EINVAL;	229	return -EINVAL;
@@ -182,28 +233,31 @@ static int filldir(struct dir_context ctx, const char name, int namlen, · 3 unmodified lines
182	return -EOVERFLOW;	233	return -EOVERFLOW;
183	}	234	}
184	dirent = buf->previous;	235	dirent = buf->previous;
185	if (dirent) {	236	if (dirent && signal_pending(current))
186	if (signal_pending(current))	237	return -EINTR;
187	return -EINTR;	238
188	if (__put_user(offset, &dirent->d_off))	239	/*
189	goto efault;	240	* Note! This range-checks 'previous' (which may be NULL).
190	}	241	* The real range was checked in getdents
191	dirent = buf->current_dir;	242	*/
192	if (__put_user(d_ino, &dirent->d_ino))	243	if (!user_access_begin(dirent, sizeof(*dirent)))
193	goto efault;
194	if (__put_user(reclen, &dirent->d_reclen))
195	goto efault;
196	if (copy_to_user(dirent->d_name, name, namlen))
197	goto efault;
198	if (__put_user(0, dirent->d_name + namlen))
199	goto efault;
200	if (__put_user(d_type, (char __user *) dirent + reclen - 1))
201	goto efault;	244	goto efault;
		245	if (dirent)
		246	unsafe_put_user(offset, &dirent->d_off, efault_end);
		247	dirent = buf->current_dir;
		248	unsafe_put_user(d_ino, &dirent->d_ino, efault_end);
		249	unsafe_put_user(reclen, &dirent->d_reclen, efault_end);
		250	unsafe_put_user(d_type, (char __user *) dirent + reclen - 1, efault_end);
		251	unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end);
		252	user_access_end();
		253
202	buf->previous = dirent;	254	buf->previous = dirent;
203	dirent = (void __user *)dirent + reclen;	255	dirent = (void __user *)dirent + reclen;
204	buf->current_dir = dirent;	256	buf->current_dir = dirent;
205	buf->count -= reclen;	257	buf->count -= reclen;
206	return 0;	258	return 0;
		259	efault_end:
		260	user_access_end();
207	efault:	261	efault:
208	buf->error = -EFAULT;	262	buf->error = -EFAULT;
209	return -EFAULT;	263	return -EFAULT;
@@ -259,34 +313,38 @@ static int filldir64(struct dir_context ctx, const char name, int namlen, · 49 unmodified lines
259	int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1,	313	int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1,
260	sizeof(u64));	314	sizeof(u64));
261		315
		316	buf->error = verify_dirent_name(name, namlen);
		317	if (unlikely(buf->error))
		318	return buf->error;
262	buf->error = -EINVAL; /* only used if we fail.. */	319	buf->error = -EINVAL; /* only used if we fail.. */
263	if (reclen > buf->count)	320	if (reclen > buf->count)
264	return -EINVAL;	321	return -EINVAL;
265	dirent = buf->previous;	322	dirent = buf->previous;
266	if (dirent) {	323	if (dirent && signal_pending(current))
267	if (signal_pending(current))	324	return -EINTR;
268	return -EINTR;	325
269	if (__put_user(offset, &dirent->d_off))	326	/*
270	goto efault;	327	* Note! This range-checks 'previous' (which may be NULL).
271	}	328	* The real range was checked in getdents
272	dirent = buf->current_dir;	329	*/
273	if (__put_user(ino, &dirent->d_ino))	330	if (!user_access_begin(dirent, sizeof(*dirent)))
274	goto efault;
275	if (__put_user(0, &dirent->d_off))
276	goto efault;
277	if (__put_user(reclen, &dirent->d_reclen))
278	goto efault;
279	if (__put_user(d_type, &dirent->d_type))
280	goto efault;
281	if (copy_to_user(dirent->d_name, name, namlen))
282	goto efault;
283	if (__put_user(0, dirent->d_name + namlen))
284	goto efault;	331	goto efault;
		332	if (dirent)
		333	unsafe_put_user(offset, &dirent->d_off, efault_end);
		334	dirent = buf->current_dir;
		335	unsafe_put_user(ino, &dirent->d_ino, efault_end);
		336	unsafe_put_user(reclen, &dirent->d_reclen, efault_end);
		337	unsafe_put_user(d_type, &dirent->d_type, efault_end);
		338	unsafe_copy_dirent_name(dirent->d_name, name, namlen, efault_end);
		339	user_access_end();
		340
285	buf->previous = dirent;	341	buf->previous = dirent;
286	dirent = (void __user *)dirent + reclen;	342	dirent = (void __user *)dirent + reclen;
287	buf->current_dir = dirent;	343	buf->current_dir = dirent;
288	buf->count -= reclen;	344	buf->count -= reclen;
289	return 0;	345	return 0;
		346	efault_end:
		347	user_access_end();
290	efault:	348	efault:
291	buf->error = -EFAULT;	349	buf->error = -EFAULT;
292	return -EFAULT;	350	return -EFAULT;

fs/super.c+4−1

 	mutex_lock(&bdev->bd_fsfreeze_mutex);
 	if (bdev->bd_fsfreeze_count > 0) {
 		mutex_unlock(&bdev->bd_fsfreeze_mutex);
+		blkdev_put(bdev, mode);
 		warnf(fc, "%pg: Can't mount, blockdev is frozen", bdev);
 		return -EBUSY;
 	}
 	fc->sget_key = bdev;
 	s = sget_fc(fc, test_bdev_super_fc, set_bdev_super_fc);
 	mutex_unlock(&bdev->bd_fsfreeze_mutex);
-	if (IS_ERR(s))
+	if (IS_ERR(s)) {
+		blkdev_put(bdev, mode);
 		return PTR_ERR(s);
+	}
 	if (s->s_root) {
 		/* Don't summarily change the RO/RW state. */

fs/tracefs/inode.c+5−41

 #include <linux/namei.h>
 #include <linux/tracefs.h>
 #include <linux/fsnotify.h>
+#include <linux/security.h>
 #include <linux/seq_file.h>
 #include <linux/parser.h>
 #include <linux/magic.h>
 #include <linux/slab.h>
-#include <linux/security.h>
 #define TRACEFS_DEFAULT_MODE	0700
 static int tracefs_mount_count;
 static bool tracefs_registered;
-static int default_open_file(struct inode *inode, struct file *filp)
-{
-	struct dentry *dentry = filp->f_path.dentry;
-	struct file_operations *real_fops;
-	int ret;
-	if (!dentry)
-		return -EINVAL;
-	ret = security_locked_down(LOCKDOWN_TRACEFS);
-	if (ret)
-		return ret;
-	real_fops = dentry->d_fsdata;
-	if (!real_fops->open)
-		return 0;
-	return real_fops->open(inode, filp);
-}
 static ssize_t default_read_file(struct file *file, char __user *buf,
 				 size_t count, loff_t *ppos)
 {
 	return 0;
 }
-static void tracefs_destroy_inode(struct inode *inode)
-{
-	if (S_ISREG(inode->i_mode))
-		kfree(inode->i_fop);
-}
 static int tracefs_remount(struct super_block *sb, int *flags, char *data)
 {
 	int err;
 static const struct super_operations tracefs_super_operations = {
 	.statfs		= simple_statfs,
 	.remount_fs	= tracefs_remount,
-	.destroy_inode  = tracefs_destroy_inode,
 	.show_options	= tracefs_show_options,
 };
 				   struct dentry *parent, void *data,
 				   const struct file_operations *fops)
 {
-	struct file_operations *proxy_fops;
 	struct dentry *dentry;
 	struct inode *inode;
+	if (security_locked_down(LOCKDOWN_TRACEFS))
+		return NULL;
 	if (!(mode & S_IFMT))
 		mode |= S_IFREG;
 	BUG_ON(!S_ISREG(mode));
 	if (unlikely(!inode))
 		return failed_creating(dentry);
-	proxy_fops = kzalloc(sizeof(struct file_operations), GFP_KERNEL);
-	if (unlikely(!proxy_fops)) {
-		iput(inode);
-		return failed_creating(dentry);
-	}
-	if (!fops)
-		fops = &tracefs_file_operations;
-	dentry->d_fsdata = (void *)fops;
-	memcpy(proxy_fops, fops, sizeof(*proxy_fops));
-	proxy_fops->open = default_open_file;
 	inode->i_mode = mode;
-	inode->i_fop = proxy_fops;
+	inode->i_fop = fops ? fops : &tracefs_file_operations;
 	inode->i_private = data;
 	d_instantiate(dentry, inode);
 	fsnotify_create(dentry->d_parent->d_inode, dentry);

fs/xfs/libxfs/xfs_ag.c+2−3

 	struct xfs_mount	*mp,
 	xfs_daddr_t		blkno,
 	size_t			numblks,
-	int			flags,
 	const struct xfs_buf_ops *ops)
 {
 	struct xfs_buf		*bp;
-	bp = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, flags);
+	bp = xfs_buf_get_uncached(mp->m_ddev_targp, numblks, 0);
 	if (!bp)
 		return NULL;
 {
 	struct xfs_buf		*bp;
-	bp = xfs_get_aghdr_buf(mp, id->daddr, id->numblks, 0, ops);
+	bp = xfs_get_aghdr_buf(mp, id->daddr, id->numblks, ops);
 	if (!bp)
 		return -ENOMEM;

fs/xfs/libxfs/xfs_attr_leaf.c+3−18

 	sf = (xfs_attr_shortform_t *)tmpbuffer;
 	xfs_idata_realloc(dp, -size, XFS_ATTR_FORK);
-	xfs_bmap_local_to_extents_empty(dp, XFS_ATTR_FORK);
+	xfs_bmap_local_to_extents_empty(args->trans, dp, XFS_ATTR_FORK);
 	bp = NULL;
 	error = xfs_da_grow_inode(args, &blkno);
-	if (error) {
+	if (error)
-		/*
-		 * If we hit an IO error middle of the transaction inside
-		 * grow_inode(), we may have inconsistent data. Bail out.
-		 */
-		if (error == -EIO)
-			goto out;
-		xfs_idata_realloc(dp, size, XFS_ATTR_FORK);	/* try to put */
-		memcpy(ifp->if_u1.if_data, tmpbuffer, size);	/* it back */
 		goto out;
-	}
 	ASSERT(blkno == 0);
 	error = xfs_attr3_leaf_create(args, blkno, &bp);
-	if (error) {
+	if (error)
-		/* xfs_attr3_leaf_create may not have instantiated a block */
-		if (bp && (xfs_da_shrink_inode(args, 0, bp) != 0))
-			goto out;
-		xfs_idata_realloc(dp, size, XFS_ATTR_FORK);	/* try to put */
-		memcpy(ifp->if_u1.if_data, tmpbuffer, size);	/* it back */
 		goto out;
-	}
 	memset((char *)&nargs, 0, sizeof(nargs));
 	nargs.dp = dp;

fs/xfs/libxfs/xfs_bmap.c+4−2

  */
 void
 xfs_bmap_local_to_extents_empty(
+	struct xfs_trans	*tp,
 	struct xfs_inode	*ip,
 	int			whichfork)
 {
 	ifp->if_u1.if_root = NULL;
 	ifp->if_height = 0;
 	XFS_IFORK_FMT_SET(ip, whichfork, XFS_DINODE_FMT_EXTENTS);
+	xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
 }
 	ASSERT(XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_LOCAL);
 	if (!ifp->if_bytes) {
-		xfs_bmap_local_to_extents_empty(ip, whichfork);
+		xfs_bmap_local_to_extents_empty(tp, ip, whichfork);
 		flags = XFS_ILOG_CORE;
 		goto done;
 	}
 	/* account for the change in fork size */
 	xfs_idata_realloc(ip, -ifp->if_bytes, whichfork);
-	xfs_bmap_local_to_extents_empty(ip, whichfork);
+	xfs_bmap_local_to_extents_empty(tp, ip, whichfork);
 	flags |= XFS_ILOG_CORE;
 	ifp->if_u1.if_root = NULL;

fs/xfs/libxfs/xfs_bmap.h+2−1

 		xfs_filblks_t len);
 int	xfs_bmap_add_attrfork(struct xfs_inode *ip, int size, int rsvd);
 int	xfs_bmap_set_attrforkoff(struct xfs_inode *ip, int size, int *version);
-void	xfs_bmap_local_to_extents_empty(struct xfs_inode *ip, int whichfork);
+void	xfs_bmap_local_to_extents_empty(struct xfs_trans *tp,
+		struct xfs_inode *ip, int whichfork);
 void	__xfs_bmap_add_free(struct xfs_trans *tp, xfs_fsblock_t bno,
 		xfs_filblks_t len, const struct xfs_owner_info *oinfo,
 		bool skip_discard);

fs/xfs/libxfs/xfs_dir2_block.c+1−1

@@ -1096,7 +1096,7 @@ xfs_dir2_sf_to_block( · 1095 unmodified lines
1096	memcpy(sfp, oldsfp, ifp->if_bytes);	1096	memcpy(sfp, oldsfp, ifp->if_bytes);
1097		1097
1098	xfs_idata_realloc(dp, -ifp->if_bytes, XFS_DATA_FORK);	1098	xfs_idata_realloc(dp, -ifp->if_bytes, XFS_DATA_FORK);
1099	xfs_bmap_local_to_extents_empty(dp, XFS_DATA_FORK);	1099	xfs_bmap_local_to_extents_empty(tp, dp, XFS_DATA_FORK);
1100	dp->i_d.di_size = 0;	1100	dp->i_d.di_size = 0;
1101		1101
1102	/*	1102	/*

fs/xfs/scrub/refcount.c+1−2

 	xfs_extlen_t		len;
 	xfs_nlink_t		refcount;
 	bool			has_cowflag;
-	int			error = 0;
 	bno = be32_to_cpu(rec->refc.rc_startblock);
 	len = be32_to_cpu(rec->refc.rc_blockcount);
 	xchk_refcountbt_xref(bs->sc, bno, len, refcount);
-	return error;
+	return 0;
 }
 /* Make sure we have as many refc blocks as the rmap says. */

fs/xfs/xfs_bmap_util.c+3−1

 	xfs_filblks_t		allocatesize_fsb;
 	xfs_extlen_t		extsz, temp;
 	xfs_fileoff_t		startoffset_fsb;
+	xfs_fileoff_t		endoffset_fsb;
 	int			nimaps;
 	int			quota_flag;
 	int			rt;
 	imapp = &imaps[0];
 	nimaps = 1;
 	startoffset_fsb	= XFS_B_TO_FSBT(mp, offset);
-	allocatesize_fsb = XFS_B_TO_FSB(mp, count);
+	endoffset_fsb = XFS_B_TO_FSB(mp, offset + count);
+	allocatesize_fsb = endoffset_fsb - startoffset_fsb;
 	/*
 	 * Allocate file space until done or until there is an error

fs/xfs/xfs_buf.c+11−1

 	unsigned short		page_count, i;
 	xfs_off_t		start, end;
 	int			error;
+	xfs_km_flags_t		kmflag_mask = 0;
+	/*
+	 * assure zeroed buffer for non-read cases.
+	 */
+	if (!(flags & XBF_READ)) {
+		kmflag_mask |= KM_ZERO;
+		gfp_mask |= __GFP_ZERO;
+	}
 	/*
 	 * for buffers that are contained within a single page, just allocate
 	size = BBTOB(bp->b_length);
 	if (size < PAGE_SIZE) {
 		int align_mask = xfs_buftarg_dma_alignment(bp->b_target);
-		bp->b_addr = kmem_alloc_io(size, align_mask, KM_NOFS);
+		bp->b_addr = kmem_alloc_io(size, align_mask,
+					   KM_NOFS | kmflag_mask);
 		if (!bp->b_addr) {
 			/* low memory - use alloc_page loop instead */
 			goto use_alloc_page;

fs/xfs/xfs_log.c+1−1

@@ -1443,7 +1443,7 @@ xlog_alloc_log( · 1442 unmodified lines
1443	prev_iclog = iclog;	1443	prev_iclog = iclog;
1444		1444
1445	iclog->ic_data = kmem_alloc_io(log->l_iclog_size, align_mask,	1445	iclog->ic_data = kmem_alloc_io(log->l_iclog_size, align_mask,
1446	KM_MAYFAIL);	1446	KM_MAYFAIL \| KM_ZERO);
1447	if (!iclog->ic_data)	1447	if (!iclog->ic_data)
1448	goto out_free_iclog;	1448	goto out_free_iclog;
1449	#ifdef DEBUG	1449	#ifdef DEBUG

fs/xfs/xfs_log_recover.c+1−1

@@ -127,7 +127,7 @@ xlog_alloc_buffer( · 126 unmodified lines
127	if (nbblks > 1 && log->l_sectBBsize > 1)	127	if (nbblks > 1 && log->l_sectBBsize > 1)
128	nbblks += log->l_sectBBsize;	128	nbblks += log->l_sectBBsize;
129	nbblks = round_up(nbblks, log->l_sectBBsize);	129	nbblks = round_up(nbblks, log->l_sectBBsize);
130	return kmem_alloc_io(BBTOB(nbblks), align_mask, KM_MAYFAIL);	130	return kmem_alloc_io(BBTOB(nbblks), align_mask, KM_MAYFAIL \| KM_ZERO);
131	}	131	}
132		132
133	/*	133	/*

include/linux/bitmap.h+2−1

 }
 /**
- * bitmap_or_equal - Check whether the or of two bitnaps is equal to a third
+ * bitmap_or_equal - Check whether the or of two bitmaps is equal to a third
  * @src1:	Pointer to bitmap 1
  * @src2:	Pointer to bitmap 2 will be or'ed with bitmap 1
  * @src3:	Pointer to bitmap 3. Compare to the result of *@src1 | *@src2
+ * @nbits:	number of bits in each of these bitmaps
  *
  * Returns: True if (*@src1 | *@src2) == *@src3, false otherwise
  */

include/linux/bitops.h+7−0

@@ -4,6 +4,13 @@ · 3 unmodified lines
4	#include <asm/types.h>	4	#include <asm/types.h>
5	#include <linux/bits.h>	5	#include <linux/bits.h>
6		6
		7	/* Set bits in the first 'n' bytes when loaded from memory */
		8	#ifdef __LITTLE_ENDIAN
		9	# define aligned_byte_mask(n) ((1UL << 8*(n))-1)
		10	#else
		11	# define aligned_byte_mask(n) (~0xffUL << (BITS_PER_LONG - 8 - 8*(n)))
		12	#endif
		13
7	#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)	14	#define BITS_PER_TYPE(type) (sizeof(type) * BITS_PER_BYTE)
8	#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(long))	15	#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_TYPE(long))
9		16

include/linux/compiler_attributes.h+17−0

@@ -40,6 +40,7 @@ · 39 unmodified lines
40	# define __GCC4_has_attribute___noclone__ 1	40	# define __GCC4_has_attribute___noclone__ 1
41	# define __GCC4_has_attribute___nonstring__ 0	41	# define __GCC4_has_attribute___nonstring__ 0
42	# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)	42	# define __GCC4_has_attribute___no_sanitize_address__ (__GNUC_MINOR__ >= 8)
		43	# define __GCC4_has_attribute___fallthrough__ 0
43	#endif	44	#endif
44		45
45	/*	46	/*
@@ -185,6 +186,22 @@ · 139 unmodified lines
185	# define __noclone	186	# define __noclone
186	#endif	187	#endif
187		188
		189	/*
		190	* Add the pseudo keyword 'fallthrough' so case statement blocks
		191	* must end with any of these keywords:
		192	* break;
		193	* fallthrough;
		194	* goto <label>;
		195	* return [expression];
		196	*
		197	* gcc: https://gcc.gnu.org/onlinedocs/gcc/Statement-Attributes.html#Statement-Attributes
		198	*/
		199	#if __has_attribute(__fallthrough__)
		200	# define fallthrough __attribute__((__fallthrough__))
		201	#else
		202	# define fallthrough do {} while (0) /* fallthrough */
		203	#endif
		204
188	/*	205	/*
189	* Note the missing underscores.	206	* Note the missing underscores.
190	*	207	*

include/linux/dsa/sja1105.h+3−1

 #define SJA1105_META_SMAC			0x222222222222ull
 #define SJA1105_META_DMAC			0x0180C200000Eull
+#define SJA1105_HWTS_RX_EN			0
 /* Global tagger data: each struct sja1105_port has a reference to
  * the structure defined in struct sja1105_private.
  */
 	 * from taggers running on multiple ports on SMP systems
 	 */
 	spinlock_t meta_lock;
-	bool hwts_rx_en;
+	unsigned long state;
 };
 struct sja1105_skb_cb {

include/linux/export.h+5−5

@@ -52,10 +52,10 @@ extern struct module __this_module; · 51 unmodified lines
52	__ADDRESSABLE(sym) \	52	__ADDRESSABLE(sym) \
53	asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \	53	asm(" .section \"___ksymtab" sec "+" #sym "\", \"a\" \n" \
54	" .balign 4 \n" \	54	" .balign 4 \n" \
55	"__ksymtab_" #sym NS_SEPARATOR #ns ": \n" \	55	"__ksymtab_" #ns NS_SEPARATOR #sym ": \n" \
56	" .long " #sym "- . \n" \	56	" .long " #sym "- . \n" \
57	" .long __kstrtab_" #sym "- . \n" \	57	" .long __kstrtab_" #sym "- . \n" \
58	" .long __kstrtab_ns_" #sym "- . \n" \	58	" .long __kstrtabns_" #sym "- . \n" \
59	" .previous \n")	59	" .previous \n")
60		60
61	#define __KSYMTAB_ENTRY(sym, sec) \	61	#define __KSYMTAB_ENTRY(sym, sec) \
@@ -76,10 +76,10 @@ struct kernel_symbol { · 14 unmodified lines
76	#else	76	#else
77	#define __KSYMTAB_ENTRY_NS(sym, sec, ns) \	77	#define __KSYMTAB_ENTRY_NS(sym, sec, ns) \
78	static const struct kernel_symbol __ksymtab_##sym##__##ns \	78	static const struct kernel_symbol __ksymtab_##sym##__##ns \
79	asm("__ksymtab_" #sym NS_SEPARATOR #ns) \	79	asm("__ksymtab_" #ns NS_SEPARATOR #sym) \
80	__attribute__((section("___ksymtab" sec "+" #sym), used)) \	80	__attribute__((section("___ksymtab" sec "+" #sym), used)) \
81	__aligned(sizeof(void *)) \	81	__aligned(sizeof(void *)) \
82	= { (unsigned long)&sym, __kstrtab_##sym, __kstrtab_ns_##sym }	82	= { (unsigned long)&sym, __kstrtab_##sym, __kstrtabns_##sym }
83		83
84	#define __KSYMTAB_ENTRY(sym, sec) \	84	#define __KSYMTAB_ENTRY(sym, sec) \
85	static const struct kernel_symbol __ksymtab_##sym \	85	static const struct kernel_symbol __ksymtab_##sym \
@@ -112,7 +112,7 @@ struct kernel_symbol { · 26 unmodified lines
112	/* For every exported symbol, place a struct in the __ksymtab section */	112	/* For every exported symbol, place a struct in the __ksymtab section */
113	#define ___EXPORT_SYMBOL_NS(sym, sec, ns) \	113	#define ___EXPORT_SYMBOL_NS(sym, sec, ns) \
114	___export_symbol_common(sym, sec); \	114	___export_symbol_common(sym, sec); \
115	static const char __kstrtab_ns_##sym[] \	115	static const char __kstrtabns_##sym[] \
116	__attribute__((section("__ksymtab_strings"), used, aligned(1))) \	116	__attribute__((section("__ksymtab_strings"), used, aligned(1))) \
117	= #ns; \	117	= #ns; \
118	__KSYMTAB_ENTRY_NS(sym, sec, ns)	118	__KSYMTAB_ENTRY_NS(sym, sec, ns)

include/linux/hwmon.h+1−1

@@ -235,7 +235,7 @@ enum hwmon_power_attributes { · 234 unmodified lines
235	#define HWMON_P_LABEL BIT(hwmon_power_label)	235	#define HWMON_P_LABEL BIT(hwmon_power_label)
236	#define HWMON_P_ALARM BIT(hwmon_power_alarm)	236	#define HWMON_P_ALARM BIT(hwmon_power_alarm)
237	#define HWMON_P_CAP_ALARM BIT(hwmon_power_cap_alarm)	237	#define HWMON_P_CAP_ALARM BIT(hwmon_power_cap_alarm)
238	#define HWMON_P_MIN_ALARM BIT(hwmon_power_max_alarm)	238	#define HWMON_P_MIN_ALARM BIT(hwmon_power_min_alarm)
239	#define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm)	239	#define HWMON_P_MAX_ALARM BIT(hwmon_power_max_alarm)
240	#define HWMON_P_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm)	240	#define HWMON_P_LCRIT_ALARM BIT(hwmon_power_lcrit_alarm)
241	#define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm)	241	#define HWMON_P_CRIT_ALARM BIT(hwmon_power_crit_alarm)

include/linux/kvm_host.h+2−0

 struct kvm_stat_data {
 	int offset;
+	int mode;
 	struct kvm *kvm;
 };
 	const char *name;
 	int offset;
 	enum kvm_stat_kind kind;
+	int mode;
 };
 extern struct kvm_stats_debugfs_item debugfs_entries[];
 extern struct dentry *kvm_debugfs_dir;

include/linux/leds.h+2−3

 /**
  * led_set_brightness_sync - set LED brightness synchronously
  * @led_cdev: the LED to set
- * @brightness: the brightness to set it to
+ * @value: the brightness to set it to
  *
  * Set an LED's brightness immediately. This function will block
  * the caller for the time required for accessing device registers,
 /**
  * led_compose_name - compose LED class device name
  * @dev: LED controller device object
- * @child: child fwnode_handle describing a LED or a group of synchronized LEDs;
+ * @init_data: the LED class device initialization data
- *	   it must be provided only for fwnode based LEDs
  * @led_classdev_name: composed LED class device name
  *
  * Create LED class device name basing on the provided init_data argument.

include/linux/memcontrol.h+29−0

 	return !cgroup_subsys_enabled(memory_cgrp_subsys);
 }
+static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
+						  bool in_low_reclaim)
+{
+	if (mem_cgroup_disabled())
+		return 0;
+	if (in_low_reclaim)
+		return READ_ONCE(memcg->memory.emin);
+	return max(READ_ONCE(memcg->memory.emin),
+		   READ_ONCE(memcg->memory.elow));
+}
 enum mem_cgroup_protection mem_cgroup_protected(struct mem_cgroup *root,
 						struct mem_cgroup *memcg);
 unsigned long mem_cgroup_get_max(struct mem_cgroup *memcg);
+unsigned long mem_cgroup_size(struct mem_cgroup *memcg);
 void mem_cgroup_print_oom_context(struct mem_cgroup *memcg,
 				struct task_struct *p);
 {
 }
+static inline unsigned long mem_cgroup_protection(struct mem_cgroup *memcg,
+						  bool in_low_reclaim)
+{
+	return 0;
+}
 static inline enum mem_cgroup_protection mem_cgroup_protected(
 	struct mem_cgroup *root, struct mem_cgroup *memcg)
 {
 	return 0;
 }
+static inline unsigned long mem_cgroup_size(struct mem_cgroup *memcg)
+{
+	return 0;
+}
 static inline void
 mem_cgroup_print_oom_context(struct mem_cgroup *memcg, struct task_struct *p)
 {
 static inline void mem_cgroup_track_foreign_dirty(struct page *page,
 						  struct bdi_writeback *wb)
 {
+	if (mem_cgroup_disabled())
+		return;
 	if (unlikely(&page->mem_cgroup->css != wb->memcg_css))
 		mem_cgroup_track_foreign_dirty_slowpath(page, wb);
 }

include/linux/mii.h+9−0

@@ -455,6 +455,15 @@ static inline void mii_lpa_mod_linkmode_lpa_t(unsigned long *lp_advertising, · 454 unmodified lines
455	lp_advertising, lpa & LPA_LPACK);	455	lp_advertising, lpa & LPA_LPACK);
456	}	456	}
457		457
		458	static inline void mii_ctrl1000_mod_linkmode_adv_t(unsigned long *advertising,
		459	u32 ctrl1000)
		460	{
		461	linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, advertising,
		462	ctrl1000 & ADVERTISE_1000HALF);
		463	linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, advertising,
		464	ctrl1000 & ADVERTISE_1000FULL);
		465	}
		466
458	/**	467	/**
459	* linkmode_adv_to_lcl_adv_t	468	* linkmode_adv_to_lcl_adv_t
460	* @advertising:pointer to linkmode advertising	469	* @advertising:pointer to linkmode advertising

include/linux/page_ext.h+9−1

 enum page_ext_flags {
 	PAGE_EXT_OWNER,
-	PAGE_EXT_OWNER_ACTIVE,
+	PAGE_EXT_OWNER_ALLOCATED,
 #if defined(CONFIG_IDLE_PAGE_TRACKING) && !defined(CONFIG_64BIT)
 	PAGE_EXT_YOUNG,
 	PAGE_EXT_IDLE,
 	unsigned long flags;
 };
+extern unsigned long page_ext_size;
 extern void pgdat_page_ext_init(struct pglist_data *pgdat);
 #ifdef CONFIG_SPARSEMEM
 struct page_ext *lookup_page_ext(const struct page *page);
+static inline struct page_ext *page_ext_next(struct page_ext *curr)
+{
+	void *next = curr;
+	next += page_ext_size;
+	return next;
+}
 #else /* !CONFIG_PAGE_EXTENSION */
 struct page_ext;

include/linux/phy.h+2−0

 	return phydev->state >= PHY_UP;
 }
+void phy_resolve_aneg_pause(struct phy_device *phydev);
 void phy_resolve_aneg_linkmode(struct phy_device *phydev);
 /**
 int __genphy_config_aneg(struct phy_device *phydev, bool changed);
 int genphy_aneg_done(struct phy_device *phydev);
 int genphy_update_link(struct phy_device *phydev);
+int genphy_read_lpa(struct phy_device *phydev);
 int genphy_read_status(struct phy_device *phydev);
 int genphy_suspend(struct phy_device *phydev);
 int genphy_resume(struct phy_device *phydev);

include/linux/platform_device.h+2−0

@@ -64,6 +64,8 @@ extern struct resource platform_get_resource_byname(struct platform_device , · 63 unmodified lines
64	unsigned int,	64	unsigned int,
65	const char *);	65	const char *);
66	extern int platform_get_irq_byname(struct platform_device , const char );	66	extern int platform_get_irq_byname(struct platform_device , const char );
		67	extern int platform_get_irq_byname_optional(struct platform_device *dev,
		68	const char *name);
67	extern int platform_add_devices(struct platform_device **, int);	69	extern int platform_add_devices(struct platform_device **, int);
68		70
69	struct platform_device_info {	71	struct platform_device_info {

include/linux/quotaops.h+3−1

@@ -97,7 +97,9 @@ int dquot_mark_dquot_dirty(struct dquot *dquot); · 96 unmodified lines
97		97
98	int dquot_file_open(struct inode inode, struct file file);	98	int dquot_file_open(struct inode inode, struct file file);
99		99
100	int dquot_enable(struct inode *inode, int type, int format_id,	100	int dquot_load_quota_sb(struct super_block *sb, int type, int format_id,
		101	unsigned int flags);
		102	int dquot_load_quota_inode(struct inode *inode, int type, int format_id,
101	unsigned int flags);	103	unsigned int flags);
102	int dquot_quota_on(struct super_block *sb, int type, int format_id,	104	int dquot_quota_on(struct super_block *sb, int type, int format_id,
103	const struct path *path);	105	const struct path *path);

include/linux/skbuff.h+1−4

 static inline void skb_ext_copy(struct sk_buff *dst, const struct sk_buff *s) {}
 #endif /* CONFIG_SKB_EXTENSIONS */
-static inline void nf_reset(struct sk_buff *skb)
+static inline void nf_reset_ct(struct sk_buff *skb)
 {
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 	nf_conntrack_put(skb_nfct(skb));
 	skb->_nfct = 0;
 #endif
-#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-	skb_ext_del(skb, SKB_EXT_BRIDGE_NF);
-#endif
 }
 static inline void nf_reset_trace(struct sk_buff *skb)

include/linux/slab.h+4−0

  * kmalloc is the normal method of allocating memory
  * for objects smaller than page size in the kernel.
  *
+ * The allocated object address is aligned to at least ARCH_KMALLOC_MINALIGN
+ * bytes. For @size of power of two bytes, the alignment is also guaranteed
+ * to be at least to the size.
+ *
  * The @flags argument may be one of the GFP flags defined at
  * include/linux/gfp.h and described at
  * :ref:`Documentation/core-api/mm-api.rst <mm-api-gfp-flags>`

include/linux/string.h+20−1

@@ -227,7 +227,26 @@ static inline bool strstarts(const char str, const char prefix) · 226 unmodified lines
227	}	227	}
228		228
229	size_t memweight(const void *ptr, size_t bytes);	229	size_t memweight(const void *ptr, size_t bytes);
230	void memzero_explicit(void *s, size_t count);	230
		231	/**
		232	* memzero_explicit - Fill a region of memory (e.g. sensitive
		233	* keying data) with 0s.
		234	* @s: Pointer to the start of the area.
		235	* @count: The size of the area.
		236	*
		237	* Note: usually using memset() is just fine (!), but in cases
		238	* where clearing out _local_ data at the end of a scope is
		239	* necessary, memzero_explicit() should be used instead in
		240	* order to prevent the compiler from optimising away zeroing.
		241	*
		242	* memzero_explicit() doesn't need an arch-specific version as
		243	* it just invokes the one of memset() implicitly.
		244	*/
		245	static inline void memzero_explicit(void *s, size_t count)
		246	{
		247	memset(s, 0, count);
		248	barrier_data(s);
		249	}
231		250
232	/**	251	/**
233	* kbasename - return the last part of a pathname.	252	* kbasename - return the last part of a pathname.

include/linux/sunrpc/xprtsock.h+1−0

@@ -61,6 +61,7 @@ struct sock_xprt { · 60 unmodified lines
61	struct mutex recv_mutex;	61	struct mutex recv_mutex;
62	struct sockaddr_storage srcaddr;	62	struct sockaddr_storage srcaddr;
63	unsigned short srcport;	63	unsigned short srcport;
		64	int xprt_err;
64		65
65	/*	66	/*
66	* UDP socket buffer size parameters	67	* UDP socket buffer size parameters

include/linux/tpm_eventlog.h+12−4

  * total. Once we've done this we know the offset of the data length field,
  * and can calculate the total size of the event.
  *
- * Return: size of the event on success, <0 on failure
+ * Return: size of the event on success, 0 on failure
  */
 static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event,
 	u16 halg;
 	int i;
 	int j;
+	u32 count, event_type;
 	marker = event;
 	marker_start = marker;
 	}
 	event = (struct tcg_pcr_event2_head *)mapping;
+	/*
+	 * The loop below will unmap these fields if the log is larger than
+	 * one page, so save them here for reference:
+	 */
+	count = READ_ONCE(event->count);
+	event_type = READ_ONCE(event->event_type);
 	efispecid = (struct tcg_efi_specid_event_head *)event_header->event;
 	/* Check if event is malformed. */
-	if (event->count > efispecid->num_algs) {
+	if (count > efispecid->num_algs) {
 		size = 0;
 		goto out;
 	}
-	for (i = 0; i < event->count; i++) {
+	for (i = 0; i < count; i++) {
 		halg_size = sizeof(event->digests[i].alg_id);
 		/* Map the digest's algorithm identifier */
 		+ event_field->event_size;
 	size = marker - marker_start;
-	if ((event->event_type == 0) && (event_field->event_size == 0))
+	if (event_type == 0 && event_field->event_size == 0)
 		size = 0;
 out:
 	if (do_mapping)
 		TPM_MEMUNMAP(mapping, mapping_size);

include/linux/uaccess.h+74−2

@@ -231,6 +231,76 @@ __copy_from_user_inatomic_nocache(void to, const void __user from, · 230 unmodified lines
231		231
232	#endif /* ARCH_HAS_NOCACHE_UACCESS */	232	#endif /* ARCH_HAS_NOCACHE_UACCESS */
233		233
		234	extern __must_check int check_zeroed_user(const void __user *from, size_t size);
		235
		236	/**
		237	* copy_struct_from_user: copy a struct from userspace
		238	* @dst: Destination address, in kernel space. This buffer must be @ksize
		239	* bytes long.
		240	* @ksize: Size of @dst struct.
		241	* @src: Source address, in userspace.
		242	* @usize: (Alleged) size of @src struct.
		243	*
		244	* Copies a struct from userspace to kernel space, in a way that guarantees
		245	* backwards-compatibility for struct syscall arguments (as long as future
		246	* struct extensions are made such that all new fields are appended to the
		247	* old struct, and zeroed-out new fields have the same meaning as the old
		248	* struct).
		249	*
		250	* @ksize is just sizeof(*dst), and @usize should've been passed by userspace.
		251	* The recommended usage is something like the following:
		252	*
		253	* SYSCALL_DEFINE2(foobar, const struct foo __user *, uarg, size_t, usize)
		254	* {
		255	* int err;
		256	* struct foo karg = {};
		257	*
		258	* if (usize > PAGE_SIZE)
		259	* return -E2BIG;
		260	* if (usize < FOO_SIZE_VER0)
		261	* return -EINVAL;
		262	*
		263	* err = copy_struct_from_user(&karg, sizeof(karg), uarg, usize);
		264	* if (err)
		265	* return err;
		266	*
		267	* // ...
		268	* }
		269	*
		270	* There are three cases to consider:
		271	* * If @usize == @ksize, then it's copied verbatim.
		272	* * If @usize < @ksize, then the userspace has passed an old struct to a
		273	* newer kernel. The rest of the trailing bytes in @dst (@ksize - @usize)
		274	* are to be zero-filled.
		275	* * If @usize > @ksize, then the userspace has passed a new struct to an
		276	* older kernel. The trailing bytes unknown to the kernel (@usize - @ksize)
		277	* are checked to ensure they are zeroed, otherwise -E2BIG is returned.
		278	*
		279	* Returns (in all cases, some data may have been copied):
		280	* * -E2BIG: (@usize > @ksize) and there are non-zero trailing bytes in @src.
		281	* * -EFAULT: access to userspace failed.
		282	*/
		283	static __always_inline __must_check int
		284	copy_struct_from_user(void dst, size_t ksize, const void __user src,
		285	size_t usize)
		286	{
		287	size_t size = min(ksize, usize);
		288	size_t rest = max(ksize, usize) - size;
		289
		290	/* Deal with trailing bytes. */
		291	if (usize < ksize) {
		292	memset(dst + size, 0, rest);
		293	} else if (usize > ksize) {
		294	int ret = check_zeroed_user(src + size, rest);
		295	if (ret <= 0)
		296	return ret ?: -E2BIG;
		297	}
		298	/* Copy the interoperable parts of the struct. */
		299	if (copy_from_user(dst, src, size))
		300	return -EFAULT;
		301	return 0;
		302	}
		303
234	/*	304	/*
235	* probe_kernel_read(): safely attempt to read from a location	305	* probe_kernel_read(): safely attempt to read from a location
236	* @dst: pointer to the buffer that shall take the data	306	* @dst: pointer to the buffer that shall take the data
@@ -285,8 +355,10 @@ extern long strnlen_unsafe_user(const void __user *unsafe_addr, long count); · 48 unmodified lines
285	#ifndef user_access_begin	355	#ifndef user_access_begin
286	#define user_access_begin(ptr,len) access_ok(ptr, len)	356	#define user_access_begin(ptr,len) access_ok(ptr, len)
287	#define user_access_end() do { } while (0)	357	#define user_access_end() do { } while (0)
288	#define unsafe_get_user(x, ptr, err) do { if (unlikely(__get_user(x, ptr))) goto err; } while (0)	358	#define unsafe_op_wrap(op, err) do { if (unlikely(op)) goto err; } while (0)
289	#define unsafe_put_user(x, ptr, err) do { if (unlikely(__put_user(x, ptr))) goto err; } while (0)	359	#define unsafe_get_user(x,p,e) unsafe_op_wrap(__get_user(x,p),e)
		360	#define unsafe_put_user(x,p,e) unsafe_op_wrap(__put_user(x,p),e)
		361	#define unsafe_copy_to_user(d,s,l,e) unsafe_op_wrap(__copy_to_user(d,s,l),e)
290	static inline unsigned long user_access_save(void) { return 0UL; }	362	static inline unsigned long user_access_save(void) { return 0UL; }
291	static inline void user_access_restore(unsigned long flags) { }	363	static inline void user_access_restore(unsigned long flags) { }
292	#endif	364	#endif

include/linux/xarray.h+2−2

@@ -230,8 +230,8 @@ static inline int xa_err(void *entry) · 229 unmodified lines
230	* This structure is used either directly or via the XA_LIMIT() macro	230	* This structure is used either directly or via the XA_LIMIT() macro
231	* to communicate the range of IDs that are valid for allocation.	231	* to communicate the range of IDs that are valid for allocation.
232	* Two common ranges are predefined for you:	232	* Two common ranges are predefined for you:
233	* * xa_limit_32b - [0 - UINT_MAX]	233	* * xa_limit_32b - [0 - UINT_MAX]
234	* * xa_limit_31b - [0 - INT_MAX]	234	* * xa_limit_31b - [0 - INT_MAX]
235	*/	235	*/
236	struct xa_limit {	236	struct xa_limit {
237	u32 max;	237	u32 max;

include/trace/events/rxrpc.h+1−1

@@ -1068,7 +1068,7 @@ TRACE_EVENT(rxrpc_recvmsg, · 1067 unmodified lines
1068	),	1068	),
1069		1069
1070	TP_fast_assign(	1070	TP_fast_assign(
1071	__entry->call = call->debug_id;	1071	__entry->call = call ? call->debug_id : 0;
1072	__entry->why = why;	1072	__entry->why = why;
1073	__entry->seq = seq;	1073	__entry->seq = seq;
1074	__entry->offset = offset;	1074	__entry->offset = offset;

include/uapi/drm/amdgpu_drm.h+2−0

@@ -1003,6 +1003,8 @@ struct drm_amdgpu_info_device { · 1002 unmodified lines
1003	__u64 high_va_max;	1003	__u64 high_va_max;
1004	/* gfx10 pa_sc_tile_steering_override */	1004	/* gfx10 pa_sc_tile_steering_override */
1005	__u32 pa_sc_tile_steering_override;	1005	__u32 pa_sc_tile_steering_override;
		1006	/* disabled TCCs */
		1007	__u64 tcc_disabled_mask;
1006	};	1008	};
1007		1009
1008	struct drm_amdgpu_info_hw_ip {	1010	struct drm_amdgpu_info_hw_ip {

include/uapi/linux/nvme_ioctl.h+23−0

@@ -45,6 +45,27 @@ struct nvme_passthru_cmd { · 44 unmodified lines
45	__u32 result;	45	__u32 result;
46	};	46	};
47		47
		48	struct nvme_passthru_cmd64 {
		49	__u8 opcode;
		50	__u8 flags;
		51	__u16 rsvd1;
		52	__u32 nsid;
		53	__u32 cdw2;
		54	__u32 cdw3;
		55	__u64 metadata;
		56	__u64 addr;
		57	__u32 metadata_len;
		58	__u32 data_len;
		59	__u32 cdw10;
		60	__u32 cdw11;
		61	__u32 cdw12;
		62	__u32 cdw13;
		63	__u32 cdw14;
		64	__u32 cdw15;
		65	__u32 timeout_ms;
		66	__u64 result;
		67	};
		68
48	#define nvme_admin_cmd nvme_passthru_cmd	69	#define nvme_admin_cmd nvme_passthru_cmd
49		70
50	#define NVME_IOCTL_ID _IO('N', 0x40)	71	#define NVME_IOCTL_ID _IO('N', 0x40)
@@ -54,5 +75,7 @@ struct nvme_passthru_cmd { · 3 unmodified lines
54	#define NVME_IOCTL_RESET _IO('N', 0x44)	75	#define NVME_IOCTL_RESET _IO('N', 0x44)
55	#define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45)	76	#define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45)
56	#define NVME_IOCTL_RESCAN _IO('N', 0x46)	77	#define NVME_IOCTL_RESCAN _IO('N', 0x46)
		78	#define NVME_IOCTL_ADMIN64_CMD _IOWR('N', 0x47, struct nvme_passthru_cmd64)
		79	#define NVME_IOCTL_IO64_CMD _IOWR('N', 0x48, struct nvme_passthru_cmd64)
57		80
58	#endif /* _UAPI_LINUX_NVME_IOCTL_H */	81	#endif /* _UAPI_LINUX_NVME_IOCTL_H */

include/uapi/linux/pg.h+4−1

 */
+#ifndef _UAPI_LINUX_PG_H
+#define _UAPI_LINUX_PG_H
 #define PG_MAGIC	'P'
 #define PG_RESET	'Z'
 #define PG_COMMAND	'C'
 };
-/* end of pg.h */
+#endif /* _UAPI_LINUX_PG_H */

include/uapi/linux/sched.h+28−2

@@ -33,8 +33,31 @@ · 32 unmodified lines
33	#define CLONE_NEWNET 0x40000000 /* New network namespace */	33	#define CLONE_NEWNET 0x40000000 /* New network namespace */
34	#define CLONE_IO 0x80000000 /* Clone io context */	34	#define CLONE_IO 0x80000000 /* Clone io context */
35		35
36	/*	36	#ifndef __ASSEMBLY__
37	* Arguments for the clone3 syscall	37	/**
		38	* struct clone_args - arguments for the clone3 syscall
		39	* @flags: Flags for the new process as listed above.
		40	* All flags are valid except for CSIGNAL and
		41	* CLONE_DETACHED.
		42	* @pidfd: If CLONE_PIDFD is set, a pidfd will be
		43	* returned in this argument.
		44	* @child_tid: If CLONE_CHILD_SETTID is set, the TID of the
		45	* child process will be returned in the child's
		46	* memory.
		47	* @parent_tid: If CLONE_PARENT_SETTID is set, the TID of
		48	* the child process will be returned in the
		49	* parent's memory.
		50	* @exit_signal: The exit_signal the parent process will be
		51	* sent when the child exits.
		52	* @stack: Specify the location of the stack for the
		53	* child process.
		54	* @stack_size: The size of the stack for the child process.
		55	* @tls: If CLONE_SETTLS is set, the tls descriptor
		56	* is set to tls.
		57	*
		58	* The structure is versioned by size and thus extensible.
		59	* New struct members must go at the end of the struct and
		60	* must be properly 64bit aligned.
38	*/	61	*/
39	struct clone_args {	62	struct clone_args {
40	__aligned_u64 flags;	63	__aligned_u64 flags;
@@ -46,6 +69,9 @@ struct clone_args { · 5 unmodified lines
46	__aligned_u64 stack_size;	69	__aligned_u64 stack_size;
47	__aligned_u64 tls;	70	__aligned_u64 tls;
48	};	71	};
		72	#endif
		73
		74	#define CLONE_ARGS_SIZE_VER0 64 /* sizeof first published struct */
49		75
50	/*	76	/*
51	* Scheduling policies	77	* Scheduling policies

include/uapi/linux/serial_core.h+1−1

@@ -291,6 +291,6 @@ · 290 unmodified lines
291	#define PORT_SUNIX 121	291	#define PORT_SUNIX 121
292		292
293	/* Freescale Linflex UART */	293	/* Freescale Linflex UART */
294	#define PORT_LINFLEXUART 121	294	#define PORT_LINFLEXUART 122
295		295
296	#endif /* _UAPILINUX_SERIAL_CORE_H */	296	#endif /* _UAPILINUX_SERIAL_CORE_H */

include/xen/xen-ops.h+1−24

@@ -212,30 +212,7 @@ int xen_xlate_map_ballooned_pages(xen_pfn_t pfns, void vaddr, · 211 unmodified lines
212		212
213	bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);	213	bool xen_running_on_version_or_later(unsigned int major, unsigned int minor);
214		214
215	efi_status_t xen_efi_get_time(efi_time_t tm, efi_time_cap_t tc);	215	void xen_efi_runtime_setup(void);
216	efi_status_t xen_efi_set_time(efi_time_t *tm);
217	efi_status_t xen_efi_get_wakeup_time(efi_bool_t enabled, efi_bool_t pending,
218	efi_time_t *tm);
219	efi_status_t xen_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm);
220	efi_status_t xen_efi_get_variable(efi_char16_t name, efi_guid_t vendor,
221	u32 attr, unsigned long data_size,
222	void *data);
223	efi_status_t xen_efi_get_next_variable(unsigned long *name_size,
224	efi_char16_t name, efi_guid_t vendor);
225	efi_status_t xen_efi_set_variable(efi_char16_t name, efi_guid_t vendor,
226	u32 attr, unsigned long data_size,
227	void *data);
228	efi_status_t xen_efi_query_variable_info(u32 attr, u64 *storage_space,
229	u64 *remaining_space,
230	u64 *max_variable_size);
231	efi_status_t xen_efi_get_next_high_mono_count(u32 *count);
232	efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules,
233	unsigned long count, unsigned long sg_list);
234	efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules,
235	unsigned long count, u64 *max_size,
236	int *reset_type);
237	void xen_efi_reset_system(int reset_type, efi_status_t status,
238	unsigned long data_size, efi_char16_t *data);
239		216
240		217
241	#ifdef CONFIG_PREEMPT	218	#ifdef CONFIG_PREEMPT

kernel/dma/remap.c+2−2

@@ -87,9 +87,9 @@ void dma_common_contiguous_remap(struct page page, size_t size, · 86 unmodified lines
87	*/	87	*/
88	void dma_common_free_remap(void *cpu_addr, size_t size)	88	void dma_common_free_remap(void *cpu_addr, size_t size)
89	{	89	{
90	struct page **pages = dma_common_find_pages(cpu_addr);	90	struct vm_struct *area = find_vm_area(cpu_addr);
91		91
92	if (!pages) {	92	if (!area \|\| area->flags != VM_DMA_COHERENT) {
93	WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr);	93	WARN(1, "trying to free invalid coherent area: %p\n", cpu_addr);
94	return;	94	return;
95	}	95	}

kernel/events/core.c+45−45

@@ -3779,11 +3779,23 @@ static void rotate_ctx(struct perf_event_context ctx, struct perf_event event) · 3778 unmodified lines
3779	perf_event_groups_insert(&ctx->flexible_groups, event);	3779	perf_event_groups_insert(&ctx->flexible_groups, event);
3780	}	3780	}
3781		3781
		3782	/* pick an event from the flexible_groups to rotate */
3782	static inline struct perf_event *	3783	static inline struct perf_event *
3783	ctx_first_active(struct perf_event_context *ctx)	3784	ctx_event_to_rotate(struct perf_event_context *ctx)
3784	{	3785	{
3785	return list_first_entry_or_null(&ctx->flexible_active,	3786	struct perf_event *event;
3786	struct perf_event, active_list);	3787
		3788	/* pick the first active flexible event */
		3789	event = list_first_entry_or_null(&ctx->flexible_active,
		3790	struct perf_event, active_list);
		3791
		3792	/* if no active flexible event, pick the first event */
		3793	if (!event) {
		3794	event = rb_entry_safe(rb_first(&ctx->flexible_groups.tree),
		3795	typeof(*event), group_node);
		3796	}
		3797
		3798	return event;
3787	}	3799	}
3788		3800
3789	static bool perf_rotate_context(struct perf_cpu_context *cpuctx)	3801	static bool perf_rotate_context(struct perf_cpu_context *cpuctx)
@@ -3808,9 +3820,9 @@ static bool perf_rotate_context(struct perf_cpu_context *cpuctx) · 18 unmodified lines
3808	perf_pmu_disable(cpuctx->ctx.pmu);	3820	perf_pmu_disable(cpuctx->ctx.pmu);
3809		3821
3810	if (task_rotate)	3822	if (task_rotate)
3811	task_event = ctx_first_active(task_ctx);	3823	task_event = ctx_event_to_rotate(task_ctx);
3812	if (cpu_rotate)	3824	if (cpu_rotate)
3813	cpu_event = ctx_first_active(&cpuctx->ctx);	3825	cpu_event = ctx_event_to_rotate(&cpuctx->ctx);
3814		3826
3815	/*	3827	/*
3816	* As per the order given at ctx_resched() first 'pop' task flexible	3828	* As per the order given at ctx_resched() first 'pop' task flexible
@@ -5668,7 +5680,8 @@ again: · 1851 unmodified lines
5668	* undo the VM accounting.	5680	* undo the VM accounting.
5669	*/	5681	*/
5670		5682
5671	atomic_long_sub((size >> PAGE_SHIFT) + 1, &mmap_user->locked_vm);	5683	atomic_long_sub((size >> PAGE_SHIFT) + 1 - mmap_locked,
		5684	&mmap_user->locked_vm);
5672	atomic64_sub(mmap_locked, &vma->vm_mm->pinned_vm);	5685	atomic64_sub(mmap_locked, &vma->vm_mm->pinned_vm);
5673	free_uid(mmap_user);	5686	free_uid(mmap_user);
5674		5687
@@ -5812,8 +5825,20 @@ accounting: · 137 unmodified lines
5812		5825
5813	user_locked = atomic_long_read(&user->locked_vm) + user_extra;	5826	user_locked = atomic_long_read(&user->locked_vm) + user_extra;
5814		5827
5815	if (user_locked > user_lock_limit)	5828	if (user_locked <= user_lock_limit) {
		5829	/* charge all to locked_vm */
		5830	} else if (atomic_long_read(&user->locked_vm) >= user_lock_limit) {
		5831	/* charge all to pinned_vm */
		5832	extra = user_extra;
		5833	user_extra = 0;
		5834	} else {
		5835	/*
		5836	* charge locked_vm until it hits user_lock_limit;
		5837	* charge the rest from pinned_vm
		5838	*/
5816	extra = user_locked - user_lock_limit;	5839	extra = user_locked - user_lock_limit;
		5840	user_extra -= extra;
		5841	}
5817		5842
5818	lock_limit = rlimit(RLIMIT_MEMLOCK);	5843	lock_limit = rlimit(RLIMIT_MEMLOCK);
5819	lock_limit >>= PAGE_SHIFT;	5844	lock_limit >>= PAGE_SHIFT;
@@ -10586,55 +10611,26 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr, · 4766 unmodified lines
10586	u32 size;	10611	u32 size;
10587	int ret;	10612	int ret;
10588		10613
10589	if (!access_ok(uattr, PERF_ATTR_SIZE_VER0))	10614	/* Zero the full structure, so that a short copy will be nice. */
10590	return -EFAULT;
10591
10592	/*
10593	* zero the full structure, so that a short copy will be nice.
10594	*/
10595	memset(attr, 0, sizeof(*attr));	10615	memset(attr, 0, sizeof(*attr));
10596		10616
10597	ret = get_user(size, &uattr->size);	10617	ret = get_user(size, &uattr->size);
10598	if (ret)	10618	if (ret)
10599	return ret;	10619	return ret;
10600		10620
10601	if (size > PAGE_SIZE) /* silly large */	10621	/* ABI compatibility quirk: */
10602	goto err_size;	10622	if (!size)
10603
10604	if (!size) /* abi compat */
10605	size = PERF_ATTR_SIZE_VER0;	10623	size = PERF_ATTR_SIZE_VER0;
10606		10624	if (size < PERF_ATTR_SIZE_VER0 \|\| size > PAGE_SIZE)
10607	if (size < PERF_ATTR_SIZE_VER0)
10608	goto err_size;	10625	goto err_size;
10609		10626
10610	/*	10627	ret = copy_struct_from_user(attr, sizeof(*attr), uattr, size);
10611	* If we're handed a bigger struct than we know of,	10628	if (ret) {
10612	* ensure all the unknown bits are 0 - i.e. new	10629	if (ret == -E2BIG)
10613	* user-space does not rely on any kernel feature	10630	goto err_size;
10614	* extensions we dont know about yet.	10631	return ret;
10615	*/
10616	if (size > sizeof(*attr)) {
10617	unsigned char __user *addr;
10618	unsigned char __user *end;
10619	unsigned char val;
10620
10621	addr = (void __user )uattr + sizeof(attr);
10622	end = (void __user *)uattr + size;
10623
10624	for (; addr < end; addr++) {
10625	ret = get_user(val, addr);
10626	if (ret)
10627	return ret;
10628	if (val)
10629	goto err_size;
10630	}
10631	size = sizeof(*attr);
10632	}	10632	}
10633		10633
10634	ret = copy_from_user(attr, uattr, size);
10635	if (ret)
10636	return -EFAULT;
10637
10638	attr->size = size;	10634	attr->size = size;
10639		10635
10640	if (attr->__reserved_1)	10636	if (attr->__reserved_1)
@@ -11891,6 +11887,10 @@ static int inherit_group(struct perf_event *parent_event, · 1250 unmodified lines
11891	child, leader, child_ctx);	11887	child, leader, child_ctx);
11892	if (IS_ERR(child_ctr))	11888	if (IS_ERR(child_ctr))
11893	return PTR_ERR(child_ctr);	11889	return PTR_ERR(child_ctr);
		11890
		11891	if (sub->aux_event == parent_event &&
		11892	!perf_get_aux_event(child_ctr, leader))
		11893	return -EINVAL;
11894	}	11894	}
11895	return 0;	11895	return 0;
11896	}	11896	}

kernel/fork.c+20−29

@@ -2525,39 +2525,19 @@ SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp, · 2524 unmodified lines
2525	#ifdef __ARCH_WANT_SYS_CLONE3	2525	#ifdef __ARCH_WANT_SYS_CLONE3
2526	noinline static int copy_clone_args_from_user(struct kernel_clone_args *kargs,	2526	noinline static int copy_clone_args_from_user(struct kernel_clone_args *kargs,
2527	struct clone_args __user *uargs,	2527	struct clone_args __user *uargs,
2528	size_t size)	2528	size_t usize)
2529	{	2529	{
		2530	int err;
2530	struct clone_args args;	2531	struct clone_args args;
2531		2532
2532	if (unlikely(size > PAGE_SIZE))	2533	if (unlikely(usize > PAGE_SIZE))
2533	return -E2BIG;	2534	return -E2BIG;
2534		2535	if (unlikely(usize < CLONE_ARGS_SIZE_VER0))
2535	if (unlikely(size < sizeof(struct clone_args)))
2536	return -EINVAL;	2536	return -EINVAL;
2537		2537
2538	if (unlikely(!access_ok(uargs, size)))	2538	err = copy_struct_from_user(&args, sizeof(args), uargs, usize);
2539	return -EFAULT;	2539	if (err)
2540		2540	return err;
2541	if (size > sizeof(struct clone_args)) {
2542	unsigned char __user *addr;
2543	unsigned char __user *end;
2544	unsigned char val;
2545
2546	addr = (void __user *)uargs + sizeof(struct clone_args);
2547	end = (void __user *)uargs + size;
2548
2549	for (; addr < end; addr++) {
2550	if (get_user(val, addr))
2551	return -EFAULT;
2552	if (val)
2553	return -E2BIG;
2554	}
2555
2556	size = sizeof(struct clone_args);
2557	}
2558
2559	if (copy_from_user(&args, uargs, size))
2560	return -EFAULT;
2561		2541
2562	/*	2542	/*
2563	* Verify that higher 32bits of exit_signal are unset and that	2543	* Verify that higher 32bits of exit_signal are unset and that
@@ -2604,6 +2584,17 @@ static bool clone3_args_valid(const struct kernel_clone_args *kargs) · 40 unmodified lines
2604	return true;	2584	return true;
2605	}	2585	}
2606		2586
		2587	/**
		2588	* clone3 - create a new process with specific properties
		2589	* @uargs: argument structure
		2590	* @size: size of @uargs
		2591	*
		2592	* clone3() is the extensible successor to clone()/clone2().
		2593	* It takes a struct as argument that is versioned by its size.
		2594	*
		2595	* Return: On success, a positive PID for the child process.
		2596	* On error, a negative errno number.
		2597	*/
2607	SYSCALL_DEFINE2(clone3, struct clone_args __user *, uargs, size_t, size)	2598	SYSCALL_DEFINE2(clone3, struct clone_args __user *, uargs, size_t, size)
2608	{	2599	{
2609	int err;	2600	int err;
@@ -2934,7 +2925,7 @@ int sysctl_max_threads(struct ctl_table *table, int write, · 324 unmodified lines
2934	struct ctl_table t;	2925	struct ctl_table t;
2935	int ret;	2926	int ret;
2936	int threads = max_threads;	2927	int threads = max_threads;
2937	int min = MIN_THREADS;	2928	int min = 1;
2938	int max = MAX_THREADS;	2929	int max = MAX_THREADS;
2939		2930
2940	t = *table;	2931	t = *table;
@@ -2946,7 +2937,7 @@ int sysctl_max_threads(struct ctl_table *table, int write, · 5 unmodified lines
2946	if (ret \|\| !write)	2937	if (ret \|\| !write)
2947	return ret;	2938	return ret;
2948		2939
2949	set_max_threads(threads);	2940	max_threads = threads;
2950		2941
2951	return 0;	2942	return 0;
2952	}	2943	}

kernel/freezer.c+0−6

 bool pm_freezing;
 bool pm_nosig_freezing;
-/*
- * Temporary export for the deadlock workaround in ata_scsi_hotplug().
- * Remove once the hack becomes unnecessary.
- */
-EXPORT_SYMBOL_GPL(pm_freezing);
 /* protects freezing and frozen transitions */
 static DEFINE_SPINLOCK(freezer_lock);

kernel/gen_kheaders.sh+4−1

 find $cpio_dir -type f -print0 |
 	xargs -0 -P8 -n1 perl -pi -e 'BEGIN {undef $/;}; s/\/\*((?!SPDX).)*?\*\///smg;'
-tar -Jcf $tarfile -C $cpio_dir/ . > /dev/null
+# Create archive and try to normalize metadata for reproducibility
+tar "${KBUILD_BUILD_TIMESTAMP:+--mtime=$KBUILD_BUILD_TIMESTAMP}" \
+    --owner=0 --group=0 --sort=name --numeric-owner \
+    -Jcf $tarfile -C $cpio_dir/ . > /dev/null
 echo "$src_files_md5" >  kernel/kheaders.md5
 echo "$obj_files_md5" >> kernel/kheaders.md5

kernel/panic.c+1−0

@@ -180,6 +180,7 @@ void panic(const char *fmt, ...) · 179 unmodified lines
180	* after setting panic_cpu) from invoking panic() again.	180	* after setting panic_cpu) from invoking panic() again.
181	*/	181	*/
182	local_irq_disable();	182	local_irq_disable();
		183	preempt_disable_notrace();
183		184
184	/*	185	/*
185	* It's possible to come here directly from a panic-assertion and	186	* It's possible to come here directly from a panic-assertion and

kernel/sched/core.c+7−36

@@ -5106,9 +5106,6 @@ static int sched_copy_attr(struct sched_attr __user uattr, struct sched_attr a · 5105 unmodified lines
5106	u32 size;	5106	u32 size;
5107	int ret;	5107	int ret;
5108		5108
5109	if (!access_ok(uattr, SCHED_ATTR_SIZE_VER0))
5110	return -EFAULT;
5111
5112	/* Zero the full structure, so that a short copy will be nice: */	5109	/* Zero the full structure, so that a short copy will be nice: */
5113	memset(attr, 0, sizeof(*attr));	5110	memset(attr, 0, sizeof(*attr));
5114		5111
@@ -5116,45 +5113,19 @@ static int sched_copy_attr(struct sched_attr __user uattr, struct sched_attr a · 1 unmodified line
5116	if (ret)	5113	if (ret)
5117	return ret;	5114	return ret;
5118		5115
5119	/* Bail out on silly large: */
5120	if (size > PAGE_SIZE)
5121	goto err_size;
5122
5123	/* ABI compatibility quirk: */	5116	/* ABI compatibility quirk: */
5124	if (!size)	5117	if (!size)
5125	size = SCHED_ATTR_SIZE_VER0;	5118	size = SCHED_ATTR_SIZE_VER0;
5126		5119	if (size < SCHED_ATTR_SIZE_VER0 \|\| size > PAGE_SIZE)
5127	if (size < SCHED_ATTR_SIZE_VER0)
5128	goto err_size;	5120	goto err_size;
5129		5121
5130	/*	5122	ret = copy_struct_from_user(attr, sizeof(*attr), uattr, size);
5131	* If we're handed a bigger struct than we know of,	5123	if (ret) {
5132	* ensure all the unknown bits are 0 - i.e. new	5124	if (ret == -E2BIG)
5133	* user-space does not rely on any kernel feature	5125	goto err_size;
5134	* extensions we dont know about yet.	5126	return ret;
5135	*/
5136	if (size > sizeof(*attr)) {
5137	unsigned char __user *addr;
5138	unsigned char __user *end;
5139	unsigned char val;
5140
5141	addr = (void __user )uattr + sizeof(attr);
5142	end = (void __user *)uattr + size;
5143
5144	for (; addr < end; addr++) {
5145	ret = get_user(val, addr);
5146	if (ret)
5147	return ret;
5148	if (val)
5149	goto err_size;
5150	}
5151	size = sizeof(*attr);
5152	}	5127	}
5153		5128
5154	ret = copy_from_user(attr, uattr, size);
5155	if (ret)
5156	return -EFAULT;
5157
5158	if ((attr->sched_flags & SCHED_FLAG_UTIL_CLAMP) &&	5129	if ((attr->sched_flags & SCHED_FLAG_UTIL_CLAMP) &&
5159	size < SCHED_ATTR_SIZE_VER1)	5130	size < SCHED_ATTR_SIZE_VER1)
5160	return -EINVAL;	5131	return -EINVAL;
@@ -5354,7 +5325,7 @@ sched_attr_copy_to_user(struct sched_attr __user *uattr, · 193 unmodified lines
5354	* sys_sched_getattr - similar to sched_getparam, but with sched_attr	5325	* sys_sched_getattr - similar to sched_getparam, but with sched_attr
5355	* @pid: the pid in question.	5326	* @pid: the pid in question.
5356	* @uattr: structure containing the extended parameters.	5327	* @uattr: structure containing the extended parameters.
5357	* @usize: sizeof(attr) that user-space knows about, for forwards and backwards compatibility.	5328	* @usize: sizeof(attr) for fwd/bwd comp.
5358	* @flags: for future extension.	5329	* @flags: for future extension.
5359	*/	5330	*/
5360	SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr,	5331	SYSCALL_DEFINE4(sched_getattr, pid_t, pid, struct sched_attr __user *, uattr,

kernel/sched/cputime.c+3−3

kernel/sched/fair.c+22−14

@@ -4926,20 +4926,28 @@ static enum hrtimer_restart sched_cfs_period_timer(struct hrtimer *timer) · 4925 unmodified lines
4926	if (++count > 3) {	4926	if (++count > 3) {
4927	u64 new, old = ktime_to_ns(cfs_b->period);	4927	u64 new, old = ktime_to_ns(cfs_b->period);
4928		4928
4929	new = (old * 147) / 128; /* ~115% */	4929	/*
4930	new = min(new, max_cfs_quota_period);	4930	* Grow period by a factor of 2 to avoid losing precision.
4931		4931	* Precision loss in the quota/period ratio can cause __cfs_schedulable
4932	cfs_b->period = ns_to_ktime(new);	4932	* to fail.
4933		4933	*/
4934	/* since max is 1s, this is limited to 1e9^2, which fits in u64 */	4934	new = old * 2;
4935	cfs_b->quota *= new;	4935	if (new < max_cfs_quota_period) {
4936	cfs_b->quota = div64_u64(cfs_b->quota, old);	4936	cfs_b->period = ns_to_ktime(new);
4937		4937	cfs_b->quota *= 2;
4938	pr_warn_ratelimited(	4938
4939	"cfs_period_timer[cpu%d]: period too short, scaling up (new cfs_period_us %lld, cfs_quota_us = %lld)\n",	4939	pr_warn_ratelimited(
4940	smp_processor_id(),	4940	"cfs_period_timer[cpu%d]: period too short, scaling up (new cfs_period_us = %lld, cfs_quota_us = %lld)\n",
4941	div_u64(new, NSEC_PER_USEC),	4941	smp_processor_id(),
4942	div_u64(cfs_b->quota, NSEC_PER_USEC));	4942	div_u64(new, NSEC_PER_USEC),
		4943	div_u64(cfs_b->quota, NSEC_PER_USEC));
		4944	} else {
		4945	pr_warn_ratelimited(
		4946	"cfs_period_timer[cpu%d]: period too short, but cannot scale up without losing precision (cfs_period_us = %lld, cfs_quota_us = %lld)\n",
		4947	smp_processor_id(),
		4948	div_u64(old, NSEC_PER_USEC),
		4949	div_u64(cfs_b->quota, NSEC_PER_USEC));
		4950	}
4943		4951
4944	/* reset count so we don't come right back in here */	4952	/* reset count so we don't come right back in here */
4945	count = 0;	4953	count = 0;

kernel/trace/ftrace.c+43−12

 #include <linux/clocksource.h>
 #include <linux/sched/task.h>
 #include <linux/kallsyms.h>
+#include <linux/security.h>
 #include <linux/seq_file.h>
 #include <linux/tracefs.h>
 #include <linux/hardirq.h>
 ftrace_avail_open(struct inode *inode, struct file *file)
 {
 	struct ftrace_iterator *iter;
+	int ret;
+	ret = security_locked_down(LOCKDOWN_TRACEFS);
+	if (ret)
+		return ret;
 	if (unlikely(ftrace_disabled))
 		return -ENODEV;
 {
 	struct ftrace_iterator *iter;
+	/*
+	 * This shows us what functions are currently being
+	 * traced and by what. Not sure if we want lockdown
+	 * to hide such critical information for an admin.
+	 * Although, perhaps it can show information we don't
+	 * want people to see, but if something is tracing
+	 * something, we probably want to know about it.
+	 */
 	iter = __seq_open_private(file, &show_ftrace_seq_ops, sizeof(*iter));
 	if (!iter)
 		return -ENOMEM;
 	struct ftrace_hash *hash;
 	struct list_head *mod_head;
 	struct trace_array *tr = ops->private;
-	int ret = 0;
+	int ret = -ENOMEM;
 	ftrace_ops_init(ops);

110 more lines aren’t shown here.

kernel/trace/trace.c+87−52

This diff is large: its 289 lines aren’t shown here.

kernel/trace/trace.h+2−0

This diff is large: its 16 lines aren’t shown here.

kernel/trace/trace_dynevent.c+4−0

This diff is large: its 11 lines aren’t shown here.

kernel/trace/trace_events.c+17−18

This diff is large: its 92 lines aren’t shown here.

kernel/trace/trace_events_hist.c+12−1

This diff is large: its 41 lines aren’t shown here.

kernel/trace/trace_events_trigger.c+7−1

This diff is large: its 29 lines aren’t shown here.

kernel/trace/trace_hwlat.c+3−1

This diff is large: its 18 lines aren’t shown here.

kernel/trace/trace_kprobe.c+11−1

This diff is large: its 37 lines aren’t shown here.

kernel/trace/trace_printk.c+7−0

This diff is large: its 21 lines aren’t shown here.

kernel/trace/trace_stack.c+8−0

This diff is large: its 29 lines aren’t shown here.

kernel/trace/trace_stat.c+5−1

This diff is large: its 20 lines aren’t shown here.

kernel/trace/trace_uprobe.c+11−0

This diff is large: its 32 lines aren’t shown here.

lib/generic-radix-tree.c+26−6

This diff is large: its 74 lines aren’t shown here.

lib/string.c+0−21

This diff is large: its 28 lines aren’t shown here.

lib/strnlen_user.c+1−7

This diff is large: its 18 lines aren’t shown here.

lib/test_meminit.c+27−0

This diff is large: its 41 lines aren’t shown here.

lib/test_user_copy.c+130−6

This diff is large: its 152 lines aren’t shown here.

lib/textsearch.c+2−2

This diff is large: its 12 lines aren’t shown here.

lib/usercopy.c+55−0

This diff is large: its 65 lines aren’t shown here.

lib/vdso/Kconfig+0−9

This diff is large: its 14 lines aren’t shown here.

mm/backing-dev.c+2−2

This diff is large: its 11 lines aren’t shown here.

mm/compaction.c+4−3

This diff is large: its 27 lines aren’t shown here.

mm/kmemleak.c+21−9

This diff is large: its 52 lines aren’t shown here.

mm/memcontrol.c+5−0

This diff is large: its 12 lines aren’t shown here.

mm/memory-failure.c+13−9

This diff is large: its 52 lines aren’t shown here.

mm/memremap.c+0−2

This diff is large: its 9 lines aren’t shown here.

mm/page_alloc.c+11−3

This diff is large: its 36 lines aren’t shown here.

mm/page_ext.c+9−14

This diff is large: its 75 lines aren’t shown here.

mm/page_owner.c+20−35

This diff is large: its 157 lines aren’t shown here.

mm/shmem.c+6−0

This diff is large: its 13 lines aren’t shown here.

mm/shuffle.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/slab.c+3−0

This diff is large: its 13 lines aren’t shown here.

mm/slab_common.c+16−3

This diff is large: its 40 lines aren’t shown here.

mm/slob.c+47−15

This diff is large: its 163 lines aren’t shown here.

mm/slub.c+38−11

This diff is large: its 107 lines aren’t shown here.

mm/sparse.c+1−1

This diff is large: its 9 lines aren’t shown here.

mm/vmpressure.c+11−9

This diff is large: its 54 lines aren’t shown here.

mm/vmscan.c+66−6

This diff is large: its 107 lines aren’t shown here.

mm/z3fold.c+8−2

This diff is large: its 51 lines aren’t shown here.

net/batman-adv/soft-interface.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/core/devlink.c+3−3

This diff is large: its 27 lines aren’t shown here.

net/core/skbuff.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/core/sock.c+9−4

This diff is large: its 34 lines aren’t shown here.

net/dccp/ipv4.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/dsa/tag_sja1105.c+11−1

This diff is large: its 26 lines aren’t shown here.

net/ipv4/ip_gre.c+1−0

This diff is large: its 8 lines aren’t shown here.

net/ipv4/ip_input.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv4/ipmr.c+2−2

This diff is large: its 18 lines aren’t shown here.

net/ipv4/netfilter/nf_dup_ipv4.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv4/raw.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv4/route.c+2−3

This diff is large: its 19 lines aren’t shown here.

net/ipv4/tcp.c+2−4

This diff is large: its 16 lines aren’t shown here.

net/ipv4/tcp_ipv4.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv4/tcp_timer.c+7−2

This diff is large: its 16 lines aren’t shown here.

net/ipv4/udp.c+9−6

This diff is large: its 43 lines aren’t shown here.

net/ipv6/addrconf.c+12−5

This diff is large: its 26 lines aren’t shown here.

net/ipv6/ip6_input.c+11−1

This diff is large: its 26 lines aren’t shown here.

net/ipv6/netfilter/nf_dup_ipv6.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv6/raw.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/ipv6/udp.c+7−2

This diff is large: its 23 lines aren’t shown here.

net/l2tp/l2tp_core.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/l2tp/l2tp_eth.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/l2tp/l2tp_ip.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/l2tp/l2tp_ip6.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/mac80211/debugfs_netdev.c+9−2

This diff is large: its 27 lines aren’t shown here.

net/mac80211/util.c+8−5

This diff is large: its 39 lines aren’t shown here.

net/netfilter/ipvs/ip_vs_xmit.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/netfilter/nft_connlimit.c+6−1

This diff is large: its 15 lines aren’t shown here.

net/nfc/llcp_sock.c+6−1

This diff is large: its 16 lines aren’t shown here.

net/openvswitch/vport-internal_dev.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/packet/af_packet.c+2−2

This diff is large: its 18 lines aren’t shown here.

net/rds/ib.c+3−3

This diff is large: its 20 lines aren’t shown here.

net/sched/sch_cbq.c+29−14

This diff is large: its 64 lines aren’t shown here.

net/sched/sch_cbs.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/sched/sch_dsmark.c+2−0

This diff is large: its 9 lines aren’t shown here.

net/sched/sch_taprio.c+2−3

This diff is large: its 15 lines aren’t shown here.

net/sctp/input.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/sctp/sm_make_chunk.c+6−6

This diff is large: its 50 lines aren’t shown here.

net/sunrpc/xprtsock.c+8−9

This diff is large: its 46 lines aren’t shown here.

net/tipc/link.c+18−11

This diff is large: its 87 lines aren’t shown here.

net/tipc/msg.c+1−4

This diff is large: its 12 lines aren’t shown here.

net/vmw_vsock/af_vsock.c+12−4

This diff is large: its 46 lines aren’t shown here.

net/vmw_vsock/hyperv_transport.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/vmw_vsock/virtio_transport_common.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/wireless/nl80211.c+41−3

This diff is large: its 79 lines aren’t shown here.

net/wireless/reg.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/wireless/scan.c+6−1

This diff is large: its 14 lines aren’t shown here.

net/wireless/wext-compat.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/xfrm/xfrm_input.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/xfrm/xfrm_interface.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/xfrm/xfrm_output.c+1−1

This diff is large: its 9 lines aren’t shown here.

net/xfrm/xfrm_policy.c+1−1

This diff is large: its 9 lines aren’t shown here.

scripts/Kbuild.include+0−5

This diff is large: its 12 lines aren’t shown here.

scripts/Makefile.build+1−1

This diff is large: its 9 lines aren’t shown here.

scripts/Makefile.lib+1−1

This diff is large: its 9 lines aren’t shown here.

scripts/coccinelle/misc/add_namespace.cocci+2−0

This diff is large: its 9 lines aren’t shown here.

scripts/mod/modpost.c+24−18

This diff is large: its 107 lines aren’t shown here.

scripts/namespace.pl+7−6

This diff is large: its 31 lines aren’t shown here.

scripts/nsdeps+2−2

This diff is large: its 15 lines aren’t shown here.

scripts/recordmcount.h+1−4

This diff is large: its 13 lines aren’t shown here.

scripts/setlocalversion+1−1

This diff is large: its 9 lines aren’t shown here.

security/integrity/Makefile+0−3

This diff is large: its 10 lines aren’t shown here.

security/selinux/ss/services.c+8−1

This diff is large: its 16 lines aren’t shown here.

tools/arch/arm/include/uapi/asm/kvm.h+3−1

This diff is large: its 12 lines aren’t shown here.

tools/arch/arm64/include/uapi/asm/kvm.h+3−1

This diff is large: its 12 lines aren’t shown here.

tools/arch/s390/include/uapi/asm/kvm.h+6−0

This diff is large: its 13 lines aren’t shown here.

tools/arch/x86/include/uapi/asm/vmx.h+2−0

This diff is large: its 16 lines aren’t shown here.

tools/include/uapi/asm-generic/mman-common.h+3−0

This diff is large: its 10 lines aren’t shown here.

tools/include/uapi/drm/i915_drm.h+1−0

This diff is large: its 8 lines aren’t shown here.

tools/include/uapi/linux/fs.h+4−51

This diff is large: its 76 lines aren’t shown here.

tools/include/uapi/linux/fscrypt.h+181−0

This diff is large: its 182 lines aren’t shown here.

tools/include/uapi/linux/kvm.h+3−0

This diff is large: its 17 lines aren’t shown here.

tools/include/uapi/linux/usbdevice_fs.h+4−0

This diff is large: its 17 lines aren’t shown here.

tools/lib/subcmd/Makefile+7−1

This diff is large: its 15 lines aren’t shown here.

tools/perf/Documentation/asciidoc.conf+3−0

This diff is large: its 10 lines aren’t shown here.

tools/perf/Documentation/jitdump-specification.txt+2−2

This diff is large: its 11 lines aren’t shown here.

tools/perf/arch/arm/annotate/instructions.c+2−2

This diff is large: its 16 lines aren’t shown here.

tools/perf/arch/arm64/annotate/instructions.c+2−2

This diff is large: its 16 lines aren’t shown here.

tools/perf/arch/powerpc/util/header.c+2−1

This diff is large: its 16 lines aren’t shown here.

tools/perf/arch/s390/annotate/instructions.c+4−2

This diff is large: its 13 lines aren’t shown here.

tools/perf/arch/s390/util/header.c+5−4

This diff is large: its 43 lines aren’t shown here.

tools/perf/arch/x86/annotate/instructions.c+4−2

This diff is large: its 13 lines aren’t shown here.

tools/perf/arch/x86/util/header.c+2−1

This diff is large: its 16 lines aren’t shown here.

tools/perf/builtin-kvm.c+4−3

This diff is large: its 19 lines aren’t shown here.

tools/perf/builtin-script.c+5−1

This diff is large: its 34 lines aren’t shown here.

tools/perf/check-headers.sh+1−0

This diff is large: its 8 lines aren’t shown here.

tools/perf/pmu-events/arch/s390/cf_z15/basic.jsonrenamed from tools/perf/pmu-events/arch/s390/cf_m8561/basic.json+0−0

File renamed without changes.

tools/perf/pmu-events/arch/s390/cf_z15/crypto.jsonrenamed from tools/perf/pmu-events/arch/s390/cf_m8561/crypto.json+0−0

File renamed without changes.

tools/perf/pmu-events/arch/s390/cf_z15/crypto6.jsonrenamed from tools/perf/pmu-events/arch/s390/cf_m8561/crypto6.json+0−0

File renamed without changes.

tools/perf/pmu-events/arch/s390/cf_z15/extended.jsonrenamed from tools/perf/pmu-events/arch/s390/cf_m8561/extended.json+0−0

File renamed without changes.

tools/perf/pmu-events/arch/s390/cf_z15/transaction.json+7−0

This diff is large: its 8 lines aren’t shown here.

tools/perf/pmu-events/arch/s390/mapfile.csv+1−1

This diff is large: its 6 lines aren’t shown here.

tools/perf/pmu-events/jevents.c+6−6

This diff is large: its 19 lines aren’t shown here.

tools/perf/tests/perf-hooks.c+1−2

This diff is large: its 14 lines aren’t shown here.

tools/perf/util/annotate.c+26−9

This diff is large: its 101 lines aren’t shown here.

tools/perf/util/annotate.h+4−0

This diff is large: its 11 lines aren’t shown here.

tools/perf/util/evsel.c+2−1

This diff is large: its 17 lines aren’t shown here.

tools/perf/util/jitdump.c+3−3

This diff is large: its 27 lines aren’t shown here.

tools/perf/util/llvm-utils.c+3−3

This diff is large: its 18 lines aren’t shown here.

tools/perf/util/map.c+3−0

This diff is large: its 16 lines aren’t shown here.

tools/perf/util/python.c+6−0

This diff is large: its 20 lines aren’t shown here.

tools/testing/selftests/Makefile+17−2

This diff is large: its 46 lines aren’t shown here.

tools/testing/selftests/kselftest/runner.sh+33−3

This diff is large: its 72 lines aren’t shown here.

tools/testing/selftests/kselftest_install.sh+2−2

This diff is large: its 15 lines aren’t shown here.

tools/testing/selftests/kvm/Makefile+2−1

This diff is large: its 17 lines aren’t shown here.

tools/testing/selftests/kvm/include/x86_64/processor.h+3−0

This diff is large: its 10 lines aren’t shown here.

tools/testing/selftests/kvm/include/x86_64/vmx.h+14−0

This diff is large: its 26 lines aren’t shown here.

tools/testing/selftests/kvm/lib/kvm_util.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/kvm/lib/kvm_util_internal.h+3−0

This diff is large: its 8 lines aren’t shown here.

tools/testing/selftests/kvm/lib/x86_64/processor.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/kvm/lib/x86_64/vmx.c+199−2

This diff is large: its 231 lines aren’t shown here.

tools/testing/selftests/kvm/x86_64/vmx_dirty_log_test.c+156−0

This diff is large: its 157 lines aren’t shown here.

tools/testing/selftests/net/.gitignore+1−0

This diff is large: its 5 lines aren’t shown here.

tools/testing/selftests/net/udpgso.c+4−12

This diff is large: its 52 lines aren’t shown here.

tools/testing/selftests/pidfd/Makefile+1−1

This diff is large: its 7 lines aren’t shown here.

tools/testing/selftests/powerpc/mm/tlbie_test.c+1−1

This diff is large: its 9 lines aren’t shown here.

tools/testing/selftests/rtc/settings+1−0

This diff is large: its 2 lines aren’t shown here.

tools/testing/selftests/watchdog/watchdog-test.c+26−1

This diff is large: its 69 lines aren’t shown here.

usr/include/Makefile+0−10

This diff is large: its 35 lines aren’t shown here.

virt/kvm/arm/vgic/trace.h+1−1

This diff is large: its 9 lines aren’t shown here.

virt/kvm/kvm_main.c+7−3

This diff is large: its 32 lines aren’t shown here.

Pull series refactoring quota enabling and disabling code.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code

@@ -683,7 +683,7 @@ static const struct omap_clkctrl_reg_data dra7_l4per2_clkctrl_regs[] __initconst · 682 unmodified lines
683	{ DRA7_L4PER2_MCASP2_CLKCTRL, dra7_mcasp2_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0154:22" },	683	{ DRA7_L4PER2_MCASP2_CLKCTRL, dra7_mcasp2_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0154:22" },
684	{ DRA7_L4PER2_MCASP3_CLKCTRL, dra7_mcasp3_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:015c:22" },	684	{ DRA7_L4PER2_MCASP3_CLKCTRL, dra7_mcasp3_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:015c:22" },
685	{ DRA7_L4PER2_MCASP5_CLKCTRL, dra7_mcasp5_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:016c:22" },	685	{ DRA7_L4PER2_MCASP5_CLKCTRL, dra7_mcasp5_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:016c:22" },
686	{ DRA7_L4PER2_MCASP8_CLKCTRL, dra7_mcasp8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0184:24" },	686	{ DRA7_L4PER2_MCASP8_CLKCTRL, dra7_mcasp8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:0184:22" },
687	{ DRA7_L4PER2_MCASP4_CLKCTRL, dra7_mcasp4_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:018c:22" },	687	{ DRA7_L4PER2_MCASP4_CLKCTRL, dra7_mcasp4_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:018c:22" },
688	{ DRA7_L4PER2_UART7_CLKCTRL, dra7_uart7_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01c4:24" },	688	{ DRA7_L4PER2_UART7_CLKCTRL, dra7_uart7_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01c4:24" },
689	{ DRA7_L4PER2_UART8_CLKCTRL, dra7_uart8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01d4:24" },	689	{ DRA7_L4PER2_UART8_CLKCTRL, dra7_uart8_bit_data, CLKF_SW_SUP, "l4per2-clkctrl:01d4:24" },
@@ -828,8 +828,8 @@ static struct ti_dt_clk dra7xx_clks[] = { · 138 unmodified lines
828	DT_CLK(NULL, "mcasp6_aux_gfclk_mux", "l4per2-clkctrl:01f8:22"),	828	DT_CLK(NULL, "mcasp6_aux_gfclk_mux", "l4per2-clkctrl:01f8:22"),
829	DT_CLK(NULL, "mcasp7_ahclkx_mux", "l4per2-clkctrl:01fc:24"),	829	DT_CLK(NULL, "mcasp7_ahclkx_mux", "l4per2-clkctrl:01fc:24"),
830	DT_CLK(NULL, "mcasp7_aux_gfclk_mux", "l4per2-clkctrl:01fc:22"),	830	DT_CLK(NULL, "mcasp7_aux_gfclk_mux", "l4per2-clkctrl:01fc:22"),
831	DT_CLK(NULL, "mcasp8_ahclkx_mux", "l4per2-clkctrl:0184:22"),	831	DT_CLK(NULL, "mcasp8_ahclkx_mux", "l4per2-clkctrl:0184:24"),
832	DT_CLK(NULL, "mcasp8_aux_gfclk_mux", "l4per2-clkctrl:0184:24"),	832	DT_CLK(NULL, "mcasp8_aux_gfclk_mux", "l4per2-clkctrl:0184:22"),
833	DT_CLK(NULL, "mmc1_clk32k", "l3init-clkctrl:0008:8"),	833	DT_CLK(NULL, "mmc1_clk32k", "l3init-clkctrl:0008:8"),
834	DT_CLK(NULL, "mmc1_fclk_div", "l3init-clkctrl:0008:25"),	834	DT_CLK(NULL, "mmc1_fclk_div", "l3init-clkctrl:0008:25"),
835	DT_CLK(NULL, "mmc1_fclk_mux", "l3init-clkctrl:0008:24"),	835	DT_CLK(NULL, "mmc1_fclk_mux", "l3init-clkctrl:0008:24"),

@@ -3683,7 +3683,7 @@ void hisi_sas_debugfs_work_handler(struct work_struct *work) · 3682 unmodified lines
3683	}	3683	}
3684	EXPORT_SYMBOL_GPL(hisi_sas_debugfs_work_handler);	3684	EXPORT_SYMBOL_GPL(hisi_sas_debugfs_work_handler);
3685		3685
3686	void hisi_sas_debugfs_release(struct hisi_hba *hisi_hba)	3686	static void hisi_sas_debugfs_release(struct hisi_hba *hisi_hba)
3687	{	3687	{
3688	struct device *dev = hisi_hba->dev;	3688	struct device *dev = hisi_hba->dev;
3689	int i;	3689	int i;
@@ -3705,7 +3705,7 @@ void hisi_sas_debugfs_release(struct hisi_hba *hisi_hba) · 15 unmodified lines
3705	devm_kfree(dev, hisi_hba->debugfs_port_reg[i]);	3705	devm_kfree(dev, hisi_hba->debugfs_port_reg[i]);
3706	}	3706	}
3707		3707
3708	int hisi_sas_debugfs_alloc(struct hisi_hba *hisi_hba)	3708	static int hisi_sas_debugfs_alloc(struct hisi_hba *hisi_hba)
3709	{	3709	{
3710	const struct hisi_sas_hw *hw = hisi_hba->hw;	3710	const struct hisi_sas_hw *hw = hisi_hba->hw;
3711	struct device *dev = hisi_hba->dev;	3711	struct device *dev = hisi_hba->dev;
@@ -3796,7 +3796,7 @@ fail: · 84 unmodified lines
3796	return -ENOMEM;	3796	return -ENOMEM;
3797	}	3797	}
3798		3798
3799	void hisi_sas_debugfs_bist_init(struct hisi_hba *hisi_hba)	3799	static void hisi_sas_debugfs_bist_init(struct hisi_hba *hisi_hba)
3800	{	3800	{
3801	hisi_hba->debugfs_bist_dentry =	3801	hisi_hba->debugfs_bist_dentry =
3802	debugfs_create_dir("bist", hisi_hba->debugfs_dir);	3802	debugfs_create_dir("bist", hisi_hba->debugfs_dir);

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	static const struct snd_pcm_hardware snd_bcm2835_playback_hw = {	12	static const struct snd_pcm_hardware snd_bcm2835_playback_hw = {
13	.info = (SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_BLOCK_TRANSFER \|	13	.info = (SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_BLOCK_TRANSFER \|
14	SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_MMAP_VALID \|	14	SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_MMAP_VALID \|
15	SNDRV_PCM_INFO_DRAIN_TRIGGER \| SNDRV_PCM_INFO_SYNC_APPLPTR),	15	SNDRV_PCM_INFO_SYNC_APPLPTR),
16	.formats = SNDRV_PCM_FMTBIT_U8 \| SNDRV_PCM_FMTBIT_S16_LE,	16	.formats = SNDRV_PCM_FMTBIT_U8 \| SNDRV_PCM_FMTBIT_S16_LE,
17	.rates = SNDRV_PCM_RATE_CONTINUOUS \| SNDRV_PCM_RATE_8000_48000,	17	.rates = SNDRV_PCM_RATE_CONTINUOUS \| SNDRV_PCM_RATE_8000_48000,
18	.rate_min = 8000,	18	.rate_min = 8000,
@@ -29,7 +29,7 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { · 10 unmodified lines
29	static const struct snd_pcm_hardware snd_bcm2835_playback_spdif_hw = {	29	static const struct snd_pcm_hardware snd_bcm2835_playback_spdif_hw = {
30	.info = (SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_BLOCK_TRANSFER \|	30	.info = (SNDRV_PCM_INFO_INTERLEAVED \| SNDRV_PCM_INFO_BLOCK_TRANSFER \|
31	SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_MMAP_VALID \|	31	SNDRV_PCM_INFO_MMAP \| SNDRV_PCM_INFO_MMAP_VALID \|
32	SNDRV_PCM_INFO_DRAIN_TRIGGER \| SNDRV_PCM_INFO_SYNC_APPLPTR),	32	SNDRV_PCM_INFO_SYNC_APPLPTR),
33	.formats = SNDRV_PCM_FMTBIT_S16_LE,	33	.formats = SNDRV_PCM_FMTBIT_S16_LE,
34	.rates = SNDRV_PCM_RATE_CONTINUOUS \| SNDRV_PCM_RATE_44100 \|	34	.rates = SNDRV_PCM_RATE_CONTINUOUS \| SNDRV_PCM_RATE_44100 \|
35	SNDRV_PCM_RATE_48000,	35	SNDRV_PCM_RATE_48000,

@@ -740,7 +740,7 @@ void vtime_account_system(struct task_struct *tsk) · 739 unmodified lines
740		740
741	write_seqcount_begin(&vtime->seqcount);	741	write_seqcount_begin(&vtime->seqcount);
742	/* We might have scheduled out from guest path */	742	/* We might have scheduled out from guest path */
743	if (current->flags & PF_VCPU)	743	if (tsk->flags & PF_VCPU)
744	vtime_account_guest(tsk, vtime);	744	vtime_account_guest(tsk, vtime);
745	else	745	else
746	__vtime_account_system(tsk, vtime);	746	__vtime_account_system(tsk, vtime);
@@ -783,7 +783,7 @@ void vtime_guest_enter(struct task_struct *tsk) · 36 unmodified lines
783	*/	783	*/
784	write_seqcount_begin(&vtime->seqcount);	784	write_seqcount_begin(&vtime->seqcount);
785	__vtime_account_system(tsk, vtime);	785	__vtime_account_system(tsk, vtime);
786	current->flags \|= PF_VCPU;	786	tsk->flags \|= PF_VCPU;
787	write_seqcount_end(&vtime->seqcount);	787	write_seqcount_end(&vtime->seqcount);
788	}	788	}
789	EXPORT_SYMBOL_GPL(vtime_guest_enter);	789	EXPORT_SYMBOL_GPL(vtime_guest_enter);
@@ -794,7 +794,7 @@ void vtime_guest_exit(struct task_struct *tsk) · 4 unmodified lines
794		794
795	write_seqcount_begin(&vtime->seqcount);	795	write_seqcount_begin(&vtime->seqcount);
796	vtime_account_guest(tsk, vtime);	796	vtime_account_guest(tsk, vtime);
797	current->flags &= ~PF_VCPU;	797	tsk->flags &= ~PF_VCPU;
798	write_seqcount_end(&vtime->seqcount);	798	write_seqcount_end(&vtime->seqcount);
799	}	799	}
800	EXPORT_SYMBOL_GPL(vtime_guest_exit);	800	EXPORT_SYMBOL_GPL(vtime_guest_exit);