From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=5.135.140.105 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794909088; b=mFhHbwWipjQqA6iwfvG6nXBm/ALEZqupfCMJdOQv0owvZw/x13qLNoQFyPIsV04PiRyY gay83+KRrHBRbIi+uasGf/GI6SK9qVF2FoZUI2ciZJqrrxBdXMDFffSwKizZLFOUC1a3q yM5ZjmTROHC/DpfBBJUNfgprVSoPx4cCDAq9RIan8e/xEfOKnMI4Kd5k71Ev8mXVQLOn+ DEfb9OOdDR13GRDqkWc5Je8/P77TzQEdWB6YtjgEXYpc6661enLIu370hCL2VBW9cDexS Nij/4ytcvubXAS5KcdiczhKMR0FhB4kbO2vPh3vkmXuRVzWRSdDeAA1ODBvhxrRSA0Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794909088; h=DMARC-Filter:Received:DKIM-Signature:From:To:Cc:Subject:Date: Message-Id:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Last-TLS-Session-Version; bh=B1OV7lBJrmDaac8ePy8dHk2DEYoP6HJXQm0PFK+z8S0=; b=QInkxrV8uVPguJWnOgLm+CbpdViNt5YBAqkpMVtHqsQ/pSRWGfiURXnGAU6gqGuiZqj+ pEKGjUoPsUnar4G3Xcoud9OFyPFUVLHgjVbhQ1Zw985jWhgJG5u+TnZkrp5A0PMcWWhdt +wlcv5LTMTNEX4RekEDHpwUWJY6Z7x0jEa/psD8asQIjo44INQvQ/vK+3Mw5cembgA1je Ewus26ZMrzSfJZwe5FTZUkmg2J1VjyDPMLCpEgrFqtjbyY/tZZFuwZFwpl3zgaFEU9GLQ TdmgUtabqKwcg6ZYbDUEX/onDyFBnv4XGGnQ0GUNDfMt9Eax7Ir8+GRn2fnsdMy/cwQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=cjdns.fr; spf=pass smtp.mailfrom=cjdns.fr; dkim=pass header.d=cjdns.fr header.i=@cjdns.fr header.a=rsa-sha256 header.s=dkim header.b=vvTPR7ab; arc=none smtp.remote-ip=5.135.140.105 Received: from mail.cjdns.fr (mail.cjdns.fr [5.135.140.105]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C59E8606A88B; Tue, 17 Nov 2026 09:51:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C59E8606A88B Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=cjdns.fr Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cjdns.fr Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cjdns.fr header.i=@cjdns.fr header.a=rsa-sha256 header.s=dkim header.b=vvTPR7ab Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id B794E517A37; Tue, 17 Nov 2026 10:51:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cjdns.fr; s=dkim; t=1794909085; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=B1OV7lBJrmDaac8ePy8dHk2DEYoP6HJXQm0PFK+z8S0=; b=vvTPR7abls+yq8/44019o7VhwHBBOWhYfCd8LphcZi4ElL4LeHHp+CF4RpsmVfKYaqj/WU pCCf60LVzgqHeDGs7uyqhsMuagR37dCma18zpCSen3ipsAhTRygBw+noFVYak1Etdd+2LA Qwn0NvdazmS3osV3SZeQEeFzmJpJvJ5c2arg0Uj5zXuPAISzL/dDQqvwAxKBpMoMPEGooj EblFdadnLa2e54gzTpHpjE9Mpyy8op5cZPYVIL5DWGHoSh66AUFycRTXZCD1y7Kb1jlCkb Ik8DNYLIWc4HhKhP0sV6Sk3BpM0ERxFSxqjMw93UZdXU8uA/d5A/bNA5k7LRPQ== From: Caleb James DeLisle To: linux-mips@vger.kernel.org Cc: conor+dt@kernel.org, daniel.lezcano@kernel.org, devicetree@vger.kernel.org, krzk+dt@kernel.org, linux-kernel@vger.kernel.org, naseefkm@gmail.com, robh@kernel.org, tglx@kernel.org, grandmaster@al2klimov.de, Caleb James DeLisle Subject: [PATCH v12 2/5] clocksource/timer-econet-en751221: Init teardown on error if possible Date: Tue, 17 Nov 2026 09:51:14 +0000 Message-Id: <20261117095117.173316-3-cjd@cjdns.fr> In-Reply-To: <20261117095117.173316-1-cjd@cjdns.fr> References: <20261117095117.173316-1-cjd@cjdns.fr> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 As a clocksource, much of the initialization process is irreversible and the impact of a failure to initialize is a failure to boot. That said, good practice is to attempt a clean exit if probing fails, and supporting this pattern will reduce the likelihood that future contributions introduce a bug by trying to teardown after it is no longer possible to do so. Convert the init process into two clearly delineated phases, one which is reverted in case of error, and the other which can't be. Move all IRQ and address resource mapping before that point, and add teardown logic in case of error before the point of no return. Signed-off-by: Caleb James DeLisle --- drivers/clocksource/timer-econet-en751221.c | 84 ++++++++++++--------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/drivers/clocksource/timer-econet-en751221.c b/drivers/clocksource/timer-econet-en751221.c index 1859335345b5..714702b9ef12 100644 --- a/drivers/clocksource/timer-econet-en751221.c +++ b/drivers/clocksource/timer-econet-en751221.c @@ -24,6 +24,7 @@ static struct { void __iomem *membase[ECONET_NUM_BLOCKS]; + int irq; u32 freq_hz; } econet_timer __ro_after_init; @@ -126,22 +127,9 @@ static void __init cevt_dev_init(uint cpu) iowrite32(U32_MAX, reg_compare(cpu)); } -static int __init cevt_init(struct device_node *np) +static void __init cevt_init(struct device_node *np) { - int i, irq, ret; - - irq = irq_of_parse_and_map(np, 0); - if (irq <= 0) { - pr_err("%pOFn: irq_of_parse_and_map failed", np); - return -EINVAL; - } - - ret = request_percpu_irq(irq, cevt_interrupt, np->name, &econet_timer_pcpu); - - if (ret < 0) { - pr_err("%pOFn: IRQ %d setup failed (%d)\n", np, irq, ret); - goto err_unmap_irq; - } + int i; for_each_possible_cpu(i) { struct clock_event_device *cd = &per_cpu(econet_timer_pcpu, i); @@ -151,21 +139,12 @@ static int __init cevt_init(struct device_node *np) CLOCK_EVT_FEAT_C3STOP | CLOCK_EVT_FEAT_PERCPU; cd->set_next_event = cevt_set_next_event; - cd->irq = irq; + cd->irq = econet_timer.irq; cd->cpumask = cpumask_of(i); cd->name = np->name; cevt_dev_init(i); } - - cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, - "clockevents/econet/timer:starting", - cevt_init_cpu, NULL); - return 0; - -err_unmap_irq: - irq_dispose_mapping(irq); - return ret; } static int __init timer_init(struct device_node *np) @@ -187,22 +166,45 @@ static int __init timer_init(struct device_node *np) econet_timer.membase[i] = of_iomap(np, i); if (!econet_timer.membase[i]) { pr_err("%pOFn: failed to map register [%d]\n", np, i); - return -ENXIO; + ret = -ENXIO; + goto out_membase; } } + econet_timer.irq = irq_of_parse_and_map(np, 0); + if (econet_timer.irq <= 0) { + pr_err("%pOFn: irq_of_parse_and_map failed\n", np); + ret = -EINVAL; + goto out_membase; + } + + ret = request_percpu_irq(econet_timer.irq, cevt_interrupt, np->name, + &econet_timer_pcpu); + + if (ret < 0) { + pr_err("%pOFn: IRQ %d setup failed (%d)\n", np, + econet_timer.irq, ret); + goto out_irq_mapping; + } + + cevt_init(np); + + ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, + "clockevents/econet/timer:starting", + cevt_init_cpu, NULL); + if (ret < 0) { + pr_err("%pOFn: cpuhp setup failed (%d)\n", np, ret); + goto out_irq_free; + } + + /* Point of no return, do not attempt to tear down after this. */ + /* For clocksource purposes always read clock zero, whatever the CPU */ ret = clocksource_mmio_init(reg_count(0), np->name, econet_timer.freq_hz, 301, ECONET_BITS, clocksource_mmio_readl_up); - if (ret) { - pr_err("%pOFn: clocksource_mmio_init failed: %d", np, ret); - return ret; - } - - ret = cevt_init(np); - if (ret < 0) - return ret; + if (ret) + pr_err("%pOFn: clocksource_mmio_init failed: %d\n", np, ret); sched_clock_register(sched_clock_read, ECONET_BITS, econet_timer.freq_hz); @@ -212,6 +214,20 @@ static int __init timer_init(struct device_node *np) (econet_timer.freq_hz / 1000) % 1000); return 0; + +out_irq_free: + free_percpu_irq(econet_timer.irq, &econet_timer_pcpu); +out_irq_mapping: + irq_dispose_mapping(econet_timer.irq); +out_membase: + for (int i = 0; i < ARRAY_SIZE(econet_timer.membase); i++) { + if (econet_timer.membase[i]) { + iounmap(econet_timer.membase[i]); + econet_timer.membase[i] = NULL; + } + } + + return ret; } TIMER_OF_DECLARE(econet_timer_hpt, "econet,en751221-timer", timer_init); -- 2.39.5