Unverified Commit 179f1798 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2945 Backport linux 6.6.2 LTS patches 

Merge Pull Request from: @zhengzengkai 
 
Backport linux-6.6.2 LTS patches from upstream.
git cherry-pick v6.6.1..v6.6.2~1 -s
No conflicts.

Build and boot testing passed. 
 
Link:https://gitee.com/openeuler/kernel/pulls/2945

 

Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents 151595c9 b1386563

Documentation/ABI/testing/sysfs-driver-qat

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ Description: (RW) Reports the current configuration of the QAT device. 
		  services

		* asym;sym: identical to sym;asym

		* dc: the device is configured for running compression services

		* dcc: identical to dc but enables the dc chaining feature,

		  hash then compression. If this is not required chose dc

		* sym: the device is configured for running symmetric crypto

		  services

		* asym: the device is configured for running asymmetric crypto

Documentation/admin-guide/hw-vuln/srso.rst

+17 −7
Original line number Diff line number Diff line
@@ -46,12 +46,22 @@ The possible values in this file are: 


   The processor is not vulnerable



 * 'Vulnerable: no microcode':

* 'Vulnerable':



   The processor is vulnerable and no mitigations have been applied.



 * 'Vulnerable: No microcode':



   The processor is vulnerable, no microcode extending IBPB

   functionality to address the vulnerability has been applied.



 * 'Mitigation: microcode':

 * 'Vulnerable: Safe RET, no microcode':



   The "Safe RET" mitigation (see below) has been applied to protect the

   kernel, but the IBPB-extending microcode has not been applied.  User

   space tasks may still be vulnerable.



 * 'Vulnerable: Microcode, no safe RET':



   Extended IBPB functionality microcode patch has been applied. It does

   not address User->Kernel and Guest->Host transitions protection but it
@@ -72,11 +82,11 @@ The possible values in this file are: 


   (spec_rstack_overflow=microcode)



 * 'Mitigation: safe RET':

 * 'Mitigation: Safe RET':



   Software-only mitigation. It complements the extended IBPB microcode

   patch functionality by addressing User->Kernel and Guest->Host

   transitions protection.

   Combined microcode/software mitigation. It complements the

   extended IBPB microcode patch functionality by addressing

   User->Kernel and Guest->Host transitions protection.



   Selected by default or by spec_rstack_overflow=safe-ret
@@ -129,7 +139,7 @@ an indrect branch prediction barrier after having applied the required 
microcode patch for one's system. This mitigation comes also at

a performance cost.



Mitigation: safe RET

Mitigation: Safe RET

--------------------



The mitigation works by ensuring all RET instructions speculate to

Documentation/devicetree/bindings/mfd/mt6397.txt

+3 −1
Original line number Diff line number Diff line
@@ -22,8 +22,9 @@ compatible: 
	"mediatek,mt6323" for PMIC MT6323

	"mediatek,mt6331" for PMIC MT6331 and MT6332

	"mediatek,mt6357" for PMIC MT6357

	"mediatek,mt6358" for PMIC MT6358 and MT6366

	"mediatek,mt6358" for PMIC MT6358

	"mediatek,mt6359" for PMIC MT6359

	"mediatek,mt6366", "mediatek,mt6358" for PMIC MT6366

	"mediatek,mt6397" for PMIC MT6397



Optional subnodes:
@@ -40,6 +41,7 @@ Optional subnodes: 
		- compatible: "mediatek,mt6323-regulator"

	see ../regulator/mt6323-regulator.txt

		- compatible: "mediatek,mt6358-regulator"

		- compatible: "mediatek,mt6366-regulator", "mediatek-mt6358-regulator"

	see ../regulator/mt6358-regulator.txt

		- compatible: "mediatek,mt6397-regulator"

	see ../regulator/mt6397-regulator.txt

arch/arm/boot/dts/broadcom/bcm4708-buffalo-wzr-1166dhp-common.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -181,5 +181,13 @@ 
		port@5 {

			label = "cpu";

		};



		port@7 {

			status = "disabled";

		};



		port@8 {

			status = "disabled";

		};

	};

};

arch/arm/boot/dts/broadcom/bcm4708-luxul-xap-1510.dts

+8 −0
Original line number Diff line number Diff line
@@ -85,5 +85,13 @@ 
		port@5 {

			label = "cpu";

		};



		port@7 {

			status = "disabled";

		};



		port@8 {

			status = "disabled";

		};

	};

};