From: "Ronciak, John" <john.ronciak@intel.com>
To: Ethan Zhao <ethan.zhao@oracle.com>,
"Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel.com>,
"Brandeburg, Jesse" <jesse.brandeburg@intel.com>,
"Allan, Bruce W" <bruce.w.allan@intel.com>,
"Wyborny, Carolyn" <carolyn.wyborny@intel.com>,
"Skidmore, Donald C" <donald.c.skidmore@intel.com>,
"Rose, Gregory V" <gregory.v.rose@intel.com>,
"Vick, Matthew" <matthew.vick@intel.com>,
"Williams, Mitch A" <mitch.a.williams@intel.com>,
"Dev, Vasu" <vasu.dev@intel.com>,
"Parikh, Neerav" <neerav.parikh@intel.com>
Cc: Linux NICS <Linux-nics@isotope.jf.intel.com>,
"e1000-devel@lists.sourceforge.net"
<e1000-devel@lists.sourceforge.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"ethan.kernel@gmail.com" <ethan.kernel@gmail.com>,
"brian.maly@oracle.com" <brian.maly@oracle.com>
Subject: RE: [PATCH] i40e: don't enable and init FCOE by default when do PF reset
Date: Fri, 9 Jan 2015 16:41:51 +0000 [thread overview]
Message-ID: <D38E8E86660E514AB505863C19C9287C741097AF@ORSMSX102.amr.corp.intel.com> (raw)
In-Reply-To: <1420821466-5747-1-git-send-email-ethan.zhao@oracle.com>
Adding Vasu and Neerav
Cheers,
John
> -----Original Message-----
> From: Ethan Zhao [mailto:ethan.zhao@oracle.com]
> Sent: Friday, January 9, 2015 8:38 AM
> To: Kirsher, Jeffrey T; Brandeburg, Jesse; Allan, Bruce W; Wyborny, Carolyn;
> Skidmore, Donald C; Rose, Gregory V; Vick, Matthew; Ronciak, John;
> Williams, Mitch A
> Cc: Linux NICS; e1000-devel@lists.sourceforge.net; netdev@vger.kernel.org;
> linux-kernel@vger.kernel.org; ethan.kernel@gmail.com;
> brian.maly@oracle.com; Ethan Zhao
> Subject: [PATCH] i40e: don't enable and init FCOE by default when do PF
> reset
>
> While do PF reset with function i40e_reset_and_rebuild(), it will call
> i40e_init_pf_fcoe() by default if FCOE is defined, thus if the PF is resetted,
> FCOE will be enabled whatever it was - enabled or not.
>
> Such bug might be hit when PF resumes from suspend, run diagnostic test
> with ethtool, setup VLAN etc.
>
> Passed building with v3.19-rc3.
>
> Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_main.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c
> b/drivers/net/ethernet/intel/i40e/i40e_main.c
> index a5f2660..a2572cc 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_main.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
> @@ -6180,9 +6180,12 @@ static void i40e_reset_and_rebuild(struct i40e_pf
> *pf, bool reinit)
> }
> #endif /* CONFIG_I40E_DCB */
> #ifdef I40E_FCOE
> - ret = i40e_init_pf_fcoe(pf);
> - if (ret)
> - dev_info(&pf->pdev->dev, "init_pf_fcoe failed: %d\n", ret);
> + if (pf->flags & I40E_FLAG_FCOE_ENABLED) {
> + ret = i40e_init_pf_fcoe(pf);
> + if (ret)
> + dev_info(&pf->pdev->dev,
> + "init_pf_fcoe failed: %d\n", ret);
> + }
>
> #endif
> /* do basic switch setup */
> --
> 1.8.3.1
next prev parent reply other threads:[~2015-01-09 16:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-09 16:37 [PATCH] i40e: don't enable and init FCOE by default when do PF reset Ethan Zhao
2015-01-09 16:37 ` Ethan Zhao
2015-01-09 16:41 ` Ronciak, John [this message]
2015-01-09 16:41 ` Ronciak, John
2015-01-09 18:18 ` Dev, Vasu
2015-01-09 18:18 ` Dev, Vasu
2015-01-13 2:56 ` Ethan Zhao
2015-01-13 2:56 ` Ethan Zhao
2015-01-13 19:38 ` Dev, Vasu
2015-01-13 19:38 ` Dev, Vasu
2015-01-14 2:40 ` ethan zhao
2015-01-14 2:40 ` ethan zhao
2015-01-15 23:45 Dev, Vasu
2015-01-15 23:45 ` Dev, Vasu
2015-01-16 1:48 ` ethan zhao
2015-01-16 1:48 ` ethan zhao
2015-01-16 14:47 ` Jeff Kirsher
2015-01-16 14:47 ` Jeff Kirsher
2015-01-17 3:01 ` ethan zhao
2015-01-17 3:01 ` ethan zhao
2015-01-19 21:10 ` Dev, Vasu
2015-01-19 21:10 ` Dev, Vasu
2015-01-20 2:05 ` ethan zhao
2015-01-20 2:05 ` ethan zhao
2015-01-26 22:38 ` Dev, Vasu
2015-01-26 22:38 ` Dev, Vasu
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=D38E8E86660E514AB505863C19C9287C741097AF@ORSMSX102.amr.corp.intel.com \
--to=john.ronciak@intel.com \
--cc=Linux-nics@isotope.jf.intel.com \
--cc=brian.maly@oracle.com \
--cc=bruce.w.allan@intel.com \
--cc=carolyn.wyborny@intel.com \
--cc=donald.c.skidmore@intel.com \
--cc=e1000-devel@lists.sourceforge.net \
--cc=ethan.kernel@gmail.com \
--cc=ethan.zhao@oracle.com \
--cc=gregory.v.rose@intel.com \
--cc=jeffrey.t.kirsher@intel.com \
--cc=jesse.brandeburg@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthew.vick@intel.com \
--cc=mitch.a.williams@intel.com \
--cc=neerav.parikh@intel.com \
--cc=netdev@vger.kernel.org \
--cc=vasu.dev@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.