[PATCH] 2.6.14-rt15 IDE compat_semaphore to completion

[PATCH] 2.6.14-rt15 IDE compat_semaphore to completion

[Aleksey Makarov]

Hi Ingo,

Please consider if this patch could be included into
the next realtime patch.

Aleksey Makarov

Index: linux-2.6.14-rt15/include/linux/ide.h
===================================================================
--- linux-2.6.14-rt15.orig/include/linux/ide.h
+++ linux-2.6.14-rt15/include/linux/ide.h
@@ -18,6 +18,7 @@
  #include <linux/bio.h>
  #include <linux/device.h>
  #include <linux/pci.h>
+#include <linux/completion.h>
  #include <asm/byteorder.h>
  #include <asm/system.h>
  #include <asm/io.h>
@@ -754,7 +755,7 @@ typedef struct ide_drive_s {
  	int		crc_count;	/* crc counter to reduce drive speed */
  	struct list_head list;
  	struct device	gendev;
-	struct compat_semaphore gendev_rel_sem;	/* to deal with device 
release() */
+	struct completion gendev_rel_sem;	/* to deal with device release() */
  } ide_drive_t;

  #define to_ide_device(dev)container_of(dev, ide_drive_t, gendev)
@@ -910,7 +911,7 @@ typedef struct hwif_s {
  	unsigned	sg_mapped  : 1;	/* sg_table and sg_nents are ready */

  	struct device	gendev;
-	struct compat_semaphore gendev_rel_sem; /* To deal with device 
release() */
+	struct completion gendev_rel_sem; /* To deal with device release() */

  	void		*hwif_data;	/* extra hwif data */

Index: linux-2.6.14-rt15/drivers/ide/ide.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/ide/ide.c
+++ linux-2.6.14-rt15/drivers/ide/ide.c
@@ -222,7 +222,7 @@ static void init_hwif_data(ide_hwif_t *h
  	hwif->mwdma_mask = 0x80;	/* disable all mwdma */
  	hwif->swdma_mask = 0x80;	/* disable all swdma */

-	sema_init(&hwif->gendev_rel_sem, 0);
+	init_completion(&hwif->gendev_rel_sem);

  	default_hwif_iops(hwif);
  	default_hwif_transport(hwif);
@@ -245,7 +245,7 @@ static void init_hwif_data(ide_hwif_t *h
  		drive->is_flash			= 0;
  		drive->vdma			= 0;
  		INIT_LIST_HEAD(&drive->list);
-		sema_init(&drive->gendev_rel_sem, 0);
+		init_completion(&drive->gendev_rel_sem);
  	}
  }

@@ -602,7 +602,7 @@ void ide_unregister(unsigned int index)
  		}
  		spin_unlock_irq(&ide_lock);
  		device_unregister(&drive->gendev);
-		down(&drive->gendev_rel_sem);
+		wait_for_completion(&drive->gendev_rel_sem);
  		spin_lock_irq(&ide_lock);
  	}
  	hwif->present = 0;
@@ -662,7 +662,7 @@ void ide_unregister(unsigned int index)
  	/* More messed up locking ... */
  	spin_unlock_irq(&ide_lock);
  	device_unregister(&hwif->gendev);
-	down(&hwif->gendev_rel_sem);
+	wait_for_completion(&hwif->gendev_rel_sem);

  	/*
  	 * Remove us from the kernel's knowledge
Index: linux-2.6.14-rt15/drivers/ide/ide-probe.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/ide/ide-probe.c
+++ linux-2.6.14-rt15/drivers/ide/ide-probe.c
@@ -656,7 +656,7 @@ static void hwif_release_dev (struct dev
  {
  	ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev);

-	up(&hwif->gendev_rel_sem);
+	complete(&hwif->gendev_rel_sem);
  }

  static void hwif_register (ide_hwif_t *hwif)
@@ -1328,7 +1328,7 @@ static void drive_release_dev (struct de
  	drive->queue = NULL;
  	spin_unlock_irq(&ide_lock);

-	up(&drive->gendev_rel_sem);
+	complete(&drive->gendev_rel_sem);
  }

  /*

Re: [PATCH] 2.6.14-rt15 IDE compat_semaphore to completion

[Ingo Molnar]

* Aleksey Makarov <amakarov@dev.rtsoft.ru> wrote:

> Hi Ingo,
> 
> Please consider if this patch could be included into
> the next realtime patch.

thanks, applied.

	Ingo

[PATCH] IDE compat_semaphore to completion

[Steven Rostedt]

The following patch is from Montavista.  I modified it slightly.
Semaphores are currently being used where it makes more sense for
completions.  This patch corrects that.

-- Steve

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Source: MontaVista Software, Inc.
Signed-off-by: Aleksey Makarov <amakarov@ru.mvista.com>
Description:
	The patch changes semaphores that are initialized as 
	locked to complete().

Index: linux-2.6.15-rc2-git5/drivers/ide/ide-probe.c
===================================================================
--- linux-2.6.15-rc2-git5.orig/drivers/ide/ide-probe.c	2005-11-23 07:59:15.000000000 -0500
+++ linux-2.6.15-rc2-git5/drivers/ide/ide-probe.c	2005-11-25 16:15:01.000000000 -0500
@@ -655,7 +655,7 @@
 {
 	ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev);
 
-	up(&hwif->gendev_rel_sem);
+	complete(&hwif->gendev_rel_comp);
 }
 
 static void hwif_register (ide_hwif_t *hwif)
@@ -1325,7 +1325,7 @@
 	drive->queue = NULL;
 	spin_unlock_irq(&ide_lock);
 
-	up(&drive->gendev_rel_sem);
+	complete(&drive->gendev_rel_comp);
 }
 
 /*
Index: linux-2.6.15-rc2-git5/drivers/ide/ide.c
===================================================================
--- linux-2.6.15-rc2-git5.orig/drivers/ide/ide.c	2005-11-23 07:59:15.000000000 -0500
+++ linux-2.6.15-rc2-git5/drivers/ide/ide.c	2005-11-25 16:15:01.000000000 -0500
@@ -222,7 +222,7 @@
 	hwif->mwdma_mask = 0x80;	/* disable all mwdma */
 	hwif->swdma_mask = 0x80;	/* disable all swdma */
 
-	sema_init(&hwif->gendev_rel_sem, 0);
+	init_completion(&hwif->gendev_rel_comp);
 
 	default_hwif_iops(hwif);
 	default_hwif_transport(hwif);
@@ -245,7 +245,7 @@
 		drive->is_flash			= 0;
 		drive->vdma			= 0;
 		INIT_LIST_HEAD(&drive->list);
-		sema_init(&drive->gendev_rel_sem, 0);
+		init_completion(&drive->gendev_rel_comp);
 	}
 }
 
@@ -602,7 +602,7 @@
 		}
 		spin_unlock_irq(&ide_lock);
 		device_unregister(&drive->gendev);
-		down(&drive->gendev_rel_sem);
+		wait_for_completion(&drive->gendev_rel_comp);
 		spin_lock_irq(&ide_lock);
 	}
 	hwif->present = 0;
@@ -662,7 +662,7 @@
 	/* More messed up locking ... */
 	spin_unlock_irq(&ide_lock);
 	device_unregister(&hwif->gendev);
-	down(&hwif->gendev_rel_sem);
+	wait_for_completion(&hwif->gendev_rel_comp);
 
 	/*
 	 * Remove us from the kernel's knowledge
Index: linux-2.6.15-rc2-git5/include/linux/ide.h
===================================================================
--- linux-2.6.15-rc2-git5.orig/include/linux/ide.h	2005-11-23 07:59:21.000000000 -0500
+++ linux-2.6.15-rc2-git5/include/linux/ide.h	2005-11-25 16:25:21.000000000 -0500
@@ -18,6 +18,7 @@
 #include <linux/bio.h>
 #include <linux/device.h>
 #include <linux/pci.h>
+#include <linux/completion.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -759,7 +760,7 @@
 	int		crc_count;	/* crc counter to reduce drive speed */
 	struct list_head list;
 	struct device	gendev;
-	struct semaphore gendev_rel_sem;	/* to deal with device release() */
+	struct completion gendev_rel_comp;	/* to deal with device release() */
 } ide_drive_t;
 
 #define to_ide_device(dev)container_of(dev, ide_drive_t, gendev)
@@ -915,7 +916,7 @@
 	unsigned	sg_mapped  : 1;	/* sg_table and sg_nents are ready */
 
 	struct device	gendev;
-	struct semaphore gendev_rel_sem; /* To deal with device release() */
+	struct completion gendev_rel_comp; /* To deal with device release() */
 
 	void		*hwif_data;	/* extra hwif data */
 

[PATCH] 2.6.14-rt15 IDE compat_semaphore to completion

[Steven Rostedt]

Ingo,

Here's a patch from MontaVista, that I slightly modified.  I sent this
to the mainline as well (you were CC'd).

-- Steve

Source: MontaVista Software, Inc.
MR: 14219
Type: Defect fix
Disposition: Should be submitted to lkml
Signed-off-by: Aleksey Makarov <amakarov@ru.mvista.com>
Description:
	The patch changes semaphores that are initialized as 
	locked to complete().

Index: linux-2.6.14-rt13/drivers/ide/ide-probe.c
===================================================================
--- linux-2.6.14-rt13.orig/drivers/ide/ide-probe.c	2005-11-17 17:43:04.000000000 -0500
+++ linux-2.6.14-rt13/drivers/ide/ide-probe.c	2005-11-17 17:46:01.000000000 -0500
@@ -656,7 +656,7 @@
 {
 	ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev);
 
-	up(&hwif->gendev_rel_sem);
+	complete(&hwif->gendev_rel_comp);
 }
 
 static void hwif_register (ide_hwif_t *hwif)
@@ -1328,7 +1328,7 @@
 	drive->queue = NULL;
 	spin_unlock_irq(&ide_lock);
 
-	up(&drive->gendev_rel_sem);
+	complete(&drive->gendev_rel_comp);
 }
 
 /*
Index: linux-2.6.14-rt13/drivers/ide/ide.c
===================================================================
--- linux-2.6.14-rt13.orig/drivers/ide/ide.c	2005-11-17 17:43:04.000000000 -0500
+++ linux-2.6.14-rt13/drivers/ide/ide.c	2005-11-17 17:45:31.000000000 -0500
@@ -222,7 +222,7 @@
 	hwif->mwdma_mask = 0x80;	/* disable all mwdma */
 	hwif->swdma_mask = 0x80;	/* disable all swdma */
 
-	sema_init(&hwif->gendev_rel_sem, 0);
+	init_completion(&hwif->gendev_rel_comp);
 
 	default_hwif_iops(hwif);
 	default_hwif_transport(hwif);
@@ -245,7 +245,7 @@
 		drive->is_flash			= 0;
 		drive->vdma			= 0;
 		INIT_LIST_HEAD(&drive->list);
-		sema_init(&drive->gendev_rel_sem, 0);
+		init_completion(&drive->gendev_rel_comp);
 	}
 }
 
@@ -602,7 +602,7 @@
 		}
 		spin_unlock_irq(&ide_lock);
 		device_unregister(&drive->gendev);
-		down(&drive->gendev_rel_sem);
+		wait_for_completion(&drive->gendev_rel_comp);
 		spin_lock_irq(&ide_lock);
 	}
 	hwif->present = 0;
@@ -662,7 +662,7 @@
 	/* More messed up locking ... */
 	spin_unlock_irq(&ide_lock);
 	device_unregister(&hwif->gendev);
-	down(&hwif->gendev_rel_sem);
+	wait_for_completion(&hwif->gendev_rel_comp);
 
 	/*
 	 * Remove us from the kernel's knowledge
Index: linux-2.6.14-rt13/include/linux/ide.h
===================================================================
--- linux-2.6.14-rt13.orig/include/linux/ide.h	2005-11-17 17:43:04.000000000 -0500
+++ linux-2.6.14-rt13/include/linux/ide.h	2005-11-17 17:44:36.000000000 -0500
@@ -18,6 +18,7 @@
 #include <linux/bio.h>
 #include <linux/device.h>
 #include <linux/pci.h>
+#include <linux/completion.h>
 #include <asm/byteorder.h>
 #include <asm/system.h>
 #include <asm/io.h>
@@ -754,7 +755,7 @@
 	int		crc_count;	/* crc counter to reduce drive speed */
 	struct list_head list;
 	struct device	gendev;
-	struct compat_semaphore gendev_rel_sem;	/* to deal with device release() */
+	struct completion gendev_rel_comp;  /* to deal with device release() */
 } ide_drive_t;
 
 #define to_ide_device(dev)container_of(dev, ide_drive_t, gendev)
@@ -910,7 +911,7 @@
 	unsigned	sg_mapped  : 1;	/* sg_table and sg_nents are ready */
 
 	struct device	gendev;
-	struct semaphore gendev_rel_sem; /* To deal with device release() */
+	struct completion gendev_rel_comp; /* To deal with device release() */
 
 	void		*hwif_data;	/* extra hwif data */
 

[PATCH -rt] convert compat sem in block device sx8

[Steven Rostedt]

Ingo,

I decided to add a few more conversions to the list :-)

Here's sx8. Unfortunately, I was only able to test compiling it, since I
don't have the hardware. Hence, I'm not sending this to mainline unless
someone can test it on yours. (your patch is the new -mm ;-)

-- Steve

Index: linux-2.6.14-rt15/drivers/block/sx8.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/block/sx8.c	2005-11-25 10:14:09.000000000 -0500
+++ linux-2.6.14-rt15/drivers/block/sx8.c	2005-11-25 16:55:01.000000000 -0500
@@ -27,6 +27,7 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <linux/dma-mapping.h>
+#include <linux/completion.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
@@ -280,10 +281,7 @@
 
 	struct work_struct		fsm_task;
 
-	/*
-	 * PREEMPT_RT: should be converted to completions.
-	 */
-	struct compat_semaphore		probe_sem;
+	struct completion		probe_comp;
 };
 
 struct carm_response {
@@ -1345,7 +1343,7 @@
 	}
 
 	case HST_PROBE_FINISHED:
-		up(&host->probe_sem);
+		completion(&host->probe_comp);
 		break;
 
 	case HST_ERROR:
@@ -1621,7 +1619,7 @@
 	host->flags = pci_dac ? FL_DAC : 0;
 	spin_lock_init(&host->lock);
 	INIT_WORK(&host->fsm_task, carm_fsm_task, host);
-	init_MUTEX_LOCKED(&host->probe_sem);
+	init_completion(&host->probe_comp);
 
 	for (i = 0; i < ARRAY_SIZE(host->req); i++)
 		host->req[i].tag = i;
@@ -1690,8 +1688,8 @@
 	if (rc)
 		goto err_out_free_irq;
 
-	DPRINTK("waiting for probe_sem\n");
-	down(&host->probe_sem);
+	DPRINTK("waiting for probe_comp\n");
+	wait_for_completion(&host->probe_comp);
 
 	printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
 	       host->name, pci_name(pdev), (int) CARM_MAX_PORTS,

[PATCH -rt] convert watchdog cpu5wdt from compat_sem to completion.

[Steven Rostedt]

OK Ingo,

This one is the last.  Of the compat_semaphores in drivers that I looked
at, these were the trivial ones.  The other ones I would not touch
unless I had hardware to test with, or the time to look deeper into it.

-- Steve

Index: linux-2.6.14-rt15/drivers/char/watchdog/cpu5wdt.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/char/watchdog/cpu5wdt.c	2005-11-25 10:14:09.000000000 -0500
+++ linux-2.6.14-rt15/drivers/char/watchdog/cpu5wdt.c	2005-11-25 16:57:31.000000000 -0500
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
+#include <linux/completion.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
@@ -56,7 +57,7 @@
 /* some device data */
 
 static struct {
-	struct compat_semaphore stop;
+	struct completion stop;
 	volatile int running;
 	struct timer_list timer;
 	volatile int queue;
@@ -84,7 +85,7 @@
 	}
 	else {
 		/* ticks doesn't matter anyway */
-		up(&cpu5wdt_device.stop);
+		complete(&cpu5wdt_device.stop);
 	}
 
 }
@@ -238,7 +239,7 @@
 	if ( !val )
 		printk(KERN_INFO PFX "sorry, was my fault\n");
 
-	init_MUTEX_LOCKED(&cpu5wdt_device.stop);
+	init_completion(&cpu5wdt_device.stop);
 	cpu5wdt_device.queue = 0;
 
 	clear_bit(0, &cpu5wdt_device.inuse);
@@ -268,7 +269,7 @@
 {
 	if ( cpu5wdt_device.queue ) {
 		cpu5wdt_device.queue = 0;
-		down(&cpu5wdt_device.stop);
+		wait_for_completion(&cpu5wdt_device.stop);
 	}
 
 	misc_deregister(&cpu5wdt_misc);

Re: [PATCH -rt] convert compat sem in block device sx8

[Steven Rostedt]

On Fri, 2005-11-25 at 17:50 -0500, Steven Rostedt wrote:
> Ingo,
> 
> I decided to add a few more conversions to the list :-)
> 
> Here's sx8. Unfortunately, I was only able to test compiling it, since I
> don't have the hardware. Hence, I'm not sending this to mainline unless
> someone can test it on yours. (your patch is the new -mm ;-)
> 

Ack!  I sent this after making a small change and never refreshing
quilt.  So this would not even compile!

Here's the fixed patch:

-- Steve

Index: linux-2.6.14-rt15/drivers/block/sx8.c
===================================================================
--- linux-2.6.14-rt15.orig/drivers/block/sx8.c	2005-11-25 10:14:09.000000000 -0500
+++ linux-2.6.14-rt15/drivers/block/sx8.c	2005-11-25 17:39:12.000000000 -0500
@@ -27,6 +27,7 @@
 #include <linux/time.h>
 #include <linux/hdreg.h>
 #include <linux/dma-mapping.h>
+#include <linux/completion.h>
 #include <asm/io.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
@@ -280,10 +281,7 @@
 
 	struct work_struct		fsm_task;
 
-	/*
-	 * PREEMPT_RT: should be converted to completions.
-	 */
-	struct compat_semaphore		probe_sem;
+	struct completion		probe_comp;
 };
 
 struct carm_response {
@@ -1345,7 +1343,7 @@
 	}
 
 	case HST_PROBE_FINISHED:
-		up(&host->probe_sem);
+		complete(&host->probe_comp);
 		break;
 
 	case HST_ERROR:
@@ -1621,7 +1619,7 @@
 	host->flags = pci_dac ? FL_DAC : 0;
 	spin_lock_init(&host->lock);
 	INIT_WORK(&host->fsm_task, carm_fsm_task, host);
-	init_MUTEX_LOCKED(&host->probe_sem);
+	init_completion(&host->probe_comp);
 
 	for (i = 0; i < ARRAY_SIZE(host->req); i++)
 		host->req[i].tag = i;
@@ -1690,8 +1688,8 @@
 	if (rc)
 		goto err_out_free_irq;
 
-	DPRINTK("waiting for probe_sem\n");
-	down(&host->probe_sem);
+	DPRINTK("waiting for probe_comp\n");
+	wait_for_completion(&host->probe_comp);
 
 	printk(KERN_INFO "%s: pci %s, ports %d, io %lx, irq %u, major %d\n",
 	       host->name, pci_name(pdev), (int) CARM_MAX_PORTS,

Re: [PATCH -rt] convert compat sem in block device sx8

[Ingo Molnar]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> On Fri, 2005-11-25 at 17:50 -0500, Steven Rostedt wrote:
> > Ingo,
> > 
> > I decided to add a few more conversions to the list :-)
> > 
> > Here's sx8. Unfortunately, I was only able to test compiling it, since I
> > don't have the hardware. Hence, I'm not sending this to mainline unless
> > someone can test it on yours. (your patch is the new -mm ;-)
> > 
> 
> Ack!  I sent this after making a small change and never refreshing
> quilt.  So this would not even compile!
> 
> Here's the fixed patch:

thanks, applied.

	Ingo

Re: [PATCH -rt] convert watchdog cpu5wdt from compat_sem to completion.

[Ingo Molnar]

* Steven Rostedt <rostedt@goodmis.org> wrote:

> OK Ingo,
> 
> This one is the last.  Of the compat_semaphores in drivers that I 
> looked at, these were the trivial ones.  The other ones I would not 
> touch unless I had hardware to test with, or the time to look deeper 
> into it.

thanks, applied.

	Ingo