From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935450AbcHaPO7 (ORCPT ); Wed, 31 Aug 2016 11:14:59 -0400 Received: from mout.gmx.net ([212.227.17.21]:56293 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935106AbcHaPO5 (ORCPT ); Wed, 31 Aug 2016 11:14:57 -0400 Subject: Re: [PATCH 2/2] rtc: asm9260: rework locking To: Alexandre Belloni , Alessandro Zummo References: <20160831001805.8367-1-alexandre.belloni@free-electrons.com> <20160831001805.8367-2-alexandre.belloni@free-electrons.com> Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org From: Oleksij Rempel Message-ID: <5e6bfec7-d5b6-6311-9cab-76d9aa932408@rempel-privat.de> Date: Wed, 31 Aug 2016 17:14:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160831001805.8367-2-alexandre.belloni@free-electrons.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0OnJIiWKcXMvIWQIDT7SpxNbwpAgtmqt2" X-Provags-ID: V03:K0:OKPVbV2SjX9hBiXokQYyMaKG05WBzIMB4+3W3OLyMP+v2E2m2/g XC7jKRozJ9slCjYxUkFMvgLQ9EH3O4pWEM5mC3jOzWGPg/uFVsliacsSXyu48iVIUECtdqn dCpuPc3SPRO6FyuO963scdff2NB5cN783VS/rjnu3hOU0WQk+JnSTcYV6M9iHqKw8nvhbOU lJ4GigNdyz9eNVPGBhTNw== X-UI-Out-Filterresults: notjunk:1;V01:K0:1pta5UPbmKo=:xxh5XpEp3umVBynPlKZJJH sBROfo5fUcQShs8YAO0xSbSKsSTcYs3hZdyVb0BLL7SJZT/voFBpb3Sh1mIK0YkCdwBwJbBdx 7/d5S8YZud8HBmiM2YXyQnYxC2r7Tkglngpl/M6lyrAMDxVy0WN52/0B+cC3X3OUbkf1Vk+6W JP/IkxVM1QJ6hvTomlhXW3pwgFaZ3IfZx9A2O9LGBSO9JsknPDVbEykEFED5f3ZirglOnYc/v zIjdroZfMEa600FbogrK5/ENx/Es1DxPPGgAsu96O0H96KW2khYvTemkqWqzn42/Jzb2Dulcm HdAnzPAiMlGgj5M+1EuL3gQxPOE7OXP1/xkxLBFbTY7WWZEeRABJS1ylE/Pvx9IZ0AwULO4Ak sseIRt8RhVXyksO+cQoRfX6hN0qy+YUq3UrMZdih7LDEphYWWvzubAbJCAZJweP2Pfn+OfJci 7VJesiT2tsaKV8k/r51kOSI9H/b5JheoSDCjZsdvOqLdUFr/xTI/nTzV5ZSmfq98qGhoaOl/G s+FwJuSHiSc2ZsbnuMkhdPMS7pHN6fQxeOSUNtbBbwqPp5FAF8OkGhByKSgpIp4BRCpnp4na5 iSZJDfg6Kx0riKed5fAro/wBi27yDRR68UGike8OS5DmQGqhRx/bS6RrgArd05qlBU1+OQsZu xvi36+8t8nfVYOtmjhi8ww+8V7UJGXQda8Rmgw3uDgYaB9eYpmuBRVL2TNloIif4b2M7v9RKG rIYSZl339gNO9ZJ8Sn3SIMef6qa5v7lpbz1nmc/5vNOAz7/wddTaisJ84wM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0OnJIiWKcXMvIWQIDT7SpxNbwpAgtmqt2 Content-Type: multipart/mixed; boundary="tVuEpBE5W2U5rBDT1u22dUGlILNmEwTI9"; protected-headers="v1" From: Oleksij Rempel To: Alexandre Belloni , Alessandro Zummo Cc: rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Message-ID: <5e6bfec7-d5b6-6311-9cab-76d9aa932408@rempel-privat.de> Subject: Re: [PATCH 2/2] rtc: asm9260: rework locking References: <20160831001805.8367-1-alexandre.belloni@free-electrons.com> <20160831001805.8367-2-alexandre.belloni@free-electrons.com> In-Reply-To: <20160831001805.8367-2-alexandre.belloni@free-electrons.com> --tVuEpBE5W2U5rBDT1u22dUGlILNmEwTI9 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Am 31.08.2016 um 02:18 schrieb Alexandre Belloni: > The rtc-asm9260 driver uses a discrete spinlock (wrongly uninitialized)= =2E > Use the rtc mutex to lock mmio accesses instead. >=20 > Signed-off-by: Alexandre Belloni = > --- > drivers/rtc/rtc-asm9260.c | 16 ++-------------- > 1 file changed, 2 insertions(+), 14 deletions(-) >=20 > diff --git a/drivers/rtc/rtc-asm9260.c b/drivers/rtc/rtc-asm9260.c > index 5219916ce11d..812f131da694 100644 > --- a/drivers/rtc/rtc-asm9260.c > +++ b/drivers/rtc/rtc-asm9260.c > @@ -112,8 +112,6 @@ struct asm9260_rtc_priv { > void __iomem *iobase; > struct rtc_device *rtc; > struct clk *clk; > - /* io lock */ > - spinlock_t lock; > }; > =20 > static irqreturn_t asm9260_rtc_irq(int irq, void *dev_id) > @@ -122,11 +120,13 @@ static irqreturn_t asm9260_rtc_irq(int irq, void = *dev_id) > u32 isr; > unsigned long events =3D 0; > =20 > + mutex_lock(&priv->rtc->ops_lock); > isr =3D ioread32(priv->iobase + HW_CIIR); > if (!isr) > return IRQ_NONE; > =20 > iowrite32(0, priv->iobase + HW_CIIR); > + mutex_unlock(&priv->rtc->ops_lock); This means if we have shared or spurious interrupt we will get a deadlock here? > events |=3D RTC_AF | RTC_IRQF; > =20 > @@ -139,9 +139,7 @@ static int asm9260_rtc_read_time(struct device *dev= , struct rtc_time *tm) > { > struct asm9260_rtc_priv *priv =3D dev_get_drvdata(dev); > u32 ctime0, ctime1, ctime2; > - unsigned long irq_flags; > =20 > - spin_lock_irqsave(&priv->lock, irq_flags); > ctime0 =3D ioread32(priv->iobase + HW_CTIME0); > ctime1 =3D ioread32(priv->iobase + HW_CTIME1); > ctime2 =3D ioread32(priv->iobase + HW_CTIME2); > @@ -155,7 +153,6 @@ static int asm9260_rtc_read_time(struct device *dev= , struct rtc_time *tm) > ctime1 =3D ioread32(priv->iobase + HW_CTIME1); > ctime2 =3D ioread32(priv->iobase + HW_CTIME2); > } > - spin_unlock_irqrestore(&priv->lock, irq_flags); > =20 > tm->tm_sec =3D (ctime0 >> BM_CTIME0_SEC_S) & BM_CTIME0_SEC_M; > tm->tm_min =3D (ctime0 >> BM_CTIME0_MIN_S) & BM_CTIME0_MIN_M; > @@ -174,9 +171,7 @@ static int asm9260_rtc_read_time(struct device *dev= , struct rtc_time *tm) > static int asm9260_rtc_set_time(struct device *dev, struct rtc_time *t= m) > { > struct asm9260_rtc_priv *priv =3D dev_get_drvdata(dev); > - unsigned long irq_flags; > =20 > - spin_lock_irqsave(&priv->lock, irq_flags); > /* > * make sure SEC counter will not flip other counter on write time, > * real value will be written at the enf of sequence. > @@ -191,7 +186,6 @@ static int asm9260_rtc_set_time(struct device *dev,= struct rtc_time *tm) > iowrite32(tm->tm_hour, priv->iobase + HW_HOUR); > iowrite32(tm->tm_min, priv->iobase + HW_MIN); > iowrite32(tm->tm_sec, priv->iobase + HW_SEC); > - spin_unlock_irqrestore(&priv->lock, irq_flags); > =20 > return 0; > } > @@ -199,9 +193,7 @@ static int asm9260_rtc_set_time(struct device *dev,= struct rtc_time *tm) > static int asm9260_rtc_read_alarm(struct device *dev, struct rtc_wkalr= m *alrm) > { > struct asm9260_rtc_priv *priv =3D dev_get_drvdata(dev); > - unsigned long irq_flags; > =20 > - spin_lock_irqsave(&priv->lock, irq_flags); > alrm->time.tm_year =3D ioread32(priv->iobase + HW_ALYEAR); > alrm->time.tm_mon =3D ioread32(priv->iobase + HW_ALMON); > alrm->time.tm_mday =3D ioread32(priv->iobase + HW_ALDOM); > @@ -213,7 +205,6 @@ static int asm9260_rtc_read_alarm(struct device *de= v, struct rtc_wkalrm *alrm) > =20 > alrm->enabled =3D ioread32(priv->iobase + HW_AMR) ? 1 : 0; > alrm->pending =3D ioread32(priv->iobase + HW_CIIR) ? 1 : 0; > - spin_unlock_irqrestore(&priv->lock, irq_flags); > =20 > return rtc_valid_tm(&alrm->time); > } > @@ -221,9 +212,7 @@ static int asm9260_rtc_read_alarm(struct device *de= v, struct rtc_wkalrm *alrm) > static int asm9260_rtc_set_alarm(struct device *dev, struct rtc_wkalrm= *alrm) > { > struct asm9260_rtc_priv *priv =3D dev_get_drvdata(dev); > - unsigned long irq_flags; > =20 > - spin_lock_irqsave(&priv->lock, irq_flags); > iowrite32(alrm->time.tm_year, priv->iobase + HW_ALYEAR); > iowrite32(alrm->time.tm_mon, priv->iobase + HW_ALMON); > iowrite32(alrm->time.tm_mday, priv->iobase + HW_ALDOM); > @@ -234,7 +223,6 @@ static int asm9260_rtc_set_alarm(struct device *dev= , struct rtc_wkalrm *alrm) > iowrite32(alrm->time.tm_sec, priv->iobase + HW_ALSEC); > =20 > iowrite32(alrm->enabled ? 0 : BM_AMR_OFF, priv->iobase + HW_AMR); > - spin_unlock_irqrestore(&priv->lock, irq_flags); > =20 > return 0; > } >=20 --=20 Regards, Oleksij --tVuEpBE5W2U5rBDT1u22dUGlILNmEwTI9-- --0OnJIiWKcXMvIWQIDT7SpxNbwpAgtmqt2 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREIAAYFAlfG9FMACgkQHwImuRkmbWkEKQD+NWw/r8E+Rqqj/qmlcom1ZrBg LrWEPloD/7kHQoctbJwA+wUkiIZNXWSRoWtqFMsZ49jICVDZPD98hysYXyhn6bmr =BAck -----END PGP SIGNATURE----- --0OnJIiWKcXMvIWQIDT7SpxNbwpAgtmqt2--