Commit ebae41a5 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add "vlb|pci_clock=" parameter 



* Add "vlb_clock=" parameter for specifying VLB clock frequency (in MHz).

* Add "pci_clock=" parameter for specifying PCI bus clock frequency (in MHz).

While at it:

* qd65xx.c: rename {active,recovery}_cycle variables to {act,rec}_cyc.

Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 10569713

drivers/ide/ide.c

+12 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,18 @@ static void ide_port_class_release(struct device *portdev) 
	put_device(&hwif->gendev);

}



int ide_vlb_clk;

EXPORT_SYMBOL_GPL(ide_vlb_clk);



module_param_named(vlb_clock, ide_vlb_clk, int, 0);

MODULE_PARM_DESC(vlb_clock, "VLB clock frequency (in MHz)");



int ide_pci_clk;

EXPORT_SYMBOL_GPL(ide_pci_clk);



module_param_named(pci_clock, ide_pci_clk, int, 0);

MODULE_PARM_DESC(pci_clock, "PCI bus clock frequency (in MHz)");



static unsigned int ide_ignore_cable;



static int ide_set_ignore_cable(const char *s, struct kernel_param *kp)

drivers/ide/legacy/ali14xx.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	int time1, time2;

	u8 param1, param2, param3, param4;

	unsigned long flags;

	int bus_speed = system_bus_clock();

	int bus_speed = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();



	/* calculate timing, according to PIO mode */

	time1 = ide_pio_cycle_time(drive, pio);

drivers/ide/legacy/ht6560b.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio) 
{

	int active_time, recovery_time;

	int active_cycles, recovery_cycles;

	int bus_speed = system_bus_clock();

	int bus_speed = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();



        if (pio) {

		unsigned int cycle_time;

drivers/ide/legacy/qd65xx.c

+14 −10
Original line number Diff line number Diff line
@@ -114,17 +114,18 @@ static void qd65xx_select(ide_drive_t *drive) 


static u8 qd6500_compute_timing (ide_hwif_t *hwif, int active_time, int recovery_time)

{

	u8 active_cycle,recovery_cycle;

	int clk = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();

	u8 act_cyc, rec_cyc;



	if (system_bus_clock()<=33) {

		active_cycle =   9  - IDE_IN(active_time   * system_bus_clock() / 1000 + 1, 2, 9);

		recovery_cycle = 15 - IDE_IN(recovery_time * system_bus_clock() / 1000 + 1, 0, 15);

	if (clk <= 33) {

		act_cyc =  9 - IDE_IN(active_time   * clk / 1000 + 1, 2,  9);

		rec_cyc = 15 - IDE_IN(recovery_time * clk / 1000 + 1, 0, 15);

	} else {

		active_cycle =   8  - IDE_IN(active_time   * system_bus_clock() / 1000 + 1, 1, 8);

		recovery_cycle = 18 - IDE_IN(recovery_time * system_bus_clock() / 1000 + 1, 3, 18);

		act_cyc =  8 - IDE_IN(active_time   * clk / 1000 + 1, 1,  8);

		rec_cyc = 18 - IDE_IN(recovery_time * clk / 1000 + 1, 3, 18);

	}



	return((recovery_cycle<<4) | 0x08 | active_cycle);

	return (rec_cyc << 4) | 0x08 | act_cyc;

}



/*
@@ -135,10 +136,13 @@ static u8 qd6500_compute_timing (ide_hwif_t *hwif, int active_time, int recovery 


static u8 qd6580_compute_timing (int active_time, int recovery_time)

{

	u8 active_cycle   = 17 - IDE_IN(active_time   * system_bus_clock() / 1000 + 1, 2, 17);

	u8 recovery_cycle = 15 - IDE_IN(recovery_time * system_bus_clock() / 1000 + 1, 2, 15);

	int clk = ide_vlb_clk ? ide_vlb_clk : system_bus_clock();

	u8 act_cyc, rec_cyc;



	return((recovery_cycle<<4) | active_cycle);

	act_cyc = 17 - IDE_IN(active_time   * clk / 1000 + 1, 2, 17);

	rec_cyc = 15 - IDE_IN(recovery_time * clk / 1000 + 1, 2, 15);



	return (rec_cyc << 4) | act_cyc;

}



/*

drivers/ide/pci/aec62xx.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) 


static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)

{

	int bus_speed = system_bus_clock();

	int bus_speed = ide_pci_clk ? ide_pci_clk : system_bus_clock();



	if (bus_speed <= 33)

		pci_set_drvdata(dev, (void *) aec6xxx_33_base);

CRA Git | Maintained and supported by SUSTech CRA and CCSE