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 174C6CCA49C for ; Tue, 7 Jun 2022 19:42:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357892AbiFGTmb (ORCPT ); Tue, 7 Jun 2022 15:42:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354359AbiFGSq5 (ORCPT ); Tue, 7 Jun 2022 14:46:57 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD26D237CA; Tue, 7 Jun 2022 11:00:55 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 900BBB8236D; Tue, 7 Jun 2022 18:00:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60C84C385A5; Tue, 7 Jun 2022 18:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624853; bh=/GG/uI1SHmCiMaut98VaM/SKzy5gUyYM4ay2lWKd5Vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EkpxpohwzPXdZ6b1nzTRM0mmPsakWQoNxlQvjbqVLA0Y7Mu2PsVLBtunsfPrTTP4g p+acloM7g/Cbos3oNYgeVHgeTacrRuDYnNcHi0dx1yd49kHPJlcMfyLDwm+Kh5Wfvj lvFT0BTIKnpMHIOACgJZPZxOiubf4aiv1ALy3AUeXMBJpebgEheAEq+r0CzUVmEUhE PFalMlj15+Rv0r5JS+wf1w+6UNh7tp5kbOXdmGwsFjPLQ8xgMNrAh408o10ItI0ceL 7U9eYlOnV3iJkDxmqBp7EfEDRVShf5u49sqc0rPvtwwNu2ioRZAYm1mGV52sFgK+tF Ws7VETK3ykn8Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andre Przywara , Robin Murphy , Daniel Lezcano , Sasha Levin , tglx@linutronix.de Subject: [PATCH AUTOSEL 5.4 15/34] clocksource/drivers/sp804: Avoid error on multiple instances Date: Tue, 7 Jun 2022 13:59:50 -0400 Message-Id: <20220607180011.481266-15-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607180011.481266-1-sashal@kernel.org> References: <20220607180011.481266-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andre Przywara [ Upstream commit a98399cbc1e05f7b977419f03905501d566cf54e ] When a machine sports more than one SP804 timer instance, we only bring up the first one, since multiple timers of the same kind are not useful to Linux. As this is intentional behaviour, we should not return an error message, as we do today: =============== [ 0.000800] Failed to initialize '/bus@8000000/motherboard-bus@8000000/iofpga-bus@300000000/timer@120000': -22 =============== Replace the -EINVAL return with a debug message and return 0 instead. Also we do not reach the init function anymore if the DT node is disabled (as this is now handled by OF_DECLARE), so remove the explicit check for that case. This fixes a long standing bogus error when booting ARM's fastmodels. Signed-off-by: Andre Przywara Reviewed-by: Robin Murphy Link: https://lore.kernel.org/r/20220506162522.3675399-1-andre.przywara@arm.com Signed-off-by: Daniel Lezcano Signed-off-by: Sasha Levin --- drivers/clocksource/timer-sp804.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c index 9c841980eed1..c9aa0498fb84 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -215,6 +215,11 @@ static int __init sp804_of_init(struct device_node *np) struct clk *clk1, *clk2; const char *name = of_get_property(np, "compatible", NULL); + if (initialized) { + pr_debug("%pOF: skipping further SP804 timer device\n", np); + return 0; + } + base = of_iomap(np, 0); if (!base) return -ENXIO; @@ -223,11 +228,6 @@ static int __init sp804_of_init(struct device_node *np) writel(0, base + TIMER_CTRL); writel(0, base + TIMER_2_BASE + TIMER_CTRL); - if (initialized || !of_device_is_available(np)) { - ret = -EINVAL; - goto err; - } - clk1 = of_clk_get(np, 0); if (IS_ERR(clk1)) clk1 = NULL; -- 2.35.1