mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
ide: pdc202xx_new PLL input clock fix
Recently the PLL input clock of Promise 2027x is sometimes detected higher than expected (e.g. 20.027 MHz compared to 16.714 MHz). It seems sometimes the mdelay() function is not as precise as it used to be. Per Alan's advice, HT or power management might affect the precision of mdelay(). This patch calls gettimeofday() to measure the time elapsed and calculate the PLL input clock accordingly. Signed-off-by: Albert Lee <albertcc@tw.ibm.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Bahadir Balban <bahadir.balban@gmail.com> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
52374f890c
commit
8006bf56e3
1 changed files with 8 additions and 2 deletions
|
@ -306,11 +306,13 @@ static long __devinit read_counter(u32 dma_base)
|
|||
*/
|
||||
static long __devinit detect_pll_input_clock(unsigned long dma_base)
|
||||
{
|
||||
struct timeval start_time, end_time;
|
||||
long start_count, end_count;
|
||||
long pll_input;
|
||||
long pll_input, usec_elapsed;
|
||||
u8 scr1;
|
||||
|
||||
start_count = read_counter(dma_base);
|
||||
do_gettimeofday(&start_time);
|
||||
|
||||
/* Start the test mode */
|
||||
outb(0x01, dma_base + 0x01);
|
||||
|
@ -322,6 +324,7 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)
|
|||
mdelay(10);
|
||||
|
||||
end_count = read_counter(dma_base);
|
||||
do_gettimeofday(&end_time);
|
||||
|
||||
/* Stop the test mode */
|
||||
outb(0x01, dma_base + 0x01);
|
||||
|
@ -333,7 +336,10 @@ static long __devinit detect_pll_input_clock(unsigned long dma_base)
|
|||
* Calculate the input clock in Hz
|
||||
* (the clock counter is 30 bit wide and counts down)
|
||||
*/
|
||||
pll_input = ((start_count - end_count) & 0x3ffffff) * 100;
|
||||
usec_elapsed = (end_time.tv_sec - start_time.tv_sec) * 1000000 +
|
||||
(end_time.tv_usec - start_time.tv_usec);
|
||||
pll_input = ((start_count - end_count) & 0x3ffffff) / 10 *
|
||||
(10000000 / usec_elapsed);
|
||||
|
||||
DBG("start[%ld] end[%ld]\n", start_count, end_count);
|
||||
|
||||
|
|
Loading…
Reference in a new issue