diff for duplicates of <1475016118.22933.1.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 01f748c..5b6c6c0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,15 +17,15 @@ Oops! Nice find! > that early; in our experiments we saw multiple failures on kernel > log, like: > -> ? [549.664] i40e 0007:01:00.1: Initial pf_reset failed: -15 -> ? [549.664] i40e: probe of 0007:01:00.1 failed with error -15 -> ? [...] -> ? [871.644] i40e 0007:01:00.1: The driver for the device stopped +> [549.664] i40e 0007:01:00.1: Initial pf_reset failed: -15 +> [549.664] i40e: probe of 0007:01:00.1 failed with error -15 +> [...] +> [871.644] i40e 0007:01:00.1: The driver for the device stopped > because the -> ? device firmware failed to init. Try updating your NVM image. -> ? [871.644] i40e: probe of 0007:01:00.1 failed with error -32 -> ? [...] -> ? [872.516] i40e 0007:01:00.0: ARQ: Unknown event 0x0000 ignored +> device firmware failed to init. Try updating your NVM image. +> [871.644] i40e: probe of 0007:01:00.1 failed with error -32 +> [...] +> [872.516] i40e 0007:01:00.0: ARQ: Unknown event 0x0000 ignored > > Between the first probe failure (error -15) and the second (error > -32) @@ -41,8 +41,8 @@ This seems reasonable. > Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com> > --- -> ?drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++ -> ?1 file changed, 6 insertions(+) +> drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++ +> 1 file changed, 6 insertions(+) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c > b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -51,12 +51,12 @@ This seems reasonable. > +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c > @@ -11360,6 +11360,12 @@ static pci_ers_result_t > i40e_pci_error_detected(struct pci_dev *pdev, -> ? -> ? dev_info(&pdev->dev, "%s: error %d\n", __func__, error); -> ? +> +> dev_info(&pdev->dev, "%s: error %d\n", __func__, error); +> > + if (!pf) { > + dev_info(&pdev->dev, -> + ?"Cannot recover - error happened during +> + "Cannot recover - error happened during > device probe\n"); > + return PCI_ERS_RESULT_DISCONNECT; > + } @@ -71,6 +71,6 @@ Thanks for the bug fix and detailed explanation! Regards, Jake -> ? /* shutdown all operations */ -> ? if (!test_bit(__I40E_SUSPENDED, &pf->state)) { -> ? rtnl_lock(); +> /* shutdown all operations */ +> if (!test_bit(__I40E_SUSPENDED, &pf->state)) { +> rtnl_lock(); diff --git a/a/content_digest b/N1/content_digest index 782e978..323552e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,12 @@ "ref\01475010871-31682-1-git-send-email-gpiccoli@linux.vnet.ibm.com\0" "From\0Keller, Jacob E <jacob.e.keller@intel.com>\0" - "Subject\0[Intel-wired-lan] [PATCH net] i40e: avoid NULL pointer dereference and recursive errors on early PCI error\0" + "Subject\0Re: [Intel-wired-lan] [PATCH net] i40e: avoid NULL pointer dereference and recursive errors on early PCI error\0" "Date\0Tue, 27 Sep 2016 22:41:59 +0000\0" - "To\0intel-wired-lan@osuosl.org\0" + "To\0gpiccoli@linux.vnet.ibm.com <gpiccoli@linux.vnet.ibm.com>" + Kirsher + Jeffrey T <jeffrey.t.kirsher@intel.com> + " intel-wired-lan@lists.osuosl.org <intel-wired-lan@lists.osuosl.org>\0" + "Cc\0netdev@vger.kernel.org <netdev@vger.kernel.org>\0" "\00:1\0" "b\0" "On Tue, 2016-09-27 at 18:14 -0300, Guilherme G. Piccoli wrote:\n" @@ -24,15 +28,15 @@ "> that early; in our experiments we saw multiple failures on kernel\n" "> log, like:\n" "> \n" - "> ? [549.664] i40e 0007:01:00.1: Initial pf_reset failed: -15\n" - "> ? [549.664] i40e: probe of 0007:01:00.1 failed with error -15\n" - "> ? [...]\n" - "> ? [871.644] i40e 0007:01:00.1: The driver for the device stopped\n" + "> \302\240 [549.664] i40e 0007:01:00.1: Initial pf_reset failed: -15\n" + "> \302\240 [549.664] i40e: probe of 0007:01:00.1 failed with error -15\n" + "> \302\240 [...]\n" + "> \302\240 [871.644] i40e 0007:01:00.1: The driver for the device stopped\n" "> because the\n" - "> ? device firmware failed to init. Try updating your NVM image.\n" - "> ? [871.644] i40e: probe of 0007:01:00.1 failed with error -32\n" - "> ? [...]\n" - "> ? [872.516] i40e 0007:01:00.0: ARQ: Unknown event 0x0000 ignored\n" + "> \302\240 device firmware failed to init. Try updating your NVM image.\n" + "> \302\240 [871.644] i40e: probe of 0007:01:00.1 failed with error -32\n" + "> \302\240 [...]\n" + "> \302\240 [872.516] i40e 0007:01:00.0: ARQ: Unknown event 0x0000 ignored\n" "> \n" "> Between the first probe failure (error -15) and the second (error\n" "> -32)\n" @@ -48,8 +52,8 @@ "\n" "> Signed-off-by: Guilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>\n" "> ---\n" - "> ?drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++\n" - "> ?1 file changed, 6 insertions(+)\n" + "> \302\240drivers/net/ethernet/intel/i40e/i40e_main.c | 6 ++++++\n" + "> \302\2401 file changed, 6 insertions(+)\n" "> \n" "> diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c\n" "> b/drivers/net/ethernet/intel/i40e/i40e_main.c\n" @@ -58,12 +62,12 @@ "> +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n" "> @@ -11360,6 +11360,12 @@ static pci_ers_result_t\n" "> i40e_pci_error_detected(struct pci_dev *pdev,\n" - "> ?\n" - "> ?\tdev_info(&pdev->dev, \"%s: error %d\\n\", __func__, error);\n" - "> ?\n" + "> \302\240\n" + "> \302\240\tdev_info(&pdev->dev, \"%s: error %d\\n\", __func__, error);\n" + "> \302\240\n" "> +\tif (!pf) {\n" "> +\t\tdev_info(&pdev->dev,\n" - "> +\t\t\t?\"Cannot recover - error happened during\n" + "> +\t\t\t\302\240\"Cannot recover - error happened during\n" "> device probe\\n\");\n" "> +\t\treturn PCI_ERS_RESULT_DISCONNECT;\n" "> +\t}\n" @@ -78,8 +82,8 @@ "Regards,\n" "Jake\n" "\n" - "> ?\t/* shutdown all operations */\n" - "> ?\tif (!test_bit(__I40E_SUSPENDED, &pf->state)) {\n" - "> ?\t\trtnl_lock();" + "> \302\240\t/* shutdown all operations */\n" + "> \302\240\tif (!test_bit(__I40E_SUSPENDED, &pf->state)) {\n" + "> \302\240\t\trtnl_lock();" -3ed4f55b4c1db0857bff04e230177c1c53ce556b945b756e34198e45b999a805 +2e45b1de3c8f2bbead1e3489e60b3851414b9ce2bcf63179f86b719a5596a77b
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.