Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bb176e0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.233 into android11-5.4-lts 



Changes in 5.4.233
	dma-mapping: add generic helpers for mapping sgtable objects
	scatterlist: add generic wrappers for iterating over sgtable objects
	drm: etnaviv: fix common struct sg_table related issues
	drm/etnaviv: don't truncate physical page address
	wifi: rtl8xxxu: gen2: Turn on the rate control
	powerpc: dts: t208x: Mark MAC1 and MAC2 as 10G
	random: always mix cycle counter in add_latent_entropy()
	KVM: x86: Fail emulation during EMULTYPE_SKIP on any exception
	KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS
	can: kvaser_usb: hydra: help gcc-13 to figure out cmd_len
	powerpc: dts: t208x: Disable 10G on MAC1 and MAC2
	alarmtimer: Prevent starvation by small intervals and SIG_IGN
	drm/i915/gvt: fix double free bug in split_2MB_gtt_entry
	mac80211: mesh: embedd mesh_paths and mpp_paths into ieee80211_if_mesh
	uaccess: Add speculation barrier to copy_from_user()
	wifi: mwifiex: Add missing compatible string for SD8787
	ext4: Fix function prototype mismatch for ext4_feat_ktype
	Revert "net/sched: taprio: make qdisc_leaf() see the per-netdev-queue pfifo child qdiscs"
	bpf: add missing header file include
	Linux 5.4.233

Change-Id: I83441dec5bd3c2ad6af19017fe9b467f7ffa2ea5
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 7f7f2549 69f65d44

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 232

SUBLEVEL = 233

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later

/*

 * QorIQ FMan v3 10g port #2 device tree stub [ controller @ offset 0x400000 ]

 *

 * Copyright 2022 Sean Anderson <sean.anderson@seco.com>

 * Copyright 2012 - 2015 Freescale Semiconductor Inc.

 */



fman@400000 {

	fman0_rx_0x08: port@88000 {

		cell-index = <0x8>;

		compatible = "fsl,fman-v3-port-rx";

		reg = <0x88000 0x1000>;

		fsl,fman-10g-port;

	};



	fman0_tx_0x28: port@a8000 {

		cell-index = <0x28>;

		compatible = "fsl,fman-v3-port-tx";

		reg = <0xa8000 0x1000>;

		fsl,fman-10g-port;

	};



	ethernet@e0000 {

		cell-index = <0>;

		compatible = "fsl,fman-memac";

		reg = <0xe0000 0x1000>;

		fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>;

		ptp-timer = <&ptp_timer0>;

		pcsphy-handle = <&pcsphy0>;

	};



	mdio@e1000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

		reg = <0xe1000 0x1000>;

		fsl,erratum-a011043; /* must ignore read errors */



		pcsphy0: ethernet-phy@0 {

			reg = <0x0>;

		};

	};

};

arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi

0 → 100644
+44 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later

/*

 * QorIQ FMan v3 10g port #3 device tree stub [ controller @ offset 0x400000 ]

 *

 * Copyright 2022 Sean Anderson <sean.anderson@seco.com>

 * Copyright 2012 - 2015 Freescale Semiconductor Inc.

 */



fman@400000 {

	fman0_rx_0x09: port@89000 {

		cell-index = <0x9>;

		compatible = "fsl,fman-v3-port-rx";

		reg = <0x89000 0x1000>;

		fsl,fman-10g-port;

	};



	fman0_tx_0x29: port@a9000 {

		cell-index = <0x29>;

		compatible = "fsl,fman-v3-port-tx";

		reg = <0xa9000 0x1000>;

		fsl,fman-10g-port;

	};



	ethernet@e2000 {

		cell-index = <1>;

		compatible = "fsl,fman-memac";

		reg = <0xe2000 0x1000>;

		fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>;

		ptp-timer = <&ptp_timer0>;

		pcsphy-handle = <&pcsphy1>;

	};



	mdio@e3000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio";

		reg = <0xe3000 0x1000>;

		fsl,erratum-a011043; /* must ignore read errors */



		pcsphy1: ethernet-phy@0 {

			reg = <0x0>;

		};

	};

};

arch/powerpc/boot/dts/fsl/t2081si-post.dtsi

+18 −2
Original line number Diff line number Diff line
@@ -609,8 +609,8 @@ 
/include/ "qoriq-bman1.dtsi"



/include/ "qoriq-fman3-0.dtsi"

/include/ "qoriq-fman3-0-1g-0.dtsi"

/include/ "qoriq-fman3-0-1g-1.dtsi"

/include/ "qoriq-fman3-0-10g-2.dtsi"

/include/ "qoriq-fman3-0-10g-3.dtsi"

/include/ "qoriq-fman3-0-1g-2.dtsi"

/include/ "qoriq-fman3-0-1g-3.dtsi"

/include/ "qoriq-fman3-0-1g-4.dtsi"
@@ -659,3 +659,19 @@ 
		interrupts = <16 2 1 9>;

	};

};



&fman0_rx_0x08 {

	/delete-property/ fsl,fman-10g-port;

};



&fman0_tx_0x28 {

	/delete-property/ fsl,fman-10g-port;

};



&fman0_rx_0x09 {

	/delete-property/ fsl,fman-10g-port;

};



&fman0_tx_0x29 {

	/delete-property/ fsl,fman-10g-port;

};

arch/x86/kvm/vmx/nested.c

+11 −0
Original line number Diff line number Diff line
@@ -4118,6 +4118,17 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, 


	vmx_switch_vmcs(vcpu, &vmx->vmcs01);



	/*

	 * If IBRS is advertised to the vCPU, KVM must flush the indirect

	 * branch predictors when transitioning from L2 to L1, as L1 expects

	 * hardware (KVM in this case) to provide separate predictor modes.

	 * Bare metal isolates VMX root (host) from VMX non-root (guest), but

	 * doesn't isolate different VMCSs, i.e. in this case, doesn't provide

	 * separate modes for L2 vs L1.

	 */

	if (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL))

		indirect_branch_prediction_barrier();



	/* Update any VMCS fields that might have changed while L2 ran */

	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx->msr_autoload.host.nr);

	vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx->msr_autoload.guest.nr);