mirror of
				https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson
				synced 2025-10-31 00:01:35 +00:00 
			
		
		
		
	libata cmd64x: whack into a shape that looks like the documentation
Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
		
							parent
							
								
									a21b069626
								
							
						
					
					
						commit
						6a40da02be
					
				| @ -197,7 +197,7 @@ static void cmd64x_set_piomode(struct ata_port *ap, struct ata_device *adev) | ||||
| static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev) | ||||
| { | ||||
| 	static const u8 udma_data[] = { | ||||
| 		0x31, 0x21, 0x11, 0x25, 0x15, 0x05 | ||||
| 		0x30, 0x20, 0x10, 0x20, 0x10, 0x00 | ||||
| 	}; | ||||
| 	static const u8 mwdma_data[] = { | ||||
| 		0x30, 0x20, 0x10 | ||||
| @ -213,12 +213,21 @@ static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev) | ||||
| 	pci_read_config_byte(pdev, pciD, ®D); | ||||
| 	pci_read_config_byte(pdev, pciU, ®U); | ||||
| 
 | ||||
| 	regD &= ~(0x20 << shift); | ||||
| 	regU &= ~(0x35 << shift); | ||||
| 	/* DMA bits off */ | ||||
| 	regD &= ~(0x20 << adev->devno); | ||||
| 	/* DMA control bits */ | ||||
| 	regU &= ~(0x30 << shift); | ||||
| 	/* DMA timing bits */ | ||||
| 	regU &= ~(0x05 << adev->devno); | ||||
| 
 | ||||
| 	if (adev->dma_mode >= XFER_UDMA_0) | ||||
| 	if (adev->dma_mode >= XFER_UDMA_0) { | ||||
| 		/* Merge thge timing value */ | ||||
| 		regU |= udma_data[adev->dma_mode - XFER_UDMA_0] << shift; | ||||
| 	else | ||||
| 		/* Merge the control bits */ | ||||
| 		regU |= 1 << adev->devno; /* UDMA on */ | ||||
| 		if (adev->dma_mode > 2)	/* 15nS timing */ | ||||
| 			regU |= 4 << adev->devno; | ||||
| 	} else | ||||
| 		regD |= mwdma_data[adev->dma_mode - XFER_MW_DMA_0] << shift; | ||||
| 
 | ||||
| 	regD |= 0x20 << adev->devno; | ||||
| @ -239,8 +248,8 @@ static void cmd648_bmdma_stop(struct ata_queued_cmd *qc) | ||||
| 	struct ata_port *ap = qc->ap; | ||||
| 	struct pci_dev *pdev = to_pci_dev(ap->host->dev); | ||||
| 	u8 dma_intr; | ||||
| 	int dma_reg = ap->port_no ? ARTTIM23_INTR_CH1 : CFR_INTR_CH0; | ||||
| 	int dma_mask = ap->port_no ? ARTTIM2 : CFR; | ||||
| 	int dma_mask = ap->port_no ? ARTTIM23_INTR_CH1 : CFR_INTR_CH0; | ||||
| 	int dma_reg = ap->port_no ? ARTTIM2 : CFR; | ||||
| 
 | ||||
| 	ata_bmdma_stop(qc); | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Alan
						Alan