Unverified Commit 379c369c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6539 Backport 5.10.204 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
https://gitee.com/openeuler/kernel/issues/I9J4PL

Conflicts:
Already merged(7):
13b1fa540794  drm/amdgpu: correct chunk_ptr to a pointer to chunk.
208dd116f96e  perf: Fix perf_event_validate_size()
d4fb20dcc13b  drm/amdgpu: correct the amdgpu runtime dereference usage count
3fe1ea5f921b  io_uring/af_unix: disable sending io_uring over sockets
bf72b44fe81b  netfilter: nft_set_pipapo: skip inactive elements during set walk
e94b6e964018  net: hns: fix fake link up on xge port
ab8816a7c2c6  x86/CPU/AMD: Check vendor in the AMD microcode callback

Rejected(2):
7f4c89400d29  hrtimers: Push pending hrtimers away from outgoing CPU earlier
8bd3d61624d5  perf/core: Add a new read format to get a number of lost samples

Kabi broken(4):
df6cb4c43098  netlink: don't call ->netlink_bind with table lock held
015870c10c45  genetlink: add CAP_NET_ADMIN test for multicast bind
ad2223a16925  psample: Require 'CAP_NET_ADMIN' when joining "packets" group
e844a9309f51  drop_monitor: Require 'CAP_SYS_ADMIN' when joining "events" group

Total patches: 97 - 7 - 2 - 4 = 84 
 
Link:https://gitee.com/openeuler/kernel/pulls/6539

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 95bd470a c16afbf0

Documentation/ABI/testing/sysfs-bus-optee-devices

+9 −0
Original line number Diff line number Diff line
@@ -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:	op-tee@lists.trustedfirmware.org

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.

Documentation/ABI/testing/sysfs-platform-asus-wmi

+9 −0
Original line number Diff line number Diff line
@@ -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" <luke@ljones.dev>

Description:

		Disable discrete GPU:

			* 0 - Enable dGPU,

			* 1 - Disable dGPU

arch/arm/boot/dts/imx7s.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -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>,

arch/arm/mach-imx/mmdc.c

+6 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
		};

	};



	memory {

	memory@40000000 {

		reg = <0 0x40000000 0 0x40000000>;

	};