From patchwork Fri Nov 4 11:07:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Peibao X-Patchwork-Id: 15477 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp332017wru; Fri, 4 Nov 2022 04:20:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5jiuPX4Ov+nYE2ruH4lkaulaYw/PZbWyyL0nXu2B6cWaXUehmq5HfBTrh7JDhJi18LNfvJ X-Received: by 2002:a17:90a:df91:b0:213:8a69:c504 with SMTP id p17-20020a17090adf9100b002138a69c504mr42058740pjv.82.1667560812865; Fri, 04 Nov 2022 04:20:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667560812; cv=none; d=google.com; s=arc-20160816; b=mts56oimuwQhnKjYt0x+VQwNqNw7z2908LZCD03W71uX41Uj2NASFoqHokXL9kqngc 2ajrnHSIBeKVrTkPkCRMSMJrvMN84vlBNdPDYWc12Po3epxG1ppcFwssAU/8aqfLQv/E BIym4Z0dJt4+vnbA/5lw8GglbSvwKKfJiV88WqUXzKt4N/KdUkF1ahQkyZefAlU0/Wuu E9EcGu8ReadlOfi96qIFRXvg+5TOj/zKc2dSfISYtxcsbcaZoVRr+A/yCGuTSt/X+Ctu k0N6q/gjnS2hlU8V4IFPjUfyrGWApr6V389lQ94zgWI2SkV2mwdq0Yz1JARrAmfTrYLP /sLw== 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 :message-id:date:subject:cc:to:from; bh=XJimp3AfLi4YZxs8faGE/nZ2hl/zHAeruzpHBYuYBF4=; b=dbZONsjIfAhUgGdAycf+TmM/7viZOaxQum4F7V/Ev29hfeCiVefONKfVHmBrwJJ3Ry cfuIeveYo1gAdPu1c/dwQYToa2nNtqtLiTBBMrcwDyDl3XxQojaYwMdS1IP46fYS67XI j7rJoR8L1m3grzoPS0boXZTcI+J1Yku3K1CJ1oajx2dMKcD/tejeyutCa6+xTJ9qZjGW 47du4NbZUNgtUl62pkVY5qORp4VxrsrVYB8AHpML9gILDFPrGxAUYUpUyGalCPIauiBC r4HdklGa+IA6qTBfOz3CrDvwLOu4eIZd26BsQscGpy5KZUcpu6c0stu9ypgterWwxxBB uwdQ== 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 n16-20020a170903111000b0017684491caasi4731944plh.594.2022.11.04.04.19.56; Fri, 04 Nov 2022 04:20:12 -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 S230342AbiKDLHg (ORCPT + 99 others); Fri, 4 Nov 2022 07:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231436AbiKDLHb (ORCPT ); Fri, 4 Nov 2022 07:07:31 -0400 Received: from loongson.cn (mail.loongson.cn [114.242.206.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id DE9E42AC1; Fri, 4 Nov 2022 04:07:20 -0700 (PDT) Received: from loongson.cn (unknown [10.20.42.77]) by gateway (Coremail) with SMTP id _____8Dx_Nhn8mRjT34EAA--.15186S3; Fri, 04 Nov 2022 19:07:19 +0800 (CST) Received: from loongson-PC.loongson.cn (unknown [10.20.42.77]) by localhost.localdomain (Coremail) with SMTP id AQAAf8CxXuBg8mRjNGoNAA--.37444S2; Fri, 04 Nov 2022 19:07:19 +0800 (CST) From: Liu Peibao To: Huacai Chen , Jiaxun Yang , Thomas Gleixner , Marc Zyngier , Jianmin Lv , Sergei Shtylyov Cc: Yinbo Zhu , Liu Peibao , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2] irqchip: loongson-liointc: fix improper error handling in liointc_init() Date: Fri, 4 Nov 2022 19:07:12 +0800 Message-Id: <20221104110712.23300-1-liupeibao@loongson.cn> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CM-TRANSID: AQAAf8CxXuBg8mRjNGoNAA--.37444S2 X-CM-SenderInfo: xolx1vpled0qxorr0wxvrqhubq/1tbiAQAACmNjr2Mb4AABs9 X-Coremail-Antispam: 1Uk129KBjvdXoWrtF4DtFW7Gw4fJFW3CF47XFb_yoWkAFX_CF Z2qws3JF92vr1kJw1kAr4Yvry2vry8W3Wj9FW8XF1fA3yUtw1YkrZ7A343CF40gF40vrn3 ZrZ5uryxur1xCjkaLaAFLSUrUUUUbb8apTn2vfkv8UJUUUU8wcxFpf9Il3svdxBIdaVrn0 xqx4xG64xvF2IEw4CE5I8CrVC2j2Jv73VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUY 17kC6x804xWl14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3w AFIxvE14AKwVWUXVWUAwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK 6xIIjxv20xvE14v26r4j6ryUM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7 xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_Cr1j6rxdM2AI xVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx1l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVW8JVWxJwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU GVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r 4UJbIYCTnIWIevJa73UjIFyTuYvjxUcCD7UUUUU X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS, SPF_PASS autolearn=ham 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?1748552093575068293?= X-GMAIL-MSGID: =?utf-8?q?1748564246889110356?= For cores less than 4, eg, loongson2k1000 with 2 cores, the of_property_match_string() may return with an error value, which causes that liointc could not work. At least isr0 is what should be checked like previous commit b2c4c3969fd7 ("irqchip/loongson-liointc: irqchip add 2.0 version") did. Fixes: 0858ed035a85 ("irqchip/loongson-liointc: Add ACPI init support") Signed-off-by: Liu Peibao --- V1 -> V2: update commit log. drivers/irqchip/irq-loongson-liointc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-loongson-liointc.c b/drivers/irqchip/irq-loongson-liointc.c index 0da8716f8f24..c4584e2f0ad3 100644 --- a/drivers/irqchip/irq-loongson-liointc.c +++ b/drivers/irqchip/irq-loongson-liointc.c @@ -207,10 +207,13 @@ static int liointc_init(phys_addr_t addr, unsigned long size, int revision, "reg-names", core_reg_names[i]); if (index < 0) - goto out_iounmap; + continue; priv->core_isr[i] = of_iomap(node, index); } + + if (!priv->core_isr[0]) + goto out_iounmap; } /* Setup IRQ domain */