From patchwork Thu Jan 20 08:03:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1582061 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4JfZml2BlQz9sPC for ; Thu, 20 Jan 2022 19:04:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358635AbiATIEu (ORCPT ); Thu, 20 Jan 2022 03:04:50 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:58995 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358448AbiATIE2 (ORCPT ); Thu, 20 Jan 2022 03:04:28 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mnqfc-1mVN6P2AqA-00pJic; Thu, 20 Jan 2022 09:03:55 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Alessandro Zummo , linux-rtc@vger.kernel.org, John Stultz , Arnd Bergmann , Daniel Lezcano , Jiaxun Yang , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , Stephen Boyd , Geert Uytterhoeven , Laurent Vivier Subject: [PATCH v11 3/5] rtc: goldfish: use gf_ioread32()/gf_iowrite32() Date: Thu, 20 Jan 2022 09:03:45 +0100 Message-Id: <20220120080347.1595379-4-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120080347.1595379-1-laurent@vivier.eu> References: <20220120080347.1595379-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:PDlTvEErr5w6REUxeS4f2MUuaTmpsPqLy8NBpWsWLJ7HitgBOLP j8hOIts9trIqV0mIBdQzPWMXhzv/1yO3Y9mBAjx7hTkUdXL9DzUhQdMbOJ5ljGLRom48J5E FVzWOuy+dn16RlGPpr4JPQjA+J0w0GW0keR512UgAnzHa51ef0Ugrd0QX3S3cwPvCwYW19M NeteAPzQotgVF2T/v+OKw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:IXTJ/PC8SO8=:hOtS4rQX09Ypm+WJJiDFVN WmoA5tMLstWnfC/eAk9DwElhUKRlH/dQCTQ/52Imeuc5nhFNsytHZPTxzPM3CtFnAdL/xXTJh 961yf4MbNZOffBoLzvuEzIwoS0G2C4g4H5bgaKE8HiKxDZYMThMKbNI2+YgADN5Fg5KLIeV2a /7skmHjjiPaKKM2p5Eypj16zfIJQzIg3hWwflwJ4DyB2w7drLMUNtOyFeeHffazAasGJ8pAaL 2B+rjVTqHPaS1BSk1vxRBLIO+XpWzZRI/ZlcKuLwek/gKSN3xFX5SIBWBeNLIQpGZvibF95ZA +EJ2WBvaXKP95+s8jWvNfCBiXF3vIWNvD93mGs+ZzBXU3Dskf2Xd4CfTLARTJtp8dIryU5kAZ +GAGxhqXZl0VMQmi4U+cOslIY84UATnP6cLoUj9Hq/hHwNAKfIbECv4zrybpHkKIvkhe9RTWG yGEVQv3eZBTEPULat9GrsmCRpYVwBfQ5x15uxWdHOUQs7jWZg2lOLxkjlWAwMZMF8rClG3ZZq Fk9fL9LUK7Y5BgASpcj9UP4QLWgFq07xHvvzY352FKNlufStP7tlPjlIWUNsIfNd2u9xVb5IV Gplbq77+qOYuHhp04vqYWpRYzAARE/2YOHnA4YjDdWoICNorJojKxnK93+ZxLRS+eImFuu1lK dcYd2G/DWm0oPd39FJlan23DxeO73D81+xRzU98wk3B+Sm/tsPWUeKyQG4GZZfbId9XQ= Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org replace readl()/writel() by gf_ioread32()/gf_iowrite32() as done for goldfish-tty. Signed-off-by: Laurent Vivier Reported-by: kernel test robot Reported-by: kernel test robot --- drivers/rtc/rtc-goldfish.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index 7ab95d052644..a3a556f6a3e0 100644 --- a/drivers/rtc/rtc-goldfish.c +++ b/drivers/rtc/rtc-goldfish.c @@ -41,8 +41,8 @@ static int goldfish_rtc_read_alarm(struct device *dev, rtcdrv = dev_get_drvdata(dev); base = rtcdrv->base; - rtc_alarm_low = readl(base + TIMER_ALARM_LOW); - rtc_alarm_high = readl(base + TIMER_ALARM_HIGH); + rtc_alarm_low = gf_ioread32(base + TIMER_ALARM_LOW); + rtc_alarm_high = gf_ioread32(base + TIMER_ALARM_HIGH); rtc_alarm = (rtc_alarm_high << 32) | rtc_alarm_low; do_div(rtc_alarm, NSEC_PER_SEC); @@ -50,7 +50,7 @@ static int goldfish_rtc_read_alarm(struct device *dev, rtc_time64_to_tm(rtc_alarm, &alrm->time); - if (readl(base + TIMER_ALARM_STATUS)) + if (gf_ioread32(base + TIMER_ALARM_STATUS)) alrm->enabled = 1; else alrm->enabled = 0; @@ -71,18 +71,18 @@ static int goldfish_rtc_set_alarm(struct device *dev, if (alrm->enabled) { rtc_alarm64 = rtc_tm_to_time64(&alrm->time) * NSEC_PER_SEC; - writel((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH); - writel(rtc_alarm64, base + TIMER_ALARM_LOW); - writel(1, base + TIMER_IRQ_ENABLED); + gf_iowrite32((rtc_alarm64 >> 32), base + TIMER_ALARM_HIGH); + gf_iowrite32(rtc_alarm64, base + TIMER_ALARM_LOW); + gf_iowrite32(1, base + TIMER_IRQ_ENABLED); } else { /* * if this function was called with enabled=0 * then it could mean that the application is * trying to cancel an ongoing alarm */ - rtc_status_reg = readl(base + TIMER_ALARM_STATUS); + rtc_status_reg = gf_ioread32(base + TIMER_ALARM_STATUS); if (rtc_status_reg) - writel(1, base + TIMER_CLEAR_ALARM); + gf_iowrite32(1, base + TIMER_CLEAR_ALARM); } return 0; @@ -98,9 +98,9 @@ static int goldfish_rtc_alarm_irq_enable(struct device *dev, base = rtcdrv->base; if (enabled) - writel(1, base + TIMER_IRQ_ENABLED); + gf_iowrite32(1, base + TIMER_IRQ_ENABLED); else - writel(0, base + TIMER_IRQ_ENABLED); + gf_iowrite32(0, base + TIMER_IRQ_ENABLED); return 0; } @@ -110,7 +110,7 @@ static irqreturn_t goldfish_rtc_interrupt(int irq, void *dev_id) struct goldfish_rtc *rtcdrv = dev_id; void __iomem *base = rtcdrv->base; - writel(1, base + TIMER_CLEAR_INTERRUPT); + gf_iowrite32(1, base + TIMER_CLEAR_INTERRUPT); rtc_update_irq(rtcdrv->rtc, 1, RTC_IRQF | RTC_AF); @@ -128,8 +128,8 @@ static int goldfish_rtc_read_time(struct device *dev, struct rtc_time *tm) rtcdrv = dev_get_drvdata(dev); base = rtcdrv->base; - time_low = readl(base + TIMER_TIME_LOW); - time_high = readl(base + TIMER_TIME_HIGH); + time_low = gf_ioread32(base + TIMER_TIME_LOW); + time_high = gf_ioread32(base + TIMER_TIME_HIGH); time = (time_high << 32) | time_low; do_div(time, NSEC_PER_SEC); @@ -149,8 +149,8 @@ static int goldfish_rtc_set_time(struct device *dev, struct rtc_time *tm) base = rtcdrv->base; now64 = rtc_tm_to_time64(tm) * NSEC_PER_SEC; - writel((now64 >> 32), base + TIMER_TIME_HIGH); - writel(now64, base + TIMER_TIME_LOW); + gf_iowrite32((now64 >> 32), base + TIMER_TIME_HIGH); + gf_iowrite32(now64, base + TIMER_TIME_LOW); return 0; }