From: John Garry <john.garry@huawei.com>
To: Marc Zyngier <maz@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
"Jason Cooper" <jason@lakedaemon.net>,
Julien Thierry <julien.thierry.kdev@gmail.com>,
Rob Herring <robh+dt@kernel.org>
Cc: Shameerali Kolothum Thodi <shameerali.kolothum.thodi@huawei.com>,
"Lokesh Vutla" <lokeshvutla@ti.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v2 12/12] irqchip/gic-v3: Add quirks for HIP06/07 invalid GICD_TYPER erratum 161010803
Date: Tue, 6 Aug 2019 12:07:00 +0100 [thread overview]
Message-ID: <5f8808f9-ca91-db68-042f-97dfcbe75508@huawei.com> (raw)
In-Reply-To: <20190806100121.240767-13-maz@kernel.org>
On 06/08/2019 11:01, Marc Zyngier wrote:
> It looks like the HIP06/07 SoCs have extra bits in their GICD_TYPER
> registers, which confuse the GICv3.1 code (these systems appear to
> expose ESPIs while they actually don't).
>
> Detect these systems as early as possible and wipe the fields that
> should be RES0 in the register.
>
thanks,
Tested-by: John Garry <john.garry@huawei.com>
> Signed-off-by: Marc Zyngier <maz@kernel.org>
> ---
> Documentation/arm64/silicon-errata.rst | 2 +
> drivers/irqchip/irq-gic-v3.c | 54 +++++++++++++++++++++-----
> 2 files changed, 46 insertions(+), 10 deletions(-)
>
> diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst
> index 3e57d09246e6..17ea3fecddaa 100644
> --- a/Documentation/arm64/silicon-errata.rst
> +++ b/Documentation/arm64/silicon-errata.rst
> @@ -115,6 +115,8 @@ stable kernels.
> +----------------+-----------------+-----------------+-----------------------------+
> | Hisilicon | Hip0{6,7} | #161010701 | N/A |
> +----------------+-----------------+-----------------+-----------------------------+
> +| Hisilicon | Hip0{6,7} | #161010803 | N/A |
> ++----------------+-----------------+-----------------+-----------------------------+
> | Hisilicon | Hip07 | #161600802 | HISILICON_ERRATUM_161600802 |
> +----------------+-----------------+-----------------+-----------------------------+
> | Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
> diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
> index 334a10d9dbfb..bee141613b67 100644
> --- a/drivers/irqchip/irq-gic-v3.c
> +++ b/drivers/irqchip/irq-gic-v3.c
> @@ -1441,6 +1441,46 @@ static bool gic_enable_quirk_msm8996(void *data)
> return true;
> }
>
> +static bool gic_enable_quirk_hip06_07(void *data)
> +{
> + struct gic_chip_data *d = data;
> +
> + /*
> + * HIP06 GICD_IIDR clashes with GIC-600 product number (despite
> + * not being an actual ARM implementation). The saving grace is
> + * that GIC-600 doesn't have ESPI, so nothing to do in that case.
> + * HIP07 doesn't even have a proper IIDR, and still pretends to
> + * have ESPI. In both cases, put them right.
> + */
> + if (d->rdists.gicd_typer & GICD_TYPER_ESPI) {
> + /* Zero both ESPI and the RES0 field next to it... */
> + d->rdists.gicd_typer &= ~GENMASK(9, 8);
> + return true;
> + }
> +
> + return false;
> +}
> +
> +static const struct gic_quirk gic_quirks[] = {
> + {
> + .desc = "GICv3: Qualcomm MSM8996 broken firmware",
> + .compatible = "qcom,msm8996-gic-v3",
> + .init = gic_enable_quirk_msm8996,
> + },
> + {
> + .desc = "GICv3: HIP06 erratum 161010803",
> + .iidr = 0x0204043b,
> + .init = gic_enable_quirk_hip06_07,
> + },
> + {
> + .desc = "GICv3: HIP07 erratum 161010803",
> + .iidr = 0x00000000,
> + .init = gic_enable_quirk_hip06_07,
> + },
> + {
> + }
> +};
> +
> static void gic_enable_nmi_support(void)
> {
> int i;
> @@ -1494,6 +1534,10 @@ static int __init gic_init_bases(void __iomem *dist_base,
> */
> typer = readl_relaxed(gic_data.dist_base + GICD_TYPER);
> gic_data.rdists.gicd_typer = typer;
> +
> + gic_enable_quirks(readl_relaxed(gic_data.dist_base + GICD_IIDR),
> + gic_quirks, &gic_data);
> +
> pr_info("%d SPIs implemented\n", GIC_LINE_NR - 32);
> pr_info("%d Extended SPIs implemented\n", GIC_ESPI_NR);
> gic_data.domain = irq_domain_create_tree(handle, &gic_irq_domain_ops,
> @@ -1676,16 +1720,6 @@ static void __init gic_of_setup_kvm_info(struct device_node *node)
> gic_set_kvm_info(&gic_v3_kvm_info);
> }
>
> -static const struct gic_quirk gic_quirks[] = {
> - {
> - .desc = "GICv3: Qualcomm MSM8996 broken firmware",
> - .compatible = "qcom,msm8996-gic-v3",
> - .init = gic_enable_quirk_msm8996,
> - },
> - {
> - }
> -};
> -
> static int __init gic_of_init(struct device_node *node, struct device_node *parent)
> {
> void __iomem *dist_base;
>
prev parent reply other threads:[~2019-08-06 11:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 10:01 [PATCH v2 00/12] irqchip/gic-v3: Add support for GICv3.1 extended PPI/SPI ranges Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 01/12] irqchip/gic: Rework gic_configure_irq to take the full ICFGR base Marc Zyngier
2019-08-19 14:26 ` Zenghui Yu
2019-08-19 14:53 ` Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 02/12] irqchip/gic-v3: Add INTID range and convertion primitives Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 03/12] dt-bindings: interrupt-controller: arm,gic-v3: Describe ESPI range support Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 04/12] irqchip/gic-v3: Add " Marc Zyngier
2019-08-19 14:25 ` Zenghui Yu
2019-08-20 9:18 ` Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 05/12] irqchip/gic: Prepare for more than 16 PPIs Marc Zyngier
2019-08-21 18:40 ` Zenghui Yu
2019-08-22 16:11 ` Julien
2019-08-22 16:32 ` Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 06/12] irqchip/gic-v3: Dynamically allocate PPI NMI refcounts Marc Zyngier
2019-08-22 15:05 ` Julien
2019-08-06 10:01 ` [PATCH v2 07/12] irqchip/gic-v3: Dynamically allocate PPI partition descriptors Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 08/12] dt-bindings: interrupt-controller: arm,gic-v3: Describe EPPI range support Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 09/12] irqchip/gic-v3: Add " Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 10/12] irqchip/gic-v3: Warn about inconsistent implementations of extended ranges Marc Zyngier
2019-08-06 10:15 ` Vladimir Murzin
2019-08-06 11:15 ` Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 11/12] irqchip/gic: Skip DT quirks when evaluating IIDR-based quirks Marc Zyngier
2019-08-06 10:01 ` [PATCH v2 12/12] irqchip/gic-v3: Add quirks for HIP06/07 invalid GICD_TYPER erratum 161010803 Marc Zyngier
2019-08-06 11:07 ` John Garry [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f8808f9-ca91-db68-042f-97dfcbe75508@huawei.com \
--to=john.garry@huawei.com \
--cc=jason@lakedaemon.net \
--cc=julien.thierry.kdev@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=maz@kernel.org \
--cc=robh+dt@kernel.org \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).