Attachment #15674 for bug #28979

View | Details | Raw Unified | Return to bug 28979
Collapse All | Expand All





    case 0x0d30105a:
    case 0x4d30105a:
    case 0x4d68105a:
	return "Promise ATA100 controller";

    case 0x00041103:


    case 0x4d38105a: /* Promise 66 & 100 need their clock changed */
    case 0x4d30105a:
    case 0x4d68105a:
    case 0x0d30105a:
	outb(rman_get_start(sc->bmio) + 0x11, 
	     inb(rman_get_start(sc->bmio) + 0x11) | 0x0a);

    case 0x4d33105a:	/* Promise Ultra/Fasttrak 33 */
    case 0x4d38105a:	/* Promise Ultra/Fasttrak 66 */
    case 0x4d30105a:	/* Promise Ultra/Fasttrak 100 */
    case 0x4d68105a:	/* Promise Ultra100 TX2*/
    case 0x0d30105a:	/* Promise OEM ATA100 */
	if (!(inl(rman_get_start(sc->bmio) + 0x1c) & 
	      (scp->channel ? 0x00004000 : 0x00000400)))




    case 0x4d33105a:	/* Promise Ultra/FastTrak 33 controllers */
    case 0x4d38105a:	/* Promise Ultra/FastTrak 66 controllers */
    case 0x4d30105a:	/* Promise Ultra/FastTrak 100 controllers */
    case 0x4d68105a:	/* Promise Ultra100 TX2 */
    case 0x0d30105a:	/* Promise OEM ATA100 controllers */
	/* the Promise can only do DMA on ATA disks not on ATAPI devices */
	if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) ||

	    break;

	if (udmamode >= 5 &&
	    (scp->chiptype == 0x4d30105a || scp->chiptype == 0x4d68105a || scp->chiptype == 0x0d30105a) &&
	    !(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
	    error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
				ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY);

	    }
	}
	if (udmamode >= 4 && (scp->chiptype == 0x4d38105a || 
	    scp->chiptype == 0x4d30105a || scp->chiptype == 0x4d68105a || scp->chiptype == 0x0d30105a) &&
	    !(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
	    error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
				ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);


    case 0x4d38105a:  /* Promise Ultra/Fasttrak 66 */
    case 0x4d30105a:  /* Promise Ultra/Fasttrak 100 */
    case 0x4d68105a:  /* Promise Ultra100 TX2*/
    case 0x0d30105a:  /* Promise OEM ATA 100 */
	switch (mode) {
	default:

Return to bug 28979

Lines 326-331 Link Here

(-)ata-all.c (+3 lines)
326		326
327	case 0x0d30105a:	327	case 0x0d30105a:
328	case 0x4d30105a:	328	case 0x4d30105a:
		329	case 0x4d68105a:
329	return "Promise ATA100 controller";	330	return "Promise ATA100 controller";
330		331
331	case 0x00041103:	332	case 0x00041103:
Lines 426-431 Link Here
426		427
427	case 0x4d38105a: /* Promise 66 & 100 need their clock changed */	428	case 0x4d38105a: /* Promise 66 & 100 need their clock changed */
428	case 0x4d30105a:	429	case 0x4d30105a:
		430	case 0x4d68105a:
429	case 0x0d30105a:	431	case 0x0d30105a:
430	outb(rman_get_start(sc->bmio) + 0x11,	432	outb(rman_get_start(sc->bmio) + 0x11,
431	inb(rman_get_start(sc->bmio) + 0x11) \| 0x0a);	433	inb(rman_get_start(sc->bmio) + 0x11) \| 0x0a);
Lines 1119-1124 Link Here
1119	case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */	1121	case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */
1120	case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */	1122	case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */
1121	case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */	1123	case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */
		1124	case 0x4d68105a: /* Promise Ultra100 TX2*/
1122	case 0x0d30105a: /* Promise OEM ATA100 */	1125	case 0x0d30105a: /* Promise OEM ATA100 */
1123	if (!(inl(rman_get_start(sc->bmio) + 0x1c) &	1126	if (!(inl(rman_get_start(sc->bmio) + 0x1c) &
1124	(scp->channel ? 0x00004000 : 0x00000400)))	1127	(scp->channel ? 0x00004000 : 0x00000400)))

Lines 722-727 Link Here

(-)ata-dma.c (-2 / +4 lines)
722	case 0x4d33105a: /* Promise Ultra/FastTrak 33 controllers */	722	case 0x4d33105a: /* Promise Ultra/FastTrak 33 controllers */
723	case 0x4d38105a: /* Promise Ultra/FastTrak 66 controllers */	723	case 0x4d38105a: /* Promise Ultra/FastTrak 66 controllers */
724	case 0x4d30105a: /* Promise Ultra/FastTrak 100 controllers */	724	case 0x4d30105a: /* Promise Ultra/FastTrak 100 controllers */
		725	case 0x4d68105a: /* Promise Ultra100 TX2 */
725	case 0x0d30105a: /* Promise OEM ATA100 controllers */	726	case 0x0d30105a: /* Promise OEM ATA100 controllers */
726	/* the Promise can only do DMA on ATA disks not on ATAPI devices */	727	/* the Promise can only do DMA on ATA disks not on ATAPI devices */
727	if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) \|\|	728	if ((device == ATA_MASTER && scp->devices & ATA_ATAPI_MASTER) \|\|
Lines 729-735 Link Here
729	break;	730	break;
730		731
731	if (udmamode >= 5 &&	732	if (udmamode >= 5 &&
732	(scp->chiptype == 0x4d30105a \|\| scp->chiptype == 0x0d30105a) &&	733	(scp->chiptype == 0x4d30105a \|\| scp->chiptype == 0x4d68105a \|\| scp->chiptype == 0x0d30105a) &&
733	!(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){	734	!(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
734	error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,	735	error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
735	ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY);	736	ATA_UDMA5, ATA_C_F_SETXFER, ATA_WAIT_READY);
Lines 744-750 Link Here
744	}	745	}
745	}	746	}
746	if (udmamode >= 4 && (scp->chiptype == 0x4d38105a \|\|	747	if (udmamode >= 4 && (scp->chiptype == 0x4d38105a \|\|
747	scp->chiptype == 0x4d30105a \|\| scp->chiptype == 0x0d30105a) &&	748	scp->chiptype == 0x4d30105a \|\| scp->chiptype == 0x4d68105a \|\| scp->chiptype == 0x0d30105a) &&
748	!(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){	749	!(pci_read_config(parent, 0x50, 2)&(scp->channel ? 1<<11 : 1<<10))){
749	error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,	750	error = ata_command(scp, device, ATA_C_SETFEATURES, 0, 0, 0,
750	ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);	751	ATA_UDMA4, ATA_C_F_SETXFER, ATA_WAIT_READY);
Lines 1040-1045 Link Here
1040		1041
1041	case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */	1042	case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */
1042	case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */	1043	case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */
		1044	case 0x4d68105a: /* Promise Ultra100 TX2*/
1043	case 0x0d30105a: /* Promise OEM ATA 100 */	1045	case 0x0d30105a: /* Promise OEM ATA 100 */
1044	switch (mode) {	1046	switch (mode) {
1045	default:	1047	default: