From patchwork Thu Mar 25 09:14:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 408764 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp354051jai; Thu, 25 Mar 2021 02:16:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNAFmMpVg4LlAOj515T3NeRVW6huIof0NdR9VFQHUrpaGN9ehSFuRVCskyaA9w0cnUYVb/ X-Received: by 2002:a17:906:719b:: with SMTP id h27mr8214002ejk.123.1616663772700; Thu, 25 Mar 2021 02:16:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616663772; cv=none; d=google.com; s=arc-20160816; b=k4XmoOoL47AyXb/qvXuzcJg2SV0Z1yPJlbuhkM3baGw6Iq3tXgzTGRYl8Aa8v2heBD ByHGYVVcvHQgpU8OfMqO4rjdpAXINwjnT8WNvui6K4rx/2Aq1OVsI/3I2la/DRH5yxSt IUWNo4/utS5JA4j/0n61eRP3oi7dSjhQ5KK0JcGc9DVo4BDx6gofRPHCN1XnJ5S0xgUL e21fGMbMpE2NVOzPITZoYF5BOInY2YYKDon+1tx/LkYFrXdTLgSOzhDE8Xy1eBnlmhFm 0r0NzMBX6ZklZtxxA/L93HFfhQFDBoiLhxQnbPz8L5aS4UEzU2lnlDX9VEJfqMZV5SeZ knmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from; bh=tiSjkqIxm0sk3zHzT/sff1amLovCkBKe2mrvg09rEe0=; b=anD1z/c9r/RaJjDHycyxJcBcLTE1RlPhE2uzk8Aw3qogK7lvQFJs8tdekj3b/tXFeW vpWPGfqnpIp0oGTyEcvHRUFWJ4mAujV2YXPdH+YurzC4T6PsSqm8dd91KyT2aD2Lqeoo TkBdLhLuFfHF1fiWcAf79SbeEPwywRruAICLR5ifvDAm9OfG7nFHrFnBhdO6njSyNlHE XcxWxxmw7mxBh4LluQl9Vznny4p6+CyHf7NSZ3NjvPVr319fXEV7SOFPfUfzG+e3q8qZ V2mITOi0kZI28AOfkyJch4yWG/r/9axMKczvSMjtOd9SG8IH3vFIAzjmQARh9IzA1jcZ sy7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id el21si3634513ejc.603.2021.03.25.02.16.12; Thu, 25 Mar 2021 02:16:12 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229508AbhCYJPl (ORCPT + 12 others); Thu, 25 Mar 2021 05:15:41 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:14894 "EHLO szxga06-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229801AbhCYJPR (ORCPT ); Thu, 25 Mar 2021 05:15:17 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.58]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4F5fXy13N9zlVtH; Thu, 25 Mar 2021 17:13:38 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.47.26.249) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.498.0; Thu, 25 Mar 2021 17:15:07 +0800 From: Shameer Kolothum To: , , , CC: , , Subject: [PATCH for-stable-5.10 0/2] Backport for- Work around firmware wrongly advertising GICv2 compatibility Date: Thu, 25 Mar 2021 09:14:22 +0000 Message-ID: <20210325091424.26348-1-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 MIME-Version: 1.0 X-Originating-IP: [10.47.26.249] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Backport 2 patches that are required on ARM64 platforms having firmware wrongly advertising GICv2 compatibility. Patch 1 has nvhe related conflict resolution while patch 2 is cleanly applied. Tested on HiSilicon D06 platform. Marc Zyngier (2): KVM: arm64: Rename __vgic_v3_get_ich_vtr_el2() to __vgic_v3_get_gic_config() KVM: arm64: Workaround firmware wrongly advertising GICv2-on-v3 compatibility arch/arm64/include/asm/kvm_asm.h | 4 +-- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 +-- arch/arm64/kvm/hyp/vgic-v3-sr.c | 40 ++++++++++++++++++++++++++++-- arch/arm64/kvm/vgic/vgic-v3.c | 12 ++++++--- 4 files changed, 51 insertions(+), 9 deletions(-) -- 2.17.1