From patchwork Tue Sep 4 14:05:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 10587379 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BD36213AC for ; Tue, 4 Sep 2018 14:06:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A95D5298EF for ; Tue, 4 Sep 2018 14:06:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BCEC298F8; Tue, 4 Sep 2018 14:06:47 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35AC5298E4 for ; Tue, 4 Sep 2018 14:06:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727075AbeIDScB (ORCPT ); Tue, 4 Sep 2018 14:32:01 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:45796 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727009AbeIDScB (ORCPT ); Tue, 4 Sep 2018 14:32:01 -0400 Received: by mail-wr1-f65.google.com with SMTP id 20-v6so4077840wrb.12 for ; Tue, 04 Sep 2018 07:06:45 -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=k44p/2t3M6djuNOIuMNp7Z1rfFkVTVVlv9PQFvFUfSw=; b=S/qTy49PvBajAe00G0AWIcSF3D0JXhao2ExRjVDKBcJb/XLQTwvLUqfFoMqwPJC4aJ Rkh7QKswfvo8burTY7p/xHSua1+Os3PYrfnf7/XYild3YYVVzMWmkNjcgSevGf7Shd7D hOzlYcoGTZlBbvl+AOBL6cMhuHmdWbdhteZMU= 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=k44p/2t3M6djuNOIuMNp7Z1rfFkVTVVlv9PQFvFUfSw=; b=HrSeNyeh5WMRHgb0tEZAOE5C3vk4yE2PIu1v2UxjKdVsCJHzyP2vscyi1K83tZQqBT E6x9PN37s+7gxreHgpd5FnC1Kl5dCjA+eRVUn7o2oik7hV5HgWyxBrmrPnmIlVp7dI6D QU3p34UrtzSqDzWpaC/9P35MIDaJUMa5Ilf4/M4rx3TIsqN1PMrjJro2ucG7kLVqJTVq E+JEIDh1TJhILBigdnhhyMBKhZj8ZnzM/3glFAwvoMqyy0Wo9F/3aeaYebCzs8XJPRV2 WvUX52DdpdCU3ok/aRKSzI2vcec32qguZocBe7nL71/gxeZQ2DzaE+WWElySatevOGYV olwA== X-Gm-Message-State: APzg51BsZIs/iss9sqYp8RzZ7Hpu5OE5Fo2SFd+klmyA0wJx235EbASu Z0NuJsCGMf/CMT9m/O48LAPtPw== X-Google-Smtp-Source: ANB0VdaprQc5H0V847MMSG5HObf05oM/x/bD5UluA3tfj6FrQzurE66RfIovjO7BX8N1BU3irpO6rw== X-Received: by 2002:adf:ffc7:: with SMTP id x7-v6mr1776002wrs.137.1536070004344; Tue, 04 Sep 2018 07:06:44 -0700 (PDT) Received: from localhost.localdomain (cpc90716-aztw32-2-0-cust92.18-1.cable.virginm.net. [86.26.100.93]) by smtp.gmail.com with ESMTPSA id h82-v6sm11471808wme.11.2018.09.04.07.06.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 07:06:43 -0700 (PDT) From: Srinivas Kandagatla To: marc.zyngier@arm.com Cc: sudeep.holla@arm.com, tglx@linutronix.de, jason@lakedaemon.net, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, rnayak@codeaurora.org, sboyd@kernel.org, bjorn.andersson@linaro.org, nicolas.dechesne@linaro.org, Srinivas Kandagatla Subject: [RFC PATCH v2] irqchip/gic-v3: Add quirk for msm8996 secured registers Date: Tue, 4 Sep 2018 15:05:38 +0100 Message-Id: <20180904140538.16602-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Access to GICR_WAKER is restricted on msm8996 SoC in Hypervisor. Its been more than 2 years of wait for this to be fixed, which has no hopes to be fixed. This change was introduced for the "lead device" on msm8996 platform. It looks like all publicly available msm8996 devices have this implementation. So add a quirk to not access this register on msm8996. With this quirk MSM8996 can at least boot out of mainline, which can help community to work with boards based on MSM8996. Without this patch Qualcomm DB820c board reboots when GICR_WAKER is accessed. Signed-off-by: Srinivas Kandagatla --- Hi Marc, There is no errata associated with this quirk, so I could not add any entries into Documentation/arm64/silicon-errata.txt Or add any number to the quirk description. Changes since v1: - renamed gic_v3 references to gic - added full mask for iidr register match thanks, srini drivers/irqchip/irq-gic-v3.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index d5912f1ec884..406d4a44c887 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -41,6 +41,8 @@ #include "irq-gic-common.h" +#define FLAGS_WORKAROUND_GICR_WAKER_MSM8996 (1ULL << 0) + struct redist_region { void __iomem *redist_base; phys_addr_t phys_base; @@ -55,6 +57,7 @@ struct gic_chip_data { struct irq_domain *domain; u64 redist_stride; u32 nr_redist_regions; + u64 flags; bool has_rss; unsigned int irq_nr; struct partition_desc *ppi_descs[16]; @@ -139,6 +142,9 @@ static void gic_enable_redist(bool enable) u32 count = 1000000; /* 1s! */ u32 val; + if (gic_data.flags & FLAGS_WORKAROUND_GICR_WAKER_MSM8996) + return; + rbase = gic_data_rdist_rd_base(); val = readl_relaxed(rbase + GICR_WAKER); @@ -1068,13 +1074,31 @@ static const struct irq_domain_ops partition_domain_ops = { .select = gic_irq_domain_select, }; +static bool __maybe_unused gic_enable_quirk_msm8996(void *data) +{ + struct gic_chip_data *d = data; + + d->flags |= FLAGS_WORKAROUND_GICR_WAKER_MSM8996; + + return true; +} + +static const struct gic_quirk gic_quirks[] = { + { + .desc = "GICv3: Qualcomm MSM8996 skip GICR_WAKER Read/Write", + .iidr = 0x00001070, /* MSM8996 */ + .mask = 0xffffffff, + .init = gic_enable_quirk_msm8996, + }, +}; + static int __init gic_init_bases(void __iomem *dist_base, struct redist_region *rdist_regs, u32 nr_redist_regions, u64 redist_stride, struct fwnode_handle *handle) { - u32 typer; + u32 typer, iidr; int gic_irqs; int err; @@ -1130,6 +1154,9 @@ static int __init gic_init_bases(void __iomem *dist_base, if (IS_ENABLED(CONFIG_ARM_GIC_V3_ITS) && gic_dist_supports_lpis()) its_init(handle, &gic_data.rdists, gic_data.domain); + iidr = readl_relaxed(dist_base + GICD_IIDR); + gic_enable_quirks(iidr, gic_quirks, &gic_data); + gic_smp_init(); gic_dist_init(); gic_cpu_init();