1 年之前 · 136573f110
--- a/Documentation/ABI/testing/sysfs-bus-optee-devices
+++ b/Documentation/ABI/testing/sysfs-bus-optee-devices
@@ -6,3 +6,12 @@ Description:
 
				 		OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
			
 
				 		matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
			
 
				 		are free to create needed API under optee-ta-<uuid> directory.
			
 
				+
			
 
				+What:		/sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
			
 
				+Date:		November 2023
			
 
				+KernelVersion:	6.7
			
 
				+Contact:	[email protected]
			
 
				+Description:
			
 
				+		Allows to distinguish whether an OP-TEE based TA/device requires user-space
			
 
				+		tee-supplicant to function properly or not. This attribute will be present for
			
 
				+		devices which depend on tee-supplicant to be running.
			
--- a/Documentation/ABI/testing/sysfs-platform-asus-wmi
+++ b/Documentation/ABI/testing/sysfs-platform-asus-wmi
@@ -57,3 +57,12 @@ Description:
 
				 			* 0 - default,
			
 
				 			* 1 - overboost,
			
 
				 			* 2 - silent
			
 
				+
			
 
				+What:		/sys/devices/platform/<platform>/dgpu_disable
			
 
				+Date:		Aug 2022
			
 
				+KernelVersion:	5.17
			
 
				+Contact:	"Luke Jones" <[email protected]>
			
 
				+Description:
			
 
				+		Disable discrete GPU:
			
 
				+			* 0 - Enable dGPU,
			
 
				+			* 1 - Disable dGPU
			
--- a/Documentation/admin-guide/sysctl/net.rst
+++ b/Documentation/admin-guide/sysctl/net.rst
@@ -31,18 +31,18 @@ see only some of them, depending on your kernel's configuration.
 
				 
			
 
				 Table : Subdirectories in /proc/sys/net
			
 
				 
			
 
				- ========= =================== = ========== ==================
			
 
				+ ========= =================== = ========== ===================
			
 
				  Directory Content               Directory  Content
			
 
				- ========= =================== = ========== ==================
			
 
				- 802       E802 protocol         mptcp     Multipath TCP
			
 
				- appletalk Appletalk protocol    netfilter Network Filter
			
 
				+ ========= =================== = ========== ===================
			
 
				+ 802       E802 protocol         mptcp      Multipath TCP
			
 
				+ appletalk Appletalk protocol    netfilter  Network Filter
			
 
				  ax25      AX25                  netrom     NET/ROM
			
 
				- bridge    Bridging              rose      X.25 PLP layer
			
 
				- core      General parameter     tipc      TIPC
			
 
				- ethernet  Ethernet protocol     unix      Unix domain sockets
			
 
				- ipv4      IP version 4          x25       X.25 protocol
			
 
				+ bridge    Bridging              rose       X.25 PLP layer
			
 
				+ core      General parameter     tipc       TIPC
			
 
				+ ethernet  Ethernet protocol     unix       Unix domain sockets
			
 
				+ ipv4      IP version 4          x25        X.25 protocol
			
 
				  ipv6      IP version 6
			
 
				- ========= =================== = ========== ==================
			
 
				+ ========= =================== = ========== ===================
			
 
				 
			
 
				 1. /proc/sys/net/core - Network core options
			
 
				 ============================================
			
--- a/Documentation/networking/ip-sysctl.rst
+++ b/Documentation/networking/ip-sysctl.rst
@@ -1902,6 +1902,14 @@ accept_ra_min_hop_limit - INTEGER
 
				 
			
 
				 	Default: 1
			
 
				 
			
 
				+accept_ra_min_lft - INTEGER
			
 
				+	Minimum acceptable lifetime value in Router Advertisement.
			
 
				+
			
 
				+	RA sections with a lifetime less than this value shall be
			
 
				+	ignored. Zero lifetimes stay unaffected.
			
 
				+
			
 
				+	Default: 0
			
 
				+
			
 
				 accept_ra_pinfo - BOOLEAN
			
 
				 	Learn Prefix Information in Router Advertisement.
			
 
				 
			
--- a/Documentation/process/deprecated.rst
+++ b/Documentation/process/deprecated.rst
@@ -70,6 +70,9 @@ Instead, the 2-factor form of the allocator should be used::
 
				 
			
 
				 	foo = kmalloc_array(count, size, GFP_KERNEL);
			
 
				 
			
 
				+Specifically, kmalloc() can be replaced with kmalloc_array(), and
			
 
				+kzalloc() can be replaced with kcalloc().
			
 
				+
			
 
				 If no 2-factor form is available, the saturate-on-overflow helpers should
			
 
				 be used::
			
 
				 
			
@@ -90,9 +93,20 @@ Instead, use the helper::
 
				         array usage and switch to a `flexible array member
			
 
				         <#zero-length-and-one-element-arrays>`_ instead.
			
 
				 
			
 
				-See array_size(), array3_size(), and struct_size(),
			
 
				-for more details as well as the related check_add_overflow() and
			
 
				-check_mul_overflow() family of functions.
			
 
				+For other calculations, please compose the use of the size_mul(),
			
 
				+size_add(), and size_sub() helpers. For example, in the case of::
			
 
				+
			
 
				+	foo = krealloc(current_size + chunk_size * (count - 3), GFP_KERNEL);
			
 
				+
			
 
				+Instead, use the helpers::
			
 
				+
			
 
				+	foo = krealloc(size_add(current_size,
			
 
				+				size_mul(chunk_size,
			
 
				+					 size_sub(count, 3))), GFP_KERNEL);
			
 
				+
			
 
				+For more details, also see array3_size() and flex_array_size(),
			
 
				+as well as the related check_mul_overflow(), check_add_overflow(),
			
 
				+check_sub_overflow(), and check_shl_overflow() family of functions.
			
 
				 
			
 
				 simple_strtol(), simple_strtoll(), simple_strtoul(), simple_strtoull()
			
 
				 ----------------------------------------------------------------------
			
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 
				 # SPDX-License-Identifier: GPL-2.0
			
 
				 VERSION = 5
			
 
				 PATCHLEVEL = 10
			
 
				-SUBLEVEL = 198
			
 
				+SUBLEVEL = 205
			
 
				 EXTRAVERSION =
			
 
				 NAME = Dare mighty things
			
 
				 
			
--- a/android/ACK_SHA
+++ b/android/ACK_SHA
@@ -1,2 +1,2 @@
 
				-26d1d5093064d66f4aeef96a10c76ec6186df1c6
			
 
				-android12-5.10-2024-01_r1
			
 
				+4d6c07fc6342c179a08b88650349e8457a333196
			
 
				+android12-5.10-2024-03_r1
			
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
--- a/android/abi_gki_aarch64_galaxy
+++ b/android/abi_gki_aarch64_galaxy
@@ -3316,6 +3316,7 @@
 
				   snd_card_disconnect
			
 
				   snd_card_free
			
 
				   snd_card_new
			
 
				+  snd_card_ref
			
 
				   snd_card_register
			
 
				   snd_card_rw_proc_new
			
 
				   snd_component_add
			
--- a/android/abi_gki_aarch64_mtk
+++ b/android/abi_gki_aarch64_mtk
@@ -2381,10 +2381,13 @@
 
				   uart_update_timeout
			
 
				   uclamp_eff_value
			
 
				   __udelay
			
 
				+  ufshcd_complete_requests
			
 
				   ufshcd_delay_us
			
 
				   ufshcd_dme_get_attr
			
 
				   ufshcd_dme_set_attr
			
 
				   ufshcd_dump_regs
			
 
				+  ufshcd_err_handling_prepare
			
 
				+  ufshcd_err_handling_unprepare
			
 
				   ufshcd_fixup_dev_quirks
			
 
				   ufshcd_get_pwr_dev_param
			
 
				   ufshcd_hba_enable
			
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -2565,6 +2565,7 @@
 
				   __stack_chk_guard
			
 
				   stack_depot_fetch
			
 
				   stack_trace_save
			
 
				+  static_key_enable
			
 
				   static_key_disable
			
 
				   static_key_slow_dec
			
 
				   static_key_slow_inc
			
@@ -2761,6 +2762,7 @@
 
				   __traceiter_android_rvh_wake_up_new_task
			
 
				   __traceiter_android_vh_account_task_time
			
 
				   __traceiter_android_vh_add_page_to_lrulist
			
 
				+  __traceiter_android_vh_adjust_alloc_flags
			
 
				   __traceiter_android_vh_alloc_pages_slowpath_begin
			
 
				   __traceiter_android_vh_alloc_pages_slowpath_end
			
 
				   __traceiter_android_vh_allow_domain_state
			
@@ -2937,6 +2939,7 @@
 
				   __traceiter_android_vh_ufs_send_tm_command
			
 
				   __traceiter_android_vh_update_page_mapcount
			
 
				   __traceiter_android_vh_update_topology_flags_workfn
			
 
				+  __traceiter_android_vh_vmscan_kswapd_done
			
 
				   __traceiter_binder_transaction_received
			
 
				   __traceiter_cpu_frequency
			
 
				   __traceiter_cpu_frequency_limits
			
@@ -2945,6 +2948,7 @@
 
				   __traceiter_ipi_entry
			
 
				   __traceiter_ipi_raise
			
 
				   __traceiter_irq_handler_entry
			
 
				+  __traceiter_mm_vmscan_kswapd_wake
			
 
				   __traceiter_net_dev_queue
			
 
				   __traceiter_net_dev_xmit
			
 
				   __traceiter_netif_receive_skb
			
@@ -2972,6 +2976,7 @@
 
				   __traceiter_android_vh_free_oem_binder_struct
			
 
				   __traceiter_android_vh_binder_special_task
			
 
				   __traceiter_android_vh_binder_free_buf
			
 
				+  __traceiter_android_vh_binder_buffer_release
			
 
				   __tracepoint_android_rvh_account_irq
			
 
				   __tracepoint_android_rvh_after_enqueue_task
			
 
				   __tracepoint_android_rvh_build_perf_domains
			
@@ -3035,6 +3040,7 @@
 
				   __tracepoint_android_rvh_wake_up_new_task
			
 
				   __tracepoint_android_vh_account_task_time
			
 
				   __tracepoint_android_vh_add_page_to_lrulist
			
 
				+  __tracepoint_android_vh_adjust_alloc_flags
			
 
				   __tracepoint_android_vh_alloc_pages_slowpath_begin
			
 
				   __tracepoint_android_vh_alloc_pages_slowpath_end
			
 
				   __tracepoint_android_vh_allow_domain_state
			
@@ -3211,6 +3217,7 @@
 
				   __tracepoint_android_vh_ufs_send_tm_command
			
 
				   __tracepoint_android_vh_update_page_mapcount
			
 
				   __tracepoint_android_vh_update_topology_flags_workfn
			
 
				+  __tracepoint_android_vh_vmscan_kswapd_done
			
 
				   __tracepoint_binder_transaction_received
			
 
				   __tracepoint_cpu_frequency
			
 
				   __tracepoint_cpu_frequency_limits
			
@@ -3219,6 +3226,7 @@
 
				   __tracepoint_ipi_entry
			
 
				   __tracepoint_ipi_raise
			
 
				   __tracepoint_irq_handler_entry
			
 
				+  __tracepoint_mm_vmscan_kswapd_wake
			
 
				   __tracepoint_net_dev_queue
			
 
				   __tracepoint_net_dev_xmit
			
 
				   __tracepoint_netif_receive_skb
			
@@ -3250,6 +3258,7 @@
 
				   __tracepoint_android_vh_free_oem_binder_struct
			
 
				   __tracepoint_android_vh_binder_special_task
			
 
				   __tracepoint_android_vh_binder_free_buf
			
 
				+  __tracepoint_android_vh_binder_buffer_release
			
 
				   trace_print_array_seq
			
 
				   trace_print_flags_seq
			
 
				   trace_print_hex_seq
			
@@ -3714,4 +3723,6 @@
 
				   xhci_ring_cmd_db
			
 
				   xhci_ring_free
			
 
				   xhci_trb_virt_to_dma
			
 
				+  xt_register_match
			
 
				+  xt_unregister_match
			
 
				   zero_pfn
			
--- a/android/abi_gki_aarch64_transsion
+++ b/android/abi_gki_aarch64_transsion
@@ -46,6 +46,26 @@
 
				   __traceiter_android_vh_unuse_swap_page
			
 
				   __traceiter_android_vh_waiting_for_page_migration
			
 
				   __traceiter_android_vh_should_end_madvise
			
 
				+  __traceiter_android_vh_exit_check
			
 
				+  __traceiter_android_vh_bio_free
			
 
				+  __traceiter_android_rvh_internal_blk_mq_alloc_request
			
 
				+  __traceiter_android_vh_internal_blk_mq_free_request
			
 
				+  __traceiter_android_vh_blk_mq_complete_request
			
 
				+  __traceiter_android_vh_blk_mq_add_to_requeue_list
			
 
				+  __traceiter_android_rvh_blk_mq_delay_run_hw_queue
			
 
				+  __traceiter_android_vh_blk_mq_run_hw_queue
			
 
				+  __traceiter_android_vh_blk_mq_insert_request
			
 
				+  __traceiter_android_rvh_blk_mq_alloc_rq_map
			
 
				+  __traceiter_android_rvh_blk_mq_init_allocated_queue
			
 
				+  __traceiter_android_vh_blk_mq_exit_queue
			
 
				+  __traceiter_android_vh_blk_mq_alloc_tag_set
			
 
				+  __traceiter_android_rvh_blk_allocated_queue_init
			
 
				+  __traceiter_android_rvh_blk_flush_plug_list
			
 
				+  __traceiter_android_vh_blk_alloc_flush_queue
			
 
				+  __traceiter_android_vh_blk_mq_all_tag_iter
			
 
				+  __traceiter_android_vh_blk_mq_queue_tag_busy_iter
			
 
				+  __traceiter_android_vh_blk_mq_free_tags
			
 
				+  __traceiter_android_vh_blk_mq_sched_insert_request
			
 
				   __tracepoint_android_rvh_alloc_si
			
 
				   __tracepoint_android_rvh_alloc_swap_slot_cache
			
 
				   __tracepoint_android_rvh_drain_slots_cache_cpu
			
@@ -82,4 +102,24 @@
 
				   __tracepoint_android_vh_unuse_swap_page
			
 
				   __tracepoint_android_vh_waiting_for_page_migration
			
 
				   __tracepoint_android_vh_should_end_madvise
			
 
				+  __tracepoint_android_vh_exit_check
			
 
				+  __tracepoint_android_vh_bio_free
			
 
				+  __tracepoint_android_rvh_internal_blk_mq_alloc_request
			
 
				+  __tracepoint_android_vh_internal_blk_mq_free_request
			
 
				+  __tracepoint_android_vh_blk_mq_complete_request
			
 
				+  __tracepoint_android_vh_blk_mq_add_to_requeue_list
			
 
				+  __tracepoint_android_rvh_blk_mq_delay_run_hw_queue
			
 
				+  __tracepoint_android_vh_blk_mq_run_hw_queue
			
 
				+  __tracepoint_android_vh_blk_mq_insert_request
			
 
				+  __tracepoint_android_rvh_blk_mq_alloc_rq_map
			
 
				+  __tracepoint_android_rvh_blk_mq_init_allocated_queue
			
 
				+  __tracepoint_android_vh_blk_mq_exit_queue
			
 
				+  __tracepoint_android_vh_blk_mq_alloc_tag_set
			
 
				+  __tracepoint_android_rvh_blk_allocated_queue_init
			
 
				+  __tracepoint_android_rvh_blk_flush_plug_list
			
 
				+  __tracepoint_android_vh_blk_alloc_flush_queue
			
 
				+  __tracepoint_android_vh_blk_mq_all_tag_iter
			
 
				+  __tracepoint_android_vh_blk_mq_queue_tag_busy_iter
			
 
				+  __tracepoint_android_vh_blk_mq_free_tags
			
 
				+  __tracepoint_android_vh_blk_mq_sched_insert_request
			
 
				   zero_pfn
			
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -437,7 +437,7 @@
 
				 			};
			
 
				 
			
 
				 			gpt1: timer@302d0000 {
			
 
				-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
			
 
				+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
			
 
				 				reg = <0x302d0000 0x10000>;
			
 
				 				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
			
 
				 				clocks = <&clks IMX7D_GPT1_ROOT_CLK>,
			
@@ -446,7 +446,7 @@
 
				 			};
			
 
				 
			
 
				 			gpt2: timer@302e0000 {
			
 
				-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
			
 
				+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
			
 
				 				reg = <0x302e0000 0x10000>;
			
 
				 				interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
			
 
				 				clocks = <&clks IMX7D_GPT2_ROOT_CLK>,
			
@@ -456,7 +456,7 @@
 
				 			};
			
 
				 
			
 
				 			gpt3: timer@302f0000 {
			
 
				-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
			
 
				+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
			
 
				 				reg = <0x302f0000 0x10000>;
			
 
				 				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
			
 
				 				clocks = <&clks IMX7D_GPT3_ROOT_CLK>,
			
@@ -466,7 +466,7 @@
 
				 			};
			
 
				 
			
 
				 			gpt4: timer@30300000 {
			
 
				-				compatible = "fsl,imx7d-gpt", "fsl,imx6sx-gpt";
			
 
				+				compatible = "fsl,imx7d-gpt", "fsl,imx6dl-gpt";
			
 
				 				reg = <0x30300000 0x10000>;
			
 
				 				interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
			
 
				 				clocks = <&clks IMX7D_GPT4_ROOT_CLK>,
			
--- a/arch/arm/boot/dts/motorola-mapphone-common.dtsi
+++ b/arch/arm/boot/dts/motorola-mapphone-common.dtsi
@@ -765,6 +765,7 @@
 
				 &uart3 {
			
 
				 	interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
			
 
				 			       &omap4_pmx_core 0x17c>;
			
 
				+	overrun-throttle-ms = <500>;
			
 
				 };
			
 
				 
			
 
				 &uart4 {
			
--- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -82,14 +82,12 @@
 
				 		};
			
 
				 	};
			
 
				 
			
 
				-	regulators {
			
 
				-		vsdcc_fixed: vsdcc-regulator {
			
 
				-			compatible = "regulator-fixed";
			
 
				-			regulator-name = "SDCC Power";
			
 
				-			regulator-min-microvolt = <2700000>;
			
 
				-			regulator-max-microvolt = <2700000>;
			
 
				-			regulator-always-on;
			
 
				-		};
			
 
				+	vsdcc_fixed: vsdcc-regulator {
			
 
				+		compatible = "regulator-fixed";
			
 
				+		regulator-name = "SDCC Power";
			
 
				+		regulator-min-microvolt = <2700000>;
			
 
				+		regulator-max-microvolt = <2700000>;
			
 
				+		regulator-always-on;
			
 
				 	};
			
 
				 
			
 
				 	soc: soc {
			
--- a/arch/arm/include/asm/exception.h
+++ b/arch/arm/include/asm/exception.h
@@ -10,10 +10,6 @@
 
				 
			
 
				 #include <linux/interrupt.h>
			
 
				 
			
 
				-#ifdef CONFIG_FUNCTION_GRAPH_TRACER
			
 
				 #define __exception_irq_entry	__irq_entry
			
 
				-#else
			
 
				-#define __exception_irq_entry
			
 
				-#endif
			
 
				 
			
 
				 #endif /* __ASM_ARM_EXCEPTION_H */
			
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
@@ -16,6 +16,7 @@
 
				 ENTRY(mmioset)
			
 
				 ENTRY(memset)
			
 
				 UNWIND( .fnstart         )
			
 
				+	and	r1, r1, #255		@ cast to unsigned char
			
 
				 	ands	r3, r0, #3		@ 1 unaligned?
			
 
				 	mov	ip, r0			@ preserve r0 as return value
			
 
				 	bne	6f			@ 1
			
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -502,6 +502,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
 
				 
			
 
				 	name = devm_kasprintf(&pdev->dev,
			
 
				 				GFP_KERNEL, "mmdc%d", ret);
			
 
				+	if (!name) {
			
 
				+		ret = -ENOMEM;
			
 
				+		goto pmu_release_id;
			
 
				+	}
			
 
				 
			
 
				 	pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
			
 
				 	pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
			
@@ -524,9 +528,10 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
 
				 
			
 
				 pmu_register_err:
			
 
				 	pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret);
			
 
				-	ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
			
 
				 	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
			
 
				 	hrtimer_cancel(&pmu_mmdc->hrtimer);
			
 
				+pmu_release_id:
			
 
				+	ida_simple_remove(&mmdc_ida, pmu_mmdc->id);
			
 
				 pmu_free:
			
 
				 	kfree(pmu_mmdc);
			
 
				 	return ret;
			
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -362,7 +362,8 @@ static int __init xen_guest_init(void)
 
				 	 * for secondary CPUs as they are brought up.
			
 
				 	 * For uniformity we use VCPUOP_register_vcpu_info even on cpu0.
			
 
				 	 */
			
 
				-	xen_vcpu_info = alloc_percpu(struct vcpu_info);
			
 
				+	xen_vcpu_info = __alloc_percpu(sizeof(struct vcpu_info),
			
 
				+				       1 << fls(sizeof(struct vcpu_info) - 1));
			
 
				 	if (xen_vcpu_info == NULL)
			
 
				 		return -ENOMEM;
			
 
				 
			
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1065,6 +1065,8 @@ choice
 
				 config CPU_BIG_ENDIAN
			
 
				 	bool "Build big-endian kernel"
			
 
				 	depends on !LD_IS_LLD || LLD_VERSION >= 130000
			
 
				+	# https://github.com/llvm/llvm-project/commit/1379b150991f70a5782e9a143c2ba5308da1161c
			
 
				+	depends on AS_IS_GNU || AS_VERSION >= 150000
			
 
				 	help
			
 
				 	  Say Y if you plan on running a kernel with a big-endian userspace.
			
 
				 
			
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
@@ -69,7 +69,7 @@
 
				 		};
			
 
				 	};
			
 
				 
			
 
				-	memory {
			
 
				+	memory@40000000 {
			
 
				 		reg = <0 0x40000000 0 0x40000000>;
			
 
				 	};
			
 
				 
			
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
@@ -55,7 +55,7 @@
 
				 		};
			
 
				 	};
			
 
				 
			
 
				-	memory {
			
 
				+	memory@40000000 {
			
 
				 		reg = <0 0x40000000 0 0x20000000>;
			
 
				 	};
			
 
				 
			
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
@@ -43,7 +43,7 @@
 
				 		id-gpio = <&pio 16 GPIO_ACTIVE_HIGH>;
			
 
				 	};
			
 
				 
			
 
				-	usb_p1_vbus: regulator@0 {
			
 
				+	usb_p1_vbus: regulator-usb-p1 {
			
 
				 		compatible = "regulator-fixed";
			
 
				 		regulator-name = "usb_vbus";
			
 
				 		regulator-min-microvolt = <5000000>;
			
@@ -52,7 +52,7 @@
 
				 		enable-active-high;
			
 
				 	};
			
 
				 
			
 
				-	usb_p0_vbus: regulator@1 {
			
 
				+	usb_p0_vbus: regulator-usb-p0 {
			
 
				 		compatible = "regulator-fixed";
			
 
				 		regulator-name = "vbus";
			
 
				 		regulator-min-microvolt = <5000000>;
			
--- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
@@ -30,7 +30,7 @@
 
				 		#address-cells = <2>;
			
 
				 		#size-cells = <2>;
			
 
				 		ranges;
			
 
				-		scp_mem_reserved: scp_mem_region {
			
 
				+		scp_mem_reserved: memory@50000000 {
			
 
				 			compatible = "shared-dma-pool";
			
 
				 			reg = <0 0x50000000 0 0x2900000>;
			
 
				 			no-map;
			
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -95,7 +95,7 @@
 
				 		#size-cells = <2>;
			
 
				 		ranges;
			
 
				 
			
 
				-		scp_mem_reserved: scp_mem_region {
			
 
				+		scp_mem_reserved: memory@50000000 {
			
 
				 			compatible = "shared-dma-pool";
			
 
				 			reg = <0 0x50000000 0 0x2900000>;
			
 
				 			no-map;
			
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -129,12 +129,6 @@
 
				 		};
			
 
				 	};
			
 
				 
			
 
				-	tcsr_mutex: hwlock {
			
 
				-		compatible = "qcom,tcsr-mutex";
			
 
				-		syscon = <&tcsr_mutex_regs 0 0x80>;
			
 
				-		#hwlock-cells = <1>;
			
 
				-	};
			
 
				-
			
 
				 	pmuv8: pmu {
			
 
				 		compatible = "arm,cortex-a53-pmu";
			
 
				 		interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
			
@@ -175,7 +169,7 @@
 
				 	smem {
			
 
				 		compatible = "qcom,smem";
			
 
				 		memory-region = <&smem_region>;
			
 
				-		hwlocks = <&tcsr_mutex 0>;
			
 
				+		hwlocks = <&tcsr_mutex 3>;
			
 
				 	};
			
 
				 
			
 
				 	soc: soc {
			
@@ -242,9 +236,10 @@
 
				 			#reset-cells = <1>;
			
 
				 		};
			
 
				 
			
 
				-		tcsr_mutex_regs: syscon@1905000 {
			
 
				-			compatible = "syscon";
			
 
				-			reg = <0x0 0x01905000 0x0 0x8000>;
			
 
				+		tcsr_mutex: hwlock@1905000 {
			
 
				+			compatible = "qcom,ipq6018-tcsr-mutex", "qcom,tcsr-mutex";
			
 
				+			reg = <0x0 0x01905000 0x0 0x20000>;
			
 
				+			#hwlock-cells = <1>;
			
 
				 		};
			
 
				 
			
 
				 		tcsr_q6: syscon@1945000 {
			
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1175,7 +1175,7 @@
 
				 			#size-cells = <1>;
			
 
				 			#iommu-cells = <1>;
			
 
				 			compatible = "qcom,msm8916-iommu", "qcom,msm-iommu-v1";
			
 
				-			ranges = <0 0x01e20000 0x40000>;
			
 
				+			ranges = <0 0x01e20000 0x20000>;
			
 
				 			reg = <0x01ef0000 0x3000>;
			
 
				 			clocks = <&gcc GCC_SMMU_CFG_CLK>,
			
 
				 				 <&gcc GCC_APSS_TCU_CLK>;
			
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -564,6 +564,8 @@
 
				 	vdd-1.8-xo-supply = <&vreg_l7a_1p8>;
			
 
				 	vdd-1.3-rfa-supply = <&vreg_l17a_1p3>;
			
 
				 	vdd-3.3-ch0-supply = <&vreg_l25a_3p3>;
			
 
				+
			
 
				+	qcom,snoc-host-cap-8bit-quirk;
			
 
				 };
			
 
				 
			
 
				 /* PINCTRL - additions to nodes defined in sdm845.dtsi */
			
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1022,7 +1022,9 @@
 
				 			power-domain@RK3399_PD_VDU {
			
 
				 				reg = <RK3399_PD_VDU>;
			
 
				 				clocks = <&cru ACLK_VDU>,
			
 
				-					 <&cru HCLK_VDU>;
			
 
				+					 <&cru HCLK_VDU>,
			
 
				+					 <&cru SCLK_VDU_CA>,
			
 
				+					 <&cru SCLK_VDU_CORE>;
			
 
				 				pm_qos = <&qos_video_m1_r>,
			
 
				 					 <&qos_video_m1_w>;
			
 
				 			};
			
@@ -1276,7 +1278,7 @@
 
				 
			
 
				 	vdec: video-codec@ff660000 {
			
 
				 		compatible = "rockchip,rk3399-vdec";
			
 
				-		reg = <0x0 0xff660000 0x0 0x400>;
			
 
				+		reg = <0x0 0xff660000 0x0 0x480>;
			
 
				 		interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH 0>;
			
 
				 		clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>,
			
 
				 			 <&cru SCLK_VDU_CA>, <&cru SCLK_VDU_CORE>;
			
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -694,7 +694,6 @@ CONFIG_PANIC_TIMEOUT=-1
 
				 CONFIG_DETECT_HUNG_TASK=y
			
 
				 CONFIG_WQ_WATCHDOG=y
			
 
				 CONFIG_SCHEDSTATS=y
			
 
				-# CONFIG_DEBUG_PREEMPT is not set
			
 
				 CONFIG_BUG_ON_DATA_CORRUPTION=y
			
 
				 CONFIG_TRACE_MMIO_ACCESS=y
			
 
				 CONFIG_TRACEFS_DISABLE_AUTOMOUNT=y
			
--- a/arch/arm64/include/asm/pgtable.h
+++ b/arch/arm64/include/asm/pgtable.h
@@ -761,6 +761,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 
				 	if (pte_hw_dirty(pte))
			
 
				 		pte = pte_mkdirty(pte);
			
 
				 	pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
			
 
				+	/*
			
 
				+	 * If we end up clearing hw dirtiness for a sw-dirty PTE, set hardware
			
 
				+	 * dirtiness again.
			
 
				+	 */
			
 
				+	if (pte_sw_dirty(pte))
			
 
				+		pte = pte_mkdirty(pte);
			
 
				 	return pte;
			
 
				 }
			
 
				 
			
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -468,6 +468,7 @@ config MACH_LOONGSON2EF
 
				 
			
 
				 config MACH_LOONGSON64
			
 
				 	bool "Loongson 64-bit family of machines"
			
 
				+	select ARCH_DMA_DEFAULT_COHERENT
			
 
				 	select ARCH_SPARSEMEM_ENABLE
			
 
				 	select ARCH_MIGHT_HAVE_PC_PARPORT
			
 
				 	select ARCH_MIGHT_HAVE_PC_SERIO
			
@@ -1379,6 +1380,7 @@ config CPU_LOONGSON64
 
				 	select CPU_SUPPORTS_MSA
			
 
				 	select CPU_DIEI_BROKEN if !LOONGSON3_ENHANCEMENT
			
 
				 	select CPU_MIPSR2_IRQ_VI
			
 
				+	select DMA_NONCOHERENT
			
 
				 	select WEAK_ORDERING
			
 
				 	select WEAK_REORDERING_BEYOND_LLSC
			
 
				 	select MIPS_ASID_BITS_VARIABLE
			
--- a/arch/mips/include/asm/mach-loongson64/boot_param.h
+++ b/arch/mips/include/asm/mach-loongson64/boot_param.h
@@ -117,7 +117,8 @@ struct irq_source_routing_table {
 
				 	u64 pci_io_start_addr;
			
 
				 	u64 pci_io_end_addr;
			
 
				 	u64 pci_config_addr;
			
 
				-	u32 dma_mask_bits;
			
 
				+	u16 dma_mask_bits;
			
 
				+	u16 dma_noncoherent;
			
 
				 } __packed;
			
 
				 
			
 
				 struct interface_info {
			
--- a/arch/mips/kvm/mmu.c
+++ b/arch/mips/kvm/mmu.c
@@ -667,7 +667,7 @@ static int kvm_mips_map_page(struct kvm_vcpu *vcpu, unsigned long gpa,
 
				 	gfn_t gfn = gpa >> PAGE_SHIFT;
			
 
				 	int srcu_idx, err;
			
 
				 	kvm_pfn_t pfn;
			
 
				-	pte_t *ptep, entry, old_pte;
			
 
				+	pte_t *ptep, entry;
			
 
				 	bool writeable;
			
 
				 	unsigned long prot_bits;
			
 
				 	unsigned long mmu_seq;
			
@@ -739,7 +739,6 @@ retry:
 
				 	entry = pfn_pte(pfn, __pgprot(prot_bits));
			
 
				 
			
 
				 	/* Write the PTE */
			
 
				-	old_pte = *ptep;
			
 
				 	set_pte(ptep, entry);
			
 
				 
			
 
				 	err = 0;
			
--- a/arch/mips/loongson64/env.c
+++ b/arch/mips/loongson64/env.c
@@ -13,6 +13,8 @@
 
				  * Copyright (C) 2009 Lemote Inc.
			
 
				  * Author: Wu Zhangjin, [email protected]
			
 
				  */
			
 
				+
			
 
				+#include <linux/dma-map-ops.h>
			
 
				 #include <linux/export.h>
			
 
				 #include <linux/pci_ids.h>
			
 
				 #include <asm/bootinfo.h>
			
@@ -131,8 +133,14 @@ void __init prom_init_env(void)
 
				 	loongson_sysconf.pci_io_base = eirq_source->pci_io_start_addr;
			
 
				 	loongson_sysconf.dma_mask_bits = eirq_source->dma_mask_bits;
			
 
				 	if (loongson_sysconf.dma_mask_bits < 32 ||
			
 
				-		loongson_sysconf.dma_mask_bits > 64)
			
 
				+			loongson_sysconf.dma_mask_bits > 64) {
			
 
				 		loongson_sysconf.dma_mask_bits = 32;
			
 
				+		dma_default_coherent = true;
			
 
				+	} else {
			
 
				+		dma_default_coherent = !eirq_source->dma_noncoherent;
			
 
				+	}
			
 
				+
			
 
				+	pr_info("Firmware: Coherent DMA: %s\n", dma_default_coherent ? "on" : "off");
			
 
				 
			
 
				 	loongson_sysconf.restart_addr = boot_p->reset_system.ResetWarm;
			
 
				 	loongson_sysconf.poweroff_addr = boot_p->reset_system.Shutdown;
			
--- a/arch/mips/loongson64/init.c
+++ b/arch/mips/loongson64/init.c
@@ -140,6 +140,11 @@ static __init void reserve_pio_range(void)
 
				 			}
			
 
				 		}
			
 
				 	}
			
 
				+
			
 
				+	/* Reserve vgabios if it comes from firmware */
			
 
				+	if (loongson_sysconf.vgabios_addr)
			
 
				+		memblock_reserve(virt_to_phys((void *)loongson_sysconf.vgabios_addr),
			
 
				+				SZ_256K);
			
 
				 }
			
 
				 
			
 
				 void __init arch_init_irq(void)
			
--- a/arch/parisc/include/uapi/asm/errno.h
+++ b/arch/parisc/include/uapi/asm/errno.h
@@ -75,7 +75,6 @@
 
				 
			
 
				 /* We now return you to your regularly scheduled HPUX. */
			
 
				 
			
 
				-#define ENOSYM		215	/* symbol does not exist in executable */
			
 
				 #define	ENOTSOCK	216	/* Socket operation on non-socket */
			
 
				 #define	EDESTADDRREQ	217	/* Destination address required */
			
 
				 #define	EMSGSIZE	218	/* Message too long */
			
@@ -101,7 +100,6 @@
 
				 #define	ETIMEDOUT	238	/* Connection timed out */
			
 
				 #define	ECONNREFUSED	239	/* Connection refused */
			
 
				 #define	EREFUSED	ECONNREFUSED	/* for HP's NFS apparently */
			
 
				-#define	EREMOTERELEASE	240	/* Remote peer released connection */
			
 
				 #define	EHOSTDOWN	241	/* Host is down */
			
 
				 #define	EHOSTUNREACH	242	/* No route to host */
			
 
				 
			
--- a/arch/parisc/include/uapi/asm/pdc.h
+++ b/arch/parisc/include/uapi/asm/pdc.h
@@ -465,6 +465,7 @@ struct pdc_model {		/* for PDC_MODEL */
 
				 	unsigned long arch_rev;
			
 
				 	unsigned long pot_key;
			
 
				 	unsigned long curr_key;
			
 
				+	unsigned long width;	/* default of PSW_W bit (1=enabled) */
			
 
				 };
			
 
				 
			
 
				 struct pdc_cache_cf {		/* for PDC_CACHE  (I/D-caches) */
			
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -497,13 +497,13 @@
 
				 	 * to a CPU TLB 4k PFN (4k => 12 bits to shift) */
			
 
				 	#define PAGE_ADD_SHIFT		(PAGE_SHIFT-12)
			
 
				 	#define PAGE_ADD_HUGE_SHIFT	(REAL_HPAGE_SHIFT-12)
			
 
				+	#define PFN_START_BIT	(63-ASM_PFN_PTE_SHIFT+(63-58)-PAGE_ADD_SHIFT)
			
 
				 
			
 
				 	/* Drop prot bits and convert to page addr for iitlbt and idtlbt */
			
 
				 	.macro		convert_for_tlb_insert20 pte,tmp
			
 
				 #ifdef CONFIG_HUGETLB_PAGE
			
 
				 	copy		\pte,\tmp
			
 
				-	extrd,u		\tmp,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
			
 
				-				64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
			
 
				+	extrd,u		\tmp,PFN_START_BIT,PFN_START_BIT+1,\pte
			
 
				 
			
 
				 	depdi		_PAGE_SIZE_ENCODING_DEFAULT,63,\
			
 
				 				(63-58)+PAGE_ADD_SHIFT,\pte
			
@@ -511,8 +511,7 @@
 
				 	depdi		_HUGE_PAGE_SIZE_ENCODING_DEFAULT,63,\
			
 
				 				(63-58)+PAGE_ADD_HUGE_SHIFT,\pte
			
 
				 #else /* Huge pages disabled */
			
 
				-	extrd,u		\pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
			
 
				-				64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
			
 
				+	extrd,u		\pte,PFN_START_BIT,PFN_START_BIT+1,\pte
			
 
				 	depdi		_PAGE_SIZE_ENCODING_DEFAULT,63,\
			
 
				 				(63-58)+PAGE_ADD_SHIFT,\pte
			
 
				 #endif
			
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -69,9 +69,8 @@ $bss_loop:
 
				 	stw,ma          %arg2,4(%r1)
			
 
				 	stw,ma          %arg3,4(%r1)
			
 
				 
			
 
				-#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20)
			
 
				-	/* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU
			
 
				-	 * and halt kernel if we detect a PA1.x CPU. */
			
 
				+#if defined(CONFIG_PA20)
			
 
				+	/* check for 64-bit capable CPU as required by current kernel */
			
 
				 	ldi		32,%r10
			
 
				 	mtctl		%r10,%cr11
			
 
				 	.level 2.0
			
--- a/arch/powerpc/include/asm/nohash/32/pte-40x.h
+++ b/arch/powerpc/include/asm/nohash/32/pte-40x.h
@@ -69,9 +69,6 @@
 
				 
			
 
				 #define _PTE_NONE_MASK	0
			
 
				 
			
 
				-/* Until my rework is finished, 40x still needs atomic PTE updates */
			
 
				-#define PTE_ATOMIC_UPDATES	1
			
 
				-
			
 
				 #define _PAGE_BASE_NC	(_PAGE_PRESENT | _PAGE_ACCESSED)
			
 
				 #define _PAGE_BASE	(_PAGE_BASE_NC)
			
 
				 
			
--- a/arch/powerpc/include/asm/nohash/32/pte-8xx.h
+++ b/arch/powerpc/include/asm/nohash/32/pte-8xx.h
@@ -94,6 +94,13 @@ static inline pte_t pte_wrprotect(pte_t pte)
 
				 
			
 
				 #define pte_wrprotect pte_wrprotect
			
 
				 
			
 
				+static inline int pte_read(pte_t pte)
			
 
				+{
			
 
				+	return (pte_val(pte) & _PAGE_RO) != _PAGE_NA;
			
 
				+}
			
 
				+
			
 
				+#define pte_read pte_read
			
 
				+
			
 
				 static inline int pte_write(pte_t pte)
			
 
				 {
			
 
				 	return !(pte_val(pte) & _PAGE_RO);
			
--- a/arch/powerpc/include/asm/nohash/64/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/64/pgtable.h
@@ -216,7 +216,7 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm,
 
				 {
			
 
				 	unsigned long old;
			
 
				 
			
 
				-	if (pte_young(*ptep))
			
 
				+	if (!pte_young(*ptep))
			
 
				 		return 0;
			
 
				 	old = pte_update(mm, addr, ptep, _PAGE_ACCESSED, 0, 0);
			
 
				 	return (old & _PAGE_ACCESSED) != 0;
			
--- a/arch/powerpc/include/asm/nohash/pgtable.h
+++ b/arch/powerpc/include/asm/nohash/pgtable.h
@@ -45,7 +45,9 @@ static inline int pte_write(pte_t pte)
 
				 	return pte_val(pte) & _PAGE_RW;
			
 
				 }
			
 
				 #endif
			
 
				+#ifndef pte_read
			
 
				 static inline int pte_read(pte_t pte)		{ return 1; }
			
 
				+#endif
			
 
				 static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }
			
 
				 static inline int pte_special(pte_t pte)	{ return pte_val(pte) & _PAGE_SPECIAL; }
			
 
				 static inline int pte_none(pte_t pte)		{ return (pte_val(pte) & ~_PTE_NONE_MASK) == 0; }
			
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -23,6 +23,15 @@
 
				 #include <asm/feature-fixups.h>
			
 
				 
			
 
				 #ifdef CONFIG_VSX
			
 
				+#define __REST_1FPVSR(n,c,base)						\
			
 
				+BEGIN_FTR_SECTION							\
			
 
				+	b	2f;							\
			
 
				+END_FTR_SECTION_IFSET(CPU_FTR_VSX);					\
			
 
				+	REST_FPR(n,base);						\
			
 
				+	b	3f;							\
			
 
				+2:	REST_VSR(n,c,base);						\
			
 
				+3:
			
 
				+
			
 
				 #define __REST_32FPVSRS(n,c,base)					\
			
 
				 BEGIN_FTR_SECTION							\
			
 
				 	b	2f;							\
			
@@ -41,9 +50,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX);					\
 
				 2:	SAVE_32VSRS(n,c,base);						\
			
 
				 3:
			
 
				 #else
			
 
				+#define __REST_1FPVSR(n,b,base)		REST_FPR(n, base)
			
 
				 #define __REST_32FPVSRS(n,b,base)	REST_32FPRS(n, base)
			
 
				 #define __SAVE_32FPVSRS(n,b,base)	SAVE_32FPRS(n, base)
			
 
				 #endif
			
 
				+#define REST_1FPVSR(n,c,base)   __REST_1FPVSR(n,__REG_##c,__REG_##base)
			
 
				 #define REST_32FPVSRS(n,c,base) __REST_32FPVSRS(n,__REG_##c,__REG_##base)
			
 
				 #define SAVE_32FPVSRS(n,c,base) __SAVE_32FPVSRS(n,__REG_##c,__REG_##base)
			
 
				 
			
@@ -67,6 +78,7 @@ _GLOBAL(store_fp_state)
 
				 	SAVE_32FPVSRS(0, R4, R3)
			
 
				 	mffs	fr0
			
 
				 	stfd	fr0,FPSTATE_FPSCR(r3)
			
 
				+	REST_1FPVSR(0, R4, R3)
			
 
				 	blr
			
 
				 EXPORT_SYMBOL(store_fp_state)
			
 
				 
			
@@ -132,4 +144,5 @@ _GLOBAL(save_fpu)
 
				 2:	SAVE_32FPVSRS(0, R4, R6)
			
 
				 	mffs	fr0
			
 
				 	stfd	fr0,FPSTATE_FPSCR(r6)
			
 
				+	REST_1FPVSR(0, R4, R6)
			
 
				 	blr
			
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -906,6 +906,8 @@ void __init setup_arch(char **cmdline_p)
 
				 
			
 
				 	/* Parse memory topology */
			
 
				 	mem_topology_setup();
			
 
				+	/* Set max_mapnr before paging_init() */
			
 
				+	set_max_mapnr(max_pfn);
			
 
				 
			
 
				 	/*
			
 
				 	 * Release secondary cpus out of their spinloops at 0x60 now that
			
--- a/arch/powerpc/kernel/trace/ftrace_64_mprofile.S
+++ b/arch/powerpc/kernel/trace/ftrace_64_mprofile.S
@@ -36,6 +36,9 @@ _GLOBAL(ftrace_regs_caller)
 
				 	/* Save the original return address in A's stack frame */
			
 
				 	std	r0,LRSAVE(r1)
			
 
				 
			
 
				+	/* Create a minimal stack frame for representing B */
			
 
				+	stdu	r1, -STACK_FRAME_MIN_SIZE(r1)
			
 
				+
			
 
				 	/* Create our stack frame + pt_regs */
			
 
				 	stdu	r1,-SWITCH_FRAME_SIZE(r1)
			
 
				 
			
@@ -52,7 +55,7 @@ _GLOBAL(ftrace_regs_caller)
 
				 	SAVE_10GPRS(22, r1)
			
 
				 
			
 
				 	/* Save previous stack pointer (r1) */
			
 
				-	addi	r8, r1, SWITCH_FRAME_SIZE
			
 
				+	addi	r8, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
			
 
				 	std	r8, GPR1(r1)
			
 
				 
			
 
				 	/* Load special regs for save below */
			
@@ -65,6 +68,8 @@ _GLOBAL(ftrace_regs_caller)
 
				 	mflr	r7
			
 
				 	/* Save it as pt_regs->nip */
			
 
				 	std     r7, _NIP(r1)
			
 
				+	/* Also save it in B's stackframe header for proper unwind */
			
 
				+	std	r7, LRSAVE+SWITCH_FRAME_SIZE(r1)
			
 
				 	/* Save the read LR in pt_regs->link */
			
 
				 	std     r0, _LINK(r1)
			
 
				 
			
@@ -121,7 +126,7 @@ ftrace_regs_call:
 
				 	ld	r2, 24(r1)
			
 
				 
			
 
				 	/* Pop our stack frame */
			
 
				-	addi r1, r1, SWITCH_FRAME_SIZE
			
 
				+	addi r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
			
 
				 
			
 
				 #ifdef CONFIG_LIVEPATCH
			
 
				         /* Based on the cmpd above, if the NIP was altered handle livepatch */
			
@@ -145,7 +150,7 @@ ftrace_no_trace:
 
				 	mflr	r3
			
 
				 	mtctr	r3
			
 
				 	REST_GPR(3, r1)
			
 
				-	addi	r1, r1, SWITCH_FRAME_SIZE
			
 
				+	addi	r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
			
 
				 	mtlr	r0
			
 
				 	bctr
			
 
				 
			
@@ -153,6 +158,9 @@ _GLOBAL(ftrace_caller)
 
				 	/* Save the original return address in A's stack frame */
			
 
				 	std	r0, LRSAVE(r1)
			
 
				 
			
 
				+	/* Create a minimal stack frame for representing B */
			
 
				+	stdu	r1, -STACK_FRAME_MIN_SIZE(r1)
			
 
				+
			
 
				 	/* Create our stack frame + pt_regs */
			
 
				 	stdu	r1, -SWITCH_FRAME_SIZE(r1)
			
 
				 
			
@@ -166,6 +174,7 @@ _GLOBAL(ftrace_caller)
 
				 	/* Get the _mcount() call site out of LR */
			
 
				 	mflr	r7
			
 
				 	std     r7, _NIP(r1)
			
 
				+	std	r7, LRSAVE+SWITCH_FRAME_SIZE(r1)
			
 
				 
			
 
				 	/* Save callee's TOC in the ABI compliant location */
			
 
				 	std	r2, 24(r1)
			
@@ -200,7 +209,7 @@ ftrace_call:
 
				 	ld	r2, 24(r1)
			
 
				 
			
 
				 	/* Pop our stack frame */
			
 
				-	addi	r1, r1, SWITCH_FRAME_SIZE
			
 
				+	addi	r1, r1, SWITCH_FRAME_SIZE+STACK_FRAME_MIN_SIZE
			
 
				 
			
 
				 	/* Reload original LR */
			
 
				 	ld	r0, LRSAVE(r1)
			
--- a/arch/powerpc/kernel/vector.S
+++ b/arch/powerpc/kernel/vector.S
@@ -32,6 +32,7 @@ _GLOBAL(store_vr_state)
 
				 	mfvscr	v0
			
 
				 	li	r4, VRSTATE_VSCR
			
 
				 	stvx	v0, r4, r3
			
 
				+	lvx	v0, 0, r3
			
 
				 	blr
			
 
				 EXPORT_SYMBOL(store_vr_state)
			
 
				 
			
@@ -104,6 +105,7 @@ _GLOBAL(save_altivec)
 
				 	mfvscr	v0
			
 
				 	li	r4,VRSTATE_VSCR
			
 
				 	stvx	v0,r4,r7
			
 
				+	lvx	v0,0,r7
			
 
				 	blr
			
 
				 
			
 
				 #ifdef CONFIG_VSX
			
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -293,7 +293,6 @@ void __init mem_init(void)
 
				 #endif
			
 
				 
			
 
				 	high_memory = (void *) __va(max_low_pfn * PAGE_SIZE);
			
 
				-	set_max_mapnr(max_pfn);
			
 
				 
			
 
				 	kasan_late_init();
			
 
				 
			
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1289,8 +1289,7 @@ static void power_pmu_disable(struct pmu *pmu)
 
				 		/*
			
 
				 		 * Disable instruction sampling if it was enabled
			
 
				 		 */
			
 
				-		if (cpuhw->mmcr.mmcra & MMCRA_SAMPLE_ENABLE)
			
 
				-			val &= ~MMCRA_SAMPLE_ENABLE;
			
 
				+		val &= ~MMCRA_SAMPLE_ENABLE;
			
 
				 
			
 
				 		/* Disable BHRB via mmcra (BHRBRD) for p10 */
			
 
				 		if (ppmu->flags & PPMU_ARCH_31)
			
@@ -1301,7 +1300,7 @@ static void power_pmu_disable(struct pmu *pmu)
 
				 		 * instruction sampling or BHRB.
			
 
				 		 */
			
 
				 		if (val != mmcra) {
			
 
				-			mtspr(SPRN_MMCRA, mmcra);
			
 
				+			mtspr(SPRN_MMCRA, val);
			
 
				 			mb();
			
 
				 			isync();
			
 
				 		}
			
--- a/arch/powerpc/perf/imc-pmu.c
+++ b/arch/powerpc/perf/imc-pmu.c
@@ -50,7 +50,7 @@ static int trace_imc_mem_size;
 
				  * core and trace-imc
			
 
				  */
			
 
				 static struct imc_pmu_ref imc_global_refc = {
			
 
				-	.lock = __SPIN_LOCK_INITIALIZER(imc_global_refc.lock),
			
 
				+	.lock = __SPIN_LOCK_UNLOCKED(imc_global_refc.lock),
			
 
				 	.id = 0,
			
 
				 	.refc = 0,
			
 
				 };
			
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -523,8 +523,10 @@ static ssize_t vcpudispatch_stats_write(struct file *file, const char __user *p,
 
				 
			
 
				 	if (cmd) {
			
 
				 		rc = init_cpu_associativity();
			
 
				-		if (rc)
			
 
				+		if (rc) {
			
 
				+			destroy_cpu_associativity();
			
 
				 			goto out;
			
 
				+		}
			
 
				 
			
 
				 		for_each_possible_cpu(cpu) {
			
 
				 			disp = per_cpu_ptr(&vcpu_disp_data, cpu);
			
--- a/arch/powerpc/sysdev/xive/native.c
+++ b/arch/powerpc/sysdev/xive/native.c
@@ -779,7 +779,7 @@ int xive_native_get_queue_info(u32 vp_id, u32 prio,
 
				 	if (out_qpage)
			
 
				 		*out_qpage = be64_to_cpu(qpage);
			
 
				 	if (out_qsize)
			
 
				-		*out_qsize = be32_to_cpu(qsize);
			
 
				+		*out_qsize = be64_to_cpu(qsize);
			
 
				 	if (out_qeoi_page)
			
 
				 		*out_qeoi_page = be64_to_cpu(qeoi_page);
			
 
				 	if (out_escalate_irq)
			
--- a/arch/riscv/kernel/traps_misaligned.c
+++ b/arch/riscv/kernel/traps_misaligned.c
@@ -344,16 +344,14 @@ int handle_misaligned_store(struct pt_regs *regs)
 
				 	} else if ((insn & INSN_MASK_C_SD) == INSN_MATCH_C_SD) {
			
 
				 		len = 8;
			
 
				 		val.data_ulong = GET_RS2S(insn, regs);
			
 
				-	} else if ((insn & INSN_MASK_C_SDSP) == INSN_MATCH_C_SDSP &&
			
 
				-		   ((insn >> SH_RD) & 0x1f)) {
			
 
				+	} else if ((insn & INSN_MASK_C_SDSP) == INSN_MATCH_C_SDSP) {
			
 
				 		len = 8;
			
 
				 		val.data_ulong = GET_RS2C(insn, regs);
			
 
				 #endif
			
 
				 	} else if ((insn & INSN_MASK_C_SW) == INSN_MATCH_C_SW) {
			
 
				 		len = 4;
			
 
				 		val.data_ulong = GET_RS2S(insn, regs);
			
 
				-	} else if ((insn & INSN_MASK_C_SWSP) == INSN_MATCH_C_SWSP &&
			
 
				-		   ((insn >> SH_RD) & 0x1f)) {
			
 
				+	} else if ((insn & INSN_MASK_C_SWSP) == INSN_MATCH_C_SWSP) {
			
 
				 		len = 4;
			
 
				 		val.data_ulong = GET_RS2C(insn, regs);
			
 
				 	} else {
			
--- a/arch/riscv/net/bpf_jit_comp64.c
+++ b/arch/riscv/net/bpf_jit_comp64.c
@@ -201,7 +201,7 @@ static void __build_epilogue(bool is_tail_call, struct rv_jit_context *ctx)
 
				 	emit_addi(RV_REG_SP, RV_REG_SP, stack_adjust, ctx);
			
 
				 	/* Set return value. */
			
 
				 	if (!is_tail_call)
			
 
				-		emit_mv(RV_REG_A0, RV_REG_A5, ctx);
			
 
				+		emit_addiw(RV_REG_A0, RV_REG_A5, 0, ctx);
			
 
				 	emit_jalr(RV_REG_ZERO, is_tail_call ? RV_REG_T3 : RV_REG_RA,
			
 
				 		  is_tail_call ? 4 : 0, /* skip TCC init */
			
 
				 		  ctx);
			
@@ -394,12 +394,12 @@ static void emit_sext_32_rd(u8 *rd, struct rv_jit_context *ctx)
 
				 	*rd = RV_REG_T2;
			
 
				 }
			
 
				 
			
 
				-static int emit_jump_and_link(u8 rd, s64 rvoff, bool force_jalr,
			
 
				+static int emit_jump_and_link(u8 rd, s64 rvoff, bool fixed_addr,
			
 
				 			      struct rv_jit_context *ctx)
			
 
				 {
			
 
				 	s64 upper, lower;
			
 
				 
			
 
				-	if (rvoff && is_21b_int(rvoff) && !force_jalr) {
			
 
				+	if (rvoff && fixed_addr && is_21b_int(rvoff)) {
			
 
				 		emit(rv_jal(rd, rvoff >> 1), ctx);
			
 
				 		return 0;
			
 
				 	} else if (in_auipc_jalr_range(rvoff)) {
			
@@ -420,24 +420,17 @@ static bool is_signed_bpf_cond(u8 cond)
 
				 		cond == BPF_JSGE || cond == BPF_JSLE;
			
 
				 }
			
 
				 
			
 
				-static int emit_call(bool fixed, u64 addr, struct rv_jit_context *ctx)
			
 
				+static int emit_call(u64 addr, bool fixed_addr, struct rv_jit_context *ctx)
			
 
				 {
			
 
				 	s64 off = 0;
			
 
				 	u64 ip;
			
 
				-	u8 rd;
			
 
				-	int ret;
			
 
				 
			
 
				 	if (addr && ctx->insns) {
			
 
				 		ip = (u64)(long)(ctx->insns + ctx->ninsns);
			
 
				 		off = addr - ip;
			
 
				 	}
			
 
				 
			
 
				-	ret = emit_jump_and_link(RV_REG_RA, off, !fixed, ctx);
			
 
				-	if (ret)
			
 
				-		return ret;
			
 
				-	rd = bpf_to_rv_reg(BPF_REG_0, ctx);
			
 
				-	emit_mv(rd, RV_REG_A0, ctx);
			
 
				-	return 0;
			
 
				+	return emit_jump_and_link(RV_REG_RA, off, fixed_addr, ctx);
			
 
				 }
			
 
				 
			
 
				 int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
			
@@ -731,7 +724,7 @@ out_be:
 
				 	/* JUMP off */
			
 
				 	case BPF_JMP | BPF_JA:
			
 
				 		rvoff = rv_offset(i, off, ctx);
			
 
				-		ret = emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
			
 
				+		ret = emit_jump_and_link(RV_REG_ZERO, rvoff, true, ctx);
			
 
				 		if (ret)
			
 
				 			return ret;
			
 
				 		break;
			
@@ -850,17 +843,21 @@ out_be:
 
				 	/* function call */
			
 
				 	case BPF_JMP | BPF_CALL:
			
 
				 	{
			
 
				-		bool fixed;
			
 
				+		bool fixed_addr;
			
 
				 		u64 addr;
			
 
				 
			
 
				 		mark_call(ctx);
			
 
				-		ret = bpf_jit_get_func_addr(ctx->prog, insn, extra_pass, &addr,
			
 
				-					    &fixed);
			
 
				+		ret = bpf_jit_get_func_addr(ctx->prog, insn, extra_pass,
			
 
				+					    &addr, &fixed_addr);
			
 
				 		if (ret < 0)
			
 
				 			return ret;
			
 
				-		ret = emit_call(fixed, addr, ctx);
			
 
				+
			
 
				+		ret = emit_call(addr, fixed_addr, ctx);
			
 
				 		if (ret)
			
 
				 			return ret;
			
 
				+
			
 
				+		if (insn->src_reg != BPF_PSEUDO_CALL)
			
 
				+			emit_mv(bpf_to_rv_reg(BPF_REG_0, ctx), RV_REG_A0, ctx);
			
 
				 		break;
			
 
				 	}
			
 
				 	/* tail call */
			
@@ -875,7 +872,7 @@ out_be:
 
				 			break;
			
 
				 
			
 
				 		rvoff = epilogue_offset(ctx);
			
 
				-		ret = emit_jump_and_link(RV_REG_ZERO, rvoff, false, ctx);
			
 
				+		ret = emit_jump_and_link(RV_REG_ZERO, rvoff, true, ctx);
			
 
				 		if (ret)
			
 
				 			return ret;
			
 
				 		break;
			
--- a/arch/s390/mm/page-states.c
+++ b/arch/s390/mm/page-states.c
@@ -112,7 +112,7 @@ static void mark_kernel_pmd(pud_t *pud, unsigned long addr, unsigned long end)
 
				 		next = pmd_addr_end(addr, end);
			
 
				 		if (pmd_none(*pmd) || pmd_large(*pmd))
			
 
				 			continue;
			
 
				-		page = virt_to_page(pmd_val(*pmd));
			
 
				+		page = phys_to_page(pmd_val(*pmd));
			
 
				 		set_bit(PG_arch_1, &page->flags);
			
 
				 	} while (pmd++, addr = next, addr != end);
			
 
				 }
			
@@ -130,8 +130,8 @@ static void mark_kernel_pud(p4d_t *p4d, unsigned long addr, unsigned long end)
 
				 		if (pud_none(*pud) || pud_large(*pud))
			
 
				 			continue;
			
 
				 		if (!pud_folded(*pud)) {
			
 
				-			page = virt_to_page(pud_val(*pud));
			
 
				-			for (i = 0; i < 3; i++)
			
 
				+			page = phys_to_page(pud_val(*pud));
			
 
				+			for (i = 0; i < 4; i++)
			
 
				 				set_bit(PG_arch_1, &page[i].flags);
			
 
				 		}
			
 
				 		mark_kernel_pmd(pud, addr, next);
			
@@ -151,8 +151,8 @@ static void mark_kernel_p4d(pgd_t *pgd, unsigned long addr, unsigned long end)
 
				 		if (p4d_none(*p4d))
			
 
				 			continue;
			
 
				 		if (!p4d_folded(*p4d)) {
			
 
				-			page = virt_to_page(p4d_val(*p4d));
			
 
				-			for (i = 0; i < 3; i++)
			
 
				+			page = phys_to_page(p4d_val(*p4d));
			
 
				+			for (i = 0; i < 4; i++)
			
 
				 				set_bit(PG_arch_1, &page[i].flags);
			
 
				 		}
			
 
				 		mark_kernel_pud(p4d, addr, next);
			
@@ -173,8 +173,8 @@ static void mark_kernel_pgd(void)
 
				 		if (pgd_none(*pgd))
			
 
				 			continue;
			
 
				 		if (!pgd_folded(*pgd)) {
			
 
				-			page = virt_to_page(pgd_val(*pgd));
			
 
				-			for (i = 0; i < 3; i++)
			
 
				+			page = phys_to_page(pgd_val(*pgd));
			
 
				+			for (i = 0; i < 4; i++)
			
 
				 				set_bit(PG_arch_1, &page[i].flags);
			
 
				 		}
			
 
				 		mark_kernel_p4d(pgd, addr, next);
			
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -717,7 +717,7 @@ void ptep_zap_unused(struct mm_struct *mm, unsigned long addr,
 
				 		pte_clear(mm, addr, ptep);
			
 
				 	}
			
 
				 	if (reset)
			
 
				-		pgste_val(pgste) &= ~_PGSTE_GPS_USAGE_MASK;
			
 
				+		pgste_val(pgste) &= ~(_PGSTE_GPS_USAGE_MASK | _PGSTE_GPS_NODAT);
			
 
				 	pgste_set_unlock(ptep, pgste);
			
 
				 	preempt_enable();
			
 
				 }
			
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -541,6 +541,17 @@ static void s390_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
 
				 		s->dma_length = 0;
			
 
				 	}
			
 
				 }
			
 
				+
			
 
				+static unsigned long *bitmap_vzalloc(size_t bits, gfp_t flags)
			
 
				+{
			
 
				+	size_t n = BITS_TO_LONGS(bits);
			
 
				+	size_t bytes;
			
 
				+
			
 
				+	if (unlikely(check_mul_overflow(n, sizeof(unsigned long), &bytes)))
			
 
				+		return NULL;
			
 
				+
			
 
				+	return vzalloc(bytes);
			
 
				+}
			
 
				 	
			
 
				 int zpci_dma_init_device(struct zpci_dev *zdev)
			
 
				 {
			
@@ -577,13 +588,13 @@ int zpci_dma_init_device(struct zpci_dev *zdev)
 
				 				zdev->end_dma - zdev->start_dma + 1);
			
 
				 	zdev->end_dma = zdev->start_dma + zdev->iommu_size - 1;
			
 
				 	zdev->iommu_pages = zdev->iommu_size >> PAGE_SHIFT;
			
 
				-	zdev->iommu_bitmap = vzalloc(zdev->iommu_pages / 8);
			
 
				+	zdev->iommu_bitmap = bitmap_vzalloc(zdev->iommu_pages, GFP_KERNEL);
			
 
				 	if (!zdev->iommu_bitmap) {
			
 
				 		rc = -ENOMEM;
			
 
				 		goto free_dma_table;
			
 
				 	}
			
 
				 	if (!s390_iommu_strict) {
			
 
				-		zdev->lazy_bitmap = vzalloc(zdev->iommu_pages / 8);
			
 
				+		zdev->lazy_bitmap = bitmap_vzalloc(zdev->iommu_pages, GFP_KERNEL);
			
 
				 		if (!zdev->lazy_bitmap) {
			
 
				 			rc = -ENOMEM;
			
 
				 			goto free_bitmap;
			
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -25,6 +25,17 @@ config STACK_DEBUG
 
				 	  every function call and will therefore incur a major
			
 
				 	  performance hit. Most users should say N.
			
 
				 
			
 
				+config EARLY_PRINTK
			
 
				+	bool "Early printk"
			
 
				+	depends on SH_STANDARD_BIOS
			
 
				+	help
			
 
				+	  Say Y here to redirect kernel printk messages to the serial port
			
 
				+	  used by the SH-IPL bootloader, starting very early in the boot
			
 
				+	  process and ending when the kernel's serial console is initialised.
			
 
				+	  This option is only useful while porting the kernel to a new machine,
			
 
				+	  when the kernel may crash or hang before the serial console is
			
 
				+	  initialised.  If unsure, say N.
			
 
				+
			
 
				 config 4KSTACKS
			
 
				 	bool "Use 4Kb for kernel stacks instead of 8Kb"
			
 
				 	depends on DEBUG_KERNEL && (MMU || BROKEN) && !PAGE_SIZE_64KB
			
--- a/arch/sparc/lib/checksum_32.S
+++ b/arch/sparc/lib/checksum_32.S
@@ -463,5 +463,5 @@ ccslow:	cmp	%g1, 0
 
				  * we only bother with faults on loads... */
			
 
				 
			
 
				 cc_fault:
			
 
				-	ret
			
 
				+	retl
			
 
				 	 clr	%o0
			
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -1360,20 +1360,10 @@ static void pt_addr_filters_fini(struct perf_event *event)
 
				 }
			
 
				 
			
 
				 #ifdef CONFIG_X86_64
			
 
				-static u64 canonical_address(u64 vaddr, u8 vaddr_bits)
			
 
				-{
			
 
				-	return ((s64)vaddr << (64 - vaddr_bits)) >> (64 - vaddr_bits);
			
 
				-}
			
 
				-
			
 
				-static u64 is_canonical_address(u64 vaddr, u8 vaddr_bits)
			
 
				-{
			
 
				-	return canonical_address(vaddr, vaddr_bits) == vaddr;
			
 
				-}
			
 
				-
			
 
				 /* Clamp to a canonical address greater-than-or-equal-to the address given */
			
 
				 static u64 clamp_to_ge_canonical_addr(u64 vaddr, u8 vaddr_bits)
			
 
				 {
			
 
				-	return is_canonical_address(vaddr, vaddr_bits) ?
			
 
				+	return __is_canonical_address(vaddr, vaddr_bits) ?
			
 
				 	       vaddr :
			
 
				 	       -BIT_ULL(vaddr_bits - 1);
			
 
				 }
			
@@ -1381,7 +1371,7 @@ static u64 clamp_to_ge_canonical_addr(u64 vaddr, u8 vaddr_bits)
 
				 /* Clamp to a canonical address less-than-or-equal-to the address given */
			
 
				 static u64 clamp_to_le_canonical_addr(u64 vaddr, u8 vaddr_bits)
			
 
				 {
			
 
				-	return is_canonical_address(vaddr, vaddr_bits) ?
			
 
				+	return __is_canonical_address(vaddr, vaddr_bits) ?
			
 
				 	       vaddr :
			
 
				 	       BIT_ULL(vaddr_bits - 1) - 1;
			
 
				 }
			
--- a/arch/x86/include/asm/i8259.h
+++ b/arch/x86/include/asm/i8259.h
@@ -67,6 +67,8 @@ struct legacy_pic {
 
				 	void (*make_irq)(unsigned int irq);
			
 
				 };
			
 
				 
			
 
				+void legacy_pic_pcat_compat(void);
			
 
				+
			
 
				 extern struct legacy_pic *legacy_pic;
			
 
				 extern struct legacy_pic null_legacy_pic;
			
 
				 
			
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -505,6 +505,7 @@
 
				 #define MSR_AMD64_CPUID_FN_1		0xc0011004
			
 
				 #define MSR_AMD64_LS_CFG		0xc0011020
			
 
				 #define MSR_AMD64_DC_CFG		0xc0011022
			
 
				+#define MSR_AMD64_TW_CFG		0xc0011023
			
 
				 
			
 
				 #define MSR_AMD64_DE_CFG		0xc0011029
			
 
				 #define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT	 1
			
@@ -541,12 +542,17 @@
 
				 
			
 
				 #define MSR_AMD64_VIRT_SPEC_CTRL	0xc001011f
			
 
				 
			
 
				-/* Fam 17h MSRs */
			
 
				-#define MSR_F17H_IRPERF			0xc00000e9
			
 
				+/* Zen4 */
			
 
				+#define MSR_ZEN4_BP_CFG			0xc001102e
			
 
				+#define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5
			
 
				 
			
 
				+/* Zen 2 */
			
 
				 #define MSR_ZEN2_SPECTRAL_CHICKEN	0xc00110e3
			
 
				 #define MSR_ZEN2_SPECTRAL_CHICKEN_BIT	BIT_ULL(1)
			
 
				 
			
 
				+/* Fam 17h MSRs */
			
 
				+#define MSR_F17H_IRPERF			0xc00000e9
			
 
				+
			
 
				 /* Fam 16h MSRs */
			
 
				 #define MSR_F16H_L2I_PERF_CTL		0xc0010230
			
 
				 #define MSR_F16H_L2I_PERF_CTR		0xc0010231
			
--- a/arch/x86/include/asm/numa.h
+++ b/arch/x86/include/asm/numa.h
@@ -12,13 +12,6 @@
 
				 
			
 
				 #define NR_NODE_MEMBLKS		(MAX_NUMNODES*2)
			
 
				 
			
 
				-/*
			
 
				- * Too small node sizes may confuse the VM badly. Usually they
			
 
				- * result from BIOS bugs. So dont recognize nodes as standalone
			
 
				- * NUMA entities that have less than this amount of RAM listed:
			
 
				- */
			
 
				-#define NODE_MIN_SIZE (4*1024*1024)
			
 
				-
			
 
				 extern int numa_off;
			
 
				 
			
 
				 /*
			
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -71,6 +71,16 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
 
				 extern bool __virt_addr_valid(unsigned long kaddr);
			
 
				 #define virt_addr_valid(kaddr)	__virt_addr_valid((unsigned long) (kaddr))
			
 
				 
			
 
				+static __always_inline u64 __canonical_address(u64 vaddr, u8 vaddr_bits)
			
 
				+{
			
 
				+	return ((s64)vaddr << (64 - vaddr_bits)) >> (64 - vaddr_bits);
			
 
				+}
			
 
				+
			
 
				+static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits)
			
 
				+{
			
 
				+	return __canonical_address(vaddr, vaddr_bits) == vaddr;
			
 
				+}
			
 
				+
			
 
				 #endif	/* __ASSEMBLY__ */
			
 
				 
			
 
				 #include <asm-generic/memory_model.h>
			
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -108,27 +108,16 @@ extern unsigned long _brk_end;
 
				 void *extend_brk(size_t size, size_t align);
			
 
				 
			
 
				 /*
			
 
				- * Reserve space in the brk section.  The name must be unique within
			
 
				- * the file, and somewhat descriptive.  The size is in bytes.  Must be
			
 
				- * used at file scope.
			
 
				+ * Reserve space in the .brk section, which is a block of memory from which the
			
 
				+ * caller is allowed to allocate very early (before even memblock is available)
			
 
				+ * by calling extend_brk().  All allocated memory will be eventually converted
			
 
				+ * to memblock.  Any leftover unallocated memory will be freed.
			
 
				  *
			
 
				- * (This uses a temp function to wrap the asm so we can pass it the
			
 
				- * size parameter; otherwise we wouldn't be able to.  We can't use a
			
 
				- * "section" attribute on a normal variable because it always ends up
			
 
				- * being @progbits, which ends up allocating space in the vmlinux
			
 
				- * executable.)
			
 
				+ * The size is in bytes.
			
 
				  */
			
 
				-#define RESERVE_BRK(name,sz)						\
			
 
				-	static void __section(".discard.text") __used notrace		\
			
 
				-	__brk_reservation_fn_##name##__(void) {				\
			
 
				-		asm volatile (						\
			
 
				-			".pushsection .brk_reservation,\"aw\",@nobits;" \
			
 
				-			".brk." #name ":"				\
			
 
				-			" 1:.skip %c0;"					\
			
 
				-			" .size .brk." #name ", . - 1b;"		\
			
 
				-			" .popsection"					\
			
 
				-			: : "i" (sz));					\
			
 
				-	}
			
 
				+#define RESERVE_BRK(name, size)					\
			
 
				+	__section(".bss..brk") __aligned(1) __used	\
			
 
				+	static char __brk_##name[size]
			
 
				 
			
 
				 /* Helper for reserving space for arrays of things */
			
 
				 #define RESERVE_BRK_ARRAY(type, name, entries)		\
			
@@ -146,12 +135,19 @@ asmlinkage void __init x86_64_start_reservations(char *real_mode_data);
 
				 
			
 
				 #endif /* __i386__ */
			
 
				 #endif /* _SETUP */
			
 
				-#else
			
 
				-#define RESERVE_BRK(name,sz)				\
			
 
				-	.pushsection .brk_reservation,"aw",@nobits;	\
			
 
				-.brk.name:						\
			
 
				-1:	.skip sz;					\
			
 
				-	.size .brk.name,.-1b;				\
			
 
				+
			
 
				+#else  /* __ASSEMBLY */
			
 
				+
			
 
				+.macro __RESERVE_BRK name, size
			
 
				+	.pushsection .bss..brk, "aw"
			
 
				+SYM_DATA_START(__brk_\name)
			
 
				+	.skip \size
			
 
				+SYM_DATA_END(__brk_\name)
			
 
				 	.popsection
			
 
				+.endm
			
 
				+
			
 
				+#define RESERVE_BRK(name, size) __RESERVE_BRK name, size
			
 
				+
			
 
				 #endif /* __ASSEMBLY__ */
			
 
				+
			
 
				 #endif /* _ASM_X86_SETUP_H */
			
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -446,7 +446,7 @@ copy_mc_to_kernel(void *to, const void *from, unsigned len);
 
				 #define copy_mc_to_kernel copy_mc_to_kernel
			
 
				 
			
 
				 unsigned long __must_check
			
 
				-copy_mc_to_user(void *to, const void *from, unsigned len);
			
 
				+copy_mc_to_user(void __user *to, const void *from, unsigned len);
			
 
				 #endif
			
 
				 
			
 
				 /*
			
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -141,6 +141,9 @@ static int __init acpi_parse_madt(struct acpi_table_header *table)
 
				 		       madt->address);
			
 
				 	}
			
 
				 
			
 
				+	if (madt->flags & ACPI_MADT_PCAT_COMPAT)
			
 
				+		legacy_pic_pcat_compat();
			
 
				+
			
 
				 	default_acpi_madt_oem_check(madt->header.oem_id,
			
 
				 				    madt->header.oem_table_id);
			
 
				 
			
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -424,6 +424,17 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
 
				 	u8 insn_buff[MAX_PATCH_LEN];
			
 
				 
			
 
				 	DPRINTK("alt table %px, -> %px", start, end);
			
 
				+
			
 
				+	/*
			
 
				+	 * In the case CONFIG_X86_5LEVEL=y, KASAN_SHADOW_START is defined using
			
 
				+	 * cpu_feature_enabled(X86_FEATURE_LA57) and is therefore patched here.
			
 
				+	 * During the process, KASAN becomes confused seeing partial LA57
			
 
				+	 * conversion and triggers a false-positive out-of-bound report.
			
 
				+	 *
			
 
				+	 * Disable KASAN until the patching is complete.
			
 
				+	 */
			
 
				+	kasan_disable_current();
			
 
				+
			
 
				 	/*
			
 
				 	 * The scan order should be from start to end. A later scanned
			
 
				 	 * alternative code can overwrite previously scanned alternative code.
			
@@ -491,6 +502,8 @@ void __init_or_module noinline apply_alternatives(struct alt_instr *start,
 
				 next:
			
 
				 		optimize_nops(instr, a->instrlen);
			
 
				 	}
			
 
				+
			
 
				+	kasan_enable_current();
			
 
				 }
			
 
				 
			
 
				 #if defined(CONFIG_RETPOLINE) && defined(CONFIG_STACK_VALIDATION)
			
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -81,6 +81,10 @@ static const int amd_div0[] =
 
				 	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x17, 0x00, 0x0, 0x2f, 0xf),
			
 
				 			   AMD_MODEL_RANGE(0x17, 0x50, 0x0, 0x5f, 0xf));
			
 
				 
			
 
				+static const int amd_erratum_1485[] =
			
 
				+	AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x19, 0x10, 0x0, 0x1f, 0xf),
			
 
				+			   AMD_MODEL_RANGE(0x19, 0x60, 0x0, 0xaf, 0xf));
			
 
				+
			
 
				 static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)
			
 
				 {
			
 
				 	int osvw_id = *erratum++;
			
@@ -1178,6 +1182,10 @@ static void init_amd(struct cpuinfo_x86 *c)
 
				 		pr_notice_once("AMD Zen1 DIV0 bug detected. Disable SMT for full protection.\n");
			
 
				 		setup_force_cpu_bug(X86_BUG_DIV0);
			
 
				 	}
			
 
				+
			
 
				+	if (!cpu_has(c, X86_FEATURE_HYPERVISOR) &&
			
 
				+	     cpu_has_amd_erratum(c, amd_erratum_1485))
			
 
				+		msr_set_bit(MSR_ZEN4_BP_CFG, MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT);
			
 
				 }
			
 
				 
			
 
				 #ifdef CONFIG_X86_32
			
@@ -1320,6 +1328,9 @@ static void zenbleed_check_cpu(void *unused)
 
				 
			
 
				 void amd_check_microcode(void)
			
 
				 {
			
 
				+	if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
			
 
				+		return;
			
 
				+
			
 
				 	on_each_cpu(zenbleed_check_cpu, NULL, 1);
			
 
				 }
			
 
				 
			
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2407,7 +2407,7 @@ static void __init srso_select_mitigation(void)
 
				 	pr_info("%s%s\n", srso_strings[srso_mitigation], (has_microcode ? "" : ", no microcode"));
			
 
				 
			
 
				 pred_cmd:
			
 
				-	if ((boot_cpu_has(X86_FEATURE_SRSO_NO) || srso_cmd == SRSO_CMD_OFF) &&
			
 
				+	if ((!boot_cpu_has_bug(X86_BUG_SRSO) || srso_cmd == SRSO_CMD_OFF) &&
			
 
				 	     boot_cpu_has(X86_FEATURE_SBPB))
			
 
				 		x86_pred_cmd = PRED_CMD_SBPB;
			
 
				 }
			
--- a/arch/x86/kernel/cpu/hygon.c
+++ b/arch/x86/kernel/cpu/hygon.c
@@ -89,8 +89,12 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)
 
				 		if (!err)
			
 
				 			c->x86_coreid_bits = get_count_order(c->x86_max_cores);
			
 
				 
			
 
				-		/* Socket ID is ApicId[6] for these processors. */
			
 
				-		c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
			
 
				+		/*
			
 
				+		 * Socket ID is ApicId[6] for the processors with model <= 0x3
			
 
				+		 * when running on host.
			
 
				+		 */
			
 
				+		if (!boot_cpu_has(X86_FEATURE_HYPERVISOR) && c->x86_model <= 0x3)
			
 
				+			c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
			
 
				 
			
 
				 		cacheinfo_hygon_init_llc_id(c, cpu);
			
 
				 	} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
			
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -80,7 +80,7 @@ static struct desc_struct startup_gdt[GDT_ENTRIES] = {
 
				  * while the kernel still uses a direct mapping.
			
 
				  */
			
 
				 static struct desc_ptr startup_gdt_descr = {
			
 
				-	.size = sizeof(startup_gdt),
			
 
				+	.size = sizeof(startup_gdt)-1,
			
 
				 	.address = 0,
			
 
				 };
			
 
				 
			
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -32,6 +32,7 @@
 
				  */
			
 
				 static void init_8259A(int auto_eoi);
			
 
				 
			
 
				+static bool pcat_compat __ro_after_init;
			
 
				 static int i8259A_auto_eoi;
			
 
				 DEFINE_RAW_SPINLOCK(i8259A_lock);
			
 
				 
			
@@ -301,15 +302,32 @@ static void unmask_8259A(void)
 
				 
			
 
				 static int probe_8259A(void)
			
 
				 {
			
 
				+	unsigned char new_val, probe_val = ~(1 << PIC_CASCADE_IR);
			
 
				 	unsigned long flags;
			
 
				-	unsigned char probe_val = ~(1 << PIC_CASCADE_IR);
			
 
				-	unsigned char new_val;
			
 
				+
			
 
				+	/*
			
 
				+	 * If MADT has the PCAT_COMPAT flag set, then do not bother probing
			
 
				+	 * for the PIC. Some BIOSes leave the PIC uninitialized and probing
			
 
				+	 * fails.
			
 
				+	 *
			
 
				+	 * Right now this causes problems as quite some code depends on
			
 
				+	 * nr_legacy_irqs() > 0 or has_legacy_pic() == true. This is silly
			
 
				+	 * when the system has an IO/APIC because then PIC is not required
			
 
				+	 * at all, except for really old machines where the timer interrupt
			
 
				+	 * must be routed through the PIC. So just pretend that the PIC is
			
 
				+	 * there and let legacy_pic->init() initialize it for nothing.
			
 
				+	 *
			
 
				+	 * Alternatively this could just try to initialize the PIC and
			
 
				+	 * repeat the probe, but for cases where there is no PIC that's
			
 
				+	 * just pointless.
			
 
				+	 */
			
 
				+	if (pcat_compat)
			
 
				+		return nr_legacy_irqs();
			
 
				+
			
 
				 	/*
			
 
				-	 * Check to see if we have a PIC.
			
 
				-	 * Mask all except the cascade and read
			
 
				-	 * back the value we just wrote. If we don't
			
 
				-	 * have a PIC, we will read 0xff as opposed to the
			
 
				-	 * value we wrote.
			
 
				+	 * Check to see if we have a PIC.  Mask all except the cascade and
			
 
				+	 * read back the value we just wrote. If we don't have a PIC, we
			
 
				+	 * will read 0xff as opposed to the value we wrote.
			
 
				 	 */
			
 
				 	raw_spin_lock_irqsave(&i8259A_lock, flags);
			
 
				 
			
@@ -431,5 +449,9 @@ static int __init i8259A_init_ops(void)
 
				 
			
 
				 	return 0;
			
 
				 }
			
 
				-
			
 
				 device_initcall(i8259A_init_ops);
			
 
				+
			
 
				+void __init legacy_pic_pcat_compat(void)
			
 
				+{
			
 
				+	pcat_compat = true;
			
 
				+}
			
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -64,11 +64,6 @@ RESERVE_BRK(dmi_alloc, 65536);
 
				 #endif
			
 
				 
			
 
				 
			
 
				-/*
			
 
				- * Range of the BSS area. The size of the BSS area is determined
			
 
				- * at link time, with RESERVE_BRK*() facility reserving additional
			
 
				- * chunks.
			
 
				- */
			
 
				 unsigned long _brk_start = (unsigned long)__brk_base;
			
 
				 unsigned long _brk_end   = (unsigned long)__brk_base;
			
 
				 
			
--- a/arch/x86/kernel/sev-es.c
+++ b/arch/x86/kernel/sev-es.c
@@ -997,6 +997,9 @@ static enum es_result vc_handle_mmio(struct ghcb *ghcb,
 
				 	enum es_result ret;
			
 
				 	long *reg_data;
			
 
				 
			
 
				+	if (user_mode(ctxt->regs))
			
 
				+		return ES_UNSUPPORTED;
			
 
				+
			
 
				 	switch (insn->opcode.bytes[0]) {
			
 
				 	/* MMIO Write */
			
 
				 	case 0x88:
			
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -414,7 +414,7 @@ SECTIONS
 
				 	.brk : AT(ADDR(.brk) - LOAD_OFFSET) {
			
 
				 		__brk_base = .;
			
 
				 		. += 64 * 1024;		/* 64k alignment slop space */
			
 
				-		*(.brk_reservation)	/* areas brk users have reserved */
			
 
				+		*(.bss..brk)		/* areas brk users have reserved */
			
 
				 		__brk_limit = .;
			
 
				 	}
			
 
				 
			
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -688,7 +688,7 @@ static inline u8 ctxt_virt_addr_bits(struct x86_emulate_ctxt *ctxt)
 
				 static inline bool emul_is_noncanonical_address(u64 la,
			
 
				 						struct x86_emulate_ctxt *ctxt)
			
 
				 {
			
 
				-	return get_canonical(la, ctxt_virt_addr_bits(ctxt)) != la;
			
 
				+	return !__is_canonical_address(la, ctxt_virt_addr_bits(ctxt));
			
 
				 }
			
 
				 
			
 
				 /*
			
@@ -738,7 +738,7 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
 
				 	case X86EMUL_MODE_PROT64:
			
 
				 		*linear = la;
			
 
				 		va_bits = ctxt_virt_addr_bits(ctxt);
			
 
				-		if (get_canonical(la, va_bits) != la)
			
 
				+		if (!__is_canonical_address(la, va_bits))
			
 
				 			goto bad;
			
 
				 
			
 
				 		*max_size = min_t(u64, ~0u, (1ull << va_bits) - la);
			
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -674,10 +674,12 @@ static int stimer_set_count(struct kvm_vcpu_hv_stimer *stimer, u64 count,
 
				 
			
 
				 	stimer_cleanup(stimer);
			
 
				 	stimer->count = count;
			
 
				-	if (stimer->count == 0)
			
 
				-		stimer->config.enable = 0;
			
 
				-	else if (stimer->config.auto_enable)
			
 
				-		stimer->config.enable = 1;
			
 
				+	if (!host) {
			
 
				+		if (stimer->count == 0)
			
 
				+			stimer->config.enable = 0;
			
 
				+		else if (stimer->config.auto_enable)
			
 
				+			stimer->config.enable = 1;
			
 
				+	}
			
 
				 
			
 
				 	if (stimer->config.enable)
			
 
				 		stimer_mark_pending(stimer, false);
			
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -2397,13 +2397,17 @@ int kvm_apic_local_deliver(struct kvm_lapic *apic, int lvt_type)
 
				 {
			
 
				 	u32 reg = kvm_lapic_get_reg(apic, lvt_type);
			
 
				 	int vector, mode, trig_mode;
			
 
				+	int r;
			
 
				 
			
 
				 	if (kvm_apic_hw_enabled(apic) && !(reg & APIC_LVT_MASKED)) {
			
 
				 		vector = reg & APIC_VECTOR_MASK;
			
 
				 		mode = reg & APIC_MODE_MASK;
			
 
				 		trig_mode = reg & APIC_LVT_LEVEL_TRIGGER;
			
 
				-		return __apic_accept_irq(apic, mode, vector, 1, trig_mode,
			
 
				-					NULL);
			
 
				+
			
 
				+		r = __apic_accept_irq(apic, mode, vector, 1, trig_mode, NULL);
			
 
				+		if (r && lvt_type == APIC_LVTPC)
			
 
				+			kvm_lapic_set_reg(apic, APIC_LVTPC, reg | APIC_LVT_MASKED);
			
 
				+		return r;
			
 
				 	}
			
 
				 	return 0;
			
 
				 }
			
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1640,7 +1640,7 @@ static int __kvm_set_msr(struct kvm_vcpu *vcpu, u32 index, u64 data,
 
				 		 * value, and that something deterministic happens if the guest
			
 
				 		 * invokes 64-bit SYSENTER.
			
 
				 		 */
			
 
				-		data = get_canonical(data, vcpu_virt_addr_bits(vcpu));
			
 
				+		data = __canonical_address(data, vcpu_virt_addr_bits(vcpu));
			
 
				 	}
			
 
				 
			
 
				 	msr.data = data;
			
@@ -3132,6 +3132,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 
				 	case MSR_AMD64_PATCH_LOADER:
			
 
				 	case MSR_AMD64_BU_CFG2:
			
 
				 	case MSR_AMD64_DC_CFG:
			
 
				+	case MSR_AMD64_TW_CFG:
			
 
				 	case MSR_F15H_EX_CFG:
			
 
				 		break;
			
 
				 
			
@@ -3485,6 +3486,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 
				 	case MSR_AMD64_BU_CFG2:
			
 
				 	case MSR_IA32_PERF_CTL:
			
 
				 	case MSR_AMD64_DC_CFG:
			
 
				+	case MSR_AMD64_TW_CFG:
			
 
				 	case MSR_F15H_EX_CFG:
			
 
				 	/*
			
 
				 	 * Intel Sandy Bridge CPUs must support the RAPL (running average power
			
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -156,14 +156,9 @@ static inline u8 vcpu_virt_addr_bits(struct kvm_vcpu *vcpu)
 
				 	return kvm_read_cr4_bits(vcpu, X86_CR4_LA57) ? 57 : 48;
			
 
				 }
			
 
				 
			
 
				-static inline u64 get_canonical(u64 la, u8 vaddr_bits)
			
 
				-{
			
 
				-	return ((int64_t)la << (64 - vaddr_bits)) >> (64 - vaddr_bits);
			
 
				-}
			
 
				-
			
 
				 static inline bool is_noncanonical_address(u64 la, struct kvm_vcpu *vcpu)
			
 
				 {
			
 
				-	return get_canonical(la, vcpu_virt_addr_bits(vcpu)) != la;
			
 
				+	return !__is_canonical_address(la, vcpu_virt_addr_bits(vcpu));
			
 
				 }
			
 
				 
			
 
				 static inline void vcpu_cache_mmio_info(struct kvm_vcpu *vcpu,
			
--- a/arch/x86/lib/copy_mc.c
+++ b/arch/x86/lib/copy_mc.c
@@ -74,23 +74,23 @@ unsigned long __must_check copy_mc_to_kernel(void *dst, const void *src, unsigne
 
				 }
			
 
				 EXPORT_SYMBOL_GPL(copy_mc_to_kernel);
			
 
				 
			
 
				-unsigned long __must_check copy_mc_to_user(void *dst, const void *src, unsigned len)
			
 
				+unsigned long __must_check copy_mc_to_user(void __user *dst, const void *src, unsigned len)
			
 
				 {
			
 
				 	unsigned long ret;
			
 
				 
			
 
				 	if (copy_mc_fragile_enabled) {
			
 
				 		__uaccess_begin();
			
 
				-		ret = copy_mc_fragile(dst, src, len);
			
 
				+		ret = copy_mc_fragile((__force void *)dst, src, len);
			
 
				 		__uaccess_end();
			
 
				 		return ret;
			
 
				 	}
			
 
				 
			
 
				 	if (static_cpu_has(X86_FEATURE_ERMS)) {
			
 
				 		__uaccess_begin();
			
 
				-		ret = copy_mc_enhanced_fast_string(dst, src, len);
			
 
				+		ret = copy_mc_enhanced_fast_string((__force void *)dst, src, len);
			
 
				 		__uaccess_end();
			
 
				 		return ret;
			
 
				 	}
			
 
				 
			
 
				-	return copy_user_generic(dst, src, len);
			
 
				+	return copy_user_generic((__force void *)dst, src, len);
			
 
				 }
			
--- a/arch/x86/mm/maccess.c
+++ b/arch/x86/mm/maccess.c
@@ -4,22 +4,26 @@
 
				 #include <linux/kernel.h>
			
 
				 
			
 
				 #ifdef CONFIG_X86_64
			
 
				-static __always_inline u64 canonical_address(u64 vaddr, u8 vaddr_bits)
			
 
				-{
			
 
				-	return ((s64)vaddr << (64 - vaddr_bits)) >> (64 - vaddr_bits);
			
 
				-}
			
 
				-
			
 
				 bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)
			
 
				 {
			
 
				 	unsigned long vaddr = (unsigned long)unsafe_src;
			
 
				 
			
 
				 	/*
			
 
				-	 * Range covering the highest possible canonical userspace address
			
 
				-	 * as well as non-canonical address range. For the canonical range
			
 
				-	 * we also need to include the userspace guard page.
			
 
				+	 * Do not allow userspace addresses.  This disallows
			
 
				+	 * normal userspace and the userspace guard page:
			
 
				 	 */
			
 
				-	return vaddr >= TASK_SIZE_MAX + PAGE_SIZE &&
			
 
				-	       canonical_address(vaddr, boot_cpu_data.x86_virt_bits) == vaddr;
			
 
				+	if (vaddr < TASK_SIZE_MAX + PAGE_SIZE)
			
 
				+		return false;
			
 
				+
			
 
				+	/*
			
 
				+	 * Allow everything during early boot before 'x86_virt_bits'
			
 
				+	 * is initialized.  Needed for instruction decoding in early
			
 
				+	 * exception handlers.
			
 
				+	 */
			
 
				+	if (!boot_cpu_data.x86_virt_bits)
			
 
				+		return true;
			
 
				+
			
 
				+	return __is_canonical_address(vaddr, boot_cpu_data.x86_virt_bits);
			
 
				 }
			
 
				 #else
			
 
				 bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)
			
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -602,13 +602,6 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
 
				 		if (start >= end)
			
 
				 			continue;
			
 
				 
			
 
				-		/*
			
 
				-		 * Don't confuse VM with a node that doesn't have the
			
 
				-		 * minimum amount of memory:
			
 
				-		 */
			
 
				-		if (end && (end - start) < NODE_MIN_SIZE)
			
 
				-			continue;
			
 
				-
			
 
				 		alloc_node_data(nid);
			
 
				 	}
			
 
				 
			
--- a/block/bio.c
+++ b/block/bio.c
@@ -21,6 +21,7 @@
 
				 #include <linux/blk-crypto.h>
			
 
				 
			
 
				 #include <trace/events/block.h>
			
 
				+#include <trace/hooks/block.h>
			
 
				 #include "blk.h"
			
 
				 #include "blk-rq-qos.h"
			
 
				 
			
@@ -252,6 +253,7 @@ static void bio_free(struct bio *bio)
 
				 	struct bio_set *bs = bio->bi_pool;
			
 
				 	void *p;
			
 
				 
			
 
				+	trace_android_vh_bio_free(bio);
			
 
				 	bio_uninit(bio);
			
 
				 
			
 
				 	if (bs) {
			
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -66,6 +66,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_merge);
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_requeue);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(block_rq_complete);
			
 
				 
			
 
				+#undef CREATE_TRACE_POINTS
			
 
				+#include <trace/hooks/block.h>
			
 
				+
			
 
				 DEFINE_IDA(blk_queue_ida);
			
 
				 
			
 
				 /*
			
@@ -522,6 +525,7 @@ struct request_queue *blk_alloc_queue(int node_id)
 
				 {
			
 
				 	struct request_queue *q;
			
 
				 	int ret;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	q = kmem_cache_alloc_node(blk_requestq_cachep,
			
 
				 				GFP_KERNEL | __GFP_ZERO, node_id);
			
@@ -585,6 +589,10 @@ struct request_queue *blk_alloc_queue(int node_id)
 
				 	blk_set_default_limits(&q->limits);
			
 
				 	q->nr_requests = BLKDEV_MAX_RQ;
			
 
				 
			
 
				+	trace_android_rvh_blk_allocated_queue_init(&skip, q);
			
 
				+	if (skip)
			
 
				+		goto fail_ref;
			
 
				+
			
 
				 	return q;
			
 
				 
			
 
				 fail_ref:
			
@@ -1761,6 +1769,7 @@ EXPORT_SYMBOL(blk_check_plugged);
 
				 
			
 
				 void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
			
 
				 {
			
 
				+	trace_android_rvh_blk_flush_plug_list(plug, from_schedule);
			
 
				 	flush_plug_callbacks(plug, from_schedule);
			
 
				 
			
 
				 	if (!list_empty(&plug->mq_list))
			
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -467,11 +467,13 @@ int blkdev_issue_flush(struct block_device *bdev, gfp_t gfp_mask)
 
				 }
			
 
				 EXPORT_SYMBOL(blkdev_issue_flush);
			
 
				 
			
 
				+#include <trace/hooks/block.h>
			
 
				 struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,
			
 
				 					      gfp_t flags)
			
 
				 {
			
 
				 	struct blk_flush_queue *fq;
			
 
				 	int rq_sz = sizeof(struct request);
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	fq = kzalloc_node(sizeof(*fq), flags, node);
			
 
				 	if (!fq)
			
@@ -479,8 +481,12 @@ struct blk_flush_queue *blk_alloc_flush_queue(int node, int cmd_size,
 
				 
			
 
				 	spin_lock_init(&fq->mq_flush_lock);
			
 
				 
			
 
				-	rq_sz = round_up(rq_sz + cmd_size, cache_line_size());
			
 
				-	fq->flush_rq = kzalloc_node(rq_sz, flags, node);
			
 
				+	trace_android_vh_blk_alloc_flush_queue(&skip, cmd_size, flags, node,
			
 
				+					       fq);
			
 
				+	if (!skip) {
			
 
				+		rq_sz = round_up(rq_sz + cmd_size, cache_line_size());
			
 
				+		fq->flush_rq = kzalloc_node(rq_sz, flags, node);
			
 
				+	}
			
 
				 	if (!fq->flush_rq)
			
 
				 		goto fail_rq;
			
 
				 
			
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -422,6 +422,7 @@ static bool blk_mq_sched_bypass_insert(struct blk_mq_hw_ctx *hctx,
 
				 	return false;
			
 
				 }
			
 
				 
			
 
				+#include <trace/hooks/block.h>
			
 
				 void blk_mq_sched_insert_request(struct request *rq, bool at_head,
			
 
				 				 bool run_queue, bool async)
			
 
				 {
			
@@ -429,10 +430,13 @@ void blk_mq_sched_insert_request(struct request *rq, bool at_head,
 
				 	struct elevator_queue *e = q->elevator;
			
 
				 	struct blk_mq_ctx *ctx = rq->mq_ctx;
			
 
				 	struct blk_mq_hw_ctx *hctx = rq->mq_hctx;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	WARN_ON(e && (rq->tag != BLK_MQ_NO_TAG));
			
 
				 
			
 
				-	if (blk_mq_sched_bypass_insert(hctx, !!e, rq)) {
			
 
				+	trace_android_vh_blk_mq_sched_insert_request(&skip, rq);
			
 
				+
			
 
				+	if (!skip && blk_mq_sched_bypass_insert(hctx, !!e, rq)) {
			
 
				 		/*
			
 
				 		 * Firstly normal IO request is inserted to scheduler queue or
			
 
				 		 * sw queue, meantime we add flush request to dispatch queue(
			
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -15,6 +15,8 @@
 
				 #include "blk-mq.h"
			
 
				 #include "blk-mq-tag.h"
			
 
				 
			
 
				+#include <trace/hooks/blk_mq.h>
			
 
				+
			
 
				 /*
			
 
				  * If a previously inactive queue goes active, bump the active user count.
			
 
				  * We need to do this before try to allocate driver tag, then even if fail
			
@@ -336,8 +338,13 @@ static void bt_tags_for_each(struct blk_mq_tags *tags, struct sbitmap_queue *bt,
 
				 static void __blk_mq_all_tag_iter(struct blk_mq_tags *tags,
			
 
				 		busy_tag_iter_fn *fn, void *priv, unsigned int flags)
			
 
				 {
			
 
				+	bool skip = false;
			
 
				+
			
 
				 	WARN_ON_ONCE(flags & BT_TAG_ITER_RESERVED);
			
 
				 
			
 
				+	trace_android_vh_blk_mq_all_tag_iter(&skip, tags, fn, priv);
			
 
				+	if (skip)
			
 
				+		return;
			
 
				 	if (tags->nr_reserved_tags)
			
 
				 		bt_tags_for_each(tags, tags->breserved_tags, fn, priv,
			
 
				 				 flags | BT_TAG_ITER_RESERVED);
			
@@ -438,6 +445,7 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,
 
				 {
			
 
				 	struct blk_mq_hw_ctx *hctx;
			
 
				 	int i;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	/*
			
 
				 	 * __blk_mq_update_nr_hw_queues() updates nr_hw_queues and queue_hw_ctx
			
@@ -457,6 +465,11 @@ void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,
 
				 		if (!blk_mq_hw_queue_mapped(hctx))
			
 
				 			continue;
			
 
				 
			
 
				+		trace_android_vh_blk_mq_queue_tag_busy_iter(&skip, hctx, fn,
			
 
				+							    priv);
			
 
				+		if (skip)
			
 
				+			continue;
			
 
				+
			
 
				 		if (tags->nr_reserved_tags)
			
 
				 			bt_for_each(hctx, tags->breserved_tags, fn, priv, true);
			
 
				 		bt_for_each(hctx, tags->bitmap_tags, fn, priv, false);
			
@@ -556,6 +569,12 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags,
 
				 
			
 
				 void blk_mq_free_tags(struct blk_mq_tags *tags, unsigned int flags)
			
 
				 {
			
 
				+	bool skip = false;
			
 
				+
			
 
				+	trace_android_vh_blk_mq_free_tags(&skip, tags);
			
 
				+	if (skip)
			
 
				+		return;
			
 
				+
			
 
				 	if (!(flags & BLK_MQ_F_TAG_HCTX_SHARED)) {
			
 
				 		sbitmap_queue_free(tags->bitmap_tags);
			
 
				 		sbitmap_queue_free(tags->breserved_tags);
			
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -353,6 +353,7 @@ static struct request *__blk_mq_alloc_request(struct blk_mq_alloc_data *data)
 
				 	struct elevator_queue *e = q->elevator;
			
 
				 	u64 alloc_time_ns = 0;
			
 
				 	unsigned int tag;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	/* alloc_time includes depth and tag waits */
			
 
				 	if (blk_queue_rq_alloc_time(q))
			
@@ -384,7 +385,9 @@ retry:
 
				 	 * case just retry the hctx assignment and tag allocation as CPU hotplug
			
 
				 	 * should have migrated us to an online CPU by now.
			
 
				 	 */
			
 
				-	tag = blk_mq_get_tag(data);
			
 
				+	trace_android_rvh_internal_blk_mq_alloc_request(&skip, &tag, data);
			
 
				+	if (!skip)
			
 
				+		tag = blk_mq_get_tag(data);
			
 
				 	if (tag == BLK_MQ_NO_TAG) {
			
 
				 		if (data->flags & BLK_MQ_REQ_NOWAIT)
			
 
				 			return NULL;
			
@@ -496,12 +499,17 @@ static void __blk_mq_free_request(struct request *rq)
 
				 	struct blk_mq_ctx *ctx = rq->mq_ctx;
			
 
				 	struct blk_mq_hw_ctx *hctx = rq->mq_hctx;
			
 
				 	const int sched_tag = rq->internal_tag;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	blk_crypto_free_request(rq);
			
 
				 	blk_pm_mark_last_busy(rq);
			
 
				 	rq->mq_hctx = NULL;
			
 
				-	if (rq->tag != BLK_MQ_NO_TAG)
			
 
				-		blk_mq_put_tag(hctx->tags, ctx, rq->tag);
			
 
				+
			
 
				+	trace_android_vh_internal_blk_mq_free_request(&skip, rq, hctx);
			
 
				+	if (!skip) {
			
 
				+		if (rq->tag != BLK_MQ_NO_TAG)
			
 
				+			blk_mq_put_tag(hctx->tags, ctx, rq->tag);
			
 
				+	}
			
 
				 	if (sched_tag != BLK_MQ_NO_TAG)
			
 
				 		blk_mq_put_tag(hctx->sched_tags, ctx, sched_tag);
			
 
				 	blk_mq_sched_restart(hctx);
			
@@ -701,6 +709,11 @@ EXPORT_SYMBOL_GPL(blk_mq_complete_request_remote);
 
				  **/
			
 
				 void blk_mq_complete_request(struct request *rq)
			
 
				 {
			
 
				+	bool skip = false;
			
 
				+
			
 
				+	trace_android_vh_blk_mq_complete_request(&skip, rq);
			
 
				+	if (skip)
			
 
				+		return;
			
 
				 	if (!blk_mq_complete_request_remote(rq))
			
 
				 		rq->q->mq_ops->complete(rq);
			
 
				 }
			
@@ -827,7 +840,12 @@ void blk_mq_add_to_requeue_list(struct request *rq, bool at_head,
 
				 {
			
 
				 	struct request_queue *q = rq->q;
			
 
				 	unsigned long flags;
			
 
				+	bool skip = false;
			
 
				 
			
 
				+	trace_android_vh_blk_mq_add_to_requeue_list(&skip, rq,
			
 
				+						     kick_requeue_list);
			
 
				+	if (skip)
			
 
				+		return;
			
 
				 	/*
			
 
				 	 * We abuse this flag that is otherwise used by the I/O scheduler to
			
 
				 	 * request head insertion from the workqueue.
			
@@ -1593,9 +1611,15 @@ select_cpu:
 
				 static void __blk_mq_delay_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async,
			
 
				 					unsigned long msecs)
			
 
				 {
			
 
				+	bool skip = false;
			
 
				+
			
 
				 	if (unlikely(blk_mq_hctx_stopped(hctx)))
			
 
				 		return;
			
 
				 
			
 
				+	trace_android_rvh_blk_mq_delay_run_hw_queue(&skip, hctx, async);
			
 
				+	if (skip)
			
 
				+		return;
			
 
				+
			
 
				 	if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
			
 
				 		int cpu = get_cpu();
			
 
				 		if (cpumask_test_cpu(cpu, hctx->cpumask)) {
			
@@ -1651,6 +1675,7 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
 
				 		blk_mq_hctx_has_pending(hctx);
			
 
				 	hctx_unlock(hctx, srcu_idx);
			
 
				 
			
 
				+	trace_android_vh_blk_mq_run_hw_queue(&need_run, hctx);
			
 
				 	if (need_run)
			
 
				 		__blk_mq_delay_run_hw_queue(hctx, async, 0);
			
 
				 }
			
@@ -1877,9 +1902,14 @@ void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, struct request *rq,
 
				 			     bool at_head)
			
 
				 {
			
 
				 	struct blk_mq_ctx *ctx = rq->mq_ctx;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	lockdep_assert_held(&ctx->lock);
			
 
				 
			
 
				+	trace_android_vh_blk_mq_insert_request(&skip, hctx, rq);
			
 
				+	if (skip)
			
 
				+		return;
			
 
				+
			
 
				 	__blk_mq_insert_req_list(hctx, rq, at_head);
			
 
				 	blk_mq_hctx_mark_pending(hctx, ctx);
			
 
				 }
			
@@ -2419,12 +2449,15 @@ struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set,
 
				 {
			
 
				 	struct blk_mq_tags *tags;
			
 
				 	int node;
			
 
				+	bool skip = false;
			
 
				 
			
 
				 	node = blk_mq_hw_queue_to_node(&set->map[HCTX_TYPE_DEFAULT], hctx_idx);
			
 
				 	if (node == NUMA_NO_NODE)
			
 
				 		node = set->numa_node;
			
 
				 
			
 
				-	tags = blk_mq_init_tags(nr_tags, reserved_tags, node, flags);
			
 
				+	trace_android_rvh_blk_mq_alloc_rq_map(&skip, &tags, set, node, flags);
			
 
				+	if (!skip)
			
 
				+		tags = blk_mq_init_tags(nr_tags, reserved_tags, node, flags);
			
 
				 	if (!tags)
			
 
				 		return NULL;
			
 
				 
			
@@ -3362,6 +3395,8 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
 
				 	blk_mq_add_queue_tag_set(set, q);
			
 
				 	blk_mq_map_swqueue(q);
			
 
				 
			
 
				+	trace_android_rvh_blk_mq_init_allocated_queue(q);
			
 
				+
			
 
				 	if (elevator_init)
			
 
				 		elevator_init_mq(q);
			
 
				 
			
@@ -3385,6 +3420,7 @@ void blk_mq_exit_queue(struct request_queue *q)
 
				 {
			
 
				 	struct blk_mq_tag_set *set = q->tag_set;
			
 
				 
			
 
				+	trace_android_vh_blk_mq_exit_queue(q);
			
 
				 	/* Checks hctx->flags & BLK_MQ_F_TAG_QUEUE_SHARED. */
			
 
				 	blk_mq_exit_hw_queues(q, set, set->nr_hw_queues);
			
 
				 	/* May clear BLK_MQ_F_TAG_QUEUE_SHARED in hctx->flags. */
			
@@ -3575,6 +3611,8 @@ int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set)
 
				 	if (ret)
			
 
				 		goto out_free_mq_map;
			
 
				 
			
 
				+	trace_android_vh_blk_mq_alloc_tag_set(set);
			
 
				+
			
 
				 	ret = blk_mq_alloc_map_and_requests(set);
			
 
				 	if (ret)
			
 
				 		goto out_free_mq_map;
			
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1409,6 +1409,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global)
 
				 		   tg_bps_limit(tg, READ), tg_bps_limit(tg, WRITE),
			
 
				 		   tg_iops_limit(tg, READ), tg_iops_limit(tg, WRITE));
			
 
				 
			
 
				+	rcu_read_lock();
			
 
				 	/*
			
 
				 	 * Update has_rules[] flags for the updated tg's subtree.  A tg is
			
 
				 	 * considered to have rules if either the tg itself or any of its
			
@@ -1436,6 +1437,7 @@ static void tg_conf_updated(struct throtl_grp *tg, bool global)
 
				 		this_tg->latency_target = max(this_tg->latency_target,
			
 
				 				parent_tg->latency_target);
			
 
				 	}
			
 
				+	rcu_read_unlock();
			
 
				 
			
 
				 	/*
			
 
				 	 * We're already holding queue_lock and know @tg is valid.  Let's
			
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -117,6 +117,8 @@ static int pcrypt_aead_encrypt(struct aead_request *req)
 
				 	err = padata_do_parallel(ictx->psenc, padata, &ctx->cb_cpu);
			
 
				 	if (!err)
			
 
				 		return -EINPROGRESS;
			
 
				+	if (err == -EBUSY)
			
 
				+		return -EAGAIN;
			
 
				 
			
 
				 	return err;
			
 
				 }
			
@@ -164,6 +166,8 @@ static int pcrypt_aead_decrypt(struct aead_request *req)
 
				 	err = padata_do_parallel(ictx->psdec, padata, &ctx->cb_cpu);
			
 
				 	if (!err)
			
 
				 		return -EINPROGRESS;
			
 
				+	if (err == -EBUSY)
			
 
				+		return -EAGAIN;
			
 
				 
			
 
				 	return err;
			
 
				 }
			
--- a/drivers/acpi/device_sysfs.c
+++ b/drivers/acpi/device_sysfs.c
@@ -156,8 +156,8 @@ static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias,
 
				 		return 0;
			
 
				 
			
 
				 	len = snprintf(modalias, size, "acpi:");
			
 
				-	if (len <= 0)
			
 
				-		return len;
			
 
				+	if (len >= size)
			
 
				+		return -ENOMEM;
			
 
				 
			
 
				 	size -= len;
			
 
				 
			
@@ -210,8 +210,10 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,
 
				 	len = snprintf(modalias, size, "of:N%sT", (char *)buf.pointer);
			
 
				 	ACPI_FREE(buf.pointer);
			
 
				 
			
 
				-	if (len <= 0)
			
 
				-		return len;
			
 
				+	if (len >= size)
			
 
				+		return -ENOMEM;
			
 
				+
			
 
				+	size -= len;
			
 
				 
			
 
				 	of_compatible = acpi_dev->data.of_compatible;
			
 
				 	if (of_compatible->type == ACPI_TYPE_PACKAGE) {
			
--- a/drivers/acpi/irq.c
+++ b/drivers/acpi/irq.c
@@ -52,6 +52,7 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
 
				 		      int polarity)
			
 
				 {
			
 
				 	struct irq_fwspec fwspec;
			
 
				+	unsigned int irq;
			
 
				 
			
 
				 	if (WARN_ON(!acpi_gsi_domain_id)) {
			
 
				 		pr_warn("GSI: No registered irqchip, giving up\n");
			
@@ -63,7 +64,11 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger,
 
				 	fwspec.param[1] = acpi_dev_get_irq_type(trigger, polarity);
			
 
				 	fwspec.param_count = 2;
			
 
				 
			
 
				-	return irq_create_fwspec_mapping(&fwspec);
			
 
				+	irq = irq_create_fwspec_mapping(&fwspec);
			
 
				+	if (!irq)
			
 
				+		return -EINVAL;
			
 
				+
			
 
				+	return irq;
			
 
				 }
			
 
				 EXPORT_SYMBOL_GPL(acpi_register_gsi);
			
 
				 
			
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -16,6 +16,7 @@
 
				 #include <linux/ioport.h>
			
 
				 #include <linux/slab.h>
			
 
				 #include <linux/irq.h>
			
 
				+#include <linux/dmi.h>
			
 
				 
			
 
				 #ifdef CONFIG_X86
			
 
				 #define valid_IRQ(i) (((i) != 0) && ((i) != 2))
			
@@ -380,21 +381,136 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity)
 
				 }
			
 
				 EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type);
			
 
				 
			
 
				-static void acpi_dev_irqresource_disabled(struct resource *res, u32 gsi)
			
 
				+static const struct dmi_system_id medion_laptop[] = {
			
 
				+	{
			
 
				+		.ident = "MEDION P15651",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "MEDION"),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "M15T"),
			
 
				+		},
			
 
				+	},
			
 
				+	{ }
			
 
				+};
			
 
				+
			
 
				+static const struct dmi_system_id asus_laptop[] = {
			
 
				+	{
			
 
				+		.ident = "Asus Vivobook K3402ZA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "K3402ZA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus Vivobook K3502ZA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "K3502ZA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus Vivobook S5402ZA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus Vivobook S5602ZA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus ExpertBook B1402CBA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus ExpertBook B1502CBA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus ExpertBook B2402CBA",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		/* TongFang GMxXGxx/TUXEDO Polaris 15 Gen5 AMD */
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "GMxXGxx"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		/* Asus ExpertBook B1402CVA */
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		/* TongFang GM6XGxX/TUXEDO Stellaris 16 Gen5 AMD */
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "GM6XGxX"),
			
 
				+		},
			
 
				+	},
			
 
				+	{
			
 
				+		.ident = "Asus ExpertBook B2502",
			
 
				+		.matches = {
			
 
				+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
			
 
				+			DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"),
			
 
				+		},
			
 
				+	},
			
 
				+	{ }
			
 
				+};
			
 
				+
			
 
				+struct irq_override_cmp {
			
 
				+	const struct dmi_system_id *system;
			
 
				+	unsigned char irq;
			
 
				+	unsigned char triggering;
			
 
				+	unsigned char polarity;
			
 
				+	unsigned char shareable;
			
 
				+};
			
 
				+
			
 
				+static const struct irq_override_cmp skip_override_table[] = {
			
 
				+	{ medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },
			
 
				+	{ asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 },
			
 
				+};
			
 
				+
			
 
				+static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
			
 
				+				  u8 shareable)
			
 
				 {
			
 
				-	res->start = gsi;
			
 
				-	res->end = gsi;
			
 
				-	res->flags = IORESOURCE_IRQ | IORESOURCE_DISABLED | IORESOURCE_UNSET;
			
 
				+	int i;
			
 
				+
			
 
				+	for (i = 0; i < ARRAY_SIZE(skip_override_table); i++) {
			
 
				+		const struct irq_override_cmp *entry = &skip_override_table[i];
			
 
				+
			
 
				+		if (dmi_check_system(entry->system) &&
			
 
				+		    entry->irq == gsi &&
			
 
				+		    entry->triggering == triggering &&
			
 
				+		    entry->polarity == polarity &&
			
 
				+		    entry->shareable == shareable)
			
 
				+			return false;
			
 
				+	}
			
 
				+
			
 
				+	return true;
			
 
				 }
			
 
				 
			
 
				 static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
			
 
				 				     u8 triggering, u8 polarity, u8 shareable,
			
 
				-				     bool legacy)
			
 
				+				     bool check_override)
			
 
				 {
			
 
				 	int irq, p, t;
			
 
				 
			
 
				 	if (!valid_IRQ(gsi)) {
			
 
				-		acpi_dev_irqresource_disabled(res, gsi);
			
 
				+		irqresource_disabled(res, gsi);
			
 
				 		return;
			
 
				 	}
			
 
				 
			
@@ -408,7 +524,9 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
 
				 	 * using extended IRQ descriptors we take the IRQ configuration
			
 
				 	 * from _CRS directly.
			
 
				 	 */
			
 
				-	if (legacy && !acpi_get_override_irq(gsi, &t, &p)) {
			
 
				+	if (check_override &&
			
 
				+	    acpi_dev_irq_override(gsi, triggering, polarity, shareable) &&
			
 
				+	    !acpi_get_override_irq(gsi, &t, &p)) {
			
 
				 		u8 trig = t ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
			
 
				 		u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
			
 
				 
			
@@ -426,7 +544,7 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
 
				 		res->start = irq;
			
 
				 		res->end = irq;
			
 
				 	} else {
			
 
				-		acpi_dev_irqresource_disabled(res, gsi);
			
 
				+		irqresource_disabled(res, gsi);
			
 
				 	}
			
 
				 }
			
 
				 
			
@@ -463,7 +581,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
 
				 		 */
			
 
				 		irq = &ares->data.irq;
			
 
				 		if (index >= irq->interrupt_count) {
			
 
				-			acpi_dev_irqresource_disabled(res, 0);
			
 
				+			irqresource_disabled(res, 0);
			
 
				 			return false;
			
 
				 		}
			
 
				 		acpi_dev_get_irqresource(res, irq->interrupts[index],
			
@@ -473,7 +591,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
 
				 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
			
 
				 		ext_irq = &ares->data.extended_irq;
			
 
				 		if (index >= ext_irq->interrupt_count) {
			
 
				-			acpi_dev_irqresource_disabled(res, 0);
			
 
				+			irqresource_disabled(res, 0);
			
 
				 			return false;
			
 
				 		}
			
 
				 		if (is_gsi(ext_irq))
			
@@ -481,7 +599,7 @@ bool acpi_dev_resource_interrupt(struct acpi_resource *ares, int index,
 
				 					 ext_irq->triggering, ext_irq->polarity,
			
 
				 					 ext_irq->shareable, false);
			
 
				 		else
			
 
				-			acpi_dev_irqresource_disabled(res, 0);
			
 
				+			irqresource_disabled(res, 0);
			
 
				 		break;
			
 
				 	default:
			
 
				 		res->flags = 0;
			
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -3830,12 +3830,14 @@ binder_free_buf(struct binder_proc *proc,
 
				 		struct binder_buffer *buffer, bool is_failure)
			
 
				 {
			
 
				 	bool enqueue_task = true;
			
 
				+	bool has_transaction = false;
			
 
				 
			
 
				 	trace_android_vh_binder_free_buf(proc, thread, buffer);
			
 
				 	binder_inner_proc_lock(proc);
			
 
				 	if (buffer->transaction) {
			
 
				 		buffer->transaction->buffer = NULL;
			
 
				 		buffer->transaction = NULL;
			
 
				+		has_transaction = true;
			
 
				 	}
			
 
				 	binder_inner_proc_unlock(proc);
			
 
				 	if (buffer->async_transaction && buffer->target_node) {
			
@@ -3859,6 +3861,8 @@ binder_free_buf(struct binder_proc *proc,
 
				 		}
			
 
				 		binder_node_inner_unlock(buf_node);
			
 
				 	}
			
 
				+	trace_android_vh_binder_buffer_release(proc, thread, buffer,
			
 
				+			has_transaction);
			
 
				 	trace_binder_transaction_buffer_release(buffer);
			
 
				 	binder_release_entire_buffer(proc, thread, buffer, is_failure);
			
 
				 	binder_alloc_free_buf(&proc->alloc, buffer);
			
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -45,6 +45,7 @@
 
				 #include <trace/hooks/thermal.h>
			
 
				 #include <trace/hooks/ufshcd.h>
			
 
				 #include <trace/hooks/block.h>
			
 
				+#include <trace/hooks/blk_mq.h>
			
 
				 #include <trace/hooks/cgroup.h>
			
 
				 #include <trace/hooks/sys.h>
			
 
				 #include <trace/hooks/traps.h>
			
@@ -290,6 +291,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_memory_rw);
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_module_permit_before_init);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_module_permit_after_init);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_util_est_update);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_adjust_alloc_flags);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_meminfo_proc_show);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_mm);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_from_fragment_pool);
			
@@ -505,6 +507,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_transaction_received);
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_free_oem_binder_struct);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_special_task);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_free_buf);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_binder_buffer_release);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_perf_huristic_ctrl);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_send_command_post_change);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_abort_success_ctrl);
			
@@ -512,6 +515,28 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_compl_rsp_check_done);
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_err_handler);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_err_check_ctrl);
			
 
				 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ufs_err_print_ctrl);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_vmscan_kswapd_done);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_swap_page_spf);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_check);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_bio_free);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_internal_blk_mq_alloc_request);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_internal_blk_mq_free_request);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_complete_request);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_add_to_requeue_list);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_blk_mq_delay_run_hw_queue);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_run_hw_queue);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_insert_request);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_blk_mq_alloc_rq_map);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_blk_mq_init_allocated_queue);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_exit_queue);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_alloc_tag_set);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_blk_allocated_queue_init);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_blk_flush_plug_list);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_alloc_flush_queue);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_all_tag_iter);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_queue_tag_busy_iter);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_free_tags);
			
 
				+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_mq_sched_insert_request);
			
 
				 /*
			
 
				  * For type visibility
			
 
				  */
			
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2224,7 +2224,7 @@ static void ata_eh_link_report(struct ata_link *link)
 
				 	struct ata_eh_context *ehc = &link->eh_context;
			
 
				 	struct ata_queued_cmd *qc;
			
 
				 	const char *frozen, *desc;
			
 
				-	char tries_buf[6] = "";
			
 
				+	char tries_buf[16] = "";
			
 
				 	int tag, nr_failed = 0;
			
 
				 
			
 
				 	if (ehc->i.flags & ATA_EHI_QUIET)
			
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -82,6 +82,9 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev
 
				 	if (pnp_port_valid(idev, 1)) {
			
 
				 		ctl_addr = devm_ioport_map(&idev->dev,
			
 
				 					   pnp_port_start(idev, 1), 1);
			
 
				+		if (!ctl_addr)
			
 
				+			return -ENOMEM;
			
 
				+
			
 
				 		ap->ioaddr.altstatus_addr = ctl_addr;
			
 
				 		ap->ioaddr.ctl_addr = ctl_addr;
			
 
				 		ap->ops = &isapnp_port_ops;