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 C3DBACCA481 for ; Tue, 7 Jun 2022 19:59:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356464AbiFGT7t (ORCPT ); Tue, 7 Jun 2022 15:59:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353252AbiFGSx4 (ORCPT ); Tue, 7 Jun 2022 14:53:56 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CBFFD14ACB4; Tue, 7 Jun 2022 11:03:43 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 6D33B6159C; Tue, 7 Jun 2022 18:03:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F22CAC385A5; Tue, 7 Jun 2022 18:03:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654625022; bh=hlnHV9qWZW7tUMGFlHkHHL18x1Xe43DL4U5v+DmOgXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JxL1gjvqTjp3KmXXaNpIl0otHi4b3fD/Yg4OY6/BaKdq+87GblbXX+w+ZSzBl1HOy 36j9OR3dTxaP+TXaK+W6eB5RDPkJn3jepr9qDSIYlpzMIIFptWXeU+kxRD+hiaD3Vb EJ4uBNPWQ+h1IDKOTxqPxoZry90e1wPSjw9noMKJ3WM2bdL8XGH3oeyFlagmoxCBTJ I/grRMlzbls0oyE6HCB2boUTDe/3jG5Lw1pUmhxK4kyq5gJDrXwC81TD19KNcQkBO6 pAzSw1lEe49Fskml91C6hjLeiTjCgMooIPWSyCPEL/XbYorUj0xdwy2kZOzQVrlM0y EIIlE/b1cgfNA== 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 4.9 12/19] clocksource/drivers/sp804: Avoid error on multiple instances Date: Tue, 7 Jun 2022 14:03:07 -0400 Message-Id: <20220607180317.482354-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607180317.482354-1-sashal@kernel.org> References: <20220607180317.482354-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 d07863388e05..780699e4d120 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -227,6 +227,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; @@ -235,11 +240,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