From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163AbbI0Gsy (ORCPT ); Sun, 27 Sep 2015 02:48:54 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36057 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751429AbbI0Gsx (ORCPT ); Sun, 27 Sep 2015 02:48:53 -0400 From: Sudip Mukherjee To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, Guenter Roeck , Linus Torvalds , akpm@linux-foundation.org, shuah.kh@samsung.com, Daniel Axtens , Subject: [PATCH] cxl: Don't remove AFUs/vPHBs in cxl_reset Date: Sun, 27 Sep 2015 12:18:41 +0530 Message-Id: <1443336521-28119-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <56073970.7060303@roeck-us.net> References: <56073970.7060303@roeck-us.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Axtens commit 4e1efb403c1c016ae831bd9988a7d2e5e0af41a0 upstream. If the driver doesn't participate in EEH, the AFUs will be removed by cxl_remove, which will be invoked by EEH. If the driver does particpate in EEH, the vPHB needs to stick around so that the it can particpate. In both cases, we shouldn't remove the AFU/vPHB. Reviewed-by: Cyril Bur Signed-off-by: Daniel Axtens Signed-off-by: Michael Ellerman Reported-by: Guenter Roeck Signed-off-by: Sudip Mukherjee Cc: # 4.1.9 --- drivers/misc/cxl/pci.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index 9eab76c..4f1b0bd 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -781,9 +781,6 @@ int cxl_reset(struct cxl *adapter) dev_info(&dev->dev, "CXL reset\n"); - for (i = 0; i < adapter->slices; i++) - cxl_remove_afu(adapter->afu[i]); - /* pcie_warm_reset requests a fundamental pci reset which includes a * PERST assert/deassert. PERST triggers a loading of the image * if "user" or "factory" is selected in sysfs */ -- 1.9.1