summaryrefslogtreecommitdiffstats
path: root/sys/dev/ata/ata-pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/ata/ata-pci.c')
-rw-r--r--sys/dev/ata/ata-pci.c748
1 files changed, 118 insertions, 630 deletions
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c
index d77d65a..065e0b0 100644
--- a/sys/dev/ata/ata-pci.c
+++ b/sys/dev/ata/ata-pci.c
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1998,1999,2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
+ * Copyright (c) 1998 - 2003 Søren Schmidt <sos@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -45,364 +45,74 @@
#include <pci/pcivar.h>
#include <pci/pcireg.h>
#include <dev/ata/ata-all.h>
+#include <dev/ata/ata-pci.h>
-/* device structures */
-struct ata_pci_controller {
- struct resource *bmio;
- int bmaddr;
- struct resource *irq;
- int irqcnt;
- int lock;
-};
+/* local vars */
+static MALLOC_DEFINE(M_ATAPCI, "ATA PCI", "ATA driver PCI");
/* misc defines */
#define IOMASK 0xfffffffc
-#define GRANDPARENT(dev) device_get_parent(device_get_parent(dev))
-#define ATA_MASTERDEV(dev) ((pci_get_progif(dev) & 0x80) && \
- (pci_get_progif(dev) & 0x05) != 0x05)
-
-int
-ata_find_dev(device_t dev, u_int32_t devid, u_int32_t revid)
-{
- device_t *children;
- int nchildren, i;
-
- if (device_get_children(device_get_parent(dev), &children, &nchildren))
- return 0;
-
- for (i = 0; i < nchildren; i++) {
- if (pci_get_devid(children[i]) == devid &&
- pci_get_revid(children[i]) >= revid) {
- free(children, M_TEMP);
- return 1;
- }
- }
- free(children, M_TEMP);
- return 0;
-}
-static void
-ata_via_southbridge_fixup(device_t dev)
-{
- device_t *children;
- int nchildren, i;
-
- if (device_get_children(device_get_parent(dev), &children, &nchildren))
- return;
-
- for (i = 0; i < nchildren; i++) {
- if (pci_get_devid(children[i]) == 0x03051106 || /* VIA VT8363 */
- pci_get_devid(children[i]) == 0x03911106 || /* VIA VT8371 */
- pci_get_devid(children[i]) == 0x31021106 || /* VIA VT8662 */
- pci_get_devid(children[i]) == 0x31121106) { /* VIA VT8361 */
- u_int8_t reg76 = pci_read_config(children[i], 0x76, 1);
-
- if ((reg76 & 0xf0) != 0xd0) {
- device_printf(dev,
- "Correcting VIA config for southbridge data corruption bug\n");
- pci_write_config(children[i], 0x75, 0x80, 1);
- pci_write_config(children[i], 0x76, (reg76 & 0x0f) | 0xd0, 1);
- }
- break;
- }
- }
- free(children, M_TEMP);
-}
+/* prototypes */
+static int ata_pci_add_child(device_t, int);
+static void ata_pci_locknoop(struct ata_channel *, int);
-static const char *
-ata_pci_match(device_t dev)
+static int
+ata_pci_probe(device_t dev)
{
if (pci_get_class(dev) != PCIC_STORAGE)
- return NULL;
-
- switch (pci_get_devid(dev)) {
- /* supported chipsets */
- case 0x12308086:
- return "Intel PIIX ATA controller";
-
- case 0x70108086:
- return "Intel PIIX3 ATA controller";
-
- case 0x71118086:
- case 0x71998086:
- case 0x84ca8086:
- return "Intel PIIX4 ATA33 controller";
-
- case 0x24218086:
- return "Intel ICH0 ATA33 controller";
-
- case 0x24118086:
- case 0x76018086:
- return "Intel ICH ATA66 controller";
-
- case 0x244a8086:
- case 0x244b8086:
- return "Intel ICH2 ATA100 controller";
-
- case 0x248a8086:
- case 0x248b8086:
- return "Intel ICH3 ATA100 controller";
-
- case 0x24cb8086:
- return "Intel ICH4 ATA100 controller";
-
- case 0x522910b9:
- if (pci_get_revid(dev) >= 0xc4)
- return "AcerLabs Aladdin ATA100 controller";
- else if (pci_get_revid(dev) >= 0xc2)
- return "AcerLabs Aladdin ATA66 controller";
- else if (pci_get_revid(dev) >= 0x20)
- return "AcerLabs Aladdin ATA33 controller";
- else
- return "AcerLabs Aladdin ATA controller";
-
- case 0x05711106:
- if (ata_find_dev(dev, 0x05861106, 0x02))
- return "VIA 82C586 ATA33 controller";
- if (ata_find_dev(dev, 0x05861106, 0))
- return "VIA 82C586 ATA controller";
- if (ata_find_dev(dev, 0x05961106, 0x12))
- return "VIA 82C596 ATA66 controller";
- if (ata_find_dev(dev, 0x05961106, 0))
- return "VIA 82C596 ATA33 controller";
- if (ata_find_dev(dev, 0x06861106, 0x40))
- return "VIA 82C686 ATA100 controller";
- if (ata_find_dev(dev, 0x06861106, 0x10))
- return "VIA 82C686 ATA66 controller";
- if (ata_find_dev(dev, 0x06861106, 0))
- return "VIA 82C686 ATA33 controller";
- if (ata_find_dev(dev, 0x82311106, 0))
- return "VIA 8231 ATA100 controller";
- if (ata_find_dev(dev, 0x30741106, 0) ||
- ata_find_dev(dev, 0x31091106, 0))
- return "VIA 8233 ATA100 controller";
- if (ata_find_dev(dev, 0x31471106, 0))
- return "VIA 8233 ATA133 controller";
- if (ata_find_dev(dev, 0x31771106, 0))
- return "VIA 8235 ATA133 controller";
- return "VIA Apollo ATA controller";
-
- case 0x55131039:
- if (ata_find_dev(dev, 0x06301039, 0x30) ||
- ata_find_dev(dev, 0x06331039, 0) ||
- ata_find_dev(dev, 0x06351039, 0) ||
- ata_find_dev(dev, 0x06401039, 0) ||
- ata_find_dev(dev, 0x06451039, 0) ||
- ata_find_dev(dev, 0x06501039, 0) ||
- ata_find_dev(dev, 0x07301039, 0) ||
- ata_find_dev(dev, 0x07331039, 0) ||
- ata_find_dev(dev, 0x07351039, 0) ||
- ata_find_dev(dev, 0x07401039, 0) ||
- ata_find_dev(dev, 0x07451039, 0) ||
- ata_find_dev(dev, 0x07501039, 0))
- return "SiS 5591 ATA100 controller";
- else if (ata_find_dev(dev, 0x05301039, 0) ||
- ata_find_dev(dev, 0x05401039, 0) ||
- ata_find_dev(dev, 0x06201039, 0) ||
- ata_find_dev(dev, 0x06301039, 0))
- return "SiS 5591 ATA66 controller";
- else
- return "SiS 5591 ATA33 controller";
-
- case 0x06801095:
- return "Sil 0680 ATA133 controller";
-
- case 0x06491095:
- return "CMD 649 ATA100 controller";
-
- case 0x06481095:
- return "CMD 648 ATA66 controller";
-
- case 0x06461095:
- return "CMD 646 ATA controller";
-
- case 0xc6931080:
- if (pci_get_subclass(dev) == PCIS_STORAGE_IDE)
- return "Cypress 82C693 ATA controller";
- return NULL;
-
- case 0x01021078:
- return "Cyrix 5530 ATA33 controller";
-
- case 0x74091022:
- return "AMD 756 ATA66 controller";
-
- case 0x74111022:
- return "AMD 766 ATA100 controller";
-
- case 0x74411022:
- return "AMD 768 ATA100 controller";
-
- case 0x01bc10de:
- return "nVidia nForce ATA100 controller";
-
- case 0x006510de:
- return "nVidia nForce ATA133 controller";
-
- case 0x02111166:
- return "ServerWorks ROSB4 ATA33 controller";
-
- case 0x02121166:
- if (pci_get_revid(dev) >= 0x92)
- return "ServerWorks CSB5 ATA100 controller";
- else
- return "ServerWorks CSB5 ATA66 controller";
-
- case 0x02131166:
- return "ServerWorks CSB6 ATA100 controller (channel 0+1)";
-
- case 0x02171166:
- return "ServerWorks CSB6 ATA66 controller (channel 2)";
-
- case 0x4d33105a:
- return "Promise ATA33 controller";
-
- case 0x0d38105a:
- case 0x4d38105a:
- return "Promise ATA66 controller";
-
- case 0x0d30105a:
- case 0x4d30105a:
- return "Promise ATA100 controller";
-
- case 0x4d68105a:
- case 0x6268105a:
- {
- uintptr_t devid = 0;
-
- /* test if we are behind the right type of bridge */
- if (!BUS_READ_IVAR(device_get_parent(GRANDPARENT(dev)),
- GRANDPARENT(dev), PCI_IVAR_DEVID, &devid) &&
- devid == 0x00221011 &&
- pci_get_class(GRANDPARENT(dev)) == PCIC_BRIDGE) {
- static long start = 0, end = 0;
-
- /* we belive we are on a TX4, now do our (simple) magic */
- if (pci_get_slot(dev) == 1) {
- bus_get_resource(dev, SYS_RES_IRQ, 0, &start, &end);
- return "Promise TX4 ATA100 controller (channel 0+1)";
- }
- else if (pci_get_slot(dev) == 2 && start && end) {
- bus_set_resource(dev, SYS_RES_IRQ, 0, start, end);
- start = end = 0;
- return "Promise TX4 ATA100 controller (channel 2+3)";
- }
- else
- start = end = 0;
- }
- }
- return "Promise TX2 ATA100 controller";
-
- case 0x1275105a:
- case 0x5275105a:
- case 0x7275105a:
- {
- uintptr_t devid = 0;
-
- /* if we are on a SuperTrak SX6000 dont attach */
- if (!BUS_READ_IVAR(device_get_parent(GRANDPARENT(dev)),
- GRANDPARENT(dev), PCI_IVAR_DEVID, &devid) &&
- devid == 0x09628086 &&
- pci_get_class(GRANDPARENT(dev)) == PCIC_BRIDGE)
- break;
- }
- /* FALLTHROUGH */
-
- case 0x4d69105a:
- case 0x6269105a:
- return "Promise TX2 ATA133 controller";
-
- case 0x00041103:
- switch (pci_get_revid(dev)) {
- case 0x00:
- case 0x01:
- return "HighPoint HPT366 ATA66 controller";
- case 0x02:
- return "HighPoint HPT368 ATA66 controller";
- case 0x03:
- case 0x04:
- return "HighPoint HPT370 ATA100 controller";
- case 0x05:
- return "HighPoint HPT372 ATA133 controller";
- }
- return NULL;
+ return ENXIO;
- case 0x00051103:
- switch (pci_get_revid(dev)) {
- case 0x01:
- return "HighPoint HPT372 ATA133 controller";
- }
- return NULL;
-
- case 0x00081103:
- switch (pci_get_revid(dev)) {
- case 0x07:
- if (pci_get_function(dev) == 0)
- return "HighPoint HPT374 ATA133 controller (channel 0+1)";
- if (pci_get_function(dev) == 1)
- return "HighPoint HPT374 ATA133 controller (channel 2+3)";
- return "HighPoint HPT374 ATA133 controller";
+ switch (pci_get_vendor(dev)) {
+ case ATA_ACARD_ID:
+ return ata_acard_ident(dev);
+ case ATA_ACER_LABS_ID:
+ return ata_ali_ident(dev);
+ case ATA_AMD_ID:
+ return ata_amd_ident(dev);
+ case ATA_CYRIX_ID:
+ return ata_cyrix_ident(dev);
+ case ATA_CYPRESS_ID:
+ return ata_cypress_ident(dev);
+ case ATA_HIGHPOINT_ID:
+ return ata_highpoint_ident(dev);
+ case ATA_INTEL_ID:
+ return ata_intel_ident(dev);
+ case ATA_NVIDIA_ID:
+ return ata_nvidia_ident(dev);
+ case ATA_PROMISE_ID:
+ return ata_promise_ident(dev);
+ case ATA_SERVERWORKS_ID:
+ return ata_serverworks_ident(dev);
+ case ATA_SILICON_IMAGE_ID:
+ return ata_sii_ident(dev);
+ case ATA_SIS_ID:
+ return ata_sis_ident(dev);
+ case ATA_VIA_ID:
+ return ata_via_ident(dev);
+
+ case 0x16ca:
+ if (pci_get_devid(dev) == 0x000116ca) {
+ device_set_desc(dev, "Cenatek Rocket Drive controller");
+ return 0;
}
- return NULL;
-
- case 0x00051191:
- return "Acard ATP850 ATA-33 controller";
-
- case 0x00061191:
- case 0x00071191:
- return "Acard ATP860 ATA-66 controller";
-
- case 0x00081191:
- case 0x00091191:
- return "Acard ATP865 ATA-133 controller";
-
- case 0x000116ca:
- return "Cenatek Rocket Drive controller";
-
- /* unsupported but known chipsets, generic DMA only */
- case 0x10001042:
- case 0x10011042:
- return "RZ 100? ATA controller !WARNING! buggy chip data loss possible";
+ return ENXIO;
- case 0x06401095:
- return "CMD 640 ATA controller !WARNING! buggy chip data loss possible";
+ case 0x1042:
+ if (pci_get_devid(dev)==0x10001042 || pci_get_devid(dev)==0x10011042) {
+ device_set_desc(dev,
+ "RZ 100? ATA controller !WARNING! buggy HW data loss possible");
+ return 0;
+ }
+ return ENXIO;
- /* unknown chipsets, try generic DMA if it seems possible */
+ /* unknown chipset, try generic DMA if it seems possible */
default:
if (pci_get_class(dev) == PCIC_STORAGE &&
(pci_get_subclass(dev) == PCIS_STORAGE_IDE))
- return "Generic PCI ATA controller";
+ return ata_generic_ident(dev);
}
- return NULL;
-}
-
-static int
-ata_pci_probe(device_t dev)
-{
- const char *desc = ata_pci_match(dev);
-
- if (desc) {
- device_set_desc(dev, desc);
- return 0;
- }
- else
- return ENXIO;
-}
-
-static int
-ata_pci_add_child(device_t dev, int unit)
-{
- /* check if this is located at one of the std addresses */
- if (ATA_MASTERDEV(dev)) {
- if (!device_add_child(dev, "ata", unit))
- return ENOMEM;
- }
- else {
- if (!device_add_child(dev, "ata",
- devclass_find_free_unit(ata_devclass, 2)))
- return ENOMEM;
- }
- return 0;
+ return ENXIO;
}
static int
@@ -436,155 +146,25 @@ ata_pci_attach(device_t dev)
/* is there a valid port range to connect to ? */
rid = 0x20;
- controller->bmio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
- 0, ~0, 1, RF_ACTIVE);
- if (!controller->bmio)
+ controller->r_bmio = bus_alloc_resource(dev, SYS_RES_IOPORT, &rid,
+ 0, ~0, 1, RF_ACTIVE);
+ if (!controller->r_bmio)
device_printf(dev, "Busmastering DMA not configured\n");
}
else
device_printf(dev, "Busmastering DMA not supported\n");
- /* do extra chipset specific setups */
- switch (type) {
-
- case 0x522910b9: /* AcerLabs Aladdin need to activate the ATAPI FIFO */
- pci_write_config(dev, 0x53,
- (pci_read_config(dev, 0x53, 1) & ~0x01) | 0x02, 1);
- break;
-
- case 0x0d30105a: /* Promise 66 & 100 (before TX2) need the clock changed */
- case 0x4d30105a:
- case 0x0d38105a:
- case 0x4d38105a:
- ATA_OUTB(controller->bmio, 0x11, ATA_INB(controller->bmio, 0x11)|0x0a);
- /* FALLTHROUGH */
-
- case 0x4d33105a: /* Promise (before TX2) need burst mode turned on */
- ATA_OUTB(controller->bmio, 0x1f, ATA_INB(controller->bmio, 0x1f)|0x01);
- break;
-
- case 0x00041103: /* HighPoint HPT366/368/370/372 default setup */
- if (pci_get_revid(dev) < 2) { /* HPT366 */
- /* turn off interrupt prediction */
- pci_write_config(dev, 0x51,
- (pci_read_config(dev, 0x51, 1) & ~0x80), 1);
- break;
- }
- if (pci_get_revid(dev) < 5) { /* HPT368/370 */
- /* turn off interrupt prediction */
- pci_write_config(dev, 0x51,
- (pci_read_config(dev, 0x51, 1) & ~0x03), 1);
- pci_write_config(dev, 0x55,
- (pci_read_config(dev, 0x55, 1) & ~0x03), 1);
-
- /* turn on interrupts */
- pci_write_config(dev, 0x5a,
- (pci_read_config(dev, 0x5a, 1) & ~0x10), 1);
-
- /* set clocks etc */
- pci_write_config(dev, 0x5b, 0x22, 1);
- break;
- }
- /* FALLTHROUGH */
-
- case 0x00051103: /* HighPoint HPT372 default setup */
- case 0x00081103: /* HighPoint HPT374 default setup */
- /* turn off interrupt prediction */
- pci_write_config(dev, 0x51, (pci_read_config(dev, 0x51, 1) & ~0x03), 1);
- pci_write_config(dev, 0x55, (pci_read_config(dev, 0x55, 1) & ~0x03), 1);
-
- /* turn on interrupts */
- pci_write_config(dev, 0x5a, (pci_read_config(dev, 0x5a, 1) & ~0x10), 1);
-
- /* set clocks etc */
- pci_write_config(dev, 0x5b,
- (pci_read_config(dev, 0x5b, 1) & 0x01) | 0x20, 1);
- break;
-
- case 0x05711106: /* VIA 82C586, '596, '686 default setup */
- /* prepare for ATA-66 on the 82C686a and 82C596b */
- if ((ata_find_dev(dev, 0x06861106, 0x10) &&
- !ata_find_dev(dev, 0x06861106, 0x40)) ||
- ata_find_dev(dev, 0x05961106, 0x12))
- pci_write_config(dev, 0x50, 0x030b030b, 4);
-
- /* the southbridge might need the data corruption fix */
- if (ata_find_dev(dev, 0x06861106, 0x40) ||
- ata_find_dev(dev, 0x82311106, 0x10))
- ata_via_southbridge_fixup(dev);
- /* FALLTHROUGH */
-
- case 0x74091022: /* AMD 756 default setup */
- case 0x74111022: /* AMD 766 default setup */
- case 0x74411022: /* AMD 768 default setup */
- case 0x01bc10de: /* nVIDIA nForce default setup */
- /* set prefetch, postwrite */
- pci_write_config(dev, 0x41, pci_read_config(dev, 0x41, 1) | 0xf0, 1);
-
- /* set fifo configuration half'n'half */
- pci_write_config(dev, 0x43,
- (pci_read_config(dev, 0x43, 1) & 0x90) | 0x2a, 1);
-
- /* set status register read retry */
- pci_write_config(dev, 0x44, pci_read_config(dev, 0x44, 1) | 0x08, 1);
-
- /* set DMA read & end-of-sector fifo flush */
- pci_write_config(dev, 0x46,
- (pci_read_config(dev, 0x46, 1) & 0x0c) | 0xf0, 1);
-
- /* set sector size */
- pci_write_config(dev, 0x60, DEV_BSIZE, 2);
- pci_write_config(dev, 0x68, DEV_BSIZE, 2);
- break;
-
- case 0x02111166: /* ServerWorks ROSB4 enable UDMA33 */
- pci_write_config(dev, 0x64,
- (pci_read_config(dev, 0x64, 4) & ~0x00002000) |
- 0x00004000, 4);
- break;
-
- case 0x02121166: /* ServerWorks CSB5 enable UDMA66/100 depending on rev */
- pci_write_config(dev, 0x5a,
- (pci_read_config(dev, 0x5a, 1) & ~0x40) |
- (pci_get_revid(dev) >= 0x92) ? 0x03 : 0x02, 1);
- break;
-
- case 0x06801095: /* Sil 0680 set ATA reference clock speed */
- if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10)
- pci_write_config(dev, 0x8a,
- (pci_read_config(dev, 0x8a, 1) & 0x0F) | 0x10, 1);
- if ((pci_read_config(dev, 0x8a, 1) & 0x30) != 0x10)
- device_printf(dev, "Sil 0680 could not set clock\n");
- break;
-
- case 0x06461095: /* CMD 646 enable interrupts, set DMA read mode */
- pci_write_config(dev, 0x71, 0x01, 1);
- break;
-
- case 0x10001042: /* RZ 100? known bad, no DMA */
- case 0x10011042:
- case 0x06401095: /* CMD 640 known bad, no DMA */
- controller->bmio = NULL;
- device_printf(dev, "Busmastering DMA disabled\n");
- }
+ /* do chipset specific setups only needed once */
+ controller->dmainit = ata_dmainit;
+ controller->locking = ata_pci_locknoop;
+ controller->chipinit(dev);
- if (controller->bmio) {
- controller->bmaddr = rman_get_start(controller->bmio);
+ if (controller->r_bmio) {
+ controller->bmaddr = rman_get_start(controller->r_bmio);
BUS_RELEASE_RESOURCE(device_get_parent(dev), dev,
- SYS_RES_IOPORT, rid, controller->bmio);
- controller->bmio = NULL;
+ SYS_RES_IOPORT, rid, controller->r_bmio);
+ controller->r_bmio = NULL;
}
- controller->lock = -1;
-
- /*
- * the Cypress chip is a mess, it contains two ATA functions, but
- * both channels are visible on the first one.
- * simply ignore the second function for now, as the right
- * solution (ignoring the second channel on the first function)
- * doesn't work with the crappy ATA interrupt setup on the alpha.
- */
- if (pci_get_devid(dev) == 0xc6931080 && pci_get_function(dev) > 1)
- return 0;
ata_pci_add_child(dev, 0);
@@ -595,117 +175,19 @@ ata_pci_attach(device_t dev)
}
static int
-ata_pci_intr(struct ata_channel *ch)
+ata_pci_add_child(device_t dev, int unit)
{
- u_int8_t dmastat;
-
- /*
- * since we might share the IRQ with another device, and in some
- * cases with our twin channel, we only want to process interrupts
- * that we know this channel generated.
- */
- switch (ch->chiptype) {
- case 0x00041103: /* HighPoint HPT366/368/370/372 */
- case 0x00051103: /* HighPoint HPT372 */
- case 0x00081103: /* HighPoint HPT374 */
- if (((dmastat = ata_dmastatus(ch)) &
- (ATA_BMSTAT_ACTIVE | ATA_BMSTAT_INTERRUPT)) != ATA_BMSTAT_INTERRUPT)
- return 0;
- ATA_OUTB(ch->r_bmio, ATA_BMSTAT_PORT, dmastat | ATA_BMSTAT_INTERRUPT);
- DELAY(1);
- return 1;
-
- case 0x06481095: /* CMD 648 */
- case 0x06491095: /* CMD 649 */
- if (!(pci_read_config(device_get_parent(ch->dev), 0x71, 1) &
- (ch->unit ? 0x08 : 0x04)))
- return 0;
- break;
-
- case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */
- case 0x0d38105a: /* Promise Fasttrak 66 */
- case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */
- case 0x0d30105a: /* Promise OEM ATA100 */
- case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */
- if (!(ATA_INL(ch->r_bmio, (ch->unit ? 0x14 : 0x1c)) &
- (ch->unit ? 0x00004000 : 0x00000400)))
- return 0;
- break;
-
- case 0x4d68105a: /* Promise TX2 ATA100 */
- case 0x6268105a: /* Promise TX2 ATA100 */
- case 0x4d69105a: /* Promise TX2 ATA133 */
- case 0x1275105a: /* Promise TX2 ATA133 */
- case 0x5275105a: /* Promise TX2 ATA133 */
- case 0x6269105a: /* Promise TX2 ATA133 */
- case 0x7275105a: /* Promise TX2 ATA133 */
- ATA_OUTB(ch->r_bmio, ATA_BMDEVSPEC_0, 0x0b);
- if (!(ATA_INB(ch->r_bmio, ATA_BMDEVSPEC_1) & 0x20))
- return 0;
- break;
-
- case 0x00051191: /* Acard ATP850 */
- {
- struct ata_pci_controller *scp =
- device_get_softc(device_get_parent(ch->dev));
-
- if (ch->unit != scp->lock)
- return 0;
- }
- /* FALLTHROUGH */
-
- case 0x00061191: /* Acard ATP860 */
- case 0x00071191: /* Acard ATP860R */
- case 0x00081191: /* Acard ATP865 */
- case 0x00091191: /* Acard ATP865R */
- if (ch->flags & ATA_DMA_ACTIVE) {
- if (!((dmastat = ata_dmastatus(ch)) & ATA_BMSTAT_INTERRUPT))
- return 0;
- ATA_OUTB(ch->r_bmio, ATA_BMSTAT_PORT, dmastat|ATA_BMSTAT_INTERRUPT);
- DELAY(1);
- ATA_OUTB(ch->r_bmio, ATA_BMCMD_PORT,
- ATA_INB(ch->r_bmio, ATA_BMCMD_PORT)&~ATA_BMCMD_START_STOP);
- DELAY(1);
- }
- return 1;
- }
-
- if (ch->flags & ATA_DMA_ACTIVE) {
- if (!((dmastat = ata_dmastatus(ch)) & ATA_BMSTAT_INTERRUPT))
- return 0;
- ATA_OUTB(ch->r_bmio, ATA_BMSTAT_PORT, dmastat | ATA_BMSTAT_INTERRUPT);
- DELAY(1);
+ /* check if this is located at one of the std addresses */
+ if (ATA_MASTERDEV(dev)) {
+ if (!device_add_child(dev, "ata", unit))
+ return ENOMEM;
}
- return 1;
-}
-
-static void
-ata_pci_locknoop(struct ata_channel *ch, int type)
-{
-}
-
-static void
-ata_pci_serialize(struct ata_channel *ch, int flags)
-{
- struct ata_pci_controller *scp =
- device_get_softc(device_get_parent(ch->dev));
-
- switch (flags) {
- case ATA_LF_LOCK:
- if (scp->lock == ch->unit)
- break;
- while (!atomic_cmpset_acq_int(&scp->lock, -1, ch->unit))
- tsleep((caddr_t)ch->lock_func, PRIBIO, "atalck", 1);
- break;
-
- case ATA_LF_UNLOCK:
- if (scp->lock == -1 || scp->lock != ch->unit)
- break;
- atomic_store_rel_int(&scp->lock, -1);
- wakeup((caddr_t)ch->lock_func);
- break;
+ else {
+ if (!device_add_child(dev, "ata",
+ devclass_find_free_unit(ata_devclass, 2)))
+ return ENOMEM;
}
- return;
+ return 0;
}
static int
@@ -730,8 +212,8 @@ ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
u_long start, u_long end, u_long count, u_int flags)
{
struct ata_pci_controller *controller = device_get_softc(dev);
- struct resource *res = NULL;
int unit = ((struct ata_channel *)device_get_softc(child))->unit;
+ struct resource *res = NULL;
int myrid;
if (type == SYS_RES_IOPORT) {
@@ -798,24 +280,18 @@ ata_pci_alloc_resource(device_t dev, device_t child, int type, int *rid,
}
if (type == SYS_RES_IRQ && *rid == ATA_IRQ_RID) {
- if (ATA_MASTERDEV(dev)) {
+ if (ATA_MASTERDEV(dev)) {
#ifdef __alpha__
return alpha_platform_alloc_ide_intr(unit);
#else
int irq = (unit == 0 ? 14 : 15);
-
+
return BUS_ALLOC_RESOURCE(device_get_parent(dev), child,
SYS_RES_IRQ, rid, irq, irq, 1, flags);
#endif
}
else {
- /* primary and secondary channels share interrupt, keep track */
- if (!controller->irq)
- controller->irq = BUS_ALLOC_RESOURCE(device_get_parent(dev),
- dev, SYS_RES_IRQ,
- rid, 0, ~0, 1, flags);
- controller->irqcnt++;
- return controller->irq;
+ return controller->r_irq;
}
}
return 0;
@@ -825,7 +301,6 @@ static int
ata_pci_release_resource(device_t dev, device_t child, int type, int rid,
struct resource *r)
{
- struct ata_pci_controller *controller = device_get_softc(dev);
int unit = ((struct ata_channel *)device_get_softc(child))->unit;
if (type == SYS_RES_IOPORT) {
@@ -867,34 +342,35 @@ ata_pci_release_resource(device_t dev, device_t child, int type, int rid,
SYS_RES_IRQ, rid, r);
#endif
}
- else {
- /* primary and secondary channels share interrupt, keep track */
- if (--controller->irqcnt)
- return 0;
- controller->irq = NULL;
- return BUS_RELEASE_RESOURCE(device_get_parent(dev), dev,
- SYS_RES_IRQ, rid, r);
- }
+ else
+ return 0;
}
return EINVAL;
}
static int
ata_pci_setup_intr(device_t dev, device_t child, struct resource *irq,
- int flags, driver_intr_t *intr, void *arg,
+ int flags, driver_intr_t *function, void *argument,
void **cookiep)
{
if (ATA_MASTERDEV(dev)) {
#ifdef __alpha__
- return alpha_platform_setup_ide_intr(child, irq, intr, arg, cookiep);
+ return alpha_platform_setup_ide_intr(child, irq, function, argument,
+ cookiep);
#else
return BUS_SETUP_INTR(device_get_parent(dev), child, irq,
- flags, intr, arg, cookiep);
+ flags, function, argument, cookiep);
#endif
}
- else
- return BUS_SETUP_INTR(device_get_parent(dev), dev, irq,
- flags, intr, arg, cookiep);
+ else {
+ struct ata_pci_controller *controller = device_get_softc(dev);
+ int unit = ((struct ata_channel *)device_get_softc(child))->unit;
+
+ controller->interrupt[unit].function = function;
+ controller->interrupt[unit].argument = argument;
+ *cookiep = controller;
+ return 0;
+ }
}
static int
@@ -909,9 +385,15 @@ ata_pci_teardown_intr(device_t dev, device_t child, struct resource *irq,
#endif
}
else
- return BUS_TEARDOWN_INTR(device_get_parent(dev), dev, irq, cookie);
+ return 0;
}
+static void
+ata_pci_locknoop(struct ata_channel *ch, int flags)
+{
+}
+
+
static device_method_t ata_pci_methods[] = {
/* device interface */
DEVMETHOD(device_probe, ata_pci_probe),
@@ -944,9 +426,10 @@ DRIVER_MODULE(atapci, pci, ata_pci_driver, ata_pci_devclass, 0, 0);
static int
ata_pcisub_probe(device_t dev)
{
+ struct ata_pci_controller *ctlr = device_get_softc(device_get_parent(dev));
struct ata_channel *ch = device_get_softc(dev);
device_t *children;
- int count, i;
+ int count, error, i;
/* find channel number on this controller */
device_get_children(device_get_parent(dev), &children, &count);
@@ -956,19 +439,24 @@ ata_pcisub_probe(device_t dev)
}
free(children, M_TEMP);
- ch->intr_func = ata_pci_intr;
+ ch->device[MASTER].setmode = ctlr->setmode;
+ ch->device[SLAVE].setmode = ctlr->setmode;
+ ch->locking = ctlr->locking;
ch->chiptype = pci_get_devid(device_get_parent(dev));
- switch (ch->chiptype) {
- case 0x10001042: /* RZ 1000 */
- case 0x10011042: /* RZ 1001 */
- case 0x06401095: /* CMD 640 */
- case 0x00051191: /* Acard ATP850 */
- ch->lock_func = ata_pci_serialize;
- break;
- default:
- ch->lock_func = ata_pci_locknoop;
+
+ if (!(error = ata_probe(dev)) && ch->r_bmio) {
+ /* if simplex controller, only allow DMA on primary channel */
+ ATA_OUTB(ch->r_bmio, ATA_BMSTAT_PORT,
+ ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) &
+ (ATA_BMSTAT_DMA_MASTER | ATA_BMSTAT_DMA_SLAVE));
+ if (ch->unit == 1 && ATA_INB(ch->r_bmio, ATA_BMSTAT_PORT) &
+ ATA_BMSTAT_DMA_SIMPLEX) {
+ ata_printf(ch, -1, "simplex device, DMA on primary only\n");
+ return error;
+ }
+ error = ctlr->dmainit(ch);
}
- return ata_probe(dev);
+ return error;
}
static device_method_t ata_pcisub_methods[] = {
OpenPOWER on IntegriCloud