From patchwork Tue Sep 15 13:39:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11776651 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24B516CA for ; Tue, 15 Sep 2020 13:40:39 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9108206BE for ; Tue, 15 Sep 2020 13:40:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NnVZExMs"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="h392Twh8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D9108206BE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=spr3rU+wOTcOQwEr1aqVN0zlHvaSOxK5hOY7QfSpq/o=; b=NnVZExMsYsHlreN71TKLc2AE7 6miMgqqF5Pb9Mlb+nN519ouAyGT9aEWaJwvJ5fGKdUuQ+iK29k7OgbdntSt4MsqL18qWG5K/wcHIT wJJ2enS9Id5wzIAr2NuSrIhgDxoyEW7B1OWPb8s0Y/OZDKKULJmJl+RmZv8aD3zGI/U0YEnJ9QL6d 9+ij3YXg+6+NqfWZOMaD2gC1QGkxp/dcVYL9Csw5BYtYN8P3+NkdeugG/Wu6e5Ny/YJ1y2qq8jQLP NoQBtgxU1gBviOjZRXG7xB3d7urxxlBFw+yHijVTbKnd4vIU6TKSwKxAdLuoQmDynspxynB9zddQJ UIXX6Tr8w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIBC5-0005bl-0Z; Tue, 15 Sep 2020 13:40:25 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIBC0-0005aB-2K for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 13:40:20 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4AF89222BB; Tue, 15 Sep 2020 13:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600177219; bh=l8ZBD9TP9Sqrk5ArhBI3j0uMGU4B0/WAtLJBpy0K5AQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h392Twh8mN+iLk5hsBobvuCoLRd0NI8Ey+NSUrzDdZSZNRkher+E4C0p+8CVGJ84w 4ZJdU3RogXRuh+K25pqtKEsXm/tiyENqkhsUS9CapAXnLlT0njh+d65A58ARvdL0vH kJky/6XdiHIppruX6n9XgogOElJBazJvPEWGujaw= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kIBBx-00C1TP-QQ; Tue, 15 Sep 2020 14:40:17 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] irqchip/gic: Handle non-standard SGI deactivation on Samsung's Franken-GIC Date: Tue, 15 Sep 2020 14:39:43 +0100 Message-Id: <20200915133944.1285456-2-maz@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915133944.1285456-1-maz@kernel.org> References: <20200915133944.1285456-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, jason@lakedaemon.net, m.szyprowski@samsung.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_094020_246365_EADADB91 X-CRM114-Status: GOOD ( 19.54 ) X-Spam-Score: -8.2 (--------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-8.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -3.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Gleixner , kernel-team@android.com, Jason Cooper , Marek Szyprowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The GIC available on some of Samsung's A9-based platform is thankfully one of a kind. On top of not presenting a banked programing model (each CPU has its own base addresses for both distributor and CPU interface), it also encodes the source CPU for SGIs in the INTID read from IAR, and requires this exact value to be written back to EOI. Without this, interrupts are never deactivated, and the kernel grinds to a halt. Work around it by stashing the INTID for in-flight SGIs, and using that value on EOI. This only works because we don't nest SGIs. Reported-by: Marek Szyprowski Fixes: ac063232d4b0 ("irqchip/gic: Configure SGIs as standard interrupts") Signed-off-by: Marc Zyngier Tested-by: Marek Szyprowski --- drivers/irqchip/irq-gic.c | 49 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 4be2b62f816f..84a2d2a1aab7 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -150,10 +150,37 @@ static inline void gic_set_base_accessor(struct gic_chip_data *data, { data->get_base = f; } + +static DEFINE_STATIC_KEY_FALSE(frankengic_key); +static DEFINE_PER_CPU(u32, sgi_intid); + +static void enable_frankengic(void) +{ + static_branch_enable(&frankengic_key); +} + +static inline bool is_frankengic(void) +{ + return static_branch_unlikely(&frankengic_key); +} + +static inline void set_sgi_intid(u32 intid) +{ + this_cpu_write(sgi_intid, intid); +} + +static inline u32 get_sgi_intid(void) +{ + return this_cpu_read(sgi_intid); +} #else #define gic_data_dist_base(d) ((d)->dist_base.common_base) #define gic_data_cpu_base(d) ((d)->cpu_base.common_base) #define gic_set_base_accessor(d, f) +#define enable_frankengic() do { } while(0) +#define is_frankengic() false +#define set_sgi_intid(i) do { } while(0) +#define get_sgi_intid() 0 #endif static inline void __iomem *gic_dist_base(struct irq_data *d) @@ -226,7 +253,12 @@ static void gic_unmask_irq(struct irq_data *d) static void gic_eoi_irq(struct irq_data *d) { - writel_relaxed(gic_irq(d), gic_cpu_base(d) + GIC_CPU_EOI); + u32 hwirq = gic_irq(d); + + if (is_frankengic() && hwirq < 16) + hwirq = get_sgi_intid(); + + writel_relaxed(hwirq, gic_cpu_base(d) + GIC_CPU_EOI); } static void gic_eoimode1_eoi_irq(struct irq_data *d) @@ -348,8 +380,20 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) * * Pairs with the write barrier in gic_ipi_send_mask */ - if (irqnr <= 15) + if (irqnr <= 15) { smp_rmb(); + + /* + * Samsung's funky GIC encodes the source CPU in + * GICC_IAR, leading to the deactivation to fail if + * not written back as is to GICC_EOI. Stash the + * INTID away for gic_eoi_irq() to write back. + * This only works because we don't nest SGIs... + */ + if (is_frankengic()) + set_sgi_intid(irqstat); + } + handle_domain_irq(gic->domain, irqnr, regs); } while (1); } @@ -1142,6 +1186,7 @@ static int gic_init_bases(struct gic_chip_data *gic, gic->raw_cpu_base + offset; } + enable_frankengic(); gic_set_base_accessor(gic, gic_get_percpu_base); } else { /* Normal, sane GIC... */ From patchwork Tue Sep 15 13:39:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11776661 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F01716CA for ; Tue, 15 Sep 2020 13:42:03 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B84EF20936 for ; Tue, 15 Sep 2020 13:42:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="M7eZHbeW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="P1MnlP2h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B84EF20936 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: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:List-Owner; bh=BSSSJAIVAOI5jq6k/IMOODKd33LnMpQkwO6rzXYPNXw=; b=M7eZHbeWmSDIFPjfojn9hRqrQ NeDNSbCIrgBCoXWfvYl6aecOMIiFQ3GCHxDxnHusqi+lxtNzN46KWPejsfrkCXxO6aSnJ63a73wEe 2CLV5BqMM9Rw0y87IT11ULUfDtuYzMMbd0dsVfFVhFGSRVdDOTV51zaW8n2DVSaa9QNGb3ae0qAUx 6+roDvTXzoSYl5fdXM8X3pzRrgVXYIPJhCM0LVvjyTIe+xTZBnvfdhoZCokQKpFFl/cXW3Zd5zrnD At34iRAnW0wymrPWHvXvy3sTix1POuNedUJ55VGf2cyWNiDd9E37rLpPs1qfb3QUHOX3jhUBrzxA9 4CxF4MLEg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIBC7-0005c9-DZ; Tue, 15 Sep 2020 13:40:28 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kIBC0-0005aO-IH for linux-arm-kernel@lists.infradead.org; Tue, 15 Sep 2020 13:40:21 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7D51222C2; Tue, 15 Sep 2020 13:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600177220; bh=i1RznCTmfw0gls/KJHH1mjWlrZkmsd0/IrQtSoEcbYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P1MnlP2htQKZmZslq7kalm+V63+aO5Njm3ZCM+0mpTohZ+l+BTSCKKk6yvhOQUjf9 Y5JZi2nkTQ1p1EFbBU+yAYjV+UZSP5P2/2KIUBV8+9nu4Vth4dtvHcgNxc1wl1udYb sdRnTJv6+FQ+03ErnOUYi0ezX94xA4uBa0tgYR+k= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kIBBy-00C1TP-A2; Tue, 15 Sep 2020 14:40:18 +0100 From: Marc Zyngier To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] irqchip/gic: Cleanup Franken-GIC handling Date: Tue, 15 Sep 2020 14:39:44 +0100 Message-Id: <20200915133944.1285456-3-maz@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915133944.1285456-1-maz@kernel.org> References: <20200915133944.1285456-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, jason@lakedaemon.net, m.szyprowski@samsung.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200915_094020_726170_FD380526 X-CRM114-Status: GOOD ( 19.42 ) X-Spam-Score: -8.2 (--------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-8.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -3.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Gleixner , kernel-team@android.com, Jason Cooper , Marek Szyprowski Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Now that we have a static key identifying Samsung's unique creation, let's replace the indirect call to compute the base addresses by a simple test on the static key. Faster, cheaper, negative diffstat. Signed-off-by: Marc Zyngier Tested-by: Marek Szyprowski --- drivers/irqchip/irq-gic.c | 48 +++++++++------------------------------ 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 84a2d2a1aab7..98743afdaea6 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -83,9 +83,6 @@ struct gic_chip_data { #endif struct irq_domain *domain; unsigned int gic_irqs; -#ifdef CONFIG_GIC_NON_BANKED - void __iomem *(*get_base)(union gic_base *); -#endif }; #ifdef CONFIG_BL_SWITCHER @@ -125,32 +122,6 @@ static struct gic_chip_data gic_data[CONFIG_ARM_GIC_MAX_NR] __read_mostly; static struct gic_kvm_info gic_v2_kvm_info; #ifdef CONFIG_GIC_NON_BANKED -static void __iomem *gic_get_percpu_base(union gic_base *base) -{ - return raw_cpu_read(*base->percpu_base); -} - -static void __iomem *gic_get_common_base(union gic_base *base) -{ - return base->common_base; -} - -static inline void __iomem *gic_data_dist_base(struct gic_chip_data *data) -{ - return data->get_base(&data->dist_base); -} - -static inline void __iomem *gic_data_cpu_base(struct gic_chip_data *data) -{ - return data->get_base(&data->cpu_base); -} - -static inline void gic_set_base_accessor(struct gic_chip_data *data, - void __iomem *(*f)(union gic_base *)) -{ - data->get_base = f; -} - static DEFINE_STATIC_KEY_FALSE(frankengic_key); static DEFINE_PER_CPU(u32, sgi_intid); @@ -173,10 +144,20 @@ static inline u32 get_sgi_intid(void) { return this_cpu_read(sgi_intid); } + +static inline void __iomem *__get_base(union gic_base *base) +{ + if (is_frankengic()) + return raw_cpu_read(*base->percpu_base); + + return base->common_base; +} + +#define gic_data_dist_base(d) __get_base(&(d)->dist_base) +#define gic_data_cpu_base(d) __get_base(&(d)->cpu_base) #else #define gic_data_dist_base(d) ((d)->dist_base.common_base) #define gic_data_cpu_base(d) ((d)->cpu_base.common_base) -#define gic_set_base_accessor(d, f) #define enable_frankengic() do { } while(0) #define is_frankengic() false #define set_sgi_intid(i) do { } while(0) @@ -741,11 +722,6 @@ static int gic_notifier(struct notifier_block *self, unsigned long cmd, void *v) int i; for (i = 0; i < CONFIG_ARM_GIC_MAX_NR; i++) { -#ifdef CONFIG_GIC_NON_BANKED - /* Skip over unused GICs */ - if (!gic_data[i].get_base) - continue; -#endif switch (cmd) { case CPU_PM_ENTER: gic_cpu_save(&gic_data[i]); @@ -1187,7 +1163,6 @@ static int gic_init_bases(struct gic_chip_data *gic, } enable_frankengic(); - gic_set_base_accessor(gic, gic_get_percpu_base); } else { /* Normal, sane GIC... */ WARN(gic->percpu_offset, @@ -1195,7 +1170,6 @@ static int gic_init_bases(struct gic_chip_data *gic, gic->percpu_offset); gic->dist_base.common_base = gic->raw_dist_base; gic->cpu_base.common_base = gic->raw_cpu_base; - gic_set_base_accessor(gic, gic_get_common_base); } /*