From patchwork Fri Mar 24 06:08:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5ZCV5bu65rCR?= X-Patchwork-Id: 74361 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp405547vqo; Thu, 23 Mar 2023 23:13:36 -0700 (PDT) X-Google-Smtp-Source: AKy350aze3/xr9vflQ80i2Y7OmAqbBu8STgGYXYvNMDOCrExt7F2QGXVaBlzKrs1XZ5Kx6sgjhVV X-Received: by 2002:a17:906:1947:b0:929:37c3:1021 with SMTP id b7-20020a170906194700b0092937c31021mr1515306eje.48.1679638416439; Thu, 23 Mar 2023 23:13:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679638416; cv=none; d=google.com; s=arc-20160816; b=ejZmP0VRRTx2AZ+YfJ5eD16iqd80Z8ISD2OfWLOkPpdYKOmZUymIACU/61q0szsW5O cOMEJVa+BQu0YYN3J/BF/NXQDQnlzII0YugNsGYn6KbeKaMmpW498X7+udu7QQ1Gue49 aP+rN5BU1Aj15of253Oucrqqq35GCT9FtLF8Kb5QNLFkOVTcd3dKEilj22cWXxJCY0wU fM8dr9oGgbe7WXo6y1Y6ei19RPdex7eYowjrsnsO5rn/kNfVA8ZLSUHuq/I0mWBdrfeY 5YGE+Dw1ENaM6V9mo/omSSsrVFkhRwKd66Ou/iPOTAUaB7U+3z5VG/10Zy3ZB+THHdze 9ysQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=sl1CeKWcWI/De2qaW8A1Nqts8grLQ4ppUHNGMWTQh7Q=; b=aSgq2ettbeYtFGAYE0GLLbSkS8BJEp+E1KhRfsklOFheKsmyEWK/vqI3nkVfS1nfR9 RKmzfZQdHkugXJLL20lOzQPaP+gLQj4+PeJ2c2EHNXhVLxZ3g7kx2fdqxRmHNf55sRMY DqcSe2Nz7HirQXjy+cCFcy5lApWyLQ2EBq+neYqaS9iRciOuMunXZ7Ze1BfC9JdbX82s KP2kXbeKqHCMZDdONk3exehr81aRLAUI/9lwyqjgPoX17oBqdagHH+Ya/XQRir4hu/oY WNaWvOxlxWtRH2xyAMPFhBXN3jjjLAIxQJO6B28Ur5OtK9yGO+ATm8xYsIh6PIalHXEq Z1lg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dy21-20020a05640231f500b00501da1db818si9999648edb.408.2023.03.23.23.13.13; Thu, 23 Mar 2023 23:13:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231669AbjCXGJN (ORCPT + 99 others); Fri, 24 Mar 2023 02:09:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231298AbjCXGJC (ORCPT ); Fri, 24 Mar 2023 02:09:02 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 065EB1A947 for ; Thu, 23 Mar 2023 23:09:00 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.153]) by gateway (Coremail) with SMTP id _____8Dx_5d7Ph1kU5wQAA--.25518S3; Fri, 24 Mar 2023 14:08:59 +0800 (CST) Received: from loongson-pc.loongson.cn (unknown [10.20.42.153]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Axmr12Ph1kY_QKAA--.2874S6; Fri, 24 Mar 2023 14:08:59 +0800 (CST) From: Jianmin Lv To: Thomas Gleixner , Marc Zyngier Cc: linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, Lorenzo Pieralisi , Jiaxun Yang , Huacai Chen , loongson-kernel@lists.loongnix.cn Subject: [PATCH V1 4/5] irqchip/loongson-eiointc: Fix registration of syscore_ops Date: Fri, 24 Mar 2023 14:08:53 +0800 Message-Id: <20230324060854.29375-5-lvjianmin@loongson.cn> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230324060854.29375-1-lvjianmin@loongson.cn> References: <20230324060854.29375-1-lvjianmin@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Axmr12Ph1kY_QKAA--.2874S6 X-CM-SenderInfo: 5oymxthqpl0qxorr0wxvrqhubq/ X-Coremail-Antispam: 1Uk129KBjvJXoW7ZFW7XFyrJF1kWrWfKF4rXwb_yoW8Xw4Dpa yrCa4kKr4rGa4UCr9aqFyDZFy5Awn5XrW7ArWrXayavF98Gw15Cr1FyFn09FWqkwsrGF1j 9F40qr4Uua15AwUanT9S1TB71UUUUjDqnTZGkaVYY2UrUUUUj1kv1TuYvTs0mT0YCTnIWj qI5I8CrVACY4xI64kE6c02F40Ex7xfYxn0WfASr-VFAUDa7-sFnT9fnUUIcSsGvfJTRUUU bSxYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20EY4v20xvaj40_Wr0E3s 1l1IIY67AEw4v_Jrv_JF1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xv wVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwA2z4 x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4UJVWxJr1l n4kS14v26r126r1DM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6x ACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26rWY6Fy7McIj6I8E 87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxV Aaw2AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1l4IxY O2xFxVAFwI0_JF0_Jw1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGV WUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_ Xr0_Ar1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rV WUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4U JbIYCTnIWIevJa73UjIFyTuYvjxUVWrXDUUUU X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761228532472780713?= X-GMAIL-MSGID: =?utf-8?q?1761228532472780713?= When support suspend/resume for loongson-eiointc, the syscore_ops is registered twice in dual-bridges machines where there are two eiointc IRQ domains. Repeated registration of an same syscore_ops broke syscore_ops_list. Also, cpuhp_setup_state_nocalls is only needed to call for once. So the patch will corret them. Change-Id: I7a9060fa109baab5e9b155baa51f12e46633d304 Fixes: a90335c2dfb4 ("irqchip/loongson-eiointc: Add suspend/resume support") Signed-off-by: Jianmin Lv --- drivers/irqchip/irq-loongson-eiointc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-loongson-eiointc.c index b165c27a3609..e7e1201e61f2 100644 --- a/drivers/irqchip/irq-loongson-eiointc.c +++ b/drivers/irqchip/irq-loongson-eiointc.c @@ -419,10 +419,12 @@ int __init eiointc_acpi_init(struct irq_domain *parent, parent_irq = irq_create_mapping(parent, acpi_eiointc->cascade); irq_set_chained_handler_and_data(parent_irq, eiointc_irq_dispatch, priv); - register_syscore_ops(&eiointc_syscore_ops); - cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_LOONGARCH_STARTING, + if (nr_pics == 1) { + register_syscore_ops(&eiointc_syscore_ops); + cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_LOONGARCH_STARTING, "irqchip/loongarch/intc:starting", eiointc_router_init, NULL); + } if (cpu_has_flatmode) node = cpu_to_node(node * CORES_PER_EIO_NODE);