Unverified Commit 6a292cc7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12164 Backport 5.10.218 LTS patches from upstream 

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

Conflicts:
Already merged(4):
99951b62bf20c  mptcp: ensure snd_nxt is properly initialized on connect
eb15243bc98b3  ima: fix deadlock when traversing "ima_default_rules".
f2277d9e2a0d0  firmware: arm_scmi: Harden accesses to the reset domains
c48ab6a4cd821  btrfs: add missing mutex_unlock in btrfs_relocate_sys_chunks()

Rejected(1):
1424ab4bb386d  x86/xen: Drop USERGS_SYSRET64 paravirt call

Total patches: 15 - 4 - 1 = 10 
 
Link:https://gitee.com/openeuler/kernel/pulls/12164

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 9e44bdbf d9c1d386

Documentation/sphinx/kernel_include.py

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ class KernelInclude(Include): 
        # HINT: this is the only line I had to change / commented out:

        #path = utils.relative_path(None, path)



        path = nodes.reprunicode(path)

        encoding = self.options.get(

            'encoding', self.state.document.settings.input_encoding)

        e_handler=self.state.document.settings.input_encoding_error_handler

arch/x86/kvm/x86.c

+9 −2
Original line number Diff line number Diff line
@@ -8892,13 +8892,20 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu) 


static void kvm_inject_exception(struct kvm_vcpu *vcpu)

{

	/*

	 * Suppress the error code if the vCPU is in Real Mode, as Real Mode

	 * exceptions don't report error codes.  The presence of an error code

	 * is carried with the exception and only stripped when the exception

	 * is injected as intercepted #PF VM-Exits for AMD's Paged Real Mode do

	 * report an error code despite the CPU being in Real Mode.

	 */

	vcpu->arch.exception.has_error_code &= is_protmode(vcpu);



	trace_kvm_inj_exception(vcpu->arch.exception.nr,

				vcpu->arch.exception.has_error_code,

				vcpu->arch.exception.error_code,

				vcpu->arch.exception.injected);



	if (vcpu->arch.exception.error_code && !is_protmode(vcpu))

		vcpu->arch.exception.error_code = false;

	kvm_x86_ops.queue_exception(vcpu);

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

+3 −0
Original line number Diff line number Diff line
@@ -765,6 +765,9 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev, 
	if (!obj)

		return -EINVAL;



	if (!info || info->head.block == AMDGPU_RAS_BLOCK_COUNT)

		return -EINVAL;



	switch (info->head.block) {

	case AMDGPU_RAS_BLOCK__UMC:

		if (adev->umc.funcs->query_ras_error_count)

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+11 −1
Original line number Diff line number Diff line
@@ -2424,14 +2424,18 @@ static void umac_enable_set(struct bcmgenet_priv *priv, u32 mask, bool enable) 
{

	u32 reg;



	spin_lock_bh(&priv->reg_lock);

	reg = bcmgenet_umac_readl(priv, UMAC_CMD);

	if (reg & CMD_SW_RESET)

	if (reg & CMD_SW_RESET) {

		spin_unlock_bh(&priv->reg_lock);

		return;

	}

	if (enable)

		reg |= mask;

	else

		reg &= ~mask;

	bcmgenet_umac_writel(priv, reg, UMAC_CMD);

	spin_unlock_bh(&priv->reg_lock);



	/* UniMAC stops on a packet boundary, wait for a full-size packet

	 * to be processed
@@ -2447,8 +2451,10 @@ static void reset_umac(struct bcmgenet_priv *priv) 
	udelay(10);



	/* issue soft reset and disable MAC while updating its registers */

	spin_lock_bh(&priv->reg_lock);

	bcmgenet_umac_writel(priv, CMD_SW_RESET, UMAC_CMD);

	udelay(2);

	spin_unlock_bh(&priv->reg_lock);

}



static void bcmgenet_intr_disable(struct bcmgenet_priv *priv)
@@ -3576,16 +3582,19 @@ static void bcmgenet_set_rx_mode(struct net_device *dev) 
	 * 3. The number of filters needed exceeds the number filters

	 *    supported by the hardware.

	*/

	spin_lock(&priv->reg_lock);

	reg = bcmgenet_umac_readl(priv, UMAC_CMD);

	if ((dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) ||

	    (nfilter > MAX_MDF_FILTER)) {

		reg |= CMD_PROMISC;

		bcmgenet_umac_writel(priv, reg, UMAC_CMD);

		spin_unlock(&priv->reg_lock);

		bcmgenet_umac_writel(priv, 0, UMAC_MDF_CTRL);

		return;

	} else {

		reg &= ~CMD_PROMISC;

		bcmgenet_umac_writel(priv, reg, UMAC_CMD);

		spin_unlock(&priv->reg_lock);

	}



	/* update MDF filter */
@@ -3979,6 +3988,7 @@ static int bcmgenet_probe(struct platform_device *pdev) 
		goto err;

	}



	spin_lock_init(&priv->reg_lock);

	spin_lock_init(&priv->lock);



	SET_NETDEV_DEV(dev, &pdev->dev);

drivers/net/ethernet/broadcom/genet/bcmgenet.h

+2 −0
Original line number Diff line number Diff line
@@ -627,6 +627,8 @@ struct bcmgenet_rxnfc_rule { 
/* device context */

struct bcmgenet_priv {

	void __iomem *base;

	/* reg_lock: lock to serialize access to shared registers */

	spinlock_t reg_lock;

	enum bcmgenet_version version;

	struct net_device *dev;