Revert "Merge tag 'android14-6.1.75_r00' into android14-6.1"

This reverts commit 1dbafe6. Reason for revert: Too early. Needs to wait until 2024-03-27 Change-Id: I769b944bd089aa2278659ec87f7ba4ac4e74ee4a Signed-off-by: Todd Kjos <[email protected]>
NothingOSS · Mar 7, 2024 · 6bad105 · 6bad105
1 parent ecb45e2
commit 6bad105
Show file tree

Hide file tree

Showing 897 changed files with 6,208 additions and 10,610 deletions.
diff --git a/Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml b/Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
@@ -126,7 +126,7 @@ examples:
   - |
     #include <dt-bindings/interrupt-controller/arm-gic.h>
 
-        gpio@a0020000 {
+        gpio@e000a000 {
             compatible = "xlnx,xps-gpio-1.00.a";
             reg = <0xa0020000 0x10000>;
             #gpio-cells = <2>;

diff --git a/Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml b/Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml
@@ -61,9 +61,6 @@ properties:
       - description: used for 1st data pipe from RDMA
       - description: used for 2nd data pipe from RDMA
 
-  '#dma-cells':
-    const: 1
-
 required:
   - compatible
   - reg
@@ -73,7 +70,6 @@ required:
   - clocks
   - iommus
   - mboxes
-  - '#dma-cells'
 
 additionalProperties: false
 
@@ -84,17 +80,16 @@ examples:
     #include <dt-bindings/power/mt8183-power.h>
     #include <dt-bindings/memory/mt8183-larb-port.h>
 
-    dma-controller@14001000 {
-        compatible = "mediatek,mt8183-mdp3-rdma";
-        reg = <0x14001000 0x1000>;
-        mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>;
-        mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>,
-                              <CMDQ_EVENT_MDP_RDMA0_EOF>;
-        power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
-        clocks = <&mmsys CLK_MM_MDP_RDMA0>,
-                 <&mmsys CLK_MM_MDP_RSZ1>;
-        iommus = <&iommu>;
-        mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>,
-                 <&gce 21 CMDQ_THR_PRIO_LOWEST>;
-        #dma-cells = <1>;
+    mdp3_rdma0: mdp3-rdma0@14001000 {
+      compatible = "mediatek,mt8183-mdp3-rdma";
+      reg = <0x14001000 0x1000>;
+      mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>;
+      mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>,
+                            <CMDQ_EVENT_MDP_RDMA0_EOF>;
+      power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
+      clocks = <&mmsys CLK_MM_MDP_RDMA0>,
+               <&mmsys CLK_MM_MDP_RSZ1>;
+      iommus = <&iommu>;
+      mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>,
+               <&gce 21 CMDQ_THR_PRIO_LOWEST>;
     };
diff --git a/Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml b/Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml
@@ -50,9 +50,6 @@ properties:
   iommus:
     maxItems: 1
 
-  '#dma-cells':
-    const: 1
-
 required:
   - compatible
   - reg
@@ -61,7 +58,6 @@ required:
   - power-domains
   - clocks
   - iommus
-  - '#dma-cells'
 
 additionalProperties: false
 
@@ -72,14 +68,13 @@ examples:
     #include <dt-bindings/power/mt8183-power.h>
     #include <dt-bindings/memory/mt8183-larb-port.h>
 
-    dma-controller@14005000 {
-        compatible = "mediatek,mt8183-mdp3-wrot";
-        reg = <0x14005000 0x1000>;
-        mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>;
-        mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>,
-                              <CMDQ_EVENT_MDP_WROT0_EOF>;
-        power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
-        clocks = <&mmsys CLK_MM_MDP_WROT0>;
-        iommus = <&iommu>;
-        #dma-cells = <1>;
+    mdp3_wrot0: mdp3-wrot0@14005000 {
+      compatible = "mediatek,mt8183-mdp3-wrot";
+      reg = <0x14005000 0x1000>;
+      mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>;
+      mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>,
+                            <CMDQ_EVENT_MDP_WROT0_EOF>;
+      power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;
+      clocks = <&mmsys CLK_MM_MDP_WROT0>;
+      iommus = <&iommu>;
     };
diff --git a/Documentation/devicetree/bindings/media/rockchip-isp1.yaml b/Documentation/devicetree/bindings/media/rockchip-isp1.yaml
@@ -90,16 +90,15 @@ properties:
         description: connection point for input on the parallel interface
 
         properties:
+          bus-type:
+            enum: [5, 6]
+
           endpoint:
             $ref: video-interfaces.yaml#
             unevaluatedProperties: false
 
-            properties:
-              bus-type:
-                enum: [5, 6]
-
-            required:
-              - bus-type
+        required:
+          - bus-type
 
     anyOf:
       - required:

diff --git a/Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml b/Documentation/devicetree/bindings/nvmem/mxs-ocotp.yaml
@@ -14,11 +14,9 @@ allOf:
 
 properties:
   compatible:
-    items:
-      - enum:
-          - fsl,imx23-ocotp
-          - fsl,imx28-ocotp
-      - const: fsl,ocotp
+    enum:
+      - fsl,imx23-ocotp
+      - fsl,imx28-ocotp
 
   "#address-cells":
     const: 1
@@ -42,7 +40,7 @@ additionalProperties: false
 examples:
   - |
     ocotp: efuse@8002c000 {
-        compatible = "fsl,imx28-ocotp", "fsl,ocotp";
+        compatible = "fsl,imx28-ocotp";
         #address-cells = <1>;
         #size-cells = <1>;
         reg = <0x8002c000 0x2000>;

diff --git a/Documentation/driver-api/pci/p2pdma.rst b/Documentation/driver-api/pci/p2pdma.rst
@@ -83,9 +83,19 @@ this to include other types of resources like doorbells.
 Client Drivers
 --------------
 
-A client driver only has to use the mapping API :c:func:`dma_map_sg()`
-and :c:func:`dma_unmap_sg()` functions as usual, and the implementation
-will do the right thing for the P2P capable memory.
+A client driver typically only has to conditionally change its DMA map
+routine to use the mapping function :c:func:`pci_p2pdma_map_sg()` instead
+of the usual :c:func:`dma_map_sg()` function. Memory mapped in this
+way does not need to be unmapped.
+
+The client may also, optionally, make use of
+:c:func:`is_pci_p2pdma_page()` to determine when to use the P2P mapping
+functions and when to use the regular mapping functions. In some
+situations, it may be more appropriate to use a flag to indicate a
+given request is P2P memory and map appropriately. It is important to
+ensure that struct pages that back P2P memory stay out of code that
+does not have support for them as other code may treat the pages as
+regular memory which may not be appropriate.
 
 
 Orchestrator Drivers

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -10845,8 +10845,6 @@ L:	[email protected]
 S:	Maintained
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:	kernel/irq/
-F:	include/linux/group_cpus.h
-F:	lib/group_cpus.c
 
 IRQCHIP DRIVERS
 M:	Thomas Gleixner <[email protected]>

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 75
+SUBLEVEL = 68
 EXTRAVERSION =
 NAME = Curry Ramen
 

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
@@ -39134,10 +39134,6 @@ member {
   id: 0x230f36dc
   type_id: 0x0312ab60
 }
-member {
-  id: 0x23531e28
-  type_id: 0x026208b2
-}
 member {
   id: 0x2380a48f
   type_id: 0x012ce22f
@@ -40052,11 +40048,6 @@ member {
   type_id: 0x5d86aa37
   offset: 96
 }
-member {
-  id: 0x34aaae1a
-  type_id: 0x5d84d1ff
-  offset: 24
-}
 member {
   id: 0x34be27ed
   type_id: 0x5dd6efa4
@@ -51120,10 +51111,10 @@ member {
   offset: 160
 }
 member {
-  id: 0xb2dd5b41
+  id: 0xb2dd57f2
   name: "autoconf"
   type_id: 0xb3e7bac9
-  offset: 6
+  offset: 30
   bitsize: 1
 }
 member {
@@ -141071,10 +141062,10 @@ member {
   offset: 9920
 }
 member {
-  id: 0x7adb5caf
+  id: 0x7adb50ba
   name: "onlink"
   type_id: 0xb3e7bac9
-  offset: 7
+  offset: 31
   bitsize: 1
 }
 member {
@@ -164816,9 +164807,10 @@ member {
   offset: 1024
 }
 member {
-  id: 0x688b9626
+  id: 0x688b9047
   name: "reserved"
   type_id: 0xb3e7bac9
+  offset: 24
   bitsize: 6
 }
 member {
@@ -209484,16 +209476,6 @@ struct_union {
     member_id: 0x2d8a4e32
   }
 }
-struct_union {
-  id: 0x026208b2
-  kind: STRUCT
-  definition {
-    bytesize: 1
-    member_id: 0x688b9626
-    member_id: 0xb2dd5b41
-    member_id: 0x7adb5caf
-  }
-}
 struct_union {
   id: 0x02c70092
   kind: STRUCT
@@ -214650,15 +214632,6 @@ struct_union {
     member_id: 0x36752b74
   }
 }
-struct_union {
-  id: 0x5d84d1ff
-  kind: UNION
-  definition {
-    bytesize: 1
-    member_id: 0x2ddb63e4
-    member_id: 0x23531e28
-  }
-}
 struct_union {
   id: 0x5d86aa37
   kind: UNION
@@ -249227,7 +249200,9 @@ struct_union {
     member_id: 0x5ce532c4
     member_id: 0xb5de8e04
     member_id: 0x2165da89
-    member_id: 0x34aaae1a
+    member_id: 0x688b9047
+    member_id: 0xb2dd57f2
+    member_id: 0x7adb50ba
     member_id: 0xe91a1d71
     member_id: 0xbada6e7d
     member_id: 0x08cabd3c

diff --git a/arch/Kconfig b/arch/Kconfig
@@ -34,9 +34,6 @@ config ARCH_HAS_SUBPAGE_FAULTS
 config HOTPLUG_SMT
 	bool
 
-config SMT_NUM_THREADS_DYNAMIC
-	bool
-
 config GENERIC_ENTRY
        bool
 

diff --git a/arch/arc/kernel/signal.c b/arch/arc/kernel/signal.c
@@ -61,7 +61,7 @@ struct rt_sigframe {
 	unsigned int sigret_magic;
 };
 
-static int save_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
+static int save_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
 {
 	int err = 0;
 #ifndef CONFIG_ISA_ARCOMPACT
@@ -74,12 +74,12 @@ static int save_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
 #else
 	v2abi.r58 = v2abi.r59 = 0;
 #endif
-	err = __copy_to_user(&mctx->v2abi, (void const *)&v2abi, sizeof(v2abi));
+	err = __copy_to_user(&mctx->v2abi, &v2abi, sizeof(v2abi));
 #endif
 	return err;
 }
 
-static int restore_arcv2_regs(struct sigcontext __user *mctx, struct pt_regs *regs)
+static int restore_arcv2_regs(struct sigcontext *mctx, struct pt_regs *regs)
 {
 	int err = 0;
 #ifndef CONFIG_ISA_ARCOMPACT

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
@@ -349,7 +349,6 @@
 					<SYSC_IDLE_NO>,
 					<SYSC_IDLE_SMART>,
 					<SYSC_IDLE_SMART_WKUP>;
-			ti,sysc-delay-us = <2>;
 			clocks = <&l3s_clkctrl AM3_L3S_USB_OTG_HS_CLKCTRL 0>;
 			clock-names = "fck";
 			#address-cells = <1>;

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
@@ -144,7 +144,7 @@
 
 		l3-noc@44000000 {
 			compatible = "ti,dra7-l3-noc";
-			reg = <0x44000000 0x1000000>,
+			reg = <0x44000000 0x1000>,
 			      <0x45000000 0x1000>;
 			interrupts-extended = <&crossbar_mpu GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
 					      <&wakeupgen GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -750,7 +750,7 @@
 
 				xoadc: xoadc@197 {
 					compatible = "qcom,pm8921-adc";
-					reg = <0x197>;
+					reg = <197>;
 					interrupts-extended = <&pmicintc 78 IRQ_TYPE_EDGE_RISING>;
 					#address-cells = <2>;
 					#size-cells = <0>;

diff --git a/arch/arm/boot/dts/qcom-sdx65.dtsi b/arch/arm/boot/dts/qcom-sdx65.dtsi
@@ -401,7 +401,7 @@
 			reg = <0x0c264000 0x1000>;
 		};
 
-		spmi_bus: spmi@c440000 {
+		spmi_bus: qcom,spmi@c440000 {
 			compatible = "qcom,spmi-pmic-arb";
 			reg = <0xc440000 0xd00>,
 				<0xc600000 0x2000000>,

diff --git a/arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts b/arch/arm/boot/dts/stm32mp157a-dk1-scmi.dts
@@ -11,7 +11,7 @@
 
 / {
 	model = "STMicroelectronics STM32MP157A-DK1 SCMI Discovery Board";
-	compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157";
+	compatible = "st,stm32mp157a-dk1-scmi", "st,stm32mp157a-dk1", "st,stm32mp157";
 
 	reserved-memory {
 		optee@de000000 {

diff --git a/arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts b/arch/arm/boot/dts/stm32mp157c-dk2-scmi.dts
@@ -11,7 +11,7 @@
 
 / {
 	model = "STMicroelectronics STM32MP157C-DK2 SCMI Discovery Board";
-	compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157";
+	compatible = "st,stm32mp157c-dk2-scmi", "st,stm32mp157c-dk2", "st,stm32mp157";
 
 	reserved-memory {
 		optee@de000000 {

diff --git a/arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts b/arch/arm/boot/dts/stm32mp157c-ed1-scmi.dts
@@ -11,7 +11,7 @@
 
 / {
 	model = "STMicroelectronics STM32MP157C-ED1 SCMI eval daughter";
-	compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157";
+	compatible = "st,stm32mp157c-ed1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157";
 
 	reserved-memory {
 		optee@fe000000 {

diff --git a/arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts b/arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts
@@ -11,7 +11,8 @@
 
 / {
 	model = "STMicroelectronics STM32MP157C-EV1 SCMI eval daughter on eval mother";
-	compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ed1", "st,stm32mp157";
+	compatible = "st,stm32mp157c-ev1-scmi", "st,stm32mp157c-ev1", "st,stm32mp157c-ed1",
+		     "st,stm32mp157";
 
 	reserved-memory {
 		optee@fe000000 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,9 +34,6 @@ config ARCH_HAS_SUBPAGE_FAULTS @@
     config HOTPLUG_SMT
     	bool
-    config SMT_NUM_THREADS_DYNAMIC
-    	bool
     config GENERIC_ENTRY
            bool
@@ Expand Down @@