BACKPORT: FROMGIT: irqchip/gic-v3: Workaround for GIC-700 erratum 2941627
GIC700 erratum 2941627 may cause GIC-700 missing SPIs wake requests when SPIs are deactivated while targeting a sleeping CPU - ie a CPU for which the redistributor: GICR_WAKER.ProcessorSleep == 1 This runtime situation can happen if an SPI that has been activated on a core is retargeted to a different core, it becomes pending and the target core subsequently enters a power state quiescing the respective redistributor. When this situation is hit, the de-activation carried out on the core that activated the SPI (through either ICC_EOIR1_EL1 or ICC_DIR_EL1 register writes) does not trigger a wake requests for the sleeping GIC redistributor even if the SPI is pending. Work around the erratum by de-activating the SPI using the redistributor GICD_ICACTIVER register if the runtime conditions require it (ie the IRQ was retargeted between activation and de-activation). Bug: 292459437 Change-Id: Ide915b8c925a631a7fc9ccebca19d9175def162e Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20230704155034.148262-1-lpieralisi@kernel.org (cherry picked from commit 6fe5c68ee6a1aae0ef291a56001e7888de547fa2 https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irq/irqchip-fixes) [Defined CPUIF_MAP for ICC_EOIR1_EL1 register] Signed-off-by: Carlos Galo <carlosgalo@google.com>
This commit is contained in:
parent
ec3f57af0a
commit
6efa28db9a
@ -113,6 +113,9 @@ stable kernels.
|
|||||||
| ARM | MMU-500 | #841119,826419 | N/A |
|
| ARM | MMU-500 | #841119,826419 | N/A |
|
||||||
+----------------+-----------------+-----------------+-----------------------------+
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
+----------------+-----------------+-----------------+-----------------------------+
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
| ARM | GIC-700 | #2941627 | ARM64_ERRATUM_2941627 |
|
||||||
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
| Broadcom | Brahma-B53 | N/A | ARM64_ERRATUM_845719 |
|
| Broadcom | Brahma-B53 | N/A | ARM64_ERRATUM_845719 |
|
||||||
+----------------+-----------------+-----------------+-----------------------------+
|
+----------------+-----------------+-----------------+-----------------------------+
|
||||||
| Broadcom | Brahma-B53 | N/A | ARM64_ERRATUM_843419 |
|
| Broadcom | Brahma-B53 | N/A | ARM64_ERRATUM_843419 |
|
||||||
|
@ -48,6 +48,7 @@ static inline u32 read_ ## a64(void) \
|
|||||||
return read_sysreg(a32); \
|
return read_sysreg(a32); \
|
||||||
} \
|
} \
|
||||||
|
|
||||||
|
CPUIF_MAP(ICC_EOIR1, ICC_EOIR1_EL1)
|
||||||
CPUIF_MAP(ICC_PMR, ICC_PMR_EL1)
|
CPUIF_MAP(ICC_PMR, ICC_PMR_EL1)
|
||||||
CPUIF_MAP(ICC_AP0R0, ICC_AP0R0_EL1)
|
CPUIF_MAP(ICC_AP0R0, ICC_AP0R0_EL1)
|
||||||
CPUIF_MAP(ICC_AP0R1, ICC_AP0R1_EL1)
|
CPUIF_MAP(ICC_AP0R1, ICC_AP0R1_EL1)
|
||||||
|
@ -51,6 +51,8 @@ struct redist_region {
|
|||||||
bool single_redist;
|
bool single_redist;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static DEFINE_STATIC_KEY_FALSE(gic_arm64_2941627_erratum);
|
||||||
|
|
||||||
static struct gic_chip_data gic_data __read_mostly;
|
static struct gic_chip_data gic_data __read_mostly;
|
||||||
static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key);
|
static DEFINE_STATIC_KEY_TRUE(supports_deactivate_key);
|
||||||
|
|
||||||
@ -542,9 +544,39 @@ static void gic_irq_nmi_teardown(struct irq_data *d)
|
|||||||
gic_irq_set_prio(d, GICD_INT_DEF_PRI);
|
gic_irq_set_prio(d, GICD_INT_DEF_PRI);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool gic_arm64_erratum_2941627_needed(struct irq_data *d)
|
||||||
|
{
|
||||||
|
enum gic_intid_range range;
|
||||||
|
|
||||||
|
if (!static_branch_unlikely(&gic_arm64_2941627_erratum))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
range = get_intid_range(d);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The workaround is needed if the IRQ is an SPI and
|
||||||
|
* the target cpu is different from the one we are
|
||||||
|
* executing on.
|
||||||
|
*/
|
||||||
|
return (range == SPI_RANGE || range == ESPI_RANGE) &&
|
||||||
|
!cpumask_test_cpu(raw_smp_processor_id(),
|
||||||
|
irq_data_get_effective_affinity_mask(d));
|
||||||
|
}
|
||||||
|
|
||||||
static void gic_eoi_irq(struct irq_data *d)
|
static void gic_eoi_irq(struct irq_data *d)
|
||||||
{
|
{
|
||||||
gic_write_eoir(gic_irq(d));
|
write_gicreg(gic_irq(d), ICC_EOIR1_EL1);
|
||||||
|
isb();
|
||||||
|
|
||||||
|
if (gic_arm64_erratum_2941627_needed(d)) {
|
||||||
|
/*
|
||||||
|
* Make sure the GIC stream deactivate packet
|
||||||
|
* issued by ICC_EOIR1_EL1 has completed before
|
||||||
|
* deactivating through GICD_IACTIVER.
|
||||||
|
*/
|
||||||
|
dsb(sy);
|
||||||
|
gic_poke_irq(d, GICD_ICACTIVER);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void gic_eoimode1_eoi_irq(struct irq_data *d)
|
static void gic_eoimode1_eoi_irq(struct irq_data *d)
|
||||||
@ -555,7 +587,11 @@ static void gic_eoimode1_eoi_irq(struct irq_data *d)
|
|||||||
*/
|
*/
|
||||||
if (gic_irq(d) >= 8192 || irqd_is_forwarded_to_vcpu(d))
|
if (gic_irq(d) >= 8192 || irqd_is_forwarded_to_vcpu(d))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (!gic_arm64_erratum_2941627_needed(d))
|
||||||
gic_write_dir(gic_irq(d));
|
gic_write_dir(gic_irq(d));
|
||||||
|
else
|
||||||
|
gic_poke_irq(d, GICD_ICACTIVER);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int gic_set_type(struct irq_data *d, unsigned int type)
|
static int gic_set_type(struct irq_data *d, unsigned int type)
|
||||||
@ -1642,6 +1678,12 @@ static bool gic_enable_quirk_hip06_07(void *data)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool gic_enable_quirk_arm64_2941627(void *data)
|
||||||
|
{
|
||||||
|
static_branch_enable(&gic_arm64_2941627_erratum);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
static const struct gic_quirk gic_quirks[] = {
|
static const struct gic_quirk gic_quirks[] = {
|
||||||
{
|
{
|
||||||
.desc = "GICv3: Qualcomm MSM8996 broken firmware",
|
.desc = "GICv3: Qualcomm MSM8996 broken firmware",
|
||||||
@ -1678,6 +1720,25 @@ static const struct gic_quirk gic_quirks[] = {
|
|||||||
.mask = 0xe8f00fff,
|
.mask = 0xe8f00fff,
|
||||||
.init = gic_enable_quirk_cavium_38539,
|
.init = gic_enable_quirk_cavium_38539,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* GIC-700: 2941627 workaround - IP variant [0,1]
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
.desc = "GICv3: ARM64 erratum 2941627",
|
||||||
|
.iidr = 0x0400043b,
|
||||||
|
.mask = 0xff0e0fff,
|
||||||
|
.init = gic_enable_quirk_arm64_2941627,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* GIC-700: 2941627 workaround - IP variant [2]
|
||||||
|
*/
|
||||||
|
.desc = "GICv3: ARM64 erratum 2941627",
|
||||||
|
.iidr = 0x0402043b,
|
||||||
|
.mask = 0xff0f0fff,
|
||||||
|
.init = gic_enable_quirk_arm64_2941627,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user