From patchwork Thu Oct 8 15:46:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11823431 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 12EF41592 for ; Thu, 8 Oct 2020 15:51:40 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 BB65D20578 for ; Thu, 8 Oct 2020 15:51:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="B0lRJ2cu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BB65D20578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.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=W0NhSJPTk/bEKGGflJtcuVUBzO5Y80oBRHUwk/Q798c=; b=B0lRJ2curt64W5BYr8f1s8LQa QZT1vv+d+qmIWR5FmtwzXJ7Jhh/8nQeDj51cisJc8FtM5Ai6XWGIGfwDOuHPy7PR+u+8P8Z3R/Jr3 Cgzb03B9mX3QPak39EfYxih15RcTwJ1QkKuQqnT+F1vihEDZmXjmQrAh3FNGqN0lLjq+juIBLGjmL 7hnd87j/t0TRUAfa61bILOndAU8ntPvfECfR9mPIY3LCtvVGuFbify99LNZZxXpgFouNjMUHxEYaD IGBMPv0d2MmDeaV4PTmWyoGUbRUmpFaaOUmUlHwcm90pSQkdtmSL/owItu8qMiptWELY/T7B1uBDM qxAcDnH9w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQYAo-00039W-Qx; Thu, 08 Oct 2020 15:49:43 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQY9k-0002fM-G1 for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2020 15:48:45 +0000 Received: from localhost.localdomain ([192.30.34.233]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1Mc0Aj-1kvldN13hX-00dWMm; Thu, 08 Oct 2020 17:48:03 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 07/13] m68k: sun3/sun3c: use legacy_timer_tick Date: Thu, 8 Oct 2020 17:46:45 +0200 Message-Id: <20201008154651.1901126-8-arnd@arndb.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201008154651.1901126-1-arnd@arndb.de> References: <20201008154651.1901126-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:zzQepl59kGHqC31NpC7bG+PeDhhMCTHQVd0gy+gcmjQuJwPro/e YgST2M/5bg8pOnYtalrizCt/CQyfRU+vMCZDSUytu+vPazaG4fAxasAdlunS51IYkSBYlio iPqKfp3Ni+6XHGef7N1RuGA1HbD8Bj6TL8ALg1RiJsRZLOv9XJUGmO2imGEXPXrvBfzClTK ZAePO58Y6+u0ShYOmkmbQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:VCTA03n0EEU=:F2qbphEYNVKx6MJTqdbPS9 8XM2b9J+zhO6UDLal5j3YrCnsMUxDdJxYBaNUcsRTQ50xeOEYAta4l2IPNxQSpYjQW5t/ydFc oLCOg7bQJ/MrIFK1/PKD1yW5HMMSFGHmKNFVaV+61PV4O3WwHJoWAhOnOmtRXOoM7pjW/qyAY y6A08V3bvjAnGOWn+dhu8i4PTeG+zHOIZbn0uOKj3A08KrinOovfDrJq0SKSzH7uZXsgeh8iq ToLrCTD60CE6Rjv+5MIFFRjFydwUurD4CLFnhCCb0ti/Hfhz8GmACo+PJjg0iGr/9dFjCEBoJ q7MgBIx3cFt5CA+uCEarAjCXnWh0qdMQJcF3VZUy1iSQqJSEYPqhcAvfcQ3N4DegjK73H+g+n 3XrHPgIW3FBIEUGmqZTQHgkqA8Y/zSX+59SaE2SIC65pOHaPoYCQcB1QdZ+4xX735HeZFfJ85 zdikSNwG+1vfTMCev89+QsrYDGYep1hUlU1EZ44dWzZLWWbyDzk62Kn0QnKZiFABMlF+uc+sI U0ZKZFcYeHfzL87AFsCQlyNNWqRRv+/sPRhvgYVmFinY+pUz7tmkRJeoPngeAH6cAlUIvnXUE r5huH7yKmGaqxZ2vGUqHHOcYugSn+y0aHJE4hcA4FLUegviVCy9Q1h5FOsWdsVWfwntp5GzG5 HcE3seAhPVXL7OB4N/KU2Y8epU4W0XNvUUWV6AJ0vfOuwwdhymaOXjphbvzY+PrxaMsk30ept 9t/01z/QE2X9pNLvqNr5kgaqWiAq8HhGu6Z8s02Pr5CYEVUnrm2os6W2MnDulbkL46Y65IQAW aGK4w26/nvMdyCrpo6U45G4k+/M+lhSqScEFjggjoU9EF5AiAeRqMeFBXBF3mF6ryjud+PD X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201008_114837_119304_A80FB5CE X-CRM114-Status: GOOD ( 18.50 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.24 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.24 listed in wl.mailspike.net] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 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: Sam Creasey , Fenghua Yu , Linus Walleij , Tony Luck , Thomas Gleixner , linux-parisc@vger.kernel.org, Arnd Bergmann , linux-ia64@vger.kernel.org, Stephen Boyd , Helge Deller , Daniel Lezcano , Russell King , Finn Thain , "James E.J. Bottomley" , linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, John Stultz , Philip Blundell , Greg Ungerer , Joshua Thompson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org These two are different from all other machines: * sun3 does not call timer_routine() but open-codes it except for the profile_tick() call that appears to be unintentionally missing. * sun3x has a commented-out timer irq handler but no functional timer tick I could find. Change both to calling the new legacy_timer_tick here, which includes the call to profile_tick() but does not fix sun3x as that is still commented out. Signed-off-by: Arnd Bergmann Reviewed-by: Geert Uytterhoeven Acked-by: Geert Uytterhoeven --- arch/m68k/Kconfig.machine | 2 ++ arch/m68k/sun3/sun3ints.c | 3 +-- arch/m68k/sun3x/time.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine index 17e8c3a292d7..e3c835440d9a 100644 --- a/arch/m68k/Kconfig.machine +++ b/arch/m68k/Kconfig.machine @@ -99,6 +99,7 @@ config HP300 config SUN3X bool "Sun3x support" depends on MMU + select LEGACY_TIMER_TICK select MMU_MOTOROLA if MMU select M68030 help @@ -126,6 +127,7 @@ config SUN3 depends on MMU depends on !MMU_MOTOROLA select MMU_SUN3 if MMU + select LEGACY_TIMER_TICK select NO_DMA select M68020 help diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c index a5824abb4a39..41ae422119d3 100644 --- a/arch/m68k/sun3/sun3ints.c +++ b/arch/m68k/sun3/sun3ints.c @@ -73,8 +73,7 @@ static irqreturn_t sun3_int5(int irq, void *dev_id) #ifdef CONFIG_SUN3 intersil_clear(); #endif - xtime_update(1); - update_process_times(user_mode(get_irq_regs())); + legacy_timer_tick(1); cnt = kstat_irqs_cpu(irq, 0); if (!(cnt % 20)) sun3_leds(led_pattern[cnt % 160 / 20]); diff --git a/arch/m68k/sun3x/time.c b/arch/m68k/sun3x/time.c index 9163294b0fb6..f6e25fdc008c 100644 --- a/arch/m68k/sun3x/time.c +++ b/arch/m68k/sun3x/time.c @@ -77,14 +77,13 @@ int sun3x_hwclk(int set, struct rtc_time *t) #if 0 static irqreturn_t sun3x_timer_tick(int irq, void *dev_id) { - irq_handler_t timer_routine = dev_id; unsigned long flags; local_irq_save(flags); /* Clear the pending interrupt - pulse the enable line low */ disable_irq(5); enable_irq(5); - timer_routine(0, NULL); + legacy_timer_tick(1); local_irq_restore(flags); return IRQ_HANDLED;