From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17F88C433F5 for ; Sat, 16 Oct 2021 09:06:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1C1B61040 for ; Sat, 16 Oct 2021 09:06:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235043AbhJPJIs (ORCPT ); Sat, 16 Oct 2021 05:08:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234999AbhJPJIs (ORCPT ); Sat, 16 Oct 2021 05:08:48 -0400 Received: from bmailout3.hostsharing.net (bmailout3.hostsharing.net [IPv6:2a01:4f8:150:2161:1:b009:f23e:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 475CDC061570 for ; Sat, 16 Oct 2021 02:06:40 -0700 (PDT) Received: from h08.hostsharing.net (h08.hostsharing.net [IPv6:2a01:37:1000::53df:5f1c:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.hostsharing.net", Issuer "RapidSSL TLS DV RSA Mixed SHA256 2020 CA-1" (verified OK)) by bmailout3.hostsharing.net (Postfix) with ESMTPS id 4F7F8100AF7F4; Sat, 16 Oct 2021 11:06:36 +0200 (CEST) Received: by h08.hostsharing.net (Postfix, from userid 100393) id 24106276E19; Sat, 16 Oct 2021 11:06:36 +0200 (CEST) Date: Sat, 16 Oct 2021 11:06:36 +0200 From: Lukas Wunner To: Bjorn Helgaas Cc: Kuppuswamy Sathyanarayanan , Sinan Kaya , Ashok Raj , Keith Busch , Yicong Yang , linux-pci@vger.kernel.org, Russell Currey , Oliver OHalloran , Stuart Hayes , Mika Westerberg , Oza Pawandeep Subject: Re: [PATCH 0/4] pciehp error recovery fix + cleanups Message-ID: <20211016090636.GA31246@wunner.de> References: <20211015192916.GA2150101@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211015192916.GA2150101@bhelgaas> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Fri, Oct 15, 2021 at 02:29:16PM -0500, Bjorn Helgaas wrote: > On Sat, Jul 31, 2021 at 02:39:00PM +0200, Lukas Wunner wrote: > > One fix for a pciehp error recovery issue spotted by Stuart > > plus three cleanups. Please review and test. Thanks! > > > > Lukas Wunner (4): > > PCI: pciehp: Ignore Link Down/Up caused by error-induced Hot Reset > > PCI/portdrv: Remove unused resume err_handler > > PCI/portdrv: Remove unused pcie_port_bus_{,un}register() declarations > > PCI/ERR: Reduce compile time for CONFIG_PCIEAER=n > > Applied to pci/hotplug for v5.16, thanks! > > I split off the pm_iter() to its own patch at the beginning. Thanks a lot, I wouldn't have gotten around to respinning the series until in a couple of days, so it's helpful that you took over. The lkp robot reported a trivial build issue caused by a dangling '#ifdef CONFIG_PCI_ERROR_RECOVERY'. If you could squash the below fix into the top-most commit on the branch I'd be grateful. Thanks! -- >8 -- diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 4d3f0e2..b0923bd 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -1542,7 +1542,7 @@ static int pci_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } -#ifdef CONFIG_PCI_ERROR_RECOVERY +#if defined(CONFIG_PCIEAER) || defined(CONFIG_EEH) /** * pci_uevent_ers - emit a uevent during recovery path of PCI device * @pdev: PCI device undergoing error recovery