From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Dominik Brodowski <linux@dominikbrodowski.net>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 18/22] PCI, sys: Use device_type and attr_groups with pci dev
Date: Fri, 10 Feb 2012 20:06:21 -0800 [thread overview]
Message-ID: <1328933185-15154-19-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1328933185-15154-1-git-send-email-yinghai@kernel.org>
We want to create rescan in sys only for pci bridge instead of all pci dev.
We could use attribute_groups/is_visible method to do that.
Now pci dev does not use device type yet. So add pci_dev_type to take
attr_groups with it.
Add pci_dev_bridge_attrs_are_visible() to control attr_bridge_group only create
attr for bridge.
This is the framework related change, later could attr to bridge_attr_group,
to make those attr only show up on pci bridge device.
Also We could add more attr groups with is_visible to reduce messness in
pci_create_sysfs_dev_files. ( at least for boot_vga one )
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/pci-sysfs.c | 30 ++++++++++++++++++++++++++++++
drivers/pci/pci.h | 1 +
drivers/pci/probe.c | 1 +
3 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index d972303..124e826 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -1335,3 +1335,33 @@ static int __init pci_sysfs_init(void)
}
late_initcall(pci_sysfs_init);
+
+static struct attribute *pci_dev_bridge_attrs[] = {
+ NULL,
+};
+
+static umode_t pci_dev_bridge_attrs_are_visible(struct kobject *kobj,
+ struct attribute *a, int n)
+{
+ struct device *dev = container_of(kobj, struct device, kobj);
+ struct pci_dev *pdev = to_pci_dev(dev);
+
+ if (!pdev->subordinate)
+ return 0;
+
+ return a->mode;
+}
+
+static struct attribute_group pci_dev_bridge_attr_group = {
+ .attrs = pci_dev_bridge_attrs,
+ .is_visible = pci_dev_bridge_attrs_are_visible,
+};
+
+static const struct attribute_group *pci_dev_attr_groups[] = {
+ &pci_dev_bridge_attr_group,
+ NULL,
+};
+
+struct device_type pci_dev_type = {
+ .groups = pci_dev_attr_groups,
+};
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index f862a5a..8d17a1c 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -161,6 +161,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev)
}
extern struct device_attribute pci_dev_attrs[];
extern struct device_attribute pcibus_dev_attrs[];
+extern struct device_type pci_dev_type;
#ifdef CONFIG_HOTPLUG
extern struct bus_attribute pci_bus_attrs[];
#else
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 009946a..b24fa1f 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1100,6 +1100,7 @@ int pci_setup_device(struct pci_dev *dev)
dev->sysdata = dev->bus->sysdata;
dev->dev.parent = dev->bus->bridge;
dev->dev.bus = &pci_bus_type;
+ dev->dev.type = &pci_dev_type;
dev->hdr_type = hdr_type & 0x7f;
dev->multifunction = !!(hdr_type & 0x80);
dev->error_state = pci_channel_io_normal;
--
1.7.7
next prev parent reply other threads:[~2012-02-11 4:06 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-11 4:06 [PATCH -v6 0/22] PCI: allocate pci bus num range for unassigned bridge busn + pci rescan cleanup Yinghai Lu
2012-02-11 4:06 ` [PATCH 01/22] PCI: Add busn_res into struct pci_bus Yinghai Lu
2012-02-11 4:06 ` [PATCH 02/22] PCI: Add busn_res operation functions Yinghai Lu
2012-02-11 4:06 ` [PATCH 03/22] PCI: Add busn_res tracking in core Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 04/22] PCI, x86: Register busn_res for root buses Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 05/22] PCI, ia64: " Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 06/22] PCI, sparc: " Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 07/22] PCI, powerpc: " Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 08/22] PCI, parisc: " Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 09/22] PCI: Add pci_bus_extend/shrink_top() Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 10/22] PCI: Probe safe range that we can use for unassigned bridge Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 11/22] PCI: Strict checking of valid range for bridge Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 12/22] PCI: Allocate bus range instead of use max blindly Yinghai Lu
2012-02-11 4:06 ` [PATCH 13/22] PCI: kill pci_fixup_parent_subordinate_busnr() Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 14/22] PCI: Seperate child bus scanning to two passes overall Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 15/22] pcmcia: remove workaround for fixing pci parent bus subordinate Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 16/22] PCI: Double checking setting for bus register and bus struct Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 17/22] PCI, pciehp: Remove not needed bus number range checking Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu [this message]
2012-02-11 4:06 ` [PATCH 18/22] PCI, sys: Use device_type and attr_groups with pci dev Yinghai Lu
2012-02-11 4:06 ` [PATCH 19/22] PCI, sysfs: create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 20/22] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 21/22] PCI: make pci_rescan_bus_bridge_resize use pci_scan_bridge instead Yinghai Lu
2012-02-11 4:06 ` Yinghai Lu
2012-02-11 4:06 ` [PATCH 22/22] PCI: clean up rescan_bus_bridge_resize Yinghai Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328933185-15154-19-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).