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 230FDCCA47E for ; Tue, 7 Jun 2022 19:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353496AbiFGTDC (ORCPT ); Tue, 7 Jun 2022 15:03:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352126AbiFGSQz (ORCPT ); Tue, 7 Jun 2022 14:16:55 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ACC0DE93; Tue, 7 Jun 2022 10:50:37 -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 3EAD7B8234A; Tue, 7 Jun 2022 17:50:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28FFDC341C0; Tue, 7 Jun 2022 17:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654624235; bh=wH7/90BcNZzwB2bJOgzMEcaResWqJwE5uqhLmPT9ENA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uaE/pYg55gugLwRSxK3j0b+s6gAjQsX8NRe1T3siqN5lAIWHpxLKaA/joeJRxjHD8 hoQo25T7rTojzkbbiHFDOd477pPrcgvy6ReMWczsZqqpP3klvuMZMhb671cz9ErHih vQxCzhbmXAX2JhbEwoqjzNCnrd+NfDM3EdcF7MN2L0RaS66Tkzaz4Mx8ucUOpuSE2j +I5hCC5jM6CJN1FTt734yZG++wrCwojUArEPoOcKdH6XpqeqdNhHd/81gOxKAMZIVe SgQgEBd9rx1/b2l41mGnAWStyRtDUOC5BSp5TmBf/mCQSqdFywmgwKC5VAWzQdYmRP SEr1WZdXsvTHA== 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.18 26/68] clocksource/drivers/sp804: Avoid error on multiple instances Date: Tue, 7 Jun 2022 13:47:52 -0400 Message-Id: <20220607174846.477972-26-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220607174846.477972-1-sashal@kernel.org> References: <20220607174846.477972-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 401d592e85f5..e6a87f4af2b5 100644 --- a/drivers/clocksource/timer-sp804.c +++ b/drivers/clocksource/timer-sp804.c @@ -259,6 +259,11 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time 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; @@ -270,11 +275,6 @@ static int __init sp804_of_init(struct device_node *np, struct sp804_timer *time writel(0, timer1_base + timer->ctrl); writel(0, timer2_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