From: Bjorn Helgaas <helgaas@kernel.org>
To: Wesley Sheng <wesley.sheng@microchip.com>
Cc: kurt.schwemmer@microsemi.com, logang@deltatee.com,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
wesleyshenggit@sina.com
Subject: Re: [PATCH v2 2/2] switchtec: Fix unintended mask of MRPC event
Date: Thu, 18 Apr 2019 08:49:02 -0500 [thread overview]
Message-ID: <20190418134902.GZ126710@google.com> (raw)
In-Reply-To: <1555339302-31829-3-git-send-email-wesley.sheng@microchip.com>
On Mon, Apr 15, 2019 at 10:41:42PM +0800, Wesley Sheng wrote:
> When running application tool switchtec-user's `firmware update` and
> `event wait` commands concurrently, sometimes the firmware update
> speed reduced evidently.
>
> It is because when the MRPC event happened right after MRPC event
> occurrence check but before event mask loop reach to its header
> register in event ISR, the MRPC event would be masked unintentionally.
> Since there's no chance to enable it again except for a module reload,
> all the following MRPC execution completion check will be deferred to
> timeout.
>
> Fix this bug by skipping the mask operation for MRPC event in event
> ISR, same as what we already do for LINK event.
>
> Fixes: 52eabba5bcdb ("switchtec: Add IOCTLs to the Switchtec driver")
> Signed-off-by: Wesley Sheng <wesley.sheng@microchip.com>
> ---
> drivers/pci/switch/switchtec.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
> index 7df9a69..30f6e08 100644
> --- a/drivers/pci/switch/switchtec.c
> +++ b/drivers/pci/switch/switchtec.c
> @@ -1177,7 +1177,8 @@ static int mask_event(struct switchtec_dev *stdev, int eid, int idx)
> if (!(hdr & SWITCHTEC_EVENT_OCCURRED && hdr & SWITCHTEC_EVENT_EN_IRQ))
> return 0;
>
> - if (eid == SWITCHTEC_IOCTL_EVENT_LINK_STATE)
> + if (eid == SWITCHTEC_IOCTL_EVENT_LINK_STATE ||
> + eid == SWITCHTEC_IOCTL_EVENT_MRPC_COMP)
> return 0;
I'm OK with this, but I do wonder why this check is in mask_event()
instead of in switchtec_event_isr(). AFAICT it doesn't depend on
anything in the mask_all_events() -> mask_event() path, and doing it
in switchtec_event_isr() would avoid the CSR read in mask_event().
But maybe it logically belongs here. I'll merge it as-is for now.
> dev_dbg(&stdev->dev, "%s: %d %d %x\n", __func__, eid, idx, hdr);
> --
> 2.7.4
>
next prev parent reply other threads:[~2019-04-18 13:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-15 14:41 [PATCH v2 0/2] Fix two bugs of switchtec module Wesley Sheng
2019-04-15 14:41 ` [PATCH v2 1/2] switchtec: Fix false maximum supported PCIe function number issue Wesley Sheng
2019-04-17 22:48 ` Bjorn Helgaas
[not found] ` <20190418165621.GA5272@sina.com>
2019-04-18 13:09 ` Bjorn Helgaas
2019-04-18 15:49 ` Logan Gunthorpe
2019-04-15 14:41 ` [PATCH v2 2/2] switchtec: Fix unintended mask of MRPC event Wesley Sheng
2019-04-18 13:49 ` Bjorn Helgaas [this message]
2019-04-15 15:51 ` [PATCH v2 0/2] Fix two bugs of switchtec module Logan Gunthorpe
2019-04-18 13:55 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190418134902.GZ126710@google.com \
--to=helgaas@kernel.org \
--cc=kurt.schwemmer@microsemi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=wesley.sheng@microchip.com \
--cc=wesleyshenggit@sina.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox