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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 AF9DEC7618F for ; Mon, 15 Jul 2019 13:57:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79D5D217D9 for ; Mon, 15 Jul 2019 13:57:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199046; bh=tTta1BWjUTdGT2Co5I0+LQJ9ME+Vzdj5DIveTseWO8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RwiWxEClKEl0Tg0aT1oQMwfk5Cw3c6N70CajjzuHj4mzrcDMtdPUtZKPghQ/F3oGu PMCY7sSphQv4UXUOlSHmfBuYsgeyiCiapbbEX72r9BagKLvlx+uDQ/hW42OYWCqSn3 dfrLlG9ySzRNk/QuZJw2wj6i7NQRmTI6hk+t7SqQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732686AbfGON5Z (ORCPT ); Mon, 15 Jul 2019 09:57:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:35250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732571AbfGON5T (ORCPT ); Mon, 15 Jul 2019 09:57:19 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2195E20C01; Mon, 15 Jul 2019 13:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199039; bh=tTta1BWjUTdGT2Co5I0+LQJ9ME+Vzdj5DIveTseWO8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AMpj0RjV9jCdLAJ1AF0MfjQQHz6t8UED1sTSDzSxK+aCOeE9NQWH2efSuD9Tp6crz ROJDygnz23sUUkP/PNCHVYSrttf1exgrnTUdVOrHMLFA3G6qehc44eGB9N41s0TnNP 3EcWDyeM6sKfQUmrTBMD/DDCMqJ1H+mIdoQ4r9KA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Osipenko , Jon Hunter , Thierry Reding , Daniel Lezcano , Sasha Levin , linux-tegra@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 172/249] clocksource/drivers/tegra: Restore base address before cleanup Date: Mon, 15 Jul 2019 09:45:37 -0400 Message-Id: <20190715134655.4076-172-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715134655.4076-1-sashal@kernel.org> References: <20190715134655.4076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Osipenko [ Upstream commit fc9babc2574691d3bbf0428f007b22261fed55c6 ] We're adjusting the timer's base for each per-CPU timer to point to the actual start of the timer since device-tree defines a compound registers range that includes all of the timers. In this case the original base need to be restore before calling iounmap to unmap the proper address. Signed-off-by: Dmitry Osipenko Acked-by: Jon Hunter Acked-by: Thierry Reding Signed-off-by: Daniel Lezcano Signed-off-by: Sasha Levin --- drivers/clocksource/timer-tegra20.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clocksource/timer-tegra20.c b/drivers/clocksource/timer-tegra20.c index fe5cc0963ac9..462be34b41c4 100644 --- a/drivers/clocksource/timer-tegra20.c +++ b/drivers/clocksource/timer-tegra20.c @@ -319,6 +319,8 @@ static int __init tegra_init_timer(struct device_node *np) irq_dispose_mapping(cpu_to->clkevt.irq); } } + + to->of_base.base = timer_reg_base; out: timer_of_cleanup(to); return ret; -- 2.20.1