litmus-rt.git - The LITMUS^RT kernel.

diff options

author	Chandra Seetharaman <sekharan@us.ibm.com>	2006-07-30 06:03:35 -0400
committer	Linus Torvalds <torvalds@g5.osdl.org>	2006-07-31 16:28:39 -0400
commit	8c78f3075dab4be279e283f901f00e33ce44890a (patch)
tree	034d667a713b24d39608b09bd2aafb7983fb6ba5 /kernel
parent	cea6a4ba8acfba6f59cc9ed71e0d05cb770b9d9c (diff)

[PATCH] cpu hotplug: replace __devinit* with __cpuinit* for cpu notifications

Few of the callback functions and notifier blocks that are associated with cpu notifications incorrectly have __devinit and __devinitdata. They should be __cpuinit and __cpuinitdata instead. It makes no functional difference but wastes text area when CONFIG_HOTPLUG is enabled and CONFIG_HOTPLUG_CPU is not. This patch fixes all those instances. Signed-off-by: Chandra Seetharaman <sekharan@us.ibm.com> Cc: Ashok Raj <ashok.raj@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Diffstat (limited to 'kernel')

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

5 files changed, 10 insertions, 10 deletions


diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index d17766d40dab..be989efc7856 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c
@@ -835,7 +835,7 @@ static void migrate_hrtimers(int cpu)
835	}	835	}
836	#endif /* CONFIG_HOTPLUG_CPU */	836	#endif /* CONFIG_HOTPLUG_CPU */
837		837
838	static int __devinit hrtimer_cpu_notify(struct notifier_block *self,	838	static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self,
839	unsigned long action, void *hcpu)	839	unsigned long action, void *hcpu)
840	{	840	{
841	long cpu = (long)hcpu;	841	long cpu = (long)hcpu;
@@ -859,7 +859,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self,
859	return NOTIFY_OK;	859	return NOTIFY_OK;
860	}	860	}
861		861
862	static struct notifier_block __devinitdata hrtimers_nb = {	862	static struct notifier_block __cpuinitdata hrtimers_nb = {
863	.notifier_call = hrtimer_cpu_notify,	863	.notifier_call = hrtimer_cpu_notify,
864	};	864	};
865		865


diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index 759805c9859a..436ab35f6fa7 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c
@@ -548,7 +548,7 @@ static void __devinit rcu_online_cpu(int cpu)
548	tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);	548	tasklet_init(&per_cpu(rcu_tasklet, cpu), rcu_process_callbacks, 0UL);
549	}	549	}
550		550
551	static int __devinit rcu_cpu_notify(struct notifier_block *self,	551	static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
552	unsigned long action, void *hcpu)	552	unsigned long action, void *hcpu)
553	{	553	{
554	long cpu = (long)hcpu;	554	long cpu = (long)hcpu;
@@ -565,7 +565,7 @@ static int __devinit rcu_cpu_notify(struct notifier_block *self,
565	return NOTIFY_OK;	565	return NOTIFY_OK;
566	}	566	}
567		567
568	static struct notifier_block __devinitdata rcu_nb = {	568	static struct notifier_block __cpuinitdata rcu_nb = {
569	.notifier_call = rcu_cpu_notify,	569	.notifier_call = rcu_cpu_notify,
570	};	570	};
571		571


diff --git a/kernel/softirq.c b/kernel/softirq.c index 0f08a84ae307..aab880677ce0 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c
@@ -547,7 +547,7 @@ static void takeover_tasklets(unsigned int cpu)
547	}	547	}
548	#endif /* CONFIG_HOTPLUG_CPU */	548	#endif /* CONFIG_HOTPLUG_CPU */
549		549
550	static int __devinit cpu_callback(struct notifier_block *nfb,	550	static int __cpuinit cpu_callback(struct notifier_block *nfb,
551	unsigned long action,	551	unsigned long action,
552	void *hcpu)	552	void *hcpu)
553	{	553	{
@@ -587,7 +587,7 @@ static int __devinit cpu_callback(struct notifier_block *nfb,
587	return NOTIFY_OK;	587	return NOTIFY_OK;
588	}	588	}
589		589
590	static struct notifier_block __devinitdata cpu_nfb = {	590	static struct notifier_block __cpuinitdata cpu_nfb = {
591	.notifier_call = cpu_callback	591	.notifier_call = cpu_callback
592	};	592	};
593		593


diff --git a/kernel/softlockup.c b/kernel/softlockup.c index 6b76caa22981..03e6a2b0b787 100644 --- a/kernel/softlockup.c +++ b/kernel/softlockup.c
@@ -104,7 +104,7 @@ static int watchdog(void * __bind_cpu)
104	/*	104	/*
105	* Create/destroy watchdog threads as CPUs come and go:	105	* Create/destroy watchdog threads as CPUs come and go:
106	*/	106	*/
107	static int __devinit	107	static int __cpuinit
108	cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)	108	cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)
109	{	109	{
110	int hotcpu = (unsigned long)hcpu;	110	int hotcpu = (unsigned long)hcpu;
@@ -142,7 +142,7 @@ cpu_callback(struct notifier_block nfb, unsigned long action, void hcpu)
142	return NOTIFY_OK;	142	return NOTIFY_OK;
143	}	143	}
144		144
145	static struct notifier_block __devinitdata cpu_nfb = {	145	static struct notifier_block __cpuinitdata cpu_nfb = {
146	.notifier_call = cpu_callback	146	.notifier_call = cpu_callback
147	};	147	};
148		148


diff --git a/kernel/timer.c b/kernel/timer.c index 05809c2e2fd6..ee319fc69f40 100644 --- a/kernel/timer.c +++ b/kernel/timer.c
@@ -1688,7 +1688,7 @@ static void __devinit migrate_timers(int cpu)
1688	}	1688	}
1689	#endif /* CONFIG_HOTPLUG_CPU */	1689	#endif /* CONFIG_HOTPLUG_CPU */
1690		1690
1691	static int __devinit timer_cpu_notify(struct notifier_block *self,	1691	static int __cpuinit timer_cpu_notify(struct notifier_block *self,
1692	unsigned long action, void *hcpu)	1692	unsigned long action, void *hcpu)
1693	{	1693	{
1694	long cpu = (long)hcpu;	1694	long cpu = (long)hcpu;
@@ -1708,7 +1708,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self,
1708	return NOTIFY_OK;	1708	return NOTIFY_OK;
1709	}	1709	}
1710		1710
1711	static struct notifier_block __devinitdata timers_nb = {	1711	static struct notifier_block __cpuinitdata timers_nb = {
1712	.notifier_call = timer_cpu_notify,	1712	.notifier_call = timer_cpu_notify,
1713	};	1713	};
1714		1714

/* * Copyright (C) 1994-1998 Linus Torvalds & authors (see below) * Copyright (C) 2005, 2007 Bartlomiej Zolnierkiewicz */ /* * Mostly written by Mark Lord <mlord@pobox.com> * and Gadi Oxman <gadio@netvision.net.il> * and Andre Hedrick <andre@linux-ide.org> * * See linux/MAINTAINERS for address of current maintainer. * * This is the IDE probe module, as evolved from hd.c and ide.c. * * -- increase WAIT_PIDENTIFY to avoid CD-ROM locking at boot * by Andrea Arcangeli */ #include <linux/module.h> #include <linux/types.h> #include <linux/string.h> #include <linux/kernel.h> #include <linux/timer.h> #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/major.h> #include <linux/errno.h> #include <linux/genhd.h> #include <linux/slab.h> #include <linux/delay.h> #include <linux/ide.h> #include <linux/spinlock.h> #include <linux/kmod.h> #include <linux/pci.h> #include <linux/scatterlist.h> #include <asm/byteorder.h> #include <asm/irq.h> #include <asm/uaccess.h> #include <asm/io.h> /** * generic_id - add a generic drive id * @drive: drive to make an ID block for * * Add a fake id field to the drive we are passed. This allows * use to skip a ton of NULL checks (which people always miss) * and make drive properties unconditional outside of this file */ static void generic_id(ide_drive_t *drive) { u16 *id = drive->id; id[ATA_ID_CUR_CYLS] = id[ATA_ID_CYLS] = drive->cyl; id[ATA_ID_CUR_HEADS] = id[ATA_ID_HEADS] = drive->head; id[ATA_ID_CUR_SECTORS] = id[ATA_ID_SECTORS] = drive->sect; } static void ide_disk_init_chs(ide_drive_t *drive) { u16 *id = drive->id; /* Extract geometry if we did not already have one for the drive */ if (!drive->cyl || !drive->head || !drive->sect) { drive->cyl = drive->bios_cyl = id[ATA_ID_CYLS]; drive->head = drive->bios_head = id[ATA_ID_HEADS]; drive->sect = drive->bios_sect = id[ATA_ID_SECTORS]; } /* Handle logical geometry translation by the drive */ if (ata_id_current_chs_valid(id)) { drive->cyl = id[ATA_ID_CUR_CYLS]; drive->head = id[ATA_ID_CUR_HEADS]; drive->sect = id[ATA_ID_CUR_SECTORS]; } /* Use physical geometry if what we have still makes no sense */ if (drive->head > 16 && id[ATA_ID_HEADS] && id[ATA_ID_HEADS] <= 16) { drive->cyl = id[ATA_ID_CYLS]; drive->head = id[ATA_ID_HEADS]; drive->sect = id[ATA_ID_SECTORS]; } } static void ide_disk_init_mult_count(ide_drive_t *drive) { u16 *id = drive->id; u8 max_multsect = id[ATA_ID_MAX_MULTSECT] & 0xff; if (max_multsect) { if ((max_multsect / 2) > 1) id[ATA_ID_MULTSECT] = max_multsect | 0x100; else id[ATA_ID_MULTSECT] &= ~0x1ff; drive->mult_req = id[ATA_ID_MULTSECT] & 0xff; if (drive->mult_req) drive->special_flags |= IDE_SFLAG_SET_MULTMODE; } } static void ide_classify_ata_dev(ide_drive_t *drive) { u16 *id = drive->id; char *m = (char *)&id[ATA_ID_PROD]; int is_cfa = ata_id_is_cfa(id); /* CF devices are *not* removable in Linux definition of the term */ if (is_cfa == 0 && (id[ATA_ID_CONFIG] & (1 << 7))) drive->dev_flags |= IDE_DFLAG_REMOVABLE; drive->media = ide_disk; if (!ata_id_has_unload(drive->id)) drive->dev_flags |= IDE_DFLAG_NO_UNLOAD; printk(KERN_INFO "%s: %s, %s DISK drive\n", drive->name, m, is_cfa ? "CFA" : "ATA"); } static void ide_classify_atapi_dev(ide_drive_t *drive) { u16 *id = drive->id; char *m = (char *)&id[ATA_ID_PROD]; u8 type = (id[ATA_ID_CONFIG] >> 8) & 0x1f; printk(KERN_INFO "%s: %s, ATAPI ", drive->name, m); switch (type) { case ide_floppy: if (!strstr(m, "CD-ROM")) { if (!strstr(m, "oppy") && !strstr(m, "poyp") && !strstr(m, "ZIP")) printk(KERN_CONT "cdrom or floppy?, assuming "); if (drive->media != ide_cdrom) { printk(KERN_CONT "FLOPPY"); drive->dev_flags |= IDE_DFLAG_REMOVABLE; break; } } /* Early cdrom models used zero */ type = ide_cdrom; case ide_cdrom: drive->dev_flags |= IDE_DFLAG_REMOVABLE; #ifdef CONFIG_PPC /* kludge for Apple PowerBook internal zip */ if (!strstr(m, "CD-ROM") && strstr(m, "ZIP")) { printk(KERN_CONT "FLOPPY"); type = ide_floppy; break; } #endif printk(KERN_CONT "CD/DVD-ROM"); break; case ide_tape: printk(KERN_CONT "TAPE"); break; case ide_optical: printk(KERN_CONT "OPTICAL"); drive->dev_flags |= IDE_DFLAG_REMOVABLE; break; default: printk(KERN_CONT "UNKNOWN (type %d)", type); break; } printk(KERN_CONT " drive\n"); drive->media = type; /* an ATAPI device ignores DRDY */ drive->ready_stat = 0; if (ata_id_cdb_intr(id)) drive->atapi_flags |= IDE_AFLAG_DRQ_INTERRUPT; drive->dev_flags |= IDE_DFLAG_DOORLOCKING; /* we don't do head unloading on ATAPI devices */ drive->dev_flags |= IDE_DFLAG_NO_UNLOAD; } /** * do_identify - identify a drive * @drive: drive to identify * @cmd: command used * @id: buffer for IDENTIFY data * * Called when we have issued a drive identify command to * read and parse the results. This function is run with * interrupts disabled. */ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id) { ide_hwif_t *hwif = drive->hwif; char *m = (char *)&id[ATA_ID_PROD]; unsigned long flags; int bswap = 1; /* local CPU only; some systems need this */ local_irq_save(flags); /* read 512 bytes of id info */ hwif->tp_ops->input_data(drive, NULL, id, SECTOR_SIZE); local_irq_restore(flags); drive->dev_flags |= IDE_DFLAG_ID_READ; #ifdef DEBUG printk(KERN_INFO "%s: dumping identify data\n", drive->name); ide_dump_identify((u8 *)id); #endif ide_fix_driveid(id); /* * ATA_CMD_ID_ATA returns little-endian info, * ATA_CMD_ID_ATAPI *usually* returns little-endian info. */ if (cmd == ATA_CMD_ID_ATAPI) { if ((m[0] == 'N' && m[1] == 'E') || /* NEC */ (m[0] == 'F' && m[1] == 'X') || /* Mitsumi */ (m[0] == 'P' && m[1] == 'i')) /* Pioneer */ /* Vertos drives may still be weird */ bswap ^= 1; } ide_fixstring(m, ATA_ID_PROD_LEN, bswap); ide_fixstring((char *)&id[ATA_ID_FW_REV], ATA_ID_FW_REV_LEN, bswap); ide_fixstring((char *)&id[ATA_ID_SERNO], ATA_ID_SERNO_LEN, bswap); /* we depend on this a lot! */ m[ATA_ID_PROD_LEN - 1] = '\0'; if (strstr(m, "E X A B Y T E N E S T")) drive->dev_flags &= ~IDE_DFLAG_PRESENT; else drive->dev_flags |= IDE_DFLAG_PRESENT; } /** * ide_dev_read_id - send ATA/ATAPI IDENTIFY command * @drive: drive to identify * @cmd: command to use * @id: buffer for IDENTIFY data * @irq_ctx: flag set when called from the IRQ context * * Sends an ATA(PI) IDENTIFY request to a drive and waits for a response. * * Returns: 0 device was identified * 1 device timed-out (no response to identify request) * 2 device aborted the command (refused to identify itself) */ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id, int irq_ctx) { ide_hwif_t *hwif = drive->hwif; struct ide_io_ports *io_ports = &hwif->io_ports; const struct ide_tp_ops *tp_ops = hwif->tp_ops; int use_altstatus = 0, rc; unsigned long timeout; u8 s = 0, a = 0; /* * Disable device IRQ. Otherwise we'll get spurious interrupts * during the identify phase that the IRQ handler isn't expecting. */ if (io_ports->ctl_addr) tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS); /* take a deep breath */ if (irq_ctx) mdelay(50); else msleep(50); if (io_ports->ctl_addr && (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0) { a = tp_ops->read_altstatus(hwif); s = tp_ops->read_status(hwif); if ((a ^ s) & ~ATA_IDX) /* ancient Seagate drives, broken interfaces */ printk(KERN_INFO "%s: probing with STATUS(0x%02x) " "instead of ALTSTATUS(0x%02x)\n", drive->name, s, a); else /* use non-intrusive polling */ use_altstatus = 1; } /* set features register for atapi * identify command to be sure of reply */ if (cmd == ATA_CMD_ID_ATAPI) { struct ide_taskfile tf; memset(&tf, 0, sizeof(tf)); /* disable DMA & overlap */ tp_ops->tf_load(drive, &tf, IDE_VALID_FEATURE); } /* ask drive for ID */ tp_ops->exec_command(hwif, cmd); timeout = ((cmd == ATA_CMD_ID_ATA) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2; /* wait for IRQ and ATA_DRQ */ if (irq_ctx) { rc = __ide_wait_stat(drive, ATA_DRQ, BAD_R_STAT, timeout, &s); if (rc) return 1; } else { rc = ide_busy_sleep(drive, timeout, use_altstatus); if (rc) return 1; msleep(50); s = tp_ops->read_status(hwif); } if (OK_STAT(s, ATA_DRQ, BAD_R_STAT)) { /* drive returned ID */ do_identify(drive, cmd, id); /* drive responded with ID */ rc = 0; /* clear drive IRQ */ (void)tp_ops->read_status(hwif); } else { /* drive refused ID */ rc = 2; } return rc; } int ide_busy_sleep(ide_drive_t *drive, unsigned long timeout, int altstatus) { ide_hwif_t *hwif = drive->hwif; u8 stat; timeout += jiffies; do { msleep(50); /* give drive a breather */ stat = altstatus ? hwif->tp_ops->read_altstatus(hwif) : hwif->tp_ops->read_status(hwif); if ((stat & ATA_BUSY) == 0) return 0; } while (time_before(jiffies, timeout)); printk(KERN_ERR "%s: timeout in %s\n", drive->name, __func__); return 1; /* drive timed-out */ } static u8 ide_read_device(ide_drive_t *drive) { struct ide_taskfile tf; drive->hwif->tp_ops->tf_read(drive, &tf, IDE_VALID_DEVICE); return tf.device; } /** * do_probe - probe an IDE device * @drive: drive to probe * @cmd: command to use * * do_probe() has the difficult job of finding a drive if it exists, * without getting hung up if it doesn't exist, without trampling on * ethernet cards, and without leaving any IRQs dangling to haunt us later. * * If a drive is "known" to exist (from CMOS or kernel parameters), * but does not respond right away, the probe will "hang in there" * for the maximum wait time (about 30 seconds), otherwise it will * exit much more quickly. * * Returns: 0 device was identified * 1 device timed-out (no response to identify request) * 2 device aborted the command (refused to identify itself) * 3 bad status from device (possible for ATAPI drives) * 4 probe was not attempted because failure was obvious */ static int do_probe (ide_drive_t *drive, u8 cmd) { ide_hwif_t *hwif = drive->hwif; const struct ide_tp_ops *tp_ops = hwif->tp_ops; u16 *id = drive->id; int rc; u8 present = !!(drive->dev_flags & IDE_DFLAG_PRESENT), stat; /* avoid waiting for inappropriate probes */ if (present && drive->media != ide_disk && cmd == ATA_CMD_ID_ATA) return 4; #ifdef DEBUG printk(KERN_INFO "probing for %s: present=%d, media=%d, probetype=%s\n", drive->name, present, drive->media, (cmd == ATA_CMD_ID_ATA) ? "ATA" : "ATAPI"); #endif /* needed for some systems * (e.g. crw9624 as drive0 with disk as slave) */ msleep(50); tp_ops->dev_select(drive); msleep(50); if (ide_read_device(drive) != drive->select && present == 0) { if (drive->dn & 1) { /* exit with drive0 selected */ tp_ops->dev_select(hwif->devices[0]); /* allow ATA_BUSY to assert & clear */ msleep(50); } /* no i/f present: mmm.. this should be a 4 -ml */ return 3; } stat = tp_ops->read_status(hwif); if (OK_STAT(stat, ATA_DRDY, ATA_BUSY) || present || cmd == ATA_CMD_ID_ATAPI) { rc = ide_dev_read_id(drive, cmd, id, 0); if (rc) /* failed: try again */ rc = ide_dev_read_id(drive, cmd, id, 0); stat = tp_ops->read_status(hwif); if (stat == (ATA_BUSY | ATA_DRDY)) return 4; if (rc == 1 && cmd == ATA_CMD_ID_ATAPI) { printk(KERN_ERR "%s: no response (status = 0x%02x), " "resetting drive\n", drive->name, stat); msleep(50); tp_ops->dev_select(drive); msleep(50); tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET); (void)ide_busy_sleep(drive, WAIT_WORSTCASE, 0); rc = ide_dev_read_id(drive, cmd, id, 0); } /* ensure drive IRQ is clear */ stat = tp_ops->read_status(hwif); if (rc == 1) printk(KERN_ERR "%s: no response (status = 0x%02x)\n", drive->name, stat); } else { /* not present or maybe ATAPI */ rc = 3; } if (drive->dn & 1) { /* exit with drive0 selected */ tp_ops->dev_select(hwif->devices[0]); msleep(50); /* ensure drive irq is clear */ (void)tp_ops->read_status(hwif); } return rc; } /** * probe_for_drives - upper level drive probe * @drive: drive to probe for * * probe_for_drive() tests for existence of a given drive using do_probe() * and presents things to the user as needed. * * Returns: 0 no device was found * 1 device was found * (note: IDE_DFLAG_PRESENT might still be not set) */ static u8 probe_for_drive(ide_drive_t *drive) { char *m; int rc; u8 cmd; drive->dev_flags &= ~IDE_DFLAG_ID_READ; m = (char *)&drive->id[ATA_ID_PROD]; strcpy(m, "UNKNOWN"); /* skip probing? */ if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0) { /* if !(success||timed-out) */ cmd = ATA_CMD_ID_ATA; rc = do_probe(drive, cmd); if (rc >= 2) { /* look for ATAPI device */ cmd = ATA_CMD_ID_ATAPI; rc = do_probe(drive, cmd); } if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) return 0; /* identification failed? */ if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) { if (drive->media == ide_disk) { printk(KERN_INFO "%s: non-IDE drive, CHS=%d/%d/%d\n", drive->name, drive->cyl, drive->head, drive->sect); } else if (drive->media == ide_cdrom) { printk(KERN_INFO "%s: ATAPI cdrom (?)\n", drive->name); } else { /* nuke it */ printk(KERN_WARNING "%s: Unknown device on bus refused identification. Ignoring.\n", drive->name); drive->dev_flags &= ~IDE_DFLAG_PRESENT; } } else { if (cmd == ATA_CMD_ID_ATAPI) ide_classify_atapi_dev(drive); else ide_classify_ata_dev(drive); } } if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) return 0; /* The drive wasn't being helpful. Add generic info only */ if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) { generic_id(drive); return 1; } if (drive->media == ide_disk) { ide_disk_init_chs(drive); ide_disk_init_mult_count(drive); } return 1; } static void hwif_release_dev(struct device *dev) { ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev); complete(&hwif->gendev_rel_comp); } static int ide_register_port(ide_hwif_t *hwif) { int ret; /* register with global device tree */ dev_set_name(&hwif->gendev, "%s", hwif->name); dev_set_drvdata(&hwif->gendev, hwif); if (hwif->gendev.parent == NULL) hwif->gendev.parent = hwif->dev; hwif->gendev.release = hwif_release_dev; ret = device_register(&hwif->gendev); if (ret < 0) { printk(KERN_WARNING "IDE: %s: device_register error: %d\n", __func__, ret); goto out; } hwif->portdev = device_create(ide_port_class, &hwif->gendev, MKDEV(0, 0), hwif, "%s", hwif->name); if (IS_ERR(hwif->portdev)) { ret = PTR_ERR(hwif->portdev); device_unregister(&hwif->gendev); } out: return ret; } /** * ide_port_wait_ready - wait for port to become ready * @hwif: IDE port * * This is needed on some PPCs and a bunch of BIOS-less embedded * platforms. Typical cases are: * * - The firmware hard reset the disk before booting the kernel, * the drive is still doing it's poweron-reset sequence, that * can take up to 30 seconds. * * - The firmware does nothing (or no firmware), the device is * still in POST state (same as above actually). * * - Some CD/DVD/Writer combo drives tend to drive the bus during * their reset sequence even when they are non-selected slave * devices, thus preventing discovery of the main HD. * * Doing this wait-for-non-busy should not harm any existing * configuration and fix some issues like the above. * * BenH. * * Returns 0 on success, error code (< 0) otherwise. */ static int ide_port_wait_ready(ide_hwif_t *hwif) { const struct ide_tp_ops *tp_ops = hwif->tp_ops; ide_drive_t *drive; int i, rc; printk(KERN_DEBUG "Probing IDE interface %s...\n", hwif->name); /* Let HW settle down a bit from whatever init state we * come from */ mdelay(2); /* Wait for BSY bit to go away, spec timeout is 30 seconds, * I know of at least one disk who takes 31 seconds, I use 35 * here to be safe */ rc = ide_wait_not_busy(hwif, 35000); if (rc) return rc; /* Now make sure both master & slave are ready */ ide_port_for_each_dev(i, drive, hwif) { /* Ignore disks that we will not probe for later. */ if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0 || (drive->dev_flags & IDE_DFLAG_PRESENT)) { tp_ops->dev_select(drive); tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS); mdelay(2); rc = ide_wait_not_busy(hwif, 35000); if (rc) goto out; } else printk(KERN_DEBUG "%s: ide_wait_not_busy() skipped\n", drive->name); } out: /* Exit function with master reselected (let's be sane) */ if (i) tp_ops->dev_select(hwif->devices[0]); return rc; } /** * ide_undecoded_slave - look for bad CF adapters * @dev1: slave device * * Analyse the drives on the interface and attempt to decide if we * have the same drive viewed twice. This occurs with crap CF adapters * and PCMCIA sometimes. */ void ide_undecoded_slave(ide_drive_t *dev1) { ide_drive_t *dev0 = dev1->hwif->devices[0]; if ((dev1->dn & 1) == 0 || (dev0->dev_flags & IDE_DFLAG_PRESENT) == 0) return; /* If the models don't match they are not the same product */ if (strcmp((char *)&dev0->id[ATA_ID_PROD], (char *)&dev1->id[ATA_ID_PROD])) return; /* Serial numbers do not match */ if (strncmp((char *)&dev0->id[ATA_ID_SERNO], (char *)&dev1->id[ATA_ID_SERNO], ATA_ID_SERNO_LEN)) return; /* No serial number, thankfully very rare for CF */ if (*(char *)&dev0->id[ATA_ID_SERNO] == 0) return; /* Appears to be an IDE flash adapter with decode bugs */ printk(KERN_WARNING "ide-probe: ignoring undecoded slave\n"); dev1->dev_flags &= ~IDE_DFLAG_PRESENT; } EXPORT_SYMBOL_GPL(ide_undecoded_slave); static int ide_probe_port(ide_hwif_t *hwif) { ide_drive_t *drive; unsigned int irqd; int i, rc = -ENODEV; BUG_ON(hwif->present); if ((hwif->devices[0]->dev_flags & IDE_DFLAG_NOPROBE) && (hwif->devices[1]->dev_flags & IDE_DFLAG_NOPROBE)) return -EACCES; /* * We must always disable IRQ, as probe_for_drive will assert IRQ, but * we'll install our IRQ driver much later... */ irqd = hwif->irq; if (irqd) disable_irq(hwif->irq); if (ide_port_wait_ready(hwif) == -EBUSY) printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name); /* * Second drive should only exist if first drive was found, * but a lot of cdrom drives are configured as single slaves. */ ide_port_for_each_dev(i, drive, hwif) { (void) probe_for_drive(drive); if (drive->dev_flags & IDE_DFLAG_PRESENT) rc = 0; } /* * Use cached IRQ number. It might be (and is...) changed by probe * code above */ if (irqd) enable_irq(irqd); return rc; } static void ide_port_tune_devices(ide_hwif_t *hwif) { const struct ide_port_ops *port_ops = hwif->port_ops; ide_drive_t *drive; int i; ide_port_for_each_present_dev(i, drive, hwif) { ide_check_nien_quirk_list(drive); if (port_ops && port_ops->quirkproc) port_ops->quirkproc(drive); } ide_port_for_each_present_dev(i, drive, hwif) { ide_set_max_pio(drive); drive->dev_flags |= IDE_DFLAG_NICE1; if (hwif->dma_ops) ide_set_dma(drive); } } /* * init request queue */ static int ide_init_queue(ide_drive_t *drive) { struct request_queue *q; ide_hwif_t *hwif = drive->hwif; int max_sectors = 256; int max_sg_entries = PRD_ENTRIES; /* * Our default set up assumes the normal IDE case, * that is 64K segmenting, standard PRD setup * and LBA28. Some drivers then impose their own * limits and LBA48 we could raise it but as yet * do not. */ q = blk_init_queue_node(do_ide_request, NULL, hwif_to_node(hwif)); if (!q) return 1; q->queuedata = drive; blk_queue_segment_boundary(q, 0xffff); if (hwif->rqsize < max_sectors) max_sectors = hwif->rqsize; blk_queue_max_hw_sectors(q, max_sectors); #ifdef CONFIG_PCI /* When we have an IOMMU, we may have a problem where pci_map_sg() * creates segments that don't completely match our boundary * requirements and thus need to be broken up again. Because it * doesn't align properly either, we may actually have to break up * to more segments than what was we got in the first place, a max * worst case is twice as many. * This will be fixed once we teach pci_map_sg() about our boundary * requirements, hopefully soon. *FIXME* */ if (!PCI_DMA_BUS_IS_PHYS) max_sg_entries >>= 1; #endif /* CONFIG_PCI */ blk_queue_max_segments(q, max_sg_entries); /* assign drive queue */ drive->queue = q; /* needs drive->queue to be set */ ide_toggle_bounce(drive, 1); return 0; } static DEFINE_MUTEX(ide_cfg_mtx); /* * For any present drive: * - allocate the block device queue */ static int ide_port_setup_devices(ide_hwif_t *hwif) { ide_drive_t *drive; int i, j = 0; mutex_lock(&ide_cfg_mtx); ide_port_for_each_present_dev(i, drive, hwif) { if (ide_init_queue(drive)) { printk(KERN_ERR "ide: failed to init %s\n", drive->name); drive->dev_flags &= ~IDE_DFLAG_PRESENT; continue; } j++; } mutex_unlock(&ide_cfg_mtx); return j; } static void ide_host_enable_irqs(struct ide_host *host) { ide_hwif_t *hwif; int i; ide_host_for_each_port(i, hwif, host) { if (hwif == NULL) continue; /* clear any pending IRQs */ hwif->tp_ops->read_status(hwif); /* unmask IRQs */ if (hwif->io_ports.ctl_addr) hwif->tp_ops->write_devctl(hwif, ATA_DEVCTL_OBS); } } /* * This routine sets up the IRQ for an IDE interface. */ static int init_irq (ide_hwif_t *hwif) { struct ide_io_ports *io_ports = &hwif->io_ports; struct ide_host *host = hwif->host; irq_handler_t irq_handler = host->irq_handler; int sa = host->irq_flags; if (irq_handler == NULL) irq_handler = ide_intr; if (request_irq(hwif->irq, irq_handler, sa, hwif->name, hwif)) goto out_up; #if !defined(__mc68000__) printk(KERN_INFO "%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name, io_ports->data_addr, io_ports->status_addr, io_ports->ctl_addr, hwif->irq); #else printk(KERN_INFO "%s at 0x%08lx on irq %d", hwif->name, io_ports->data_addr, hwif->irq); #endif /* __mc68000__ */ if (hwif->host->host_flags & IDE_HFLAG_SERIALIZE) printk(KERN_CONT " (serialized)"); printk(KERN_CONT "\n"); return 0; out_up: return 1; } static int ata_lock(dev_t dev, void *data) { /* FIXME: we want to pin hwif down */ return 0; } static struct kobject *ata_probe(dev_t dev, int *part, void *data) { ide_hwif_t *hwif = data; int unit = *part >> PARTN_BITS; ide_drive_t *drive = hwif->devices[unit]; if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) return NULL; if (drive->media == ide_disk) request_module("ide-disk"); if (drive->media == ide_cdrom || drive->media == ide_optical) request_module("ide-cd");


context:
space:
mode: