UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

pata_sis: extract a sis_port_base() method 

This is similar to the existing sis_old_port_base() method. We do this
same calculation and logic in multiple places (with one more to come in
a future patch), so extracting it into a method makes sense.

Reviewed-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Dan McGee 2011-09-07 11:23:18 -05:00 committed by Jeff Garzik
parent 904c04feaf
commit 023a0175ad
1 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/ata/pata_sis.c
View File

@ -88,6 +88,29 @@ static int sis_old_port_base(struct ata_device *adev)
return 0x40 + (4 * adev->link->ap->port_no) + (2 * adev->devno); return 0x40 + (4 * adev->link->ap->port_no) + (2 * adev->devno);
} }
/**
* sis_port_base - return PCI configuration base for dev
* @adev: device
*
* Returns the base of the PCI configuration registers for this port
* number.
*/
static int sis_port_base(struct ata_device *adev)
{
struct ata_port *ap = adev->link->ap;
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
int port = 0x40;
u32 reg54;
/* If bit 30 is set then the registers are mapped at 0x70 not 0x40 */
pci_read_config_dword(pdev, 0x54, &reg54);
if (reg54 & 0x40000000)
port = 0x70;
return port + (8 * ap->port_no) + (4 * adev->devno);
}
/** /**
* sis_133_cable_detect - check for 40/80 pin * sis_133_cable_detect - check for 40/80 pin
* @ap: Port * @ap: Port
@ -266,9 +289,8 @@ static void sis_100_set_piomode (struct ata_port *ap, struct ata_device *adev)
static void sis_133_set_piomode (struct ata_port *ap, struct ata_device *adev) static void sis_133_set_piomode (struct ata_port *ap, struct ata_device *adev)
{ {
struct pci_dev *pdev = to_pci_dev(ap->host->dev); struct pci_dev *pdev = to_pci_dev(ap->host->dev);
int port = 0x40; int port;
u32 t1; u32 t1;
u32 reg54;
int speed = adev->pio_mode - XFER_PIO_0; int speed = adev->pio_mode - XFER_PIO_0;
const u32 timing133[] = { const u32 timing133[] = {
@ -288,12 +310,7 @@ static void sis_133_set_piomode (struct ata_port *ap, struct ata_device *adev)
sis_set_fifo(ap, adev); sis_set_fifo(ap, adev);
/* If bit 14 is set then the registers are mapped at 0x70 not 0x40 */ port = sis_port_base(adev);
pci_read_config_dword(pdev, 0x54, &reg54);
if (reg54 & 0x40000000)
port = 0x70;
port += 8 * ap->port_no + 4 * adev->devno;
pci_read_config_dword(pdev, port, &t1); pci_read_config_dword(pdev, port, &t1);
t1 &= 0xC0C00FFF; /* Mask out timing */ t1 &= 0xC0C00FFF; /* Mask out timing */
@ -465,21 +482,14 @@ static void sis_133_early_set_dmamode (struct ata_port *ap, struct ata_device *a
static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev) static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev)
{ {
struct pci_dev *pdev = to_pci_dev(ap->host->dev); struct pci_dev *pdev = to_pci_dev(ap->host->dev);
int speed = adev->dma_mode - XFER_MW_DMA_0; int port;
int port = 0x40;
u32 t1; u32 t1;
u32 reg54;
/* bits 4- cycle time 8 - cvs time */ /* bits 4- cycle time 8 - cvs time */
static const u32 timing_u100[] = { 0x6B0, 0x470, 0x350, 0x140, 0x120, 0x110, 0x000 }; static const u32 timing_u100[] = { 0x6B0, 0x470, 0x350, 0x140, 0x120, 0x110, 0x000 };
static const u32 timing_u133[] = { 0x9F0, 0x6A0, 0x470, 0x250, 0x230, 0x220, 0x210 }; static const u32 timing_u133[] = { 0x9F0, 0x6A0, 0x470, 0x250, 0x230, 0x220, 0x210 };
/* If bit 14 is set then the registers are mapped at 0x70 not 0x40 */ port = sis_port_base(adev);
pci_read_config_dword(pdev, 0x54, &reg54);
if (reg54 & 0x40000000)
port = 0x70;
port += (8 * ap->port_no) + (4 * adev->devno);
pci_read_config_dword(pdev, port, &t1); pci_read_config_dword(pdev, port, &t1);
if (adev->dma_mode < XFER_UDMA_0) { if (adev->dma_mode < XFER_UDMA_0) {
@ -487,7 +497,7 @@ static void sis_133_set_dmamode (struct ata_port *ap, struct ata_device *adev)
/* FIXME: need data sheet to add MWDMA here. Also lacking on /* FIXME: need data sheet to add MWDMA here. Also lacking on
ide/pci driver */ ide/pci driver */
} else { } else {
speed = adev->dma_mode - XFER_UDMA_0; int speed = adev->dma_mode - XFER_UDMA_0;
/* if & 8 no UDMA133 - need info for ... */ /* if & 8 no UDMA133 - need info for ... */
t1 &= ~0x00000FF0; t1 &= ~0x00000FF0;
t1 |= 0x00000004; t1 |= 0x00000004;