From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:33891 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750923AbcFDTwD (ORCPT ); Sat, 4 Jun 2016 15:52:03 -0400 Subject: Patch "powerpc/eeh: Don't report error in eeh_pe_reset_and_recover()" has been added to the 4.6-stable tree To: gwshan@linux.vnet.ibm.com, gregkh@linuxfoundation.org, mpe@ellerman.id.au, ruscur@russell.cc Cc: , From: Date: Sat, 04 Jun 2016 12:52:01 -0700 Message-ID: <14650699219324@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled powerpc/eeh: Don't report error in eeh_pe_reset_and_recover() to the 4.6-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: powerpc-eeh-don-t-report-error-in-eeh_pe_reset_and_recover.patch and it can be found in the queue-4.6 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From affeb0f2d3a9af419ad7ef4ac782e1540b2f7b28 Mon Sep 17 00:00:00 2001 From: Gavin Shan Date: Wed, 27 Apr 2016 11:14:50 +1000 Subject: powerpc/eeh: Don't report error in eeh_pe_reset_and_recover() From: Gavin Shan commit affeb0f2d3a9af419ad7ef4ac782e1540b2f7b28 upstream. The function eeh_pe_reset_and_recover() is used to recover EEH error when the passthrough device are transferred to guest and backwards, meaning the device's driver is vfio-pci or none. When the driver is vfio-pci that provides error_detected() error handler only, the handler simply stops the guest and it's not expected behaviour. On the other hand, no error handlers will be called if we don't have a bound driver. This ignores the error handler in eeh_pe_reset_and_recover() that reports the error to device driver to avoid the exceptional behaviour. Fixes: 5cfb20b9 ("powerpc/eeh: Emulate EEH recovery for VFIO devices") Signed-off-by: Gavin Shan Reviewed-by: Russell Currey Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/eeh_driver.c | 3 --- 1 file changed, 3 deletions(-) --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c @@ -564,9 +564,6 @@ int eeh_pe_reset_and_recover(struct eeh_ /* Save states */ eeh_pe_dev_traverse(pe, eeh_dev_save_state, NULL); - /* Report error */ - eeh_pe_dev_traverse(pe, eeh_report_error, &result); - /* Issue reset */ ret = eeh_reset_pe(pe); if (ret) { Patches currently in stable-queue which might be from gwshan@linux.vnet.ibm.com are queue-4.6/powerpc-eeh-restore-initial-state-in-eeh_pe_reset_and_recover.patch queue-4.6/revert-powerpc-eeh-fix-crash-in-eeh_add_device_early-on-cell.patch queue-4.6/powerpc-eeh-don-t-report-error-in-eeh_pe_reset_and_recover.patch