From nobody Thu Apr 9 09:49:55 2026 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [160.30.148.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7F5D52E285C for ; Tue, 10 Mar 2026 06:16:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=160.30.148.35 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773123369; cv=none; b=Wy8Pyd79GQigezwJhd6JN4sbtPlGpfE31B5mhQTLgiCwLvcj12W2lo8CtfxcYIhMi29sBQngBeyOhNHKGMGyu/Ge13MjdbS0BFWi1imbIp9kPCZ8Qa3eT/I//UAFr8bjJqoq0aJGm9MfazuvPHYgJ78OTvALELNgGT5utwLS+68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773123369; c=relaxed/simple; bh=u3NH18NEX3jdc1+7mlWdWEzuJ4OxQqsvW2IrUFw9kN4=; h=Message-ID:In-Reply-To:References:Date:Mime-Version:From:To:Cc: Subject:Content-Type; b=ZdC1YnufjyM48ygPHB2F+jL75FEdOGmA35uEBw52Y0RxEnF0XaTSywydhUOudFr8PGAk7I6QVrFYvTbK+yzlJqoqfkEbR5i3VXlvMox/lz1WPLHGtcbVbtYv37kPrGeWr5haB3izXwMDwHC4Fr6VzvKSD8fhKLz9DQkytdg6hZQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn; spf=pass smtp.mailfrom=zte.com.cn; arc=none smtp.client-ip=160.30.148.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=zte.com.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zte.com.cn Received: from mse-fl1.zte.com.cn (unknown [10.5.228.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4fVNtF5kPpz8Xs6y; Tue, 10 Mar 2026 14:16:05 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.99.176]) by mse-fl1.zte.com.cn with SMTP id 62A6FwKW065083; Tue, 10 Mar 2026 14:15:58 +0800 (+08) (envelope-from liu.xuemei1@zte.com.cn) Received: from mapi (xaxapp05[null]) by mapi (Zmail) with MAPI id mid32; Tue, 10 Mar 2026 14:16:00 +0800 (CST) X-Zmail-TransId: 2afc69afb7207e7-b4382 X-Mailer: Zmail v1.0 Message-ID: <20260310141600411Fu8H8-GXOOgKISU48Tjgx@zte.com.cn> In-Reply-To: <20260310141349432DBRJJclgnBHYWu8it0geX@zte.com.cn> References: 20260310141349432DBRJJclgnBHYWu8it0geX@zte.com.cn Date: Tue, 10 Mar 2026 14:16:00 +0800 (CST) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 From: To: , , , , , , , , , , Cc: , , Subject: =?UTF-8?B?W1BBVENIIHYyIDEvMl0gaXJxY2hpcC9yaXNjdi1hcGxpYzogRG8gbm90IGNsZWFyIEFDUEkgZGVwZW5kZW5jaWVzIG9uIHByb2JlIGZhaWx1cmU=?= X-MAIL: mse-fl1.zte.com.cn 62A6FwKW065083 X-TLS: YES X-SPF-DOMAIN: zte.com.cn X-ENVELOPE-SENDER: liu.xuemei1@zte.com.cn X-SPF: None X-SOURCE-IP: 10.5.228.132 unknown Tue, 10 Mar 2026 14:16:05 +0800 X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 69AFB725.000/4fVNtF5kPpz8Xs6y Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jessica Liu The aplic_probe() function calls acpi_dev_clear_dependencies() unconditionally at the end, even when the preceding setup (MSI or direct mode) has failed. This is incorrect because if the device failed to probe, it should not be considered as active and should not clear dependencies for other devices waiting on it. Fix this by returning immediately when the setup fails, skipping the ACPI dependency cleanup. Also, explicitly return 0 on success instead of relying on the value of 'rc' to make the success path clear. Fixes: 5122e380c23b ("irqchip/riscv-aplic: Add ACPI support") Signed-off-by: Jessica Liu --- drivers/irqchip/irq-riscv-aplic-main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/irqchip/irq-riscv-aplic-main.c b/drivers/irqchip/irq-r= iscv-aplic-main.c index 4495ca26abf5..8775f188ea4f 100644 --- a/drivers/irqchip/irq-riscv-aplic-main.c +++ b/drivers/irqchip/irq-riscv-aplic-main.c @@ -372,18 +372,21 @@ static int aplic_probe(struct platform_device *pdev) rc =3D aplic_msi_setup(dev, regs); else rc =3D aplic_direct_setup(dev, regs); - if (rc) + + if (rc) { dev_err_probe(dev, rc, "failed to setup APLIC in %s mode\n", msi_mode ? "MSI" : "direct"); - else - register_syscore(&aplic_syscore); + return rc; + } + + register_syscore(&aplic_syscore); #ifdef CONFIG_ACPI if (!acpi_disabled) acpi_dev_clear_dependencies(ACPI_COMPANION(dev)); #endif - return rc; + return 0; } static const struct of_device_id aplic_match[] =3D { --=20 2.27.0