Commit 1dbfeb4b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add "noacpi" / "acpigtf" / "acpionboot" parameters 



* Rename ide_noacpi{tfs,onboot} to ide_acpi{gtf,onboot} (+ reverse logic).

* Move ide_*acpi* variables to ide-acpi.c and remove unnecessary initializers.

* Add "noacpi" / "acpigtf" / "acpionboot" parameters.

* Obsolete "ide=noacpi" / "ide=acpigtf" / "ide=acpionboot" kernel parameters.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 9dcba7f2

drivers/ide/ide-acpi.c

+13 −5
Original line number Diff line number Diff line
@@ -60,9 +60,17 @@ struct ide_acpi_hwif_link { 
#define DEBPRINT(fmt, args...)	do {} while (0)

#endif	/* DEBUGGING */



extern int ide_noacpi;

extern int ide_noacpitfs;

extern int ide_noacpionboot;

int ide_noacpi;

module_param_named(noacpi, ide_noacpi, bool, 0);

MODULE_PARM_DESC(noacpi, "disable IDE ACPI support");



int ide_acpigtf;

module_param_named(acpigtf, ide_acpigtf, bool, 0);

MODULE_PARM_DESC(acpigtf, "enable IDE ACPI _GTF support");



int ide_acpionboot;

module_param_named(acpionboot, ide_acpionboot, bool, 0);

MODULE_PARM_DESC(acpionboot, "call IDE ACPI methods on boot");



static bool ide_noacpi_psx;

static int no_acpi_psx(const struct dmi_system_id *id)
@@ -376,7 +384,7 @@ static int taskfile_load_raw(ide_drive_t *drive, 
	memcpy(&args.tf_array[7], &gtf->tfa, 7);

	args.tf_flags = IDE_TFLAG_TF | IDE_TFLAG_DEVICE;



	if (ide_noacpitfs) {

	if (!ide_acpigtf) {

		DEBPRINT("_GTF execution disabled\n");

		return err;

	}
@@ -721,7 +729,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif) 
				 drive->name, err);

	}



	if (ide_noacpionboot) {

	if (!ide_acpionboot) {

		DEBPRINT("ACPI methods disabled on boot\n");

		return;

	}

drivers/ide/ide.c

+5 −11
Original line number Diff line number Diff line
@@ -94,12 +94,6 @@ DEFINE_MUTEX(ide_cfg_mtx); 


int noautodma = 0;



#ifdef CONFIG_BLK_DEV_IDEACPI

int ide_noacpi = 0;

int ide_noacpitfs = 1;

int ide_noacpionboot = 1;

#endif



ide_hwif_t ide_hwifs[MAX_HWIFS];	/* master data repository */



static void ide_port_init_devices_data(ide_hwif_t *);
@@ -880,17 +874,17 @@ static int __init ide_setup(char *s) 
	if (!strcmp(s, "ide=noacpi")) {

		//printk(" : Disable IDE ACPI support.\n");

		ide_noacpi = 1;

		return 1;

		goto obsolete_option;

	}

	if (!strcmp(s, "ide=acpigtf")) {

		//printk(" : Enable IDE ACPI _GTF support.\n");

		ide_noacpitfs = 0;

		return 1;

		ide_acpigtf = 1;

		goto obsolete_option;

	}

	if (!strcmp(s, "ide=acpionboot")) {

		//printk(" : Call IDE ACPI methods on boot.\n");

		ide_noacpionboot = 0;

		return 1;

		ide_acpionboot = 1;

		goto obsolete_option;

	}

#endif /* CONFIG_BLK_DEV_IDEACPI */

include/linux/ide.h

+3 −0
Original line number Diff line number Diff line
@@ -798,6 +798,9 @@ int generic_ide_ioctl(ide_drive_t *, struct file *, struct block_device *, unsig 
#ifndef _IDE_C

extern	ide_hwif_t	ide_hwifs[];		/* master data repository */

#endif

extern int ide_noacpi;

extern int ide_acpigtf;

extern int ide_acpionboot;

extern int noautodma;



extern int ide_vlb_clk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE