LED: Add IDE disk activity LED trigger
PATCH 11/12 LED: Add IDE disk activity LED trigger
Add an LED trigger for IDE disk activity to the ide-disk driver.
drivers/ide/ide-disk.c +15 -2
@@ -60,6 +60,7 @@#include <linux/genhd.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/leds.h> #define _IDE_DISK
@@ -80,6 +81,8 @@static DECLARE_MUTEX (idedisk_ref_sem); +INIT_LED_TRIGGER (ide_led_trigger); +#define to_ide_disk (obj) container_of(obj, struct ide_disk_obj, kref)#define ide_disk_g (disk) \
@@ -311,10 +314,12 @@if (!blk_fs_request (rq)) {blk_dump_rq_flags (rq,"ide_do_rw_disk - bad command" ); -ide_end_request (drive,0 ,0 ); +ide_end_rw_disk (drive,0 ,0 );return ide_stopped; } +led_trigger_event (ide_led_trigger,LED_FULL ); +pr_debug ("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n" , drive->name,rq_data_dir (rq) ==READ ?"read" :"writ" , block, rq->nr_sectors, (unsigned long )rq->buffer);
@@ -325,6 +330,12 @@return __ide_do_rw_disk (drive, rq, block); } +static int ide_end_rw_disk (ide_drive_t *drive,int uptodate,int nr_sectors) +{ +led_trigger_event (ide_led_trigger,LED_OFF ); +ide_end_request (drive, uptodate, nr_sectors); +} +/* * Queries for true maximum capacity of the drive. * Returns maximum LBA address (> 0) of the drive, 0 if failed.
@@ -1097,7 +1108,7 @@ .media = ide_disk, .supports_dsc_overlap = 0, .do_request = ide_do_rw_disk, - .end_request = ide_end_request, + .end_request = ide_end_rw_disk, .error = __ide_error, .abort = __ide_abort, .proc = idedisk_proc,
@@ -1259,11 +1270,13 @@ static void __exit idedisk_exit (void) { +led_trigger_unregister_simple (ide_led_trigger);driver_unregister (&idedisk_driver.gen_driver); }static int __init idedisk_init (void ) { +led_trigger_register_simple ("ide-disk" , &ide_led_trigger);return driver_register (&idedisk_driver.gen_driver); }
Hi,
Generally it looks fine, some minor comments below.
Quoted 1 line · Richard Purdie
Add an LED trigger for IDE disk activity to the ide-disk driver.
filesystem activity
Quoted 38 lines
Signed-off-by Richard Purdie <[email protected]>Index:
linux-2.6.15/drivers/ide/ide-disk.c
===================================================================drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 renamed from drivers/ide/ide-disk.c 2006-02-04 13:35:37.000000000 +0000 +6
-1@@ -60,6 +60,7 @@ #include <linux/genhd.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/leds.h> #define _IDE_DISK@@ -80,6 +81,8 @@ static DECLARE_MUTEX(idedisk_ref_sem); +INIT_LED_TRIGGER(ide_led_trigger); + #define to_ide_disk(obj) container_of(obj, struct ide_disk_obj, kref) #define ide_disk_g(disk) \@@ -311,10 +314,12 @@ if (!blk_fs_request(rq)) { blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command"); - ide_end_request(drive, 0, 0); + ide_end_rw_disk(drive, 0, 0); return ide_stopped; } + led_trigger_event(ide_led_trigger, LED_FULL); + pr_debug("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n", drive->name, rq_data_dir(rq) == READ ? "read" : "writ", block, rq->nr_sectors, (unsigned long)rq->buffer);
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 line 333
Quoted 4 lines
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 renamed from drivers/ide/ide-disk.c 2006-02-04 13:35:37.000000000 +0000 +1
-0@@ -325,6 +330,12 @@ return __ide_do_rw_disk(drive, rq, block); } +static int ide_end_rw_disk(ide_drive_t *drive, int uptodate, int nr_sectors)
ide_end_rw_disk() is used before it is declared.
Does it compile?
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 line 335
Quoted 2 lines
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 renamed from drivers/ide/ide-disk.c 2006-02-04 13:35:37.000000000 +0000 +2
-0+{ + led_trigger_event(ide_led_trigger, LED_OFF);
It should check for blk_fs_request().
->end_request() can be used for other request types.
Quoted 16 lines
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 renamed from drivers/ide/ide-disk.c 2006-02-04 13:35:37.000000000 +0000 +4
-1+ ide_end_request(drive, uptodate, nr_sectors); +} + /* * Queries for true maximum capacity of the drive. * Returns maximum LBA address (> 0) of the drive, 0 if failed.@@ -1097,7 +1108,7 @@ .media = ide_disk, .supports_dsc_overlap = 0, .do_request = ide_do_rw_disk, - .end_request = ide_end_request, + .end_request = ide_end_rw_disk, .error = __ide_error, .abort = __ide_abort, .proc = idedisk_proc,
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 line 1274
Quoted 5 lines
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 renamed from drivers/ide/ide-disk.c 2006-02-04 13:35:37.000000000 +0000 +1
-0@@ -1259,11 +1270,13 @@ static void __exit idedisk_exit (void) { + led_trigger_unregister_simple(ide_led_trigger); driver_unregister(&idedisk_driver.gen_driver);
Shouldn't ordering be reverse to this in idedisk_init()? First driver_unregister(), then led_trigger_unregister_simple()?
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 line 1280
Quoted 6 lines
drivers/ide/ide-disk.c 2006-02-04 15:17:18.000000000 +0000 renamed from drivers/ide/ide-disk.c 2006-02-04 13:35:37.000000000 +0000 +1
-0} static int __init idedisk_init(void) { + led_trigger_register_simple("ide-disk", &ide_led_trigger); return driver_register(&idedisk_driver.gen_driver);
What does happen if driver_register() fails?
Bartlomiej
Quoted 11 lines · Bartlomiej Zolnierkiewicz
drivers/ide/ide-disk.c line 335
Quoted 2 lines
drivers/ide/ide-disk.c +2
-0+{ +led_trigger_event (ide_led_trigger,LED_OFF );It should check for
blk_fs_request().->end_request() can be used for other request types.
Quoted 4 lines
drivers/ide/ide-disk.c +3
-0+ide_end_request (drive, uptodate, nr_sectors); +} +
Quoted 7 lines
Quoted 4 lines
static void
__exitidedisk_exit(void)
{+ led_trigger_unregister_simple(ide_led_trigger); driver_unregister(&idedisk_driver.gen_driver);Shouldn't ordering be reverse to this in
idedisk_init()? Firstdriver_unregister(), thenled_trigger_unregister_simple()?
The other issues should have been addressed in -mm now, thanks. An event call after unregistering a trigger will not trouble the led trigger code as it was designed to withstand this. In -mm it now matches the order in the init function but this is purely cosmetic.
Richard
IDE disk activity fixes:
Catch failure case of driver_register().
Only trigger on blk_fs end requests.
drivers/ide/ide-disk.c +6 -3
@@ -302,7 +302,8 @@static int ide_end_rw_disk (ide_drive_t *drive,int uptodate,int nr_sectors) { -led_trigger_event (ide_led_trigger,LED_OFF ); +if (blk_fs_request (HWGROUP (drive)->rq)) +led_trigger_event (ide_led_trigger,LED_OFF );return ide_end_request (drive, uptodate, nr_sectors); }
@@ -1251,8 +1252,10 @@static int __init idedisk_init (void ) { -led_trigger_register_simple ("ide-disk" , &ide_led_trigger); -return driver_register (&idedisk_driver.gen_driver); +int ret =driver_register (&idedisk_driver.gen_driver); +if (ret >=0 ) +led_trigger_register_simple ("ide-disk" , &ide_led_trigger); +return ret; }MODULE_ALIAS ("ide:*m-disk*" );