lkml.org 
[lkml]   [2003]   [Aug]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] microcode driver sparse __user annotations.
Date
Plus with a little codeshuffling, we can do away with the
prototypes.

diff -urpN --exclude-from=/home/davej/.exclude bk-linus/arch/i386/kernel/microcode.c linux-2.5/arch/i386/kernel/microcode.c
--- bk-linus/arch/i386/kernel/microcode.c 2003-07-12 11:28:45.000000000 +0100
+++ linux-2.5/arch/i386/kernel/microcode.c 2003-07-13 16:55:50.000000000 +0100
@@ -89,15 +89,6 @@ MODULE_LICENSE("GPL");
#define printf(x...)
#endif

-/* VFS interface */
-static int microcode_open(struct inode *, struct file *);
-static ssize_t microcode_read(struct file *, char *, size_t, loff_t *);
-static ssize_t microcode_write(struct file *, const char *, size_t, loff_t *);
-static int microcode_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
-
-static int do_microcode_update(void);
-static void do_update_one(void *);
-
/* read()/write()/ioctl() are serialized on this */
static DECLARE_RWSEM(microcode_rwsem);

@@ -106,46 +97,6 @@ static unsigned int microcode_num; /* n
static char *mc_applied; /* array of applied microcode blocks */
static unsigned int mc_fsize; /* file size of /dev/cpu/microcode */

-static struct file_operations microcode_fops = {
- .owner = THIS_MODULE,
- .read = microcode_read,
- .write = microcode_write,
- .ioctl = microcode_ioctl,
- .open = microcode_open,
-};
-
-static struct miscdevice microcode_dev = {
- .minor = MICROCODE_MINOR,
- .name = "microcode",
- .devfs_name = "cpu/microcode",
- .fops = &microcode_fops,
-};
-
-static int __init microcode_init(void)
-{
- int error;
-
- error = misc_register(&microcode_dev);
- if (error)
- return error;
-
- printk(KERN_INFO
- "IA-32 Microcode Update Driver: v%s <tigran@veritas.com>\n",
- MICROCODE_VERSION);
- return 0;
-}
-
-static void __exit microcode_exit(void)
-{
- misc_deregister(&microcode_dev);
- kfree(mc_applied);
- printk(KERN_INFO "IA-32 Microcode Update Driver v%s unregistered\n",
- MICROCODE_VERSION);
-}
-
-module_init(microcode_init)
-module_exit(microcode_exit)
-
static int microcode_open(struct inode *unused1, struct file *unused2)
{
return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
@@ -160,27 +111,6 @@ struct update_req {
int slot;
} update_req[NR_CPUS];

-static int do_microcode_update(void)
-{
- int i, error = 0, err;
- struct microcode *m;
-
- if (on_each_cpu(do_update_one, NULL, 1, 1) != 0) {
- printk(KERN_ERR "microcode: IPI timeout, giving up\n");
- return -EIO;
- }
-
- for (i=0; i<NR_CPUS; i++) {
- err = update_req[i].err;
- error += err;
- if (!err) {
- m = (struct microcode *)mc_applied + i;
- memcpy(m, &microcode[update_req[i].slot], sizeof(struct microcode));
- }
- }
- return error;
-}
-
static void do_update_one(void *unused)
{
int cpu_num = smp_processor_id();
@@ -291,7 +221,28 @@ static void do_update_one(void *unused)
}


-static ssize_t microcode_read(struct file *file, char *buf, size_t len, loff_t *ppos)
+static int do_microcode_update(void)
+{
+ int i, error = 0, err;
+ struct microcode *m;
+
+ if (on_each_cpu(do_update_one, NULL, 1, 1) != 0) {
+ printk(KERN_ERR "microcode: IPI timeout, giving up\n");
+ return -EIO;
+ }
+
+ for (i=0; i<NR_CPUS; i++) {
+ err = update_req[i].err;
+ error += err;
+ if (!err) {
+ m = (struct microcode *)mc_applied + i;
+ memcpy(m, &microcode[update_req[i].slot], sizeof(struct microcode));
+ }
+ }
+ return error;
+}
+
+static ssize_t microcode_read(struct file *file, char __user *buf, size_t len, loff_t *ppos)
{
ssize_t ret = 0;

@@ -310,7 +261,7 @@ out:
return ret;
}

-static ssize_t microcode_write(struct file *file, const char *buf, size_t len, loff_t *ppos)
+static ssize_t microcode_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos)
{
ssize_t ret;

@@ -384,3 +335,44 @@ static int microcode_ioctl(struct inode
}
return -EINVAL;
}
+
+static struct file_operations microcode_fops = {
+ .owner = THIS_MODULE,
+ .read = microcode_read,
+ .write = microcode_write,
+ .ioctl = microcode_ioctl,
+ .open = microcode_open,
+};
+
+static struct miscdevice microcode_dev = {
+ .minor = MICROCODE_MINOR,
+ .name = "microcode",
+ .devfs_name = "cpu/microcode",
+ .fops = &microcode_fops,
+};
+
+static int __init microcode_init(void)
+{
+ int error;
+
+ error = misc_register(&microcode_dev);
+ if (error)
+ return error;
+
+ printk(KERN_INFO
+ "IA-32 Microcode Update Driver: v%s <tigran@veritas.com>\n",
+ MICROCODE_VERSION);
+ return 0;
+}
+
+static void __exit microcode_exit(void)
+{
+ misc_deregister(&microcode_dev);
+ kfree(mc_applied);
+ printk(KERN_INFO "IA-32 Microcode Update Driver v%s unregistered\n",
+ MICROCODE_VERSION);
+}
+
+module_init(microcode_init)
+module_exit(microcode_exit)
+
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:47    [W:0.032 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site