From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1ED126AD4; Fri, 9 Aug 2024 20:02:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723233727; cv=none; b=pALxQowM/FCrnB+QB4kB60YGqoeZWz1TABKIvuhJMgNMlQt77xATPpXiq8vu7EIUANcOSAVXKROsD0GXQnug8LTc/tXTpIaPhA6ytlPfvkXBsb/U5gVH6hSa25sCvX3IVwBpe1yUibJjJRrxO1dU0gzFDYl0X3AALBL7IllTCe8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723233727; c=relaxed/simple; bh=aV5MT+chLmmO/yfLIXBie+rc9GKsrR27EwydQ6MxIk0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=Q5Sk1oakdzv1gndFkNeG3KkYMyHV1bNOjlhpKqy9aE0rMfnZt8QLacZWZSE4Rdi0Lar0QTohjuPeiDz8LGxAIKqJ7XX1Wnmw3zsphOR1huybnZQM5Irl8rGCxHeLMWI2mTY1QcOl1BE1qngiZajr/qy4KYsd7vXP5da+ipoVwL0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eJ60u4Gw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eJ60u4Gw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07ED0C32782; Fri, 9 Aug 2024 20:02:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723233727; bh=aV5MT+chLmmO/yfLIXBie+rc9GKsrR27EwydQ6MxIk0=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=eJ60u4Gw6utirW/v97vb3jPe9DIs1l3F/PLMXIg8Jl/Y5FNYRLpUNzCg7Y2XudtVN 9TtCt+4c/sAe8JJltLc3pfUxZ0kcOIj1SPTXqbSAhj5DEhoB8+Q8leNsFDuCM0FvZr nW+BQQiwTSDKW0JiID4h2qeDEUEJP7VKm10CvapvyTrPVhoSCYl7r33stukFPvBbei KtKEyg5KuYJpclrvB5+mLl9APmjR9YbqTMUY0bRUJ767FuUmtnI30wMUT5iAf4Kj4N XnMSlUyf0Ju0oIWLQIYF+m1cJoD2MIi+mr6v79U3oexi2/T5csY0T/h+TUesGLbPpl 385LU9scnxaIw== Date: Fri, 9 Aug 2024 15:02:05 -0500 From: Bjorn Helgaas To: Lukas Wunner Cc: Niklas Schnelle , Gerald Schaefer , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , linux-s390@vger.kernel.org, linux-pci@vger.kernel.org, Alistair Francis , Jonathan.Cameron@huawei.com, alex.williamson@redhat.com, christian.koenig@amd.com, kch@nvidia.com, gregkh@linuxfoundation.org, logang@deltatee.com, chaitanyak@nvidia.com, rdunlap@infradead.org, Alistair Francis , Sebastian Ott Subject: Re: [PATCH] s390/pci: Stop usurping pdev->dev.groups Message-ID: <20240809200205.GA210335@bhelgaas> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7b970f7923e373d1b23784721208f93418720485.1722870934.git.lukas@wunner.de> On Mon, Aug 05, 2024 at 05:24:05PM +0200, Lukas Wunner wrote: > Bjorn suggests using pdev->dev.groups for attribute_groups constructed > on PCI device enumeration: > > "Is it feasible to build an attribute group in pci_doe_init() and > add it to dev->groups so device_add() will automatically add them?" > https://msgid.link/20231019165829.GA1381099@bhelgaas > > Unfortunately on s390, pcibios_device_add() usurps pdev->dev.groups for > arch-specific attribute_groups, preventing its use for anything else. > > Introduce an ARCH_PCI_DEV_GROUPS macro which arches can define in > . The macro is visible in drivers/pci/pci-sysfs.c through > the inclusion of , which in turn includes . > > On s390, define the macro to the three attribute_groups previously > assigned to pdev->dev.groups. Thereby pdev->dev.groups is made > available for use by the PCI core. > > As a side effect, arch/s390/pci/pci_sysfs.c no longer needs to be > compiled into the kernel if CONFIG_SYSFS=n. > > Signed-off-by: Lukas Wunner Applied with Niklas' ack to pci/sysfs for v6.12, thanks! > --- > arch/s390/include/asm/pci.h | 9 ++++++++- > arch/s390/pci/Makefile | 3 ++- > arch/s390/pci/pci.c | 1 - > arch/s390/pci/pci_sysfs.c | 14 ++++---------- > drivers/pci/pci-sysfs.c | 5 +++++ > 5 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h > index 30820a6..9d920ce 100644 > --- a/arch/s390/include/asm/pci.h > +++ b/arch/s390/include/asm/pci.h > @@ -191,7 +191,14 @@ static inline bool zdev_enabled(struct zpci_dev *zdev) > return (zdev->fh & (1UL << 31)) ? true : false; > } > > -extern const struct attribute_group *zpci_attr_groups[]; > +extern const struct attribute_group zpci_attr_group; > +extern const struct attribute_group pfip_attr_group; > +extern const struct attribute_group zpci_ident_attr_group; > + > +#define ARCH_PCI_DEV_GROUPS &zpci_attr_group, \ > + &pfip_attr_group, \ > + &zpci_ident_attr_group, > + > extern unsigned int s390_pci_force_floating __initdata; > extern unsigned int s390_pci_no_rid; > > diff --git a/arch/s390/pci/Makefile b/arch/s390/pci/Makefile > index 0547a10..2c21f03 100644 > --- a/arch/s390/pci/Makefile > +++ b/arch/s390/pci/Makefile > @@ -3,7 +3,8 @@ > # Makefile for the s390 PCI subsystem. > # > > -obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_clp.o pci_sysfs.o \ > +obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_clp.o \ > pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ > pci_bus.o pci_kvm_hook.o > obj-$(CONFIG_PCI_IOV) += pci_iov.o > +obj-$(CONFIG_SYSFS) += pci_sysfs.o > diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c > index cff4838..bd9624c 100644 > --- a/arch/s390/pci/pci.c > +++ b/arch/s390/pci/pci.c > @@ -587,7 +587,6 @@ int pcibios_device_add(struct pci_dev *pdev) > if (pdev->is_physfn) > pdev->no_vf_scan = 1; > > - pdev->dev.groups = zpci_attr_groups; > zpci_map_resources(pdev); > > for (i = 0; i < PCI_STD_NUM_BARS; i++) { > diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c > index 0f4f1e8..1f81f6f 100644 > --- a/arch/s390/pci/pci_sysfs.c > +++ b/arch/s390/pci/pci_sysfs.c > @@ -197,7 +197,7 @@ static umode_t zpci_index_is_visible(struct kobject *kobj, > NULL, > }; > > -static struct attribute_group zpci_ident_attr_group = { > +const struct attribute_group zpci_ident_attr_group = { > .attrs = zpci_ident_attrs, > .is_visible = zpci_index_is_visible, > }; > @@ -223,7 +223,7 @@ static umode_t zpci_index_is_visible(struct kobject *kobj, > NULL, > }; > > -static struct attribute_group zpci_attr_group = { > +const struct attribute_group zpci_attr_group = { > .attrs = zpci_dev_attrs, > .bin_attrs = zpci_bin_attrs, > }; > @@ -235,14 +235,8 @@ static umode_t zpci_index_is_visible(struct kobject *kobj, > &dev_attr_segment3.attr, > NULL, > }; > -static struct attribute_group pfip_attr_group = { > + > +const struct attribute_group pfip_attr_group = { > .name = "pfip", > .attrs = pfip_attrs, > }; > - > -const struct attribute_group *zpci_attr_groups[] = { > - &zpci_attr_group, > - &pfip_attr_group, > - &zpci_ident_attr_group, > - NULL, > -}; > diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c > index 40cfa71..5d0f4db 100644 > --- a/drivers/pci/pci-sysfs.c > +++ b/drivers/pci/pci-sysfs.c > @@ -31,6 +31,10 @@ > #include > #include "pci.h" > > +#ifndef ARCH_PCI_DEV_GROUPS > +#define ARCH_PCI_DEV_GROUPS > +#endif > + > static int sysfs_initialized; /* = 0 */ > > /* show configuration fields */ > @@ -1624,6 +1628,7 @@ static umode_t pcie_dev_attrs_are_visible(struct kobject *kobj, > &pci_dev_acpi_attr_group, > #endif > &pci_dev_resource_resize_group, > + ARCH_PCI_DEV_GROUPS > NULL, > }; > > -- > 2.43.0 >