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=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 6D92FC433FE for ; Tue, 14 Sep 2021 19:31:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5587E60E9B for ; Tue, 14 Sep 2021 19:31:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230061AbhINTcu (ORCPT ); Tue, 14 Sep 2021 15:32:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:50022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231461AbhINTct (ORCPT ); Tue, 14 Sep 2021 15:32:49 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CC5F9600CD; Tue, 14 Sep 2021 19:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631647892; bh=rtU/2+qXzD9rMj/5qvRqlaMb6+rl/c8gaobcTM2RoZU=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=G8Gg4WVRPmjz/9XSBLK2UBMDnzY6QRwAGHokL7EzKXilrV5MReMBdYVw5IBSPxY1n xxLcj4EzUmt25fOzHkVwsx+7+X/RRvY2oV1VEME0z8NaHUC4RA4J4ZQmjOWiw50bDE clnk6kXMMAvL2BGBSDBhdX93MRbE1m6BrgmR88IWe5O/hu3hi6HVXN/Nzk3jOXGNVO WXkJyh7g9WbbJ9gINjUHOG4ZrEa1mPTJDplhrksxuatqeM7MlwK8rl51xjRF6QWM11 2soen3+AGB6udu99EmWBakOoUhwwg0Y35X1BP1PiPh5tR+gZZcBnNmfaCTN0oggdva C71x4iUVn6cYA== Date: Tue, 14 Sep 2021 14:31:30 -0500 From: Bjorn Helgaas To: Niklas Schnelle Cc: Bjorn Helgaas , Benjamin Herrenschmidt , Michael Ellerman , Oliver O'Halloran , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-arch@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH 1/1] powerpc: Drop superfluous pci_dev_is_added() calls Message-ID: <20210914193130.GA1447657@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210910141940.2598035-2-schnelle@linux.ibm.com> Precedence: bulk List-ID: X-Mailing-List: linux-arch@vger.kernel.org On Fri, Sep 10, 2021 at 04:19:40PM +0200, Niklas Schnelle wrote: > On powerpc, pci_dev_is_added() is called as part of SR-IOV fixups > that are done under pcibios_add_device() which in turn is only called in > pci_device_add() whih is called when a PCI device is scanned. > > Now pci_dev_assign_added() is called in pci_bus_add_device() which is > only called after scanning the device. Thus pci_dev_is_added() is always > false and can be dropped. > > Signed-off-by: Niklas Schnelle Reviewed-by: Bjorn Helgaas This doesn't touch the PCI core, so maybe makes sense for you to take it, Michael? But let me know if you think otherwise. Thanks a lot for cleaning this up, Niklas. > --- > arch/powerpc/platforms/powernv/pci-sriov.c | 6 ------ > arch/powerpc/platforms/pseries/setup.c | 3 +-- > 2 files changed, 1 insertion(+), 8 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/pci-sriov.c b/arch/powerpc/platforms/powernv/pci-sriov.c > index 28aac933a439..deddbb233fde 100644 > --- a/arch/powerpc/platforms/powernv/pci-sriov.c > +++ b/arch/powerpc/platforms/powernv/pci-sriov.c > @@ -9,9 +9,6 @@ > > #include "pci.h" > > -/* for pci_dev_is_added() */ > -#include "../../../../drivers/pci/pci.h" > - > /* > * The majority of the complexity in supporting SR-IOV on PowerNV comes from > * the need to put the MMIO space for each VF into a separate PE. Internally > @@ -228,9 +225,6 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev) > > void pnv_pci_ioda_fixup_iov(struct pci_dev *pdev) > { > - if (WARN_ON(pci_dev_is_added(pdev))) > - return; > - > if (pdev->is_virtfn) { > struct pnv_ioda_pe *pe = pnv_ioda_get_pe(pdev); > > diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c > index f79126f16258..2188054470c1 100644 > --- a/arch/powerpc/platforms/pseries/setup.c > +++ b/arch/powerpc/platforms/pseries/setup.c > @@ -74,7 +74,6 @@ > #include > > #include "pseries.h" > -#include "../../../../drivers/pci/pci.h" > > DEFINE_STATIC_KEY_FALSE(shared_processor); > EXPORT_SYMBOL(shared_processor); > @@ -750,7 +749,7 @@ static void pseries_pci_fixup_iov_resources(struct pci_dev *pdev) > const int *indexes; > struct device_node *dn = pci_device_to_OF_node(pdev); > > - if (!pdev->is_physfn || pci_dev_is_added(pdev)) > + if (!pdev->is_physfn) > return; > /*Firmware must support open sriov otherwise dont configure*/ > indexes = of_get_property(dn, "ibm,open-sriov-vf-bar-info", NULL); > -- > 2.25.1 >