bk://kernel.bkbits.net/gregkh/linux/driver-2.6
alexn@dsv.su.se[gregkh]|ChangeSet|20050302001342|31405 alexn
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2005/03/02 14:31:39-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
# into bix.(none):/usr/src/bk-driver-core
#
# fs/sysfs/file.c
# 2005/03/02 14:31:35-08:00 akpm@bix.(none) +0 -7
# Auto merged
#
# ChangeSet
# 2005/03/01 22:16:08-08:00 akpm@bix.(none)
# Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
# into bix.(none):/usr/src/bk-driver-core
#
# include/linux/pci_ids.h
# 2005/03/01 22:16:03-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# drivers/block/genhd.c
# 2005/03/01 22:16:03-08:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2005/03/01 16:13:42-08:00 alexn@dsv.su.se
# [PATCH] sysfs: fix signedness problem
#
# count is size_t, fill_write_buffer() may return a negative number
# which would evade the 'count > 0' checks and do bad things.
#
# found by the Coverity tool
#
# Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# fs/sysfs/file.c
# 2005/02/26 06:48:19-08:00 alexn@dsv.su.se +7 -6
# sysfs: fix signedness problem
#
# ChangeSet
# 2005/03/01 15:28:15-08:00 gregkh@suse.de
# USB: move usb core to use class_simple instead of it's own class functions.
#
# This is needed if the class code is going to be made easier to use, and it makes the code
# smaller and easier to understand.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/usb/core/file.c
# 2005/03/01 15:27:44-08:00 gregkh@suse.de +19 -36
# USB: move usb core to use class_simple instead of it's own class functions.
#
# This is needed if the class code is going to be made easier to use, and it makes the code
# smaller and easier to understand.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/25 14:29:26-08:00 akpm@osdl.org
# [PATCH] tpm-build-fix
#
# drivers/char/tpm/tpm.c: In function `show_pcrs':
# drivers/char/tpm/tpm.c:228: warning: passing arg 1 of `tpm_transmit' from incompatible pointer type
# drivers/char/tpm/tpm.c:238: warning: passing arg 1 of `tpm_transmit' from incompatible pointer type
#
#
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/char/tpm/tpm.c
# 2005/02/02 20:14:29-08:00 akpm@osdl.org +1 -1
# tpm-build-fix
#
# ChangeSet
# 2005/02/23 14:47:35-08:00 gregkh@suse.de
# debugfs: fix bool built-in type.
#
# Thanks to Alessandro Rubini <rubini@gnudd.com> for pointing this out.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# fs/debugfs/file.c
# 2005/02/23 14:47:21-08:00 gregkh@suse.de +1 -1
# debugfs: fix bool built-in type.
#
# Thanks to Alessandro Rubini <rubini@gnudd.com> for pointing this out.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/23 14:42:31-08:00 gregkh@suse.de
# debufs: make built in types add a \n to their output
#
# Thanks to Alessandro Rubini <rubini@gnudd.com> for pointing this out.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# fs/debugfs/file.c
# 2005/02/23 14:42:11-08:00 gregkh@suse.de +1 -1
# debufs: make built in types add a \n to their output
#
# Thanks to Alessandro Rubini <rubini@gnudd.com> for pointing this out.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/22 22:00:29-08:00 gregkh@suse.de
# kref: make kref_put return if this was the last put call.
#
# This is needed for the upcoming klist code from Pat.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# lib/kref.c
# 2005/02/22 22:00:08-08:00 gregkh@suse.de +9 -2
# kref: make kref_put return if this was the last put call.
#
# This is needed for the upcoming klist code from Pat.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# include/linux/kref.h
# 2005/02/22 22:00:08-08:00 gregkh@suse.de +1 -1
# kref: make kref_put return if this was the last put call.
#
# This is needed for the upcoming klist code from Pat.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/22 10:44:35-08:00 gregkh@suse.de
# kmap: remove usage of rwsem from kobj_map.
#
# This forces the caller to provide the lock, but as they all already had one, it's not a big change.
# It also removes the now-unneeded cdev_subsys. Thanks to Jon Corbet for reminding me about that.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# include/linux/kobj_map.h
# 2005/02/22 10:44:21-08:00 gregkh@suse.de +1 -1
# kmap: remove usage of rwsem from kobj_map.
#
# This forces the caller to provide the lock, but as they all already had one, it's not a big change.
# It also removes the now-unneeded cdev_subsys. Thanks to Jon Corbet for reminding me about that.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# fs/char_dev.c
# 2005/02/22 10:44:21-08:00 gregkh@suse.de +9 -17
# kmap: remove usage of rwsem from kobj_map.
#
# This forces the caller to provide the lock, but as they all already had one, it's not a big change.
# It also removes the now-unneeded cdev_subsys. Thanks to Jon Corbet for reminding me about that.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/block/genhd.c
# 2005/02/22 10:44:21-08:00 gregkh@suse.de +1 -1
# kmap: remove usage of rwsem from kobj_map.
#
# This forces the caller to provide the lock, but as they all already had one, it's not a big change.
# It also removes the now-unneeded cdev_subsys. Thanks to Jon Corbet for reminding me about that.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/base/map.c
# 2005/02/22 10:44:21-08:00 gregkh@suse.de +10 -11
# kmap: remove usage of rwsem from kobj_map.
#
# This forces the caller to provide the lock, but as they all already had one, it's not a big change.
# It also removes the now-unneeded cdev_subsys. Thanks to Jon Corbet for reminding me about that.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/22 10:44:06-08:00 gregkh@suse.de
# Cset exclude: gregkh@suse.de|ChangeSet|20050218211915|31940
#
# include/linux/kobj_map.h
# 2005/02/22 10:43:57-08:00 gregkh@suse.de +0 -0
# Exclude
#
# fs/char_dev.c
# 2005/02/22 10:43:57-08:00 gregkh@suse.de +0 -0
# Exclude
#
# drivers/block/genhd.c
# 2005/02/22 10:43:57-08:00 gregkh@suse.de +0 -0
# Exclude
#
# drivers/base/map.c
# 2005/02/22 10:43:57-08:00 gregkh@suse.de +0 -0
# Exclude
#
# ChangeSet
# 2005/02/18 14:54:21-08:00 gregkh@suse.de
# sysdev: remove the rwsem usage from this subsystem.
#
# If further finer grained locking is needed, we can add a lock to the sysdev_class to
# lock the class drivers list. But if you do that, remember the global list also is still
# there and needs to be protected. That's why I went with a simple lock for everything.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/base/sys.c
# 2005/02/18 14:54:06-08:00 gregkh@suse.de +11 -10
# sysdev: remove the rwsem usage from this subsystem.
#
# If further finer grained locking is needed, we can add a lock to the sysdev_class to
# lock the class drivers list. But if you do that, remember the global list also is still
# there and needs to be protected. That's why I went with a simple lock for everything.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/18 13:51:15-08:00 gregkh@suse.de
# sysdev: fix the name of the list of drivers to be a sane name
#
# Heh, "global_drivers" as a static...
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/base/sys.c
# 2005/02/18 13:51:00-08:00 gregkh@suse.de +8 -8
# sysdev: fix the name of the list of drivers to be a sane name
#
# Heh, "global_drivers" as a static...
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/18 12:22:31-08:00 gregkh@suse.de
# sysdev: make system_subsys static as no one else needs access to it.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/base/sys.c
# 2005/02/18 12:22:11-08:00 gregkh@suse.de +1 -1
# sysdev: make system_subsys static as no one else needs access to it.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/18 10:44:47-08:00 gregkh@suse.de
# class: add a semaphore to struct class, and use that instead of the subsystem rwsem.
#
# This moves us away from using the rwsem, although recursive adds and removes of class devices
# is not yet possible (nor is it really known if it even is needed.) So this simple change is
# done instead.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# include/linux/device.h
# 2005/02/18 10:44:34-08:00 gregkh@suse.de +1 -1
# class: add a semaphore to struct class, and use that instead of the subsystem rwsem.
#
# This moves us away from using the rwsem, although recursive adds and removes of class devices
# is not yet possible (nor is it really known if it even is needed.) So this simple change is
# done instead.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/base/class.c
# 2005/02/18 10:44:34-08:00 gregkh@suse.de +11 -12
# class: add a semaphore to struct class, and use that instead of the subsystem rwsem.
#
# This moves us away from using the rwsem, although recursive adds and removes of class devices
# is not yet possible (nor is it really known if it even is needed.) So this simple change is
# done instead.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/18 10:35:33-08:00 gregkh@suse.de
# Cset exclude: greg@kroah.com[gregkh]|ChangeSet|20050214235647|51449
#
# revert the class locking code patch, we have a better solution now...
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# include/linux/device.h
# 2005/02/18 10:35:31-08:00 gregkh@suse.de +0 -0
# Exclude
#
# drivers/base/class.c
# 2005/02/18 10:35:31-08:00 gregkh@suse.de +0 -0
# Exclude
#
# ChangeSet
# 2005/02/18 10:33:19-08:00 gregkh@suse.de
# Cset exclude: greg@kroah.com[gregkh]|ChangeSet|20050214235723|62591
#
# Back out sysdev changes, not fully baked yet.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# include/linux/sysdev.h
# 2005/02/18 10:33:11-08:00 gregkh@suse.de +0 -0
# Exclude
#
# drivers/base/sys.c
# 2005/02/18 10:33:11-08:00 gregkh@suse.de +0 -0
# Exclude
#
# ChangeSet
# 2005/02/17 23:56:57-08:00 gregkh@suse.de
# kset: make ksets have a spinlock, and use that to lock their lists
#
# Do this instead of using the rwsem of a subsys.
# Smaller, faster, and I'm trying to get rid of the rwsem in the subsys.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# lib/kobject.c
# 2005/02/17 23:56:36-08:00 gregkh@suse.de +7 -6
# kset: make ksets have a spinlock, and use that to lock their lists
#
# Do this instead of using the rwsem of a subsys.
# Smaller, faster, and I'm trying to get rid of the rwsem in the subsys.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# include/linux/kobject.h
# 2005/02/17 23:56:36-08:00 gregkh@suse.de +2 -0
# kset: make ksets have a spinlock, and use that to lock their lists
#
# Do this instead of using the rwsem of a subsys.
# Smaller, faster, and I'm trying to get rid of the rwsem in the subsys.
#
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# ChangeSet
# 2005/02/17 13:37:23-08:00 kay.sievers@vrfy.org
# [PATCH] floppy.c: pass physical device to device registration
#
# With this patch the floppy driver creates the usual symlink in sysfs to
# the physical device backing the block device:
#
# $tree /sys/block/
# /sys/block/
# |-- fd0
# | |-- dev
# | |-- device -> ../../devices/platform/floppy0
# ...
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/block/floppy.c
# 2005/02/04 01:12:34-08:00 kay.sievers@vrfy.org +6 -13
# floppy.c: pass physical device to device registration
#
# ChangeSet
# 2005/02/17 13:36:42-08:00 kay.sievers@vrfy.org
# [PATCH] Driver core: add "bus" symlink to class/block devices
#
# On Tue, Feb 15, 2005 at 09:53:44PM +0100, Kay Sievers wrote:
# > Add a "bus" symlink to the class and block devices, just like the "driver"
# > and "device" links. This may be a huge speed gain for e.g. udev to determine
# > the bus value of a device, as we currently need to do a brute-force scan in
# > /sys/bus/* to find this value.
#
# Hmm, while playing around with it, I think we should create the "bus"
# link on the physical device on not on the class device.
#
# Also the current "driver" link at the class device should be removed,
# cause class devices don't have a driver. Block devices never had this
# misleading symlink.
#
# From the class device we point with the "device" link to the physical
# device, and only the physical device should have the "driver" and the
# "bus" link, as it represents the real relationship.
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#
# drivers/base/class.c
# 2005/02/15 13:32:08-08:00 kay.sievers@vrfy.org +5 -31
# Driver core: add "bus" symlink to class/block devices
#
# drivers/base/bus.c
# 2005/02/15 13:33:37-08:00 kay.sievers@vrfy.org +2 -0
# Driver core: add "bus" symlink to class/block devices
#
# ChangeSet
# 2005/02/14 19:28:03-08:00 Michael.Waychison@Sun.COM
# [PATCH] driver core: clean driver unload
#
# Get rid of semaphore abuse by converting device_driver->unload_sem
# semaphore to device_driver->unloaded completion.
#
# This should get rid of any confusion as well as save a few bytes in the
# process.
#
# Signed-off-by: Mike Waychison <michael.waychison@sun.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# include/linux/device.h
# 2005/02/14 14:17:02-08:00 Michael.Waychison@Sun.COM +1 -1
# driver core: clean driver unload
#
# drivers/base/driver.c
# 2005/02/14 14:17:02-08:00 Michael.Waychison@Sun.COM +6 -7
# driver core: clean driver unload
#
# drivers/base/bus.c
# 2005/02/14 14:17:02-08:00 Michael.Waychison@Sun.COM +1 -1
# driver core: clean driver unload
#
# ChangeSet
# 2005/02/14 16:34:59-08:00 kay.sievers@vrfy.org
# [PATCH] videodev: pass dev_t to the class core
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/media/video/videodev.c
# 2005/02/14 14:17:33-08:00 kay.sievers@vrfy.org +1 -10
# videodev: pass dev_t to the class core
#
# ChangeSet
# 2005/02/14 16:34:41-08:00 kay.sievers@vrfy.org
# [PATCH] i2c: class driver pass dev_t to the class core
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/i2c/i2c-dev.c
# 2005/02/14 14:17:37-08:00 kay.sievers@vrfy.org +1 -8
# i2c: class driver pass dev_t to the class core
#
# ChangeSet
# 2005/02/14 16:34:23-08:00 kay.sievers@vrfy.org
# [PATCH] usb: class driver pass dev_t to the class core
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/usb/core/file.c
# 2005/02/14 14:17:41-08:00 kay.sievers@vrfy.org +1 -8
# usb: class driver pass dev_t to the class core
#
# ChangeSet
# 2005/02/14 16:34:05-08:00 kay.sievers@vrfy.org
# [PATCH] class_simple: pass dev_t to the class core
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/base/class_simple.c
# 2005/02/14 14:17:45-08:00 kay.sievers@vrfy.org +2 -19
# class_simple: pass dev_t to the class core
#
# ChangeSet
# 2005/02/14 16:33:47-08:00 kay.sievers@vrfy.org
# [PATCH] block core: export MAJOR/MINOR to the hotplug env
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/block/genhd.c
# 2005/02/14 14:17:49-08:00 kay.sievers@vrfy.org +34 -19
# block core: export MAJOR/MINOR to the hotplug env
#
# ChangeSet
# 2005/02/14 16:33:29-08:00 kay.sievers@vrfy.org
# [PATCH] class core: export MAJOR/MINOR to the hotplug env
#
# Move the creation of the sysfs "dev" file of a class device into the
# driver core. The struct class_device contains a dev_t value now. If set,
# the driver core will create the "dev" file containing the major/minor
# numbers automatically.
#
# Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# include/linux/device.h
# 2005/02/14 14:17:53-08:00 kay.sievers@vrfy.org +1 -0
# class core: export MAJOR/MINOR to the hotplug env
#
# drivers/base/class.c
# 2005/02/14 14:17:53-08:00 kay.sievers@vrfy.org +29 -10
# class core: export MAJOR/MINOR to the hotplug env
#
# ChangeSet
# 2005/02/14 16:33:11-08:00 paul.mundt@nokia.com
# [PATCH] Add SuperHyway bus subsystem
#
# Signed-off-by: Paul Mundt <paul.mundt@nokia.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# include/linux/superhyway.h
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +79 -0
# Add SuperHyway bus subsystem
#
# drivers/sh/superhyway/superhyway.c
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +201 -0
# Add SuperHyway bus subsystem
#
# drivers/sh/superhyway/superhyway-sysfs.c
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +45 -0
# Add SuperHyway bus subsystem
#
# drivers/sh/superhyway/Makefile
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +7 -0
# Add SuperHyway bus subsystem
#
# drivers/sh/Makefile
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +6 -0
# Add SuperHyway bus subsystem
#
# include/linux/superhyway.h
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/include/linux/superhyway.h
#
# drivers/sh/superhyway/superhyway.c
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/sh/superhyway/superhyway.c
#
# drivers/sh/superhyway/superhyway-sysfs.c
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/sh/superhyway/superhyway-sysfs.c
#
# drivers/sh/superhyway/Makefile
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/sh/superhyway/Makefile
#
# drivers/sh/Makefile
# 2005/02/14 14:17:58-08:00 paul.mundt@nokia.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/sh/Makefile
#
# ChangeSet
# 2005/02/14 16:18:43-08:00 rmk+lkml@arm.linux.org.uk
# [PATCH] driver core: Separate platform device name from platform device number
#
# Separate platform device name from platform device number such that
# names ending with numbers aren't confusing.
#
# Signed-off-by: Russell King <rmk@arm.linux.org.uk>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/base/platform.c
# 2005/02/14 14:18:06-08:00 rmk+lkml@arm.linux.org.uk +1 -1
# driver core: Separate platform device name from platform device number
#
# ChangeSet
# 2005/02/14 16:18:25-08:00 akpm@osdl.org
# [PATCH] tpm_atmel build fix
#
# drivers/char/tpm/tpm_atmel.c:131: unknown field `fops' specified in initializer
# drivers/char/tpm/tpm_atmel.c:131: warning: missing braces around initializer
#
#
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/char/tpm/tpm_atmel.c
# 2005/02/14 14:18:18-08:00 akpm@osdl.org +1 -1
# tpm_atmel build fix
#
# ChangeSet
# 2005/02/14 16:18:08-08:00 akpm@osdl.org
# [PATCH] tpm_msc-build-fix
#
# With older gcc's:
#
# drivers/char/tpm/tpm_nsc.c:238: unknown field `fops' specified in initializer
# drivers/char/tpm/tpm_nsc.c:238: warning: missing braces around initializer
#
#
# Signed-off-by: Andrew Morton <akpm@osdl.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/char/tpm/tpm_nsc.c
# 2005/02/14 14:18:22-08:00 akpm@osdl.org +2 -1
# tpm_msc-build-fix
#
# ChangeSet
# 2005/02/14 16:17:50-08:00 kjhall@us.ibm.com
# [PATCH] tpm: fix cause of SMP stack traces
#
# There were misplaced spinlock acquires and releases in the probe, close and release
# paths which were causing might_sleep and schedule while atomic error messages accompanied
# by stack traces when the kernel was compiled with SMP support. Bug reported by Reben Jenster
# <ruben@hotheads.de>
#
# Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/char/tpm/tpm.c
# 2005/02/14 14:18:27-08:00 kjhall@us.ibm.com +8 -8
# tpm: fix cause of SMP stack traces
#
# ChangeSet
# 2005/02/14 16:17:33-08:00 ecashin@coraid.com
# [PATCH] aoe: drivers/block/aoe/aoechr.c cleanups
#
# Adrian Bunk <bunk@stusta.de> writes:
#
# > This patch contains the following cleanups:
# > - make the needlessly global struct aoe_fops static
# > - #if 0 the unused global function aoechr_hdump
#
# Thanks for the patch. The original patch leaves the prototype for
# aoechr_hdump in aoe.h, but since this function is just for debugging,
# it seems better to just take both prototype and definition out.
#
#
# remove aoechr_hdump
# make aoe_fops static
#
# Signed-off-by: Adrian Bunk <bunk@stusta.de>
# Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/block/aoe/aoechr.c
# 2005/02/14 14:18:31-08:00 ecashin@coraid.com +1 -36
# aoe: drivers/block/aoe/aoechr.c cleanups
#
# drivers/block/aoe/aoe.h
# 2005/02/14 14:18:31-08:00 ecashin@coraid.com +0 -1
# aoe: drivers/block/aoe/aoechr.c cleanups
#
# ChangeSet
# 2005/02/14 16:17:16-08:00 ecashin@coraid.com
# [PATCH] aoe status.sh: handle sysfs not in /etc/mtab
#
# Suse 9.1 Pro doesn't put /sys in /etc/mtab. This patch makes the
# example aoe status.sh script work when sysfs is mounted but `mount`
# doesn't mention sysfs.
#
#
# aoe status.sh: handle sysfs not in /etc/mtab
#
# Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# Documentation/aoe/status.sh
# 2005/02/14 14:18:35-08:00 ecashin@coraid.com +5 -2
# aoe status.sh: handle sysfs not in /etc/mtab
#
# ChangeSet
# 2005/02/14 16:16:58-08:00 ecashin@coraid.com
# [PATCH] aoe: fail IO on disk errors
#
# This patch makes disk errors fail the IO instead of getting logged and
# ignored.
#
#
# Fail IO on disk errors
#
# Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/block/aoe/aoecmd.c
# 2005/02/14 14:18:39-08:00 ecashin@coraid.com +5 -3
# aoe: fail IO on disk errors
#
# ChangeSet
# 2005/02/14 16:16:40-08:00 ecashin@coraid.com
# [PATCH] aoe: update documentation for udev users
#
# Bodo Eggert <7eggert@gmx.de> writes:
#
# > Ed L Cashin <ecashin@coraid.com> wrote:
# >
# >> +if=A0test=A0-z=A0"$conf";=A0then
# >> +=A0=A0=A0=A0=A0=A0=A0=A0conf=3D"`find=A0/etc=A0-type=A0f=A0-name=A0udev=
# .conf=A02>=A0/dev/null`"
# >> +fi
# >> +if=A0test=A0-z=A0"$conf"=A0||=A0test=A0!=A0-r=A0$conf;=A0then
# >> +=A0=A0=A0=A0=A0=A0=A0=A0echo=A0"$me=A0Error:=A0could=A0not=A0find=A0rea=
# dable=A0udev.conf=A0in=A0/etc"=A01>&2
# >> +=A0=A0=A0=A0=A0=A0=A0=A0exit=A01
# >> +fi
# >
# > This will fail and print
# > ---
# > bash: test: etc/udev.conf: binary operator expected
# > ---
# > if there is more than one udev.conf.
# >
# > Fix: Always put quotes around variables.
#
# Thanks. With the changes below, it still will complain if it finds
# more than one udev.conf, but only if /etc/udev/udev.conf doesn't
# exist.
#
# Quote all shell variables, and use /etc/udev/udev.conf if available.
#
# Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# Documentation/aoe/udev-install.sh
# 2005/02/14 14:18:43-08:00 ecashin@coraid.com +9 -5
# aoe: update documentation for udev users
#
# ChangeSet
# 2005/02/14 16:16:23-08:00 ecashin@coraid.com
# [PATCH] aoe: add documentation for udev users
#
# add documentation for udev users
#
# Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# Documentation/aoe/udev.txt
# 2005/02/14 14:18:47-08:00 ecashin@coraid.com +23 -0
# aoe: add documentation for udev users
#
# Documentation/aoe/udev.txt
# 2005/02/14 14:18:47-08:00 ecashin@coraid.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/Documentation/aoe/udev.txt
#
# Documentation/aoe/aoe.txt
# 2005/02/14 14:18:47-08:00 ecashin@coraid.com +10 -3
# aoe: add documentation for udev users
#
# Documentation/aoe/udev-install.sh
# 2005/02/14 14:18:47-08:00 ecashin@coraid.com +22 -0
# aoe: add documentation for udev users
#
# Documentation/aoe/udev-install.sh
# 2005/02/14 14:18:47-08:00 ecashin@coraid.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/Documentation/aoe/udev-install.sh
#
# ChangeSet
# 2005/02/14 15:57:41-08:00 alexn@dsv.su.se
# [PATCH] AoE warning on 64-bit archs
#
# I just accidently built AoE on x86-64 and it emits a warning
# due to conversion of types of different size, trivial fix:
#
#
# Signed-off-by: Alexander Nyberg <alexn@dsv.su.se>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/block/aoe/aoechr.c
# 2005/02/14 14:18:51-08:00 alexn@dsv.su.se +2 -2
# AoE warning on 64-bit archs
#
# ChangeSet
# 2005/02/14 15:57:05-08:00 kjhall@us.ibm.com
# [PATCH] Add TPM hardware enablement driver
#
# This patch is a device driver to enable new hardware. The new hardware is
# the TPM chip as described by specifications at
# <http://www.trustedcomputinggroup.org>. The TPM chip will enable you to
# use hardware to securely store and protect your keys and personal data.
# To use the chip according to the specification, you will need the Trusted
# Software Stack (TSS) of which an implementation for Linux is available at:
# <http://sourceforge.net/projects/trousers>.
#
#
# Signed-off-by: Leendert van Doorn <leendert@watson.ibm.com>
# Signed-off-by: Reiner Sailer <sailer@watson.ibm.com>
# Signed-off-by: Dave Safford <safford@watson.ibm.com>
# Signed-off-by: Kylene Hall <kjhall@us.ibm.com>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# drivers/char/tpm/tpm_nsc.c
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +372 -0
# Add TPM hardware enablement driver
#
# drivers/char/tpm/tpm_atmel.c
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +216 -0
# Add TPM hardware enablement driver
#
# drivers/char/tpm/tpm.h
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +92 -0
# Add TPM hardware enablement driver
#
# drivers/char/tpm/tpm.c
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +697 -0
# Add TPM hardware enablement driver
#
# drivers/char/tpm/Makefile
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +7 -0
# Add TPM hardware enablement driver
#
# include/linux/pci_ids.h
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +1 -0
# Add TPM hardware enablement driver
#
# drivers/char/tpm/tpm_nsc.c
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/char/tpm/tpm_nsc.c
#
# drivers/char/tpm/tpm_atmel.c
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/char/tpm/tpm_atmel.c
#
# drivers/char/tpm/tpm.h
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/char/tpm/tpm.h
#
# drivers/char/tpm/tpm.c
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/char/tpm/tpm.c
#
# drivers/char/tpm/Makefile
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/char/tpm/Makefile
#
# drivers/char/tpm/Kconfig
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +39 -0
# Add TPM hardware enablement driver
#
# drivers/char/Makefile
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +1 -1
# Add TPM hardware enablement driver
#
# drivers/char/Kconfig
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +2 -0
# Add TPM hardware enablement driver
#
# drivers/char/tpm/Kconfig
# 2005/02/14 14:19:04-08:00 kjhall@us.ibm.com +0 -0
# BitKeeper file /home/greg/linux/BK/do/driver-2.6/drivers/char/tpm/Kconfig
#
# ChangeSet
# 2005/02/14 15:56:29-08:00 linux@dominikbrodowski.de
# [PATCH] cpufreq 2.4 interface removal schedule
#
# Even though these 2.4. interfaces are already gone in Dave Jones' cpufreq
# bitkeeper tree, here's a patch which properly announces it in
# Documentation/feature-removal-schedule.txt:
#
#
# Add meaningful content concerning the removal of deprecated interfaces to
# the cpufreq core.
#
# Signed-off-by: Dominik Brodowski <linux@brodo.de>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# Documentation/feature-removal-schedule.txt
# 2005/02/14 14:19:12-08:00 linux@dominikbrodowski.de +11 -3
# cpufreq 2.4 interface removal schedule
#
# ChangeSet
# 2005/02/14 15:56:12-08:00 rddunlap@osdl.org
# [PATCH] Add 2.4.x cpufreq /proc and sysctl interface removal feature-removal-schedule
#
# Add 2.4.x cpufreq /proc and sysctl interface removal
# to the feature-removal-schedule.
#
# Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# Documentation/feature-removal-schedule.txt
# 2005/02/14 14:19:16-08:00 rddunlap@osdl.org +9 -0
# Add 2.4.x cpufreq /proc and sysctl interface removal feature-removal-schedule
#
# ChangeSet
# 2005/02/14 15:55:54-08:00 arjan@infradead.org
# [PATCH] Kobject: remove some unneeded exports
#
# kobject_get_path and kobject_rename are only used by the sysfs core code
# and not aren't really driver-ish code. Remove the unused exports
#
# Signed-off-by: Arjan van de Ven <arjan@infradead.org>
# Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
#
# lib/kobject.c
# 2005/02/14 14:19:33-08:00 arjan@infradead.org +0 -2
# Kobject: remove some unneeded exports
#
diff -Nru a/Documentation/aoe/aoe.txt b/Documentation/aoe/aoe.txt
--- a/Documentation/aoe/aoe.txt 2005-03-03 21:53:30 -08:00
+++ b/Documentation/aoe/aoe.txt 2005-03-03 21:53:30 -08:00
@@ -6,9 +6,16 @@
CREATING DEVICE NODES
- Users of udev should find device nodes created automatically. Two
- scripts are provided in Documentation/aoe as examples of static
- device node creation for using the aoe driver.
+ Users of udev should find the block device nodes created
+ automatically, but to create all the necessary device nodes, use the
+ udev configuration rules provided in udev.txt (in this directory).
+
+ There is a udev-install.sh script that shows how to install these
+ rules on your system.
+
+ If you are not using udev, two scripts are provided in
+ Documentation/aoe as examples of static device node creation for
+ using the aoe driver.
rm -rf /dev/etherd
sh Documentation/aoe/mkdevs.sh /dev/etherd
diff -Nru a/Documentation/aoe/status.sh b/Documentation/aoe/status.sh
--- a/Documentation/aoe/status.sh 2005-03-03 21:53:30 -08:00
+++ b/Documentation/aoe/status.sh 2005-03-03 21:53:30 -08:00
@@ -4,10 +4,13 @@
set -e
format="%8s\t%8s\t%8s\n"
me=`basename $0`
+sysd=${sysfs_dir:-/sys}
# printf "$format" device mac netif state
-test -z "`mount | grep sysfs`" && {
+# Suse 9.1 Pro doesn't put /sys in /etc/mtab
+#test -z "`mount | grep sysfs`" && {
+test ! -d "$sysd/block" && {
echo "$me Error: sysfs is not mounted" 1>&2
exit 1
}
@@ -16,7 +19,7 @@
exit 1
}
-for d in `ls -d /sys/block/etherd* 2>/dev/null | grep -v p` end; do
+for d in `ls -d $sysd/block/etherd* 2>/dev/null | grep -v p` end; do
# maybe ls comes up empty, so we use "end"
test $d = end && continue
diff -Nru a/Documentation/aoe/udev-install.sh b/Documentation/aoe/udev-install.sh
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/Documentation/aoe/udev-install.sh 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,26 @@
+# install the aoe-specific udev rules from udev.txt into
+# the system's udev configuration
+#
+
+me="`basename $0`"
+
+# find udev.conf, often /etc/udev/udev.conf
+# (or environment can specify where to find udev.conf)
+#
+if test -z "$conf"; then
+ if test -r /etc/udev/udev.conf; then
+ conf=/etc/udev/udev.conf
+ else
+ conf="`find /etc -type f -name udev.conf 2> /dev/null`"
+ if test -z "$conf" || test ! -r "$conf"; then
+ echo "$me Error: no udev.conf found" 1>&2
+ exit 1
+ fi
+ fi
+fi
+
+# find the directory where udev rules are stored, often
+# /etc/udev/rules.d
+#
+rules_d="`sed -n '/^udev_rules=/{ s!udev_rules=!!; s!\"!!g; p; }' $conf`"
+test "$rules_d" && sh -xc "cp `dirname $0`/udev.txt $rules_d/60-aoe.rules"
diff -Nru a/Documentation/aoe/udev.txt b/Documentation/aoe/udev.txt
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/Documentation/aoe/udev.txt 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,23 @@
+# These rules tell udev what device nodes to create for aoe support.
+# They may be installed along the following lines (adjusted to what
+# you see on your system).
+#
+# ecashin@makki ~$ su
+# Password:
+# bash# find /etc -type f -name udev.conf
+# /etc/udev/udev.conf
+# bash# grep udev_rules= /etc/udev/udev.conf
+# udev_rules="/etc/udev/rules.d/"
+# bash# ls /etc/udev/rules.d/
+# 10-wacom.rules 50-udev.rules
+# bash# cp /path/to/linux-2.6.xx/Documentation/aoe/udev.txt \
+# /etc/udev/rules.d/60-aoe.rules
+#
+
+# aoe char devices
+SUBSYSTEM="aoe", KERNEL="discover", NAME="etherd/%k", GROUP="disk", MODE="0220"
+SUBSYSTEM="aoe", KERNEL="err", NAME="etherd/%k", GROUP="disk", MODE="0440"
+SUBSYSTEM="aoe", KERNEL="interfaces", NAME="etherd/%k", GROUP="disk", MODE="0220"
+
+# aoe block devices
+KERNEL="etherd*", NAME="%k", GROUP="disk"
diff -Nru a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
--- a/Documentation/feature-removal-schedule.txt 2005-03-03 21:53:30 -08:00
+++ b/Documentation/feature-removal-schedule.txt 2005-03-03 21:53:30 -08:00
@@ -15,3 +15,20 @@
against the LSB, and can be replaced by using udev.
Who: Greg Kroah-Hartman <greg@kroah.com>
+---------------------------
+
+What: /proc/sys/cpu/*, sysctl and /proc/cpufreq interfaces to cpufreq (2.4.x interfaces)
+When: January 2005
+Files: drivers/cpufreq/: cpufreq_userspace.c, proc_intf.c
+Why: /proc/sys/cpu/* has been deprecated since inclusion of cpufreq into
+ the main kernel tree. It bloats /proc/ unnecessarily and doesn't work
+ well with the "governor"-based design of cpufreq.
+ /proc/cpufreq/* has also been deprecated for a long time and was only
+ meant for usage during 2.5. until the new sysfs-based interface became
+ ready. It has an inconsistent interface which doesn't work well with
+ userspace setting the frequency. The output from /proc/cpufreq/* can
+ be emulated using "cpufreq-info --proc" (cpufrequtils).
+ Both interfaces are superseded by the cpufreq interface in
+ /sys/devices/system/cpu/cpu%n/cpufreq/.
+Who: Dominik Brodowski <linux@brodo.de>
+
diff -Nru a/drivers/base/bus.c b/drivers/base/bus.c
--- a/drivers/base/bus.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/bus.c 2005-03-03 21:53:30 -08:00
@@ -65,7 +65,7 @@
static void driver_release(struct kobject * kobj)
{
struct device_driver * drv = to_driver(kobj);
- up(&drv->unload_sem);
+ complete(&drv->unloaded);
}
static struct kobj_type ktype_driver = {
@@ -465,6 +465,7 @@
up_write(&dev->bus->subsys.rwsem);
device_add_attrs(bus, dev);
sysfs_create_link(&bus->devices.kobj, &dev->kobj, dev->bus_id);
+ sysfs_create_link(&dev->kobj, &dev->bus->subsys.kset.kobj, "bus");
}
return error;
}
@@ -481,6 +482,7 @@
void bus_remove_device(struct device * dev)
{
if (dev->bus) {
+ sysfs_remove_link(&dev->kobj, "bus");
sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
device_remove_attrs(dev->bus, dev);
down_write(&dev->bus->subsys.rwsem);
diff -Nru a/drivers/base/class.c b/drivers/base/class.c
--- a/drivers/base/class.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/class.c 2005-03-03 21:53:30 -08:00
@@ -15,6 +15,7 @@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/string.h>
+#include <linux/kdev_t.h>
#include "base.h"
#define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
@@ -139,6 +140,7 @@
INIT_LIST_HEAD(&cls->children);
INIT_LIST_HEAD(&cls->interfaces);
+ init_MUTEX(&cls->sem);
error = kobject_set_name(&cls->subsys.kset.kobj, "%s", cls->name);
if (error)
return error;
@@ -195,33 +197,6 @@
sysfs_remove_bin_file(&class_dev->kobj, attr);
}
-static int class_device_dev_link(struct class_device * class_dev)
-{
- if (class_dev->dev)
- return sysfs_create_link(&class_dev->kobj,
- &class_dev->dev->kobj, "device");
- return 0;
-}
-
-static void class_device_dev_unlink(struct class_device * class_dev)
-{
- sysfs_remove_link(&class_dev->kobj, "device");
-}
-
-static int class_device_driver_link(struct class_device * class_dev)
-{
- if ((class_dev->dev) && (class_dev->dev->driver))
- return sysfs_create_link(&class_dev->kobj,
- &class_dev->dev->driver->kobj, "driver");
- return 0;
-}
-
-static void class_device_driver_unlink(struct class_device * class_dev)
-{
- sysfs_remove_link(&class_dev->kobj, "driver");
-}
-
-
static ssize_t
class_device_attr_show(struct kobject * kobj, struct attribute * attr,
char * buf)
@@ -298,9 +273,9 @@
int num_envp, char *buffer, int buffer_size)
{
struct class_device *class_dev = to_class_dev(kobj);
- int retval = 0;
int i = 0;
int length = 0;
+ int retval = 0;
pr_debug("%s - name = %s\n", __FUNCTION__, class_dev->class_id);
@@ -313,26 +288,34 @@
&length, "PHYSDEVPATH=%s", path);
kfree(path);
- /* add bus name of physical device */
if (dev->bus)
add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length,
"PHYSDEVBUS=%s", dev->bus->name);
- /* add driver name of physical device */
if (dev->driver)
add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length,
"PHYSDEVDRIVER=%s", dev->driver->name);
-
- /* terminate, set to next free slot, shrink available space */
- envp[i] = NULL;
- envp = &envp[i];
- num_envp -= i;
- buffer = &buffer[length];
- buffer_size -= length;
}
+ if (MAJOR(class_dev->devt)) {
+ add_hotplug_env_var(envp, num_envp, &i,
+ buffer, buffer_size, &length,
+ "MAJOR=%u", MAJOR(class_dev->devt));
+
+ add_hotplug_env_var(envp, num_envp, &i,
+ buffer, buffer_size, &length,
+ "MINOR=%u", MINOR(class_dev->devt));
+ }
+
+ /* terminate, set to next free slot, shrink available space */
+ envp[i] = NULL;
+ envp = &envp[i];
+ num_envp -= i;
+ buffer = &buffer[length];
+ buffer_size -= length;
+
if (class_dev->class->hotplug) {
/* have the bus specific function add its stuff */
retval = class_dev->class->hotplug (class_dev, envp, num_envp,
@@ -388,6 +371,12 @@
}
}
+static ssize_t show_dev(struct class_device *class_dev, char *buf)
+{
+ return print_dev_t(buf, class_dev->devt);
+}
+static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
+
void class_device_initialize(struct class_device *class_dev)
{
kobj_set_kset_s(class_dev, class_obj_subsys);
@@ -425,16 +414,21 @@
/* now take care of our own registration */
if (parent) {
- down_write(&parent->subsys.rwsem);
+ down(&parent->sem);
list_add_tail(&class_dev->node, &parent->children);
list_for_each_entry(class_intf, &parent->interfaces, node)
if (class_intf->add)
class_intf->add(class_dev);
- up_write(&parent->subsys.rwsem);
+ up(&parent->sem);
}
+
+ if (MAJOR(class_dev->devt))
+ class_device_create_file(class_dev, &class_device_attr_dev);
+
class_device_add_attrs(class_dev);
- class_device_dev_link(class_dev);
- class_device_driver_link(class_dev);
+ if (class_dev->dev)
+ sysfs_create_link(&class_dev->kobj,
+ &class_dev->dev->kobj, "device");
register_done:
if (error && parent)
@@ -455,16 +449,16 @@
struct class_interface * class_intf;
if (parent) {
- down_write(&parent->subsys.rwsem);
+ down(&parent->sem);
list_del_init(&class_dev->node);
list_for_each_entry(class_intf, &parent->interfaces, node)
if (class_intf->remove)
class_intf->remove(class_dev);
- up_write(&parent->subsys.rwsem);
+ up(&parent->sem);
}
- class_device_dev_unlink(class_dev);
- class_device_driver_unlink(class_dev);
+ if (class_dev->dev)
+ sysfs_remove_link(&class_dev->kobj, "device");
class_device_remove_attrs(class_dev);
kobject_del(&class_dev->kobj);
@@ -516,8 +510,8 @@
int class_interface_register(struct class_interface *class_intf)
{
- struct class * parent;
- struct class_device * class_dev;
+ struct class *parent;
+ struct class_device *class_dev;
if (!class_intf || !class_intf->class)
return -ENODEV;
@@ -526,14 +520,13 @@
if (!parent)
return -EINVAL;
- down_write(&parent->subsys.rwsem);
+ down(&parent->sem);
list_add_tail(&class_intf->node, &parent->interfaces);
-
if (class_intf->add) {
list_for_each_entry(class_dev, &parent->children, node)
class_intf->add(class_dev);
}
- up_write(&parent->subsys.rwsem);
+ up(&parent->sem);
return 0;
}
@@ -546,14 +539,13 @@
if (!parent)
return;
- down_write(&parent->subsys.rwsem);
+ down(&parent->sem);
list_del_init(&class_intf->node);
-
if (class_intf->remove) {
list_for_each_entry(class_dev, &parent->children, node)
class_intf->remove(class_dev);
}
- up_write(&parent->subsys.rwsem);
+ up(&parent->sem);
class_put(parent);
}
diff -Nru a/drivers/base/class_simple.c b/drivers/base/class_simple.c
--- a/drivers/base/class_simple.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/class_simple.c 2005-03-03 21:53:30 -08:00
@@ -10,18 +10,15 @@
#include <linux/config.h>
#include <linux/device.h>
-#include <linux/kdev_t.h>
#include <linux/err.h>
struct class_simple {
- struct class_device_attribute attr;
struct class class;
};
#define to_class_simple(d) container_of(d, struct class_simple, class)
struct simple_dev {
struct list_head node;
- dev_t dev;
struct class_device class_dev;
};
#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
@@ -35,12 +32,6 @@
kfree(s_dev);
}
-static ssize_t show_dev(struct class_device *class_dev, char *buf)
-{
- struct simple_dev *s_dev = to_simple_dev(class_dev);
- return print_dev_t(buf, s_dev->dev);
-}
-
static void class_simple_release(struct class *class)
{
struct class_simple *cs = to_class_simple(class);
@@ -75,12 +66,6 @@
cs->class.class_release = class_simple_release;
cs->class.release = release_simple_dev;
- cs->attr.attr.name = "dev";
- cs->attr.attr.mode = S_IRUGO;
- cs->attr.attr.owner = owner;
- cs->attr.show = show_dev;
- cs->attr.store = NULL;
-
retval = class_register(&cs->class);
if (retval)
goto error;
@@ -143,7 +128,7 @@
}
memset(s_dev, 0x00, sizeof(*s_dev));
- s_dev->dev = dev;
+ s_dev->class_dev.devt = dev;
s_dev->class_dev.dev = device;
s_dev->class_dev.class = &cs->class;
@@ -154,8 +139,6 @@
if (retval)
goto error;
- class_device_create_file(&s_dev->class_dev, &cs->attr);
-
spin_lock(&simple_dev_list_lock);
list_add(&s_dev->node, &simple_dev_list);
spin_unlock(&simple_dev_list_lock);
@@ -200,7 +183,7 @@
spin_lock(&simple_dev_list_lock);
list_for_each_entry(s_dev, &simple_dev_list, node) {
- if (s_dev->dev == dev) {
+ if (s_dev->class_dev.devt == dev) {
found = 1;
break;
}
diff -Nru a/drivers/base/driver.c b/drivers/base/driver.c
--- a/drivers/base/driver.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/driver.c 2005-03-03 21:53:30 -08:00
@@ -79,14 +79,14 @@
* since most of the things we have to do deal with the bus
* structures.
*
- * The one interesting aspect is that we initialize @drv->unload_sem
- * to a locked state here. It will be unlocked when the driver
- * reference count reaches 0.
+ * The one interesting aspect is that we setup @drv->unloaded
+ * as a completion that gets complete when the driver reference
+ * count reaches 0.
*/
int driver_register(struct device_driver * drv)
{
INIT_LIST_HEAD(&drv->devices);
- init_MUTEX_LOCKED(&drv->unload_sem);
+ init_completion(&drv->unloaded);
return bus_add_driver(drv);
}
@@ -97,7 +97,7 @@
*
* Again, we pass off most of the work to the bus-level call.
*
- * Though, once that is done, we attempt to take @drv->unload_sem.
+ * Though, once that is done, we wait until @drv->unloaded is completed.
* This will block until the driver refcount reaches 0, and it is
* released. Only modular drivers will call this function, and we
* have to guarantee that it won't complete, letting the driver
@@ -107,8 +107,7 @@
void driver_unregister(struct device_driver * drv)
{
bus_remove_driver(drv);
- down(&drv->unload_sem);
- up(&drv->unload_sem);
+ wait_for_completion(&drv->unloaded);
}
/**
diff -Nru a/drivers/base/map.c b/drivers/base/map.c
--- a/drivers/base/map.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/map.c 2005-03-03 21:53:30 -08:00
@@ -25,7 +25,7 @@
int (*lock)(dev_t, void *);
void *data;
} *probes[255];
- struct rw_semaphore *sem;
+ struct semaphore *sem;
};
int kobj_map(struct kobj_map *domain, dev_t dev, unsigned long range,
@@ -53,7 +53,7 @@
p->range = range;
p->data = data;
}
- down_write(domain->sem);
+ down(domain->sem);
for (i = 0, p -= n; i < n; i++, p++, index++) {
struct probe **s = &domain->probes[index % 255];
while (*s && (*s)->range < range)
@@ -61,7 +61,7 @@
p->next = *s;
*s = p;
}
- up_write(domain->sem);
+ up(domain->sem);
return 0;
}
@@ -75,7 +75,7 @@
if (n > 255)
n = 255;
- down_write(domain->sem);
+ down(domain->sem);
for (i = 0; i < n; i++, index++) {
struct probe **s;
for (s = &domain->probes[index % 255]; *s; s = &(*s)->next) {
@@ -88,7 +88,7 @@
}
}
}
- up_write(domain->sem);
+ up(domain->sem);
kfree(found);
}
@@ -99,7 +99,7 @@
unsigned long best = ~0UL;
retry:
- down_read(domain->sem);
+ down(domain->sem);
for (p = domain->probes[MAJOR(dev) % 255]; p; p = p->next) {
struct kobject *(*probe)(dev_t, int *, void *);
struct module *owner;
@@ -120,7 +120,7 @@
module_put(owner);
continue;
}
- up_read(domain->sem);
+ up(domain->sem);
kobj = probe(dev, index, data);
/* Currently ->owner protects _only_ ->probe() itself. */
module_put(owner);
@@ -128,12 +128,11 @@
return kobj;
goto retry;
}
- up_read(domain->sem);
+ up(domain->sem);
return NULL;
}
-struct kobj_map *kobj_map_init(kobj_probe_t *base_probe,
- struct subsystem *s)
+struct kobj_map *kobj_map_init(kobj_probe_t *base_probe, struct semaphore *sem)
{
struct kobj_map *p = kmalloc(sizeof(struct kobj_map), GFP_KERNEL);
struct probe *base = kmalloc(sizeof(struct probe), GFP_KERNEL);
@@ -151,6 +150,6 @@
base->get = base_probe;
for (i = 0; i < 255; i++)
p->probes[i] = base;
- p->sem = &s->rwsem;
+ p->sem = sem;
return p;
}
diff -Nru a/drivers/base/platform.c b/drivers/base/platform.c
--- a/drivers/base/platform.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/platform.c 2005-03-03 21:53:30 -08:00
@@ -131,7 +131,7 @@
pdev->dev.bus = &platform_bus_type;
if (pdev->id != -1)
- snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s%u", pdev->name, pdev->id);
+ snprintf(pdev->dev.bus_id, BUS_ID_SIZE, "%s.%u", pdev->name, pdev->id);
else
strlcpy(pdev->dev.bus_id, pdev->name, BUS_ID_SIZE);
diff -Nru a/drivers/base/sys.c b/drivers/base/sys.c
--- a/drivers/base/sys.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/base/sys.c 2005-03-03 21:53:30 -08:00
@@ -79,7 +79,7 @@
/*
* declare system_subsys
*/
-decl_subsys(system, &ktype_sysdev, NULL);
+static decl_subsys(system, &ktype_sysdev, NULL);
int sysdev_class_register(struct sysdev_class * cls)
{
@@ -102,7 +102,8 @@
EXPORT_SYMBOL_GPL(sysdev_class_unregister);
-static LIST_HEAD(global_drivers);
+static LIST_HEAD(sysdev_drivers);
+static DECLARE_MUTEX(sysdev_drivers_lock);
/**
* sysdev_driver_register - Register auxillary driver
@@ -112,14 +113,14 @@
* If @cls is valid, then @drv is inserted into @cls->drivers to be
* called on each operation on devices of that class. The refcount
* of @cls is incremented.
- * Otherwise, @drv is inserted into global_drivers, and called for
+ * Otherwise, @drv is inserted into sysdev_drivers, and called for
* each device.
*/
int sysdev_driver_register(struct sysdev_class * cls,
struct sysdev_driver * drv)
{
- down_write(&system_subsys.rwsem);
+ down(&sysdev_drivers_lock);
if (cls && kset_get(&cls->kset)) {
list_add_tail(&drv->entry, &cls->drivers);
@@ -130,8 +131,8 @@
drv->add(dev);
}
} else
- list_add_tail(&drv->entry, &global_drivers);
- up_write(&system_subsys.rwsem);
+ list_add_tail(&drv->entry, &sysdev_drivers);
+ up(&sysdev_drivers_lock);
return 0;
}
@@ -144,7 +145,7 @@
void sysdev_driver_unregister(struct sysdev_class * cls,
struct sysdev_driver * drv)
{
- down_write(&system_subsys.rwsem);
+ down(&sysdev_drivers_lock);
list_del_init(&drv->entry);
if (cls) {
if (drv->remove) {
@@ -154,7 +155,7 @@
}
kset_put(&cls->kset);
}
- up_write(&system_subsys.rwsem);
+ up(&sysdev_drivers_lock);
}
EXPORT_SYMBOL_GPL(sysdev_driver_register);
@@ -193,13 +194,13 @@
if (!error) {
struct sysdev_driver * drv;
- down_write(&system_subsys.rwsem);
+ down(&sysdev_drivers_lock);
/* Generic notification is implicit, because it's that
* code that should have called us.
*/
/* Notify global drivers */
- list_for_each_entry(drv, &global_drivers, entry) {
+ list_for_each_entry(drv, &sysdev_drivers, entry) {
if (drv->add)
drv->add(sysdev);
}
@@ -209,7 +210,7 @@
if (drv->add)
drv->add(sysdev);
}
- up_write(&system_subsys.rwsem);
+ up(&sysdev_drivers_lock);
}
return error;
}
@@ -218,8 +219,8 @@
{
struct sysdev_driver * drv;
- down_write(&system_subsys.rwsem);
- list_for_each_entry(drv, &global_drivers, entry) {
+ down(&sysdev_drivers_lock);
+ list_for_each_entry(drv, &sysdev_drivers, entry) {
if (drv->remove)
drv->remove(sysdev);
}
@@ -228,7 +229,7 @@
if (drv->remove)
drv->remove(sysdev);
}
- up_write(&system_subsys.rwsem);
+ up(&sysdev_drivers_lock);
kobject_unregister(&sysdev->kobj);
}
@@ -255,7 +256,7 @@
pr_debug("Shutting Down System Devices\n");
- down_write(&system_subsys.rwsem);
+ down(&sysdev_drivers_lock);
list_for_each_entry_reverse(cls, &system_subsys.kset.list,
kset.kobj.entry) {
struct sys_device * sysdev;
@@ -268,7 +269,7 @@
pr_debug(" %s\n", kobject_name(&sysdev->kobj));
/* Call global drivers first. */
- list_for_each_entry(drv, &global_drivers, entry) {
+ list_for_each_entry(drv, &sysdev_drivers, entry) {
if (drv->shutdown)
drv->shutdown(sysdev);
}
@@ -284,7 +285,7 @@
cls->shutdown(sysdev);
}
}
- up_write(&system_subsys.rwsem);
+ up(&sysdev_drivers_lock);
}
@@ -319,7 +320,7 @@
pr_debug(" %s\n", kobject_name(&sysdev->kobj));
/* Call global drivers first. */
- list_for_each_entry(drv, &global_drivers, entry) {
+ list_for_each_entry(drv, &sysdev_drivers, entry) {
if (drv->suspend)
drv->suspend(sysdev, state);
}
@@ -375,7 +376,7 @@
}
/* Call global drivers. */
- list_for_each_entry(drv, &global_drivers, entry) {
+ list_for_each_entry(drv, &sysdev_drivers, entry) {
if (drv->resume)
drv->resume(sysdev);
}
diff -Nru a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoe.h 2005-03-03 21:53:30 -08:00
+++ b/drivers/block/aoe/aoe.h 2005-03-03 21:53:30 -08:00
@@ -143,7 +143,6 @@
int aoechr_init(void);
void aoechr_exit(void);
void aoechr_error(char *);
-void aoechr_hdump(char *, int len);
void aoecmd_work(struct aoedev *d);
void aoecmd_cfg(ushort, unsigned char);
diff -Nru a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
--- a/drivers/block/aoe/aoechr.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/block/aoe/aoechr.c 2005-03-03 21:53:30 -08:00
@@ -99,41 +99,6 @@
up(&emsgs_sema);
}
-#define PERLINE 16
-void
-aoechr_hdump(char *buf, int n)
-{
- int bufsiz;
- char *fbuf;
- int linelen;
- char *p, *e, *fp;
-
- bufsiz = n * 3; /* 2 hex digits and a space */
- bufsiz += n / PERLINE + 1; /* the newline characters */
- bufsiz += 1; /* the final '\0' */
-
- fbuf = kmalloc(bufsiz, GFP_ATOMIC);
- if (!fbuf) {
- printk(KERN_INFO
- "%s: cannot allocate memory\n",
- __FUNCTION__);
- return;
- }
-
- for (p = buf; n <= 0;) {
- linelen = n > PERLINE ? PERLINE : n;
- n -= linelen;
-
- fp = fbuf;
- for (e=p+linelen; p<e; p++)
- fp += sprintf(fp, "%2.2X ", *p & 255);
- sprintf(fp, "\n");
- aoechr_error(fbuf);
- }
-
- kfree(fbuf);
-}
-
static ssize_t
aoechr_write(struct file *filp, const char __user *buf, size_t cnt, loff_t *offp)
{
@@ -178,13 +143,13 @@
static ssize_t
aoechr_read(struct file *filp, char __user *buf, size_t cnt, loff_t *off)
{
- int n;
+ unsigned long n;
char *mp;
struct ErrMsg *em;
ssize_t len;
ulong flags;
- n = (int) filp->private_data;
+ n = (unsigned long) filp->private_data;
switch (n) {
case MINOR_ERR:
spin_lock_irqsave(&emsgs_lock, flags);
@@ -233,7 +198,7 @@
}
}
-struct file_operations aoe_fops = {
+static struct file_operations aoe_fops = {
.write = aoechr_write,
.read = aoechr_read,
.open = aoechr_open,
diff -Nru a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
--- a/drivers/block/aoe/aoecmd.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/block/aoe/aoecmd.c 2005-03-03 21:53:30 -08:00
@@ -416,7 +416,9 @@
if (ahin->cmdstat & 0xa9) { /* these bits cleared on success */
printk(KERN_CRIT "aoe: aoecmd_ata_rsp: ata error cmd=%2.2Xh "
- "stat=%2.2Xh\n", ahout->cmdstat, ahin->cmdstat);
+ "stat=%2.2Xh from e%ld.%ld\n",
+ ahout->cmdstat, ahin->cmdstat,
+ d->aoemajor, d->aoeminor);
if (buf)
buf->flags |= BUFFL_FAIL;
} else {
@@ -458,8 +460,8 @@
if (buf) {
buf->nframesout -= 1;
if (buf->nframesout == 0 && buf->resid == 0) {
- n = !(buf->flags & BUFFL_FAIL);
- bio_endio(buf->bio, buf->bio->bi_size, 0);
+ n = (buf->flags & BUFFL_FAIL) ? -EIO : 0;
+ bio_endio(buf->bio, buf->bio->bi_size, n);
mempool_free(buf, d->bufpool);
}
}
diff -Nru a/drivers/block/floppy.c b/drivers/block/floppy.c
--- a/drivers/block/floppy.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/block/floppy.c 2005-03-03 21:53:30 -08:00
@@ -4370,6 +4370,10 @@
goto out_flush_work;
}
+ err = platform_device_register(&floppy_device);
+ if (err)
+ goto out_flush_work;
+
for (drive = 0; drive < N_DRIVE; drive++) {
if (!(allowed_drive_mask & (1 << drive)))
continue;
@@ -4379,23 +4383,12 @@
disks[drive]->private_data = (void *)(long)drive;
disks[drive]->queue = floppy_queue;
disks[drive]->flags |= GENHD_FL_REMOVABLE;
+ disks[drive]->driverfs_dev = &floppy_device.dev;
add_disk(disks[drive]);
}
- err = platform_device_register(&floppy_device);
- if (err)
- goto out_del_disk;
-
return 0;
-out_del_disk:
- for (drive = 0; drive < N_DRIVE; drive++) {
- if (!(allowed_drive_mask & (1 << drive)))
- continue;
- if (fdc_state[FDC(drive)].version == FDC_NONE)
- continue;
- del_gendisk(disks[drive]);
- }
out_flush_work:
flush_scheduled_work();
if (usage_count)
@@ -4600,7 +4593,6 @@
int drive;
init_completion(&device_release);
- platform_device_unregister(&floppy_device);
blk_unregister_region(MKDEV(FLOPPY_MAJOR, 0), 256);
unregister_blkdev(FLOPPY_MAJOR, "fd");
@@ -4614,6 +4606,7 @@
}
put_disk(disks[drive]);
}
+ platform_device_unregister(&floppy_device);
devfs_remove("floppy");
del_timer_sync(&fd_timeout);
diff -Nru a/drivers/block/genhd.c b/drivers/block/genhd.c
--- a/drivers/block/genhd.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/block/genhd.c 2005-03-03 21:53:30 -08:00
@@ -302,7 +302,7 @@
static int __init genhd_device_init(void)
{
- bdev_map = kobj_map_init(base_probe, &block_subsys);
+ bdev_map = kobj_map_init(base_probe, &block_subsys_sem);
blk_dev_init();
subsystem_register(&block_subsys);
return 0;
@@ -430,42 +430,57 @@
static int block_hotplug(struct kset *kset, struct kobject *kobj, char **envp,
int num_envp, char *buffer, int buffer_size)
{
- struct device *dev = NULL;
struct kobj_type *ktype = get_ktype(kobj);
+ struct device *physdev;
+ struct gendisk *disk;
+ struct hd_struct *part;
int length = 0;
int i = 0;
- /* get physical device backing disk or partition */
if (ktype == &ktype_block) {
- struct gendisk *disk = container_of(kobj, struct gendisk, kobj);
- dev = disk->driverfs_dev;
+ disk = container_of(kobj, struct gendisk, kobj);
+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
+ &length, "MINOR=%u", disk->first_minor);
} else if (ktype == &ktype_part) {
- struct gendisk *disk = container_of(kobj->parent, struct gendisk, kobj);
- dev = disk->driverfs_dev;
- }
-
- if (dev) {
- /* add physical device, backing this device */
- char *path = kobject_get_path(&dev->kobj, GFP_KERNEL);
+ disk = container_of(kobj->parent, struct gendisk, kobj);
+ part = container_of(kobj, struct hd_struct, kobj);
+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
+ &length, "MINOR=%u",
+ disk->first_minor + part->partno);
+ } else
+ return 0;
+
+ add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length,
+ "MAJOR=%u", disk->major);
+
+ /* add physical device, backing this device */
+ physdev = disk->driverfs_dev;
+ if (physdev) {
+ char *path = kobject_get_path(&physdev->kobj, GFP_KERNEL);
add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size,
&length, "PHYSDEVPATH=%s", path);
kfree(path);
- /* add bus name of physical device */
- if (dev->bus)
+ if (physdev->bus)
add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length,
- "PHYSDEVBUS=%s", dev->bus->name);
+ "PHYSDEVBUS=%s",
+ physdev->bus->name);
- /* add driver name of physical device */
- if (dev->driver)
+ if (physdev->driver)
add_hotplug_env_var(envp, num_envp, &i,
buffer, buffer_size, &length,
- "PHYSDEVDRIVER=%s", dev->driver->name);
-
- envp[i] = NULL;
+ "PHYSDEVDRIVER=%s",
+ physdev->driver->name);
}
+
+ /* terminate, set to next free slot, shrink available space */
+ envp[i] = NULL;
+ envp = &envp[i];
+ num_envp -= i;
+ buffer = &buffer[length];
+ buffer_size -= length;
return 0;
}
diff -Nru a/drivers/char/Kconfig b/drivers/char/Kconfig
--- a/drivers/char/Kconfig 2005-03-03 21:53:30 -08:00
+++ b/drivers/char/Kconfig 2005-03-03 21:53:30 -08:00
@@ -991,5 +991,7 @@
The mmtimer device allows direct userspace access to the
Altix system timer.
+source "drivers/char/tpm/Kconfig"
+
endmenu
diff -Nru a/drivers/char/Makefile b/drivers/char/Makefile
--- a/drivers/char/Makefile 2005-03-03 21:53:30 -08:00
+++ b/drivers/char/Makefile 2005-03-03 21:53:30 -08:00
@@ -89,7 +89,7 @@
obj-$(CONFIG_IPMI_HANDLER) += ipmi/
obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
-
+obj-$(CONFIG_TCG_TPM) += tpm/
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c qtronixmap.c
diff -Nru a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/char/tpm/Kconfig 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,39 @@
+#
+# TPM device configuration
+#
+
+menu "TPM devices"
+
+config TCG_TPM
+ tristate "TPM Hardware Support"
+ depends on EXPERIMENTAL
+ ---help---
+ If you have a TPM security chip in your system, which
+ implements the Trusted Computing Group's specification,
+ say Yes and it will be accessible from within Linux. For
+ more information see <http://www.trustedcomputinggroup.org>.
+ An implementation of the Trusted Software Stack (TSS), the
+ userspace enablement piece of the specification, can be
+ obtained at: <http://sourceforge.net/projects/trousers>. To
+ compile this driver as a module, choose M here; the module
+ will be called tpm. If unsure, say N.
+
+config TCG_NSC
+ tristate "National Semiconductor TPM Interface"
+ depends on TCG_TPM
+ ---help---
+ If you have a TPM security chip from National Semicondutor
+ say Yes and it will be accessible from within Linux. To
+ compile this driver as a module, choose M here; the module
+ will be called tpm_nsc.
+
+config TCG_ATMEL
+ tristate "Atmel TPM Interface"
+ depends on TCG_TPM
+ ---help---
+ If you have a TPM security chip from Atmel say Yes and it
+ will be accessible from within Linux. To compile this driver
+ as a module, choose M here; the module will be called tpm_atmel.
+
+endmenu
+
diff -Nru a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/char/tpm/Makefile 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,7 @@
+#
+# Makefile for the kernel tpm device drivers.
+#
+obj-$(CONFIG_TCG_TPM) += tpm.o
+obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
+obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
+
diff -Nru a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/char/tpm/tpm.c 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,697 @@
+/*
+ * Copyright (C) 2004 IBM Corporation
+ *
+ * Authors:
+ * Leendert van Doorn <leendert@watson.ibm.com>
+ * Dave Safford <safford@watson.ibm.com>
+ * Reiner Sailer <sailer@watson.ibm.com>
+ * Kylene Hall <kjhall@us.ibm.com>
+ *
+ * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ *
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ * Note, the TPM chip is not interrupt driven (only polling)
+ * and can have very long timeouts (minutes!). Hence the unusual
+ * calls to schedule_timeout.
+ *
+ */
+
+#include <linux/sched.h>
+#include <linux/poll.h>
+#include <linux/spinlock.h>
+#include "tpm.h"
+
+#define TPM_MINOR 224 /* officially assigned */
+
+#define TPM_BUFSIZE 2048
+
+/* PCI configuration addresses */
+#define PCI_GEN_PMCON_1 0xA0
+#define PCI_GEN1_DEC 0xE4
+#define PCI_LPC_EN 0xE6
+#define PCI_GEN2_DEC 0xEC
+
+static LIST_HEAD(tpm_chip_list);
+static spinlock_t driver_lock = SPIN_LOCK_UNLOCKED;
+static int dev_mask[32];
+
+static void user_reader_timeout(unsigned long ptr)
+{
+ struct tpm_chip *chip = (struct tpm_chip *) ptr;
+
+ down(&chip->buffer_mutex);
+ atomic_set(&chip->data_pending, 0);
+ memset(chip->data_buffer, 0, TPM_BUFSIZE);
+ up(&chip->buffer_mutex);
+}
+
+void tpm_time_expired(unsigned long ptr)
+{
+ int *exp = (int *) ptr;
+ *exp = 1;
+}
+
+EXPORT_SYMBOL_GPL(tpm_time_expired);
+
+/*
+ * Initialize the LPC bus and enable the TPM ports
+ */
+int tpm_lpc_bus_init(struct pci_dev *pci_dev, u16 base)
+{
+ u32 lpcenable, tmp;
+ int is_lpcm = 0;
+
+ switch (pci_dev->vendor) {
+ case PCI_VENDOR_ID_INTEL:
+ switch (pci_dev->device) {
+ case PCI_DEVICE_ID_INTEL_82801CA_12:
+ case PCI_DEVICE_ID_INTEL_82801DB_12:
+ is_lpcm = 1;
+ break;
+ }
+ /* init ICH (enable LPC) */
+ pci_read_config_dword(pci_dev, PCI_GEN1_DEC, &lpcenable);
+ lpcenable |= 0x20000000;
+ pci_write_config_dword(pci_dev, PCI_GEN1_DEC, lpcenable);
+
+ if (is_lpcm) {
+ pci_read_config_dword(pci_dev, PCI_GEN1_DEC,
+ &lpcenable);
+ if ((lpcenable & 0x20000000) == 0) {
+ dev_err(&pci_dev->dev,
+ "cannot enable LPC\n");
+ return -ENODEV;
+ }
+ }
+
+ /* initialize TPM registers */
+ pci_read_config_dword(pci_dev, PCI_GEN2_DEC, &tmp);
+
+ if (!is_lpcm)
+ tmp = (tmp & 0xFFFF0000) | (base & 0xFFF0);
+ else
+ tmp =
+ (tmp & 0xFFFF0000) | (base & 0xFFF0) |
+ 0x00000001;
+
+ pci_write_config_dword(pci_dev, PCI_GEN2_DEC, tmp);
+
+ if (is_lpcm) {
+ pci_read_config_dword(pci_dev, PCI_GEN_PMCON_1,
+ &tmp);
+ tmp |= 0x00000004; /* enable CLKRUN */
+ pci_write_config_dword(pci_dev, PCI_GEN_PMCON_1,
+ tmp);
+ }
+ tpm_write_index(0x0D, 0x55); /* unlock 4F */
+ tpm_write_index(0x0A, 0x00); /* int disable */
+ tpm_write_index(0x08, base); /* base addr lo */
+ tpm_write_index(0x09, (base & 0xFF00) >> 8); /* base addr hi */
+ tpm_write_index(0x0D, 0xAA); /* lock 4F */
+ break;
+ case PCI_VENDOR_ID_AMD:
+ /* nothing yet */
+ break;
+ }
+
+ return 0;
+}
+
+EXPORT_SYMBOL_GPL(tpm_lpc_bus_init);
+
+/*
+ * Internal kernel interface to transmit TPM commands
+ */
+static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
+ size_t bufsiz)
+{
+ ssize_t len;
+ u32 count;
+ __be32 *native_size;
+
+ native_size = (__force __be32 *) (buf + 2);
+ count = be32_to_cpu(*native_size);
+
+ if (count == 0)
+ return -ENODATA;
+ if (count > bufsiz) {
+ dev_err(&chip->pci_dev->dev,
+ "invalid count value %x %x \n", count, bufsiz);
+ return -E2BIG;
+ }
+
+ down(&chip->tpm_mutex);
+
+ if ((len = chip->vendor->send(chip, (u8 *) buf, count)) < 0) {
+ dev_err(&chip->pci_dev->dev,
+ "tpm_transmit: tpm_send: error %d\n", len);
+ return len;
+ }
+
+ down(&chip->timer_manipulation_mutex);
+ chip->time_expired = 0;
+ init_timer(&chip->device_timer);
+ chip->device_timer.function = tpm_time_expired;
+ chip->device_timer.expires = jiffies + 2 * 60 * HZ;
+ chip->device_timer.data = (unsigned long) &chip->time_expired;
+ add_timer(&chip->device_timer);
+ up(&chip->timer_manipulation_mutex);
+
+ do {
+ u8 status = inb(chip->vendor->base + 1);
+ if ((status & chip->vendor->req_complete_mask) ==
+ chip->vendor->req_complete_val) {
+ down(&chip->timer_manipulation_mutex);
+ del_singleshot_timer_sync(&chip->device_timer);
+ up(&chip->timer_manipulation_mutex);
+ goto out_recv;
+ }
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(TPM_TIMEOUT);
+ rmb();
+ } while (!chip->time_expired);
+
+
+ chip->vendor->cancel(chip);
+ dev_err(&chip->pci_dev->dev, "Time expired\n");
+ up(&chip->tpm_mutex);
+ return -EIO;
+
+out_recv:
+ len = chip->vendor->recv(chip, (u8 *) buf, bufsiz);
+ if (len < 0)
+ dev_err(&chip->pci_dev->dev,
+ "tpm_transmit: tpm_recv: error %d\n", len);
+ up(&chip->tpm_mutex);
+ return len;
+}
+
+#define TPM_DIGEST_SIZE 20
+#define CAP_PCR_RESULT_SIZE 18
+static u8 cap_pcr[] = {
+ 0, 193, /* TPM_TAG_RQU_COMMAND */
+ 0, 0, 0, 22, /* length */
+ 0, 0, 0, 101, /* TPM_ORD_GetCapability */
+ 0, 0, 0, 5,
+ 0, 0, 0, 4,
+ 0, 0, 1, 1
+};
+
+#define READ_PCR_RESULT_SIZE 30
+static u8 pcrread[] = {
+ 0, 193, /* TPM_TAG_RQU_COMMAND */
+ 0, 0, 0, 14, /* length */
+ 0, 0, 0, 21, /* TPM_ORD_PcrRead */
+ 0, 0, 0, 0 /* PCR index */
+};
+
+static ssize_t show_pcrs(struct device *dev, char *buf)
+{
+ u8 data[READ_PCR_RESULT_SIZE];
+ ssize_t len;
+ int i, j, index, num_pcrs;
+ char *str = buf;
+
+ struct tpm_chip *chip =
+ pci_get_drvdata(container_of(dev, struct pci_dev, dev));
+ if (chip == NULL)
+ return -ENODEV;
+
+ memcpy(data, cap_pcr, sizeof(cap_pcr));
+ if ((len = tpm_transmit(chip, data, sizeof(data)))
+ < CAP_PCR_RESULT_SIZE)
+ return len;
+
+ num_pcrs = be32_to_cpu(*((__force __be32 *) (data + 14)));
+
+ for (i = 0; i < num_pcrs; i++) {
+ memcpy(data, pcrread, sizeof(pcrread));
+ index = cpu_to_be32(i);
+ memcpy(data + 10, &index, 4);
+ if ((len = tpm_transmit(chip, data, sizeof(data)))
+ < READ_PCR_RESULT_SIZE)
+ return len;
+ str += sprintf(str, "PCR-%02d: ", i);
+ for (j = 0; j < TPM_DIGEST_SIZE; j++)
+ str += sprintf(str, "%02X ", *(data + 10 + j));
+ str += sprintf(str, "\n");
+ }
+ return str - buf;
+}
+
+static DEVICE_ATTR(pcrs, S_IRUGO, show_pcrs, NULL);
+
+#define READ_PUBEK_RESULT_SIZE 314
+static u8 readpubek[] = {
+ 0, 193, /* TPM_TAG_RQU_COMMAND */
+ 0, 0, 0, 30, /* length */
+ 0, 0, 0, 124, /* TPM_ORD_ReadPubek */
+};
+
+static ssize_t show_pubek(struct device *dev, char *buf)
+{
+ u8 data[READ_PUBEK_RESULT_SIZE];
+ ssize_t len;
+ __be32 *native_val;
+ int i;
+ char *str = buf;
+
+ struct tpm_chip *chip =
+ pci_get_drvdata(container_of(dev, struct pci_dev, dev));
+ if (chip == NULL)
+ return -ENODEV;
+
+ memcpy(data, readpubek, sizeof(readpubek));
+ memset(data + sizeof(readpubek), 0, 20); /* zero nonce */
+
+ if ((len = tpm_transmit(chip, data, sizeof(data))) <
+ READ_PUBEK_RESULT_SIZE)
+ return len;
+
+ /*
+ ignore header 10 bytes
+ algorithm 32 bits (1 == RSA )
+ encscheme 16 bits
+ sigscheme 16 bits
+ parameters (RSA 12->bytes: keybit, #primes, expbit)
+ keylenbytes 32 bits
+ 256 byte modulus
+ ignore checksum 20 bytes
+ */
+
+ native_val = (__force __be32 *) (data + 34);
+
+ str +=
+ sprintf(str,
+ "Algorithm: %02X %02X %02X %02X\nEncscheme: %02X %02X\n"
+ "Sigscheme: %02X %02X\nParameters: %02X %02X %02X %02X"
+ " %02X %02X %02X %02X %02X %02X %02X %02X\n"
+ "Modulus length: %d\nModulus: \n",
+ data[10], data[11], data[12], data[13], data[14],
+ data[15], data[16], data[17], data[22], data[23],
+ data[24], data[25], data[26], data[27], data[28],
+ data[29], data[30], data[31], data[32], data[33],
+ be32_to_cpu(*native_val)
+ );
+
+ for (i = 0; i < 256; i++) {
+ str += sprintf(str, "%02X ", data[i + 39]);
+ if ((i + 1) % 16 == 0)
+ str += sprintf(str, "\n");
+ }
+ return str - buf;
+}
+
+static DEVICE_ATTR(pubek, S_IRUGO, show_pubek, NULL);
+
+#define CAP_VER_RESULT_SIZE 18
+static u8 cap_version[] = {
+ 0, 193, /* TPM_TAG_RQU_COMMAND */
+ 0, 0, 0, 18, /* length */
+ 0, 0, 0, 101, /* TPM_ORD_GetCapability */
+ 0, 0, 0, 6,
+ 0, 0, 0, 0
+};
+
+#define CAP_MANUFACTURER_RESULT_SIZE 18
+static u8 cap_manufacturer[] = {
+ 0, 193, /* TPM_TAG_RQU_COMMAND */
+ 0, 0, 0, 22, /* length */
+ 0, 0, 0, 101, /* TPM_ORD_GetCapability */
+ 0, 0, 0, 5,
+ 0, 0, 0, 4,
+ 0, 0, 1, 3
+};
+
+static ssize_t show_caps(struct device *dev, char *buf)
+{
+ u8 data[READ_PUBEK_RESULT_SIZE];
+ ssize_t len;
+ char *str = buf;
+
+ struct tpm_chip *chip =
+ pci_get_drvdata(container_of(dev, struct pci_dev, dev));
+ if (chip == NULL)
+ return -ENODEV;
+
+ memcpy(data, cap_manufacturer, sizeof(cap_manufacturer));
+
+ if ((len = tpm_transmit(chip, data, sizeof(data))) <
+ CAP_MANUFACTURER_RESULT_SIZE)
+ return len;
+
+ str += sprintf(str, "Manufacturer: 0x%x\n",
+ be32_to_cpu(*(data + 14)));
+
+ memcpy(data, cap_version, sizeof(cap_version));
+
+ if ((len = tpm_transmit(chip, data, sizeof(data))) <
+ CAP_VER_RESULT_SIZE)
+ return len;
+
+ str +=
+ sprintf(str, "TCG version: %d.%d\nFirmware version: %d.%d\n",
+ (int) data[14], (int) data[15], (int) data[16],
+ (int) data[17]);
+
+ return str - buf;
+}
+
+static DEVICE_ATTR(caps, S_IRUGO, show_caps, NULL);
+
+/*
+ * Device file system interface to the TPM
+ */
+int tpm_open(struct inode *inode, struct file *file)
+{
+ int rc = 0, minor = iminor(inode);
+ struct tpm_chip *chip = NULL, *pos;
+
+ spin_lock(&driver_lock);
+
+ list_for_each_entry(pos, &tpm_chip_list, list) {
+ if (pos->vendor->miscdev.minor == minor) {
+ chip = pos;
+ break;
+ }
+ }
+
+ if (chip == NULL) {
+ rc = -ENODEV;
+ goto err_out;
+ }
+
+ if (chip->num_opens) {
+ dev_dbg(&chip->pci_dev->dev,
+ "Another process owns this TPM\n");
+ rc = -EBUSY;
+ goto err_out;
+ }
+
+ chip->num_opens++;
+ pci_dev_get(chip->pci_dev);
+
+ spin_unlock(&driver_lock);
+
+ chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
+ if (chip->data_buffer == NULL) {
+ chip->num_opens--;
+ pci_dev_put(chip->pci_dev);
+ return -ENOMEM;
+ }
+
+ atomic_set(&chip->data_pending, 0);
+
+ file->private_data = chip;
+ return 0;
+
+err_out:
+ spin_unlock(&driver_lock);
+ return rc;
+}
+
+EXPORT_SYMBOL_GPL(tpm_open);
+
+int tpm_release(struct inode *inode, struct file *file)
+{
+ struct tpm_chip *chip = file->private_data;
+
+ file->private_data = NULL;
+
+ spin_lock(&driver_lock);
+ chip->num_opens--;
+ spin_unlock(&driver_lock);
+
+ down(&chip->timer_manipulation_mutex);
+ if (timer_pending(&chip->user_read_timer))
+ del_singleshot_timer_sync(&chip->user_read_timer);
+ else if (timer_pending(&chip->device_timer))
+ del_singleshot_timer_sync(&chip->device_timer);
+ up(&chip->timer_manipulation_mutex);
+
+ kfree(chip->data_buffer);
+ atomic_set(&chip->data_pending, 0);
+
+ pci_dev_put(chip->pci_dev);
+ return 0;
+}
+
+EXPORT_SYMBOL_GPL(tpm_release);
+
+ssize_t tpm_write(struct file * file, const char __user * buf,
+ size_t size, loff_t * off)
+{
+ struct tpm_chip *chip = file->private_data;
+ int in_size = size, out_size;
+
+ /* cannot perform a write until the read has cleared
+ either via tpm_read or a user_read_timer timeout */
+ while (atomic_read(&chip->data_pending) != 0) {
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(TPM_TIMEOUT);
+ }
+
+ down(&chip->buffer_mutex);
+
+ if (in_size > TPM_BUFSIZE)
+ in_size = TPM_BUFSIZE;
+
+ if (copy_from_user
+ (chip->data_buffer, (void __user *) buf, in_size)) {
+ up(&chip->buffer_mutex);
+ return -EFAULT;
+ }
+
+ /* atomic tpm command send and result receive */
+ out_size = tpm_transmit(chip, chip->data_buffer, TPM_BUFSIZE);
+
+ atomic_set(&chip->data_pending, out_size);
+ up(&chip->buffer_mutex);
+
+ /* Set a timeout by which the reader must come claim the result */
+ down(&chip->timer_manipulation_mutex);
+ init_timer(&chip->user_read_timer);
+ chip->user_read_timer.function = user_reader_timeout;
+ chip->user_read_timer.data = (unsigned long) chip;
+ chip->user_read_timer.expires = jiffies + (60 * HZ);
+ add_timer(&chip->user_read_timer);
+ up(&chip->timer_manipulation_mutex);
+
+ return in_size;
+}
+
+EXPORT_SYMBOL_GPL(tpm_write);
+
+ssize_t tpm_read(struct file * file, char __user * buf,
+ size_t size, loff_t * off)
+{
+ struct tpm_chip *chip = file->private_data;
+ int ret_size = -ENODATA;
+
+ if (atomic_read(&chip->data_pending) != 0) { /* Result available */
+ down(&chip->timer_manipulation_mutex);
+ del_singleshot_timer_sync(&chip->user_read_timer);
+ up(&chip->timer_manipulation_mutex);
+
+ down(&chip->buffer_mutex);
+
+ ret_size = atomic_read(&chip->data_pending);
+ atomic_set(&chip->data_pending, 0);
+
+ if (ret_size == 0) /* timeout just occurred */
+ ret_size = -ETIME;
+ else if (ret_size > 0) { /* relay data */
+ if (size < ret_size)
+ ret_size = size;
+
+ if (copy_to_user((void __user *) buf,
+ chip->data_buffer, ret_size)) {
+ ret_size = -EFAULT;
+ }
+ }
+ up(&chip->buffer_mutex);
+ }
+
+ return ret_size;
+}
+
+EXPORT_SYMBOL_GPL(tpm_read);
+
+void __devexit tpm_remove(struct pci_dev *pci_dev)
+{
+ struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+
+ if (chip == NULL) {
+ dev_err(&pci_dev->dev, "No device data found\n");
+ return;
+ }
+
+ spin_lock(&driver_lock);
+
+ list_del(&chip->list);
+
+ spin_unlock(&driver_lock);
+
+ pci_set_drvdata(pci_dev, NULL);
+ misc_deregister(&chip->vendor->miscdev);
+
+ device_remove_file(&pci_dev->dev, &dev_attr_pubek);
+ device_remove_file(&pci_dev->dev, &dev_attr_pcrs);
+ device_remove_file(&pci_dev->dev, &dev_attr_caps);
+
+ pci_disable_device(pci_dev);
+
+ dev_mask[chip->dev_num / 32] &= !(1 << (chip->dev_num % 32));
+
+ kfree(chip);
+
+ pci_dev_put(pci_dev);
+}
+
+EXPORT_SYMBOL_GPL(tpm_remove);
+
+static u8 savestate[] = {
+ 0, 193, /* TPM_TAG_RQU_COMMAND */
+ 0, 0, 0, 10, /* blob length (in bytes) */
+ 0, 0, 0, 152 /* TPM_ORD_SaveState */
+};
+
+/*
+ * We are about to suspend. Save the TPM state
+ * so that it can be restored.
+ */
+int tpm_pm_suspend(struct pci_dev *pci_dev, u32 pm_state)
+{
+ struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+ if (chip == NULL)
+ return -ENODEV;
+
+ tpm_transmit(chip, savestate, sizeof(savestate));
+ return 0;
+}
+
+EXPORT_SYMBOL_GPL(tpm_pm_suspend);
+
+/*
+ * Resume from a power safe. The BIOS already restored
+ * the TPM state.
+ */
+int tpm_pm_resume(struct pci_dev *pci_dev)
+{
+ struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+
+ if (chip == NULL)
+ return -ENODEV;
+
+ spin_lock(&driver_lock);
+ tpm_lpc_bus_init(pci_dev, chip->vendor->base);
+ spin_unlock(&driver_lock);
+
+ return 0;
+}
+
+EXPORT_SYMBOL_GPL(tpm_pm_resume);
+
+/*
+ * Called from tpm_<specific>.c probe function only for devices
+ * the driver has determined it should claim. Prior to calling
+ * this function the specific probe function has called pci_enable_device
+ * upon errant exit from this function specific probe function should call
+ * pci_disable_device
+ */
+int tpm_register_hardware(struct pci_dev *pci_dev,
+ struct tpm_vendor_specific *entry)
+{
+ char devname[7];
+ struct tpm_chip *chip;
+ int i, j;
+
+ /* Driver specific per-device data */
+ chip = kmalloc(sizeof(*chip), GFP_KERNEL);
+ if (chip == NULL)
+ return -ENOMEM;
+
+ memset(chip, 0, sizeof(struct tpm_chip));
+
+ init_MUTEX(&chip->buffer_mutex);
+ init_MUTEX(&chip->tpm_mutex);
+ init_MUTEX(&chip->timer_manipulation_mutex);
+ INIT_LIST_HEAD(&chip->list);
+
+ chip->vendor = entry;
+
+ chip->dev_num = -1;
+
+ for (i = 0; i < 32; i++)
+ for (j = 0; j < 8; j++)
+ if ((dev_mask[i] & (1 << j)) == 0) {
+ chip->dev_num = i * 32 + j;
+ dev_mask[i] |= 1 << j;
+ goto dev_num_search_complete;
+ }
+
+dev_num_search_complete:
+ if (chip->dev_num < 0) {
+ dev_err(&pci_dev->dev,
+ "No available tpm device numbers\n");
+ kfree(chip);
+ return -ENODEV;
+ } else if (chip->dev_num == 0)
+ chip->vendor->miscdev.minor = TPM_MINOR;
+ else
+ chip->vendor->miscdev.minor = MISC_DYNAMIC_MINOR;
+
+ snprintf(devname, sizeof(devname), "%s%d", "tpm", chip->dev_num);
+ chip->vendor->miscdev.name = devname;
+
+ chip->vendor->miscdev.dev = &(pci_dev->dev);
+ chip->pci_dev = pci_dev_get(pci_dev);
+
+ if (misc_register(&chip->vendor->miscdev)) {
+ dev_err(&chip->pci_dev->dev,
+ "unable to misc_register %s, minor %d\n",
+ chip->vendor->miscdev.name,
+ chip->vendor->miscdev.minor);
+ pci_dev_put(pci_dev);
+ kfree(chip);
+ dev_mask[i] &= !(1 << j);
+ return -ENODEV;
+ }
+
+ pci_set_drvdata(pci_dev, chip);
+
+ list_add(&chip->list, &tpm_chip_list);
+
+ device_create_file(&pci_dev->dev, &dev_attr_pubek);
+ device_create_file(&pci_dev->dev, &dev_attr_pcrs);
+ device_create_file(&pci_dev->dev, &dev_attr_caps);
+
+ return 0;
+}
+
+EXPORT_SYMBOL_GPL(tpm_register_hardware);
+
+static int __init init_tpm(void)
+{
+ return 0;
+}
+
+static void __exit cleanup_tpm(void)
+{
+
+}
+
+module_init(init_tpm);
+module_exit(cleanup_tpm);
+
+MODULE_AUTHOR("Leendert van Doorn (leendert@watson.ibm.com)");
+MODULE_DESCRIPTION("TPM Driver");
+MODULE_VERSION("2.0");
+MODULE_LICENSE("GPL");
diff -Nru a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/char/tpm/tpm.h 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2004 IBM Corporation
+ *
+ * Authors:
+ * Leendert van Doorn <leendert@watson.ibm.com>
+ * Dave Safford <safford@watson.ibm.com>
+ * Reiner Sailer <sailer@watson.ibm.com>
+ * Kylene Hall <kjhall@us.ibm.com>
+ *
+ * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ *
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ */
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/miscdevice.h>
+
+#define TPM_TIMEOUT msecs_to_jiffies(5)
+
+/* TPM addresses */
+#define TPM_ADDR 0x4E
+#define TPM_DATA 0x4F
+
+struct tpm_chip;
+
+struct tpm_vendor_specific {
+ u8 req_complete_mask;
+ u8 req_complete_val;
+ u16 base; /* TPM base address */
+
+ int (*recv) (struct tpm_chip *, u8 *, size_t);
+ int (*send) (struct tpm_chip *, u8 *, size_t);
+ void (*cancel) (struct tpm_chip *);
+ struct miscdevice miscdev;
+};
+
+struct tpm_chip {
+ struct pci_dev *pci_dev; /* PCI device stuff */
+
+ int dev_num; /* /dev/tpm# */
+ int num_opens; /* only one allowed */
+ int time_expired;
+
+ /* Data passed to and from the tpm via the read/write calls */
+ u8 *data_buffer;
+ atomic_t data_pending;
+ struct semaphore buffer_mutex;
+
+ struct timer_list user_read_timer; /* user needs to claim result */
+ struct semaphore tpm_mutex; /* tpm is processing */
+ struct timer_list device_timer; /* tpm is processing */
+ struct semaphore timer_manipulation_mutex;
+
+ struct tpm_vendor_specific *vendor;
+
+ struct list_head list;
+};
+
+static inline int tpm_read_index(int index)
+{
+ outb(index, TPM_ADDR);
+ return inb(TPM_DATA) & 0xFF;
+}
+
+static inline void tpm_write_index(int index, int value)
+{
+ outb(index, TPM_ADDR);
+ outb(value & 0xFF, TPM_DATA);
+}
+
+extern void tpm_time_expired(unsigned long);
+extern int tpm_lpc_bus_init(struct pci_dev *, u16);
+
+extern int tpm_register_hardware(struct pci_dev *,
+ struct tpm_vendor_specific *);
+extern int tpm_open(struct inode *, struct file *);
+extern int tpm_release(struct inode *, struct file *);
+extern ssize_t tpm_write(struct file *, const char __user *, size_t,
+ loff_t *);
+extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
+extern void __devexit tpm_remove(struct pci_dev *);
+extern int tpm_pm_suspend(struct pci_dev *, u32);
+extern int tpm_pm_resume(struct pci_dev *);
diff -Nru a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/char/tpm/tpm_atmel.c 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2004 IBM Corporation
+ *
+ * Authors:
+ * Leendert van Doorn <leendert@watson.ibm.com>
+ * Dave Safford <safford@watson.ibm.com>
+ * Reiner Sailer <sailer@watson.ibm.com>
+ * Kylene Hall <kjhall@us.ibm.com>
+ *
+ * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ *
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ */
+
+#include "tpm.h"
+
+/* Atmel definitions */
+#define TPM_ATML_BASE 0x400
+
+/* write status bits */
+#define ATML_STATUS_ABORT 0x01
+#define ATML_STATUS_LASTBYTE 0x04
+
+/* read status bits */
+#define ATML_STATUS_BUSY 0x01
+#define ATML_STATUS_DATA_AVAIL 0x02
+#define ATML_STATUS_REWRITE 0x04
+
+
+static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
+{
+ u8 status, *hdr = buf;
+ u32 size;
+ int i;
+ __be32 *native_size;
+
+ /* start reading header */
+ if (count < 6)
+ return -EIO;
+
+ for (i = 0; i < 6; i++) {
+ status = inb(chip->vendor->base + 1);
+ if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
+ dev_err(&chip->pci_dev->dev,
+ "error reading header\n");
+ return -EIO;
+ }
+ *buf++ = inb(chip->vendor->base);
+ }
+
+ /* size of the data received */
+ native_size = (__force __be32 *) (hdr + 2);
+ size = be32_to_cpu(*native_size);
+
+ if (count < size) {
+ dev_err(&chip->pci_dev->dev,
+ "Recv size(%d) less than available space\n", size);
+ for (; i < size; i++) { /* clear the waiting data anyway */
+ status = inb(chip->vendor->base + 1);
+ if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
+ dev_err(&chip->pci_dev->dev,
+ "error reading data\n");
+ return -EIO;
+ }
+ }
+ return -EIO;
+ }
+
+ /* read all the data available */
+ for (; i < size; i++) {
+ status = inb(chip->vendor->base + 1);
+ if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
+ dev_err(&chip->pci_dev->dev,
+ "error reading data\n");
+ return -EIO;
+ }
+ *buf++ = inb(chip->vendor->base);
+ }
+
+ /* make sure data available is gone */
+ status = inb(chip->vendor->base + 1);
+ if (status & ATML_STATUS_DATA_AVAIL) {
+ dev_err(&chip->pci_dev->dev, "data available is stuck\n");
+ return -EIO;
+ }
+
+ return size;
+}
+
+static int tpm_atml_send(struct tpm_chip *chip, u8 * buf, size_t count)
+{
+ int i;
+
+ dev_dbg(&chip->pci_dev->dev, "tpm_atml_send: ");
+ for (i = 0; i < count; i++) {
+ dev_dbg(&chip->pci_dev->dev, "0x%x(%d) ", buf[i], buf[i]);
+ outb(buf[i], chip->vendor->base);
+ }
+
+ return count;
+}
+
+static void tpm_atml_cancel(struct tpm_chip *chip)
+{
+ outb(ATML_STATUS_ABORT, chip->vendor->base + 1);
+}
+
+static struct file_operations atmel_ops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .open = tpm_open,
+ .read = tpm_read,
+ .write = tpm_write,
+ .release = tpm_release,
+};
+
+static struct tpm_vendor_specific tpm_atmel = {
+ .recv = tpm_atml_recv,
+ .send = tpm_atml_send,
+ .cancel = tpm_atml_cancel,
+ .req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL,
+ .req_complete_val = ATML_STATUS_DATA_AVAIL,
+ .base = TPM_ATML_BASE,
+ .miscdev = { .fops = &atmel_ops, },
+};
+
+static int __devinit tpm_atml_init(struct pci_dev *pci_dev,
+ const struct pci_device_id *pci_id)
+{
+ u8 version[4];
+ int rc = 0;
+
+ if (pci_enable_device(pci_dev))
+ return -EIO;
+
+ if (tpm_lpc_bus_init(pci_dev, TPM_ATML_BASE)) {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ /* verify that it is an Atmel part */
+ if (tpm_read_index(4) != 'A' || tpm_read_index(5) != 'T'
+ || tpm_read_index(6) != 'M' || tpm_read_index(7) != 'L') {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ /* query chip for its version number */
+ if ((version[0] = tpm_read_index(0x00)) != 0xFF) {
+ version[1] = tpm_read_index(0x01);
+ version[2] = tpm_read_index(0x02);
+ version[3] = tpm_read_index(0x03);
+ } else {
+ dev_info(&pci_dev->dev, "version query failed\n");
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ if ((rc = tpm_register_hardware(pci_dev, &tpm_atmel)) < 0)
+ goto out_err;
+
+ dev_info(&pci_dev->dev,
+ "Atmel TPM version %d.%d.%d.%d\n", version[0], version[1],
+ version[2], version[3]);
+
+ return 0;
+out_err:
+ pci_disable_device(pci_dev);
+ return rc;
+}
+
+static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
+ {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
+
+static struct pci_driver atmel_pci_driver = {
+ .name = "tpm_atmel",
+ .id_table = tpm_pci_tbl,
+ .probe = tpm_atml_init,
+ .remove = __devexit_p(tpm_remove),
+ .suspend = tpm_pm_suspend,
+ .resume = tpm_pm_resume,
+};
+
+static int __init init_atmel(void)
+{
+ return pci_register_driver(&atmel_pci_driver);
+}
+
+static void __exit cleanup_atmel(void)
+{
+ pci_unregister_driver(&atmel_pci_driver);
+}
+
+module_init(init_atmel);
+module_exit(cleanup_atmel);
+
+MODULE_AUTHOR("Leendert van Doorn (leendert@watson.ibm.com)");
+MODULE_DESCRIPTION("TPM Driver");
+MODULE_VERSION("2.0");
+MODULE_LICENSE("GPL");
diff -Nru a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/char/tpm/tpm_nsc.c 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,373 @@
+/*
+ * Copyright (C) 2004 IBM Corporation
+ *
+ * Authors:
+ * Leendert van Doorn <leendert@watson.ibm.com>
+ * Dave Safford <safford@watson.ibm.com>
+ * Reiner Sailer <sailer@watson.ibm.com>
+ * Kylene Hall <kjhall@us.ibm.com>
+ *
+ * Maintained by: <tpmdd_devel@lists.sourceforge.net>
+ *
+ * Device driver for TCG/TCPA TPM (trusted platform module).
+ * Specifications at www.trustedcomputinggroup.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, version 2 of the
+ * License.
+ *
+ */
+
+#include "tpm.h"
+
+/* National definitions */
+#define TPM_NSC_BASE 0x360
+#define TPM_NSC_IRQ 0x07
+
+#define NSC_LDN_INDEX 0x07
+#define NSC_SID_INDEX 0x20
+#define NSC_LDC_INDEX 0x30
+#define NSC_DIO_INDEX 0x60
+#define NSC_CIO_INDEX 0x62
+#define NSC_IRQ_INDEX 0x70
+#define NSC_ITS_INDEX 0x71
+
+#define NSC_STATUS 0x01
+#define NSC_COMMAND 0x01
+#define NSC_DATA 0x00
+
+/* status bits */
+#define NSC_STATUS_OBF 0x01 /* output buffer full */
+#define NSC_STATUS_IBF 0x02 /* input buffer full */
+#define NSC_STATUS_F0 0x04 /* F0 */
+#define NSC_STATUS_A2 0x08 /* A2 */
+#define NSC_STATUS_RDY 0x10 /* ready to receive command */
+#define NSC_STATUS_IBR 0x20 /* ready to receive data */
+
+/* command bits */
+#define NSC_COMMAND_NORMAL 0x01 /* normal mode */
+#define NSC_COMMAND_EOC 0x03
+#define NSC_COMMAND_CANCEL 0x22
+
+/*
+ * Wait for a certain status to appear
+ */
+static int wait_for_stat(struct tpm_chip *chip, u8 mask, u8 val, u8 * data)
+{
+ int expired = 0;
+ struct timer_list status_timer =
+ TIMER_INITIALIZER(tpm_time_expired, jiffies + 10 * HZ,
+ (unsigned long) &expired);
+
+ /* status immediately available check */
+ *data = inb(chip->vendor->base + NSC_STATUS);
+ if ((*data & mask) == val)
+ return 0;
+
+ /* wait for status */
+ add_timer(&status_timer);
+ do {
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(TPM_TIMEOUT);
+ *data = inb(chip->vendor->base + 1);
+ if ((*data & mask) == val) {
+ del_singleshot_timer_sync(&status_timer);
+ return 0;
+ }
+ }
+ while (!expired);
+
+ return -EBUSY;
+}
+
+static int nsc_wait_for_ready(struct tpm_chip *chip)
+{
+ int status;
+ int expired = 0;
+ struct timer_list status_timer =
+ TIMER_INITIALIZER(tpm_time_expired, jiffies + 100,
+ (unsigned long) &expired);
+
+ /* status immediately available check */
+ status = inb(chip->vendor->base + NSC_STATUS);
+ if (status & NSC_STATUS_OBF)
+ status = inb(chip->vendor->base + NSC_DATA);
+ if (status & NSC_STATUS_RDY)
+ return 0;
+
+ /* wait for status */
+ add_timer(&status_timer);
+ do {
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(TPM_TIMEOUT);
+ status = inb(chip->vendor->base + NSC_STATUS);
+ if (status & NSC_STATUS_OBF)
+ status = inb(chip->vendor->base + NSC_DATA);
+ if (status & NSC_STATUS_RDY) {
+ del_singleshot_timer_sync(&status_timer);
+ return 0;
+ }
+ }
+ while (!expired);
+
+ dev_info(&chip->pci_dev->dev, "wait for ready failed\n");
+ return -EBUSY;
+}
+
+
+static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
+{
+ u8 *buffer = buf;
+ u8 data, *p;
+ u32 size;
+ __be32 *native_size;
+
+ if (count < 6)
+ return -EIO;
+
+ if (wait_for_stat(chip, NSC_STATUS_F0, NSC_STATUS_F0, &data) < 0) {
+ dev_err(&chip->pci_dev->dev, "F0 timeout\n");
+ return -EIO;
+ }
+ if ((data =
+ inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_NORMAL) {
+ dev_err(&chip->pci_dev->dev, "not in normal mode (0x%x)\n",
+ data);
+ return -EIO;
+ }
+
+ /* read the whole packet */
+ for (p = buffer; p < &buffer[count]; p++) {
+ if (wait_for_stat
+ (chip, NSC_STATUS_OBF, NSC_STATUS_OBF, &data) < 0) {
+ dev_err(&chip->pci_dev->dev,
+ "OBF timeout (while reading data)\n");
+ return -EIO;
+ }
+ if (data & NSC_STATUS_F0)
+ break;
+ *p = inb(chip->vendor->base + NSC_DATA);
+ }
+
+ if ((data & NSC_STATUS_F0) == 0) {
+ dev_err(&chip->pci_dev->dev, "F0 not set\n");
+ return -EIO;
+ }
+ if ((data = inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_EOC) {
+ dev_err(&chip->pci_dev->dev,
+ "expected end of command(0x%x)\n", data);
+ return -EIO;
+ }
+
+ native_size = (__force __be32 *) (buf + 2);
+ size = be32_to_cpu(*native_size);
+
+ if (count < size)
+ return -EIO;
+
+ return size;
+}
+
+static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
+{
+ u8 data;
+ int i;
+
+ /*
+ * If we hit the chip with back to back commands it locks up
+ * and never set IBF. Hitting it with this "hammer" seems to
+ * fix it. Not sure why this is needed, we followed the flow
+ * chart in the manual to the letter.
+ */
+ outb(NSC_COMMAND_CANCEL, chip->vendor->base + NSC_COMMAND);
+
+ if (nsc_wait_for_ready(chip) != 0)
+ return -EIO;
+
+ if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
+ dev_err(&chip->pci_dev->dev, "IBF timeout\n");
+ return -EIO;
+ }
+
+ outb(NSC_COMMAND_NORMAL, chip->vendor->base + NSC_COMMAND);
+ if (wait_for_stat(chip, NSC_STATUS_IBR, NSC_STATUS_IBR, &data) < 0) {
+ dev_err(&chip->pci_dev->dev, "IBR timeout\n");
+ return -EIO;
+ }
+
+ for (i = 0; i < count; i++) {
+ if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
+ dev_err(&chip->pci_dev->dev,
+ "IBF timeout (while writing data)\n");
+ return -EIO;
+ }
+ outb(buf[i], chip->vendor->base + NSC_DATA);
+ }
+
+ if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
+ dev_err(&chip->pci_dev->dev, "IBF timeout\n");
+ return -EIO;
+ }
+ outb(NSC_COMMAND_EOC, chip->vendor->base + NSC_COMMAND);
+
+ return count;
+}
+
+static void tpm_nsc_cancel(struct tpm_chip *chip)
+{
+ outb(NSC_COMMAND_CANCEL, chip->vendor->base + NSC_COMMAND);
+}
+
+static struct file_operations nsc_ops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .open = tpm_open,
+ .read = tpm_read,
+ .write = tpm_write,
+ .release = tpm_release,
+};
+
+static struct tpm_vendor_specific tpm_nsc = {
+ .recv = tpm_nsc_recv,
+ .send = tpm_nsc_send,
+ .cancel = tpm_nsc_cancel,
+ .req_complete_mask = NSC_STATUS_OBF,
+ .req_complete_val = NSC_STATUS_OBF,
+ .base = TPM_NSC_BASE,
+ .miscdev = { .fops = &nsc_ops, },
+
+};
+
+static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
+ const struct pci_device_id *pci_id)
+{
+ int rc = 0;
+
+ if (pci_enable_device(pci_dev))
+ return -EIO;
+
+ if (tpm_lpc_bus_init(pci_dev, TPM_NSC_BASE)) {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ /* verify that it is a National part (SID) */
+ if (tpm_read_index(NSC_SID_INDEX) != 0xEF) {
+ rc = -ENODEV;
+ goto out_err;
+ }
+
+ dev_dbg(&pci_dev->dev, "NSC TPM detected\n");
+ dev_dbg(&pci_dev->dev,
+ "NSC LDN 0x%x, SID 0x%x, SRID 0x%x\n",
+ tpm_read_index(0x07), tpm_read_index(0x20),
+ tpm_read_index(0x27));
+ dev_dbg(&pci_dev->dev,
+ "NSC SIOCF1 0x%x SIOCF5 0x%x SIOCF6 0x%x SIOCF8 0x%x\n",
+ tpm_read_index(0x21), tpm_read_index(0x25),
+ tpm_read_index(0x26), tpm_read_index(0x28));
+ dev_dbg(&pci_dev->dev, "NSC IO Base0 0x%x\n",
+ (tpm_read_index(0x60) << 8) | tpm_read_index(0x61));
+ dev_dbg(&pci_dev->dev, "NSC IO Base1 0x%x\n",
+ (tpm_read_index(0x62) << 8) | tpm_read_index(0x63));
+ dev_dbg(&pci_dev->dev, "NSC Interrupt number and wakeup 0x%x\n",
+ tpm_read_index(0x70));
+ dev_dbg(&pci_dev->dev, "NSC IRQ type select 0x%x\n",
+ tpm_read_index(0x71));
+ dev_dbg(&pci_dev->dev,
+ "NSC DMA channel select0 0x%x, select1 0x%x\n",
+ tpm_read_index(0x74), tpm_read_index(0x75));
+ dev_dbg(&pci_dev->dev,
+ "NSC Config "
+ "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
+ tpm_read_index(0xF0), tpm_read_index(0xF1),
+ tpm_read_index(0xF2), tpm_read_index(0xF3),
+ tpm_read_index(0xF4), tpm_read_index(0xF5),
+ tpm_read_index(0xF6), tpm_read_index(0xF7),
+ tpm_read_index(0xF8), tpm_read_index(0xF9));
+
+ dev_info(&pci_dev->dev,
+ "NSC PC21100 TPM revision %d\n",
+ tpm_read_index(0x27) & 0x1F);
+
+ if (tpm_read_index(NSC_LDC_INDEX) == 0)
+ dev_info(&pci_dev->dev, ": NSC TPM not active\n");
+
+ /* select PM channel 1 */
+ tpm_write_index(NSC_LDN_INDEX, 0x12);
+ tpm_read_index(NSC_LDN_INDEX);
+
+ /* disable the DPM module */
+ tpm_write_index(NSC_LDC_INDEX, 0);
+ tpm_read_index(NSC_LDC_INDEX);
+
+ /* set the data register base addresses */
+ tpm_write_index(NSC_DIO_INDEX, TPM_NSC_BASE >> 8);
+ tpm_write_index(NSC_DIO_INDEX + 1, TPM_NSC_BASE);
+ tpm_read_index(NSC_DIO_INDEX);
+ tpm_read_index(NSC_DIO_INDEX + 1);
+
+ /* set the command register base addresses */
+ tpm_write_index(NSC_CIO_INDEX, (TPM_NSC_BASE + 1) >> 8);
+ tpm_write_index(NSC_CIO_INDEX + 1, (TPM_NSC_BASE + 1));
+ tpm_read_index(NSC_DIO_INDEX);
+ tpm_read_index(NSC_DIO_INDEX + 1);
+
+ /* set the interrupt number to be used for the host interface */
+ tpm_write_index(NSC_IRQ_INDEX, TPM_NSC_IRQ);
+ tpm_write_index(NSC_ITS_INDEX, 0x00);
+ tpm_read_index(NSC_IRQ_INDEX);
+
+ /* enable the DPM module */
+ tpm_write_index(NSC_LDC_INDEX, 0x01);
+ tpm_read_index(NSC_LDC_INDEX);
+
+ if ((rc = tpm_register_hardware(pci_dev, &tpm_nsc)) < 0)
+ goto out_err;
+
+ return 0;
+
+out_err:
+ pci_disable_device(pci_dev);
+ return rc;
+}
+
+static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
+ {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
+ {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
+ {0,}
+};
+
+MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
+
+static struct pci_driver nsc_pci_driver = {
+ .name = "tpm_nsc",
+ .id_table = tpm_pci_tbl,
+ .probe = tpm_nsc_init,
+ .remove = __devexit_p(tpm_remove),
+ .suspend = tpm_pm_suspend,
+ .resume = tpm_pm_resume,
+};
+
+static int __init init_nsc(void)
+{
+ return pci_register_driver(&nsc_pci_driver);
+}
+
+static void __exit cleanup_nsc(void)
+{
+ pci_unregister_driver(&nsc_pci_driver);
+}
+
+module_init(init_nsc);
+module_exit(cleanup_nsc);
+
+MODULE_AUTHOR("Leendert van Doorn (leendert@watson.ibm.com)");
+MODULE_DESCRIPTION("TPM Driver");
+MODULE_VERSION("2.0");
+MODULE_LICENSE("GPL");
diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
--- a/drivers/i2c/i2c-dev.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/i2c/i2c-dev.c 2005-03-03 21:53:30 -08:00
@@ -108,13 +108,6 @@
spin_unlock(&i2c_dev_array_lock);
}
-static ssize_t show_dev(struct class_device *class_dev, char *buf)
-{
- struct i2c_dev *i2c_dev = to_i2c_dev(class_dev);
- return print_dev_t(buf, MKDEV(I2C_MAJOR, i2c_dev->minor));
-}
-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
-
static ssize_t show_adapter_name(struct class_device *class_dev, char *buf)
{
struct i2c_dev *i2c_dev = to_i2c_dev(class_dev);
@@ -451,11 +444,11 @@
else
i2c_dev->class_dev.dev = adap->dev.parent;
i2c_dev->class_dev.class = &i2c_dev_class;
+ i2c_dev->class_dev.devt = MKDEV(I2C_MAJOR, i2c_dev->minor);
snprintf(i2c_dev->class_dev.class_id, BUS_ID_SIZE, "i2c-%d", i2c_dev->minor);
retval = class_device_register(&i2c_dev->class_dev);
if (retval)
goto error;
- class_device_create_file(&i2c_dev->class_dev, &class_device_attr_dev);
class_device_create_file(&i2c_dev->class_dev, &class_device_attr_name);
return 0;
error:
diff -Nru a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
--- a/drivers/media/video/videodev.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/media/video/videodev.c 2005-03-03 21:53:30 -08:00
@@ -46,15 +46,7 @@
return sprintf(buf,"%.*s\n",(int)sizeof(vfd->name),vfd->name);
}
-static ssize_t show_dev(struct class_device *cd, char *buf)
-{
- struct video_device *vfd = container_of(cd, struct video_device, class_dev);
- dev_t dev = MKDEV(VIDEO_MAJOR, vfd->minor);
- return print_dev_t(buf,dev);
-}
-
static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
struct video_device *video_device_alloc(void)
{
@@ -347,12 +339,11 @@
if (vfd->dev)
vfd->class_dev.dev = vfd->dev;
vfd->class_dev.class = &video_class;
+ vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE);
class_device_register(&vfd->class_dev);
class_device_create_file(&vfd->class_dev,
&class_device_attr_name);
- class_device_create_file(&vfd->class_dev,
- &class_device_attr_dev);
#if 1 /* needed until all drivers are fixed */
if (!vfd->release)
diff -Nru a/drivers/sh/Makefile b/drivers/sh/Makefile
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/sh/Makefile 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,6 @@
+#
+# Makefile for the SuperH specific drivers.
+#
+
+obj-$(CONFIG_SUPERHYWAY) += superhyway/
+
diff -Nru a/drivers/sh/superhyway/Makefile b/drivers/sh/superhyway/Makefile
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/sh/superhyway/Makefile 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,7 @@
+#
+# Makefile for the SuperHyway bus drivers.
+#
+
+obj-$(CONFIG_SUPERHYWAY) += superhyway.o
+obj-$(CONFIG_SYSFS) += superhyway-sysfs.o
+
diff -Nru a/drivers/sh/superhyway/superhyway-sysfs.c b/drivers/sh/superhyway/superhyway-sysfs.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/sh/superhyway/superhyway-sysfs.c 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,45 @@
+/*
+ * drivers/sh/superhyway/superhyway-sysfs.c
+ *
+ * SuperHyway Bus sysfs interface
+ *
+ * Copyright (C) 2004, 2005 Paul Mundt <lethal@linux-sh.org>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/types.h>
+#include <linux/superhyway.h>
+
+#define superhyway_ro_attr(name, fmt, field) \
+static ssize_t name##_show(struct device *dev, char *buf) \
+{ \
+ struct superhyway_device *s = to_superhyway_device(dev); \
+ return sprintf(buf, fmt, s->field); \
+}
+
+/* VCR flags */
+superhyway_ro_attr(perr_flags, "0x%02x\n", vcr.perr_flags);
+superhyway_ro_attr(merr_flags, "0x%02x\n", vcr.merr_flags);
+superhyway_ro_attr(mod_vers, "0x%04x\n", vcr.mod_vers);
+superhyway_ro_attr(mod_id, "0x%04x\n", vcr.mod_id);
+superhyway_ro_attr(bot_mb, "0x%02x\n", vcr.bot_mb);
+superhyway_ro_attr(top_mb, "0x%02x\n", vcr.top_mb);
+
+/* Misc */
+superhyway_ro_attr(resource, "0x%08lx\n", resource.start);
+
+struct device_attribute superhyway_dev_attrs[] = {
+ __ATTR_RO(perr_flags),
+ __ATTR_RO(merr_flags),
+ __ATTR_RO(mod_vers),
+ __ATTR_RO(mod_id),
+ __ATTR_RO(bot_mb),
+ __ATTR_RO(top_mb),
+ __ATTR_RO(resource),
+ __ATTR_NULL,
+};
+
diff -Nru a/drivers/sh/superhyway/superhyway.c b/drivers/sh/superhyway/superhyway.c
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/drivers/sh/superhyway/superhyway.c 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,201 @@
+/*
+ * drivers/sh/superhyway/superhyway.c
+ *
+ * SuperHyway Bus Driver
+ *
+ * Copyright (C) 2004, 2005 Paul Mundt <lethal@linux-sh.org>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/list.h>
+#include <linux/superhyway.h>
+
+static int superhyway_devices;
+
+static struct device superhyway_bus_device = {
+ .bus_id = "superhyway",
+};
+
+static void superhyway_device_release(struct device *dev)
+{
+ kfree(to_superhyway_device(dev));
+}
+
+/**
+ * superhyway_add_device - Add a SuperHyway module
+ * @mod_id: Module ID (taken from MODULE.VCR.MOD_ID).
+ * @base: Physical address where module is mapped.
+ * @vcr: VCR value.
+ *
+ * This is responsible for adding a new SuperHyway module. This sets up a new
+ * struct superhyway_device for the module being added. Each one of @mod_id,
+ * @base, and @vcr are registered with the new device for further use
+ * elsewhere.
+ *
+ * Devices are initially added in the order that they are scanned (from the
+ * top-down of the memory map), and are assigned an ID based on the order that
+ * they are added. Any manual addition of a module will thus get the ID after
+ * the devices already discovered regardless of where it resides in memory.
+ *
+ * Further work can and should be done in superhyway_scan_bus(), to be sure
+ * that any new modules are properly discovered and subsequently registered.
+ */
+int superhyway_add_device(unsigned int mod_id, unsigned long base,
+ unsigned long long vcr)
+{
+ struct superhyway_device *dev;
+
+ dev = kmalloc(sizeof(struct superhyway_device), GFP_KERNEL);
+ if (!dev)
+ return -ENOMEM;
+
+ memset(dev, 0, sizeof(struct superhyway_device));
+
+ dev->id.id = mod_id;
+ sprintf(dev->name, "SuperHyway device %04x", dev->id.id);
+
+ dev->vcr = *((struct vcr_info *)(&vcr));
+ dev->resource.name = dev->name;
+ dev->resource.start = base;
+ dev->resource.end = dev->resource.start + 0x01000000;
+ dev->dev.parent = &superhyway_bus_device;
+ dev->dev.bus = &superhyway_bus_type;
+ dev->dev.release = superhyway_device_release;
+
+ sprintf(dev->dev.bus_id, "%02x", superhyway_devices);
+
+ superhyway_devices++;
+
+ return device_register(&dev->dev);
+}
+
+static int __init superhyway_init(void)
+{
+ device_register(&superhyway_bus_device);
+ return superhyway_scan_bus();
+}
+
+postcore_initcall(superhyway_init);
+
+static const struct superhyway_device_id *
+superhyway_match_id(const struct superhyway_device_id *ids,
+ struct superhyway_device *dev)
+{
+ while (ids->id) {
+ if (ids->id == dev->id.id)
+ return ids;
+
+ ids++;
+ }
+
+ return NULL;
+}
+
+static int superhyway_device_probe(struct device *dev)
+{
+ struct superhyway_device *shyway_dev = to_superhyway_device(dev);
+ struct superhyway_driver *shyway_drv = to_superhyway_driver(dev->driver);
+
+ if (shyway_drv && shyway_drv->probe) {
+ const struct superhyway_device_id *id;
+
+ id = superhyway_match_id(shyway_drv->id_table, shyway_dev);
+ if (id)
+ return shyway_drv->probe(shyway_dev, id);
+ }
+
+ return -ENODEV;
+}
+
+static int superhyway_device_remove(struct device *dev)
+{
+ struct superhyway_device *shyway_dev = to_superhyway_device(dev);
+ struct superhyway_driver *shyway_drv = to_superhyway_driver(dev->driver);
+
+ if (shyway_drv && shyway_drv->remove) {
+ shyway_drv->remove(shyway_dev);
+ return 0;
+ }
+
+ return -ENODEV;
+}
+
+/**
+ * superhyway_register_driver - Register a new SuperHyway driver
+ * @drv: SuperHyway driver to register.
+ *
+ * This registers the passed in @drv. Any devices matching the id table will
+ * automatically be populated and handed off to the driver's specified probe
+ * routine.
+ */
+int superhyway_register_driver(struct superhyway_driver *drv)
+{
+ drv->drv.name = drv->name;
+ drv->drv.bus = &superhyway_bus_type;
+ drv->drv.probe = superhyway_device_probe;
+ drv->drv.remove = superhyway_device_remove;
+
+ return driver_register(&drv->drv);
+}
+
+/**
+ * superhyway_unregister_driver - Unregister a SuperHyway driver
+ * @drv: SuperHyway driver to unregister.
+ *
+ * This cleans up after superhyway_register_driver(), and should be invoked in
+ * the exit path of any module drivers.
+ */
+void superhyway_unregister_driver(struct superhyway_driver *drv)
+{
+ driver_unregister(&drv->drv);
+}
+
+static int superhyway_bus_match(struct device *dev, struct device_driver *drv)
+{
+ struct superhyway_device *shyway_dev = to_superhyway_device(dev);
+ struct superhyway_driver *shyway_drv = to_superhyway_driver(drv);
+ const struct superhyway_device_id *ids = shyway_drv->id_table;
+
+ if (!ids)
+ return -EINVAL;
+ if (superhyway_match_id(ids, shyway_dev))
+ return 1;
+
+ return -ENODEV;
+}
+
+struct bus_type superhyway_bus_type = {
+ .name = "superhyway",
+ .match = superhyway_bus_match,
+#ifdef CONFIG_SYSFS
+ .dev_attrs = superhyway_dev_attrs,
+#endif
+};
+
+static int __init superhyway_bus_init(void)
+{
+ return bus_register(&superhyway_bus_type);
+}
+
+static void __exit superhyway_bus_exit(void)
+{
+ device_unregister(&superhyway_bus_device);
+ bus_unregister(&superhyway_bus_type);
+}
+
+core_initcall(superhyway_bus_init);
+module_exit(superhyway_bus_exit);
+
+EXPORT_SYMBOL(superhyway_bus_type);
+EXPORT_SYMBOL(superhyway_add_device);
+EXPORT_SYMBOL(superhyway_register_driver);
+EXPORT_SYMBOL(superhyway_unregister_driver);
+
+MODULE_LICENSE("GPL");
diff -Nru a/drivers/usb/core/file.c b/drivers/usb/core/file.c
--- a/drivers/usb/core/file.c 2005-03-03 21:53:30 -08:00
+++ b/drivers/usb/core/file.c 2005-03-03 21:53:30 -08:00
@@ -66,16 +66,7 @@
.open = usb_open,
};
-static void release_usb_class_dev(struct class_device *class_dev)
-{
- dbg("%s - %s", __FUNCTION__, class_dev->class_id);
- kfree(class_dev);
-}
-
-static struct class usb_class = {
- .name = "usb",
- .release = &release_usb_class_dev,
-};
+static struct class_simple *usb_class;
int usb_major_init(void)
{
@@ -87,9 +78,9 @@
goto out;
}
- error = class_register(&usb_class);
- if (error) {
- err("class_register failed for usb devices");
+ usb_class = class_simple_create(THIS_MODULE, "usb");
+ if (IS_ERR(usb_class)) {
+ err("class_simple_create failed for usb devices");
unregister_chrdev(USB_MAJOR, "usb");
goto out;
}
@@ -102,18 +93,11 @@
void usb_major_cleanup(void)
{
- class_unregister(&usb_class);
+ class_simple_destroy(usb_class);
devfs_remove("usb");
unregister_chrdev(USB_MAJOR, "usb");
}
-static ssize_t show_dev(struct class_device *class_dev, char *buf)
-{
- int minor = (int)(long)class_get_devdata(class_dev);
- return print_dev_t(buf, MKDEV(USB_MAJOR, minor));
-}
-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
-
/**
* usb_register_dev - register a USB device, and ask for a minor number
* @intf: pointer to the usb_interface that is being registered
@@ -141,7 +125,6 @@
int minor_base = class_driver->minor_base;
int minor = 0;
char name[BUS_ID_SIZE];
- struct class_device *class_dev;
char *temp;
#ifdef CONFIG_USB_DYNAMIC_MINORS
@@ -181,22 +164,18 @@
devfs_mk_cdev(MKDEV(USB_MAJOR, minor), class_driver->mode, name);
/* create a usb class device for this usb interface */
- class_dev = kmalloc(sizeof(*class_dev), GFP_KERNEL);
- if (class_dev) {
- memset(class_dev, 0x00, sizeof(struct class_device));
- class_dev->class = &usb_class;
- class_dev->dev = &intf->dev;
-
- temp = strrchr(name, '/');
- if (temp && (temp[1] != 0x00))
- ++temp;
- else
- temp = name;
- snprintf(class_dev->class_id, BUS_ID_SIZE, "%s", temp);
- class_set_devdata(class_dev, (void *)(long)intf->minor);
- class_device_register(class_dev);
- class_device_create_file(class_dev, &class_device_attr_dev);
- intf->class_dev = class_dev;
+ temp = strrchr(name, '/');
+ if (temp && (temp[1] != 0x00))
+ ++temp;
+ else
+ temp = name;
+ intf->class_dev = class_simple_device_add(usb_class, MKDEV(USB_MAJOR, minor), &intf->dev, "%s", temp);
+ if (IS_ERR(intf->class_dev)) {
+ spin_lock (&minor_lock);
+ usb_minors[intf->minor] = NULL;
+ spin_unlock (&minor_lock);
+ devfs_remove (name);
+ retval = PTR_ERR(intf->class_dev);
}
exit:
return retval;
@@ -239,11 +218,8 @@
snprintf(name, BUS_ID_SIZE, class_driver->name, intf->minor - minor_base);
devfs_remove (name);
-
- if (intf->class_dev) {
- class_device_unregister(intf->class_dev);
- intf->class_dev = NULL;
- }
+ class_simple_device_remove(MKDEV(USB_MAJOR, intf->minor));
+ intf->class_dev = NULL;
intf->minor = -1;
}
EXPORT_SYMBOL(usb_deregister_dev);
diff -Nru a/fs/char_dev.c b/fs/char_dev.c
--- a/fs/char_dev.c 2005-03-03 21:53:30 -08:00
+++ b/fs/char_dev.c 2005-03-03 21:53:30 -08:00
@@ -28,7 +28,7 @@
#define MAX_PROBE_HASH 255 /* random */
-static DEFINE_RWLOCK(chrdevs_lock);
+static DECLARE_MUTEX(chrdevs_lock);
static struct char_device_struct {
struct char_device_struct *next;
@@ -54,13 +54,13 @@
len = sprintf(page, "Character devices:\n");
- read_lock(&chrdevs_lock);
+ down(&chrdevs_lock);
for (i = 0; i < ARRAY_SIZE(chrdevs) ; i++) {
for (cd = chrdevs[i]; cd; cd = cd->next)
len += sprintf(page+len, "%3d %s\n",
cd->major, cd->name);
}
- read_unlock(&chrdevs_lock);
+ up(&chrdevs_lock);
return len;
}
@@ -90,7 +90,7 @@
memset(cd, 0, sizeof(struct char_device_struct));
- write_lock_irq(&chrdevs_lock);
+ down(&chrdevs_lock);
/* temporary */
if (major == 0) {
@@ -125,10 +125,10 @@
}
cd->next = *cp;
*cp = cd;
- write_unlock_irq(&chrdevs_lock);
+ up(&chrdevs_lock);
return cd;
out:
- write_unlock_irq(&chrdevs_lock);
+ up(&chrdevs_lock);
kfree(cd);
return ERR_PTR(ret);
}
@@ -139,7 +139,7 @@
struct char_device_struct *cd = NULL, **cp;
int i = major_to_index(major);
- write_lock_irq(&chrdevs_lock);
+ up(&chrdevs_lock);
for (cp = &chrdevs[i]; *cp; cp = &(*cp)->next)
if ((*cp)->major == major &&
(*cp)->baseminor == baseminor &&
@@ -149,7 +149,7 @@
cd = *cp;
*cp = cd->next;
}
- write_unlock_irq(&chrdevs_lock);
+ up(&chrdevs_lock);
return cd;
}
@@ -380,8 +380,6 @@
}
-static decl_subsys(cdev, NULL, NULL);
-
static void cdev_default_release(struct kobject *kobj)
{
struct cdev *p = container_of(kobj, struct cdev, kobj);
@@ -434,13 +432,7 @@
void __init chrdev_init(void)
{
-/*
- * Keep cdev_subsys around because (and only because) the kobj_map code
- * depends on the rwsem it contains. We don't make it public in sysfs,
- * however.
- */
- subsystem_init(&cdev_subsys);
- cdev_map = kobj_map_init(base_probe, &cdev_subsys);
+ cdev_map = kobj_map_init(base_probe, &chrdevs_lock);
}
diff -Nru a/fs/debugfs/file.c b/fs/debugfs/file.c
--- a/fs/debugfs/file.c 2005-03-03 21:53:30 -08:00
+++ b/fs/debugfs/file.c 2005-03-03 21:53:30 -08:00
@@ -52,7 +52,7 @@
char buf[32]; \
type *val = file->private_data; \
\
- snprintf(buf, sizeof(buf), format, *val); \
+ snprintf(buf, sizeof(buf), format "\n", *val); \
return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf));\
} \
static ssize_t write_file_##type(struct file *file, const char __user *user_buf,\
@@ -186,7 +186,7 @@
char buf[3];
u32 *val = file->private_data;
- if (val)
+ if (*val)
buf[0] = 'Y';
else
buf[0] = 'N';
diff -Nru a/include/linux/device.h b/include/linux/device.h
--- a/include/linux/device.h 2005-03-03 21:53:30 -08:00
+++ b/include/linux/device.h 2005-03-03 21:53:30 -08:00
@@ -15,7 +15,6 @@
#include <linux/ioport.h>
#include <linux/kobject.h>
#include <linux/list.h>
-#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/pm.h>
@@ -102,7 +101,7 @@
char * name;
struct bus_type * bus;
- struct semaphore unload_sem;
+ struct completion unloaded;
struct kobject kobj;
struct list_head devices;
@@ -148,6 +147,7 @@
struct subsystem subsys;
struct list_head children;
struct list_head interfaces;
+ struct semaphore sem; /* locks both the children and interfaces lists */
struct class_attribute * class_attrs;
struct class_device_attribute * class_dev_attrs;
@@ -184,6 +184,7 @@
struct kobject kobj;
struct class * class; /* required */
+ dev_t devt; /* dev_t, creates the sysfs "dev" */
struct device * dev; /* not necessary, but nice to have */
void * class_data; /* class-specific data */
diff -Nru a/include/linux/kobj_map.h b/include/linux/kobj_map.h
--- a/include/linux/kobj_map.h 2005-03-03 21:53:30 -08:00
+++ b/include/linux/kobj_map.h 2005-03-03 21:53:30 -08:00
@@ -7,6 +7,6 @@
kobj_probe_t *, int (*)(dev_t, void *), void *);
void kobj_unmap(struct kobj_map *, dev_t, unsigned long);
struct kobject *kobj_lookup(struct kobj_map *, dev_t, int *);
-struct kobj_map *kobj_map_init(kobj_probe_t *, struct subsystem *);
+struct kobj_map *kobj_map_init(kobj_probe_t *, struct semaphore *);
#endif
diff -Nru a/include/linux/kobject.h b/include/linux/kobject.h
--- a/include/linux/kobject.h 2005-03-03 21:53:30 -08:00
+++ b/include/linux/kobject.h 2005-03-03 21:53:30 -08:00
@@ -20,6 +20,7 @@
#include <linux/types.h>
#include <linux/list.h>
#include <linux/sysfs.h>
+#include <linux/spinlock.h>
#include <linux/rwsem.h>
#include <linux/kref.h>
#include <linux/kobject_uevent.h>
@@ -102,6 +103,7 @@
struct subsystem * subsys;
struct kobj_type * ktype;
struct list_head list;
+ spinlock_t list_lock;
struct kobject kobj;
struct kset_hotplug_ops * hotplug_ops;
};
diff -Nru a/include/linux/kref.h b/include/linux/kref.h
--- a/include/linux/kref.h 2005-03-03 21:53:30 -08:00
+++ b/include/linux/kref.h 2005-03-03 21:53:30 -08:00
@@ -26,7 +26,7 @@
void kref_init(struct kref *kref);
void kref_get(struct kref *kref);
-void kref_put(struct kref *kref, void (*release) (struct kref *kref));
+int kref_put(struct kref *kref, void (*release) (struct kref *kref));
#endif /* __KERNEL__ */
#endif /* _KREF_H_ */
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h 2005-03-03 21:53:30 -08:00
+++ b/include/linux/pci_ids.h 2005-03-03 21:53:30 -08:00
@@ -506,6 +506,7 @@
#define PCI_DEVICE_ID_AMD_OPUS_7449 0x7449
# define PCI_DEVICE_ID_AMD_VIPER_7449 PCI_DEVICE_ID_AMD_OPUS_7449
#define PCI_DEVICE_ID_AMD_8111_LAN 0x7462
+#define PCI_DEVICE_ID_AMD_8111_LPC 0x7468
#define PCI_DEVICE_ID_AMD_8111_IDE 0x7469
#define PCI_DEVICE_ID_AMD_8111_SMBUS2 0x746a
#define PCI_DEVICE_ID_AMD_8111_SMBUS 0x746b
diff -Nru a/include/linux/superhyway.h b/include/linux/superhyway.h
--- /dev/null Wed Dec 31 16:00:00 196900
+++ b/include/linux/superhyway.h 2005-03-03 21:53:30 -08:00
@@ -0,0 +1,79 @@
+/*
+ * include/linux/superhyway.h
+ *
+ * SuperHyway Bus definitions
+ *
+ * Copyright (C) 2004, 2005 Paul Mundt <lethal@linux-sh.org>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#ifndef __LINUX_SUPERHYWAY_H
+#define __LINUX_SUPERHYWAY_H
+
+#include <linux/device.h>
+
+/*
+ * SuperHyway IDs
+ */
+#define SUPERHYWAY_DEVICE_ID_SH5_DMAC 0x0183
+
+struct vcr_info {
+ u8 perr_flags; /* P-port Error flags */
+ u8 merr_flags; /* Module Error flags */
+ u16 mod_vers; /* Module Version */
+ u16 mod_id; /* Module ID */
+ u8 bot_mb; /* Bottom Memory block */
+ u8 top_mb; /* Top Memory block */
+};
+
+struct superhyway_device_id {
+ unsigned int id;
+ unsigned long driver_data;
+};
+
+struct superhyway_device;
+extern struct bus_type superhyway_bus_type;
+
+struct superhyway_driver {
+ char *name;
+
+ const struct superhyway_device_id *id_table;
+ struct device_driver drv;
+
+ int (*probe)(struct superhyway_device *dev, const struct superhyway_device_id *id);
+ void (*remove)(struct superhyway_device *dev);
+};
+
+#define to_superhyway_driver(d) container_of((d), struct superhyway_driver, drv)
+
+struct superhyway_device {
+ char name[32];
+
+ struct device dev;
+
+ struct superhyway_device_id id;
+ struct superhyway_driver *drv;
+
+ struct resource resource;
+ struct vcr_info vcr;
+};
+
+#define to_superhyway_device(d) container_of((d), struct superhyway_device, dev)
+
+#define superhyway_get_drvdata(d) dev_get_drvdata(&(d)->dev)
+#define superhyway_set_drvdata(d,p) dev_set_drvdata(&(d)->dev, (p))
+
+extern int superhyway_scan_bus(void);
+
+/* drivers/sh/superhyway/superhyway.c */
+int superhyway_register_driver(struct superhyway_driver *);
+void superhyway_unregister_driver(struct superhyway_driver *);
+int superhyway_add_device(unsigned int, unsigned long, unsigned long long);
+
+/* drivers/sh/superhyway/superhyway-sysfs.c */
+extern struct device_attribute superhyway_dev_attrs[];
+
+#endif /* __LINUX_SUPERHYWAY_H */
+
diff -Nru a/lib/kobject.c b/lib/kobject.c
--- a/lib/kobject.c 2005-03-03 21:53:30 -08:00
+++ b/lib/kobject.c 2005-03-03 21:53:30 -08:00
@@ -140,9 +140,9 @@
static void unlink(struct kobject * kobj)
{
if (kobj->kset) {
- down_write(&kobj->kset->subsys->rwsem);
+ spin_lock(&kobj->kset->list_lock);
list_del_init(&kobj->entry);
- up_write(&kobj->kset->subsys->rwsem);
+ spin_unlock(&kobj->kset->list_lock);
}
kobject_put(kobj);
}
@@ -168,13 +168,13 @@
kobj->kset ? kobj->kset->kobj.name : "<NULL>" );
if (kobj->kset) {
- down_write(&kobj->kset->subsys->rwsem);
+ spin_lock(&kobj->kset->list_lock);
if (!parent)
parent = kobject_get(&kobj->kset->kobj);
list_add_tail(&kobj->entry,&kobj->kset->list);
- up_write(&kobj->kset->subsys->rwsem);
+ spin_unlock(&kobj->kset->list_lock);
}
kobj->parent = parent;
@@ -380,6 +380,7 @@
{
kobject_init(&k->kobj);
INIT_LIST_HEAD(&k->list);
+ spin_lock_init(&k->list_lock);
}
@@ -444,7 +445,7 @@
struct list_head * entry;
struct kobject * ret = NULL;
- down_read(&kset->subsys->rwsem);
+ spin_lock(&kset->list_lock);
list_for_each(entry,&kset->list) {
struct kobject * k = to_kobj(entry);
if (kobject_name(k) && !strcmp(kobject_name(k),name)) {
@@ -452,7 +453,7 @@
break;
}
}
- up_read(&kset->subsys->rwsem);
+ spin_unlock(&kset->list_lock);
return ret;
}
@@ -524,7 +525,6 @@
}
}
-EXPORT_SYMBOL(kobject_get_path);
EXPORT_SYMBOL(kobject_init);
EXPORT_SYMBOL(kobject_register);
EXPORT_SYMBOL(kobject_unregister);
@@ -532,7 +532,6 @@
EXPORT_SYMBOL(kobject_put);
EXPORT_SYMBOL(kobject_add);
EXPORT_SYMBOL(kobject_del);
-EXPORT_SYMBOL(kobject_rename);
EXPORT_SYMBOL(kset_register);
EXPORT_SYMBOL(kset_unregister);
diff -Nru a/lib/kref.c b/lib/kref.c
--- a/lib/kref.c 2005-03-03 21:53:30 -08:00
+++ b/lib/kref.c 2005-03-03 21:53:30 -08:00
@@ -42,14 +42,21 @@
* in as this function.
*
* Decrement the refcount, and if 0, call release().
+ * Return 1 if the object was removed, otherwise return 0. Beware, if this
+ * function returns 0, you still can not count on the kref from remaining in
+ * memory. Only use the return value if you want to see if the kref is now
+ * gone, not present.
*/
-void kref_put(struct kref *kref, void (*release) (struct kref *kref))
+int kref_put(struct kref *kref, void (*release)(struct kref *kref))
{
WARN_ON(release == NULL);
WARN_ON(release == (void (*)(struct kref *))kfree);
- if (atomic_dec_and_test(&kref->refcount))
+ if (atomic_dec_and_test(&kref->refcount)) {
release(kref);
+ return 1;
+ }
+ return 0;
}
EXPORT_SYMBOL(kref_init);