From patchwork Tue Oct 17 16:55:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 116152 Delivered-To: patch@linaro.org Received: by 10.80.163.170 with SMTP id s39csp1444806edb; Tue, 17 Oct 2017 09:56:17 -0700 (PDT) X-Received: by 10.84.233.69 with SMTP id k5mr12863853plt.189.1508259376975; Tue, 17 Oct 2017 09:56:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508259376; cv=none; d=google.com; s=arc-20160816; b=Wl0LjlbmjCuskoNj9k1ZjtAXRBo1JhYpFC4sOhhfBeVwJMiXge+Z+ncECYQ4KjopFa NNado0u9BhE9yXSoHE5SgY6kMFpisuI9lqyjjr2ud2lliZdFIEoqn1by2bfnmuJ9Gp8e qtsSopeOeHns2dJ3IJL+ix8WIbTXPv9xeIJZH8cDV7uQYZ65Z838t9ueqw/XN8sk7TpA kh5XQi7xr088SVBf8oRkLCAOPbdmx0J1gQWZJqtOT3v8/Q3i2IOviuCsbsaePynYQa+a 4YVWygs04EakuJ0NpxjH9RxRpU0ZNc4mYACbSGYrWOqJcbf+Xudr0jr0rmp12uLELcLN vR1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=2xKQmmVUCiS+r4q6hGwUPkSMByZrYmU6l+FXbeWobB8=; b=KKIAvhr/l3gfhv/SjcenhoH7zXcMFxO1X3oTpwec+Fi5wrl7aNbsQG00xpzsSJkire 1z/sWXmB6a3BH7pPjl+dtOgE57G/NsW1mYxDBfbXWT6UbGHCSpPHQdrf/QgkqqePdg0z n2UCu5S/yf+pB+odAST0vFpanHtZBCzz6AP5m1mkIsTFsZCEwN/m27CMDOpqJwdvDyY0 32q0+UZLfwQFnyC02OqwxyUAZOB+RObhLN2Q65KY/sayXHLfnKG1HhjV2qvXJPERR6d8 7kuc9cOfmHKad5nGp93Zin/Me+joK9SMddXjGcd52EZnGUd9Em8M1cZGlzG6kyiP8yZi A2fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jVbu3tjz; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i72si6128715pfe.165.2017.10.17.09.56.16; Tue, 17 Oct 2017 09:56:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=jVbu3tjz; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934144AbdJQQ4Q (ORCPT + 6 others); Tue, 17 Oct 2017 12:56:16 -0400 Received: from mail-wr0-f176.google.com ([209.85.128.176]:51034 "EHLO mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934082AbdJQQ4O (ORCPT ); Tue, 17 Oct 2017 12:56:14 -0400 Received: by mail-wr0-f176.google.com with SMTP id q42so2396834wrb.7 for ; Tue, 17 Oct 2017 09:56:14 -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:in-reply-to:references; bh=ELJn5DzE13okxuglSbAYOrhTrvqUaU3kopJf5Xe1EMU=; b=jVbu3tjz418ouC8s9DONeu7fEY7CkKcFgja0qKVrurq3thFmA9TJJjHLXTuKHJWdfJ G1SFNbGnOf3wuQFqmrtnMh3Ff8dUdJRQ0DHjktRAZjZkKDBENyh4oR3iyDA/hxl1Jjlu R4LXX+XcKLLbmLTP+mC6issFoNJaFWCvDG/DU= 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:in-reply-to :references; bh=ELJn5DzE13okxuglSbAYOrhTrvqUaU3kopJf5Xe1EMU=; b=jpuiPJ3Sg+lJoIBNZB414junMFXVa8JCM6U4KyS1F9Cn50wrNPC48MuUlc9HKCHgZY vLGGVMIqOTHYpJ3Pa0e7cHQpD0+yhPOFWLK578GZ08jgYdYoBIDd6xm4iCuTpl4SxBhn BuwAP5ryFXYjZ/wlWliyCY62c8ynMtLzYroOa+yZjoiUqC9zgXzkO7KIBezXTrI34VtP KWyJ4KKo599Ylto3/FKSR2X+w90VaimriCFD8+Szvloe7VPHX5cLaJd7bECkIuAlail6 33IGdsTJOKdyjpQuwHgbhi3nCIzaVI/ShadY41i4EzYY2Ngr7ksZ63u4WBiktcMPugEa k0DQ== X-Gm-Message-State: AMCzsaUjCAET9fwXRbvKwxqhdU/Q8HWB4ErTV3pphF28JtPSqEj+VEal VKcTYM6VDz+c9Ac1Au+O2358Tg== X-Google-Smtp-Source: ABhQp+Tjrm9uIpjpMl/KTNa+UvDWWodZAzuJHmMVnA7miX1r8z8sX1pnn27n1/U4NU8D1GWdA3XnPw== X-Received: by 10.223.179.1 with SMTP id j1mr4458251wrd.105.1508259373403; Tue, 17 Oct 2017 09:56:13 -0700 (PDT) Received: from localhost.localdomain ([154.144.50.139]) by smtp.gmail.com with ESMTPSA id y84sm5854517wmg.43.2017.10.17.09.56.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 09:56:12 -0700 (PDT) From: Ard Biesheuvel To: marc.zyngier@arm.com, robin.murphy@arm.com Cc: linux-arm-kernel@lists.infradead.org, daniel.thompson@Linaro.org, leif.lindholm@linaro.org, graeme.gregory@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, devicetree@vger.kernel.org, robh+dt@kernel.org, Ard Biesheuvel Subject: [PATCH v5 3/3] drivers/irqchip: gicv3: add workaround for Synquacer pre-ITS Date: Tue, 17 Oct 2017 17:55:56 +0100 Message-Id: <20171017165556.30250-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017165556.30250-1-ard.biesheuvel@linaro.org> References: <20171017165556.30250-1-ard.biesheuvel@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 | 72 +++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt index 4c29cdab0ea5..c3e6092f3add 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: (u32, u32) tuple describing the untranslated + 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 0df64a6a56d4..c4361dff2b74 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -539,6 +539,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 c34f21c7a38e..1172b8583db4 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -83,6 +83,8 @@ struct its_baser { u32 psz; }; +struct its_device; + /* * The ITS structure - contains most of the infrastructure, with the * top-level MSI domain, the command queue, the collections, and the @@ -97,11 +99,15 @@ struct its_node { struct its_cmd_block *cmd_write; struct its_baser tables[GITS_BASER_NR_REGS]; struct its_collection *collections; + struct fwnode_handle *fwnode_handle; + u64 (*get_msi_base)(struct its_device *its_dev); struct list_head its_device_list; u64 flags; u32 ite_size; u32 device_ids; int numa_node; + unsigned int msi_domain_flags; + u32 pre_its_base; /* for Socionext Synquacer */ bool is_v4; }; @@ -1095,6 +1101,13 @@ 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_device *its_dev) +{ + struct its_node *its = its_dev->its; + + 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); @@ -1102,7 +1115,7 @@ 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->get_msi_base(its_dev); msg->address_lo = lower_32_bits(addr); msg->address_hi = upper_32_bits(addr); @@ -2758,6 +2771,45 @@ static bool __maybe_unused its_enable_quirk_qdf2400_e0065(void *data) return true; } +static u64 its_irq_get_msi_base_pre_its(struct its_device *its_dev) +{ + struct its_node *its = its_dev->its; + + /* + * 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); +} + +static bool __maybe_unused its_enable_quirk_socionext_synquacer(void *data) +{ + struct its_node *its = data; + u32 pre_its_window[2]; + u32 ids; + + if (!fwnode_property_read_u32_array(its->fwnode_handle, + "socionext,synquacer-pre-its", + pre_its_window, + ARRAY_SIZE(pre_its_window))) { + + its->pre_its_base = pre_its_window[0]; + its->get_msi_base = its_irq_get_msi_base_pre_its; + + ids = ilog2(pre_its_window[1]) - 2; + if (its->device_ids > ids) + its->device_ids = ids; + + /* the pre-ITS breaks isolation, so disable MSI remapping */ + its->msi_domain_flags &= ~IRQ_DOMAIN_FLAG_MSI_REMAP; + return true; + } + return false; +} + static const struct gic_quirk its_quirks[] = { #ifdef CONFIG_CAVIUM_ERRATUM_22375 { @@ -2783,6 +2835,19 @@ static const struct gic_quirk its_quirks[] = { .init = its_enable_quirk_qdf2400_e0065, }, #endif +#ifdef CONFIG_SOCIONEXT_SYNQUACER_PREITS + { + /* + * The Socionext Synquacer SoC incorporates ARM's own GIC-500 + * implementation, but with a 'pre-ITS' added that requires + * special handling in software. + */ + .desc = "ITS: Socionext Synquacer pre-ITS", + .iidr = 0x0001143b, + .mask = 0xffffffff, + .init = its_enable_quirk_socionext_synquacer, + }, +#endif { } }; @@ -2811,7 +2876,7 @@ 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; + inner_domain->flags |= its->msi_domain_flags; info->ops = &its_msi_domain_ops; info->data = its; inner_domain->host_data = info; @@ -2965,6 +3030,9 @@ static int __init its_probe_one(struct resource *res, goto out_free_its; } its->cmd_write = its->cmd_base; + its->fwnode_handle = handle; + its->get_msi_base = its_irq_get_msi_base; + its->msi_domain_flags = IRQ_DOMAIN_FLAG_MSI_REMAP; its_enable_quirks(its);