driver inclusion category: other bugzilla: https://gitee.com/openeuler/kernel/issues/I9KBKD
------------------------------------------------------------------
This reverts commit cb0003ae0500bb69eefa2275722d08bc39a0f157.
Signed-off-by: Zhou Wang wangzhou1@hisilicon.com Signed-off-by: caijian caijian11@h-partners.com --- Documentation/arch/arm64/silicon-errata.rst | 2 -- arch/arm64/kvm/vgic/vgic-mmio.c | 17 ----------------- arch/arm64/kvm/vgic/vgic-mmio.h | 1 - drivers/irqchip/irq-gic-v3.c | 16 ---------------- 4 files changed, 36 deletions(-)
diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst index ef58c86cd10b..66e02dba6cc9 100644 --- a/Documentation/arch/arm64/silicon-errata.rst +++ b/Documentation/arch/arm64/silicon-errata.rst @@ -215,8 +215,6 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | Hisilicon | Hip09 | #162200803 | N/A | +----------------+-----------------+-----------------+-----------------------------+ -| Hisilicon | Hip09 | #162200806 | N/A | -+----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 | +----------------+-----------------+-----------------+-----------------------------+ | Qualcomm Tech. | Kryo/Falkor v1 | E1009 | QCOM_FALKOR_ERRATUM_1009 | diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c index 56549ee4313c..59b81e5ce1d8 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio.c +++ b/arch/arm64/kvm/vgic/vgic-mmio.c @@ -228,7 +228,6 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu, return 0; }
-#define VIRTUAL_SGI_PENDING_OFFSET 0x3F0 static unsigned long __read_pending(struct kvm_vcpu *vcpu, gpa_t addr, unsigned int len, bool is_user) @@ -236,7 +235,6 @@ static unsigned long __read_pending(struct kvm_vcpu *vcpu, u32 intid = VGIC_ADDR_TO_INTID(addr, 1); u32 value = 0; int i; - struct its_vpe *vpe = &vcpu->arch.vgic_cpu.vgic_v3.its_vpe;
/* Loop over all IRQs affected by this read */ for (i = 0; i < len * 8; i++) { @@ -257,21 +255,6 @@ static unsigned long __read_pending(struct kvm_vcpu *vcpu, if (vgic_direct_sgi_or_ppi(irq)) { int err;
- if (irq->hw && vgic_irq_is_sgi(irq->intid) && - (kvm_vgic_global_state.flags & - FLAGS_WORKAROUND_HIP09_ERRATUM_162200806)) { - void *va; - u8 *ptr; - int mask; - bool is_pending; - - mask = BIT(irq->intid % BITS_PER_BYTE); - va = page_address(vpe->vpt_page); - ptr = va + VIRTUAL_SGI_PENDING_OFFSET + - irq->intid / BITS_PER_BYTE; - is_pending = *ptr & mask; - } - val = false; err = irq_get_irqchip_state(irq->host_irq, IRQCHIP_STATE_PENDING, diff --git a/arch/arm64/kvm/vgic/vgic-mmio.h b/arch/arm64/kvm/vgic/vgic-mmio.h index 0477ec95e96c..55f49933e304 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio.h +++ b/arch/arm64/kvm/vgic/vgic-mmio.h @@ -6,7 +6,6 @@ #define __KVM_ARM_VGIC_MMIO_H__
#define FLAGS_WORKAROUND_HIP09_ERRATUM_162200803 (1ULL << 4) -#define FLAGS_WORKAROUND_HIP09_ERRATUM_162200806 (1ULL << 5)
struct vgic_register_region { unsigned int reg_offset; diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index d287e7199cfe..34405577c458 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -42,7 +42,6 @@ #define FLAGS_WORKAROUND_MTK_GICR_SAVE (1ULL << 2) #define FLAGS_WORKAROUND_ASR_ERRATUM_8601001 (1ULL << 3) #define FLAGS_WORKAROUND_HIP09_ERRATUM_162200803 (1ULL << 4) -#define FLAGS_WORKAROUND_HIP09_ERRATUM_162200806 (1ULL << 5)
#define GIC_IRQ_TYPE_PARTITION (GIC_IRQ_TYPE_LPI + 1)
@@ -2002,15 +2001,6 @@ static bool gic_enable_quirk_hip09_162200803(void *data) return true; }
-static bool __maybe_unused gic_enable_quirk_hip09_162200806(void *data) -{ - struct gic_chip_data *d = data; - - d->flags |= FLAGS_WORKAROUND_HIP09_ERRATUM_162200806; - - return true; -} - static const struct gic_quirk gic_quirks[] = { { .desc = "GICv3: Qualcomm MSM8996 broken firmware", @@ -2088,12 +2078,6 @@ static const struct gic_quirk gic_quirks[] = { .mask = 0xffffffff, .init = gic_enable_quirk_hip09_162200803, }, - { - .desc = "GICv3: HIP09 erratum 162200806", - .iidr = 0x01050736, - .mask = 0xffffffff, - .init = gic_enable_quirk_hip09_162200806, - }, { } };