Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates
 149.199.60.83 as permitted sender) receiver=protection.outlook.com;
 client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01;
Subject: Re: [PATCH] rtc: zynqmp: Clear alarm interrupt status before
 interrupt enable
To:     Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Michal Simek <monstr@monstr.eu>
Cc:     Srinivas Neeli <srinivas.neeli@xilinx.com>,
        Alessandro Zummo <a.zummo@towertech.it>,
        Srinivas Goud <sgoud@xilinx.com>,
        Shubhrajyoti Datta <shubhraj@xilinx.com>,
        linux-rtc@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
        linux-arm <linux-arm-kernel@lists.infradead.org>,
        git <git@xilinx.com>
References: <1576155618-7933-1-git-send-email-srinivas.neeli@xilinx.com>
 <CAHTX3dKSq1oTzkoRv3wK3rhkc1r0rOiQhFKmgsYbtG_uvOfAJg@mail.gmail.com>
 <20200211103939.GD3527@piout.net>
From:   Michal Simek <michal.simek@xilinx.com>
Message-ID: <49ee656d-0d5e-c97f-f77e-04b1f1a187b4@xilinx.com>
Date:   Tue, 11 Feb 2020 11:40:40 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.4.1
MIME-Version: 1.0
In-Reply-To: <20200211103939.GD3527@piout.net>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2020 10:40:54.4237
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 5c9c2d2d-3d22-4ce5-992b-08d7aededf25
X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.60.83];Helo=[xsj-pvapsmtpgw01]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6932
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 11. 02. 20 11:39, Alexandre Belloni wrote:
> On 10/02/2020 12:48:14+0100, Michal Simek wrote:
>> Hi,
>>
>> čt 12. 12. 2019 v 14:01 odesílatel Srinivas Neeli
>> <srinivas.neeli@xilinx.com> napsal:
>>>
>>> Fix multiple occurring interrupts for alarm interrupt. RTC module doesn't
>>> clear the alarm interrupt status bit immediately after the interrupt is
>>> triggered.This is due to the sticky nature of the alarm interrupt status
>>> register. The alarm interrupt status register can be cleared only after
>>> the second counter outruns the set alarm value. To fix multiple spurious
>>> interrupts, disable alarm interrupt in the handler and clear the status
>>> bit before enabling the alarm interrupt.
>>>
>>> Fixes: 11143c19eb57 ("rtc: add xilinx zynqmp rtc driver")
>>> Signed-off-by: Srinivas Neeli <srinivas.neeli@xilinx.com>
>>> ---
>>>  drivers/rtc/rtc-zynqmp.c | 29 ++++++++++++++++++++++++-----
>>>  1 file changed, 24 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/rtc/rtc-zynqmp.c b/drivers/rtc/rtc-zynqmp.c
>>> index 5786866c09e9..d311e3ef1f21 100644
>>> --- a/drivers/rtc/rtc-zynqmp.c
>>> +++ b/drivers/rtc/rtc-zynqmp.c
>>> @@ -38,6 +38,8 @@
>>>
>>>  #define RTC_CALIB_DEF          0x198233
>>>  #define RTC_CALIB_MASK         0x1FFFFF
>>> +#define RTC_ALRM_MASK          BIT(1)
>>> +#define RTC_MSEC               1000
>>>
>>>  struct xlnx_rtc_dev {
>>>         struct rtc_device       *rtc;
>>> @@ -124,11 +126,28 @@ static int xlnx_rtc_alarm_irq_enable(struct device *dev, u32 enabled)
>>>  {
>>>         struct xlnx_rtc_dev *xrtcdev = dev_get_drvdata(dev);
>>>
>>
>> here shouldn't be empty line.
>>
>>> -       if (enabled)
>>> +       unsigned int status;
>>> +       ulong timeout;
>>> +
>>> +       timeout = jiffies + msecs_to_jiffies(RTC_MSEC);
>>> +
>>> +       if (enabled) {
>>> +               while (1) {
>>> +                       status = readl(xrtcdev->reg_base + RTC_INT_STS);
>>> +                       if (!((status & RTC_ALRM_MASK) == RTC_ALRM_MASK))
>>> +                               break;
>>> +
>>> +                       if (time_after_eq(jiffies, timeout)) {
>>> +                               dev_err(dev, "Time out occur, while clearing alarm status bit\n");
>>> +                               return -ETIMEDOUT;
>>> +                       }
>>> +                       writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_STS);
>>> +               }
>>> +
>>>                 writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_EN);
>>> -       else
>>> +       } else {
>>>                 writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_DIS);
>>> -
>>> +       }
>>
>> And here it was good to have empty line.
>>
>>>         return 0;
>>>  }
>>>
>>> @@ -183,8 +202,8 @@ static irqreturn_t xlnx_rtc_interrupt(int irq, void *id)
>>>         if (!(status & (RTC_INT_SEC | RTC_INT_ALRM)))
>>>                 return IRQ_NONE;
>>>
>>> -       /* Clear RTC_INT_ALRM interrupt only */
>>> -       writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_STS);
>>> +       /* Disable RTC_INT_ALRM interrupt only */
>>> +       writel(RTC_INT_ALRM, xrtcdev->reg_base + RTC_INT_DIS);
>>>
>>>         if (status & RTC_INT_ALRM)
>>>                 rtc_update_irq(xrtcdev->rtc, 1, RTC_IRQF | RTC_AF);
>>> --
>>> 2.7.4
>>
>> Other then these two above things look good.
>>
>> Alexandre: Any issue with this patch?
>>
> 
> No issue, I was kind of waiting for your review. I'll take the patch
> once your comments are addressed.

Ok. Thanks,
Michal