Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e9ae6d5 authored by Finn Thain's avatar Finn Thain Committed by Christoph Hellwig
Browse files

mac_scsi: Add module option to Kconfig 



Allow mac_scsi to be built as a module. Replace the old validation of
__setup options with code that validates both module and __setup options.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 92de3831

drivers/scsi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1615,7 +1615,7 @@ config ATARI_SCSI_RESET_BOOT 
	  that leave the devices with SCSI operations partway completed.



config MAC_SCSI

	bool "Macintosh NCR5380 SCSI"

	tristate "Macintosh NCR5380 SCSI"

	depends on MAC && SCSI=y

	select SCSI_SPI_ATTRS

	help

drivers/scsi/mac_scsi.c

+37 −75
Original line number Diff line number Diff line
@@ -62,15 +62,18 @@ 
static void mac_scsi_reset_boot(struct Scsi_Host *instance);

#endif



static int setup_called = 0;

static int setup_can_queue = -1;

module_param(setup_can_queue, int, 0);

static int setup_cmd_per_lun = -1;

module_param(setup_cmd_per_lun, int, 0);

static int setup_sg_tablesize = -1;

module_param(setup_sg_tablesize, int, 0);

static int setup_use_pdma = -1;

#ifdef SUPPORT_TAGS

module_param(setup_use_pdma, int, 0);

static int setup_use_tagged_queuing = -1;

#endif

module_param(setup_use_tagged_queuing, int, 0);

static int setup_hostid = -1;

module_param(setup_hostid, int, 0);



/* Time (in jiffies) to wait after a reset; the SCSI standard calls for 250ms,

 * we usually do 0.5s to be on the safe side. But Toshiba CD-ROMs once more
@@ -102,72 +105,34 @@ static __inline__ void macscsi_write(struct Scsi_Host *instance, int reg, int va 
  out_8(instance->io_port + (reg<<4), value);

}



/*

 * Function : mac_scsi_setup(char *str)

 *

 * Purpose : booter command line initialization of the overrides array,

 *

 * Inputs : str - comma delimited list of options

 *

 */



static int __init mac_scsi_setup(char *str) {

#ifndef MODULE

static int __init mac_scsi_setup(char *str)

{

	int ints[7];



	(void)get_options(str, ARRAY_SIZE(ints), ints);



	if (setup_called++ || ints[0] < 1 || ints[0] > 6) {

	    printk(KERN_WARNING "scsi: <mac5380>"

		" Usage: mac5380=<can_queue>[,<cmd_per_lun>,<sg_tablesize>,<hostid>,<use_tags>,<use_pdma>]\n");

	    printk(KERN_ALERT "scsi: <mac5380> Bad Penguin parameters?\n");

	if (ints[0] < 1 || ints[0] > 6) {

		pr_err("Usage: mac5380=<can_queue>[,<cmd_per_lun>[,<sg_tablesize>[,<hostid>[,<use_tags>[,<use_pdma>]]]]]\n");

		return 0;

	}

	    

	if (ints[0] >= 1) {

		if (ints[1] > 0)

			/* no limits on this, just > 0 */

	if (ints[0] >= 1)

		setup_can_queue = ints[1];

	}

	if (ints[0] >= 2) {

		if (ints[2] > 0)

	if (ints[0] >= 2)

		setup_cmd_per_lun = ints[2];

	}

	if (ints[0] >= 3) {

		if (ints[3] >= 0) {

	if (ints[0] >= 3)

		setup_sg_tablesize = ints[3];

			/* Must be <= SG_ALL (255) */

			if (setup_sg_tablesize > SG_ALL)

				setup_sg_tablesize = SG_ALL;

		}

	}

	if (ints[0] >= 4) {

		/* Must be between 0 and 7 */

		if (ints[4] >= 0 && ints[4] <= 7)

	if (ints[0] >= 4)

		setup_hostid = ints[4];

		else if (ints[4] > 7)

			printk(KERN_WARNING "mac_scsi_setup: invalid host ID %d !\n", ints[4] );

	}

#ifdef SUPPORT_TAGS	

	if (ints[0] >= 5) {

		if (ints[5] >= 0)

			setup_use_tagged_queuing = !!ints[5];

	}

	

	if (ints[0] == 6) {

	    if (ints[6] >= 0)

	if (ints[0] >= 5)

		setup_use_tagged_queuing = ints[5];

	if (ints[0] >= 6)

		setup_use_pdma = ints[6];

	}

#else

	if (ints[0] == 5) {

	    if (ints[5] >= 0)

		setup_use_pdma = ints[5];

	}

#endif /* SUPPORT_TAGS */

	

	return 1;

}



__setup("mac5380=", mac_scsi_setup);

#endif /* !MODULE */



/*

 * Function : int macscsi_detect(struct scsi_host_template * tpnt)
@@ -199,13 +164,8 @@ int __init macscsi_detect(struct scsi_host_template * tpnt) 
		tpnt->cmd_per_lun = setup_cmd_per_lun;

	if (setup_sg_tablesize >= 0)

		tpnt->sg_tablesize = setup_sg_tablesize;



	if (setup_hostid >= 0)

	tpnt->this_id = setup_hostid;

    else {

	/* use 7 as default */

	tpnt->this_id = 7;

    }

		tpnt->this_id = setup_hostid & 7;



#ifdef SUPPORT_TAGS

    if (setup_use_tagged_queuing < 0)
@@ -219,15 +179,15 @@ int __init macscsi_detect(struct scsi_host_template * tpnt) 
	return 0;



    if (macintosh_config->ident == MAC_MODEL_IIFX) {

	mac_scsi_regp  = via1+0x8000;

	mac_scsi_drq   = via1+0xE000;

	mac_scsi_nodrq = via1+0xC000;

	mac_scsi_regp  = (unsigned char *) VIA1_BASE + 0x8000;

	mac_scsi_drq   = (unsigned char *) VIA1_BASE + 0xE000;

	mac_scsi_nodrq = (unsigned char *) VIA1_BASE + 0xC000;

	/* The IIFX should be able to do true DMA, but pseudo-dma doesn't work */

	flags = FLAG_NO_PSEUDO_DMA;

    } else {

	mac_scsi_regp  = via1+0x10000;

	mac_scsi_drq   = via1+0x6000;

	mac_scsi_nodrq = via1+0x12000;

	mac_scsi_regp  = (unsigned char *) VIA1_BASE + 0x10000;

	mac_scsi_drq   = (unsigned char *) VIA1_BASE + 0x6000;

	mac_scsi_nodrq = (unsigned char *) VIA1_BASE + 0x12000;

    }



    if (! setup_use_pdma)
@@ -520,3 +480,5 @@ static struct scsi_host_template driver_template = { 




#include "scsi_module.c"



MODULE_LICENSE("GPL");