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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E94C0C2D0CF for ; Tue, 24 Dec 2019 10:04:01 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id ADB1C206B7 for ; Tue, 24 Dec 2019 10:04:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VNWZkdKi"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="a9IhZppL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADB1C206B7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HYWzo122foo6LApqXwzXFYWUHF6LyO9SJUnDC2aqQLQ=; b=VNWZkdKiZUdsjd AucEFa2Vw+UmJeCSZAz/j+q6ptncj+SnCPXLrXcCchzTcf9ImKVQsifLQsvASny4Ru8YY1dQHxpsA 7aldPgqLsgbNOC3HOoQrs2mX9blTRty3TBt6n84znlFXh6xyZ6daUDF57k4HGl+vWHjIhq0BLk1Vx OuPFuGC7IljdIj5MHLM8cm6jRWjZUrmFIQvgOR4UH7L+4j4lTRpPVw/I0HKYr73ZmHni5Xy4Ya88l ZGUj0BU/UaLBpnSh39gFhE1hukgcqpvc5zWkwIRNEhCdzRdozVaYenpnr0JPcow2CdVZ5EUsK16a2 oZJCqC9Thds+1xOvLwWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ijh2j-0006CA-PZ; Tue, 24 Dec 2019 10:03:57 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ijh2N-0005xA-6T for linux-arm-kernel@lists.infradead.org; Tue, 24 Dec 2019 10:03:36 +0000 Received: by mail-wr1-x444.google.com with SMTP id g17so19368035wro.2 for ; Tue, 24 Dec 2019 02:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IOU/3rF9+fuzA5asqkKAmzkuulu7zyIHvx1EjERPIsc=; b=a9IhZppL5a8/+KLGjQ8Z/Hg37A+/pBB0A5pgOJ2JSDBsBCYTY6cmA0C2xu/OrvI57M MXEu9cJ8opTXxf+4OeOlK2PEtD/iglKIw0DmL3dLwXCc0k1z0KTYrOhDXlG2WA3WsHX/ XcJVf9oWdXi515QH0//c5j0Hn8M9Sqqu+yKHIwuQBHSUceG3lhDE8RkMl/4WIPGm73cA /Lrwv5V39LeG6yjbE4iq8kBCKMvPNykT5DGCE6feHnkNcgc4j9FORJ+pL7FcGjDXWBij 4vt0URC1rMSQx/up8KKB4XA5euN/zOxiMaWJ1gBKszClbhz2PuB/RCImS5d1JRqg3lnj x/QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IOU/3rF9+fuzA5asqkKAmzkuulu7zyIHvx1EjERPIsc=; b=jgk9Dblucy/U8XkjOvN0tyaSp3iEFa4GNSOsGcC5G50V6UbAbnnMw+DwmPE228RPNh Zl2dSLsxwIeojL2fd4DVH96lsUHE11EC4CJZtE5ouCntr/dNRFeRjptl60CIXKkIFcyw HxiR9b8B73L8OgbQXCtvoK0nqRMgY0c5gLrpB6txzuWdNpHt7xmhr5FDp1vopt//p7bP 9qAsSZ0nlzQeTpvGoylKij2Kfx5VyUiIOIA9CZesiy/9MZ63m0f21215jx9Ypqiura3t eGrRq7izdbkeY0oF8kXddxBbCl7n3qNZytjvt2FxpDsCdWYJDfACU4beH4GuZfi8wgZ5 PY0g== X-Gm-Message-State: APjAAAXJfc/3Ew3TC+6AN3DZ5l9Z6OUUsB3OBH5NT77Tzc3Fk4ajPaz6 jIY1olH0ueV6mp+KGw63KbHMRQ== X-Google-Smtp-Source: APXvYqz/w1dmLmweJHLlEnDCKSnJsQ2/Bj2X/bPyXS+HazNTW+SKi+yFKfSZtSIJaG7d9Y1kufjboQ== X-Received: by 2002:a5d:4d4a:: with SMTP id a10mr34681699wru.220.1577181813740; Tue, 24 Dec 2019 02:03:33 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id a184sm2164048wmf.29.2019.12.24.02.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 02:03:33 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Daniel Lezcano , Thomas Gleixner , David Lechner , Kevin Hilman Subject: [PATCH v2 1/3] clocksource: davinci: only enable tim34 in periodic mode once it's initialized Date: Tue, 24 Dec 2019 11:03:26 +0100 Message-Id: <20191224100328.13608-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191224100328.13608-1-brgl@bgdev.pl> References: <20191224100328.13608-1-brgl@bgdev.pl> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191224_020335_233779_63C04259 X-CRM114-Status: GOOD ( 12.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Bartosz Golaszewski The DM365 platform has a strange quirk (only present when using ancient u-boot - mainline u-boot v2013.01 and later works fine) where if we enable the second half of the timer in periodic mode before we do its initialization - the time won't start flowing and we can't boot. When using more recent u-boot, we can enable the timer, then reinitialize it and all works fine. I've been unable to figure out why that is, but a workaround for this is straightforward - don't enable the tim34 timer in periodic mode until it's properly initialized. Signed-off-by: Bartosz Golaszewski --- drivers/clocksource/timer-davinci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c index 62745c962049..2801f21bb0e2 100644 --- a/drivers/clocksource/timer-davinci.c +++ b/drivers/clocksource/timer-davinci.c @@ -62,6 +62,7 @@ static struct { struct clocksource dev; void __iomem *base; unsigned int tim_off; + bool initialized; } davinci_clocksource; static struct davinci_clockevent * @@ -94,8 +95,9 @@ static void davinci_tim12_shutdown(void __iomem *base) * halves. In this case TIM34 runs in periodic mode and we must * not modify it. */ - tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << - DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; + if (likely(davinci_clocksource.initialized)) + tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << + DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; writel_relaxed(tcr, base + DAVINCI_TIMER_REG_TCR); } @@ -107,8 +109,9 @@ static void davinci_tim12_set_oneshot(void __iomem *base) tcr = DAVINCI_TIMER_ENAMODE_ONESHOT << DAVINCI_TIMER_ENAMODE_SHIFT_TIM12; /* Same as above. */ - tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << - DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; + if (likely(davinci_clocksource.initialized)) + tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << + DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; writel_relaxed(tcr, base + DAVINCI_TIMER_REG_TCR); } @@ -206,6 +209,8 @@ static void davinci_clocksource_init_tim34(void __iomem *base) writel_relaxed(0x0, base + DAVINCI_TIMER_REG_TIM34); writel_relaxed(UINT_MAX, base + DAVINCI_TIMER_REG_PRD34); writel_relaxed(tcr, base + DAVINCI_TIMER_REG_TCR); + + davinci_clocksource.initialized = true; } /* -- 2.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6106C2D0CF for ; Tue, 24 Dec 2019 10:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C397206B7 for ; Tue, 24 Dec 2019 10:03:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.b="a9IhZppL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726261AbfLXKDi (ORCPT ); Tue, 24 Dec 2019 05:03:38 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:40749 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726091AbfLXKDg (ORCPT ); Tue, 24 Dec 2019 05:03:36 -0500 Received: by mail-wr1-f66.google.com with SMTP id c14so19363415wrn.7 for ; Tue, 24 Dec 2019 02:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IOU/3rF9+fuzA5asqkKAmzkuulu7zyIHvx1EjERPIsc=; b=a9IhZppL5a8/+KLGjQ8Z/Hg37A+/pBB0A5pgOJ2JSDBsBCYTY6cmA0C2xu/OrvI57M MXEu9cJ8opTXxf+4OeOlK2PEtD/iglKIw0DmL3dLwXCc0k1z0KTYrOhDXlG2WA3WsHX/ XcJVf9oWdXi515QH0//c5j0Hn8M9Sqqu+yKHIwuQBHSUceG3lhDE8RkMl/4WIPGm73cA /Lrwv5V39LeG6yjbE4iq8kBCKMvPNykT5DGCE6feHnkNcgc4j9FORJ+pL7FcGjDXWBij 4vt0URC1rMSQx/up8KKB4XA5euN/zOxiMaWJ1gBKszClbhz2PuB/RCImS5d1JRqg3lnj x/QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IOU/3rF9+fuzA5asqkKAmzkuulu7zyIHvx1EjERPIsc=; b=pHd6jvgJoDWRebDPUfXrK/DP3OPdR+YuDWJ+SlV3Tu47I1i2o121fE7+QlumvWb80K V5wcey42USD39k6Uxlv2aUrdEHqNurhtllGT9RW0shETK4c6tLuA48e+3wT9MOVeke3z FJcivSChBuVg9SqoVC+EfL6vbsNiMQ4NdWy6rTtnzZEgy0KULqLtB94qHp89n7GIexc4 jYO9lml4vFcdkeni16kIdQIlAf4+ehghBFolZq/Yg/hujAzV9tCrzPL/Djb/oRC6LByj C0NEOkzRZfeAfQYYCjUObDPE1EXCgk86Qzenf9oC3wDWRhFvUCo6JXs/xq2tpRdGPdNE w6zg== X-Gm-Message-State: APjAAAVRxr4LMRxK2JREfUdQ2jjddFrvu1H150dDWi2PIm87r+xgEDpe 8oxoR1F4vcCGELJ50dNstV4d1oCybCc= X-Google-Smtp-Source: APXvYqz/w1dmLmweJHLlEnDCKSnJsQ2/Bj2X/bPyXS+HazNTW+SKi+yFKfSZtSIJaG7d9Y1kufjboQ== X-Received: by 2002:a5d:4d4a:: with SMTP id a10mr34681699wru.220.1577181813740; Tue, 24 Dec 2019 02:03:33 -0800 (PST) Received: from debian-brgl.home ([2a01:cb1d:af:5b00:6d6c:8493:1ab5:dad7]) by smtp.gmail.com with ESMTPSA id a184sm2164048wmf.29.2019.12.24.02.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Dec 2019 02:03:33 -0800 (PST) From: Bartosz Golaszewski To: Sekhar Nori , Daniel Lezcano , Thomas Gleixner , David Lechner , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v2 1/3] clocksource: davinci: only enable tim34 in periodic mode once it's initialized Date: Tue, 24 Dec 2019 11:03:26 +0100 Message-Id: <20191224100328.13608-2-brgl@bgdev.pl> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191224100328.13608-1-brgl@bgdev.pl> References: <20191224100328.13608-1-brgl@bgdev.pl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bartosz Golaszewski The DM365 platform has a strange quirk (only present when using ancient u-boot - mainline u-boot v2013.01 and later works fine) where if we enable the second half of the timer in periodic mode before we do its initialization - the time won't start flowing and we can't boot. When using more recent u-boot, we can enable the timer, then reinitialize it and all works fine. I've been unable to figure out why that is, but a workaround for this is straightforward - don't enable the tim34 timer in periodic mode until it's properly initialized. Signed-off-by: Bartosz Golaszewski --- drivers/clocksource/timer-davinci.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c index 62745c962049..2801f21bb0e2 100644 --- a/drivers/clocksource/timer-davinci.c +++ b/drivers/clocksource/timer-davinci.c @@ -62,6 +62,7 @@ static struct { struct clocksource dev; void __iomem *base; unsigned int tim_off; + bool initialized; } davinci_clocksource; static struct davinci_clockevent * @@ -94,8 +95,9 @@ static void davinci_tim12_shutdown(void __iomem *base) * halves. In this case TIM34 runs in periodic mode and we must * not modify it. */ - tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << - DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; + if (likely(davinci_clocksource.initialized)) + tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << + DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; writel_relaxed(tcr, base + DAVINCI_TIMER_REG_TCR); } @@ -107,8 +109,9 @@ static void davinci_tim12_set_oneshot(void __iomem *base) tcr = DAVINCI_TIMER_ENAMODE_ONESHOT << DAVINCI_TIMER_ENAMODE_SHIFT_TIM12; /* Same as above. */ - tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << - DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; + if (likely(davinci_clocksource.initialized)) + tcr |= DAVINCI_TIMER_ENAMODE_PERIODIC << + DAVINCI_TIMER_ENAMODE_SHIFT_TIM34; writel_relaxed(tcr, base + DAVINCI_TIMER_REG_TCR); } @@ -206,6 +209,8 @@ static void davinci_clocksource_init_tim34(void __iomem *base) writel_relaxed(0x0, base + DAVINCI_TIMER_REG_TIM34); writel_relaxed(UINT_MAX, base + DAVINCI_TIMER_REG_PRD34); writel_relaxed(tcr, base + DAVINCI_TIMER_REG_TCR); + + davinci_clocksource.initialized = true; } /* -- 2.23.0