From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEAE5C77B6C for ; Sat, 8 Apr 2023 10:47:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbjDHKrM (ORCPT ); Sat, 8 Apr 2023 06:47:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229901AbjDHKrE (ORCPT ); Sat, 8 Apr 2023 06:47:04 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 706631026B; Sat, 8 Apr 2023 03:46:24 -0700 (PDT) Date: Sat, 08 Apr 2023 10:45:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1680950715; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g8toMptRbl0YAh2qmk/dW1vdH5vnrI9650hQda4a4V0=; b=EdsN/SaK7hU6KX168e0EcRRM1WW+ohT04xMfh/7srQUjAvBCv2cs5k77OFRt521faexs/O QYC6IlXDcUpkSgy4MnSmmLDLusKPeFq7PsY5F2v62IEi2bQNWlDUhcrhAnhl+Q4vYDr3aq ZAIm2MKCDgRWt201wyTUYTL8bMjihXnEYP0aZAK1Y/8/0QoCkDMIGAnIi1wpw7MO4nw7er ewn/Z4y3gsK4b6Sf3wxto0jTrLdP3wcdfwYrRTrpFHmEN3kiYbwnO3iK8b45Cg1iAXI/eO Wjyqjy+G+N2CU3S0133auBn2zgDfq1CymT7pNMav/UVpUjlgt/v0Bw33XbLF3w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1680950715; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g8toMptRbl0YAh2qmk/dW1vdH5vnrI9650hQda4a4V0=; b=08HVg8MSbBAaCDG65JqNC9/Wia+cKdgmvlSle8z5kS2MKUMMar3sEp116ptBQsSinR8Cpe ygESDen4CBT2ZaCg== From: "irqchip-bot for Jianmin Lv" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-kernel@vger.kernel.org Subject: [irqchip: irq/irqchip-next] irqchip/loongson-pch-pic: Fix registration of syscore_ops Cc: stable@vger.kernel.org, Jianmin Lv , Marc Zyngier , tglx@linutronix.de In-Reply-To: <20230407083453.6305-5-lvjianmin@loongson.cn> References: <20230407083453.6305-5-lvjianmin@loongson.cn> MIME-Version: 1.0 Message-ID: <168095071449.404.65013102195860563.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/irqchip-next branch of irqchip: Commit-ID: c84efbba46901b187994558ee0edb15f7076c9a7 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/c84efbba46901b187994558ee0edb15f7076c9a7 Author: Jianmin Lv AuthorDate: Fri, 07 Apr 2023 16:34:52 +08:00 Committer: Marc Zyngier CommitterDate: Sat, 08 Apr 2023 11:29:18 +01:00 irqchip/loongson-pch-pic: Fix registration of syscore_ops When support suspend/resume for loongson-pch-pic, the syscore_ops is registered twice in dual-bridges machines where there are two pch-pic IRQ domains. Repeated registration of an same syscore_ops broke syscore_ops_list, so the patch will corret it. Fixes: 1ed008a2c331 ("irqchip/loongson-pch-pic: Add suspend/resume support") Cc: stable@vger.kernel.org Signed-off-by: Jianmin Lv Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20230407083453.6305-5-lvjianmin@loongson.cn --- drivers/irqchip/irq-loongson-pch-pic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-loongson-pch-pic.c b/drivers/irqchip/irq-loongson-pch-pic.c index 437f1af..64fa67d 100644 --- a/drivers/irqchip/irq-loongson-pch-pic.c +++ b/drivers/irqchip/irq-loongson-pch-pic.c @@ -311,7 +311,8 @@ static int pch_pic_init(phys_addr_t addr, unsigned long size, int vec_base, pch_pic_handle[nr_pics] = domain_handle; pch_pic_priv[nr_pics++] = priv; - register_syscore_ops(&pch_pic_syscore_ops); + if (nr_pics == 1) + register_syscore_ops(&pch_pic_syscore_ops); return 0;