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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0D1FC43461 for ; Thu, 10 Sep 2020 20:50:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B03E9214F1 for ; Thu, 10 Sep 2020 20:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599771011; bh=Agzfe7HExjYL6X7cfUQ4kj9lNgyrIBJvfmcOPAa0FdU=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=gGDOcYdJry/ikEVaQmIGI9ygYjyjElt6w9YQSXoCDiXfGepFn4G8oXGyPz1b241An l+HAME7azHqCwC2AWX6bBjxGrTghBlC7LtPQgEtzKz3ayCoADs+VPaZlrRmRkTPg1U 5VagVY5PXy4NjEK38bfJT1Pf0RbFsudJpAFz9ODk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727789AbgIJUuL (ORCPT ); Thu, 10 Sep 2020 16:50:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:51536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726792AbgIJUVJ (ORCPT ); Thu, 10 Sep 2020 16:21:09 -0400 Received: from localhost (52.sub-72-107-123.myvzw.com [72.107.123.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 26B2D221E3; Thu, 10 Sep 2020 20:21:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599769268; bh=Agzfe7HExjYL6X7cfUQ4kj9lNgyrIBJvfmcOPAa0FdU=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=vK+DqN966kgApGnPPLKKQldcvc7Yy8MIkyClhRe+/r1L1o57ibi53DRK1Ys6ZzTuW Fzwkj9M3BKYdC/o6+zmVLJRzMtgQ2y2H2esuv4B22W2YpC/kelqAyAXeQlgtnIFKKT PtOYdYdwOtkHsB9d4KhbGU37vWQf23BArjz17acs= Date: Thu, 10 Sep 2020 15:21:06 -0500 From: Bjorn Helgaas To: Tiezhu Yang Cc: Bjorn Helgaas , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Xuefeng Li , Huacai Chen Subject: Re: [RFC PATCH] PCI/portdrv: No need to call pci_disable_device() during shutdown Message-ID: <20200910202106.GA811000@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200910194138.GA808043@bjorn-Precision-5520> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [+cc Huacai] On Thu, Sep 10, 2020 at 02:41:39PM -0500, Bjorn Helgaas wrote: > On Sat, Sep 05, 2020 at 04:33:26PM +0800, Tiezhu Yang wrote: > > After commit 745be2e700cd ("PCIe: portdrv: call pci_disable_device > > during remove") and commit cc27b735ad3a ("PCI/portdrv: Turn off PCIe > > services during shutdown"), it also calls pci_disable_device() during > > shutdown, this seems unnecessary, so just remove it. > > I would like to get rid of the portdrv completely by folding its > functionality into the PCI core itself, so there would be no portdrv > probe or remove. > > Does this solve a problem? If not, I'm inclined to just leave it > as-is for now. But if it fixes something, we should do the fix, of > course. This looks awfully similar to [1], so I guess we *do* need to do something here. I'll respond there since it has more details. [1] https://lore.kernel.org/r/1596268180-9114-1-git-send-email-chenhc@lemote.com > > Signed-off-by: Tiezhu Yang > > --- > > drivers/pci/pcie/portdrv_core.c | 1 - > > drivers/pci/pcie/portdrv_pci.c | 14 +++++++++++++- > > 2 files changed, 13 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > > index 50a9522..1991aca 100644 > > --- a/drivers/pci/pcie/portdrv_core.c > > +++ b/drivers/pci/pcie/portdrv_core.c > > @@ -491,7 +491,6 @@ void pcie_port_device_remove(struct pci_dev *dev) > > { > > device_for_each_child(&dev->dev, NULL, remove_iter); > > pci_free_irq_vectors(dev); > > - pci_disable_device(dev); > > } > > > > /** > > diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c > > index 3a3ce40..cab37a8 100644 > > --- a/drivers/pci/pcie/portdrv_pci.c > > +++ b/drivers/pci/pcie/portdrv_pci.c > > @@ -143,6 +143,18 @@ static void pcie_portdrv_remove(struct pci_dev *dev) > > } > > > > pcie_port_device_remove(dev); > > + pci_disable_device(dev); > > +} > > + > > +static void pcie_portdrv_shutdown(struct pci_dev *dev) > > +{ > > + if (pci_bridge_d3_possible(dev)) { > > + pm_runtime_forbid(&dev->dev); > > + pm_runtime_get_noresume(&dev->dev); > > + pm_runtime_dont_use_autosuspend(&dev->dev); > > + } > > + > > + pcie_port_device_remove(dev); > > } > > > > static pci_ers_result_t pcie_portdrv_error_detected(struct pci_dev *dev, > > @@ -211,7 +223,7 @@ static struct pci_driver pcie_portdriver = { > > > > .probe = pcie_portdrv_probe, > > .remove = pcie_portdrv_remove, > > - .shutdown = pcie_portdrv_remove, > > + .shutdown = pcie_portdrv_shutdown, > > > > .err_handler = &pcie_portdrv_err_handler, > > > > -- > > 2.1.0 > >