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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AC3A4C54E67 for ; Tue, 26 Mar 2024 22:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wqdLmMIHh6nkhDJDiM5IwIntct9W6F7bvGy28HW7jbY=; b=vksbDR/tkzaC7P RoQXXvVrZAOKriPhRiPDr4KFfPC/9EG/29ZRfJiVAjSvDcXmGLM5NDKzQeuZS+ENsNjLPMvVg8Fi4 pluYlFzGTEz4p3tP9GM/r1FkiTO2Gg93KxkjMfiP3LOzJpT5hlgnDnUswziR9GSto02qrEa2fdIe/ q/G2EO3zla3r5jN1xJq5svIWIY4ODL80omaaf2fHa6UfUAPFMrmmhzOzTRjkYBgWMMljZMq5m4L/m 9pCruZOg2hNKN9h/7FQ0BsdYqCXc9v04g27+5Uk77mPgwF5xrLkZ+P0fSf/sgMf610DYGQBY1uX47 N0K8rsWMQjUa2wHgNoGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpFQZ-00000006iJ5-3JoS; Tue, 26 Mar 2024 22:37:55 +0000 Received: from lelv0142.ext.ti.com ([198.47.23.249]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpFQH-00000006iBH-32Pr for linux-arm-kernel@lists.infradead.org; Tue, 26 Mar 2024 22:37:40 +0000 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 42QMbWDp092773; Tue, 26 Mar 2024 17:37:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1711492652; bh=RROmykh+GXi1qU7J3euldybQGKdRbR+HJWggHHB28yU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ClUU2fkcDKhV6stl1V3qCZgvZ+fsU/whnXAvmUfquPeXbV63a/JrDilk6G9DVVfpA mQ3mTPvUWZO0vD4qJ5hNsXaer46eBGXSdCOQyrV9ot3v+6CUEKq/Kyvi5EoelD73xu vNyCoG4vf8uE1e1LGSu04EFbnfYsyZZRBqWrG8J4= Received: from DLEE113.ent.ti.com (dlee113.ent.ti.com [157.170.170.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 42QMbWHw106463 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 26 Mar 2024 17:37:32 -0500 Received: from DLEE101.ent.ti.com (157.170.170.31) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Tue, 26 Mar 2024 17:37:32 -0500 Received: from fllvsmtp8.itg.ti.com (10.64.41.158) by DLEE101.ent.ti.com (157.170.170.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 26 Mar 2024 17:37:32 -0500 Received: from fllvsmtp8.itg.ti.com ([10.249.42.149]) by fllvsmtp8.itg.ti.com (8.15.2/8.15.2) with ESMTP id 42QMbVmZ109669; Tue, 26 Mar 2024 17:37:31 -0500 From: Andrew Davis To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Santosh Shilimkar , Nishanth Menon , Vignesh Raghavendra CC: , , , Andrew Davis Subject: [PATCH 2/4] firmware: ti_sci: Unconditionally register reset handler Date: Tue, 26 Mar 2024 17:37:28 -0500 Message-ID: <20240326223730.54639-3-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240326223730.54639-1-afd@ti.com> References: <20240326223730.54639-1-afd@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240326_153737_954345_87FDC46B X-CRM114-Status: GOOD ( 13.66 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There was once a limitation that there could only be one system reset handler. Due to that we only would register this handler when a non-standard device tree property was found, else we left the default handler in place (usually PSCI). Now that we can have multiple handlers, and TI-SCI reset is always available in the firmware, register this handler unconditionally. This priority is left at the default so higher priority handlers (like PSCI) are still attempted first. Signed-off-by: Andrew Davis --- drivers/firmware/ti_sci.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c index 9885e1763591b..160968301b1fb 100644 --- a/drivers/firmware/ti_sci.c +++ b/drivers/firmware/ti_sci.c @@ -3299,7 +3299,6 @@ static int ti_sci_probe(struct platform_device *pdev) struct mbox_client *cl; int ret = -EINVAL; int i; - int reboot = 0; u32 h_id; desc = device_get_match_data(dev); @@ -3323,8 +3322,6 @@ static int ti_sci_probe(struct platform_device *pdev) } } - reboot = of_property_read_bool(dev->of_node, - "ti,system-reboot-controller"); INIT_LIST_HEAD(&info->node); minfo = &info->minfo; @@ -3395,14 +3392,10 @@ static int ti_sci_probe(struct platform_device *pdev) ti_sci_setup_ops(info); - if (reboot) { - ret = devm_register_restart_handler(dev, - tisci_reboot_handler, - info); - if (ret) { - dev_err(dev, "reboot registration fail(%d)\n", ret); - goto out; - } + ret = devm_register_restart_handler(dev, tisci_reboot_handler, info); + if (ret) { + dev_err(dev, "reboot registration fail(%d)\n", ret); + goto out; } dev_info(dev, "ABI: %d.%d (firmware rev 0x%04x '%s')\n", -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel