Attachment 159061 Details for Bug 247982 – patch intoduces ide=disable

[patch] patch intoduces ide=disable

ide-disable.diff (text/plain), 2.17 KB, created by Gerd Hoffmann on 2007-07-12 14:26:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerd Hoffmann

Created: 2007-07-12 14:26:54 UTC

Size: 2.17 KB

patch

obsolete

>--- a/include/linux/ide.h.xenpv	2007-07-11 21:20:25.000000000 +0200
>+++ b/include/linux/ide.h	2007-07-11 21:21:21.000000000 +0200
>@@ -1006,6 +1006,7 @@ int generic_ide_ioctl(ide_drive_t *, str
> extern	ide_hwif_t	ide_hwifs[];		/* master data repository */
> #endif
> extern int noautodma;
>+extern int disable_ide;
> 
> extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs);
> int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
>--- a/drivers/ide/setup-pci.c.xenpv	2006-09-20 05:42:06.000000000 +0200
>+++ b/drivers/ide/setup-pci.c	2007-07-11 21:22:12.000000000 +0200
>@@ -653,6 +653,11 @@ static int do_ide_setup_pci_device(struc
> 	int tried_config = 0;
> 	int pciirq, ret;
> 
>+	if (disable_ide) {
>+		printk("%s: ide disabled\n", __FUNCTION__);
>+		return -ENODEV;
>+	}
>+
> 	ret = ide_setup_pci_controller(dev, d, noisy, &tried_config);
> 	if (ret < 0)
> 		goto out;
>--- a/drivers/ide/ide.c.xenpv	2007-07-11 15:12:17.000000000 +0200
>+++ b/drivers/ide/ide.c	2007-07-11 21:19:56.000000000 +0200
>@@ -171,6 +171,7 @@ static const u8 ide_hwif_to_major[] = { 
> static int idebus_parameter;	/* holds the "idebus=" parameter */
> static int system_bus_speed;	/* holds what we think is VESA/PCI bus speed */
> static int initializing;	/* set while initializing built-in drivers */
>+int disable_ide;
> 
> DECLARE_MUTEX(ide_cfg_sem);
>  __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock);
>@@ -360,7 +361,14 @@ struct proc_dir_entry *proc_ide_root;
> static struct resource* hwif_request_region(ide_hwif_t *hwif,
> 					    unsigned long addr, int num)
> {
>-	struct resource *res = request_region(addr, num, hwif->name);
>+	struct resource *res;
>+
>+	if (disable_ide) {
>+		printk("%s: ide disabled, refusing 0x%lX-0x%lX for %s\n",
>+		       __FUNCTION__, addr, addr+num-1, hwif->name);
>+		return NULL;
>+	}
>+	res = request_region(addr, num, hwif->name);
> 
> 	if (!res)
> 		printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
>@@ -1524,6 +1532,12 @@ static int __init ide_setup(char *s)
> 		return 1;
> 	}
> 
>+	if (!strcmp(s, "ide=disable")) {
>+		printk(" : disable drivers/ide subsystem\n");
>+		disable_ide = 1;
>+		return 1;
>+	}
>+
> #ifdef CONFIG_BLK_DEV_IDEPCI
> 	if (!strcmp(s, "ide=reverse")) {
> 		ide_scan_direction = 1;

Actions: View | Diff

Attachments on bug 247982: 159061