Commit 098cdff3 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Jeff Garzik
Browse files

sata_promise: simplify port setup 



Each place in pdc_ata_init_one() that initialises a SATA
port first calls pdc_ata_setup_port(), and then manually
assigns the port's ->scr_addr. Simplify the code by extending
pdc_ata_setup_port() to also handle scr_addr initialisation;
for PATA ports we pass NULL as scr_addr.

The initialisation of the PATA-only 20619 redundantly set
up scr_addr for the ports. Remove this.

Tested on 20619, 20575, and 20775 chips.

Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 540477b4

drivers/ata/sata_promise.c

+10 −19
Original line number Original line Diff line number Diff line
@@ -777,7 +777,8 @@ static int pdc_old_check_atapi_dma(struct ata_queued_cmd *qc) 
	return pdc_check_atapi_dma(qc);

	return pdc_check_atapi_dma(qc);

}

}





static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base)

static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base,

			       void __iomem *scr_addr)

{

{

	port->cmd_addr		= base;

	port->cmd_addr		= base;

	port->data_addr		= base;

	port->data_addr		= base;
@@ -792,6 +793,7 @@ static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base) 
	port->status_addr	= base + 0x1c;

	port->status_addr	= base + 0x1c;

	port->altstatus_addr	=

	port->altstatus_addr	=

	port->ctl_addr		= base + 0x38;

	port->ctl_addr		= base + 0x38;

	port->scr_addr		= scr_addr;

}

}
@@ -904,11 +906,8 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 




	base = probe_ent->iomap[PDC_MMIO_BAR];

	base = probe_ent->iomap[PDC_MMIO_BAR];





	pdc_ata_setup_port(&probe_ent->port[0], base + 0x200);

	pdc_ata_setup_port(&probe_ent->port[0], base + 0x200, base + 0x400);

	pdc_ata_setup_port(&probe_ent->port[1], base + 0x280);

	pdc_ata_setup_port(&probe_ent->port[1], base + 0x280, base + 0x500);



	probe_ent->port[0].scr_addr = base + 0x400;

	probe_ent->port[1].scr_addr = base + 0x500;





	/* notice 4-port boards */

	/* notice 4-port boards */

	switch (board_idx) {

	switch (board_idx) {
@@ -917,12 +916,8 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
		/* Fall through */

		/* Fall through */

	case board_20319:

	case board_20319:

       		probe_ent->n_ports = 4;

       		probe_ent->n_ports = 4;



		pdc_ata_setup_port(&probe_ent->port[2], base + 0x300, base + 0x600);

		pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);

		pdc_ata_setup_port(&probe_ent->port[3], base + 0x380, base + 0x700);

		pdc_ata_setup_port(&probe_ent->port[3], base + 0x380);



		probe_ent->port[2].scr_addr = base + 0x600;

		probe_ent->port[3].scr_addr = base + 0x700;

		break;

		break;

	case board_2057x:

	case board_2057x:

		hp->flags |= PDC_FLAG_GEN_II;

		hp->flags |= PDC_FLAG_GEN_II;
@@ -932,7 +927,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
		tmp = readb(base + PDC_FLASH_CTL+1);

		tmp = readb(base + PDC_FLASH_CTL+1);

		if (!(tmp & 0x80)) {

		if (!(tmp & 0x80)) {

			probe_ent->n_ports = 3;

			probe_ent->n_ports = 3;

			pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);

			pdc_ata_setup_port(&probe_ent->port[2], base + 0x300, NULL);

			hp->port_flags[2] = ATA_FLAG_SLAVE_POSS;

			hp->port_flags[2] = ATA_FLAG_SLAVE_POSS;

			printk(KERN_INFO DRV_NAME " PATA port found\n");

			printk(KERN_INFO DRV_NAME " PATA port found\n");

		} else

		} else
@@ -942,12 +937,8 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
		break;

		break;

	case board_20619:

	case board_20619:

		probe_ent->n_ports = 4;

		probe_ent->n_ports = 4;



		pdc_ata_setup_port(&probe_ent->port[2], base + 0x300, NULL);

		pdc_ata_setup_port(&probe_ent->port[2], base + 0x300);

		pdc_ata_setup_port(&probe_ent->port[3], base + 0x380, NULL);

		pdc_ata_setup_port(&probe_ent->port[3], base + 0x380);



		probe_ent->port[2].scr_addr = base + 0x600;

		probe_ent->port[3].scr_addr = base + 0x700;

		break;

		break;

	default:

	default:

		BUG();

		BUG();

CRA Git | Maintained and supported by SUSTech CRA and CCSE