Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit bf6263a853c9c143bf03f0a6fdcc68ab714fb5f5

Authored by Jeff Garzik
1 parent cd70c26617
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[libata] Use ATA_UDMAx standard masks when filling driver's udma_mask info 

The ATA_UDMAx masks are self-documenting, and far better than manually
writing in the hex mask.

Note that pata_it8213 mask differed from the comment.  Added a FIXME there.

Signed-off-by: Jeff Garzik <jeff@garzik.org>

Showing 27 changed files with 65 additions and 65 deletions Side-by-side Diff

drivers/ata/ata_generic.c
Diff comments   View file @ bf6263a
... ... @@ -146,7 +146,7 @@
146 146 .flags = ATA_FLAG_SLAVE_POSS,
147 147 .pio_mask = 0x1f,
148 148 .mwdma_mask = 0x07,
149   - .udma_mask = 0x3f,
  149 + .udma_mask = ATA_UDMA5,
150 150 .port_ops = &generic_port_ops
151 151 };
152 152 const struct ata_port_info *ppi[] = { &info, NULL };
drivers/ata/ata_piix.c
Diff comments   View file @ bf6263a
... ... @@ -497,7 +497,7 @@
497 497 .flags = PIIX_SATA_FLAGS,
498 498 .pio_mask = 0x1f, /* pio0-4 */
499 499 .mwdma_mask = 0x07, /* mwdma0-2 */
500   - .udma_mask = 0x7f, /* udma0-6 */
  500 + .udma_mask = ATA_UDMA6,
501 501 .port_ops = &piix_sata_ops,
502 502 },
503 503  
... ... @@ -507,7 +507,7 @@
507 507 .flags = PIIX_SATA_FLAGS | PIIX_FLAG_SCR,
508 508 .pio_mask = 0x1f, /* pio0-4 */
509 509 .mwdma_mask = 0x07, /* mwdma0-2 */
510   - .udma_mask = 0x7f, /* udma0-6 */
  510 + .udma_mask = ATA_UDMA6,
511 511 .port_ops = &piix_sata_ops,
512 512 },
513 513  
... ... @@ -518,7 +518,7 @@
518 518 PIIX_FLAG_AHCI,
519 519 .pio_mask = 0x1f, /* pio0-4 */
520 520 .mwdma_mask = 0x07, /* mwdma0-2 */
521   - .udma_mask = 0x7f, /* udma0-6 */
  521 + .udma_mask = ATA_UDMA6,
522 522 .port_ops = &piix_sata_ops,
523 523 },
524 524  
... ... @@ -529,7 +529,7 @@
529 529 PIIX_FLAG_AHCI,
530 530 .pio_mask = 0x1f, /* pio0-4 */
531 531 .mwdma_mask = 0x07, /* mwdma0-2 */
532   - .udma_mask = 0x7f, /* udma0-6 */
  532 + .udma_mask = ATA_UDMA6,
533 533 .port_ops = &piix_sata_ops,
534 534 },
535 535  
... ... @@ -540,7 +540,7 @@
540 540 PIIX_FLAG_AHCI,
541 541 .pio_mask = 0x1f, /* pio0-4 */
542 542 .mwdma_mask = 0x07, /* mwdma0-2 */
543   - .udma_mask = 0x7f, /* udma0-6 */
  543 + .udma_mask = ATA_UDMA6,
544 544 .port_ops = &piix_sata_ops,
545 545 },
546 546  
drivers/ata/pata_ali.c
Diff comments   View file @ bf6263a
... ... @@ -547,7 +547,7 @@
547 547 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
548 548 .pio_mask = 0x1f,
549 549 .mwdma_mask = 0x07,
550   - .udma_mask = 0x1f,
  550 + .udma_mask = ATA_UDMA4,
551 551 .port_ops = &ali_c2_port_ops
552 552 };
553 553 /* Revision 0xC3 is UDMA66 for now */
... ... @@ -556,7 +556,7 @@
556 556 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
557 557 .pio_mask = 0x1f,
558 558 .mwdma_mask = 0x07,
559   - .udma_mask = 0x1f,
  559 + .udma_mask = ATA_UDMA4,
560 560 .port_ops = &ali_c2_port_ops
561 561 };
562 562 /* Revision 0xC4 is UDMA100 */
... ... @@ -565,7 +565,7 @@
565 565 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_PIO_LBA48,
566 566 .pio_mask = 0x1f,
567 567 .mwdma_mask = 0x07,
568   - .udma_mask = 0x3f,
  568 + .udma_mask = ATA_UDMA5,
569 569 .port_ops = &ali_c2_port_ops
570 570 };
571 571 /* Revision 0xC5 is UDMA133 with LBA48 DMA */
... ... @@ -574,7 +574,7 @@
574 574 .flags = ATA_FLAG_SLAVE_POSS,
575 575 .pio_mask = 0x1f,
576 576 .mwdma_mask = 0x07,
577   - .udma_mask = 0x7f,
  577 + .udma_mask = ATA_UDMA6,
578 578 .port_ops = &ali_c5_port_ops
579 579 };
580 580  
drivers/ata/pata_amd.c
Diff comments   View file @ bf6263a
... ... @@ -552,7 +552,7 @@
552 552 .flags = ATA_FLAG_SLAVE_POSS,
553 553 .pio_mask = 0x1f,
554 554 .mwdma_mask = 0x07,
555   - .udma_mask = 0x1f, /* UDMA 66 */
  555 + .udma_mask = ATA_UDMA4, /* UDMA 66 */
556 556 .port_ops = &amd66_port_ops
557 557 },
558 558 { /* 2: AMD 7409, no swdma errata */
... ... @@ -560,7 +560,7 @@
560 560 .flags = ATA_FLAG_SLAVE_POSS,
561 561 .pio_mask = 0x1f,
562 562 .mwdma_mask = 0x07,
563   - .udma_mask = 0x1f, /* UDMA 66 */
  563 + .udma_mask = ATA_UDMA4, /* UDMA 66 */
564 564 .port_ops = &amd66_port_ops
565 565 },
566 566 { /* 3: AMD 7411 */
... ... @@ -568,7 +568,7 @@
568 568 .flags = ATA_FLAG_SLAVE_POSS,
569 569 .pio_mask = 0x1f,
570 570 .mwdma_mask = 0x07,
571   - .udma_mask = 0x3f, /* UDMA 100 */
  571 + .udma_mask = ATA_UDMA5, /* UDMA 100 */
572 572 .port_ops = &amd100_port_ops
573 573 },
574 574 { /* 4: AMD 7441 */
... ... @@ -576,7 +576,7 @@
576 576 .flags = ATA_FLAG_SLAVE_POSS,
577 577 .pio_mask = 0x1f,
578 578 .mwdma_mask = 0x07,
579   - .udma_mask = 0x3f, /* UDMA 100 */
  579 + .udma_mask = ATA_UDMA5, /* UDMA 100 */
580 580 .port_ops = &amd100_port_ops
581 581 },
582 582 { /* 5: AMD 8111*/
... ... @@ -584,7 +584,7 @@
584 584 .flags = ATA_FLAG_SLAVE_POSS,
585 585 .pio_mask = 0x1f,
586 586 .mwdma_mask = 0x07,
587   - .udma_mask = 0x7f, /* UDMA 133, no swdma */
  587 + .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */
588 588 .port_ops = &amd133_port_ops
589 589 },
590 590 { /* 6: AMD 8111 UDMA 100 (Serenade) */
... ... @@ -592,7 +592,7 @@
592 592 .flags = ATA_FLAG_SLAVE_POSS,
593 593 .pio_mask = 0x1f,
594 594 .mwdma_mask = 0x07,
595   - .udma_mask = 0x3f, /* UDMA 100, no swdma */
  595 + .udma_mask = ATA_UDMA5, /* UDMA 100, no swdma */
596 596 .port_ops = &amd133_port_ops
597 597 },
598 598 { /* 7: Nvidia Nforce */
... ... @@ -600,7 +600,7 @@
600 600 .flags = ATA_FLAG_SLAVE_POSS,
601 601 .pio_mask = 0x1f,
602 602 .mwdma_mask = 0x07,
603   - .udma_mask = 0x3f, /* UDMA 100 */
  603 + .udma_mask = ATA_UDMA5, /* UDMA 100 */
604 604 .port_ops = &nv100_port_ops
605 605 },
606 606 { /* 8: Nvidia Nforce2 and later */
... ... @@ -608,7 +608,7 @@
608 608 .flags = ATA_FLAG_SLAVE_POSS,
609 609 .pio_mask = 0x1f,
610 610 .mwdma_mask = 0x07,
611   - .udma_mask = 0x7f, /* UDMA 133, no swdma */
  611 + .udma_mask = ATA_UDMA6, /* UDMA 133, no swdma */
612 612 .port_ops = &nv133_port_ops
613 613 },
614 614 { /* 9: AMD CS5536 (Geode companion) */
... ... @@ -616,7 +616,7 @@
616 616 .flags = ATA_FLAG_SLAVE_POSS,
617 617 .pio_mask = 0x1f,
618 618 .mwdma_mask = 0x07,
619   - .udma_mask = 0x3f, /* UDMA 100 */
  619 + .udma_mask = ATA_UDMA5, /* UDMA 100 */
620 620 .port_ops = &amd100_port_ops
621 621 }
622 622 };
drivers/ata/pata_cs5535.c
Diff comments   View file @ bf6263a
... ... @@ -228,7 +228,7 @@
228 228 .flags = ATA_FLAG_SLAVE_POSS,
229 229 .pio_mask = 0x1f,
230 230 .mwdma_mask = 0x07,
231   - .udma_mask = 0x1f,
  231 + .udma_mask = ATA_UDMA4,
232 232 .port_ops = &cs5535_port_ops
233 233 };
234 234 const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info };
drivers/ata/pata_hpt366.c
Diff comments   View file @ bf6263a
... ... @@ -396,7 +396,7 @@
396 396 .flags = ATA_FLAG_SLAVE_POSS,
397 397 .pio_mask = 0x1f,
398 398 .mwdma_mask = 0x07,
399   - .udma_mask = 0x1f,
  399 + .udma_mask = ATA_UDMA4,
400 400 .port_ops = &hpt366_port_ops
401 401 };
402 402 struct ata_port_info info = info_hpt366;
drivers/ata/pata_hpt37x.c
Diff comments   View file @ bf6263a
... ... @@ -892,7 +892,7 @@
892 892 .flags = ATA_FLAG_SLAVE_POSS,
893 893 .pio_mask = 0x1f,
894 894 .mwdma_mask = 0x07,
895   - .udma_mask = 0x3f,
  895 + .udma_mask = ATA_UDMA5,
896 896 .port_ops = &hpt370_port_ops
897 897 };
898 898 /* HPT370A - UDMA100 */
... ... @@ -901,7 +901,7 @@
901 901 .flags = ATA_FLAG_SLAVE_POSS,
902 902 .pio_mask = 0x1f,
903 903 .mwdma_mask = 0x07,
904   - .udma_mask = 0x3f,
  904 + .udma_mask = ATA_UDMA5,
905 905 .port_ops = &hpt370a_port_ops
906 906 };
907 907 /* HPT370 - UDMA100 */
... ... @@ -928,7 +928,7 @@
928 928 .flags = ATA_FLAG_SLAVE_POSS,
929 929 .pio_mask = 0x1f,
930 930 .mwdma_mask = 0x07,
931   - .udma_mask = 0x7f,
  931 + .udma_mask = ATA_UDMA6,
932 932 .port_ops = &hpt372_port_ops
933 933 };
934 934 /* HPT374 - UDMA100 */
... ... @@ -937,7 +937,7 @@
937 937 .flags = ATA_FLAG_SLAVE_POSS,
938 938 .pio_mask = 0x1f,
939 939 .mwdma_mask = 0x07,
940   - .udma_mask = 0x3f,
  940 + .udma_mask = ATA_UDMA5,
941 941 .port_ops = &hpt374_port_ops
942 942 };
943 943  
drivers/ata/pata_hpt3x2n.c
Diff comments   View file @ bf6263a
... ... @@ -493,7 +493,7 @@
493 493 .flags = ATA_FLAG_SLAVE_POSS,
494 494 .pio_mask = 0x1f,
495 495 .mwdma_mask = 0x07,
496   - .udma_mask = 0x7f,
  496 + .udma_mask = ATA_UDMA6,
497 497 .port_ops = &hpt3x2n_port_ops
498 498 };
499 499 struct ata_port_info port = info;
drivers/ata/pata_it8213.c
Diff comments   View file @ bf6263a
... ... @@ -316,7 +316,7 @@
316 316 .flags = ATA_FLAG_SLAVE_POSS,
317 317 .pio_mask = 0x1f, /* pio0-4 */
318 318 .mwdma_mask = 0x07, /* mwdma0-2 */
319   - .udma_mask = 0x1f, /* UDMA 100 */
  319 + .udma_mask = ATA_UDMA4, /* FIXME: want UDMA 100? */
320 320 .port_ops = &it8213_ops,
321 321 };
322 322 /* Current IT8213 stuff is single port */
drivers/ata/pata_it821x.c
Diff comments   View file @ bf6263a
... ... @@ -724,7 +724,7 @@
724 724 .flags = ATA_FLAG_SLAVE_POSS,
725 725 .pio_mask = 0x1f,
726 726 .mwdma_mask = 0x07,
727   - .udma_mask = 0x7f,
  727 + .udma_mask = ATA_UDMA6,
728 728 .port_ops = &it821x_passthru_port_ops
729 729 };
730 730  
drivers/ata/pata_jmicron.c
Diff comments   View file @ bf6263a
... ... @@ -197,7 +197,7 @@
197 197  
198 198 .pio_mask = 0x1f,
199 199 .mwdma_mask = 0x07,
200   - .udma_mask = 0x3f,
  200 + .udma_mask = ATA_UDMA5,
201 201  
202 202 .port_ops = &jmicron_ops,
203 203 };
drivers/ata/pata_marvell.c
Diff comments   View file @ bf6263a
... ... @@ -167,7 +167,7 @@
167 167  
168 168 .pio_mask = 0x1f,
169 169 .mwdma_mask = 0x07,
170   - .udma_mask = 0x3f,
  170 + .udma_mask = ATA_UDMA5,
171 171  
172 172 .port_ops = &marvell_ops,
173 173 };
... ... @@ -178,7 +178,7 @@
178 178  
179 179 .pio_mask = 0x1f,
180 180 .mwdma_mask = 0x07,
181   - .udma_mask = 0x7f,
  181 + .udma_mask = ATA_UDMA6,
182 182  
183 183 .port_ops = &marvell_ops,
184 184 };
drivers/ata/pata_netcell.c
Diff comments   View file @ bf6263a
... ... @@ -99,7 +99,7 @@
99 99 firmware deals with it */
100 100 .pio_mask = 0x1f, /* pio0-4 */
101 101 .mwdma_mask = 0x07, /* mwdma0-2 */
102   - .udma_mask = 0x3f, /* UDMA 133 */
  102 + .udma_mask = ATA_UDMA5, /* UDMA 133 */
103 103 .port_ops = &netcell_ops,
104 104 };
105 105 const struct ata_port_info *port_info[] = { &info, NULL };
drivers/ata/pata_serverworks.c
Diff comments   View file @ bf6263a
... ... @@ -495,14 +495,14 @@
495 495 .flags = ATA_FLAG_SLAVE_POSS,
496 496 .pio_mask = 0x1f,
497 497 .mwdma_mask = 0x07,
498   - .udma_mask = 0x1f,
  498 + .udma_mask = ATA_UDMA4,
499 499 .port_ops = &serverworks_csb_port_ops
500 500 }, { /* CSB5 - later revisions*/
501 501 .sht = &serverworks_sht,
502 502 .flags = ATA_FLAG_SLAVE_POSS,
503 503 .pio_mask = 0x1f,
504 504 .mwdma_mask = 0x07,
505   - .udma_mask = 0x3f,
  505 + .udma_mask = ATA_UDMA5,
506 506 .port_ops = &serverworks_csb_port_ops
507 507 }
508 508 };
drivers/ata/pata_sil680.c
Diff comments   View file @ bf6263a
... ... @@ -349,7 +349,7 @@
349 349 .flags = ATA_FLAG_SLAVE_POSS,
350 350 .pio_mask = 0x1f,
351 351 .mwdma_mask = 0x07,
352   - .udma_mask = 0x7f,
  352 + .udma_mask = ATA_UDMA6,
353 353 .port_ops = &sil680_port_ops
354 354 };
355 355 static const struct ata_port_info info_slow = {
... ... @@ -357,7 +357,7 @@
357 357 .flags = ATA_FLAG_SLAVE_POSS,
358 358 .pio_mask = 0x1f,
359 359 .mwdma_mask = 0x07,
360   - .udma_mask = 0x3f,
  360 + .udma_mask = ATA_UDMA5,
361 361 .port_ops = &sil680_port_ops
362 362 };
363 363 const struct ata_port_info *ppi[] = { &info, NULL };
drivers/ata/pata_via.c
Diff comments   View file @ bf6263a
... ... @@ -471,7 +471,7 @@
471 471 .flags = ATA_FLAG_SLAVE_POSS,
472 472 .pio_mask = 0x1f,
473 473 .mwdma_mask = 0x07,
474   - .udma_mask = 0x7,
  474 + .udma_mask = ATA_UDMA2,
475 475 .port_ops = &via_port_ops
476 476 };
477 477 /* VIA UDMA 66 devices */
... ... @@ -480,7 +480,7 @@
480 480 .flags = ATA_FLAG_SLAVE_POSS,
481 481 .pio_mask = 0x1f,
482 482 .mwdma_mask = 0x07,
483   - .udma_mask = 0x1f,
  483 + .udma_mask = ATA_UDMA4,
484 484 .port_ops = &via_port_ops
485 485 };
486 486 /* VIA UDMA 100 devices */
... ... @@ -489,7 +489,7 @@
489 489 .flags = ATA_FLAG_SLAVE_POSS,
490 490 .pio_mask = 0x1f,
491 491 .mwdma_mask = 0x07,
492   - .udma_mask = 0x3f,
  492 + .udma_mask = ATA_UDMA5,
493 493 .port_ops = &via_port_ops
494 494 };
495 495 /* UDMA133 with bad AST (All current 133) */
... ... @@ -498,7 +498,7 @@
498 498 .flags = ATA_FLAG_SLAVE_POSS,
499 499 .pio_mask = 0x1f,
500 500 .mwdma_mask = 0x07,
501   - .udma_mask = 0x7f, /* FIXME: should check north bridge */
  501 + .udma_mask = ATA_UDMA6, /* FIXME: should check north bridge */
502 502 .port_ops = &via_port_ops
503 503 };
504 504 struct ata_port_info type;
drivers/ata/pdc_adma.c
Diff comments   View file @ bf6263a
... ... @@ -188,7 +188,7 @@
188 188 ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO |
189 189 ATA_FLAG_PIO_POLLING,
190 190 .pio_mask = 0x10, /* pio4 */
191   - .udma_mask = 0x1f, /* udma0-4 */
  191 + .udma_mask = ATA_UDMA4,
192 192 .port_ops = &adma_ata_ops,
193 193 },
194 194 };
drivers/ata/sata_inic162x.c
Diff comments   View file @ bf6263a
... ... @@ -594,7 +594,7 @@
594 594 .flags = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA,
595 595 .pio_mask = 0x1f, /* pio0-4 */
596 596 .mwdma_mask = 0x07, /* mwdma0-2 */
597   - .udma_mask = 0x7f, /* udma0-6 */
  597 + .udma_mask = ATA_UDMA6,
598 598 .port_ops = &inic_port_ops
599 599 };
600 600  
drivers/ata/sata_mv.c
Diff comments   View file @ bf6263a
... ... @@ -526,44 +526,44 @@
526 526 { /* chip_504x */
527 527 .flags = MV_COMMON_FLAGS,
528 528 .pio_mask = 0x1f, /* pio0-4 */
529   - .udma_mask = 0x7f, /* udma0-6 */
  529 + .udma_mask = ATA_UDMA6,
530 530 .port_ops = &mv5_ops,
531 531 },
532 532 { /* chip_508x */
533 533 .flags = (MV_COMMON_FLAGS | MV_FLAG_DUAL_HC),
534 534 .pio_mask = 0x1f, /* pio0-4 */
535   - .udma_mask = 0x7f, /* udma0-6 */
  535 + .udma_mask = ATA_UDMA6,
536 536 .port_ops = &mv5_ops,
537 537 },
538 538 { /* chip_5080 */
539 539 .flags = (MV_COMMON_FLAGS | MV_FLAG_DUAL_HC),
540 540 .pio_mask = 0x1f, /* pio0-4 */
541   - .udma_mask = 0x7f, /* udma0-6 */
  541 + .udma_mask = ATA_UDMA6,
542 542 .port_ops = &mv5_ops,
543 543 },
544 544 { /* chip_604x */
545 545 .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS),
546 546 .pio_mask = 0x1f, /* pio0-4 */
547   - .udma_mask = 0x7f, /* udma0-6 */
  547 + .udma_mask = ATA_UDMA6,
548 548 .port_ops = &mv6_ops,
549 549 },
550 550 { /* chip_608x */
551 551 .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS |
552 552 MV_FLAG_DUAL_HC),
553 553 .pio_mask = 0x1f, /* pio0-4 */
554   - .udma_mask = 0x7f, /* udma0-6 */
  554 + .udma_mask = ATA_UDMA6,
555 555 .port_ops = &mv6_ops,
556 556 },
557 557 { /* chip_6042 */
558 558 .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS),
559 559 .pio_mask = 0x1f, /* pio0-4 */
560   - .udma_mask = 0x7f, /* udma0-6 */
  560 + .udma_mask = ATA_UDMA6,
561 561 .port_ops = &mv_iie_ops,
562 562 },
563 563 { /* chip_7042 */
564 564 .flags = (MV_COMMON_FLAGS | MV_6XXX_FLAGS),
565 565 .pio_mask = 0x1f, /* pio0-4 */
566   - .udma_mask = 0x7f, /* udma0-6 */
  566 + .udma_mask = ATA_UDMA6,
567 567 .port_ops = &mv_iie_ops,
568 568 },
569 569 };
drivers/ata/sata_qstor.c
Diff comments   View file @ bf6263a
... ... @@ -176,7 +176,7 @@
176 176 //FIXME ATA_FLAG_SRST |
177 177 ATA_FLAG_MMIO | ATA_FLAG_PIO_POLLING,
178 178 .pio_mask = 0x10, /* pio4 */
179   - .udma_mask = 0x7f, /* udma0-6 */
  179 + .udma_mask = ATA_UDMA6,
180 180 .port_ops = &qs_ata_ops,
181 181 },
182 182 };
drivers/ata/sata_sil.c
Diff comments   View file @ bf6263a
... ... @@ -218,7 +218,7 @@
218 218 .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_MOD15WRITE,
219 219 .pio_mask = 0x1f, /* pio0-4 */
220 220 .mwdma_mask = 0x07, /* mwdma0-2 */
221   - .udma_mask = 0x3f, /* udma0-5 */
  221 + .udma_mask = ATA_UDMA5,
222 222 .port_ops = &sil_ops,
223 223 },
224 224 /* sil_3112_no_sata_irq */
... ... @@ -227,7 +227,7 @@
227 227 SIL_FLAG_NO_SATA_IRQ,
228 228 .pio_mask = 0x1f, /* pio0-4 */
229 229 .mwdma_mask = 0x07, /* mwdma0-2 */
230   - .udma_mask = 0x3f, /* udma0-5 */
  230 + .udma_mask = ATA_UDMA5,
231 231 .port_ops = &sil_ops,
232 232 },
233 233 /* sil_3512 */
... ... @@ -235,7 +235,7 @@
235 235 .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT,
236 236 .pio_mask = 0x1f, /* pio0-4 */
237 237 .mwdma_mask = 0x07, /* mwdma0-2 */
238   - .udma_mask = 0x3f, /* udma0-5 */
  238 + .udma_mask = ATA_UDMA5,
239 239 .port_ops = &sil_ops,
240 240 },
241 241 /* sil_3114 */
... ... @@ -243,7 +243,7 @@
243 243 .flags = SIL_DFL_PORT_FLAGS | SIL_FLAG_RERR_ON_DMA_ACT,
244 244 .pio_mask = 0x1f, /* pio0-4 */
245 245 .mwdma_mask = 0x07, /* mwdma0-2 */
246   - .udma_mask = 0x3f, /* udma0-5 */
  246 + .udma_mask = ATA_UDMA5,
247 247 .port_ops = &sil_ops,
248 248 },
249 249 };
drivers/ata/sata_sil24.c
Diff comments   View file @ bf6263a
... ... @@ -426,7 +426,7 @@
426 426 SIL24_FLAG_PCIX_IRQ_WOC,
427 427 .pio_mask = 0x1f, /* pio0-4 */
428 428 .mwdma_mask = 0x07, /* mwdma0-2 */
429   - .udma_mask = 0x3f, /* udma0-5 */
  429 + .udma_mask = ATA_UDMA5, /* udma0-5 */
430 430 .port_ops = &sil24_ops,
431 431 },
432 432 /* sil_3132 */
... ... @@ -434,7 +434,7 @@
434 434 .flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(2),
435 435 .pio_mask = 0x1f, /* pio0-4 */
436 436 .mwdma_mask = 0x07, /* mwdma0-2 */
437   - .udma_mask = 0x3f, /* udma0-5 */
  437 + .udma_mask = ATA_UDMA5, /* udma0-5 */
438 438 .port_ops = &sil24_ops,
439 439 },
440 440 /* sil_3131/sil_3531 */
... ... @@ -442,7 +442,7 @@
442 442 .flags = SIL24_COMMON_FLAGS | SIL24_NPORTS2FLAG(1),
443 443 .pio_mask = 0x1f, /* pio0-4 */
444 444 .mwdma_mask = 0x07, /* mwdma0-2 */
445   - .udma_mask = 0x3f, /* udma0-5 */
  445 + .udma_mask = ATA_UDMA5, /* udma0-5 */
446 446 .port_ops = &sil24_ops,
447 447 },
448 448 };
drivers/ata/sata_sis.c
Diff comments   View file @ bf6263a
... ... @@ -133,7 +133,7 @@
133 133 .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
134 134 .pio_mask = 0x1f,
135 135 .mwdma_mask = 0x7,
136   - .udma_mask = 0x7f,
  136 + .udma_mask = ATA_UDMA6,
137 137 .port_ops = &sis_ops,
138 138 };
139 139  
drivers/ata/sata_svw.c
Diff comments   View file @ bf6263a
... ... @@ -361,7 +361,7 @@
361 361 ATA_FLAG_MMIO | K2_FLAG_NO_ATAPI_DMA,
362 362 .pio_mask = 0x1f,
363 363 .mwdma_mask = 0x07,
364   - .udma_mask = 0x7f,
  364 + .udma_mask = ATA_UDMA6,
365 365 .port_ops = &k2_sata_ops,
366 366 },
367 367 /* board_svw8 */
... ... @@ -371,7 +371,7 @@
371 371 K2_FLAG_SATA_8_PORTS,
372 372 .pio_mask = 0x1f,
373 373 .mwdma_mask = 0x07,
374   - .udma_mask = 0x7f,
  374 + .udma_mask = ATA_UDMA6,
375 375 .port_ops = &k2_sata_ops,
376 376 },
377 377 };
drivers/ata/sata_uli.c
Diff comments   View file @ bf6263a
... ... @@ -129,7 +129,7 @@
129 129 .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
130 130 ATA_FLAG_IGN_SIMPLEX,
131 131 .pio_mask = 0x1f, /* pio0-4 */
132   - .udma_mask = 0x7f, /* udma0-6 */
  132 + .udma_mask = ATA_UDMA6,
133 133 .port_ops = &uli_ops,
134 134 };
135 135  
drivers/ata/sata_via.c
Diff comments   View file @ bf6263a
... ... @@ -223,7 +223,7 @@
223 223 .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
224 224 .pio_mask = 0x1f,
225 225 .mwdma_mask = 0x07,
226   - .udma_mask = 0x7f,
  226 + .udma_mask = ATA_UDMA6,
227 227 .port_ops = &vt6420_sata_ops,
228 228 };
229 229  
... ... @@ -231,7 +231,7 @@
231 231 .flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
232 232 .pio_mask = 0x1f,
233 233 .mwdma_mask = 0x07,
234   - .udma_mask = 0x7f,
  234 + .udma_mask = ATA_UDMA6,
235 235 .port_ops = &vt6421_sata_ops,
236 236 };
237 237  
... ... @@ -239,7 +239,7 @@
239 239 .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_NO_LEGACY,
240 240 .pio_mask = 0x1f,
241 241 .mwdma_mask = 0,
242   - .udma_mask = 0x7f,
  242 + .udma_mask = ATA_UDMA6,
243 243 .port_ops = &vt6421_pata_ops,
244 244 };
245 245  
drivers/ata/sata_vsc.c
Diff comments   View file @ bf6263a
... ... @@ -371,7 +371,7 @@
371 371 ATA_FLAG_MMIO,
372 372 .pio_mask = 0x1f,
373 373 .mwdma_mask = 0x07,
374   - .udma_mask = 0x7f,
  374 + .udma_mask = ATA_UDMA6,
375 375 .port_ops = &vsc_sata_ops,
376 376 };
377 377 const struct ata_port_info *ppi[] = { &pi, NULL };