diff options
Diffstat (limited to 'drivers/ide/pci/hpt366.c')
-rw-r--r-- | drivers/ide/pci/hpt366.c | 1583 |
1 files changed, 819 insertions, 764 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index b486442dd5d7..05be8fadda7a 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/drivers/ide/pci/hpt366.c Version 0.36 April 25, 2003 | 2 | * linux/drivers/ide/pci/hpt366.c Version 1.01 Dec 23, 2006 |
3 | * | 3 | * |
4 | * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> | 4 | * Copyright (C) 1999-2003 Andre Hedrick <andre@linux-ide.org> |
5 | * Portions Copyright (C) 2001 Sun Microsystems, Inc. | 5 | * Portions Copyright (C) 2001 Sun Microsystems, Inc. |
@@ -60,13 +60,10 @@ | |||
60 | * channel caused the cached register value to get out of sync with the | 60 | * channel caused the cached register value to get out of sync with the |
61 | * actual one, the channels weren't serialized, the turnaround shouldn't | 61 | * actual one, the channels weren't serialized, the turnaround shouldn't |
62 | * be done on 66 MHz PCI bus | 62 | * be done on 66 MHz PCI bus |
63 | * - avoid calibrating PLL twice as the second time results in a wrong PCI | 63 | * - disable UltraATA/100 for HPT370 by default as the 33 MHz clock being used |
64 | * frequency and thus in the wrong timings for the secondary channel | 64 | * does not allow for this speed anyway |
65 | * - disable UltraATA/133 for HPT372 by default (50 MHz DPLL clock do not | 65 | * - avoid touching disabled channels (e.g. HPT371/N are single channel chips, |
66 | * allow for this speed anyway) | 66 | * their primary channel is kind of virtual, it isn't tied to any pins) |
67 | * - add support for HPT302N and HPT371N clocking (the same as for HPT372N) | ||
68 | * - HPT371/N are single channel chips, so avoid touching the primary channel | ||
69 | * which exists only virtually (there's no pins for it) | ||
70 | * - fix/remove bad/unused timing tables and use one set of tables for the whole | 67 | * - fix/remove bad/unused timing tables and use one set of tables for the whole |
71 | * HPT37x chip family; save space by introducing the separate transfer mode | 68 | * HPT37x chip family; save space by introducing the separate transfer mode |
72 | * table in which the mode lookup is done | 69 | * table in which the mode lookup is done |
@@ -76,11 +73,47 @@ | |||
76 | * and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead | 73 | * and for HPT36x the obsolete HDIO_TRISTATE_HWIF handler was called instead |
77 | * - pass to init_chipset() handlers a copy of the IDE PCI device structure as | 74 | * - pass to init_chipset() handlers a copy of the IDE PCI device structure as |
78 | * they tamper with its fields | 75 | * they tamper with its fields |
79 | * <source@mvista.com> | 76 | * - pass to the init_setup handlers a copy of the ide_pci_device_t structure |
80 | * | 77 | * since they may tamper with its fields |
78 | * - prefix the driver startup messages with the real chip name | ||
79 | * - claim the extra 240 bytes of I/O space for all chips | ||
80 | * - optimize the rate masking/filtering and the drive list lookup code | ||
81 | * - use pci_get_slot() to get to the function 1 of HPT36x/374 | ||
82 | * - cache offset of the channel's misc. control registers (MCRs) being used | ||
83 | * throughout the driver | ||
84 | * - only touch the relevant MCR when detecting the cable type on HPT374's | ||
85 | * function 1 | ||
86 | * - rename all the register related variables consistently | ||
87 | * - move all the interrupt twiddling code from the speedproc handlers into | ||
88 | * init_hwif_hpt366(), also grouping all the DMA related code together there | ||
89 | * - merge two HPT37x speedproc handlers, fix the PIO timing register mask and | ||
90 | * separate the UltraDMA and MWDMA masks there to avoid changing PIO timings | ||
91 | * when setting an UltraDMA mode | ||
92 | * - fix hpt3xx_tune_drive() to set the PIO mode requested, not always select | ||
93 | * the best possible one | ||
94 | * - clean up DMA timeout handling for HPT370 | ||
95 | * - switch to using the enumeration type to differ between the numerous chip | ||
96 | * variants, matching PCI device/revision ID with the chip type early, at the | ||
97 | * init_setup stage | ||
98 | * - extend the hpt_info structure to hold the DPLL and PCI clock frequencies, | ||
99 | * stop duplicating it for each channel by storing the pointer in the pci_dev | ||
100 | * structure: first, at the init_setup stage, point it to a static "template" | ||
101 | * with only the chip type and its specific base DPLL frequency, the highest | ||
102 | * supported DMA mode, and the chip settings table pointer filled, then, at | ||
103 | * the init_chipset stage, allocate per-chip instance and fill it with the | ||
104 | * rest of the necessary information | ||
105 | * - get rid of the constant thresholds in the HPT37x PCI clock detection code, | ||
106 | * switch to calculating PCI clock frequency based on the chip's base DPLL | ||
107 | * frequency | ||
108 | * - switch to using the DPLL clock and enable UltraATA/133 mode by default on | ||
109 | * anything newer than HPT370/A | ||
110 | * - fold PCI clock detection and DPLL setup code into init_chipset_hpt366(), | ||
111 | * also fixing the interchanged 25/40 MHz PCI clock cases for HPT36x chips; | ||
112 | * unify HPT36x/37x timing setup code and the speedproc handlers by joining | ||
113 | * the register setting lists into the table indexed by the clock selected | ||
114 | * Sergei Shtylyov, <sshtylyov@ru.mvista.com> or <source@mvista.com> | ||
81 | */ | 115 | */ |
82 | 116 | ||
83 | |||
84 | #include <linux/types.h> | 117 | #include <linux/types.h> |
85 | #include <linux/module.h> | 118 | #include <linux/module.h> |
86 | #include <linux/kernel.h> | 119 | #include <linux/kernel.h> |
@@ -332,93 +365,159 @@ static u32 sixty_six_base_hpt37x[] = { | |||
332 | }; | 365 | }; |
333 | 366 | ||
334 | #define HPT366_DEBUG_DRIVE_INFO 0 | 367 | #define HPT366_DEBUG_DRIVE_INFO 0 |
335 | #define HPT374_ALLOW_ATA133_6 0 | 368 | #define HPT374_ALLOW_ATA133_6 1 |
336 | #define HPT371_ALLOW_ATA133_6 0 | 369 | #define HPT371_ALLOW_ATA133_6 1 |
337 | #define HPT302_ALLOW_ATA133_6 0 | 370 | #define HPT302_ALLOW_ATA133_6 1 |
338 | #define HPT372_ALLOW_ATA133_6 0 | 371 | #define HPT372_ALLOW_ATA133_6 1 |
339 | #define HPT370_ALLOW_ATA100_5 1 | 372 | #define HPT370_ALLOW_ATA100_5 0 |
340 | #define HPT366_ALLOW_ATA66_4 1 | 373 | #define HPT366_ALLOW_ATA66_4 1 |
341 | #define HPT366_ALLOW_ATA66_3 1 | 374 | #define HPT366_ALLOW_ATA66_3 1 |
342 | #define HPT366_MAX_DEVS 8 | 375 | #define HPT366_MAX_DEVS 8 |
343 | 376 | ||
344 | #define F_LOW_PCI_33 0x23 | 377 | /* Supported ATA clock frequencies */ |
345 | #define F_LOW_PCI_40 0x29 | 378 | enum ata_clock { |
346 | #define F_LOW_PCI_50 0x2d | 379 | ATA_CLOCK_25MHZ, |
347 | #define F_LOW_PCI_66 0x42 | 380 | ATA_CLOCK_33MHZ, |
381 | ATA_CLOCK_40MHZ, | ||
382 | ATA_CLOCK_50MHZ, | ||
383 | ATA_CLOCK_66MHZ, | ||
384 | NUM_ATA_CLOCKS | ||
385 | }; | ||
348 | 386 | ||
349 | /* | 387 | /* |
350 | * Hold all the highpoint quirks and revision information in one | 388 | * Hold all the HighPoint chip information in one place. |
351 | * place. | ||
352 | */ | 389 | */ |
353 | 390 | ||
354 | struct hpt_info | 391 | struct hpt_info { |
355 | { | 392 | u8 chip_type; /* Chip type */ |
356 | u8 max_mode; /* Speeds allowed */ | 393 | u8 max_mode; /* Speeds allowed */ |
357 | int revision; /* Chipset revision */ | 394 | u8 dpll_clk; /* DPLL clock in MHz */ |
358 | int flags; /* Chipset properties */ | 395 | u8 pci_clk; /* PCI clock in MHz */ |
359 | #define PLL_MODE 1 | 396 | u32 **settings; /* Chipset settings table */ |
360 | #define IS_3xxN 2 | ||
361 | #define PCI_66MHZ 4 | ||
362 | /* Speed table */ | ||
363 | u32 *speed; | ||
364 | }; | 397 | }; |
365 | 398 | ||
366 | /* | 399 | /* Supported HighPoint chips */ |
367 | * This wants fixing so that we do everything not by classrev | 400 | enum { |
368 | * (which breaks on the newest chips) but by creating an | 401 | HPT36x, |
369 | * enumeration of chip variants and using that | 402 | HPT370, |
370 | */ | 403 | HPT370A, |
404 | HPT374, | ||
405 | HPT372, | ||
406 | HPT372A, | ||
407 | HPT302, | ||
408 | HPT371, | ||
409 | HPT372N, | ||
410 | HPT302N, | ||
411 | HPT371N | ||
412 | }; | ||
413 | |||
414 | static u32 *hpt36x_settings[NUM_ATA_CLOCKS] = { | ||
415 | twenty_five_base_hpt36x, | ||
416 | thirty_three_base_hpt36x, | ||
417 | forty_base_hpt36x, | ||
418 | NULL, | ||
419 | NULL | ||
420 | }; | ||
421 | |||
422 | static u32 *hpt37x_settings[NUM_ATA_CLOCKS] = { | ||
423 | NULL, | ||
424 | thirty_three_base_hpt37x, | ||
425 | NULL, | ||
426 | fifty_base_hpt37x, | ||
427 | sixty_six_base_hpt37x | ||
428 | }; | ||
429 | |||
430 | static struct hpt_info hpt36x __devinitdata = { | ||
431 | .chip_type = HPT36x, | ||
432 | .max_mode = (HPT366_ALLOW_ATA66_4 || HPT366_ALLOW_ATA66_3) ? 2 : 1, | ||
433 | .dpll_clk = 0, /* no DPLL */ | ||
434 | .settings = hpt36x_settings | ||
435 | }; | ||
436 | |||
437 | static struct hpt_info hpt370 __devinitdata = { | ||
438 | .chip_type = HPT370, | ||
439 | .max_mode = HPT370_ALLOW_ATA100_5 ? 3 : 2, | ||
440 | .dpll_clk = 48, | ||
441 | .settings = hpt37x_settings | ||
442 | }; | ||
443 | |||
444 | static struct hpt_info hpt370a __devinitdata = { | ||
445 | .chip_type = HPT370A, | ||
446 | .max_mode = HPT370_ALLOW_ATA100_5 ? 3 : 2, | ||
447 | .dpll_clk = 48, | ||
448 | .settings = hpt37x_settings | ||
449 | }; | ||
450 | |||
451 | static struct hpt_info hpt374 __devinitdata = { | ||
452 | .chip_type = HPT374, | ||
453 | .max_mode = HPT374_ALLOW_ATA133_6 ? 4 : 3, | ||
454 | .dpll_clk = 48, | ||
455 | .settings = hpt37x_settings | ||
456 | }; | ||
457 | |||
458 | static struct hpt_info hpt372 __devinitdata = { | ||
459 | .chip_type = HPT372, | ||
460 | .max_mode = HPT372_ALLOW_ATA133_6 ? 4 : 3, | ||
461 | .dpll_clk = 55, | ||
462 | .settings = hpt37x_settings | ||
463 | }; | ||
464 | |||
465 | static struct hpt_info hpt372a __devinitdata = { | ||
466 | .chip_type = HPT372A, | ||
467 | .max_mode = HPT372_ALLOW_ATA133_6 ? 4 : 3, | ||
468 | .dpll_clk = 66, | ||
469 | .settings = hpt37x_settings | ||
470 | }; | ||
471 | |||
472 | static struct hpt_info hpt302 __devinitdata = { | ||
473 | .chip_type = HPT302, | ||
474 | .max_mode = HPT302_ALLOW_ATA133_6 ? 4 : 3, | ||
475 | .dpll_clk = 66, | ||
476 | .settings = hpt37x_settings | ||
477 | }; | ||
478 | |||
479 | static struct hpt_info hpt371 __devinitdata = { | ||
480 | .chip_type = HPT371, | ||
481 | .max_mode = HPT371_ALLOW_ATA133_6 ? 4 : 3, | ||
482 | .dpll_clk = 66, | ||
483 | .settings = hpt37x_settings | ||
484 | }; | ||
485 | |||
486 | static struct hpt_info hpt372n __devinitdata = { | ||
487 | .chip_type = HPT372N, | ||
488 | .max_mode = HPT372_ALLOW_ATA133_6 ? 4 : 3, | ||
489 | .dpll_clk = 77, | ||
490 | .settings = hpt37x_settings | ||
491 | }; | ||
492 | |||
493 | static struct hpt_info hpt302n __devinitdata = { | ||
494 | .chip_type = HPT302N, | ||
495 | .max_mode = HPT302_ALLOW_ATA133_6 ? 4 : 3, | ||
496 | .dpll_clk = 77, | ||
497 | }; | ||
371 | 498 | ||
372 | static __devinit u32 hpt_revision (struct pci_dev *dev) | 499 | static struct hpt_info hpt371n __devinitdata = { |
500 | .chip_type = HPT371N, | ||
501 | .max_mode = HPT371_ALLOW_ATA133_6 ? 4 : 3, | ||
502 | .dpll_clk = 77, | ||
503 | .settings = hpt37x_settings | ||
504 | }; | ||
505 | |||
506 | static int check_in_drive_list(ide_drive_t *drive, const char **list) | ||
373 | { | 507 | { |
374 | u32 class_rev; | 508 | struct hd_driveid *id = drive->id; |
375 | pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev); | ||
376 | class_rev &= 0xff; | ||
377 | |||
378 | switch(dev->device) { | ||
379 | /* Remap new 372N onto 372 */ | ||
380 | case PCI_DEVICE_ID_TTI_HPT372N: | ||
381 | class_rev = PCI_DEVICE_ID_TTI_HPT372; break; | ||
382 | case PCI_DEVICE_ID_TTI_HPT374: | ||
383 | class_rev = PCI_DEVICE_ID_TTI_HPT374; break; | ||
384 | case PCI_DEVICE_ID_TTI_HPT371: | ||
385 | class_rev = PCI_DEVICE_ID_TTI_HPT371; break; | ||
386 | case PCI_DEVICE_ID_TTI_HPT302: | ||
387 | class_rev = PCI_DEVICE_ID_TTI_HPT302; break; | ||
388 | case PCI_DEVICE_ID_TTI_HPT372: | ||
389 | class_rev = PCI_DEVICE_ID_TTI_HPT372; break; | ||
390 | default: | ||
391 | break; | ||
392 | } | ||
393 | return class_rev; | ||
394 | } | ||
395 | 509 | ||
396 | static int check_in_drive_lists(ide_drive_t *drive, const char **list); | 510 | while (*list) |
511 | if (!strcmp(*list++,id->model)) | ||
512 | return 1; | ||
513 | return 0; | ||
514 | } | ||
397 | 515 | ||
398 | static u8 hpt3xx_ratemask (ide_drive_t *drive) | 516 | static u8 hpt3xx_ratemask(ide_drive_t *drive) |
399 | { | 517 | { |
400 | ide_hwif_t *hwif = drive->hwif; | 518 | struct hpt_info *info = pci_get_drvdata(HWIF(drive)->pci_dev); |
401 | struct hpt_info *info = ide_get_hwifdata(hwif); | 519 | u8 mode = info->max_mode; |
402 | u8 mode = 0; | 520 | |
403 | |||
404 | /* FIXME: TODO - move this to set info->mode once at boot */ | ||
405 | |||
406 | if (info->revision >= 8) { /* HPT374 */ | ||
407 | mode = (HPT374_ALLOW_ATA133_6) ? 4 : 3; | ||
408 | } else if (info->revision >= 7) { /* HPT371 */ | ||
409 | mode = (HPT371_ALLOW_ATA133_6) ? 4 : 3; | ||
410 | } else if (info->revision >= 6) { /* HPT302 */ | ||
411 | mode = (HPT302_ALLOW_ATA133_6) ? 4 : 3; | ||
412 | } else if (info->revision >= 5) { /* HPT372 */ | ||
413 | mode = (HPT372_ALLOW_ATA133_6) ? 4 : 3; | ||
414 | } else if (info->revision >= 4) { /* HPT370A */ | ||
415 | mode = (HPT370_ALLOW_ATA100_5) ? 3 : 2; | ||
416 | } else if (info->revision >= 3) { /* HPT370 */ | ||
417 | mode = (HPT370_ALLOW_ATA100_5) ? 3 : 2; | ||
418 | mode = (check_in_drive_lists(drive, bad_ata33)) ? 0 : mode; | ||
419 | } else { /* HPT366 and HPT368 */ | ||
420 | mode = (check_in_drive_lists(drive, bad_ata33)) ? 0 : 2; | ||
421 | } | ||
422 | if (!eighty_ninty_three(drive) && mode) | 521 | if (!eighty_ninty_three(drive) && mode) |
423 | mode = min(mode, (u8)1); | 522 | mode = min(mode, (u8)1); |
424 | return mode; | 523 | return mode; |
@@ -429,75 +528,61 @@ static u8 hpt3xx_ratemask (ide_drive_t *drive) | |||
429 | * either PIO or UDMA modes 0,4,5 | 528 | * either PIO or UDMA modes 0,4,5 |
430 | */ | 529 | */ |
431 | 530 | ||
432 | static u8 hpt3xx_ratefilter (ide_drive_t *drive, u8 speed) | 531 | static u8 hpt3xx_ratefilter(ide_drive_t *drive, u8 speed) |
433 | { | 532 | { |
434 | ide_hwif_t *hwif = drive->hwif; | 533 | struct hpt_info *info = pci_get_drvdata(HWIF(drive)->pci_dev); |
435 | struct hpt_info *info = ide_get_hwifdata(hwif); | 534 | u8 chip_type = info->chip_type; |
436 | u8 mode = hpt3xx_ratemask(drive); | 535 | u8 mode = hpt3xx_ratemask(drive); |
437 | 536 | ||
438 | if (drive->media != ide_disk) | 537 | if (drive->media != ide_disk) |
439 | return min(speed, (u8)XFER_PIO_4); | 538 | return min(speed, (u8)XFER_PIO_4); |
440 | 539 | ||
441 | switch(mode) { | 540 | switch (mode) { |
442 | case 0x04: | 541 | case 0x04: |
443 | speed = min(speed, (u8)XFER_UDMA_6); | 542 | speed = min_t(u8, speed, XFER_UDMA_6); |
444 | break; | 543 | break; |
445 | case 0x03: | 544 | case 0x03: |
446 | speed = min(speed, (u8)XFER_UDMA_5); | 545 | speed = min_t(u8, speed, XFER_UDMA_5); |
447 | if (info->revision >= 5) | 546 | if (chip_type >= HPT374) |
448 | break; | 547 | break; |
449 | if (check_in_drive_lists(drive, bad_ata100_5)) | 548 | if (!check_in_drive_list(drive, bad_ata100_5)) |
450 | speed = min(speed, (u8)XFER_UDMA_4); | 549 | goto check_bad_ata33; |
451 | break; | 550 | /* fall thru */ |
452 | case 0x02: | 551 | case 0x02: |
453 | speed = min(speed, (u8)XFER_UDMA_4); | 552 | speed = min_t(u8, speed, XFER_UDMA_4); |
454 | /* | 553 | |
455 | * CHECK ME, Does this need to be set to 5 ?? | 554 | /* |
456 | */ | 555 | * CHECK ME, Does this need to be changed to HPT374 ?? |
457 | if (info->revision >= 3) | 556 | */ |
458 | break; | 557 | if (chip_type >= HPT370) |
459 | if ((check_in_drive_lists(drive, bad_ata66_4)) || | 558 | goto check_bad_ata33; |
460 | (!(HPT366_ALLOW_ATA66_4))) | 559 | if (HPT366_ALLOW_ATA66_4 && |
461 | speed = min(speed, (u8)XFER_UDMA_3); | 560 | !check_in_drive_list(drive, bad_ata66_4)) |
462 | if ((check_in_drive_lists(drive, bad_ata66_3)) || | 561 | goto check_bad_ata33; |
463 | (!(HPT366_ALLOW_ATA66_3))) | 562 | |
464 | speed = min(speed, (u8)XFER_UDMA_2); | 563 | speed = min_t(u8, speed, XFER_UDMA_3); |
465 | break; | 564 | if (HPT366_ALLOW_ATA66_3 && |
565 | !check_in_drive_list(drive, bad_ata66_3)) | ||
566 | goto check_bad_ata33; | ||
567 | /* fall thru */ | ||
466 | case 0x01: | 568 | case 0x01: |
467 | speed = min(speed, (u8)XFER_UDMA_2); | 569 | speed = min_t(u8, speed, XFER_UDMA_2); |
468 | /* | 570 | |
469 | * CHECK ME, Does this need to be set to 5 ?? | 571 | check_bad_ata33: |
470 | */ | 572 | if (chip_type >= HPT370A) |
471 | if (info->revision >= 3) | ||
472 | break; | 573 | break; |
473 | if (check_in_drive_lists(drive, bad_ata33)) | 574 | if (!check_in_drive_list(drive, bad_ata33)) |
474 | speed = min(speed, (u8)XFER_MW_DMA_2); | 575 | break; |
475 | break; | 576 | /* fall thru */ |
476 | case 0x00: | 577 | case 0x00: |
477 | default: | 578 | default: |
478 | speed = min(speed, (u8)XFER_MW_DMA_2); | 579 | speed = min_t(u8, speed, XFER_MW_DMA_2); |
479 | break; | 580 | break; |
480 | } | 581 | } |
481 | return speed; | 582 | return speed; |
482 | } | 583 | } |
483 | 584 | ||
484 | static int check_in_drive_lists (ide_drive_t *drive, const char **list) | 585 | static u32 get_speed_setting(u8 speed, struct hpt_info *info) |
485 | { | ||
486 | struct hd_driveid *id = drive->id; | ||
487 | |||
488 | if (quirk_drives == list) { | ||
489 | while (*list) | ||
490 | if (strstr(id->model, *list++)) | ||
491 | return 1; | ||
492 | } else { | ||
493 | while (*list) | ||
494 | if (!strcmp(*list++,id->model)) | ||
495 | return 1; | ||
496 | } | ||
497 | return 0; | ||
498 | } | ||
499 | |||
500 | static u32 pci_bus_clock_list(u8 speed, u32 *chipset_table) | ||
501 | { | 586 | { |
502 | int i; | 587 | int i; |
503 | 588 | ||
@@ -510,228 +595,161 @@ static u32 pci_bus_clock_list(u8 speed, u32 *chipset_table) | |||
510 | for (i = 0; i < ARRAY_SIZE(xfer_speeds) - 1; i++) | 595 | for (i = 0; i < ARRAY_SIZE(xfer_speeds) - 1; i++) |
511 | if (xfer_speeds[i] == speed) | 596 | if (xfer_speeds[i] == speed) |
512 | break; | 597 | break; |
513 | return chipset_table[i]; | 598 | /* |
599 | * NOTE: info->settings only points to the pointer | ||
600 | * to the list of the actual register values | ||
601 | */ | ||
602 | return (*info->settings)[i]; | ||
514 | } | 603 | } |
515 | 604 | ||
516 | static int hpt36x_tune_chipset(ide_drive_t *drive, u8 xferspeed) | 605 | static int hpt36x_tune_chipset(ide_drive_t *drive, u8 xferspeed) |
517 | { | 606 | { |
518 | ide_hwif_t *hwif = drive->hwif; | 607 | ide_hwif_t *hwif = HWIF(drive); |
519 | struct pci_dev *dev = hwif->pci_dev; | 608 | struct pci_dev *dev = hwif->pci_dev; |
520 | struct hpt_info *info = ide_get_hwifdata(hwif); | 609 | struct hpt_info *info = pci_get_drvdata(dev); |
521 | u8 speed = hpt3xx_ratefilter(drive, xferspeed); | 610 | u8 speed = hpt3xx_ratefilter(drive, xferspeed); |
522 | u8 regtime = (drive->select.b.unit & 0x01) ? 0x44 : 0x40; | 611 | u8 itr_addr = drive->dn ? 0x44 : 0x40; |
523 | u8 regfast = (hwif->channel) ? 0x55 : 0x51; | 612 | u32 itr_mask = speed < XFER_MW_DMA_0 ? 0x30070000 : |
524 | u8 drive_fast = 0; | 613 | (speed < XFER_UDMA_0 ? 0xc0070000 : 0xc03800ff); |
525 | u32 reg1 = 0, reg2 = 0; | 614 | u32 new_itr = get_speed_setting(speed, info); |
526 | 615 | u32 old_itr = 0; | |
527 | /* | ||
528 | * Disable the "fast interrupt" prediction. | ||
529 | */ | ||
530 | pci_read_config_byte(dev, regfast, &drive_fast); | ||
531 | if (drive_fast & 0x80) | ||
532 | pci_write_config_byte(dev, regfast, drive_fast & ~0x80); | ||
533 | |||
534 | reg2 = pci_bus_clock_list(speed, info->speed); | ||
535 | 616 | ||
536 | /* | 617 | /* |
537 | * Disable on-chip PIO FIFO/buffer | 618 | * Disable on-chip PIO FIFO/buffer (and PIO MST mode as well) |
538 | * (to avoid problems handling I/O errors later) | 619 | * to avoid problems handling I/O errors later |
539 | */ | 620 | */ |
540 | pci_read_config_dword(dev, regtime, ®1); | 621 | pci_read_config_dword(dev, itr_addr, &old_itr); |
541 | if (speed >= XFER_MW_DMA_0) { | 622 | new_itr = (new_itr & ~itr_mask) | (old_itr & itr_mask); |
542 | reg2 = (reg2 & ~0xc0000000) | (reg1 & 0xc0000000); | 623 | new_itr &= ~0xc0000000; |
543 | } else { | ||
544 | reg2 = (reg2 & ~0x30070000) | (reg1 & 0x30070000); | ||
545 | } | ||
546 | reg2 &= ~0x80000000; | ||
547 | 624 | ||
548 | pci_write_config_dword(dev, regtime, reg2); | 625 | pci_write_config_dword(dev, itr_addr, new_itr); |
549 | 626 | ||
550 | return ide_config_drive_speed(drive, speed); | 627 | return ide_config_drive_speed(drive, speed); |
551 | } | 628 | } |
552 | 629 | ||
553 | static int hpt370_tune_chipset(ide_drive_t *drive, u8 xferspeed) | 630 | static int hpt37x_tune_chipset(ide_drive_t *drive, u8 xferspeed) |
554 | { | 631 | { |
555 | ide_hwif_t *hwif = drive->hwif; | 632 | ide_hwif_t *hwif = HWIF(drive); |
556 | struct pci_dev *dev = hwif->pci_dev; | 633 | struct pci_dev *dev = hwif->pci_dev; |
557 | struct hpt_info *info = ide_get_hwifdata(hwif); | 634 | struct hpt_info *info = pci_get_drvdata(dev); |
558 | u8 speed = hpt3xx_ratefilter(drive, xferspeed); | 635 | u8 speed = hpt3xx_ratefilter(drive, xferspeed); |
559 | u8 regfast = (drive->hwif->channel) ? 0x55 : 0x51; | 636 | u8 itr_addr = 0x40 + (drive->dn * 4); |
560 | u8 drive_pci = 0x40 + (drive->dn * 4); | 637 | u32 itr_mask = speed < XFER_MW_DMA_0 ? 0x303c0000 : |
561 | u8 new_fast = 0, drive_fast = 0; | 638 | (speed < XFER_UDMA_0 ? 0xc03c0000 : 0xc1c001ff); |
562 | u32 list_conf = 0, drive_conf = 0; | 639 | u32 new_itr = get_speed_setting(speed, info); |
563 | u32 conf_mask = (speed >= XFER_MW_DMA_0) ? 0xc0000000 : 0x30070000; | 640 | u32 old_itr = 0; |
564 | 641 | ||
565 | /* | 642 | pci_read_config_dword(dev, itr_addr, &old_itr); |
566 | * Disable the "fast interrupt" prediction. | 643 | new_itr = (new_itr & ~itr_mask) | (old_itr & itr_mask); |
567 | * don't holdoff on interrupts. (== 0x01 despite what the docs say) | ||
568 | */ | ||
569 | pci_read_config_byte(dev, regfast, &drive_fast); | ||
570 | new_fast = drive_fast; | ||
571 | if (new_fast & 0x02) | ||
572 | new_fast &= ~0x02; | ||
573 | |||
574 | #ifdef HPT_DELAY_INTERRUPT | ||
575 | if (new_fast & 0x01) | ||
576 | new_fast &= ~0x01; | ||
577 | #else | ||
578 | if ((new_fast & 0x01) == 0) | ||
579 | new_fast |= 0x01; | ||
580 | #endif | ||
581 | if (new_fast != drive_fast) | ||
582 | pci_write_config_byte(dev, regfast, new_fast); | ||
583 | |||
584 | list_conf = pci_bus_clock_list(speed, info->speed); | ||
585 | |||
586 | pci_read_config_dword(dev, drive_pci, &drive_conf); | ||
587 | list_conf = (list_conf & ~conf_mask) | (drive_conf & conf_mask); | ||
588 | 644 | ||
589 | if (speed < XFER_MW_DMA_0) | 645 | if (speed < XFER_MW_DMA_0) |
590 | list_conf &= ~0x80000000; /* Disable on-chip PIO FIFO/buffer */ | 646 | new_itr &= ~0x80000000; /* Disable on-chip PIO FIFO/buffer */ |
591 | pci_write_config_dword(dev, drive_pci, list_conf); | 647 | pci_write_config_dword(dev, itr_addr, new_itr); |
592 | 648 | ||
593 | return ide_config_drive_speed(drive, speed); | 649 | return ide_config_drive_speed(drive, speed); |
594 | } | 650 | } |
595 | 651 | ||
596 | static int hpt372_tune_chipset(ide_drive_t *drive, u8 xferspeed) | 652 | static int hpt3xx_tune_chipset(ide_drive_t *drive, u8 speed) |
597 | { | 653 | { |
598 | ide_hwif_t *hwif = drive->hwif; | 654 | ide_hwif_t *hwif = HWIF(drive); |
599 | struct pci_dev *dev = hwif->pci_dev; | 655 | struct hpt_info *info = pci_get_drvdata(hwif->pci_dev); |
600 | struct hpt_info *info = ide_get_hwifdata(hwif); | ||
601 | u8 speed = hpt3xx_ratefilter(drive, xferspeed); | ||
602 | u8 regfast = (drive->hwif->channel) ? 0x55 : 0x51; | ||
603 | u8 drive_fast = 0, drive_pci = 0x40 + (drive->dn * 4); | ||
604 | u32 list_conf = 0, drive_conf = 0; | ||
605 | u32 conf_mask = (speed >= XFER_MW_DMA_0) ? 0xc0000000 : 0x30070000; | ||
606 | |||
607 | /* | ||
608 | * Disable the "fast interrupt" prediction. | ||
609 | * don't holdoff on interrupts. (== 0x01 despite what the docs say) | ||
610 | */ | ||
611 | pci_read_config_byte(dev, regfast, &drive_fast); | ||
612 | drive_fast &= ~0x07; | ||
613 | pci_write_config_byte(dev, regfast, drive_fast); | ||
614 | |||
615 | list_conf = pci_bus_clock_list(speed, info->speed); | ||
616 | pci_read_config_dword(dev, drive_pci, &drive_conf); | ||
617 | list_conf = (list_conf & ~conf_mask) | (drive_conf & conf_mask); | ||
618 | if (speed < XFER_MW_DMA_0) | ||
619 | list_conf &= ~0x80000000; /* Disable on-chip PIO FIFO/buffer */ | ||
620 | pci_write_config_dword(dev, drive_pci, list_conf); | ||
621 | |||
622 | return ide_config_drive_speed(drive, speed); | ||
623 | } | ||
624 | 656 | ||
625 | static int hpt3xx_tune_chipset (ide_drive_t *drive, u8 speed) | 657 | if (info->chip_type >= HPT370) |
626 | { | 658 | return hpt37x_tune_chipset(drive, speed); |
627 | ide_hwif_t *hwif = drive->hwif; | ||
628 | struct hpt_info *info = ide_get_hwifdata(hwif); | ||
629 | |||
630 | if (info->revision >= 8) | ||
631 | return hpt372_tune_chipset(drive, speed); /* not a typo */ | ||
632 | else if (info->revision >= 5) | ||
633 | return hpt372_tune_chipset(drive, speed); | ||
634 | else if (info->revision >= 3) | ||
635 | return hpt370_tune_chipset(drive, speed); | ||
636 | else /* hpt368: hpt_minimum_revision(dev, 2) */ | 659 | else /* hpt368: hpt_minimum_revision(dev, 2) */ |
637 | return hpt36x_tune_chipset(drive, speed); | 660 | return hpt36x_tune_chipset(drive, speed); |
638 | } | 661 | } |
639 | 662 | ||
640 | static void hpt3xx_tune_drive (ide_drive_t *drive, u8 pio) | 663 | static void hpt3xx_tune_drive(ide_drive_t *drive, u8 pio) |
641 | { | 664 | { |
642 | pio = ide_get_best_pio_mode(drive, 255, pio, NULL); | 665 | pio = ide_get_best_pio_mode(drive, pio, 4, NULL); |
643 | (void) hpt3xx_tune_chipset(drive, (XFER_PIO_0 + pio)); | 666 | (void) hpt3xx_tune_chipset (drive, XFER_PIO_0 + pio); |
644 | } | 667 | } |
645 | 668 | ||
646 | /* | 669 | /* |
647 | * This allows the configuration of ide_pci chipset registers | 670 | * This allows the configuration of ide_pci chipset registers |
648 | * for cards that learn about the drive's UDMA, DMA, PIO capabilities | 671 | * for cards that learn about the drive's UDMA, DMA, PIO capabilities |
649 | * after the drive is reported by the OS. Initially for designed for | 672 | * after the drive is reported by the OS. Initially designed for |
650 | * HPT366 UDMA chipset by HighPoint|Triones Technologies, Inc. | 673 | * HPT366 UDMA chipset by HighPoint|Triones Technologies, Inc. |
651 | * | 674 | * |
652 | * check_in_drive_lists(drive, bad_ata66_4) | ||
653 | * check_in_drive_lists(drive, bad_ata66_3) | ||
654 | * check_in_drive_lists(drive, bad_ata33) | ||
655 | * | ||
656 | */ | 675 | */ |
657 | static int config_chipset_for_dma (ide_drive_t *drive) | 676 | static int config_chipset_for_dma(ide_drive_t *drive) |
658 | { | 677 | { |
659 | u8 speed = ide_dma_speed(drive, hpt3xx_ratemask(drive)); | 678 | u8 speed = ide_dma_speed(drive, hpt3xx_ratemask(drive)); |
660 | ide_hwif_t *hwif = drive->hwif; | ||
661 | struct hpt_info *info = ide_get_hwifdata(hwif); | ||
662 | 679 | ||
663 | if (!speed) | 680 | if (!speed) |
664 | return 0; | 681 | return 0; |
665 | 682 | ||
666 | /* If we don't have any timings we can't do a lot */ | ||
667 | if (info->speed == NULL) | ||
668 | return 0; | ||
669 | |||
670 | (void) hpt3xx_tune_chipset(drive, speed); | 683 | (void) hpt3xx_tune_chipset(drive, speed); |
671 | return ide_dma_enable(drive); | 684 | return ide_dma_enable(drive); |
672 | } | 685 | } |
673 | 686 | ||
674 | static int hpt3xx_quirkproc (ide_drive_t *drive) | 687 | static int hpt3xx_quirkproc(ide_drive_t *drive) |
675 | { | 688 | { |
676 | return ((int) check_in_drive_lists(drive, quirk_drives)); | 689 | struct hd_driveid *id = drive->id; |
690 | const char **list = quirk_drives; | ||
691 | |||
692 | while (*list) | ||
693 | if (strstr(id->model, *list++)) | ||
694 | return 1; | ||
695 | return 0; | ||
677 | } | 696 | } |
678 | 697 | ||
679 | static void hpt3xx_intrproc (ide_drive_t *drive) | 698 | static void hpt3xx_intrproc(ide_drive_t *drive) |
680 | { | 699 | { |
681 | ide_hwif_t *hwif = drive->hwif; | 700 | ide_hwif_t *hwif = HWIF(drive); |
682 | 701 | ||
683 | if (drive->quirk_list) | 702 | if (drive->quirk_list) |
684 | return; | 703 | return; |
685 | /* drives in the quirk_list may not like intr setups/cleanups */ | 704 | /* drives in the quirk_list may not like intr setups/cleanups */ |
686 | hwif->OUTB(drive->ctl|2, IDE_CONTROL_REG); | 705 | hwif->OUTB(drive->ctl | 2, IDE_CONTROL_REG); |
687 | } | 706 | } |
688 | 707 | ||
689 | static void hpt3xx_maskproc (ide_drive_t *drive, int mask) | 708 | static void hpt3xx_maskproc(ide_drive_t *drive, int mask) |
690 | { | 709 | { |
691 | ide_hwif_t *hwif = drive->hwif; | 710 | ide_hwif_t *hwif = HWIF(drive); |
692 | struct hpt_info *info = ide_get_hwifdata(hwif); | 711 | struct pci_dev *dev = hwif->pci_dev; |
693 | struct pci_dev *dev = hwif->pci_dev; | 712 | struct hpt_info *info = pci_get_drvdata(dev); |
694 | 713 | ||
695 | if (drive->quirk_list) { | 714 | if (drive->quirk_list) { |
696 | if (info->revision >= 3) { | 715 | if (info->chip_type >= HPT370) { |
697 | u8 reg5a = 0; | 716 | u8 scr1 = 0; |
698 | pci_read_config_byte(dev, 0x5a, ®5a); | 717 | |
699 | if (((reg5a & 0x10) >> 4) != mask) | 718 | pci_read_config_byte(dev, 0x5a, &scr1); |
700 | pci_write_config_byte(dev, 0x5a, mask ? (reg5a | 0x10) : (reg5a & ~0x10)); | 719 | if (((scr1 & 0x10) >> 4) != mask) { |
720 | if (mask) | ||
721 | scr1 |= 0x10; | ||
722 | else | ||
723 | scr1 &= ~0x10; | ||
724 | pci_write_config_byte(dev, 0x5a, scr1); | ||
725 | } | ||
701 | } else { | 726 | } else { |
702 | if (mask) { | 727 | if (mask) |
703 | disable_irq(hwif->irq); | 728 | disable_irq(hwif->irq); |
704 | } else { | 729 | else |
705 | enable_irq(hwif->irq); | 730 | enable_irq (hwif->irq); |
706 | } | ||
707 | } | 731 | } |
708 | } else { | 732 | } else |
709 | if (IDE_CONTROL_REG) | 733 | hwif->OUTB(mask ? (drive->ctl | 2) : (drive->ctl & ~2), |
710 | hwif->OUTB(mask ? (drive->ctl | 2) : | 734 | IDE_CONTROL_REG); |
711 | (drive->ctl & ~2), | ||
712 | IDE_CONTROL_REG); | ||
713 | } | ||
714 | } | 735 | } |
715 | 736 | ||
716 | static int hpt366_config_drive_xfer_rate (ide_drive_t *drive) | 737 | static int hpt366_config_drive_xfer_rate(ide_drive_t *drive) |
717 | { | 738 | { |
718 | ide_hwif_t *hwif = drive->hwif; | 739 | ide_hwif_t *hwif = HWIF(drive); |
719 | struct hd_driveid *id = drive->id; | 740 | struct hd_driveid *id = drive->id; |
720 | 741 | ||
721 | drive->init_speed = 0; | 742 | drive->init_speed = 0; |
722 | 743 | ||
723 | if ((id->capability & 1) && drive->autodma) { | 744 | if ((id->capability & 1) && drive->autodma) { |
724 | 745 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | |
725 | if (ide_use_dma(drive)) { | 746 | return hwif->ide_dma_on(drive); |
726 | if (config_chipset_for_dma(drive)) | ||
727 | return hwif->ide_dma_on(drive); | ||
728 | } | ||
729 | 747 | ||
730 | goto fast_ata_pio; | 748 | goto fast_ata_pio; |
731 | 749 | ||
732 | } else if ((id->capability & 8) || (id->field_valid & 2)) { | 750 | } else if ((id->capability & 8) || (id->field_valid & 2)) { |
733 | fast_ata_pio: | 751 | fast_ata_pio: |
734 | hpt3xx_tune_drive(drive, 5); | 752 | hpt3xx_tune_drive(drive, 255); |
735 | return hwif->ide_dma_off_quietly(drive); | 753 | return hwif->ide_dma_off_quietly(drive); |
736 | } | 754 | } |
737 | /* IORDY not supported */ | 755 | /* IORDY not supported */ |
@@ -739,31 +757,48 @@ fast_ata_pio: | |||
739 | } | 757 | } |
740 | 758 | ||
741 | /* | 759 | /* |
742 | * This is specific to the HPT366 UDMA bios chipset | 760 | * This is specific to the HPT366 UDMA chipset |
743 | * by HighPoint|Triones Technologies, Inc. | 761 | * by HighPoint|Triones Technologies, Inc. |
744 | */ | 762 | */ |
745 | static int hpt366_ide_dma_lostirq (ide_drive_t *drive) | 763 | static int hpt366_ide_dma_lostirq(ide_drive_t *drive) |
746 | { | 764 | { |
747 | struct pci_dev *dev = HWIF(drive)->pci_dev; | 765 | struct pci_dev *dev = HWIF(drive)->pci_dev; |
748 | u8 reg50h = 0, reg52h = 0, reg5ah = 0; | 766 | u8 mcr1 = 0, mcr3 = 0, scr1 = 0; |
749 | 767 | ||
750 | pci_read_config_byte(dev, 0x50, ®50h); | 768 | pci_read_config_byte(dev, 0x50, &mcr1); |
751 | pci_read_config_byte(dev, 0x52, ®52h); | 769 | pci_read_config_byte(dev, 0x52, &mcr3); |
752 | pci_read_config_byte(dev, 0x5a, ®5ah); | 770 | pci_read_config_byte(dev, 0x5a, &scr1); |
753 | printk("%s: (%s) reg50h=0x%02x, reg52h=0x%02x, reg5ah=0x%02x\n", | 771 | printk("%s: (%s) mcr1=0x%02x, mcr3=0x%02x, scr1=0x%02x\n", |
754 | drive->name, __FUNCTION__, reg50h, reg52h, reg5ah); | 772 | drive->name, __FUNCTION__, mcr1, mcr3, scr1); |
755 | if (reg5ah & 0x10) | 773 | if (scr1 & 0x10) |
756 | pci_write_config_byte(dev, 0x5a, reg5ah & ~0x10); | 774 | pci_write_config_byte(dev, 0x5a, scr1 & ~0x10); |
757 | return __ide_dma_lostirq(drive); | 775 | return __ide_dma_lostirq(drive); |
758 | } | 776 | } |
759 | 777 | ||
760 | static void hpt370_clear_engine (ide_drive_t *drive) | 778 | static void hpt370_clear_engine(ide_drive_t *drive) |
761 | { | 779 | { |
762 | u8 regstate = HWIF(drive)->channel ? 0x54 : 0x50; | 780 | ide_hwif_t *hwif = HWIF(drive); |
763 | pci_write_config_byte(HWIF(drive)->pci_dev, regstate, 0x37); | 781 | |
782 | pci_write_config_byte(hwif->pci_dev, hwif->select_data, 0x37); | ||
764 | udelay(10); | 783 | udelay(10); |
765 | } | 784 | } |
766 | 785 | ||
786 | static void hpt370_irq_timeout(ide_drive_t *drive) | ||
787 | { | ||
788 | ide_hwif_t *hwif = HWIF(drive); | ||
789 | u16 bfifo = 0; | ||
790 | u8 dma_cmd; | ||
791 | |||
792 | pci_read_config_word(hwif->pci_dev, hwif->select_data + 2, &bfifo); | ||
793 | printk(KERN_DEBUG "%s: %d bytes in FIFO\n", drive->name, bfifo & 0x1ff); | ||
794 | |||
795 | /* get DMA command mode */ | ||
796 | dma_cmd = hwif->INB(hwif->dma_command); | ||
797 | /* stop DMA */ | ||
798 | hwif->OUTB(dma_cmd & ~0x1, hwif->dma_command); | ||
799 | hpt370_clear_engine(drive); | ||
800 | } | ||
801 | |||
767 | static void hpt370_ide_dma_start(ide_drive_t *drive) | 802 | static void hpt370_ide_dma_start(ide_drive_t *drive) |
768 | { | 803 | { |
769 | #ifdef HPT_RESET_STATE_ENGINE | 804 | #ifdef HPT_RESET_STATE_ENGINE |
@@ -772,64 +807,35 @@ static void hpt370_ide_dma_start(ide_drive_t *drive) | |||
772 | ide_dma_start(drive); | 807 | ide_dma_start(drive); |
773 | } | 808 | } |
774 | 809 | ||
775 | static int hpt370_ide_dma_end (ide_drive_t *drive) | 810 | static int hpt370_ide_dma_end(ide_drive_t *drive) |
776 | { | 811 | { |
777 | ide_hwif_t *hwif = HWIF(drive); | 812 | ide_hwif_t *hwif = HWIF(drive); |
778 | u8 dma_stat = hwif->INB(hwif->dma_status); | 813 | u8 dma_stat = hwif->INB(hwif->dma_status); |
779 | 814 | ||
780 | if (dma_stat & 0x01) { | 815 | if (dma_stat & 0x01) { |
781 | /* wait a little */ | 816 | /* wait a little */ |
782 | udelay(20); | 817 | udelay(20); |
783 | dma_stat = hwif->INB(hwif->dma_status); | 818 | dma_stat = hwif->INB(hwif->dma_status); |
819 | if (dma_stat & 0x01) | ||
820 | hpt370_irq_timeout(drive); | ||
784 | } | 821 | } |
785 | if ((dma_stat & 0x01) != 0) | ||
786 | /* fallthrough */ | ||
787 | (void) HWIF(drive)->ide_dma_timeout(drive); | ||
788 | |||
789 | return __ide_dma_end(drive); | 822 | return __ide_dma_end(drive); |
790 | } | 823 | } |
791 | 824 | ||
792 | static void hpt370_lostirq_timeout (ide_drive_t *drive) | 825 | static int hpt370_ide_dma_timeout(ide_drive_t *drive) |
793 | { | 826 | { |
794 | ide_hwif_t *hwif = HWIF(drive); | 827 | hpt370_irq_timeout(drive); |
795 | u8 bfifo = 0, reginfo = hwif->channel ? 0x56 : 0x52; | ||
796 | u8 dma_stat = 0, dma_cmd = 0; | ||
797 | |||
798 | pci_read_config_byte(HWIF(drive)->pci_dev, reginfo, &bfifo); | ||
799 | printk(KERN_DEBUG "%s: %d bytes in FIFO\n", drive->name, bfifo); | ||
800 | hpt370_clear_engine(drive); | ||
801 | /* get dma command mode */ | ||
802 | dma_cmd = hwif->INB(hwif->dma_command); | ||
803 | /* stop dma */ | ||
804 | hwif->OUTB(dma_cmd & ~0x1, hwif->dma_command); | ||
805 | dma_stat = hwif->INB(hwif->dma_status); | ||
806 | /* clear errors */ | ||
807 | hwif->OUTB(dma_stat | 0x6, hwif->dma_status); | ||
808 | } | ||
809 | |||
810 | static int hpt370_ide_dma_timeout (ide_drive_t *drive) | ||
811 | { | ||
812 | hpt370_lostirq_timeout(drive); | ||
813 | hpt370_clear_engine(drive); | ||
814 | return __ide_dma_timeout(drive); | 828 | return __ide_dma_timeout(drive); |
815 | } | 829 | } |
816 | 830 | ||
817 | static int hpt370_ide_dma_lostirq (ide_drive_t *drive) | ||
818 | { | ||
819 | hpt370_lostirq_timeout(drive); | ||
820 | hpt370_clear_engine(drive); | ||
821 | return __ide_dma_lostirq(drive); | ||
822 | } | ||
823 | |||
824 | /* returns 1 if DMA IRQ issued, 0 otherwise */ | 831 | /* returns 1 if DMA IRQ issued, 0 otherwise */ |
825 | static int hpt374_ide_dma_test_irq(ide_drive_t *drive) | 832 | static int hpt374_ide_dma_test_irq(ide_drive_t *drive) |
826 | { | 833 | { |
827 | ide_hwif_t *hwif = HWIF(drive); | 834 | ide_hwif_t *hwif = HWIF(drive); |
828 | u16 bfifo = 0; | 835 | u16 bfifo = 0; |
829 | u8 reginfo = hwif->channel ? 0x56 : 0x52; | 836 | u8 dma_stat; |
830 | u8 dma_stat; | ||
831 | 837 | ||
832 | pci_read_config_word(hwif->pci_dev, reginfo, &bfifo); | 838 | pci_read_config_word(hwif->pci_dev, hwif->select_data + 2, &bfifo); |
833 | if (bfifo & 0x1FF) { | 839 | if (bfifo & 0x1FF) { |
834 | // printk("%s: %d bytes in FIFO\n", drive->name, bfifo); | 840 | // printk("%s: %d bytes in FIFO\n", drive->name, bfifo); |
835 | return 0; | 841 | return 0; |
@@ -837,7 +843,7 @@ static int hpt374_ide_dma_test_irq(ide_drive_t *drive) | |||
837 | 843 | ||
838 | dma_stat = hwif->INB(hwif->dma_status); | 844 | dma_stat = hwif->INB(hwif->dma_status); |
839 | /* return 1 if INTR asserted */ | 845 | /* return 1 if INTR asserted */ |
840 | if ((dma_stat & 4) == 4) | 846 | if (dma_stat & 4) |
841 | return 1; | 847 | return 1; |
842 | 848 | ||
843 | if (!drive->waiting_for_dma) | 849 | if (!drive->waiting_for_dma) |
@@ -846,17 +852,17 @@ static int hpt374_ide_dma_test_irq(ide_drive_t *drive) | |||
846 | return 0; | 852 | return 0; |
847 | } | 853 | } |
848 | 854 | ||
849 | static int hpt374_ide_dma_end (ide_drive_t *drive) | 855 | static int hpt374_ide_dma_end(ide_drive_t *drive) |
850 | { | 856 | { |
851 | struct pci_dev *dev = HWIF(drive)->pci_dev; | ||
852 | ide_hwif_t *hwif = HWIF(drive); | 857 | ide_hwif_t *hwif = HWIF(drive); |
853 | u8 msc_stat = 0, mscreg = hwif->channel ? 0x54 : 0x50; | 858 | struct pci_dev *dev = hwif->pci_dev; |
854 | u8 bwsr_stat = 0, bwsr_mask = hwif->channel ? 0x02 : 0x01; | 859 | u8 mcr = 0, mcr_addr = hwif->select_data; |
855 | 860 | u8 bwsr = 0, mask = hwif->channel ? 0x02 : 0x01; | |
856 | pci_read_config_byte(dev, 0x6a, &bwsr_stat); | 861 | |
857 | pci_read_config_byte(dev, mscreg, &msc_stat); | 862 | pci_read_config_byte(dev, 0x6a, &bwsr); |
858 | if ((bwsr_stat & bwsr_mask) == bwsr_mask) | 863 | pci_read_config_byte(dev, mcr_addr, &mcr); |
859 | pci_write_config_byte(dev, mscreg, msc_stat|0x30); | 864 | if (bwsr & mask) |
865 | pci_write_config_byte(dev, mcr_addr, mcr | 0x30); | ||
860 | return __ide_dma_end(drive); | 866 | return __ide_dma_end(drive); |
861 | } | 867 | } |
862 | 868 | ||
@@ -866,40 +872,37 @@ static int hpt374_ide_dma_end (ide_drive_t *drive) | |||
866 | * @mode: clocking mode (0x21 for write, 0x23 otherwise) | 872 | * @mode: clocking mode (0x21 for write, 0x23 otherwise) |
867 | * | 873 | * |
868 | * Switch the DPLL clock on the HPT3xxN devices. This is a right mess. | 874 | * Switch the DPLL clock on the HPT3xxN devices. This is a right mess. |
869 | * NOTE: avoid touching the disabled primary channel on HPT371N -- it | ||
870 | * doesn't physically exist anyway... | ||
871 | */ | 875 | */ |
872 | 876 | ||
873 | static void hpt3xxn_set_clock(ide_hwif_t *hwif, u8 mode) | 877 | static void hpt3xxn_set_clock(ide_hwif_t *hwif, u8 mode) |
874 | { | 878 | { |
875 | u8 mcr1, scr2 = hwif->INB(hwif->dma_master + 0x7b); | 879 | u8 scr2 = hwif->INB(hwif->dma_master + 0x7b); |
876 | 880 | ||
877 | if ((scr2 & 0x7f) == mode) | 881 | if ((scr2 & 0x7f) == mode) |
878 | return; | 882 | return; |
879 | 883 | ||
880 | /* MISC. control register 1 has the channel enable bit... */ | ||
881 | mcr1 = hwif->INB(hwif->dma_master + 0x70); | ||
882 | |||
883 | /* Tristate the bus */ | 884 | /* Tristate the bus */ |
884 | if (mcr1 & 0x04) | 885 | hwif->OUTB(0x80, hwif->dma_master + 0x73); |
885 | hwif->OUTB(0x80, hwif->dma_master + 0x73); | ||
886 | hwif->OUTB(0x80, hwif->dma_master + 0x77); | 886 | hwif->OUTB(0x80, hwif->dma_master + 0x77); |
887 | 887 | ||
888 | /* Switch clock and reset channels */ | 888 | /* Switch clock and reset channels */ |
889 | hwif->OUTB(mode, hwif->dma_master + 0x7b); | 889 | hwif->OUTB(mode, hwif->dma_master + 0x7b); |
890 | hwif->OUTB(0xc0, hwif->dma_master + 0x79); | 890 | hwif->OUTB(0xc0, hwif->dma_master + 0x79); |
891 | 891 | ||
892 | /* Reset state machines */ | 892 | /* |
893 | if (mcr1 & 0x04) | 893 | * Reset the state machines. |
894 | hwif->OUTB(0x37, hwif->dma_master + 0x70); | 894 | * NOTE: avoid accidentally enabling the disabled channels. |
895 | hwif->OUTB(0x37, hwif->dma_master + 0x74); | 895 | */ |
896 | hwif->OUTB(hwif->INB(hwif->dma_master + 0x70) | 0x32, | ||
897 | hwif->dma_master + 0x70); | ||
898 | hwif->OUTB(hwif->INB(hwif->dma_master + 0x74) | 0x32, | ||
899 | hwif->dma_master + 0x74); | ||
896 | 900 | ||
897 | /* Complete reset */ | 901 | /* Complete reset */ |
898 | hwif->OUTB(0x00, hwif->dma_master + 0x79); | 902 | hwif->OUTB(0x00, hwif->dma_master + 0x79); |
899 | 903 | ||
900 | /* Reconnect channels to bus */ | 904 | /* Reconnect channels to bus */ |
901 | if (mcr1 & 0x04) | 905 | hwif->OUTB(0x00, hwif->dma_master + 0x73); |
902 | hwif->OUTB(0x00, hwif->dma_master + 0x73); | ||
903 | hwif->OUTB(0x00, hwif->dma_master + 0x77); | 906 | hwif->OUTB(0x00, hwif->dma_master + 0x77); |
904 | } | 907 | } |
905 | 908 | ||
@@ -914,14 +917,12 @@ static void hpt3xxn_set_clock(ide_hwif_t *hwif, u8 mode) | |||
914 | 917 | ||
915 | static void hpt3xxn_rw_disk(ide_drive_t *drive, struct request *rq) | 918 | static void hpt3xxn_rw_disk(ide_drive_t *drive, struct request *rq) |
916 | { | 919 | { |
917 | ide_hwif_t *hwif = HWIF(drive); | 920 | hpt3xxn_set_clock(HWIF(drive), rq_data_dir(rq) ? 0x23 : 0x21); |
918 | u8 wantclock = rq_data_dir(rq) ? 0x23 : 0x21; | ||
919 | |||
920 | hpt3xxn_set_clock(hwif, wantclock); | ||
921 | } | 921 | } |
922 | 922 | ||
923 | /* | 923 | /* |
924 | * Set/get power state for a drive. | 924 | * Set/get power state for a drive. |
925 | * NOTE: affects both drives on each channel. | ||
925 | * | 926 | * |
926 | * When we turn the power back on, we need to re-initialize things. | 927 | * When we turn the power back on, we need to re-initialize things. |
927 | */ | 928 | */ |
@@ -929,26 +930,18 @@ static void hpt3xxn_rw_disk(ide_drive_t *drive, struct request *rq) | |||
929 | 930 | ||
930 | static int hpt3xx_busproc(ide_drive_t *drive, int state) | 931 | static int hpt3xx_busproc(ide_drive_t *drive, int state) |
931 | { | 932 | { |
932 | ide_hwif_t *hwif = drive->hwif; | 933 | ide_hwif_t *hwif = HWIF(drive); |
933 | struct pci_dev *dev = hwif->pci_dev; | 934 | struct pci_dev *dev = hwif->pci_dev; |
934 | u8 tristate, resetmask, bus_reg = 0; | 935 | u8 mcr_addr = hwif->select_data + 2; |
935 | u16 tri_reg = 0; | 936 | u8 resetmask = hwif->channel ? 0x80 : 0x40; |
937 | u8 bsr2 = 0; | ||
938 | u16 mcr = 0; | ||
936 | 939 | ||
937 | hwif->bus_state = state; | 940 | hwif->bus_state = state; |
938 | 941 | ||
939 | if (hwif->channel) { | ||
940 | /* secondary channel */ | ||
941 | tristate = 0x56; | ||
942 | resetmask = 0x80; | ||
943 | } else { | ||
944 | /* primary channel */ | ||
945 | tristate = 0x52; | ||
946 | resetmask = 0x40; | ||
947 | } | ||
948 | |||
949 | /* Grab the status. */ | 942 | /* Grab the status. */ |
950 | pci_read_config_word(dev, tristate, &tri_reg); | 943 | pci_read_config_word(dev, mcr_addr, &mcr); |
951 | pci_read_config_byte(dev, 0x59, &bus_reg); | 944 | pci_read_config_byte(dev, 0x59, &bsr2); |
952 | 945 | ||
953 | /* | 946 | /* |
954 | * Set the state. We don't set it if we don't need to do so. | 947 | * Set the state. We don't set it if we don't need to do so. |
@@ -956,22 +949,22 @@ static int hpt3xx_busproc(ide_drive_t *drive, int state) | |||
956 | */ | 949 | */ |
957 | switch (state) { | 950 | switch (state) { |
958 | case BUSSTATE_ON: | 951 | case BUSSTATE_ON: |
959 | if (!(bus_reg & resetmask)) | 952 | if (!(bsr2 & resetmask)) |
960 | return 0; | 953 | return 0; |
961 | hwif->drives[0].failures = hwif->drives[1].failures = 0; | 954 | hwif->drives[0].failures = hwif->drives[1].failures = 0; |
962 | 955 | ||
963 | pci_write_config_byte(dev, 0x59, bus_reg & ~resetmask); | 956 | pci_write_config_byte(dev, 0x59, bsr2 & ~resetmask); |
964 | pci_write_config_word(dev, tristate, tri_reg & ~TRISTATE_BIT); | 957 | pci_write_config_word(dev, mcr_addr, mcr & ~TRISTATE_BIT); |
965 | return 0; | 958 | return 0; |
966 | case BUSSTATE_OFF: | 959 | case BUSSTATE_OFF: |
967 | if ((bus_reg & resetmask) && !(tri_reg & TRISTATE_BIT)) | 960 | if ((bsr2 & resetmask) && !(mcr & TRISTATE_BIT)) |
968 | return 0; | 961 | return 0; |
969 | tri_reg &= ~TRISTATE_BIT; | 962 | mcr &= ~TRISTATE_BIT; |
970 | break; | 963 | break; |
971 | case BUSSTATE_TRISTATE: | 964 | case BUSSTATE_TRISTATE: |
972 | if ((bus_reg & resetmask) && (tri_reg & TRISTATE_BIT)) | 965 | if ((bsr2 & resetmask) && (mcr & TRISTATE_BIT)) |
973 | return 0; | 966 | return 0; |
974 | tri_reg |= TRISTATE_BIT; | 967 | mcr |= TRISTATE_BIT; |
975 | break; | 968 | break; |
976 | default: | 969 | default: |
977 | return -EINVAL; | 970 | return -EINVAL; |
@@ -980,268 +973,320 @@ static int hpt3xx_busproc(ide_drive_t *drive, int state) | |||
980 | hwif->drives[0].failures = hwif->drives[0].max_failures + 1; | 973 | hwif->drives[0].failures = hwif->drives[0].max_failures + 1; |
981 | hwif->drives[1].failures = hwif->drives[1].max_failures + 1; | 974 | hwif->drives[1].failures = hwif->drives[1].max_failures + 1; |
982 | 975 | ||
983 | pci_write_config_word(dev, tristate, tri_reg); | 976 | pci_write_config_word(dev, mcr_addr, mcr); |
984 | pci_write_config_byte(dev, 0x59, bus_reg | resetmask); | 977 | pci_write_config_byte(dev, 0x59, bsr2 | resetmask); |
985 | return 0; | 978 | return 0; |
986 | } | 979 | } |
987 | 980 | ||
988 | static void __devinit hpt366_clocking(ide_hwif_t *hwif) | 981 | /** |
982 | * hpt37x_calibrate_dpll - calibrate the DPLL | ||
983 | * @dev: PCI device | ||
984 | * | ||
985 | * Perform a calibration cycle on the DPLL. | ||
986 | * Returns 1 if this succeeds | ||
987 | */ | ||
988 | static int __devinit hpt37x_calibrate_dpll(struct pci_dev *dev, u16 f_low, u16 f_high) | ||
989 | { | 989 | { |
990 | u32 reg1 = 0; | 990 | u32 dpll = (f_high << 16) | f_low | 0x100; |
991 | struct hpt_info *info = ide_get_hwifdata(hwif); | 991 | u8 scr2; |
992 | int i; | ||
992 | 993 | ||
993 | pci_read_config_dword(hwif->pci_dev, 0x40, ®1); | 994 | pci_write_config_dword(dev, 0x5c, dpll); |
994 | 995 | ||
995 | /* detect bus speed by looking at control reg timing: */ | 996 | /* Wait for oscillator ready */ |
996 | switch((reg1 >> 8) & 7) { | 997 | for(i = 0; i < 0x5000; ++i) { |
997 | case 5: | 998 | udelay(50); |
998 | info->speed = forty_base_hpt36x; | 999 | pci_read_config_byte(dev, 0x5b, &scr2); |
999 | break; | 1000 | if (scr2 & 0x80) |
1000 | case 9: | ||
1001 | info->speed = twenty_five_base_hpt36x; | ||
1002 | break; | ||
1003 | case 7: | ||
1004 | default: | ||
1005 | info->speed = thirty_three_base_hpt36x; | ||
1006 | break; | 1001 | break; |
1007 | } | 1002 | } |
1003 | /* See if it stays ready (we'll just bail out if it's not yet) */ | ||
1004 | for(i = 0; i < 0x1000; ++i) { | ||
1005 | pci_read_config_byte(dev, 0x5b, &scr2); | ||
1006 | /* DPLL destabilized? */ | ||
1007 | if(!(scr2 & 0x80)) | ||
1008 | return 0; | ||
1009 | } | ||
1010 | /* Turn off tuning, we have the DPLL set */ | ||
1011 | pci_read_config_dword (dev, 0x5c, &dpll); | ||
1012 | pci_write_config_dword(dev, 0x5c, (dpll & ~0x100)); | ||
1013 | return 1; | ||
1008 | } | 1014 | } |
1009 | 1015 | ||
1010 | static void __devinit hpt37x_clocking(ide_hwif_t *hwif) | 1016 | static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const char *name) |
1011 | { | 1017 | { |
1012 | struct hpt_info *info = ide_get_hwifdata(hwif); | 1018 | struct hpt_info *info = kmalloc(sizeof(struct hpt_info), GFP_KERNEL); |
1013 | struct pci_dev *dev = hwif->pci_dev; | 1019 | unsigned long io_base = pci_resource_start(dev, 4); |
1014 | int adjust, i; | 1020 | u8 pci_clk, dpll_clk = 0; /* PCI and DPLL clock in MHz */ |
1015 | u16 freq = 0; | 1021 | enum ata_clock clock; |
1016 | u32 pll, temp = 0; | 1022 | |
1017 | u8 reg5bh = 0, mcr1 = 0; | 1023 | if (info == NULL) { |
1018 | 1024 | printk(KERN_ERR "%s: out of memory!\n", name); | |
1025 | return -ENOMEM; | ||
1026 | } | ||
1027 | |||
1019 | /* | 1028 | /* |
1020 | * default to pci clock. make sure MA15/16 are set to output | 1029 | * Copy everything from a static "template" structure |
1021 | * to prevent drives having problems with 40-pin cables. Needed | 1030 | * to just allocated per-chip hpt_info structure. |
1022 | * for some drives such as IBM-DTLA which will not enter ready | ||
1023 | * state on reset when PDIAG is a input. | ||
1024 | * | ||
1025 | * ToDo: should we set 0x21 when using PLL mode ? | ||
1026 | */ | 1031 | */ |
1027 | pci_write_config_byte(dev, 0x5b, 0x23); | 1032 | *info = *(struct hpt_info *)pci_get_drvdata(dev); |
1028 | 1033 | ||
1029 | /* | 1034 | /* |
1030 | * We'll have to read f_CNT value in order to determine | 1035 | * FIXME: Not portable. Also, why do we enable the ROM in the first place? |
1031 | * the PCI clock frequency according to the following ratio: | 1036 | * We don't seem to be using it. |
1032 | * | ||
1033 | * f_CNT = Fpci * 192 / Fdpll | ||
1034 | * | ||
1035 | * First try reading the register in which the HighPoint BIOS | ||
1036 | * saves f_CNT value before reprogramming the DPLL from its | ||
1037 | * default setting (which differs for the various chips). | ||
1038 | * NOTE: This register is only accessible via I/O space. | ||
1039 | * | ||
1040 | * In case the signature check fails, we'll have to resort to | ||
1041 | * reading the f_CNT register itself in hopes that nobody has | ||
1042 | * touched the DPLL yet... | ||
1043 | */ | 1037 | */ |
1044 | temp = inl(pci_resource_start(dev, 4) + 0x90); | 1038 | if (dev->resource[PCI_ROM_RESOURCE].start) |
1045 | if ((temp & 0xFFFFF000) != 0xABCDE000) { | 1039 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, |
1046 | printk(KERN_WARNING "HPT37X: no clock data saved by BIOS\n"); | 1040 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); |
1047 | 1041 | ||
1048 | /* Calculate the average value of f_CNT */ | 1042 | pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4)); |
1049 | for (temp = i = 0; i < 128; i++) { | 1043 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78); |
1050 | pci_read_config_word(dev, 0x78, &freq); | 1044 | pci_write_config_byte(dev, PCI_MIN_GNT, 0x08); |
1051 | temp += freq & 0x1ff; | 1045 | pci_write_config_byte(dev, PCI_MAX_LAT, 0x08); |
1052 | mdelay(1); | ||
1053 | } | ||
1054 | freq = temp / 128; | ||
1055 | } else | ||
1056 | freq = temp & 0x1ff; | ||
1057 | 1046 | ||
1058 | /* | 1047 | /* |
1059 | * HPT3xxN chips use different PCI clock information. | 1048 | * First, try to estimate the PCI clock frequency... |
1060 | * Currently we always set up the PLL for them. | ||
1061 | */ | 1049 | */ |
1050 | if (info->chip_type >= HPT370) { | ||
1051 | u8 scr1 = 0; | ||
1052 | u16 f_cnt = 0; | ||
1053 | u32 temp = 0; | ||
1062 | 1054 | ||
1063 | if (info->flags & IS_3xxN) { | 1055 | /* Interrupt force enable. */ |
1064 | if(freq < 0x55) | 1056 | pci_read_config_byte(dev, 0x5a, &scr1); |
1065 | pll = F_LOW_PCI_33; | 1057 | if (scr1 & 0x10) |
1066 | else if(freq < 0x70) | 1058 | pci_write_config_byte(dev, 0x5a, scr1 & ~0x10); |
1067 | pll = F_LOW_PCI_40; | ||
1068 | else if(freq < 0x7F) | ||
1069 | pll = F_LOW_PCI_50; | ||
1070 | else | ||
1071 | pll = F_LOW_PCI_66; | ||
1072 | 1059 | ||
1073 | printk(KERN_INFO "HPT3xxN detected, FREQ: %d, PLL: %d\n", freq, pll); | 1060 | /* |
1074 | } | 1061 | * HighPoint does this for HPT372A. |
1075 | else | 1062 | * NOTE: This register is only writeable via I/O space. |
1076 | { | 1063 | */ |
1077 | if(freq < 0x9C) | 1064 | if (info->chip_type == HPT372A) |
1078 | pll = F_LOW_PCI_33; | 1065 | outb(0x0e, io_base + 0x9c); |
1079 | else if(freq < 0xb0) | 1066 | |
1080 | pll = F_LOW_PCI_40; | 1067 | /* |
1081 | else if(freq <0xc8) | 1068 | * Default to PCI clock. Make sure MA15/16 are set to output |
1082 | pll = F_LOW_PCI_50; | 1069 | * to prevent drives having problems with 40-pin cables. |
1070 | */ | ||
1071 | pci_write_config_byte(dev, 0x5b, 0x23); | ||
1072 | |||
1073 | /* | ||
1074 | * We'll have to read f_CNT value in order to determine | ||
1075 | * the PCI clock frequency according to the following ratio: | ||
1076 | * | ||
1077 | * f_CNT = Fpci * 192 / Fdpll | ||
1078 | * | ||
1079 | * First try reading the register in which the HighPoint BIOS | ||
1080 | * saves f_CNT value before reprogramming the DPLL from its | ||
1081 | * default setting (which differs for the various chips). | ||
1082 | * NOTE: This register is only accessible via I/O space. | ||
1083 | * | ||
1084 | * In case the signature check fails, we'll have to resort to | ||
1085 | * reading the f_CNT register itself in hopes that nobody has | ||
1086 | * touched the DPLL yet... | ||
1087 | */ | ||
1088 | temp = inl(io_base + 0x90); | ||
1089 | if ((temp & 0xFFFFF000) != 0xABCDE000) { | ||
1090 | int i; | ||
1091 | |||
1092 | printk(KERN_WARNING "%s: no clock data saved by BIOS\n", | ||
1093 | name); | ||
1094 | |||
1095 | /* Calculate the average value of f_CNT. */ | ||
1096 | for (temp = i = 0; i < 128; i++) { | ||
1097 | pci_read_config_word(dev, 0x78, &f_cnt); | ||
1098 | temp += f_cnt & 0x1ff; | ||
1099 | mdelay(1); | ||
1100 | } | ||
1101 | f_cnt = temp / 128; | ||
1102 | } else | ||
1103 | f_cnt = temp & 0x1ff; | ||
1104 | |||
1105 | dpll_clk = info->dpll_clk; | ||
1106 | pci_clk = (f_cnt * dpll_clk) / 192; | ||
1107 | |||
1108 | /* Clamp PCI clock to bands. */ | ||
1109 | if (pci_clk < 40) | ||
1110 | pci_clk = 33; | ||
1111 | else if(pci_clk < 45) | ||
1112 | pci_clk = 40; | ||
1113 | else if(pci_clk < 55) | ||
1114 | pci_clk = 50; | ||
1083 | else | 1115 | else |
1084 | pll = F_LOW_PCI_66; | 1116 | pci_clk = 66; |
1085 | 1117 | ||
1086 | if (pll == F_LOW_PCI_33) { | 1118 | printk(KERN_INFO "%s: DPLL base: %d MHz, f_CNT: %d, " |
1087 | info->speed = thirty_three_base_hpt37x; | 1119 | "assuming %d MHz PCI\n", name, dpll_clk, f_cnt, pci_clk); |
1088 | printk(KERN_DEBUG "HPT37X: using 33MHz PCI clock\n"); | 1120 | } else { |
1089 | } else if (pll == F_LOW_PCI_40) { | 1121 | u32 itr1 = 0; |
1090 | /* Unsupported */ | 1122 | |
1091 | } else if (pll == F_LOW_PCI_50) { | 1123 | pci_read_config_dword(dev, 0x40, &itr1); |
1092 | info->speed = fifty_base_hpt37x; | 1124 | |
1093 | printk(KERN_DEBUG "HPT37X: using 50MHz PCI clock\n"); | 1125 | /* Detect PCI clock by looking at cmd_high_time. */ |
1094 | } else { | 1126 | switch((itr1 >> 8) & 0x07) { |
1095 | info->speed = sixty_six_base_hpt37x; | 1127 | case 0x09: |
1096 | printk(KERN_DEBUG "HPT37X: using 66MHz PCI clock\n"); | 1128 | pci_clk = 40; |
1129 | break; | ||
1130 | case 0x05: | ||
1131 | pci_clk = 25; | ||
1132 | break; | ||
1133 | case 0x07: | ||
1134 | default: | ||
1135 | pci_clk = 33; | ||
1136 | break; | ||
1097 | } | 1137 | } |
1098 | } | 1138 | } |
1099 | 1139 | ||
1100 | if (pll == F_LOW_PCI_66) | 1140 | /* Let's assume we'll use PCI clock for the ATA clock... */ |
1101 | info->flags |= PCI_66MHZ; | 1141 | switch (pci_clk) { |
1142 | case 25: | ||
1143 | clock = ATA_CLOCK_25MHZ; | ||
1144 | break; | ||
1145 | case 33: | ||
1146 | default: | ||
1147 | clock = ATA_CLOCK_33MHZ; | ||
1148 | break; | ||
1149 | case 40: | ||
1150 | clock = ATA_CLOCK_40MHZ; | ||
1151 | break; | ||
1152 | case 50: | ||
1153 | clock = ATA_CLOCK_50MHZ; | ||
1154 | break; | ||
1155 | case 66: | ||
1156 | clock = ATA_CLOCK_66MHZ; | ||
1157 | break; | ||
1158 | } | ||
1102 | 1159 | ||
1103 | /* | 1160 | /* |
1104 | * only try the pll if we don't have a table for the clock | 1161 | * Only try the DPLL if we don't have a table for the PCI clock that |
1105 | * speed that we're running at. NOTE: the internal PLL will | 1162 | * we are running at for HPT370/A, always use it for anything newer... |
1106 | * result in slow reads when using a 33MHz PCI clock. we also | ||
1107 | * don't like to use the PLL because it will cause glitches | ||
1108 | * on PRST/SRST when the HPT state engine gets reset. | ||
1109 | * | 1163 | * |
1110 | * ToDo: Use 66MHz PLL when ATA133 devices are present on a | 1164 | * NOTE: Using the internal DPLL results in slow reads on 33 MHz PCI. |
1111 | * 372 device so we can get ATA133 support | 1165 | * We also don't like using the DPLL because this causes glitches |
1166 | * on PRST-/SRST- when the state engine gets reset... | ||
1112 | */ | 1167 | */ |
1113 | if (info->speed) | 1168 | if (info->chip_type >= HPT374 || info->settings[clock] == NULL) { |
1114 | goto init_hpt37X_done; | 1169 | u16 f_low, delta = pci_clk < 50 ? 2 : 4; |
1170 | int adjust; | ||
1171 | |||
1172 | /* | ||
1173 | * Select 66 MHz DPLL clock only if UltraATA/133 mode is | ||
1174 | * supported/enabled, use 50 MHz DPLL clock otherwise... | ||
1175 | */ | ||
1176 | if (info->max_mode == 0x04) { | ||
1177 | dpll_clk = 66; | ||
1178 | clock = ATA_CLOCK_66MHZ; | ||
1179 | } else if (dpll_clk) { /* HPT36x chips don't have DPLL */ | ||
1180 | dpll_clk = 50; | ||
1181 | clock = ATA_CLOCK_50MHZ; | ||
1182 | } | ||
1115 | 1183 | ||
1116 | info->flags |= PLL_MODE; | 1184 | if (info->settings[clock] == NULL) { |
1117 | 1185 | printk(KERN_ERR "%s: unknown bus timing!\n", name); | |
1118 | /* | 1186 | kfree(info); |
1119 | * Adjust the PLL based upon the PCI clock, enable it, and | 1187 | return -EIO; |
1120 | * wait for stabilization... | ||
1121 | */ | ||
1122 | adjust = 0; | ||
1123 | freq = (pll < F_LOW_PCI_50) ? 2 : 4; | ||
1124 | while (adjust++ < 6) { | ||
1125 | pci_write_config_dword(dev, 0x5c, (freq + pll) << 16 | | ||
1126 | pll | 0x100); | ||
1127 | |||
1128 | /* wait for clock stabilization */ | ||
1129 | for (i = 0; i < 0x50000; i++) { | ||
1130 | pci_read_config_byte(dev, 0x5b, ®5bh); | ||
1131 | if (reg5bh & 0x80) { | ||
1132 | /* spin looking for the clock to destabilize */ | ||
1133 | for (i = 0; i < 0x1000; ++i) { | ||
1134 | pci_read_config_byte(dev, 0x5b, | ||
1135 | ®5bh); | ||
1136 | if ((reg5bh & 0x80) == 0) | ||
1137 | goto pll_recal; | ||
1138 | } | ||
1139 | pci_read_config_dword(dev, 0x5c, &pll); | ||
1140 | pci_write_config_dword(dev, 0x5c, | ||
1141 | pll & ~0x100); | ||
1142 | pci_write_config_byte(dev, 0x5b, 0x21); | ||
1143 | |||
1144 | info->speed = fifty_base_hpt37x; | ||
1145 | printk("HPT37X: using 50MHz internal PLL\n"); | ||
1146 | goto init_hpt37X_done; | ||
1147 | } | ||
1148 | } | 1188 | } |
1149 | pll_recal: | ||
1150 | if (adjust & 1) | ||
1151 | pll -= (adjust >> 1); | ||
1152 | else | ||
1153 | pll += (adjust >> 1); | ||
1154 | } | ||
1155 | 1189 | ||
1156 | init_hpt37X_done: | 1190 | /* Select the DPLL clock. */ |
1157 | if (!info->speed) | 1191 | pci_write_config_byte(dev, 0x5b, 0x21); |
1158 | printk(KERN_ERR "HPT37x%s: unknown bus timing [%d %d].\n", | ||
1159 | (info->flags & IS_3xxN) ? "N" : "", pll, freq); | ||
1160 | /* | ||
1161 | * Reset the state engines. | ||
1162 | * NOTE: avoid accidentally enabling the primary channel on HPT371N. | ||
1163 | */ | ||
1164 | pci_read_config_byte(dev, 0x50, &mcr1); | ||
1165 | if (mcr1 & 0x04) | ||
1166 | pci_write_config_byte(dev, 0x50, 0x37); | ||
1167 | pci_write_config_byte(dev, 0x54, 0x37); | ||
1168 | udelay(100); | ||
1169 | } | ||
1170 | 1192 | ||
1171 | static int __devinit init_hpt37x(struct pci_dev *dev) | 1193 | /* |
1172 | { | 1194 | * Adjust the DPLL based upon PCI clock, enable it, |
1173 | u8 reg5ah; | 1195 | * and wait for stabilization... |
1196 | */ | ||
1197 | f_low = (pci_clk * 48) / dpll_clk; | ||
1174 | 1198 | ||
1175 | pci_read_config_byte(dev, 0x5a, ®5ah); | 1199 | for (adjust = 0; adjust < 8; adjust++) { |
1176 | /* interrupt force enable */ | 1200 | if(hpt37x_calibrate_dpll(dev, f_low, f_low + delta)) |
1177 | pci_write_config_byte(dev, 0x5a, (reg5ah & ~0x10)); | 1201 | break; |
1178 | return 0; | ||
1179 | } | ||
1180 | 1202 | ||
1181 | static int __devinit init_hpt366(struct pci_dev *dev) | 1203 | /* |
1182 | { | 1204 | * See if it'll settle at a fractionally different clock |
1183 | u32 reg1 = 0; | 1205 | */ |
1184 | u8 drive_fast = 0; | 1206 | if (adjust & 1) |
1207 | f_low -= adjust >> 1; | ||
1208 | else | ||
1209 | f_low += adjust >> 1; | ||
1210 | } | ||
1211 | if (adjust == 8) { | ||
1212 | printk(KERN_ERR "%s: DPLL did not stabilize!\n", name); | ||
1213 | kfree(info); | ||
1214 | return -EIO; | ||
1215 | } | ||
1185 | 1216 | ||
1186 | /* | 1217 | printk("%s: using %d MHz DPLL clock\n", name, dpll_clk); |
1187 | * Disable the "fast interrupt" prediction. | 1218 | } else { |
1188 | */ | 1219 | /* Mark the fact that we're not using the DPLL. */ |
1189 | pci_read_config_byte(dev, 0x51, &drive_fast); | 1220 | dpll_clk = 0; |
1190 | if (drive_fast & 0x80) | ||
1191 | pci_write_config_byte(dev, 0x51, drive_fast & ~0x80); | ||
1192 | pci_read_config_dword(dev, 0x40, ®1); | ||
1193 | |||
1194 | return 0; | ||
1195 | } | ||
1196 | 1221 | ||
1197 | static unsigned int __devinit init_chipset_hpt366(struct pci_dev *dev, const char *name) | 1222 | printk("%s: using %d MHz PCI clock\n", name, pci_clk); |
1198 | { | 1223 | } |
1199 | int ret = 0; | ||
1200 | 1224 | ||
1201 | /* | 1225 | /* |
1202 | * FIXME: Not portable. Also, why do we enable the ROM in the first place? | 1226 | * Advance the table pointer to a slot which points to the list |
1203 | * We don't seem to be using it. | 1227 | * of the register values settings matching the clock being used. |
1204 | */ | 1228 | */ |
1205 | if (dev->resource[PCI_ROM_RESOURCE].start) | 1229 | info->settings += clock; |
1206 | pci_write_config_dword(dev, PCI_ROM_ADDRESS, | ||
1207 | dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE); | ||
1208 | 1230 | ||
1209 | pci_write_config_byte(dev, PCI_CACHE_LINE_SIZE, (L1_CACHE_BYTES / 4)); | 1231 | /* Store the clock frequencies. */ |
1210 | pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x78); | 1232 | info->dpll_clk = dpll_clk; |
1211 | pci_write_config_byte(dev, PCI_MIN_GNT, 0x08); | 1233 | info->pci_clk = pci_clk; |
1212 | pci_write_config_byte(dev, PCI_MAX_LAT, 0x08); | ||
1213 | 1234 | ||
1214 | if (hpt_revision(dev) >= 3) | 1235 | /* Point to this chip's own instance of the hpt_info structure. */ |
1215 | ret = init_hpt37x(dev); | 1236 | pci_set_drvdata(dev, info); |
1216 | else | ||
1217 | ret = init_hpt366(dev); | ||
1218 | 1237 | ||
1219 | if (ret) | 1238 | if (info->chip_type >= HPT370) { |
1220 | return ret; | 1239 | u8 mcr1, mcr4; |
1240 | |||
1241 | /* | ||
1242 | * Reset the state engines. | ||
1243 | * NOTE: Avoid accidentally enabling the disabled channels. | ||
1244 | */ | ||
1245 | pci_read_config_byte (dev, 0x50, &mcr1); | ||
1246 | pci_read_config_byte (dev, 0x54, &mcr4); | ||
1247 | pci_write_config_byte(dev, 0x50, (mcr1 | 0x32)); | ||
1248 | pci_write_config_byte(dev, 0x54, (mcr4 | 0x32)); | ||
1249 | udelay(100); | ||
1250 | } | ||
1251 | |||
1252 | /* | ||
1253 | * On HPT371N, if ATA clock is 66 MHz we must set bit 2 in | ||
1254 | * the MISC. register to stretch the UltraDMA Tss timing. | ||
1255 | * NOTE: This register is only writeable via I/O space. | ||
1256 | */ | ||
1257 | if (info->chip_type == HPT371N && clock == ATA_CLOCK_66MHZ) | ||
1258 | |||
1259 | outb(inb(io_base + 0x9c) | 0x04, io_base + 0x9c); | ||
1221 | 1260 | ||
1222 | return dev->irq; | 1261 | return dev->irq; |
1223 | } | 1262 | } |
1224 | 1263 | ||
1225 | static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) | 1264 | static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) |
1226 | { | 1265 | { |
1227 | struct pci_dev *dev = hwif->pci_dev; | 1266 | struct pci_dev *dev = hwif->pci_dev; |
1228 | struct hpt_info *info = ide_get_hwifdata(hwif); | 1267 | struct hpt_info *info = pci_get_drvdata(dev); |
1229 | u8 ata66 = 0, regmask = (hwif->channel) ? 0x01 : 0x02; | ||
1230 | int serialize = HPT_SERIALIZE_IO; | 1268 | int serialize = HPT_SERIALIZE_IO; |
1231 | 1269 | u8 scr1 = 0, ata66 = (hwif->channel) ? 0x01 : 0x02; | |
1270 | u8 chip_type = info->chip_type; | ||
1271 | u8 new_mcr, old_mcr = 0; | ||
1272 | |||
1273 | /* Cache the channel's MISC. control registers' offset */ | ||
1274 | hwif->select_data = hwif->channel ? 0x54 : 0x50; | ||
1275 | |||
1232 | hwif->tuneproc = &hpt3xx_tune_drive; | 1276 | hwif->tuneproc = &hpt3xx_tune_drive; |
1233 | hwif->speedproc = &hpt3xx_tune_chipset; | 1277 | hwif->speedproc = &hpt3xx_tune_chipset; |
1234 | hwif->quirkproc = &hpt3xx_quirkproc; | 1278 | hwif->quirkproc = &hpt3xx_quirkproc; |
1235 | hwif->intrproc = &hpt3xx_intrproc; | 1279 | hwif->intrproc = &hpt3xx_intrproc; |
1236 | hwif->maskproc = &hpt3xx_maskproc; | 1280 | hwif->maskproc = &hpt3xx_maskproc; |
1237 | 1281 | hwif->busproc = &hpt3xx_busproc; | |
1282 | |||
1238 | /* | 1283 | /* |
1239 | * HPT3xxN chips have some complications: | 1284 | * HPT3xxN chips have some complications: |
1240 | * | 1285 | * |
1241 | * - on 33 MHz PCI we must clock switch | 1286 | * - on 33 MHz PCI we must clock switch |
1242 | * - on 66 MHz PCI we must NOT use the PCI clock | 1287 | * - on 66 MHz PCI we must NOT use the PCI clock |
1243 | */ | 1288 | */ |
1244 | if ((info->flags & (IS_3xxN | PCI_66MHZ)) == IS_3xxN) { | 1289 | if (chip_type >= HPT372N && info->dpll_clk && info->pci_clk < 66) { |
1245 | /* | 1290 | /* |
1246 | * Clock is shared between the channels, | 1291 | * Clock is shared between the channels, |
1247 | * so we'll have to serialize them... :-( | 1292 | * so we'll have to serialize them... :-( |
@@ -1250,200 +1295,171 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) | |||
1250 | hwif->rw_disk = &hpt3xxn_rw_disk; | 1295 | hwif->rw_disk = &hpt3xxn_rw_disk; |
1251 | } | 1296 | } |
1252 | 1297 | ||
1298 | /* Serialize access to this device if needed */ | ||
1299 | if (serialize && hwif->mate) | ||
1300 | hwif->serialized = hwif->mate->serialized = 1; | ||
1301 | |||
1302 | /* | ||
1303 | * Disable the "fast interrupt" prediction. Don't hold off | ||
1304 | * on interrupts. (== 0x01 despite what the docs say) | ||
1305 | */ | ||
1306 | pci_read_config_byte(dev, hwif->select_data + 1, &old_mcr); | ||
1307 | |||
1308 | if (info->chip_type >= HPT374) | ||
1309 | new_mcr = old_mcr & ~0x07; | ||
1310 | else if (info->chip_type >= HPT370) { | ||
1311 | new_mcr = old_mcr; | ||
1312 | new_mcr &= ~0x02; | ||
1313 | |||
1314 | #ifdef HPT_DELAY_INTERRUPT | ||
1315 | new_mcr &= ~0x01; | ||
1316 | #else | ||
1317 | new_mcr |= 0x01; | ||
1318 | #endif | ||
1319 | } else /* HPT366 and HPT368 */ | ||
1320 | new_mcr = old_mcr & ~0x80; | ||
1321 | |||
1322 | if (new_mcr != old_mcr) | ||
1323 | pci_write_config_byte(dev, hwif->select_data + 1, new_mcr); | ||
1324 | |||
1325 | if (!hwif->dma_base) { | ||
1326 | hwif->drives[0].autotune = hwif->drives[1].autotune = 1; | ||
1327 | return; | ||
1328 | } | ||
1329 | |||
1330 | hwif->ultra_mask = 0x7f; | ||
1331 | hwif->mwdma_mask = 0x07; | ||
1332 | |||
1253 | /* | 1333 | /* |
1254 | * The HPT37x uses the CBLID pins as outputs for MA15/MA16 | 1334 | * The HPT37x uses the CBLID pins as outputs for MA15/MA16 |
1255 | * address lines to access an external eeprom. To read valid | 1335 | * address lines to access an external EEPROM. To read valid |
1256 | * cable detect state the pins must be enabled as inputs. | 1336 | * cable detect state the pins must be enabled as inputs. |
1257 | */ | 1337 | */ |
1258 | if (info->revision >= 8 && (PCI_FUNC(dev->devfn) & 1)) { | 1338 | if (chip_type == HPT374 && (PCI_FUNC(dev->devfn) & 1)) { |
1259 | /* | 1339 | /* |
1260 | * HPT374 PCI function 1 | 1340 | * HPT374 PCI function 1 |
1261 | * - set bit 15 of reg 0x52 to enable TCBLID as input | 1341 | * - set bit 15 of reg 0x52 to enable TCBLID as input |
1262 | * - set bit 15 of reg 0x56 to enable FCBLID as input | 1342 | * - set bit 15 of reg 0x56 to enable FCBLID as input |
1263 | */ | 1343 | */ |
1264 | u16 mcr3, mcr6; | 1344 | u8 mcr_addr = hwif->select_data + 2; |
1265 | pci_read_config_word(dev, 0x52, &mcr3); | 1345 | u16 mcr; |
1266 | pci_read_config_word(dev, 0x56, &mcr6); | 1346 | |
1267 | pci_write_config_word(dev, 0x52, mcr3 | 0x8000); | 1347 | pci_read_config_word (dev, mcr_addr, &mcr); |
1268 | pci_write_config_word(dev, 0x56, mcr6 | 0x8000); | 1348 | pci_write_config_word(dev, mcr_addr, (mcr | 0x8000)); |
1269 | /* now read cable id register */ | 1349 | /* now read cable id register */ |
1270 | pci_read_config_byte(dev, 0x5a, &ata66); | 1350 | pci_read_config_byte (dev, 0x5a, &scr1); |
1271 | pci_write_config_word(dev, 0x52, mcr3); | 1351 | pci_write_config_word(dev, mcr_addr, mcr); |
1272 | pci_write_config_word(dev, 0x56, mcr6); | 1352 | } else if (chip_type >= HPT370) { |
1273 | } else if (info->revision >= 3) { | ||
1274 | /* | 1353 | /* |
1275 | * HPT370/372 and 374 pcifn 0 | 1354 | * HPT370/372 and 374 pcifn 0 |
1276 | * - clear bit 0 of 0x5b to enable P/SCBLID as inputs | 1355 | * - clear bit 0 of reg 0x5b to enable P/SCBLID as inputs |
1277 | */ | 1356 | */ |
1278 | u8 scr2; | 1357 | u8 scr2 = 0; |
1279 | pci_read_config_byte(dev, 0x5b, &scr2); | ||
1280 | pci_write_config_byte(dev, 0x5b, scr2 & ~1); | ||
1281 | /* now read cable id register */ | ||
1282 | pci_read_config_byte(dev, 0x5a, &ata66); | ||
1283 | pci_write_config_byte(dev, 0x5b, scr2); | ||
1284 | } else { | ||
1285 | pci_read_config_byte(dev, 0x5a, &ata66); | ||
1286 | } | ||
1287 | 1358 | ||
1288 | #ifdef DEBUG | 1359 | pci_read_config_byte (dev, 0x5b, &scr2); |
1289 | printk("HPT366: reg5ah=0x%02x ATA-%s Cable Port%d\n", | 1360 | pci_write_config_byte(dev, 0x5b, (scr2 & ~1)); |
1290 | ata66, (ata66 & regmask) ? "33" : "66", | 1361 | /* now read cable id register */ |
1291 | PCI_FUNC(hwif->pci_dev->devfn)); | 1362 | pci_read_config_byte (dev, 0x5a, &scr1); |
1292 | #endif /* DEBUG */ | 1363 | pci_write_config_byte(dev, 0x5b, scr2); |
1293 | 1364 | } else | |
1294 | /* Serialize access to this device */ | 1365 | pci_read_config_byte (dev, 0x5a, &scr1); |
1295 | if (serialize && hwif->mate) | ||
1296 | hwif->serialized = hwif->mate->serialized = 1; | ||
1297 | 1366 | ||
1298 | /* | 1367 | if (!hwif->udma_four) |
1299 | * Set up ioctl for power status. | 1368 | hwif->udma_four = (scr1 & ata66) ? 0 : 1; |
1300 | * NOTE: power affects both drives on each channel. | ||
1301 | */ | ||
1302 | hwif->busproc = &hpt3xx_busproc; | ||
1303 | 1369 | ||
1304 | if (!hwif->dma_base) { | 1370 | hwif->ide_dma_check = &hpt366_config_drive_xfer_rate; |
1305 | hwif->drives[0].autotune = 1; | ||
1306 | hwif->drives[1].autotune = 1; | ||
1307 | return; | ||
1308 | } | ||
1309 | 1371 | ||
1310 | hwif->ultra_mask = 0x7f; | 1372 | if (chip_type >= HPT374) { |
1311 | hwif->mwdma_mask = 0x07; | 1373 | hwif->ide_dma_test_irq = &hpt374_ide_dma_test_irq; |
1312 | 1374 | hwif->ide_dma_end = &hpt374_ide_dma_end; | |
1313 | if (!(hwif->udma_four)) | 1375 | } else if (chip_type >= HPT370) { |
1314 | hwif->udma_four = ((ata66 & regmask) ? 0 : 1); | 1376 | hwif->dma_start = &hpt370_ide_dma_start; |
1315 | hwif->ide_dma_check = &hpt366_config_drive_xfer_rate; | 1377 | hwif->ide_dma_end = &hpt370_ide_dma_end; |
1316 | 1378 | hwif->ide_dma_timeout = &hpt370_ide_dma_timeout; | |
1317 | if (info->revision >= 8) { | 1379 | } else |
1318 | hwif->ide_dma_test_irq = &hpt374_ide_dma_test_irq; | 1380 | hwif->ide_dma_lostirq = &hpt366_ide_dma_lostirq; |
1319 | hwif->ide_dma_end = &hpt374_ide_dma_end; | ||
1320 | } else if (info->revision >= 5) { | ||
1321 | hwif->ide_dma_test_irq = &hpt374_ide_dma_test_irq; | ||
1322 | hwif->ide_dma_end = &hpt374_ide_dma_end; | ||
1323 | } else if (info->revision >= 3) { | ||
1324 | hwif->dma_start = &hpt370_ide_dma_start; | ||
1325 | hwif->ide_dma_end = &hpt370_ide_dma_end; | ||
1326 | hwif->ide_dma_timeout = &hpt370_ide_dma_timeout; | ||
1327 | hwif->ide_dma_lostirq = &hpt370_ide_dma_lostirq; | ||
1328 | } else if (info->revision >= 2) | ||
1329 | hwif->ide_dma_lostirq = &hpt366_ide_dma_lostirq; | ||
1330 | else | ||
1331 | hwif->ide_dma_lostirq = &hpt366_ide_dma_lostirq; | ||
1332 | 1381 | ||
1333 | if (!noautodma) | 1382 | if (!noautodma) |
1334 | hwif->autodma = 1; | 1383 | hwif->autodma = 1; |
1335 | hwif->drives[0].autodma = hwif->autodma; | 1384 | hwif->drives[0].autodma = hwif->drives[1].autodma = hwif->autodma; |
1336 | hwif->drives[1].autodma = hwif->autodma; | ||
1337 | } | 1385 | } |
1338 | 1386 | ||
1339 | static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase) | 1387 | static void __devinit init_dma_hpt366(ide_hwif_t *hwif, unsigned long dmabase) |
1340 | { | 1388 | { |
1341 | struct hpt_info *info = ide_get_hwifdata(hwif); | 1389 | struct pci_dev *dev = hwif->pci_dev; |
1342 | u8 masterdma = 0, slavedma = 0; | 1390 | u8 masterdma = 0, slavedma = 0; |
1343 | u8 dma_new = 0, dma_old = 0; | 1391 | u8 dma_new = 0, dma_old = 0; |
1344 | u8 primary = hwif->channel ? 0x4b : 0x43; | ||
1345 | u8 secondary = hwif->channel ? 0x4f : 0x47; | ||
1346 | unsigned long flags; | 1392 | unsigned long flags; |
1347 | 1393 | ||
1348 | if (!dmabase) | 1394 | if (!dmabase) |
1349 | return; | 1395 | return; |
1350 | 1396 | ||
1351 | if(info->speed == NULL) { | 1397 | dma_old = hwif->INB(dmabase + 2); |
1352 | printk(KERN_WARNING "hpt366: no known IDE timings, disabling DMA.\n"); | ||
1353 | return; | ||
1354 | } | ||
1355 | |||
1356 | dma_old = hwif->INB(dmabase+2); | ||
1357 | 1398 | ||
1358 | local_irq_save(flags); | 1399 | local_irq_save(flags); |
1359 | 1400 | ||
1360 | dma_new = dma_old; | 1401 | dma_new = dma_old; |
1361 | pci_read_config_byte(hwif->pci_dev, primary, &masterdma); | 1402 | pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma); |
1362 | pci_read_config_byte(hwif->pci_dev, secondary, &slavedma); | 1403 | pci_read_config_byte(dev, hwif->channel ? 0x4f : 0x47, &slavedma); |
1363 | 1404 | ||
1364 | if (masterdma & 0x30) dma_new |= 0x20; | 1405 | if (masterdma & 0x30) dma_new |= 0x20; |
1365 | if (slavedma & 0x30) dma_new |= 0x40; | 1406 | if ( slavedma & 0x30) dma_new |= 0x40; |
1366 | if (dma_new != dma_old) | 1407 | if (dma_new != dma_old) |
1367 | hwif->OUTB(dma_new, dmabase+2); | 1408 | hwif->OUTB(dma_new, dmabase + 2); |
1368 | 1409 | ||
1369 | local_irq_restore(flags); | 1410 | local_irq_restore(flags); |
1370 | 1411 | ||
1371 | ide_setup_dma(hwif, dmabase, 8); | 1412 | ide_setup_dma(hwif, dmabase, 8); |
1372 | } | 1413 | } |
1373 | 1414 | ||
1374 | /* | ||
1375 | * We "borrow" this hook in order to set the data structures | ||
1376 | * up early enough before dma or init_hwif calls are made. | ||
1377 | */ | ||
1378 | |||
1379 | static void __devinit init_iops_hpt366(ide_hwif_t *hwif) | ||
1380 | { | ||
1381 | struct hpt_info *info = kzalloc(sizeof(struct hpt_info), GFP_KERNEL); | ||
1382 | struct pci_dev *dev = hwif->pci_dev; | ||
1383 | u16 did = dev->device; | ||
1384 | u8 rid = 0; | ||
1385 | |||
1386 | if(info == NULL) { | ||
1387 | printk(KERN_WARNING "hpt366: out of memory.\n"); | ||
1388 | return; | ||
1389 | } | ||
1390 | ide_set_hwifdata(hwif, info); | ||
1391 | |||
1392 | /* Avoid doing the same thing twice. */ | ||
1393 | if (hwif->channel && hwif->mate) { | ||
1394 | memcpy(info, ide_get_hwifdata(hwif->mate), sizeof(struct hpt_info)); | ||
1395 | return; | ||
1396 | } | ||
1397 | |||
1398 | pci_read_config_byte(dev, PCI_CLASS_REVISION, &rid); | ||
1399 | |||
1400 | if (( did == PCI_DEVICE_ID_TTI_HPT366 && rid == 6) || | ||
1401 | ((did == PCI_DEVICE_ID_TTI_HPT372 || | ||
1402 | did == PCI_DEVICE_ID_TTI_HPT302 || | ||
1403 | did == PCI_DEVICE_ID_TTI_HPT371) && rid > 1) || | ||
1404 | did == PCI_DEVICE_ID_TTI_HPT372N) | ||
1405 | info->flags |= IS_3xxN; | ||
1406 | |||
1407 | info->revision = hpt_revision(dev); | ||
1408 | |||
1409 | if (info->revision >= 3) | ||
1410 | hpt37x_clocking(hwif); | ||
1411 | else | ||
1412 | hpt366_clocking(hwif); | ||
1413 | } | ||
1414 | |||
1415 | static int __devinit init_setup_hpt374(struct pci_dev *dev, ide_pci_device_t *d) | 1415 | static int __devinit init_setup_hpt374(struct pci_dev *dev, ide_pci_device_t *d) |
1416 | { | 1416 | { |
1417 | struct pci_dev *findev = NULL; | 1417 | struct pci_dev *dev2; |
1418 | 1418 | ||
1419 | if (PCI_FUNC(dev->devfn) & 1) | 1419 | if (PCI_FUNC(dev->devfn) & 1) |
1420 | return -ENODEV; | 1420 | return -ENODEV; |
1421 | 1421 | ||
1422 | while ((findev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) { | 1422 | pci_set_drvdata(dev, &hpt374); |
1423 | if ((findev->vendor == dev->vendor) && | 1423 | |
1424 | (findev->device == dev->device) && | 1424 | if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) { |
1425 | ((findev->devfn - dev->devfn) == 1) && | 1425 | int ret; |
1426 | (PCI_FUNC(findev->devfn) & 1)) { | 1426 | |
1427 | if (findev->irq != dev->irq) { | 1427 | pci_set_drvdata(dev2, &hpt374); |
1428 | /* FIXME: we need a core pci_set_interrupt() */ | 1428 | |
1429 | findev->irq = dev->irq; | 1429 | if (dev2->irq != dev->irq) { |
1430 | printk(KERN_WARNING "%s: pci-config space interrupt " | 1430 | /* FIXME: we need a core pci_set_interrupt() */ |
1431 | "fixed.\n", d->name); | 1431 | dev2->irq = dev->irq; |
1432 | } | 1432 | printk(KERN_WARNING "%s: PCI config space interrupt " |
1433 | return ide_setup_pci_devices(dev, findev, d); | 1433 | "fixed.\n", d->name); |
1434 | } | 1434 | } |
1435 | ret = ide_setup_pci_devices(dev, dev2, d); | ||
1436 | if (ret < 0) | ||
1437 | pci_dev_put(dev2); | ||
1438 | return ret; | ||
1435 | } | 1439 | } |
1436 | return ide_setup_pci_device(dev, d); | 1440 | return ide_setup_pci_device(dev, d); |
1437 | } | 1441 | } |
1438 | 1442 | ||
1439 | static int __devinit init_setup_hpt37x(struct pci_dev *dev, ide_pci_device_t *d) | 1443 | static int __devinit init_setup_hpt372n(struct pci_dev *dev, ide_pci_device_t *d) |
1440 | { | 1444 | { |
1445 | pci_set_drvdata(dev, &hpt372n); | ||
1446 | |||
1441 | return ide_setup_pci_device(dev, d); | 1447 | return ide_setup_pci_device(dev, d); |
1442 | } | 1448 | } |
1443 | 1449 | ||
1444 | static int __devinit init_setup_hpt371(struct pci_dev *dev, ide_pci_device_t *d) | 1450 | static int __devinit init_setup_hpt371(struct pci_dev *dev, ide_pci_device_t *d) |
1445 | { | 1451 | { |
1446 | u8 mcr1 = 0; | 1452 | struct hpt_info *info; |
1453 | u8 rev = 0, mcr1 = 0; | ||
1454 | |||
1455 | pci_read_config_byte(dev, PCI_REVISION_ID, &rev); | ||
1456 | |||
1457 | if (rev > 1) { | ||
1458 | d->name = "HPT371N"; | ||
1459 | |||
1460 | info = &hpt371n; | ||
1461 | } else | ||
1462 | info = &hpt371; | ||
1447 | 1463 | ||
1448 | /* | 1464 | /* |
1449 | * HPT371 chips physically have only one channel, the secondary one, | 1465 | * HPT371 chips physically have only one channel, the secondary one, |
@@ -1453,59 +1469,94 @@ static int __devinit init_setup_hpt371(struct pci_dev *dev, ide_pci_device_t *d) | |||
1453 | */ | 1469 | */ |
1454 | pci_read_config_byte(dev, 0x50, &mcr1); | 1470 | pci_read_config_byte(dev, 0x50, &mcr1); |
1455 | if (mcr1 & 0x04) | 1471 | if (mcr1 & 0x04) |
1456 | pci_write_config_byte(dev, 0x50, (mcr1 & ~0x04)); | 1472 | pci_write_config_byte(dev, 0x50, mcr1 & ~0x04); |
1473 | |||
1474 | pci_set_drvdata(dev, info); | ||
1475 | |||
1476 | return ide_setup_pci_device(dev, d); | ||
1477 | } | ||
1478 | |||
1479 | static int __devinit init_setup_hpt372a(struct pci_dev *dev, ide_pci_device_t *d) | ||
1480 | { | ||
1481 | struct hpt_info *info; | ||
1482 | u8 rev = 0; | ||
1483 | |||
1484 | pci_read_config_byte(dev, PCI_REVISION_ID, &rev); | ||
1485 | |||
1486 | if (rev > 1) { | ||
1487 | d->name = "HPT372N"; | ||
1488 | |||
1489 | info = &hpt372n; | ||
1490 | } else | ||
1491 | info = &hpt372a; | ||
1492 | pci_set_drvdata(dev, info); | ||
1493 | |||
1494 | return ide_setup_pci_device(dev, d); | ||
1495 | } | ||
1496 | |||
1497 | static int __devinit init_setup_hpt302(struct pci_dev *dev, ide_pci_device_t *d) | ||
1498 | { | ||
1499 | struct hpt_info *info; | ||
1500 | u8 rev = 0; | ||
1501 | |||
1502 | pci_read_config_byte(dev, PCI_REVISION_ID, &rev); | ||
1503 | |||
1504 | if (rev > 1) { | ||
1505 | d->name = "HPT302N"; | ||
1506 | |||
1507 | info = &hpt302n; | ||
1508 | } else | ||
1509 | info = &hpt302; | ||
1510 | pci_set_drvdata(dev, info); | ||
1457 | 1511 | ||
1458 | return ide_setup_pci_device(dev, d); | 1512 | return ide_setup_pci_device(dev, d); |
1459 | } | 1513 | } |
1460 | 1514 | ||
1461 | static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d) | 1515 | static int __devinit init_setup_hpt366(struct pci_dev *dev, ide_pci_device_t *d) |
1462 | { | 1516 | { |
1463 | struct pci_dev *findev = NULL; | 1517 | struct pci_dev *dev2; |
1464 | u8 pin1 = 0, pin2 = 0; | 1518 | u8 rev = 0; |
1465 | unsigned int class_rev; | 1519 | static char *chipset_names[] = { "HPT366", "HPT366", "HPT368", |
1466 | char *chipset_names[] = {"HPT366", "HPT366", "HPT368", | 1520 | "HPT370", "HPT370A", "HPT372", |
1467 | "HPT370", "HPT370A", "HPT372", | 1521 | "HPT372N" }; |
1468 | "HPT372N" }; | 1522 | static struct hpt_info *info[] = { &hpt36x, &hpt36x, &hpt36x, |
1523 | &hpt370, &hpt370a, &hpt372, | ||
1524 | &hpt372n }; | ||
1469 | 1525 | ||
1470 | if (PCI_FUNC(dev->devfn) & 1) | 1526 | if (PCI_FUNC(dev->devfn) & 1) |
1471 | return -ENODEV; | 1527 | return -ENODEV; |
1472 | 1528 | ||
1473 | pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev); | 1529 | pci_read_config_byte(dev, PCI_REVISION_ID, &rev); |
1474 | class_rev &= 0xff; | ||
1475 | 1530 | ||
1476 | if(dev->device == PCI_DEVICE_ID_TTI_HPT372N) | 1531 | if (rev > 6) |
1477 | class_rev = 6; | 1532 | rev = 6; |
1478 | 1533 | ||
1479 | if(class_rev <= 6) | 1534 | d->name = chipset_names[rev]; |
1480 | d->name = chipset_names[class_rev]; | 1535 | |
1481 | 1536 | pci_set_drvdata(dev, info[rev]); | |
1482 | switch(class_rev) { | 1537 | |
1483 | case 6: | 1538 | if (rev > 2) |
1484 | case 5: | 1539 | goto init_single; |
1485 | case 4: | ||
1486 | case 3: | ||
1487 | goto init_single; | ||
1488 | default: | ||
1489 | break; | ||
1490 | } | ||
1491 | 1540 | ||
1492 | d->channels = 1; | 1541 | d->channels = 1; |
1493 | 1542 | ||
1494 | pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1); | 1543 | if ((dev2 = pci_get_slot(dev->bus, dev->devfn + 1)) != NULL) { |
1495 | while ((findev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, findev)) != NULL) { | 1544 | u8 pin1 = 0, pin2 = 0; |
1496 | if ((findev->vendor == dev->vendor) && | 1545 | int ret; |
1497 | (findev->device == dev->device) && | 1546 | |
1498 | ((findev->devfn - dev->devfn) == 1) && | 1547 | pci_set_drvdata(dev2, info[rev]); |
1499 | (PCI_FUNC(findev->devfn) & 1)) { | 1548 | |
1500 | pci_read_config_byte(findev, PCI_INTERRUPT_PIN, &pin2); | 1549 | pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin1); |
1501 | if ((pin1 != pin2) && (dev->irq == findev->irq)) { | 1550 | pci_read_config_byte(dev2, PCI_INTERRUPT_PIN, &pin2); |
1502 | d->bootable = ON_BOARD; | 1551 | if (pin1 != pin2 && dev->irq == dev2->irq) { |
1503 | printk("%s: onboard version of chipset, " | 1552 | d->bootable = ON_BOARD; |
1504 | "pin1=%d pin2=%d\n", d->name, | 1553 | printk("%s: onboard version of chipset, pin1=%d pin2=%d\n", |
1505 | pin1, pin2); | 1554 | d->name, pin1, pin2); |
1506 | } | ||
1507 | return ide_setup_pci_devices(dev, findev, d); | ||
1508 | } | 1555 | } |
1556 | ret = ide_setup_pci_devices(dev, dev2, d); | ||
1557 | if (ret < 0) | ||
1558 | pci_dev_put(dev2); | ||
1559 | return ret; | ||
1509 | } | 1560 | } |
1510 | init_single: | 1561 | init_single: |
1511 | return ide_setup_pci_device(dev, d); | 1562 | return ide_setup_pci_device(dev, d); |
@@ -1516,64 +1567,68 @@ static ide_pci_device_t hpt366_chipsets[] __devinitdata = { | |||
1516 | .name = "HPT366", | 1567 | .name = "HPT366", |
1517 | .init_setup = init_setup_hpt366, | 1568 | .init_setup = init_setup_hpt366, |
1518 | .init_chipset = init_chipset_hpt366, | 1569 | .init_chipset = init_chipset_hpt366, |
1519 | .init_iops = init_iops_hpt366, | ||
1520 | .init_hwif = init_hwif_hpt366, | 1570 | .init_hwif = init_hwif_hpt366, |
1521 | .init_dma = init_dma_hpt366, | 1571 | .init_dma = init_dma_hpt366, |
1522 | .channels = 2, | 1572 | .channels = 2, |
1523 | .autodma = AUTODMA, | 1573 | .autodma = AUTODMA, |
1574 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | ||
1524 | .bootable = OFF_BOARD, | 1575 | .bootable = OFF_BOARD, |
1525 | .extra = 240 | 1576 | .extra = 240 |
1526 | },{ /* 1 */ | 1577 | },{ /* 1 */ |
1527 | .name = "HPT372A", | 1578 | .name = "HPT372A", |
1528 | .init_setup = init_setup_hpt37x, | 1579 | .init_setup = init_setup_hpt372a, |
1529 | .init_chipset = init_chipset_hpt366, | 1580 | .init_chipset = init_chipset_hpt366, |
1530 | .init_iops = init_iops_hpt366, | ||
1531 | .init_hwif = init_hwif_hpt366, | 1581 | .init_hwif = init_hwif_hpt366, |
1532 | .init_dma = init_dma_hpt366, | 1582 | .init_dma = init_dma_hpt366, |
1533 | .channels = 2, | 1583 | .channels = 2, |
1534 | .autodma = AUTODMA, | 1584 | .autodma = AUTODMA, |
1585 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | ||
1535 | .bootable = OFF_BOARD, | 1586 | .bootable = OFF_BOARD, |
1587 | .extra = 240 | ||
1536 | },{ /* 2 */ | 1588 | },{ /* 2 */ |
1537 | .name = "HPT302", | 1589 | .name = "HPT302", |
1538 | .init_setup = init_setup_hpt37x, | 1590 | .init_setup = init_setup_hpt302, |
1539 | .init_chipset = init_chipset_hpt366, | 1591 | .init_chipset = init_chipset_hpt366, |
1540 | .init_iops = init_iops_hpt366, | ||
1541 | .init_hwif = init_hwif_hpt366, | 1592 | .init_hwif = init_hwif_hpt366, |
1542 | .init_dma = init_dma_hpt366, | 1593 | .init_dma = init_dma_hpt366, |
1543 | .channels = 2, | 1594 | .channels = 2, |
1544 | .autodma = AUTODMA, | 1595 | .autodma = AUTODMA, |
1596 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | ||
1545 | .bootable = OFF_BOARD, | 1597 | .bootable = OFF_BOARD, |
1598 | .extra = 240 | ||
1546 | },{ /* 3 */ | 1599 | },{ /* 3 */ |
1547 | .name = "HPT371", | 1600 | .name = "HPT371", |
1548 | .init_setup = init_setup_hpt371, | 1601 | .init_setup = init_setup_hpt371, |
1549 | .init_chipset = init_chipset_hpt366, | 1602 | .init_chipset = init_chipset_hpt366, |
1550 | .init_iops = init_iops_hpt366, | ||
1551 | .init_hwif = init_hwif_hpt366, | 1603 | .init_hwif = init_hwif_hpt366, |
1552 | .init_dma = init_dma_hpt366, | 1604 | .init_dma = init_dma_hpt366, |
1553 | .channels = 2, | 1605 | .channels = 2, |
1554 | .autodma = AUTODMA, | 1606 | .autodma = AUTODMA, |
1555 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | 1607 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, |
1556 | .bootable = OFF_BOARD, | 1608 | .bootable = OFF_BOARD, |
1609 | .extra = 240 | ||
1557 | },{ /* 4 */ | 1610 | },{ /* 4 */ |
1558 | .name = "HPT374", | 1611 | .name = "HPT374", |
1559 | .init_setup = init_setup_hpt374, | 1612 | .init_setup = init_setup_hpt374, |
1560 | .init_chipset = init_chipset_hpt366, | 1613 | .init_chipset = init_chipset_hpt366, |
1561 | .init_iops = init_iops_hpt366, | ||
1562 | .init_hwif = init_hwif_hpt366, | 1614 | .init_hwif = init_hwif_hpt366, |
1563 | .init_dma = init_dma_hpt366, | 1615 | .init_dma = init_dma_hpt366, |
1564 | .channels = 2, /* 4 */ | 1616 | .channels = 2, /* 4 */ |
1565 | .autodma = AUTODMA, | 1617 | .autodma = AUTODMA, |
1618 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | ||
1566 | .bootable = OFF_BOARD, | 1619 | .bootable = OFF_BOARD, |
1620 | .extra = 240 | ||
1567 | },{ /* 5 */ | 1621 | },{ /* 5 */ |
1568 | .name = "HPT372N", | 1622 | .name = "HPT372N", |
1569 | .init_setup = init_setup_hpt37x, | 1623 | .init_setup = init_setup_hpt372n, |
1570 | .init_chipset = init_chipset_hpt366, | 1624 | .init_chipset = init_chipset_hpt366, |
1571 | .init_iops = init_iops_hpt366, | ||
1572 | .init_hwif = init_hwif_hpt366, | 1625 | .init_hwif = init_hwif_hpt366, |
1573 | .init_dma = init_dma_hpt366, | 1626 | .init_dma = init_dma_hpt366, |
1574 | .channels = 2, /* 4 */ | 1627 | .channels = 2, /* 4 */ |
1575 | .autodma = AUTODMA, | 1628 | .autodma = AUTODMA, |
1629 | .enablebits = {{0x50,0x04,0x04}, {0x54,0x04,0x04}}, | ||
1576 | .bootable = OFF_BOARD, | 1630 | .bootable = OFF_BOARD, |
1631 | .extra = 240 | ||
1577 | } | 1632 | } |
1578 | }; | 1633 | }; |
1579 | 1634 | ||