Skip to contentSkip to conversation

PCI changes for 2.5.69

PATCH New Greg KH 3 participants 12 messages May 22, 2003 – May 23, 2003

Subsystems (3)
Documentation PCI Driver core
lore
Share & tools
lore

Greg KH

author
#0 lore raw

PATCH 1/1 PCI changes for 2.5.69

Hi,

Here's some PCI changesets against the latest 2.5.69 tree. They include Matt Domsch's dynamic PCI id patch for sysfs, which has been gone over a few times on lkml in the recent past, and everyone now agrees with it.

It also includes the start of the work to add proper locking to the PCI devices and the PCI device and bus lists. After years of trying to foist that task off on unsuspecting people (who later run screaming from it), it looks like I'm finally going to have to do the work myself :)

Please pull from:

	bk://kernel.bkbits.net/gregkh/linux/pci-2.5

thanks,

greg k-h

p.s. I'll send these as patches in response to this email to lkml for those who want to see them.

 drivers/pci/pci-sysfs-dynids.c |  251 -------------
 Documentation/pci.txt          |   24 +
 drivers/base/bus.c             |    2 
 drivers/pci/Makefile           |    6 
 drivers/pci/bus.c              |    2 
 drivers/pci/hotplug.c          |   23 -
 drivers/pci/pci-driver.c       |  785 +++++++++++++++++++++++++++++++++--------
 drivers/pci/pci-sysfs-dynids.c |  251 +++++++++++++
 drivers/pci/pci.h              |    2 
 drivers/pci/probe.c            |   18 
 include/linux/device.h         |   35 +
 include/linux/pci-dynids.h     |   68 ++-
 include/linux/pci.h            |   47 +-
 13 files changed, 1045 insertions(+), 469 deletions(-)

-----

Greg Kroah-Hartman <[email protected]>:
o PCI: remove pci_insert_device() as no one uses it anymore
o PCI: add pci_get_dev() and pci_put_dev()

Matt Domsch <[email protected]>:
o dynids: call driver_attach() when new IDs are added
o pci.h whitespace cleanups
o PCI dynids - documentation fixes, id_table NULL check
o Shrink dynids feature set
o Device Driver Dynamic PCI Device IDs

author
#1 lore raw

PATCH 1/1 PCI changes for 2.5.69

ChangeSet 1.1042.9.1, 2003/04/16 16:03:20-05:00, [email protected]

Device Driver Dynamic PCI Device IDs

Provides a mechanism to pass new PCI device IDs to device drivers at runtime, rather than relying only on a static compiled-in list of supported IDs.

For each driver which has a pci_driver->probe routine, two things are added: a probe_it file, and a dynamic_id directory. In the dynamic_id directory is a new file, new_id.

/sys/bus/pci/drivers/e100
|-- dynamic_id
| `-- new_id
`-- probe_it

One may read the new_id file, which by default returns:

$ cat new_id
echo vendor device subvendor subdevice class classmask
where each field is a 32-bit value in ABCD (hex) format (no leading 0x).
Pass only as many fields as you need to override the defaults below.
Default vendor, device, subvendor, and subdevice fields
are set to FFFFFFFF (PCI_ANY_ID).
Default class and classmask fields are set to 0.

One may write new PCI device IDs into the new_id file:
echo "8086 1229" > new_id

which will cause a new device ID (sysfs name 0) to be added to the driver.

/sys/bus/pci/drivers/e100

|-- dynamic_id
|   |-- 0
|   `-- new_id

`-- probe_it

$ cat 0
00008086 00001229 ffffffff ffffffff 00000000 00000000

One can then cause the driver to probe for devices again. echo 1 > probe_it

Individual device drivers may override the behavior of the new_id file, for instance, if they need to also pass driver-specific information. Likewise, reading the individual dynamic ID files can be overridden by the driver.

This also adds an existance test field to struct driver_attribute, necessary because we only want the probe_it file to appear iff struct pci_driver->probe is non-NULL.

The device probing routines in pci-driver.c are enhanced to scan first the static list of IDs, then the dynamic list (if any).

 drivers/pci/Makefile           |    2 
 drivers/pci/pci-driver.c       |  267 +++++++++++++++++++++++++++++++++++++----
 drivers/pci/pci-sysfs-dynids.c |  251 ++++++++++++++++++++++++++++++++++++++
 drivers/pci/pci.h              |    1 
 include/linux/device.h         |   11 +
 include/linux/pci-dynids.h     |   40 ++++++
 include/linux/pci.h            |    2 
 7 files changed, 547 insertions(+), 27 deletions(-)
drivers/pci/Makefile +1 -1
diff -Nru a/drivers/pci/Makefile b/drivers/pci/Makefile
@@ -4,7 +4,7 @@
 
 obj-y		+= access.o bus.o probe.o pci.o pool.o quirks.o \
 			names.o pci-driver.o search.o hotplug.o \
-			pci-sysfs.o
+			pci-sysfs.o pci-sysfs-dynids.o
 obj-$(CONFIG_PM)  += power.o
 obj-$(CONFIG_PROC_FS) += proc.o
drivers/pci/pci-driver.c +241 -26

318 lines not on this page · raw message

drivers/pci/pci-sysfs-dynids.c new file +251 -0

251 lines not on this page · raw message

drivers/pci/pci.h +1 -0
diff -Nru a/drivers/pci/pci.h b/drivers/pci/pci.h
@@ -3,3 +3,4 @@
 extern int pci_hotplug (struct device *dev, char **envp, int num_envp,
 			 char *buffer, int buffer_size);
 extern void pci_create_sysfs_dev_files(struct pci_dev *pdev);
+extern int pci_register_dynids(struct pci_driver *drv);
include/linux/device.h +11 -0
diff -Nru a/include/linux/device.h b/include/linux/device.h
@@ -144,6 +144,7 @@
 	struct attribute	attr;
 	ssize_t (*show)(struct device_driver *, char * buf);
 	ssize_t (*store)(struct device_driver *, const char * buf, size_t count);
+	int (*exists)(struct device_driver *);
 };
 
 #define DRIVER_ATTR(_name,_mode,_show,_store)	\

@@ -151,7 +152,17 @@
 	.attr = {.name = __stringify(_name), .mode = _mode },	\
 	.show	= _show,				\
 	.store	= _store,				\
+	.exists	= NULL,				        \
 };
+
+#define DRIVER_ATTR_EXISTS(_name,_mode,_show,_store,_exists)	\
+struct driver_attribute driver_attr_##_name = { 		\
+	.attr = {.name = __stringify(_name), .mode = _mode },	\
+	.show	= _show,				\
+	.store	= _store,				\
+	.exists	= _exists,				\
+};
+
 
 extern int driver_create_file(struct device_driver *, struct driver_attribute *);
 extern void driver_remove_file(struct device_driver *, struct driver_attribute *);
include/linux/pci-dynids.h new file +40 -0
diff -Nru a/include/linux/pci-dynids.h b/include/linux/pci-dynids.h
@@ -0,0 +1,40 @@
+/*
+ *	PCI defines and function prototypes
+ *	Copyright 2003 Dell Computer Corporation
+ *        by Matt Domsch <[email protected]>
+ */
+
+#ifndef LINUX_PCI_DYNIDS_H
+#define LINUX_PCI_DYNIDS_H
+
+#include <linux/mod_devicetable.h>
+#include <linux/types.h>
+#include <linux/config.h>
+#include <linux/list.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+
+struct pci_driver;
+struct pci_device_id;
+
+struct dynid_attribute {
+	struct attribute	attr;
+	struct list_head        node;
+	struct pci_device_id   *id;
+	ssize_t (*show)(struct pci_driver * pdrv, struct dynid_attribute *dattr, char * buf);
+	ssize_t (*store)(struct pci_driver * pdrv, struct dynid_attribute *dattr, const char * buf, size_t count);
+	char name[KOBJ_NAME_LEN];
+};
+
+struct pci_dynamic_id_kobj {
+	ssize_t (*show_new_id)(struct pci_driver * pdrv, char * buf);
+	ssize_t (*store_new_id)(struct pci_driver * pdrv, const char * buf, size_t count);
+	ssize_t (*show_id)(struct pci_device_id * id, struct dynid_attribute *dattr, char * buf);
+
+	spinlock_t lock;            /* protects list, index */
+	struct list_head list;      /* for IDs added at runtime */
+	struct kobject kobj;        /* for displaying the list in sysfs */
+	unsigned int nextname;     /* name of next dynamic ID twhen created */
+};
+
+#endif
include/linux/pci.h +2 -0
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -343,6 +343,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/device.h>
+#include <linux/pci-dynids.h>
 
 /* File state for mmap()s on /proc/bus/pci/X/Y */
 enum pci_mmap_state {

@@ -502,6 +503,7 @@
 	int  (*enable_wake) (struct pci_dev *dev, u32 state, int enable);   /* Enable wake event */
 
 	struct device_driver	driver;
+	struct pci_dynamic_id_kobj  dynids;
 };
 
 #define	to_pci_driver(drv) container_of(drv,struct pci_driver, driver)
author
#2 lore raw

ChangeSet 1.1042.117.2, 2003/05/05 13:00:19-05:00, [email protected]

Shrink dynids feature set

Per recommendation from GregKH:
Remove directory 'dynamic_id'
Remove exporting dynamic_id/0 files
Remove probe_it driver attribute
Move new_id into driver directory as a driver attribute. Make it probe when new IDs are added.
Move attribute existance test into pci-driver.c completely.

 drivers/pci/pci-sysfs-dynids.c |  251 -----------------------------------------
 drivers/pci/Makefile           |    2 
 drivers/pci/pci-driver.c       |  110 +++++++++++------
 drivers/pci/pci.h              |    1 
 include/linux/device.h         |   11 -
 include/linux/pci-dynids.h     |   28 ----
 include/linux/pci.h            |   20 ++-
 7 files changed, 91 insertions(+), 332 deletions(-)
drivers/pci/Makefile +1 -1
diff -Nru a/drivers/pci/Makefile b/drivers/pci/Makefile
@@ -4,7 +4,7 @@
 
 obj-y		+= access.o bus.o probe.o pci.o pool.o quirks.o \
 			names.o pci-driver.o search.o hotplug.o \
-			pci-sysfs.o pci-sysfs-dynids.o
+			pci-sysfs.o
 obj-$(CONFIG_PM)  += power.o
 obj-$(CONFIG_PROC_FS) += proc.o
drivers/pci/pci-driver.c +69 -41

175 lines not on this page · raw message

drivers/pci/pci-sysfs-dynids.c deleted +0 -251

251 lines not on this page · raw message

drivers/pci/pci.h +0 -1
diff -Nru a/drivers/pci/pci.h b/drivers/pci/pci.h
@@ -3,4 +3,3 @@
 extern int pci_hotplug (struct device *dev, char **envp, int num_envp,
 			 char *buffer, int buffer_size);
 extern void pci_create_sysfs_dev_files(struct pci_dev *pdev);
-extern int pci_register_dynids(struct pci_driver *drv);
include/linux/device.h +0 -11
diff -Nru a/include/linux/device.h b/include/linux/device.h
@@ -143,7 +143,6 @@
 	struct attribute	attr;
 	ssize_t (*show)(struct device_driver *, char * buf);
 	ssize_t (*store)(struct device_driver *, const char * buf, size_t count);
-	int (*exists)(struct device_driver *);
 };
 
 #define DRIVER_ATTR(_name,_mode,_show,_store)	\

@@ -151,17 +150,7 @@
 	.attr = {.name = __stringify(_name), .mode = _mode },	\
 	.show	= _show,				\
 	.store	= _store,				\
-	.exists	= NULL,				        \
 };
-
-#define DRIVER_ATTR_EXISTS(_name,_mode,_show,_store,_exists)	\
-struct driver_attribute driver_attr_##_name = { 		\
-	.attr = {.name = __stringify(_name), .mode = _mode },	\
-	.show	= _show,				\
-	.store	= _store,				\
-	.exists	= _exists,				\
-};
-
 
 extern int driver_create_file(struct device_driver *, struct driver_attribute *);
 extern void driver_remove_file(struct device_driver *, struct driver_attribute *);
include/linux/pci-dynids.h +3 -25
diff -Nru a/include/linux/pci-dynids.h b/include/linux/pci-dynids.h
@@ -7,34 +7,12 @@
 #ifndef LINUX_PCI_DYNIDS_H
 #define LINUX_PCI_DYNIDS_H
 
-#include <linux/mod_devicetable.h>
-#include <linux/types.h>
-#include <linux/config.h>
 #include <linux/list.h>
-#include <linux/device.h>
-#include <linux/pci.h>
-
-struct pci_driver;
-struct pci_device_id;
+#include <linux/mod_devicetable.h>
 
-struct dynid_attribute {
-	struct attribute	attr;
+struct dynid {
 	struct list_head        node;
-	struct pci_device_id   *id;
-	ssize_t (*show)(struct pci_driver * pdrv, struct dynid_attribute *dattr, char * buf);
-	ssize_t (*store)(struct pci_driver * pdrv, struct dynid_attribute *dattr, const char * buf, size_t count);
-	char name[KOBJ_NAME_LEN];
-};
-
-struct pci_dynamic_id_kobj {
-	ssize_t (*show_new_id)(struct pci_driver * pdrv, char * buf);
-	ssize_t (*store_new_id)(struct pci_driver * pdrv, const char * buf, size_t count);
-	ssize_t (*show_id)(struct pci_device_id * id, struct dynid_attribute *dattr, char * buf);
-
-	spinlock_t lock;            /* protects list, index */
-	struct list_head list;      /* for IDs added at runtime */
-	struct kobject kobj;        /* for displaying the list in sysfs */
-	unsigned int nextname;     /* name of next dynamic ID twhen created */
+	struct pci_device_id    id;
 };
 
 #endif
include/linux/pci.h +18 -2
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -343,7 +343,6 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/device.h>
-#include <linux/pci-dynids.h>
 
 /* File state for mmap()s on /proc/bus/pci/X/Y */
 enum pci_mmap_state {

@@ -491,6 +490,12 @@
 	unsigned long end;
 };
 
+struct pci_dynids {
+	spinlock_t lock;            /* protects list, index */
+	struct list_head list;      /* for IDs added at runtime */
+	unsigned int use_driver_data:1; /* pci_driver->driver_data is used */
+};
+
 struct pci_driver {
 	struct list_head node;
 	char *name;

@@ -503,12 +508,14 @@
 	int  (*enable_wake) (struct pci_dev *dev, u32 state, int enable);   /* Enable wake event */
 
 	struct device_driver	driver;
-	struct pci_dynamic_id_kobj  dynids;
+	struct pci_dynids dynids;
 };
 
 #define	to_pci_driver(drv) container_of(drv,struct pci_driver, driver)
 
 
+
+
 /* these external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
 

@@ -704,6 +711,12 @@
 			 struct pci_bus_wrapped *wrapped_parent);
 extern int pci_remove_device_safe(struct pci_dev *dev);
 
+static inline void
+pci_dynids_set_use_driver_data(struct pci_driver *pdrv, int val)
+{
+	pdrv->dynids.use_driver_data = val;
+}
+
 #endif /* CONFIG_PCI */
 
 /* Include architecture-dependent settings and functions */

@@ -752,6 +765,7 @@
 static inline int scsi_to_pci_dma_dir(unsigned char scsi_dir) { return scsi_dir; }
 static inline int pci_find_capability (struct pci_dev *dev, int cap) {return 0; }
 static inline const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) { return NULL; }
+static inline void pci_dynids_set_use_driver_data(struct pci_driver *pdrv, int val) { }
 
 /* Power management related routines */
 static inline int pci_save_state(struct pci_dev *dev, u32 *buffer) { return 0; }

@@ -763,6 +777,8 @@
 	for(dev = NULL; 0; )
 
 #define	isa_bridge	((struct pci_dev *)NULL)
+
+
 
 #else
author
#3 lore raw

ChangeSet 1.1063.1.2, 2003/05/05 16:40:59-05:00, [email protected]

PCI dynids - documentation fixes, id_table NULL check

 Documentation/pci.txt    |   24 ++++++++++++++++++++++--
 drivers/pci/pci-driver.c |    4 +++-
 include/linux/pci.h      |    2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)
Documentation/pci.txt +22 -2
diff -Nru a/Documentation/pci.txt b/Documentation/pci.txt
@@ -45,8 +45,6 @@
 	id_table	Pointer to table of device ID's the driver is
 			interested in.  Most drivers should export this
 			table using MODULE_DEVICE_TABLE(pci,...).
-			Set to NULL to call probe() function for every
-			PCI device known to the system.
 	probe		Pointer to a probing function which gets called (during
 			execution of pci_register_driver for already existing
 			devices or later if a new device gets inserted) for all

@@ -82,6 +80,28 @@
 	class,		Device class to match. The class_mask tells which bits
 	class_mask	of the class are honored during the comparison.
 	driver_data	Data private to the driver.
+
+Most drivers don't need to use the driver_data field.  Best practice
+for use of driver_data is to use it as an index into a static list of
+equivalant device types, not to use it as a pointer.
+
+Have a table entry {PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID}
+to have probe() called for every PCI device known to the system.
+
+New PCI IDs may be added to a device driver at runtime by writing
+to the file /sys/bus/pci/drivers/{driver}/new_id.  When added, the
+driver will probe for all devices it can support.
+
+echo "vendor device subvendor subdevice class class_mask driver_data" > \
+ /sys/bus/pci/drivers/{driver}/new_id
+where all fields are passed in as hexadecimal values (no leading 0x).
+Users need pass only as many fields as necessary; vendor, device,
+subvendor, and subdevice fields default to PCI_ANY_ID (FFFFFFFF),
+class and classmask fields default to 0, and driver_data defaults to
+0UL.  Device drivers must call
+   pci_dynids_set_use_driver_data(pci_driver *, 1)
+in order for the driver_data field to get passed to the driver.
+Otherwise, only a 0 is passed in that field.
 
 When the driver exits, it just calls pci_unregister_driver() and the PCI layer
 automatically calls the remove hook for all devices handled by the driver.
drivers/pci/pci-driver.c +3 -1
diff -Nru a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
@@ -65,7 +65,9 @@
 {		   
 	int error = -ENODEV;
 	const struct pci_device_id *id;
-	
+
+	if (!drv->id_table)
+		return error;
 	id = pci_match_device(drv->id_table, pci_dev);
 	if (id)
 		error = drv->probe(pci_dev, id);
include/linux/pci.h +1 -1
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -499,7 +499,7 @@
 struct pci_driver {
 	struct list_head node;
 	char *name;
-	const struct pci_device_id *id_table;	/* NULL if wants all devices */
+	const struct pci_device_id *id_table;	/* must be non-NULL for probe to be called */
 	int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);	/* New device inserted */
 	void (*remove) (struct pci_dev *dev);	/* Device removed (NULL if not a hot-plug capable driver) */
 	int  (*save_state) (struct pci_dev *dev, u32 state);    /* Save Device Context */
author
#4 lore raw

ChangeSet 1.1063.1.3, 2003/05/05 17:29:47-05:00, [email protected]

pci.h whitespace cleanups

 include/linux/pci.h |    4 ----
 1 files changed, 4 deletions(-)
include/linux/pci.h +0 -4
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -514,8 +514,6 @@
 #define	to_pci_driver(drv) container_of(drv,struct pci_driver, driver)
 
 
-
-
 /* these external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
 

@@ -777,8 +775,6 @@
 	for(dev = NULL; 0; )
 
 #define	isa_bridge	((struct pci_dev *)NULL)
-
-
 
 #else
author
#5 lore raw

ChangeSet 1.1063.1.4, 2003/05/06 11:15:45-05:00, [email protected]

dynids: call driver_attach() when new IDs are added

This causes the driver to create proper device symlinks in sysfs when new IDs are added and thus new devices found by the driver.

drivers/base/bus.c
make driver_attach non-static
drivers/pci/pci-driver.c
delete probe_each_pci_dev, call driver_attach instead. Whitespace cleanups.
include/linux/device.h
add declaration of driver_attach.

 drivers/base/bus.c       |    2 -
 drivers/pci/pci-driver.c |   82 ++++++++++++++++++-----------------------------
 include/linux/device.h   |    1 
 3 files changed, 35 insertions(+), 50 deletions(-)
drivers/base/bus.c +1 -1
diff -Nru a/drivers/base/bus.c b/drivers/base/bus.c
@@ -316,7 +316,7 @@
  *	Note that we ignore the error from bus_match(), since it's perfectly
  *	valid for a driver not to bind to any devices.
  */
-static void driver_attach(struct device_driver * drv)
+void driver_attach(struct device_driver * drv)
 {
 	struct bus_type * bus = drv->bus;
 	struct list_head * entry;
drivers/pci/pci-driver.c +33 -49

179 lines not on this page · raw message

include/linux/device.h +1 -0
diff -Nru a/include/linux/device.h b/include/linux/device.h
@@ -318,6 +318,7 @@
  */
 extern void device_bind_driver(struct device * dev);
 extern void device_release_driver(struct device * dev);
+extern void driver_attach(struct device_driver * drv);
 
 
 /* driverfs interface for exporting device attributes */
author
#6 lore raw

ChangeSet 1.1210, 2003/05/22 10:30:35-07:00, [email protected]

PCI: add pci_get_dev() and pci_put_dev()

Move the PCI core to start using these, enabling proper reference counting on struct pci_dev.

 drivers/pci/bus.c        |    2 +-
 drivers/pci/hotplug.c    |    2 +-
 drivers/pci/pci-driver.c |   41 +++++++++++++++++++++++++++++++++++++++++
 drivers/pci/probe.c      |   18 ++++++++++++++++++
 include/linux/pci.h      |    2 ++
 5 files changed, 63 insertions(+), 2 deletions(-)
drivers/pci/bus.c +1 -1
diff -Nru a/drivers/pci/bus.c b/drivers/pci/bus.c
@@ -92,7 +92,7 @@
 		if (!list_empty(&dev->global_list))
 			continue;
 
-		device_register(&dev->dev);
+		device_add(&dev->dev);
 		list_add_tail(&dev->global_list, &pci_devices);
 #ifdef CONFIG_PROC_FS
 		pci_proc_attach_device(dev);
drivers/pci/hotplug.c +1 -1
diff -Nru a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
@@ -275,7 +275,7 @@
 	pci_proc_detach_device(dev);
 #endif
 
-	kfree(dev);
+	pci_put_dev(dev);
 }
 
 /**
drivers/pci/pci-driver.c +41 -0

50 lines not on this page · raw message

drivers/pci/probe.c +18 -0
diff -Nru a/drivers/pci/probe.c b/drivers/pci/probe.c
@@ -462,6 +462,21 @@
 	return 0;
 }
 
+/**
+ * pci_release_dev - free a pci device structure when all users of it are finished.
+ * @dev: device that's been disconnected
+ *
+ * Will be called only by the device core when all users of this pci device are
+ * done.
+ */
+static void pci_release_dev(struct device *dev)
+{
+	struct pci_dev *pci_dev;
+
+	pci_dev = to_pci_dev(dev);
+	kfree(pci_dev);
+}
+
 /*
  * Read the config data for a PCI device, sanity-check it
  * and fill in the dev structure...

@@ -506,6 +521,9 @@
 		kfree(dev);
 		return NULL;
 	}
+	device_initialize(&dev->dev);
+	dev->dev.release = pci_release_dev;
+	pci_get_dev(dev);
 
 	pci_name_device(dev);
include/linux/pci.h +2 -0
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -556,6 +556,8 @@
 struct resource *pci_find_parent_resource(const struct pci_dev *dev, struct resource *res);
 int pci_setup_device(struct pci_dev *dev);
 int pci_get_interrupt_pin(struct pci_dev *dev, struct pci_dev **bridge);
+extern struct pci_dev *pci_get_dev(struct pci_dev *dev);
+extern void pci_put_dev(struct pci_dev *dev);
 
 /* Generic PCI functions exported to card drivers */
author
#7 lore raw

ChangeSet 1.1212, 2003/05/22 14:31:07-07:00, [email protected]

[PATCH] PCI: remove pci_insert_device() as no one uses it anymore.

 drivers/pci/hotplug.c |   21 ---------------------
 include/linux/pci.h   |    1 -
 2 files changed, 22 deletions(-)
drivers/pci/hotplug.c +0 -21
diff -Nru a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c
@@ -207,26 +207,6 @@
 
 #endif /* CONFIG_HOTPLUG */
 
-/**
- * pci_insert_device - insert a pci device
- * @dev: the device to insert
- * @bus: where to insert it
- *
- * Link the device to both the global PCI device chain and the 
- * per-bus list of devices, add the /proc entry.
- */
-void
-pci_insert_device(struct pci_dev *dev, struct pci_bus *bus)
-{
-	list_add_tail(&dev->bus_list, &bus->devices);
-	list_add_tail(&dev->global_list, &pci_devices);
-#ifdef CONFIG_PROC_FS
-	pci_proc_attach_device(dev);
-#endif
-	/* add sysfs device files */
-	pci_create_sysfs_dev_files(dev);
-}
-
 static void
 pci_free_resources(struct pci_dev *dev)
 {

@@ -300,7 +280,6 @@
 }
 
 #ifdef CONFIG_HOTPLUG
-EXPORT_SYMBOL(pci_insert_device);
 EXPORT_SYMBOL(pci_remove_bus_device);
 EXPORT_SYMBOL(pci_remove_behind_bridge);
 #endif
include/linux/pci.h +0 -1
diff -Nru a/include/linux/pci.h b/include/linux/pci.h
@@ -660,7 +660,6 @@
 /* New-style probing supporting hot-pluggable devices */
 int pci_register_driver(struct pci_driver *);
 void pci_unregister_driver(struct pci_driver *);
-void pci_insert_device(struct pci_dev *, struct pci_bus *);
 void pci_remove_bus_device(struct pci_dev *);
 void pci_remove_behind_bridge(struct pci_dev *);
 struct pci_driver *pci_dev_driver(const struct pci_dev *);
#8 lore raw
In reply to Greg KH
Quoted 20 lines · Greg KH

ChangeSet 1.1210, 2003/05/22 10:30:35-07:00, [email protected]

PCI: add pci_get_dev() and pci_put_dev()

Move the PCI core to start using these, enabling proper reference counting on struct pci_dev.

 drivers/pci/bus.c        |    2 +-
 drivers/pci/hotplug.c    |    2 +-
 drivers/pci/pci-driver.c |   41 +++++++++++++++++++++++++++++++++++++++++
 drivers/pci/probe.c      |   18 ++++++++++++++++++
 include/linux/pci.h      |    2 ++
 5 files changed, 63 insertions(+), 2 deletions(-)

diff -Nru a/drivers/pci/bus.c b/drivers/pci/bus.c

drivers/pci/bus.c line 95

Quoted 5 lines
drivers/pci/bus.c +1 -1
@@ -92,7 +92,7 @@
 		if (!list_empty(&dev->global_list))
 			continue;
 
-		device_register(&dev->dev);
+		device_add(&dev->dev);

This doesn't match the patch description..

drivers/pci/bus.c line 96

Quoted 1 line
drivers/pci/bus.c +1 -0
+struct pci_dev *pci_get_dev (struct pci_dev *dev)

Please fix up to adhere Documentation/CodingStyle (hint: placement of the opening brace is wrong).

drivers/pci/bus.c

Quoted 5 lines
drivers/pci/bus.c +5 -0
+{
+	struct device *tmp;
+
+	if (!dev)
+		return NULL;

Does it make sense to allow NULL argument here?

author
#9 lore raw
Quoted 24 lines · Christoph Hellwig
Quoted 23 lines · Greg KH

ChangeSet 1.1210, 2003/05/22 10:30:35-07:00, [email protected]

PCI: add pci_get_dev() and pci_put_dev()

Move the PCI core to start using these, enabling proper reference counting on struct pci_dev.

 drivers/pci/bus.c        |    2 +-
 drivers/pci/hotplug.c    |    2 +-
 drivers/pci/pci-driver.c |   41 +++++++++++++++++++++++++++++++++++++++++
 drivers/pci/probe.c      |   18 ++++++++++++++++++
 include/linux/pci.h      |    2 ++
 5 files changed, 63 insertions(+), 2 deletions(-)

diff -Nru a/drivers/pci/bus.c b/drivers/pci/bus.c

drivers/pci/bus.c +0 -0
@@ -92,7 +92,7 @@
 		if (!list_empty(&dev->global_list))
 			continue;
Quoted 4 lines

drivers/pci/bus.c line 95

Quoted 2 lines
drivers/pci/bus.c +1 -1
-		device_register(&dev->dev);
+		device_add(&dev->dev);

This doesn't match the patch description..

Yes it does. "Move the PCI core to start..." describes exactly this portion of the patch. We have to change from device_register() to device_add() if we want to grab a reference count on the pci device before we register it with the driver core. Which we do want to do, because of the two stage process of creating and registering pci devices.

Quoted 4 lines

drivers/pci/bus.c line 96

Quoted 1 line
drivers/pci/bus.c +1 -0
+struct pci_dev *pci_get_dev (struct pci_dev *dev)

Please fix up to adhere Documentation/CodingStyle (hint: placement of the opening brace is wrong).

CodingStyle doesn't _explicitly_ say that this is not allowed :)

I'll fix it next set of pci patches...

Quoted 7 lines

drivers/pci/bus.c

Quoted 5 lines
drivers/pci/bus.c +5 -0
+{
+	struct device *tmp;
+
+	if (!dev)
+		return NULL;

Does it make sense to allow NULL argument here?

Just being safe. We can drop it if it really annoys you, but other subsystems do the same thing.

greg k-h

#10 lore raw
In reply to Greg KH
Quoted 4 lines · Greg KH

One may write new PCI device IDs into the new_id file:
echo "8086 1229" > new_id

which will cause a new device ID (sysfs name 0) to be added to the driver.

Why not call the probe routine at this point ? This would do away with the need for the probe_it file. The only downside I can see is that if we have a script echoing lots of device id updates, we're going to lots of additional (-ENODEV) probes.

Dave

author
#11 lore raw
Quoted 5 lines · Dave Jones
Quoted 3 lines · Greg KH

One may write new PCI device IDs into the new_id file:
echo "8086 1229" > new_id

Quoted 7 lines
Quoted 1 line

which will cause a new device ID (sysfs name 0) to be added to the driver.

Why not call the probe routine at this point ? This would do away with the need for the probe_it file. The only downside I can see is that if we have a script echoing lots of device id updates, we're going to lots of additional (-ENODEV) probes.

Keep reading through the patches :)

greg k-h