Skip to content

L
linux
Commit 280c1c9a authored by Stanley Wang's avatar Stanley Wang Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] PCI Hotplug: Replace pcihpfs with sysfs.

parent d2940fb6
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 875 deletions
drivers/hotplug/pci_hotplug.h
View file @ 280c1c9a
...@@ -46,8 +46,11 @@ enum pci_bus_speed { ...@@ -46,8 +46,11 @@ enum pci_bus_speed {
}; };
struct hotplug_slot; struct hotplug_slot;
struct hotplug_slot_core; struct hotplug_slot_attribute {
struct attribute attr;
ssize_t (*show)(struct hotplug_slot *, char *);
ssize_t (*store)(struct hotplug_slot *, const char *, size_t);
};
/** /**
* struct hotplug_slot_ops -the callbacks that the hotplug pci core can use * struct hotplug_slot_ops -the callbacks that the hotplug pci core can use
* @owner: The module owner of this structure * @owner: The module owner of this structure
...@@ -131,7 +134,7 @@ struct hotplug_slot { ...@@ -131,7 +134,7 @@ struct hotplug_slot {
/* Variables below this are for use only by the hotplug pci core. */ /* Variables below this are for use only by the hotplug pci core. */
struct list_head slot_list; struct list_head slot_list;
struct hotplug_slot_core *core_priv; struct kobject kobj;
}; };
extern int pci_hp_register (struct hotplug_slot *slot); extern int pci_hp_register (struct hotplug_slot *slot);
......
drivers/hotplug/pci_hotplug_core.c
View file @ 280c1c9a
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#include <linux/dnotify.h> #include <linux/dnotify.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <linux/kobject.h>
#include <linux/sysfs.h>
#include "pci_hotplug.h" #include "pci_hotplug.h"
...@@ -67,30 +69,44 @@ static int debug; ...@@ -67,30 +69,44 @@ static int debug;
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
/* Random magic number */
#define PCIHPFS_MAGIC 0x52454541
struct hotplug_slot_core {
struct dentry *dir_dentry;
struct dentry *power_dentry;
struct dentry *attention_dentry;
struct dentry *latch_dentry;
struct dentry *adapter_dentry;
struct dentry *test_dentry;
struct dentry *max_bus_speed_dentry;
struct dentry *cur_bus_speed_dentry;
};
static struct super_operations pcihpfs_ops;
static struct file_operations default_file_operations;
static struct inode_operations pcihpfs_dir_inode_operations;
static struct vfsmount *pcihpfs_mount; /* one of the mounts of our fs for reference counting */
static int pcihpfs_mount_count; /* times we have mounted our fs */
static spinlock_t mount_lock; /* protects our mount_count */
static spinlock_t list_lock; static spinlock_t list_lock;
static LIST_HEAD(pci_hotplug_slot_list); static LIST_HEAD(pci_hotplug_slot_list);
static struct subsystem hotplug_slots_subsys;
static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
struct attribute *attr, char *buf)
{
struct hotplug_slot *slot=container_of(kobj,
struct hotplug_slot,kobj);
struct hotplug_slot_attribute *attribute =
container_of(attr, struct hotplug_slot_attribute, attr);
return attribute->show ? attribute->show(slot, buf) : 0;
}
static ssize_t hotplug_slot_attr_store(struct kobject *kobj,
struct attribute *attr, const char *buf, size_t len)
{
struct hotplug_slot *slot=container_of(kobj,
struct hotplug_slot,kobj);
struct hotplug_slot_attribute *attribute =
container_of(attr, struct hotplug_slot_attribute, attr);
return attribute->store ? attribute->store(slot, buf, len) : 0;
}
static struct sysfs_ops hotplug_slot_sysfs_ops = {
.show = hotplug_slot_attr_show,
.store = hotplug_slot_attr_store,
};
static struct kobj_type hotplug_slot_ktype = {
.sysfs_ops = &hotplug_slot_sysfs_ops
};
static decl_subsys(hotplug_slots, &hotplug_slot_ktype);
/* these strings match up with the values in pci_bus_speed */ /* these strings match up with the values in pci_bus_speed */
static char *pci_bus_speed_strings[] = { static char *pci_bus_speed_strings[] = {
"33 MHz PCI", /* 0x00 */ "33 MHz PCI", /* 0x00 */
...@@ -129,438 +145,6 @@ static inline int cpci_hotplug_init(int debug) { return 0; } ...@@ -129,438 +145,6 @@ static inline int cpci_hotplug_init(int debug) { return 0; }
static inline void cpci_hotplug_exit(void) { } static inline void cpci_hotplug_exit(void) { }
#endif #endif
static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, dev_t dev)
{
struct inode *inode = new_inode(sb);
if (inode) {
inode->i_mode = mode;
inode->i_uid = current->fsuid;
inode->i_gid = current->fsgid;
inode->i_blksize = PAGE_CACHE_SIZE;
inode->i_blocks = 0;
inode->i_rdev = NODEV;
inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
switch (mode & S_IFMT) {
default:
init_special_inode(inode, mode, dev);
break;
case S_IFREG:
inode->i_fop = &default_file_operations;
break;
case S_IFDIR:
inode->i_op = &pcihpfs_dir_inode_operations;
inode->i_fop = &simple_dir_operations;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
inode->i_nlink++;
break;
}
}
return inode;
}
/* SMP-safe */
static int pcihpfs_mknod (struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
{
struct inode *inode = pcihpfs_get_inode(dir->i_sb, mode, dev);
int error = -ENOSPC;
if (inode) {
d_instantiate(dentry, inode);
dget(dentry);
error = 0;
}
return error;
}
static int pcihpfs_mkdir (struct inode *dir, struct dentry *dentry, int mode)
{
return pcihpfs_mknod (dir, dentry, mode | S_IFDIR, 0);
}
static int pcihpfs_create (struct inode *dir, struct dentry *dentry, int mode)
{
return pcihpfs_mknod (dir, dentry, mode | S_IFREG, 0);
}
static inline int pcihpfs_positive (struct dentry *dentry)
{
return dentry->d_inode && !d_unhashed(dentry);
}
static int pcihpfs_empty (struct dentry *dentry)
{
struct list_head *list;
spin_lock(&dcache_lock);
list_for_each(list, &dentry->d_subdirs) {
struct dentry *de = list_entry(list, struct dentry, d_child);
if (pcihpfs_positive(de)) {
spin_unlock(&dcache_lock);
return 0;
}
}
spin_unlock(&dcache_lock);
return 1;
}
static int pcihpfs_unlink (struct inode *dir, struct dentry *dentry)
{
int error = -ENOTEMPTY;
if (pcihpfs_empty(dentry)) {
struct inode *inode = dentry->d_inode;
lock_kernel();
inode->i_nlink--;
unlock_kernel();
dput(dentry);
error = 0;
}
return error;
}
#define pcihpfs_rmdir pcihpfs_unlink
/* default file operations */
static ssize_t default_read_file (struct file *file, char *buf, size_t count, loff_t *ppos)
{
dbg ("\n");
return 0;
}
static ssize_t default_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos)
{
dbg ("\n");
return count;
}
static loff_t default_file_lseek (struct file *file, loff_t offset, int orig)
{
loff_t retval = -EINVAL;
lock_kernel();
switch(orig) {
case 0:
if (offset > 0) {
file->f_pos = offset;
retval = file->f_pos;
}
break;
case 1:
if ((offset + file->f_pos) > 0) {
file->f_pos += offset;
retval = file->f_pos;
}
break;
default:
break;
}
unlock_kernel();
return retval;
}
static int default_open (struct inode *inode, struct file *filp)
{
if (inode->u.generic_ip)
filp->private_data = inode->u.generic_ip;
return 0;
}
static struct file_operations default_file_operations = {
.read = default_read_file,
.write = default_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "power" files */
static ssize_t power_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static ssize_t power_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
static struct file_operations power_file_operations = {
.read = power_read_file,
.write = power_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "attention" files */
static ssize_t attention_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static ssize_t attention_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
static struct file_operations attention_file_operations = {
.read = attention_read_file,
.write = attention_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "latch" files */
static ssize_t latch_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations latch_file_operations = {
.read = latch_read_file,
.write = default_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "presence" files */
static ssize_t presence_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations presence_file_operations = {
.read = presence_read_file,
.write = default_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "max bus speed" files */
static ssize_t max_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations max_bus_speed_file_operations = {
.read = max_bus_speed_read_file,
.write = default_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "current bus speed" files */
static ssize_t cur_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset);
static struct file_operations cur_bus_speed_file_operations = {
.read = cur_bus_speed_read_file,
.write = default_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
/* file ops for the "test" files */
static ssize_t test_write_file (struct file *file, const char *buf, size_t count, loff_t *ppos);
static struct file_operations test_file_operations = {
.read = default_read_file,
.write = test_write_file,
.open = default_open,
.llseek = default_file_lseek,
};
static struct inode_operations pcihpfs_dir_inode_operations = {
.create = pcihpfs_create,
.lookup = simple_lookup,
.unlink = pcihpfs_unlink,
.mkdir = pcihpfs_mkdir,
.rmdir = pcihpfs_rmdir,
.mknod = pcihpfs_mknod,
};
static struct super_operations pcihpfs_ops = {
.statfs = simple_statfs,
.drop_inode = generic_delete_inode,
};
static int pcihpfs_fill_super(struct super_block *sb, void *data, int silent)
{
struct inode *inode;
struct dentry *root;
sb->s_blocksize = PAGE_CACHE_SIZE;
sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
sb->s_magic = PCIHPFS_MAGIC;
sb->s_op = &pcihpfs_ops;
inode = pcihpfs_get_inode(sb, S_IFDIR | 0755, 0);
if (!inode) {
dbg("%s: could not get inode!\n",__FUNCTION__);
return -ENOMEM;
}
root = d_alloc_root(inode);
if (!root) {
dbg("%s: could not get root dentry!\n",__FUNCTION__);
iput(inode);
return -ENOMEM;
}
sb->s_root = root;
return 0;
}
static struct super_block *pcihpfs_get_sb(struct file_system_type *fs_type,
int flags, char *dev_name, void *data)
{
return get_sb_single(fs_type, flags, data, pcihpfs_fill_super);
}
static struct file_system_type pcihpfs_type = {
.owner = THIS_MODULE,
.name = "pcihpfs",
.get_sb = pcihpfs_get_sb,
.kill_sb = kill_litter_super,
};
static int get_mount (void)
{
struct vfsmount *mnt;
spin_lock (&mount_lock);
if (pcihpfs_mount) {
mntget(pcihpfs_mount);
++pcihpfs_mount_count;
spin_unlock (&mount_lock);
goto go_ahead;
}
spin_unlock (&mount_lock);
mnt = kern_mount (&pcihpfs_type);
if (IS_ERR(mnt)) {
err ("could not mount the fs...erroring out!\n");
return -ENODEV;
}
spin_lock (&mount_lock);
if (!pcihpfs_mount) {
pcihpfs_mount = mnt;
++pcihpfs_mount_count;
spin_unlock (&mount_lock);
goto go_ahead;
}
mntget(pcihpfs_mount);
++pcihpfs_mount_count;
spin_unlock (&mount_lock);
mntput(mnt);
go_ahead:
dbg("pcihpfs_mount_count = %d\n", pcihpfs_mount_count);
return 0;
}
static void remove_mount (void)
{
struct vfsmount *mnt;
spin_lock (&mount_lock);
mnt = pcihpfs_mount;
--pcihpfs_mount_count;
if (!pcihpfs_mount_count)
pcihpfs_mount = NULL;
spin_unlock (&mount_lock);
mntput(mnt);
dbg("pcihpfs_mount_count = %d\n", pcihpfs_mount_count);
}
/**
* pcihpfs_create_by_name - create a file, given a name
* @name: name of file
* @mode: type of file
* @parent: dentry of directory to create it in
* @dentry: resulting dentry of file
*
* There is a bit of overhead in creating a file - basically, we
* have to hash the name of the file, then look it up. This will
* prevent files of the same name.
* We then call the proper vfs_ function to take care of all the
* file creation details.
* This function handles both regular files and directories.
*/
static int pcihpfs_create_by_name (const char *name, mode_t mode,
struct dentry *parent, struct dentry **dentry)
{
struct dentry *d = NULL;
struct qstr qstr;
int error;
/* If the parent is not specified, we create it in the root.
* We need the root dentry to do this, which is in the super
* block. A pointer to that is in the struct vfsmount that we
* have around.
*/
if (!parent ) {
if (pcihpfs_mount && pcihpfs_mount->mnt_sb) {
parent = pcihpfs_mount->mnt_sb->s_root;
}
}
if (!parent) {
dbg("Ah! can not find a parent!\n");
return -EINVAL;
}
*dentry = NULL;
qstr.name = name;
qstr.len = strlen(name);
qstr.hash = full_name_hash(name,qstr.len);
parent = dget(parent);
down(&parent->d_inode->i_sem);
d = lookup_hash(&qstr,parent);
error = PTR_ERR(d);
if (!IS_ERR(d)) {
switch(mode & S_IFMT) {
case 0:
case S_IFREG:
error = vfs_create(parent->d_inode,d,mode);
break;
case S_IFDIR:
error = vfs_mkdir(parent->d_inode,d,mode);
break;
default:
err("cannot create special files\n");
}
*dentry = d;
}
up(&parent->d_inode->i_sem);
dput(parent);
return error;
}
static struct dentry *fs_create_file (const char *name, mode_t mode,
struct dentry *parent, void *data,
struct file_operations *fops)
{
struct dentry *dentry;
int error;
dbg("creating file '%s'\n",name);
error = pcihpfs_create_by_name(name,mode,parent,&dentry);
if (error) {
dentry = NULL;
} else {
if (dentry->d_inode) {
if (data)
dentry->d_inode->u.generic_ip = data;
if (fops)
dentry->d_inode->i_fop = fops;
}
}
return dentry;
}
static void fs_remove_file (struct dentry *dentry)
{
struct dentry *parent = dentry->d_parent;
if (!parent || !parent->d_inode)
return;
down(&parent->d_inode->i_sem);
if (pcihpfs_positive(dentry)) {
if (dentry->d_inode) {
if (S_ISDIR(dentry->d_inode->i_mode))
vfs_rmdir(parent->d_inode,dentry);
else
vfs_unlink(parent->d_inode,dentry);
}
dput(dentry);
}
up(&parent->d_inode->i_sem);
}
/* Weee, fun with macros... */ /* Weee, fun with macros... */
#define GET_STATUS(name,type) \ #define GET_STATUS(name,type) \
static int get_##name (struct hotplug_slot *slot, type *value) \ static int get_##name (struct hotplug_slot *slot, type *value) \
...@@ -584,80 +168,27 @@ GET_STATUS(adapter_status, u8) ...@@ -584,80 +168,27 @@ GET_STATUS(adapter_status, u8)
GET_STATUS(max_bus_speed, enum pci_bus_speed) GET_STATUS(max_bus_speed, enum pci_bus_speed)
GET_STATUS(cur_bus_speed, enum pci_bus_speed) GET_STATUS(cur_bus_speed, enum pci_bus_speed)
static ssize_t power_read_file (struct file *file, char *buf, size_t count, loff_t *offset) static ssize_t power_read_file (struct hotplug_slot *slot, char *buf)
{ {
struct hotplug_slot *slot = file->private_data;
unsigned char *page;
int retval; int retval;
int len;
u8 value; u8 value;
dbg(" count = %d, offset = %lld\n", count, *offset);
if (*offset < 0)
return -EINVAL;
if (count == 0 || count > 16384)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
page = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
retval = get_power_status (slot, &value); retval = get_power_status (slot, &value);
if (retval) if (retval)
goto exit; goto exit;
len = sprintf (page, "%d\n", value); retval = sprintf (buf, "%d\n", value);
if (copy_to_user (buf, page, len)) {
retval = -EFAULT;
goto exit;
}
*offset += len;
retval = len;
exit: exit:
free_page((unsigned long)page);
return retval; return retval;
} }
static ssize_t power_write_file (struct file *file, const char *ubuff, size_t count, loff_t *offset) static ssize_t power_write_file (struct hotplug_slot *slot, const char *buf,
size_t count)
{ {
struct hotplug_slot *slot = file->private_data;
char *buff;
unsigned long lpower; unsigned long lpower;
u8 power; u8 power;
int retval = 0; int retval = 0;
if (*offset < 0) lpower = simple_strtoul (buf, NULL, 10);
return -EINVAL;
if (count == 0 || count > 16384)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
buff = kmalloc (count + 1, GFP_KERNEL);
if (!buff)
return -ENOMEM;
memset (buff, 0x00, count + 1);
if (copy_from_user ((void *)buff, (void *)ubuff, count)) {
retval = -EFAULT;
goto exit;
}
lpower = simple_strtoul (buff, NULL, 10);
power = (u8)(lpower & 0xff); power = (u8)(lpower & 0xff);
dbg ("power = %d\n", power); dbg ("power = %d\n", power);
...@@ -683,87 +214,39 @@ static ssize_t power_write_file (struct file *file, const char *ubuff, size_t co ...@@ -683,87 +214,39 @@ static ssize_t power_write_file (struct file *file, const char *ubuff, size_t co
module_put(slot->ops->owner); module_put(slot->ops->owner);
exit: exit:
kfree (buff);
if (retval) if (retval)
return retval; return retval;
return count; return count;
} }
static ssize_t attention_read_file (struct file *file, char *buf, size_t count, loff_t *offset) static struct hotplug_slot_attribute hotplug_slot_attr_power = {
.attr = {.name = "power", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.show = power_read_file,
.store = power_write_file
};
static ssize_t attention_read_file (struct hotplug_slot *slot, char *buf)
{ {
struct hotplug_slot *slot = file->private_data;
unsigned char *page;
int retval; int retval;
int len;
u8 value; u8 value;
dbg("count = %d, offset = %lld\n", count, *offset);
if (*offset < 0)
return -EINVAL;
if (count <= 0)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
page = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
retval = get_attention_status (slot, &value); retval = get_attention_status (slot, &value);
if (retval) if (retval)
goto exit; goto exit;
len = sprintf (page, "%d\n", value); retval = sprintf (buf, "%d\n", value);
if (copy_to_user (buf, page, len)) {
retval = -EFAULT;
goto exit;
}
*offset += len;
retval = len;
exit: exit:
free_page((unsigned long)page);
return retval; return retval;
} }
static ssize_t attention_write_file (struct file *file, const char *ubuff, size_t count, loff_t *offset) static ssize_t attention_write_file (struct hotplug_slot *slot, const char *buf,
size_t count)
{ {
struct hotplug_slot *slot = file->private_data;
char *buff;
unsigned long lattention; unsigned long lattention;
u8 attention; u8 attention;
int retval = 0; int retval = 0;
if (*offset < 0) lattention = simple_strtoul (buf, NULL, 10);
return -EINVAL;
if (count == 0 || count > 16384)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
buff = kmalloc (count + 1, GFP_KERNEL);
if (!buff)
return -ENOMEM;
memset (buff, 0x00, count + 1);
if (copy_from_user ((void *)buff, (void *)ubuff, count)) {
retval = -EFAULT;
goto exit;
}
lattention = simple_strtoul (buff, NULL, 10);
attention = (u8)(lattention & 0xff); attention = (u8)(lattention & 0xff);
dbg (" - attention = %d\n", attention); dbg (" - attention = %d\n", attention);
...@@ -776,128 +259,63 @@ static ssize_t attention_write_file (struct file *file, const char *ubuff, size_ ...@@ -776,128 +259,63 @@ static ssize_t attention_write_file (struct file *file, const char *ubuff, size_
module_put(slot->ops->owner); module_put(slot->ops->owner);
exit: exit:
kfree (buff);
if (retval) if (retval)
return retval; return retval;
return count; return count;
} }
static ssize_t latch_read_file (struct file *file, char *buf, size_t count, loff_t *offset) static struct hotplug_slot_attribute hotplug_slot_attr_attention = {
.attr = {.name = "attention", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.show = attention_read_file,
.store = attention_write_file
};
static ssize_t latch_read_file (struct hotplug_slot *slot, char *buf)
{ {
struct hotplug_slot *slot = file->private_data;
unsigned char *page;
int retval; int retval;
int len;
u8 value; u8 value;
dbg("count = %d, offset = %lld\n", count, *offset);
if (*offset < 0)
return -EINVAL;
if (count <= 0)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
page = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
retval = get_latch_status (slot, &value); retval = get_latch_status (slot, &value);
if (retval) if (retval)
goto exit; goto exit;
len = sprintf (page, "%d\n", value); retval = sprintf (buf, "%d\n", value);
if (copy_to_user (buf, page, len)) {
retval = -EFAULT;
goto exit;
}
*offset += len;
retval = len;
exit: exit:
free_page((unsigned long)page);
return retval; return retval;
} }
static ssize_t presence_read_file (struct file *file, char *buf, size_t count, loff_t *offset) static struct hotplug_slot_attribute hotplug_slot_attr_latch = {
.attr = {.name = "latch", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.show = latch_read_file,
};
static ssize_t presence_read_file (struct hotplug_slot *slot, char *buf)
{ {
struct hotplug_slot *slot = file->private_data;
unsigned char *page;
int retval; int retval;
int len;
u8 value; u8 value;
dbg("count = %d, offset = %lld\n", count, *offset);
if (*offset < 0)
return -EINVAL;
if (count <= 0)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
page = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
retval = get_adapter_status (slot, &value); retval = get_adapter_status (slot, &value);
if (retval) if (retval)
goto exit; goto exit;
len = sprintf (page, "%d\n", value); retval = sprintf (buf, "%d\n", value);
if (copy_to_user (buf, page, len)) {
retval = -EFAULT;
goto exit;
}
*offset += len;
retval = len;
exit: exit:
free_page((unsigned long)page);
return retval; return retval;
} }
static struct hotplug_slot_attribute hotplug_slot_attr_presence = {
.attr = {.name = "adapter", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.show = presence_read_file,
};
static char *unknown_speed = "Unknown bus speed"; static char *unknown_speed = "Unknown bus speed";
static ssize_t max_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset) static ssize_t max_bus_speed_read_file (struct hotplug_slot *slot, char *buf)
{ {
struct hotplug_slot *slot = file->private_data;
unsigned char *page;
char *speed_string; char *speed_string;
int retval; int retval;
int len = 0;
enum pci_bus_speed value; enum pci_bus_speed value;
dbg ("count = %d, offset = %lld\n", count, *offset);
if (*offset < 0)
return -EINVAL;
if (count <= 0)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
page = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
retval = get_max_bus_speed (slot, &value); retval = get_max_bus_speed (slot, &value);
if (retval) if (retval)
goto exit; goto exit;
...@@ -907,47 +325,23 @@ static ssize_t max_bus_speed_read_file (struct file *file, char *buf, size_t cou ...@@ -907,47 +325,23 @@ static ssize_t max_bus_speed_read_file (struct file *file, char *buf, size_t cou
else else
speed_string = pci_bus_speed_strings[value]; speed_string = pci_bus_speed_strings[value];
len = sprintf (page, "%s\n", speed_string); retval = sprintf (buf, "%s\n", speed_string);
if (copy_to_user (buf, page, len)) {
retval = -EFAULT;
goto exit;
}
*offset += len;
retval = len;
exit: exit:
free_page((unsigned long)page);
return retval; return retval;
} }
static ssize_t cur_bus_speed_read_file (struct file *file, char *buf, size_t count, loff_t *offset) static struct hotplug_slot_attribute hotplug_slot_attr_max_bus_speed = {
.attr = {.name = "max_bus_speed", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.show = max_bus_speed_read_file,
};
static ssize_t cur_bus_speed_read_file (struct hotplug_slot *slot, char *buf)
{ {
struct hotplug_slot *slot = file->private_data;
unsigned char *page;
char *speed_string; char *speed_string;
int retval; int retval;
int len = 0;
enum pci_bus_speed value; enum pci_bus_speed value;
dbg ("count = %d, offset = %lld\n", count, *offset);
if (*offset < 0)
return -EINVAL;
if (count <= 0)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
page = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!page)
return -ENOMEM;
retval = get_cur_bus_speed (slot, &value); retval = get_cur_bus_speed (slot, &value);
if (retval) if (retval)
goto exit; goto exit;
...@@ -957,51 +351,25 @@ static ssize_t cur_bus_speed_read_file (struct file *file, char *buf, size_t cou ...@@ -957,51 +351,25 @@ static ssize_t cur_bus_speed_read_file (struct file *file, char *buf, size_t cou
else else
speed_string = pci_bus_speed_strings[value]; speed_string = pci_bus_speed_strings[value];
len = sprintf (page, "%s\n", speed_string); retval = sprintf (buf, "%s\n", speed_string);
if (copy_to_user (buf, page, len)) {
retval = -EFAULT;
goto exit;
}
*offset += len;
retval = len;
exit: exit:
free_page((unsigned long)page);
return retval; return retval;
} }
static ssize_t test_write_file (struct file *file, const char *ubuff, size_t count, loff_t *offset) static struct hotplug_slot_attribute hotplug_slot_attr_cur_bus_speed = {
.attr = {.name = "cur_bus_speed", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.show = cur_bus_speed_read_file,
};
static ssize_t test_write_file (struct hotplug_slot *slot, const char *buf,
size_t count)
{ {
struct hotplug_slot *slot = file->private_data;
char *buff;
unsigned long ltest; unsigned long ltest;
u32 test; u32 test;
int retval = 0; int retval = 0;
if (*offset < 0) ltest = simple_strtoul (buf, NULL, 10);
return -EINVAL;
if (count == 0 || count > 16384)
return 0;
if (*offset != 0)
return 0;
if (slot == NULL) {
dbg("slot == NULL???\n");
return -ENODEV;
}
buff = kmalloc (count + 1, GFP_KERNEL);
if (!buff)
return -ENOMEM;
memset (buff, 0x00, count + 1);
if (copy_from_user ((void *)buff, (void *)ubuff, count)) {
retval = -EFAULT;
goto exit;
}
ltest = simple_strtoul (buff, NULL, 10);
test = (u32)(ltest & 0xffffffff); test = (u32)(ltest & 0xffffffff);
dbg ("test = %d\n", test); dbg ("test = %d\n", test);
...@@ -1014,104 +382,69 @@ static ssize_t test_write_file (struct file *file, const char *ubuff, size_t cou ...@@ -1014,104 +382,69 @@ static ssize_t test_write_file (struct file *file, const char *ubuff, size_t cou
module_put(slot->ops->owner); module_put(slot->ops->owner);
exit: exit:
kfree (buff);
if (retval) if (retval)
return retval; return retval;
return count; return count;
} }
static struct hotplug_slot_attribute hotplug_slot_attr_test = {
.attr = {.name = "test", .mode = S_IFREG | S_IRUGO | S_IWUSR},
.store = test_write_file
};
static int fs_add_slot (struct hotplug_slot *slot) static int fs_add_slot (struct hotplug_slot *slot)
{ {
struct hotplug_slot_core *core = slot->core_priv;
int result;
result = get_mount();
if (result)
return result;
core->dir_dentry = fs_create_file (slot->name,
S_IFDIR | S_IXUGO | S_IRUGO,
NULL, NULL, NULL);
if (core->dir_dentry != NULL) {
if ((slot->ops->enable_slot) || if ((slot->ops->enable_slot) ||
(slot->ops->disable_slot) || (slot->ops->disable_slot) ||
(slot->ops->get_power_status)) (slot->ops->get_power_status))
core->power_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_power.attr);
fs_create_file ("power",
S_IFREG | S_IRUGO | S_IWUSR,
core->dir_dentry, slot,
&power_file_operations);
if ((slot->ops->set_attention_status) || if ((slot->ops->set_attention_status) ||
(slot->ops->get_attention_status)) (slot->ops->get_attention_status))
core->attention_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_attention.attr);
fs_create_file ("attention",
S_IFREG | S_IRUGO | S_IWUSR,
core->dir_dentry, slot,
&attention_file_operations);
if (slot->ops->get_latch_status) if (slot->ops->get_latch_status)
core->latch_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_latch.attr);
fs_create_file ("latch",
S_IFREG | S_IRUGO,
core->dir_dentry, slot,
&latch_file_operations);
if (slot->ops->get_adapter_status) if (slot->ops->get_adapter_status)
core->adapter_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
fs_create_file ("adapter",
S_IFREG | S_IRUGO,
core->dir_dentry, slot,
&presence_file_operations);
if (slot->ops->get_max_bus_speed) if (slot->ops->get_max_bus_speed)
core->max_bus_speed_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
fs_create_file ("max_bus_speed",
S_IFREG | S_IRUGO,
core->dir_dentry, slot,
&max_bus_speed_file_operations);
if (slot->ops->get_cur_bus_speed) if (slot->ops->get_cur_bus_speed)
core->cur_bus_speed_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_cur_bus_speed.attr);
fs_create_file ("cur_bus_speed",
S_IFREG | S_IRUGO,
core->dir_dentry, slot,
&cur_bus_speed_file_operations);
if (slot->ops->hardware_test) if (slot->ops->hardware_test)
core->test_dentry = sysfs_create_file(&slot->kobj, &hotplug_slot_attr_test.attr);
fs_create_file ("test",
S_IFREG | S_IRUGO | S_IWUSR,
core->dir_dentry, slot,
&test_file_operations);
}
return 0; return 0;
} }
static void fs_remove_slot (struct hotplug_slot *slot) static void fs_remove_slot (struct hotplug_slot *slot)
{ {
struct hotplug_slot_core *core = slot->core_priv; if ((slot->ops->enable_slot) ||
(slot->ops->disable_slot) ||
if (core->dir_dentry) { (slot->ops->get_power_status))
if (core->power_dentry) sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_power.attr);
fs_remove_file (core->power_dentry);
if (core->attention_dentry) if ((slot->ops->set_attention_status) ||
fs_remove_file (core->attention_dentry); (slot->ops->get_attention_status))
if (core->latch_dentry) sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_attention.attr);
fs_remove_file (core->latch_dentry);
if (core->adapter_dentry) if (slot->ops->get_latch_status)
fs_remove_file (core->adapter_dentry); sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_latch.attr);
if (core->max_bus_speed_dentry)
fs_remove_file (core->max_bus_speed_dentry); if (slot->ops->get_adapter_status)
if (core->cur_bus_speed_dentry) sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_presence.attr);
fs_remove_file (core->cur_bus_speed_dentry);
if (core->test_dentry)
fs_remove_file (core->test_dentry);
fs_remove_file (core->dir_dentry);
}
remove_mount(); if (slot->ops->get_max_bus_speed)
sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_max_bus_speed.attr);
if (slot->ops->get_cur_bus_speed)
sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_cur_bus_speed.attr);
if (slot->ops->hardware_test)
sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_test.attr);
} }
static struct hotplug_slot *get_slot_from_name (const char *name) static struct hotplug_slot *get_slot_from_name (const char *name)
...@@ -1138,7 +471,6 @@ static struct hotplug_slot *get_slot_from_name (const char *name) ...@@ -1138,7 +471,6 @@ static struct hotplug_slot *get_slot_from_name (const char *name)
*/ */
int pci_hp_register (struct hotplug_slot *slot) int pci_hp_register (struct hotplug_slot *slot)
{ {
struct hotplug_slot_core *core;
int result; int result;
if (slot == NULL) if (slot == NULL)
...@@ -1146,20 +478,20 @@ int pci_hp_register (struct hotplug_slot *slot) ...@@ -1146,20 +478,20 @@ int pci_hp_register (struct hotplug_slot *slot)
if ((slot->info == NULL) || (slot->ops == NULL)) if ((slot->info == NULL) || (slot->ops == NULL))
return -EINVAL; return -EINVAL;
core = kmalloc (sizeof (struct hotplug_slot_core), GFP_KERNEL);
if (!core)
return -ENOMEM;
/* make sure we have not already registered this slot */ /* make sure we have not already registered this slot */
spin_lock (&list_lock); spin_lock (&list_lock);
if (get_slot_from_name (slot->name) != NULL) { if (get_slot_from_name (slot->name) != NULL) {
spin_unlock (&list_lock); spin_unlock (&list_lock);
kfree (core);
return -EINVAL; return -EINVAL;
} }
memset (core, 0, sizeof (struct hotplug_slot_core)); strncpy(slot->kobj.name, slot->name, KOBJ_NAME_LEN);
slot->core_priv = core; kobj_set_kset_s(slot, hotplug_slots_subsys);
if (kobject_register(&slot->kobj)) {
err("Unable to register kobject");
return -EINVAL;
}
list_add (&slot->slot_list, &pci_hotplug_slot_list); list_add (&slot->slot_list, &pci_hotplug_slot_list);
spin_unlock (&list_lock); spin_unlock (&list_lock);
...@@ -1197,20 +529,11 @@ int pci_hp_deregister (struct hotplug_slot *slot) ...@@ -1197,20 +529,11 @@ int pci_hp_deregister (struct hotplug_slot *slot)
spin_unlock (&list_lock); spin_unlock (&list_lock);
fs_remove_slot (slot); fs_remove_slot (slot);
kfree(slot->core_priv);
dbg ("Removed slot %s from the list\n", slot->name); dbg ("Removed slot %s from the list\n", slot->name);
kobject_unregister(&slot->kobj);
return 0; return 0;
} }
static inline void update_dentry_inode_time (struct dentry *dentry)
{
struct inode *inode = dentry->d_inode;
if (inode) {
inode->i_mtime = CURRENT_TIME;
dnotify_parent(dentry, DN_MODIFY);
}
}
/** /**
* pci_hp_change_slot_info - changes the slot's information structure in the core * pci_hp_change_slot_info - changes the slot's information structure in the core
* @name: the name of the slot whose info has changed * @name: the name of the slot whose info has changed
...@@ -1220,45 +543,10 @@ static inline void update_dentry_inode_time (struct dentry *dentry) ...@@ -1220,45 +543,10 @@ static inline void update_dentry_inode_time (struct dentry *dentry)
* hotplug subsystem previously with a call to pci_hp_register(). * hotplug subsystem previously with a call to pci_hp_register().
* *
* Returns 0 if successful, anything else for an error. * Returns 0 if successful, anything else for an error.
* Not supported by sysfs now.
*/ */
int pci_hp_change_slot_info (const char *name, struct hotplug_slot_info *info) int pci_hp_change_slot_info (const char *name, struct hotplug_slot_info *info)
{ {
struct hotplug_slot *temp;
struct hotplug_slot_core *core;
if (info == NULL)
return -ENODEV;
spin_lock (&list_lock);
temp = get_slot_from_name (name);
if (temp == NULL) {
spin_unlock (&list_lock);
return -ENODEV;
}
/*
* check all fields in the info structure, and update timestamps
* for the files referring to the fields that have now changed.
*/
core = temp->core_priv;
if ((core->power_dentry) &&
(temp->info->power_status != info->power_status))
update_dentry_inode_time (core->power_dentry);
if ((core->attention_dentry) &&
(temp->info->attention_status != info->attention_status))
update_dentry_inode_time (core->attention_dentry);
if ((core->latch_dentry) &&
(temp->info->latch_status != info->latch_status))
update_dentry_inode_time (core->latch_dentry);
if ((core->adapter_dentry) &&
(temp->info->adapter_status != info->adapter_status))
update_dentry_inode_time (core->adapter_dentry);
if ((core->cur_bus_speed_dentry) &&
(temp->info->cur_bus_speed != info->cur_bus_speed))
update_dentry_inode_time (core->cur_bus_speed_dentry);
memcpy (temp->info, info, sizeof (struct hotplug_slot_info));
spin_unlock (&list_lock);
return 0; return 0;
} }
...@@ -1266,20 +554,18 @@ static int __init pci_hotplug_init (void) ...@@ -1266,20 +554,18 @@ static int __init pci_hotplug_init (void)
{ {
int result; int result;
spin_lock_init(&mount_lock);
spin_lock_init(&list_lock); spin_lock_init(&list_lock);
dbg("registering filesystem.\n"); kset_set_kset_s(&hotplug_slots_subsys, pci_bus_type.subsys);
result = register_filesystem(&pcihpfs_type); result = subsystem_register(&hotplug_slots_subsys);
if (result) { if (result) {
err("register_filesystem failed with %d\n", result); err("Register subsys with error %d\n", result);
goto exit; goto exit;
} }
result = cpci_hotplug_init(debug); result = cpci_hotplug_init(debug);
if (result) { if (result) {
err ("cpci_hotplug_init with error %d\n", result); err ("cpci_hotplug_init with error %d\n", result);
goto error_fs; goto err_subsys;
} }
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -1290,22 +576,21 @@ static int __init pci_hotplug_init (void) ...@@ -1290,22 +576,21 @@ static int __init pci_hotplug_init (void)
info (DRIVER_DESC " version: " DRIVER_VERSION "\n"); info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
goto exit; goto exit;
error_fs: err_subsys:
unregister_filesystem(&pcihpfs_type); subsystem_unregister(&hotplug_slots_subsys);
exit: exit:
return result; return result;
} }
static void __exit pci_hotplug_exit (void) static void __exit pci_hotplug_exit (void)
{ {
cpci_hotplug_exit();
unregister_filesystem(&pcihpfs_type);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
if (slotdir) if (slotdir)
remove_proc_entry(slotdir_name, proc_bus_pci_dir); remove_proc_entry(slotdir_name, proc_bus_pci_dir);
#endif #endif
cpci_hotplug_exit();
subsystem_unregister(&hotplug_slots_subsys);
} }
module_init(pci_hotplug_init); module_init(pci_hotplug_init);
...@@ -1320,4 +605,3 @@ MODULE_PARM_DESC(debug, "Debugging mode enabled or not"); ...@@ -1320,4 +605,3 @@ MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
EXPORT_SYMBOL_GPL(pci_hp_register); EXPORT_SYMBOL_GPL(pci_hp_register);
EXPORT_SYMBOL_GPL(pci_hp_deregister); EXPORT_SYMBOL_GPL(pci_hp_deregister);
EXPORT_SYMBOL_GPL(pci_hp_change_slot_info); EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7