From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Or Gerlitz <ogerlitz@mellanox.com>
Cc: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, Eran Ben Elisha <eranbe@mellanox.com>,
Yishai Hadas <yishaih@mellanox.com>,
Daniel Jurgens <danielj@mellanox.com>
Subject: Re: [PATCH net 4/6] net/mlx4_core: Do not BUG_ON during reset when PCI is offline
Date: Wed, 17 Feb 2016 13:53:40 +0300 [thread overview]
Message-ID: <56C45134.4010809@cogentembedded.com> (raw)
In-Reply-To: <56C43B8E.2020209@mellanox.com>
Hello.
On 2/17/2016 12:21 PM, Or Gerlitz wrote:
>>> --- a/drivers/net/ethernet/mellanox/mlx4/catas.c
>>> +++ b/drivers/net/ethernet/mellanox/mlx4/catas.c
>>> @@ -182,10 +182,17 @@ void mlx4_enter_error_state(struct
>>> mlx4_dev_persistent *persist)
>>> err = mlx4_reset_slave(dev);
>>> else
>>> err = mlx4_reset_master(dev);
>>> - BUG_ON(err != 0);
>>> +
>>> + if (!err)
>>> + mlx4_err(dev, "device was reset successfully\n");
>>> + else
>>> + /* EEH could have disabled the PCI channel during reset. That's
>>> + * recoverable and the PCI error flow will handle it.
>>> + */
>>> + if (!pci_channel_offline(dev->persist->pdev))
>>> + BUG_ON(1);
>>
>> I'm afraid this needs {}.
>
> Hey, don't be afraid just for that, stay cool... we can add that here if it
> helps, as for the blank line not deletedby this patch on which you commented
> later, will not remove it as part of a patch which is a strict fix.
Actually it's *added* by the patch, that's why I asked to not do that.
> Or.
MBR, Sergei
next prev parent reply other threads:[~2016-02-17 10:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 15:01 [PATCH net 0/6] Mellanox 10/40G mlx4 driver fixes for 4.5-rc Or Gerlitz
2016-02-16 15:01 ` [PATCH net 1/6] net/mlx4_en: Do not count dropped packets twice Or Gerlitz
2016-02-16 18:31 ` Rick Jones
2016-02-17 10:19 ` Or Gerlitz
2016-02-16 15:01 ` [PATCH net 2/6] net/mlx4_en: Choose time-stamping shift value according to HW frequency Or Gerlitz
2016-02-16 15:01 ` [PATCH net 3/6] net/mlx4_core: Fix potential corruption in counters database Or Gerlitz
2016-02-16 15:01 ` [PATCH net 4/6] net/mlx4_core: Do not BUG_ON during reset when PCI is offline Or Gerlitz
2016-02-16 18:30 ` Sergei Shtylyov
2016-02-17 9:21 ` Or Gerlitz
2016-02-17 10:53 ` Sergei Shtylyov [this message]
2016-02-16 21:21 ` Sergei Shtylyov
2016-02-17 18:50 ` Sergei Shtylyov
2016-02-16 15:01 ` [PATCH net 5/6] net/mlx4_core: Set UAR page size to 4KB regardless of system page size Or Gerlitz
2016-02-16 15:01 ` [PATCH net 6/6] net/mlx4_en: Avoid changing dev->features directly in run-time Or Gerlitz
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=56C45134.4010809@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=danielj@mellanox.com \
--cc=davem@davemloft.net \
--cc=eranbe@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=yishaih@mellanox.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;
as well as URLs for NNTP newsgroup(s).