From patchwork Thu Oct 5 11:43:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9986897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3A6156029B for ; Thu, 5 Oct 2017 11:44:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20DD428BCE for ; Thu, 5 Oct 2017 11:44:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1562828C69; Thu, 5 Oct 2017 11:44:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7971728BCE for ; Thu, 5 Oct 2017 11:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=mMDU5OhrbvH4g2+wMihDKqYSCT/eCrGz1Yu2EUL5W08=; b=pgt Ag27VaETbi5VM5B1SaDV5conA9objCCPsN7o3Xk66MHlGbnUSpsMW3zGwwrM6xQMJLlS9WG2bC6P0 zh5/RjZKCTSIYZGLm0klzw85JDWvr/4GBhjT5Sh4XNIZA3iYzrZhvc4wRrXxjYeNNN3VRr4N41wDQ FNE6FElcDhP/op0QDdqCohgbzZvK5oNsR9A8D+WWkvA/P0zvgVsJROU5xl3SAojzNC3yYrZxu8ChS gUtGRlBeh2VDy+D3gAz7q+GB0EHRd49ZkpcGq8VMzEiIp7Hu0f//FCc+uVYCuir3we1sDKsdOsdCg iC8OtIdIC72vUiyTlGtC+LYNMxu13yw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e04Zg-0006M7-7Z; Thu, 05 Oct 2017 11:44:20 +0000 Received: from mail-wr0-x235.google.com ([2a00:1450:400c:c0c::235]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e04Za-00068R-I6 for linux-arm-kernel@lists.infradead.org; Thu, 05 Oct 2017 11:44:18 +0000 Received: by mail-wr0-x235.google.com with SMTP id y44so2938801wry.10 for ; Thu, 05 Oct 2017 04:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=6/YlAkCRbsUPQ/HDZpMp7E3oy4NL4adb4jSyO4Vf+ao=; b=awsbLV3tX3wltP2SqlzmqglrpAJ+WXvddeKp0WkZjF/skrCUbLe891fmaxJTvfCNWa t/T6s+s2HWh05j/tvIHAnBSItFh57QjpvjCskVUXrCvul9ux/gKIP9Envt9hdHI2JZfV HiGs1Btd4eF296l5X0mvhnrB8HLUqIYUig4x0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6/YlAkCRbsUPQ/HDZpMp7E3oy4NL4adb4jSyO4Vf+ao=; b=jZnvHk79Vgd3u3d8pMRH9UHkOJs7cOq7d/Vw9Q0AYaGhJ0tgRf14B/IN89aAqdoY45 ndJ3XsTicYYhe4cOwTCdP5KOxi6r/49vX6w7WYzoPdciHZFWfy1ol76YqXrOZFOGC9MO tCNpxpTUQ/a1vM+zDfQrDvxMj0xHCYSULeyxS54HutBQi8ZYwtvV6GeRtmkTQSe3dX5m 2jOd60TiXMryLAqgsd/VQN5r8jH4yxBF3Yy/oCyQ1EMvSRHphgum2V/kn/C6wr+PjKKt HSamOaqEx2mPq7UdBAZFebdflj3cZ4VcStFvPOhl6SMdqsGre9A4uLcKDuC2+uJe2IIt rr9Q== X-Gm-Message-State: AMCzsaUnMz/khc9MK5rypaGKrQVCdOgbimIV8UKB+29mxomxSS9oSxnm pfP6BEymXEGeD3XFseYA/GAQitCaEHg= X-Google-Smtp-Source: AOwi7QBydxe8vGEDk5SyO7ls7c07cxo0L+kF/5Zk8cjFewA9oZVezVJ3KHsu4bEO3CG4tY5eD5gPig== X-Received: by 10.223.156.139 with SMTP id d11mr1452260wre.214.1507203831920; Thu, 05 Oct 2017 04:43:51 -0700 (PDT) Received: from localhost.localdomain ([160.90.203.54]) by smtp.gmail.com with ESMTPSA id 10sm15841695wrt.59.2017.10.05.04.43.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2017 04:43:51 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] drivers/irqchip: gicv3: add workaround for Synquacer pre-ITS Date: Thu, 5 Oct 2017 12:43:44 +0100 Message-Id: <20171005114344.21029-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171005_044414_827061_C8A4D2A8 X-CRM114-Status: GOOD ( 18.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, daniel.thompson@Linaro.org, graeme.gregory@linaro.org, Ard Biesheuvel , marc.zyngier@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, leif.lindholm@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The Socionext Synquacer SoC's implementation of GICv3 has a so-called 'pre-ITS', which maps 32-bit writes targeted at a separate window of size '4 << device_id_bits' onto writes to GITS_TRANSLATER with device ID taken from bits [device_id_bits + 1:2] of the window offset. Writes that target GITS_TRANSLATER directly are reported as originating from device ID #0. So add a workaround for this. Given that this breaks isolation, clear the IRQ_DOMAIN_FLAG_MSI_REMAP flag as well. Signed-off-by: Ard Biesheuvel --- Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt | 4 ++ arch/arm64/Kconfig | 8 ++++ drivers/irqchip/irq-gic-v3-its.c | 50 ++++++++++++++++++-- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt index 4c29cdab0ea5..112ebb286728 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt @@ -75,6 +75,10 @@ These nodes must have the following properties: - reg: Specifies the base physical address and size of the ITS registers. +Optional: +- socionext,synquacer-pre-its: (u64, u64) tuple describing the PCI address + and size of the pre-ITS window. + The main GIC node must contain the appropriate #address-cells, #size-cells and ranges properties for the reg property of all ITS nodes. diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index dfd908630631..081722240936 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -538,6 +538,14 @@ config QCOM_QDF2400_ERRATUM_0065 If unsure, say Y. +config SOCIONEXT_SYNQUACER_PREITS + bool "Socionext Synquacer: Workaround for GICv3 pre-ITS" + default y + help + Socionext Synquacer SoCs implement a separate h/w block to generate + MSI doorbell writes with non-zero values for the device ID. + + If unsure, say Y. endmenu diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 284738add89b..fb86b15fa10d 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -45,6 +45,7 @@ #define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) #define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) #define ITS_FLAGS_WORKAROUND_CAVIUM_23144 (1ULL << 2) +#define ITS_FLAGS_WORKAROUND_SOCIONEXT_PREITS (1ULL << 3) #define RDIST_FLAGS_PROPBASE_NEEDS_FLUSHING (1 << 0) @@ -85,6 +86,10 @@ struct its_node { struct its_collection *collections; struct list_head its_device_list; u64 flags; +#ifdef CONFIG_SOCIONEXT_SYNQUACER_PREITS + u64 pre_its_base; + u64 pre_its_size; +#endif u32 ite_size; u32 device_ids; int numa_node; @@ -654,6 +659,23 @@ static int its_set_affinity(struct irq_data *d, const struct cpumask *mask_val, return IRQ_SET_MASK_OK_DONE; } +static u64 its_irq_get_msi_base(struct its_node *its) +{ +#ifdef CONFIG_SOCIONEXT_SYNQUACER_PREITS + if (its->flags & ITS_FLAGS_WORKAROUND_SOCIONEXT_PREITS) + + /* + * The Socionext Synquacer SoC has a so-called 'pre-ITS', + * which maps 32-bit writes targeted at a separate window of + * size '4 << device_id_bits' onto writes to GITS_TRANSLATER + * with device ID taken from bits [device_id_bits + 1:2] of + * the window offset. + */ + return its->pre_its_base + (its_dev->device_id << 2); +#endif + return its->phys_base + GITS_TRANSLATER; +} + static void its_irq_compose_msi_msg(struct irq_data *d, struct msi_msg *msg) { struct its_device *its_dev = irq_data_get_irq_chip_data(d); @@ -661,12 +683,15 @@ static void its_irq_compose_msi_msg(struct irq_data *d, struct msi_msg *msg) u64 addr; its = its_dev->its; - addr = its->phys_base + GITS_TRANSLATER; + addr = its_irq_get_msi_base(its); msg->address_lo = lower_32_bits(addr); msg->address_hi = upper_32_bits(addr); msg->data = its_get_event_id(d); + if (its->flags & ITS_FLAGS_WORKAROUND_SOCIONEXT_PREITS) + return; + iommu_dma_map_msi_msg(d->irq, msg); } @@ -1044,6 +1069,11 @@ static int its_alloc_tables(struct its_node *its) ids = 0x14; /* 20 bits, 8MB */ } +#ifdef CONFIG_SOCIONEXT_SYNQUACER_PREITS + if (its->flags & ITS_FLAGS_WORKAROUND_SOCIONEXT_PREITS) + ids = ilog2(its->pre_its_size) - 2; +#endif + its->device_ids = ids; for (i = 0; i < GITS_BASER_NR_REGS; i++) { @@ -1640,11 +1670,21 @@ static const struct gic_quirk its_quirks[] = { } }; -static void its_enable_quirks(struct its_node *its) +static void its_enable_quirks(struct its_node *its, + struct fwnode_handle *handle) { u32 iidr = readl_relaxed(its->base + GITS_IIDR); gic_enable_quirks(iidr, its_quirks, its); + +#ifdef CONFIG_SOCIONEXT_SYNQUACER_PREITS + if (!fwnode_property_read_u64_array(handle, + "socionext,synquacer-pre-its", + &its->pre_its_base, 2)) { + its->flags |= ITS_FLAGS_WORKAROUND_SOCIONEXT_PREITS; + pr_info("ITS: enabling workaround for Socionext Synquacer pre-ITS\n"); + } +#endif } static int its_init_domain(struct fwnode_handle *handle, struct its_node *its) @@ -1664,7 +1704,9 @@ static int its_init_domain(struct fwnode_handle *handle, struct its_node *its) inner_domain->parent = its_parent; irq_domain_update_bus_token(inner_domain, DOMAIN_BUS_NEXUS); - inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_REMAP; + + if (!(its->flags & ITS_FLAGS_WORKAROUND_SOCIONEXT_PREITS)) + inner_domain->flags |= IRQ_DOMAIN_FLAG_MSI_REMAP; info->ops = &its_msi_domain_ops; info->data = its; inner_domain->host_data = info; @@ -1724,7 +1766,7 @@ static int __init its_probe_one(struct resource *res, } its->cmd_write = its->cmd_base; - its_enable_quirks(its); + its_enable_quirks(its, handle); err = its_alloc_tables(its); if (err)