[SCSI] gdth: Remove gdth_ctr_tab[] (884f7fba) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/scsi/gdth.c

+51 −58

Original line number	Original line	Diff line number	Diff line
	@@ -290,8 +290,7 @@ static unchar gdth_irq_tab[6] = {0,10,11,12,14,0}; /* IRQ table */
	#endif		#endif
	static unchar gdth_polling; /* polling if TRUE */		static unchar gdth_polling; /* polling if TRUE */
	static int gdth_ctr_count = 0; /* controller count */		static int gdth_ctr_count = 0; /* controller count */
	static struct Scsi_Host gdth_ctr_tab[MAXHA]; / controller table */		static LIST_HEAD(gdth_instances); /* controller list */
	static LIST_HEAD(gdth_instances);
	static unchar gdth_write_through = FALSE; /* write through */		static unchar gdth_write_through = FALSE; /* write through */
	static gdth_evt_str ebuffer[MAX_EVENTS]; /* event buffer */		static gdth_evt_str ebuffer[MAX_EVENTS]; /* event buffer */
	static int elastidx;		static int elastidx;
	@@ -384,6 +383,17 @@ static struct notifier_block gdth_notifier = {
	};		};
	static int notifier_disabled = 0;		static int notifier_disabled = 0;

			static gdth_ha_str *gdth_find_ha(int hanum)
			{
			gdth_ha_str *ha;

			list_for_each_entry(ha, &gdth_instances, list)
			if (hanum == ha->hanum)
			return ha;

			return NULL;
			}

	static void gdth_delay(int milliseconds)		static void gdth_delay(int milliseconds)
	{		{
	if (milliseconds == 0) {		if (milliseconds == 0) {
	@@ -3755,7 +3765,7 @@ static void gdth_timeout(ulong data)
	gdth_ha_str *ha;		gdth_ha_str *ha;
	ulong flags;		ulong flags;

	ha = shost_priv(gdth_ctr_tab[0]);		ha = list_first_entry(&gdth_instances, gdth_ha_str, list);
	spin_lock_irqsave(&ha->smp_lock, flags);		spin_lock_irqsave(&ha->smp_lock, flags);

	for (act_stats=0,i=0; i<GDTH_MAXCMDS; ++i)		for (act_stats=0,i=0; i<GDTH_MAXCMDS; ++i)
	@@ -4015,12 +4025,10 @@ static int gdth_queuecommand(struct scsi_cmnd *scp,
	static int gdth_open(struct inode inode, struct file filep)		static int gdth_open(struct inode inode, struct file filep)
	{		{
	gdth_ha_str *ha;		gdth_ha_str *ha;
	int i;

	for (i = 0; i < gdth_ctr_count; i++) {		list_for_each_entry(ha, &gdth_instances, list) {
	ha = shost_priv(gdth_ctr_tab[i]);
	if (!ha->sdev)		if (!ha->sdev)
	ha->sdev = scsi_get_host_dev(gdth_ctr_tab[i]);		ha->sdev = scsi_get_host_dev(ha->shost);
	}		}

	TRACE(("gdth_open()\n"));		TRACE(("gdth_open()\n"));
	@@ -4039,10 +4047,11 @@ static int ioc_event(void __user *arg)
	gdth_ha_str *ha;		gdth_ha_str *ha;
	ulong flags;		ulong flags;

	if (copy_from_user(&evt, arg, sizeof(gdth_ioctl_event)) \|\|		if (copy_from_user(&evt, arg, sizeof(gdth_ioctl_event)))
	evt.ionode >= gdth_ctr_count)		return -EFAULT;
			ha = gdth_find_ha(evt.ionode);
			if (!ha)
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[evt.ionode]);

	if (evt.erase == 0xff) {		if (evt.erase == 0xff) {
	if (evt.event.event_source == ES_TEST)		if (evt.event.event_source == ES_TEST)
	@@ -4076,10 +4085,11 @@ static int ioc_lockdrv(void __user *arg)
	ulong flags;		ulong flags;
	gdth_ha_str *ha;		gdth_ha_str *ha;

	if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)) \|\|		if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)))
	ldrv.ionode >= gdth_ctr_count)		return -EFAULT;
			ha = gdth_find_ha(ldrv.ionode);
			if (!ha)
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[ldrv.ionode]);

	for (i = 0; i < ldrv.drive_cnt && i < MAX_HDRIVES; ++i) {		for (i = 0; i < ldrv.drive_cnt && i < MAX_HDRIVES; ++i) {
	j = ldrv.drives[i];		j = ldrv.drives[i];
	@@ -4110,9 +4120,11 @@ static int ioc_resetdrv(void __user arg, char cmnd)
	int rval;		int rval;

	if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) \|\|		if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) \|\|
	res.ionode >= gdth_ctr_count \|\| res.number >= MAX_HDRIVES)		res.number >= MAX_HDRIVES)
			return -EFAULT;
			ha = gdth_find_ha(res.ionode);
			if (!ha)
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[res.ionode]);

	if (!ha->hdr[res.number].present)		if (!ha->hdr[res.number].present)
	return 0;		return 0;
	@@ -4142,10 +4154,11 @@ static int ioc_general(void __user arg, char cmnd)
	gdth_ha_str *ha;		gdth_ha_str *ha;
	int rval;		int rval;

	if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)) \|\|		if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)))
	gen.ionode >= gdth_ctr_count)		return -EFAULT;
			ha = gdth_find_ha(gen.ionode);
			if (!ha)
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[gen.ionode]);
	if (gen.data_len + gen.sense_len != 0) {		if (gen.data_len + gen.sense_len != 0) {
	if (!(buf = gdth_ioctl_alloc(ha, gen.data_len + gen.sense_len,		if (!(buf = gdth_ioctl_alloc(ha, gen.data_len + gen.sense_len,
	FALSE, &paddr)))		FALSE, &paddr)))
	@@ -4265,11 +4278,10 @@ static int ioc_hdrlist(void __user arg, char cmnd)
	goto free_fail;		goto free_fail;

	if (copy_from_user(rsc, arg, sizeof(gdth_ioctl_rescan)) \|\|		if (copy_from_user(rsc, arg, sizeof(gdth_ioctl_rescan)) \|\|
	rsc->ionode >= gdth_ctr_count) {		(NULL == (ha = gdth_find_ha(rsc->ionode)))) {
	rc = -EFAULT;		rc = -EFAULT;
	goto free_fail;		goto free_fail;
	}		}
	ha = shost_priv(gdth_ctr_tab[rsc->ionode]);
	memset(cmd, 0, sizeof(gdth_cmd_str));		memset(cmd, 0, sizeof(gdth_cmd_str));

	for (i = 0; i < MAX_HDRIVES; ++i) {		for (i = 0; i < MAX_HDRIVES; ++i) {
	@@ -4321,11 +4333,10 @@ static int ioc_rescan(void __user arg, char cmnd)
	goto free_fail;		goto free_fail;

	if (copy_from_user(rsc, arg, sizeof(gdth_ioctl_rescan)) \|\|		if (copy_from_user(rsc, arg, sizeof(gdth_ioctl_rescan)) \|\|
	rsc->ionode >= gdth_ctr_count) {		(NULL == (ha = gdth_find_ha(rsc->ionode)))) {
	rc = -EFAULT;		rc = -EFAULT;
	goto free_fail;		goto free_fail;
	}		}
	ha = shost_priv(gdth_ctr_tab[rsc->ionode]);
	memset(cmd, 0, sizeof(gdth_cmd_str));		memset(cmd, 0, sizeof(gdth_cmd_str));

	if (rsc->flag == 0) {		if (rsc->flag == 0) {
	@@ -4482,9 +4493,9 @@ static int gdth_ioctl(struct inode inode, struct file filep,
	gdth_ioctl_ctrtype ctrt;		gdth_ioctl_ctrtype ctrt;

	if (copy_from_user(&ctrt, argp, sizeof(gdth_ioctl_ctrtype)) \|\|		if (copy_from_user(&ctrt, argp, sizeof(gdth_ioctl_ctrtype)) \|\|
	ctrt.ionode >= gdth_ctr_count)		(NULL == (ha = gdth_find_ha(ctrt.ionode))))
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[ctrt.ionode]);
	if (ha->type == GDT_ISA \|\| ha->type == GDT_EISA) {		if (ha->type == GDT_ISA \|\| ha->type == GDT_EISA) {
	ctrt.type = (unchar)((ha->stype>>20) - 0x10);		ctrt.type = (unchar)((ha->stype>>20) - 0x10);
	} else {		} else {
	@@ -4523,9 +4534,8 @@ static int gdth_ioctl(struct inode inode, struct file filep,
	unchar i, j;		unchar i, j;

	if (copy_from_user(&lchn, argp, sizeof(gdth_ioctl_lockchn)) \|\|		if (copy_from_user(&lchn, argp, sizeof(gdth_ioctl_lockchn)) \|\|
	lchn.ionode >= gdth_ctr_count)		(NULL == (ha = gdth_find_ha(lchn.ionode))))
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[lchn.ionode]);

	i = lchn.channel;		i = lchn.channel;
	if (i < ha->bus_cnt) {		if (i < ha->bus_cnt) {
	@@ -4562,9 +4572,8 @@ static int gdth_ioctl(struct inode inode, struct file filep,
	int rval;		int rval;

	if (copy_from_user(&res, argp, sizeof(gdth_ioctl_reset)) \|\|		if (copy_from_user(&res, argp, sizeof(gdth_ioctl_reset)) \|\|
	res.ionode >= gdth_ctr_count)		(NULL == (ha = gdth_find_ha(res.ionode))))
	return -EFAULT;		return -EFAULT;
	ha = shost_priv(gdth_ctr_tab[res.ionode]);

	scp = kzalloc(sizeof(*scp), GFP_KERNEL);		scp = kzalloc(sizeof(*scp), GFP_KERNEL);
	if (!scp)		if (!scp)
	@@ -4626,7 +4635,7 @@ static void gdth_flush(gdth_ha_str *ha)
	/* shutdown routine */		/* shutdown routine */
	static int gdth_halt(struct notifier_block nb, ulong event, void buf)		static int gdth_halt(struct notifier_block nb, ulong event, void buf)
	{		{
	int hanum;		gdth_ha_str *ha;
	#ifndef __alpha__		#ifndef __alpha__
	gdth_cmd_str gdtcmd;		gdth_cmd_str gdtcmd;
	char cmnd[MAX_COMMAND_SIZE];		char cmnd[MAX_COMMAND_SIZE];
	@@ -4641,8 +4650,7 @@ static int gdth_halt(struct notifier_block nb, ulong event, void buf)

	notifier_disabled = 1;		notifier_disabled = 1;
	printk("GDT-HA: Flushing all host drives .. ");		printk("GDT-HA: Flushing all host drives .. ");
	for (hanum = 0; hanum < gdth_ctr_count; ++hanum) {		list_for_each_entry(ha, &gdth_instances, list) {
	gdth_ha_str *ha = shost_priv(gdth_ctr_tab[hanum]);
	gdth_flush(ha);		gdth_flush(ha);

	#ifndef __alpha__		#ifndef __alpha__
	@@ -4695,7 +4703,7 @@ static int gdth_isa_probe_one(ulong32 isa_bios)
	struct Scsi_Host *shp;		struct Scsi_Host *shp;
	gdth_ha_str *ha;		gdth_ha_str *ha;
	dma_addr_t scratch_dma_handle = 0;		dma_addr_t scratch_dma_handle = 0;
	int error, hanum, i;		int error, i;

	if (!gdth_search_isa(isa_bios))		if (!gdth_search_isa(isa_bios))
	return -ENXIO;		return -ENXIO;
	@@ -4730,10 +4738,8 @@ static int gdth_isa_probe_one(ulong32 isa_bios)
	shp->unchecked_isa_dma = 1;		shp->unchecked_isa_dma = 1;
	shp->irq = ha->irq;		shp->irq = ha->irq;
	shp->dma_channel = ha->drq;		shp->dma_channel = ha->drq;
	hanum = gdth_ctr_count;
	gdth_ctr_tab[gdth_ctr_count++] = shp;

	ha->hanum = (ushort)hanum;		ha->hanum = gdth_ctr_count++;
	ha->shost = shp;		ha->shost = shp;

	ha->pccb = &ha->cmdext;		ha->pccb = &ha->cmdext;
	@@ -4825,7 +4831,7 @@ static int gdth_eisa_probe_one(ushort eisa_slot)
	struct Scsi_Host *shp;		struct Scsi_Host *shp;
	gdth_ha_str *ha;		gdth_ha_str *ha;
	dma_addr_t scratch_dma_handle = 0;		dma_addr_t scratch_dma_handle = 0;
	int error, hanum, i;		int error, i;

	if (!gdth_search_eisa(eisa_slot))		if (!gdth_search_eisa(eisa_slot))
	return -ENXIO;		return -ENXIO;
	@@ -4852,10 +4858,8 @@ static int gdth_eisa_probe_one(ushort eisa_slot)
	shp->unchecked_isa_dma = 0;		shp->unchecked_isa_dma = 0;
	shp->irq = ha->irq;		shp->irq = ha->irq;
	shp->dma_channel = 0xff;		shp->dma_channel = 0xff;
	hanum = gdth_ctr_count;
	gdth_ctr_tab[gdth_ctr_count++] = shp;

	ha->hanum = (ushort)hanum;		ha->hanum = gdth_ctr_count++;
	ha->shost = shp;		ha->shost = shp;

	TRACE2(("EISA detect Bus 0: hanum %d\n", ha->hanum));		TRACE2(("EISA detect Bus 0: hanum %d\n", ha->hanum));
	@@ -4956,7 +4960,7 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)
	struct Scsi_Host *shp;		struct Scsi_Host *shp;
	gdth_ha_str *ha;		gdth_ha_str *ha;
	dma_addr_t scratch_dma_handle = 0;		dma_addr_t scratch_dma_handle = 0;
	int error, hanum, i;		int error, i;

	shp = scsi_host_alloc(&gdth_template, sizeof(gdth_ha_str));		shp = scsi_host_alloc(&gdth_template, sizeof(gdth_ha_str));
	if (!shp)		if (!shp)
	@@ -4983,10 +4987,8 @@ static int gdth_pci_probe_one(gdth_pci_str *pcistr, int ctr)
	shp->unchecked_isa_dma = 0;		shp->unchecked_isa_dma = 0;
	shp->irq = ha->irq;		shp->irq = ha->irq;
	shp->dma_channel = 0xff;		shp->dma_channel = 0xff;
	hanum = gdth_ctr_count;
	gdth_ctr_tab[gdth_ctr_count++] = shp;

	ha->hanum = (ushort)hanum;		ha->hanum = gdth_ctr_count++;
	ha->shost = shp;		ha->shost = shp;

	ha->pccb = &ha->cmdext;		ha->pccb = &ha->cmdext;
	@@ -5147,22 +5149,16 @@ static int __init gdth_init(void)
	#ifdef CONFIG_ISA		#ifdef CONFIG_ISA
	ulong32 isa_bios;		ulong32 isa_bios;
	for (isa_bios = 0xc8000UL; isa_bios <= 0xd8000UL;		for (isa_bios = 0xc8000UL; isa_bios <= 0xd8000UL;
	isa_bios += 0x8000UL) {		isa_bios += 0x8000UL)
	if (gdth_ctr_count >= MAXHA)
	break;
	gdth_isa_probe_one(isa_bios);		gdth_isa_probe_one(isa_bios);
	}
	#endif		#endif
	#ifdef CONFIG_EISA		#ifdef CONFIG_EISA
	{		{
	ushort eisa_slot;		ushort eisa_slot;
	for (eisa_slot = 0x1000; eisa_slot <= 0x8000;		for (eisa_slot = 0x1000; eisa_slot <= 0x8000;
	eisa_slot += 0x1000) {		eisa_slot += 0x1000)
	if (gdth_ctr_count >= MAXHA)
	break;
	gdth_eisa_probe_one(eisa_slot);		gdth_eisa_probe_one(eisa_slot);
	}		}
	}
	#endif		#endif
	}		}

	@@ -5175,12 +5171,9 @@ static int __init gdth_init(void)
	cnt = gdth_search_pci(pcistr);		cnt = gdth_search_pci(pcistr);
	printk("GDT-HA: Found %d PCI Storage RAID Controllers\n", cnt);		printk("GDT-HA: Found %d PCI Storage RAID Controllers\n", cnt);
	gdth_sort_pci(pcistr,cnt);		gdth_sort_pci(pcistr,cnt);
	for (ctr = 0; ctr < cnt; ++ctr) {		for (ctr = 0; ctr < cnt; ++ctr)
	if (gdth_ctr_count >= MAXHA)
	break;
	gdth_pci_probe_one(pcistr, ctr);		gdth_pci_probe_one(pcistr, ctr);
	}		}
	}
	#endif /* CONFIG_PCI */		#endif /* CONFIG_PCI */

	TRACE2(("gdth_detect() %d controller detected\n", gdth_ctr_count));		TRACE2(("gdth_detect() %d controller detected\n", gdth_ctr_count));