microcode, devfs: Wrong interface change in 2.4.25
A message that is not in the archive (sent off-list or not yet received): E1Auyi3-0000Up-00@dbz
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hello!
From the 2.4.25, devfs doesn't create anymore the microcode device in /dev/cpu/microcode (as expected from in devices.txt and LANANA) but in /dev/misc/microcode. The /dev/cpu/microcode path is also hardcoded also in microcode_ctl and distributions create only /dev/cpu/microcode.
So last microcode patch (in 2.4.25) is wrong.
You should add again the /dev/cpu/microcode support in devfs, so that the normal and stable interface is maintained (in stable kernel serie)
ciao
giacomo
Quoted 22 lines · Ryan Underwood
Quoted 6 lines · Giacomo A. Catenazzi
Quoted 3 lines
What I meant is that the name "
/dev/misc/microcode" must be used instead of "/dev/cpu/microcode", because the microcode driver in 2.4.25 no longer registers with devfs.I don't undestand.
Do you say that devfs will register only/dev/misc/microcode?No, the microcode driver only registers with misc.
Quoted 4 lines
So if devfs will register misc/microcode, it is probably a kernel bug (interface should not change!) or a problem with LANANA (in this case I should change misc microcode in drivers, but after an update to 'makedev' package.
Examine
microcode.cdriver diff between 2.4.23 and 2.4.25 in the init function. The removed code is obvious.
Hi Giacomo,
Thank you. Leave it with me and I'll verify what's going on in the 2.4.25 version thereof and correct it.
Kind regards
Tigran
Quoted 43 lines · Giacomo A. Catenazzi
Hello!
From the 2.4.25, devfs doesn't create anymore the microcode
device in/dev/cpu/microcode(as expected from in devices.txt and LANANA) but in/dev/misc/microcode. The/dev/cpu/microcodepath is also hardcoded also inmicrocode_ctland distributions create only/dev/cpu/microcode.So last microcode patch (in 2.4.25) is wrong.
You should add again the/dev/cpu/microcodesupport in devfs, so that the normal and stable interface is maintained (in stable kernel serie)ciao
giacomoQuoted 22 lines · Ryan Underwood
Quoted 6 lines · Giacomo A. Catenazzi
Quoted 3 lines
What I meant is that the name "
/dev/misc/microcode" must be used instead of "/dev/cpu/microcode", because the microcode driver in 2.4.25 no longer registers with devfs.I don't undestand.
Do you say that devfs will register only/dev/misc/microcode?No, the microcode driver only registers with misc.
Quoted 4 lines
So if devfs will register misc/microcode, it is probably a kernel bug (interface should not change!) or a problem with LANANA (in this case I should change misc microcode in drivers, but after an update to 'makedev' package.
Examine
microcode.cdriver diff between 2.4.23 and 2.4.25 in the init function. The removed code is obvious.
[patch-2.4.25] microcode.c fix (wasRe: microcode, devfs: Wrong interface change in 2.4.25
Hi Giacomo,
Yes, you are right. I have now looked at the driver in 2.4.25 and see that the latest change did break the compatibility inadvertently (because of wrongly backporting the changes from 2.6 --- can't remember who did it now, but it doesn't matter).
Please test the attached patch. I have tested it on 2.4.25 but only without devfs compiled into the kernel.
Kind regards
Tigran
PS.Notice that I also added your earlier suggestion to do compile-time merging of strings instead of runtime.
arch/i386/kernel/microcode.c +26 -11
@@ -1,7 +1,7 @@/* * Intel CPU Microcode Update driver for Linux * -* Copyright (C) 2000 Tigran Aivazian +* Copyright (C) 2000-2004 Tigran Aivazian * * This driver allows to upgrade microcode on Intel processors * belonging to IA-32 family - PentiumPro, Pentium II,
@@ -64,6 +64,10 @@* Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl * because we no longer hold a copy of applied microcode * in kernel memory. +* 1.14 23 Feb 2004 Tigran Aivazian <[email protected]> +* Restored devfs regular file entry point which was +* accidentally removed when back-porting changes from the 2.6 +* version of the driver. */
@@ -73,6 +77,7 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/miscdevice.h> +#include <linux/devfs_fs_kernel.h> #include <linux/spinlock.h> #include <linux/mm.h>
@@ -84,8 +89,8 @@MODULE_AUTHOR ("Tigran Aivazian <[email protected]>" );MODULE_LICENSE ("GPL" ); -#define MICROCODE_VERSION "1.13" -#define MICRO_DEBUG 1 +#define MICROCODE_VERSION "1.14" +#define MICRO_DEBUG 0#if MICRO_DEBUG #define dprintk(x...) printk(KERN_INFO x)#else
@@ -470,6 +475,7 @@return -EINVAL ; } +/* shared between misc device and devfs regular file */ static struct file_operations microcode_fops = { .owner =THIS_MODULE , .write = microcode_write,
@@ -483,29 +489,38 @@ .fops = µcode_fops, }; +static devfs_handle_t devfs_handle; +static int __init microcode_init (void ) {int error; error =misc_register (µcode_dev); -if (error) { +if (error)printk (KERN_ERR "microcode: can't misc_register on minor=%d\n" ,MICROCODE_MINOR ); -return error; + devfs_handle =devfs_register (NULL ,"cpu/microcode" , +DEVFS_FL_DEFAULT ,0 ,0 ,S_IFREG |S_IRUSR |S_IWUSR , + µcode_fops,NULL ); +if (devfs_handle ==NULL && error) { +printk (KERN_ERR "microcode: failed to devfs_register()\n" ); + goto out; } - + error =0 ;printk (KERN_INFO -"IA-32 Microcode Update Driver: v%s <[email protected]>\n" , -MICROCODE_VERSION ); -return 0 ; +"IA-32 Microcode Update Driver: v" +MICROCODE_VERSION " <[email protected]>\n" ); +out: +return error; } static void __exit microcode_exit (void) {misc_deregister (µcode_dev); -printk (KERN_INFO "IA-32 Microcode Update Driver v%s unregistered\n" , -MICROCODE_VERSION ); +devfs_unregister (devfs_handle); +printk (KERN_INFO "IA-32 Microcode Update Driver v" +MICROCODE_VERSION " unregistered\n" ); }module_init (microcode_init)
Re: [patch-2.4.25] microcode.c fix (wasRe: microcode, devfs: Wrong interface change in 2.4.25
Quoted 9 lines · Tigran Aivazian
Hi Giacomo,
Yes, you are right. I have now looked at the driver in 2.4.25 and see that the latest change did break the compatibility inadvertently (because of wrongly backporting the changes from 2.6 --- can't remember who did it now, but it doesn't matter).
Please test the attached patch. I have tested it on 2.4.25 but only without devfs compiled into the kernel.
The patch is correct. Now devfs will create the devices in /dev/cpu/microcode (and in /dev/misc).
[Yesterday I had some space problem with your patch, but I think the problem was in my MUA]
thanks!
ciao
giacomo
Quoted 104 lines
Kind regards
TigranPS.Notice that I also added your earlier suggestion to do compile-time merging of strings instead of runtime.
arch/i386/kernel/microcode.c +26
-11@@ -1,7 +1,7 @@/* * Intel CPU Microcode Update driver for Linux * -* Copyright (C) 2000 Tigran Aivazian +* Copyright (C) 2000-2004 Tigran Aivazian * * This driver allows to upgrade microcode on Intel processors * belonging to IA-32 family - PentiumPro, Pentium II, @@ -64,6 +64,10 @@* Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl * because we no longer hold a copy of applied microcode * in kernel memory. +* 1.14 23 Feb 2004 Tigran Aivazian <[email protected]> +* Restored devfs regular file entry point which was +* accidentally removed when back-porting changes from the 2.6 +* version of the driver. */ @@ -73,6 +77,7 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/miscdevice.h> +#include <linux/devfs_fs_kernel.h> #include <linux/spinlock.h> #include <linux/mm.h> @@ -84,8 +89,8 @@MODULE_AUTHOR ("Tigran Aivazian <[email protected]>" );MODULE_LICENSE ("GPL" ); -#define MICROCODE_VERSION "1.13" -#define MICRO_DEBUG 1 +#define MICROCODE_VERSION "1.14" +#define MICRO_DEBUG 0#if MICRO_DEBUG #define dprintk(x...) printk(KERN_INFO x)#else @@ -470,6 +475,7 @@return -EINVAL ; } +/* shared between misc device and devfs regular file */ static struct file_operations microcode_fops = { .owner =THIS_MODULE , .write = microcode_write,@@ -483,29 +489,38 @@ .fops = µcode_fops, }; +static devfs_handle_t devfs_handle; +static int __init microcode_init (void ) {int error; error =misc_register (µcode_dev); -if (error) { +if (error)printk (KERN_ERR "microcode: can't misc_register on minor=%d\n" ,MICROCODE_MINOR ); -return error; + devfs_handle =devfs_register (NULL ,"cpu/microcode" , +DEVFS_FL_DEFAULT ,0 ,0 ,S_IFREG |S_IRUSR |S_IWUSR , + µcode_fops,NULL ); +if (devfs_handle ==NULL && error) { +printk (KERN_ERR "microcode: failed to devfs_register()\n" ); + goto out; } - + error =0 ;printk (KERN_INFO -"IA-32 Microcode Update Driver: v%s <[email protected]>\n" , -MICROCODE_VERSION ); -return 0 ; +"IA-32 Microcode Update Driver: v" +MICROCODE_VERSION " <[email protected]>\n" ); +out: +return error; } static void __exit microcode_exit (void) {misc_deregister (µcode_dev); -printk (KERN_INFO "IA-32 Microcode Update Driver v%s unregistered\n" , -MICROCODE_VERSION ); +devfs_unregister (devfs_handle); +printk (KERN_INFO "IA-32 Microcode Update Driver v" +MICROCODE_VERSION " unregistered\n" ); }module_init (microcode_init)