diff options
author | Alexander Yurchenko <grange@cvs.openbsd.org> | 2004-10-17 19:21:38 +0000 |
---|---|---|
committer | Alexander Yurchenko <grange@cvs.openbsd.org> | 2004-10-17 19:21:38 +0000 |
commit | 2d9702b672f4b51cfdc31b5cff195b2f9d1c8789 (patch) | |
tree | 54a83a1bebaa25734b18623af9ed86c7172b157e /sys/dev/pci | |
parent | 4b00196c60b83e23bcda5b240d2e874be9950b66 (diff) |
Improve support for SiI3112 and add new controllers: SiI3512, SiI3114
and Adaptec AAR-1210SA (SiI3112 based). Mostly from NetBSD (work by
thorpej@).
Tested by me, Alexey E. Suslikov <cruel@texnika.com.ua>, tedu@, krw@,
marc@, markus@.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r-- | sys/dev/pci/pciide.c | 585 | ||||
-rw-r--r-- | sys/dev/pci/pciide_sii3112_reg.h | 304 |
2 files changed, 871 insertions, 18 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 82f3d0f283c..4ae8aea686c 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.176 2004/10/17 19:00:45 grange Exp $ */ +/* $OpenBSD: pciide.c,v 1.177 2004/10/17 19:21:37 grange Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -192,6 +192,16 @@ void cmd646_9_irqack(struct channel_softc *); void sii3112_chip_map(struct pciide_softc *, struct pci_attach_args *); void sii3112_setup_channel(struct channel_softc *); +void sii3112_drv_probe(struct channel_softc *); +void sii3114_chip_map(struct pciide_softc *, struct pci_attach_args *); +void sii3114_mapreg_dma(struct pciide_softc *, struct pci_attach_args *); +int sii3114_chansetup(struct pciide_softc *, int); +void sii3114_mapchan(struct pciide_channel *); +u_int8_t sii3114_dmacmd_read(struct pciide_softc *, int); +void sii3114_dmacmd_write(struct pciide_softc *, int, u_int8_t); +u_int8_t sii3114_dmactl_read(struct pciide_softc *, int); +void sii3114_dmactl_write(struct pciide_softc *, int, u_int8_t); +void sii3114_dmatbl_write(struct pciide_softc *, int, u_int32_t); void cy693_chip_map(struct pciide_softc *, struct pci_attach_args *); void cy693_setup_channel(struct channel_softc *); @@ -421,9 +431,21 @@ const struct pciide_product_desc pciide_cmd_products[] = { IDE_PCI_CLASS_OVERRIDE, cmd680_chip_map }, - { PCI_PRODUCT_CMDTECH_3112, /* SiI 3112 SATA */ - IDE_PCI_CLASS_OVERRIDE, /* XXX: subclass RAID */ + { PCI_PRODUCT_CMDTECH_3112, /* SiI3112 SATA */ + IDE_PCI_CLASS_OVERRIDE, + sii3112_chip_map + }, + { PCI_PRODUCT_CMDTECH_3512, /* SiI3512 SATA */ + IDE_PCI_CLASS_OVERRIDE, + sii3112_chip_map + }, + { PCI_PRODUCT_CMDTECH_AAR_1210SA, /* Adaptec AAR-1210SA */ + IDE_PCI_CLASS_OVERRIDE, sii3112_chip_map + }, + { PCI_PRODUCT_CMDTECH_3114, /* SiI3114 */ + IDE_PCI_CLASS_OVERRIDE, + sii3114_chip_map } }; @@ -3305,14 +3327,55 @@ sii3112_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) { struct pciide_channel *cp; bus_size_t cmdsize, ctlsize; - pcireg_t interface; + pcireg_t interface, scs_cmd, cfgctl; + pcireg_t cls, reg40, reg44; int channel; + struct pciide_satalink *sl = sc->sc_cookie; if (pciide_chipen(sc, pa) == 0) return; + /* Allocate memory for private data */ + sc->sc_cookie = malloc(sizeof(struct pciide_satalink), M_DEVBUF, + M_NOWAIT); + sl = sc->sc_cookie; + bzero(sl, sizeof(*sl)); + +#define SII3112_RESET_BITS \ + (SCS_CMD_PBM_RESET | SCS_CMD_ARB_RESET | \ + SCS_CMD_FF1_RESET | SCS_CMD_FF0_RESET | \ + SCS_CMD_IDE1_RESET | SCS_CMD_IDE0_RESET) + + /* + * Reset everything and then unblock all of the interrupts. + */ + scs_cmd = pci_conf_read(pa->pa_pc, pa->pa_tag, SII3112_SCS_CMD); + pci_conf_write(pa->pa_pc, pa->pa_tag, SII3112_SCS_CMD, + scs_cmd | SII3112_RESET_BITS); + delay(50 * 1000); + pci_conf_write(pa->pa_pc, pa->pa_tag, SII3112_SCS_CMD, + scs_cmd & SCS_CMD_BA5_EN); + delay(50 * 1000); + + if (scs_cmd & SCS_CMD_BA5_EN) { + if (pci_mapreg_map(pa, PCI_MAPREG_START + 0x14, + PCI_MAPREG_TYPE_MEM | + PCI_MAPREG_MEM_TYPE_32BIT, 0, + &sl->ba5_st, &sl->ba5_sh, + NULL, NULL, 0) != 0) + printf(": unable to map BA5 register space\n"); + else + sl->ba5_en = 1; + } else { + cfgctl = pci_conf_read(pa->pa_pc, pa->pa_tag, + SII3112_PCI_CFGCTL); + pci_conf_write(pa->pa_pc, pa->pa_tag, SII3112_PCI_CFGCTL, + cfgctl | CFGCTL_BA5INDEN); + } + printf(": DMA"); pciide_mapreg_dma(sc, pa); + printf("\n"); /* * Rev. <= 0x01 of the 3112 have a bug that can cause data @@ -3325,8 +3388,37 @@ sii3112_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) sc->sc_dma_boundary = 8192; } - sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32 | - WDC_CAPABILITY_MODE | WDC_CAPABILITY_SATA; + /* + * When the Silicon Image 3112 retries a PCI memory read command, + * it may retry it as a memory read multiple command under some + * circumstances. This can totally confuse some PCI controllers, + * so ensure that it will never do this by making sure that the + * Read Threshold (FIFO Read Request Control) field of the FIFO + * Valid Byte Count and Control registers for both channels (BA5 + * offset 0x40 and 0x44) are set to be at least as large as the + * cacheline size register. + */ + cls = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_BHLC_REG); + cls = (cls >> PCI_CACHELINE_SHIFT) & PCI_CACHELINE_MASK; + cls *= 4; + if (cls > 224) { + cls = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_BHLC_REG); + cls &= ~(PCI_CACHELINE_MASK << PCI_CACHELINE_SHIFT); + cls |= ((224/4) << PCI_CACHELINE_SHIFT); + pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_BHLC_REG, cls); + cls = 224; + } + if (cls < 32) + cls = 32; + cls = (cls + 31) / 32; + reg40 = ba5_read_4(sc, 0x40); + reg44 = ba5_read_4(sc, 0x44); + if ((reg40 & 0x7) < cls) + ba5_write_4(sc, 0x40, (reg40 & ~0x07) | cls); + if ((reg44 & 0x7) < cls) + ba5_write_4(sc, 0x44, (reg44 & ~0x07) | cls); + + sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32; sc->sc_wdcdev.PIO_cap = 4; if (sc->sc_dma_ok) { sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA; @@ -3337,12 +3429,16 @@ sii3112_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) } sc->sc_wdcdev.set_modes = sii3112_setup_channel; + /* We can use SControl and SStatus to probe for drives. */ + sc->sc_wdcdev.drv_probe = sii3112_drv_probe; + sc->sc_wdcdev.channels = sc->wdc_chanarray; sc->sc_wdcdev.nchannels = PCIIDE_NUM_CHANNELS; - /* - * The 3112 can be told to identify as a RAID controller. - * In this case, we have to fake interface + /* + * The 3112 either identifies itself as a RAID storage device + * or a Misc storage device. Fake up the interface bits for + * what our driver expects. */ if (PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_MASS_STORAGE_IDE) { interface = PCI_INTERFACE(pa->pa_class); @@ -3351,8 +3447,6 @@ sii3112_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) PCIIDE_INTERFACE_PCI(0) | PCIIDE_INTERFACE_PCI(1); } - pciide_print_channels(sc->sc_wdcdev.nchannels, interface); - for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) { cp = &sc->pciide_channels[channel]; if (pciide_chansetup(sc, channel, interface) == 0) @@ -3361,7 +3455,6 @@ sii3112_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) pciide_pci_intr); if (cp->hw_ok == 0) continue; - pciide_map_compat_intr(pa, cp, channel, interface); sc->sc_wdcdev.set_modes(&cp->wdc_channel); } } @@ -3406,15 +3499,475 @@ sii3112_setup_channel(struct channel_softc *chp) */ if (idedma_ctl != 0) { /* Add software bits in status register */ - bus_space_write_1(sc->sc_dma_iot, sc->sc_dma_ioh, - IDEDMA_CTL(chp->channel), idedma_ctl); + PCIIDE_DMACTL_WRITE(sc, chp->channel, idedma_ctl); } - pci_conf_write(sc->sc_pc, sc->sc_tag, - chp->channel == 0 ? SII3112_DTM_IDE0 : SII3112_DTM_IDE1, dtm); + BA5_WRITE_4(sc, chp->channel, ba5_IDE_DTM, dtm); pciide_print_modes(cp); } void +sii3112_drv_probe(struct channel_softc *chp) +{ + struct pciide_channel *cp = (struct pciide_channel *)chp; + struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc; + uint32_t scontrol, sstatus; + uint8_t scnt, sn, cl, ch; + int i, s; + + /* XXX This should be done by other code. */ + for (i = 0; i < 2; i++) { + chp->ch_drive[i].chnl_softc = chp; + chp->ch_drive[i].drive = i; + } + + /* + * The 3112 is a 2-port part, and only has one drive per channel + * (each port emulates a master drive). + * + * The 3114 is similar, but has 4 channels. + */ + + /* + * Request communication initialization sequence, any speed. + * Performing this is the equivalent of an ATA Reset. + */ + scontrol = SControl_DET_INIT | SControl_SPD_ANY; + + /* + * XXX We don't yet support SATA power management; disable all + * power management state transitions. + */ + scontrol |= SControl_IPM_NONE; + + BA5_WRITE_4(sc, chp->channel, ba5_SControl, scontrol); + delay(50 * 1000); + scontrol &= ~SControl_DET_INIT; + BA5_WRITE_4(sc, chp->channel, ba5_SControl, scontrol); + delay(50 * 1000); + + sstatus = BA5_READ_4(sc, chp->channel, ba5_SStatus); +#if 0 + printf("%s: port %d: SStatus=0x%08x, SControl=0x%08x\n", + sc->sc_wdcdev.sc_dev.dv_xname, chp->channel, sstatus, + BA5_READ_4(sc, chp->channel, ba5_SControl)); +#endif + switch (sstatus & SStatus_DET_mask) { + case SStatus_DET_NODEV: + /* No device; be silent. */ + break; + + case SStatus_DET_DEV_NE: + printf("%s: port %d: device connected, but " + "communication not established\n", + sc->sc_wdcdev.sc_dev.dv_xname, chp->channel); + break; + + case SStatus_DET_OFFLINE: + printf("%s: port %d: PHY offline\n", + sc->sc_wdcdev.sc_dev.dv_xname, chp->channel); + break; + + case SStatus_DET_DEV: + /* + * XXX ATAPI detection doesn't currently work. Don't + * XXX know why. But, it's not like the standard method + * XXX can detect an ATAPI device connected via a SATA/PATA + * XXX bridge, so at least this is no worse. --thorpej + */ + if (chp->_vtbl != NULL) + CHP_WRITE_REG(chp, wdr_sdh, WDSD_IBM | (0 << 4)); + else + bus_space_write_1(chp->cmd_iot, chp->cmd_ioh, + wdr_sdh & _WDC_REGMASK, WDSD_IBM | (0 << 4)); + delay(10); /* 400ns delay */ + /* Save register contents. */ + if (chp->_vtbl != NULL) { + scnt = CHP_READ_REG(chp, wdr_seccnt); + sn = CHP_READ_REG(chp, wdr_sector); + cl = CHP_READ_REG(chp, wdr_cyl_lo); + ch = CHP_READ_REG(chp, wdr_cyl_hi); + } else { + scnt = bus_space_read_1(chp->cmd_iot, + chp->cmd_ioh, wdr_seccnt & _WDC_REGMASK); + sn = bus_space_read_1(chp->cmd_iot, + chp->cmd_ioh, wdr_sector & _WDC_REGMASK); + cl = bus_space_read_1(chp->cmd_iot, + chp->cmd_ioh, wdr_cyl_lo & _WDC_REGMASK); + ch = bus_space_read_1(chp->cmd_iot, + chp->cmd_ioh, wdr_cyl_hi & _WDC_REGMASK); + } +#if 0 + printf("%s: port %d: scnt=0x%x sn=0x%x cl=0x%x ch=0x%x\n", + sc->sc_wdcdev.sc_dev.dv_xname, chp->channel, + scnt, sn, cl, ch); +#endif + /* + * scnt and sn are supposed to be 0x1 for ATAPI, but in some + * cases we get wrong values here, so ignore it. + */ + s = splbio(); + if (cl == 0x14 && ch == 0xeb) + chp->ch_drive[0].drive_flags |= DRIVE_ATAPI; + else + chp->ch_drive[0].drive_flags |= DRIVE_ATA; + splx(s); + + printf("%s: port %d: device present", + sc->sc_wdcdev.sc_dev.dv_xname, chp->channel); + switch ((sstatus & SStatus_SPD_mask) >> SStatus_SPD_shift) { + case 1: + printf(", speed: 1.5Gb/s"); + break; + case 2: + printf(", speed: 3.0Gb/s"); + break; + } + printf("\n"); + break; + + default: + printf("%s: port %d: unknown SStatus: 0x%08x\n", + sc->sc_wdcdev.sc_dev.dv_xname, chp->channel, sstatus); + } +} + +void +sii3114_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa) +{ + struct pciide_channel *cp; + pcireg_t scs_cmd; + pci_intr_handle_t intrhandle; + const char *intrstr; + int channel; + struct pciide_satalink *sl = sc->sc_cookie; + + if (pciide_chipen(sc, pa) == 0) + return; + + /* Allocate memory for private data */ + sc->sc_cookie = malloc(sizeof(struct pciide_satalink), M_DEVBUF, + M_NOWAIT); + sl = sc->sc_cookie; + bzero(sl, sizeof(*sl)); + +#define SII3114_RESET_BITS \ + (SCS_CMD_PBM_RESET | SCS_CMD_ARB_RESET | \ + SCS_CMD_FF1_RESET | SCS_CMD_FF0_RESET | \ + SCS_CMD_FF3_RESET | SCS_CMD_FF2_RESET | \ + SCS_CMD_IDE1_RESET | SCS_CMD_IDE0_RESET | \ + SCS_CMD_IDE3_RESET | SCS_CMD_IDE2_RESET) + + /* + * Reset everything and then unblock all of the interrupts. + */ + scs_cmd = pci_conf_read(pa->pa_pc, pa->pa_tag, SII3112_SCS_CMD); + pci_conf_write(pa->pa_pc, pa->pa_tag, SII3112_SCS_CMD, + scs_cmd | SII3114_RESET_BITS); + delay(50 * 1000); + pci_conf_write(pa->pa_pc, pa->pa_tag, SII3112_SCS_CMD, + scs_cmd & SCS_CMD_M66EN); + delay(50 * 1000); + + /* + * On the 3114, the BA5 register space is always enabled. In + * order to use the 3114 in any sane way, we must use this BA5 + * register space, and so we consider it an error if we cannot + * map it. + * + * As a consequence of using BA5, our register mapping is different + * from a normal PCI IDE controller's, and so we are unable to use + * most of the common PCI IDE register mapping functions. + */ + if (pci_mapreg_map(pa, PCI_MAPREG_START + 0x14, + PCI_MAPREG_TYPE_MEM | + PCI_MAPREG_MEM_TYPE_32BIT, 0, + &sl->ba5_st, &sl->ba5_sh, + NULL, NULL, 0) != 0) { + printf(": unable to map BA5 register space\n"); + return; + } + sl->ba5_en = 1; + + /* + * Set the Interrupt Steering bit in the IDEDMA_CMD register of + * channel 2. This is required at all times for proper operation + * when using the BA5 register space (otherwise interrupts from + * all 4 channels won't work). + */ + BA5_WRITE_4(sc, 2, ba5_IDEDMA_CMD, IDEDMA_CMD_INT_STEER); + + printf(": DMA"); + sii3114_mapreg_dma(sc, pa); + printf("\n"); + + sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32; + sc->sc_wdcdev.PIO_cap = 4; + if (sc->sc_dma_ok) { + sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA; + sc->sc_wdcdev.cap |= WDC_CAPABILITY_IRQACK; + sc->sc_wdcdev.irqack = pciide_irqack; + sc->sc_wdcdev.DMA_cap = 2; + sc->sc_wdcdev.UDMA_cap = 6; + } + sc->sc_wdcdev.set_modes = sii3112_setup_channel; + + /* We can use SControl and SStatus to probe for drives. */ + sc->sc_wdcdev.drv_probe = sii3112_drv_probe; + + sc->sc_wdcdev.channels = sc->wdc_chanarray; + sc->sc_wdcdev.nchannels = 4; + + /* Map and establish the interrupt handler. */ + if (pci_intr_map(pa, &intrhandle) != 0) { + printf("%s: couldn't map native-PCI interrupt\n", + sc->sc_wdcdev.sc_dev.dv_xname); + return; + } + intrstr = pci_intr_string(pa->pa_pc, intrhandle); + sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, + /* XXX */ + pciide_pci_intr, sc, + sc->sc_wdcdev.sc_dev.dv_xname); + if (sc->sc_pci_ih != NULL) { + printf("%s: using %s for native-PCI interrupt\n", + sc->sc_wdcdev.sc_dev.dv_xname, + intrstr ? intrstr : "unknown interrupt"); + } else { + printf("%s: couldn't establish native-PCI interrupt", + sc->sc_wdcdev.sc_dev.dv_xname); + if (intrstr != NULL) + printf(" at %s", intrstr); + printf("\n"); + return; + } + + for (channel = 0; channel < sc->sc_wdcdev.nchannels; channel++) { + cp = &sc->pciide_channels[channel]; + if (sii3114_chansetup(sc, channel) == 0) + continue; + sii3114_mapchan(cp); + if (cp->hw_ok == 0) + continue; + sc->sc_wdcdev.set_modes(&cp->wdc_channel); + } +} + +void +sii3114_mapreg_dma(struct pciide_softc *sc, struct pci_attach_args *pa) +{ + struct pciide_channel *pc; + int chan, reg; + bus_size_t size; + struct pciide_satalink *sl = sc->sc_cookie; + + sc->sc_wdcdev.dma_arg = sc; + sc->sc_wdcdev.dma_init = pciide_dma_init; + sc->sc_wdcdev.dma_start = pciide_dma_start; + sc->sc_wdcdev.dma_finish = pciide_dma_finish; + + /* + * Slice off a subregion of BA5 for each of the channel's DMA + * registers. + */ + + sc->sc_dma_iot = sl->ba5_st; + for (chan = 0; chan < 4; chan++) { + pc = &sc->pciide_channels[chan]; + for (reg = 0; reg < IDEDMA_NREGS; reg++) { + size = 4; + if (size > (IDEDMA_SCH_OFFSET - reg)) + size = IDEDMA_SCH_OFFSET - reg; + if (bus_space_subregion(sl->ba5_st, + sl->ba5_sh, + satalink_ba5_regmap[chan].ba5_IDEDMA_CMD + reg, + size, &sl->regs[chan].dma_iohs[reg]) != 0) { + sc->sc_dma_ok = 0; + printf(": can't subregion offset " + "%lu size %lu", + (u_long) satalink_ba5_regmap[ + chan].ba5_IDEDMA_CMD + reg, + (u_long) size); + return; + } + } + } + + sc->sc_dmacmd_read = sii3114_dmacmd_read; + sc->sc_dmacmd_write = sii3114_dmacmd_write; + sc->sc_dmactl_read = sii3114_dmactl_read; + sc->sc_dmactl_write = sii3114_dmactl_write; + sc->sc_dmatbl_write = sii3114_dmatbl_write; + + /* DMA registers all set up! */ + sc->sc_dmat = pa->pa_dmat; + sc->sc_dma_ok = 1; +} + +int +sii3114_chansetup(struct pciide_softc *sc, int channel) +{ + static const char *channel_names[] = { + "port 0", + "port 1", + "port 2", + "port 3", + }; + struct pciide_channel *cp = &sc->pciide_channels[channel]; + + sc->wdc_chanarray[channel] = &cp->wdc_channel; + + /* + * We must always keep the Interrupt Steering bit set in channel 2's + * IDEDMA_CMD register. + */ + if (channel == 2) + cp->idedma_cmd = IDEDMA_CMD_INT_STEER; + + cp->name = channel_names[channel]; + cp->wdc_channel.channel = channel; + cp->wdc_channel.wdc = &sc->sc_wdcdev; + cp->wdc_channel.ch_queue = + malloc(sizeof(struct channel_queue), M_DEVBUF, M_NOWAIT); + if (cp->wdc_channel.ch_queue == NULL) { + printf("%s %s channel: " + "can't allocate memory for command queue", + sc->sc_wdcdev.sc_dev.dv_xname, cp->name); + return (0); + } + return (1); +} + +void +sii3114_mapchan(struct pciide_channel *cp) +{ + struct channel_softc *wdc_cp = &cp->wdc_channel; + struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc; + struct pciide_satalink *sl = sc->sc_cookie; + int chan = wdc_cp->channel; + int i; + + cp->hw_ok = 0; + cp->compat = 0; + cp->ih = sc->sc_pci_ih; + + sl->regs[chan].cmd_iot = sl->ba5_st; + if (bus_space_subregion(sl->ba5_st, sl->ba5_sh, + satalink_ba5_regmap[chan].ba5_IDE_TF0, + 9, &sl->regs[chan].cmd_baseioh) != 0) { + printf("%s: couldn't subregion %s cmd base\n", + sc->sc_wdcdev.sc_dev.dv_xname, cp->name); + return; + } + + sl->regs[chan].ctl_iot = sl->ba5_st; + if (bus_space_subregion(sl->ba5_st, sl->ba5_sh, + satalink_ba5_regmap[chan].ba5_IDE_TF8, + 1, &cp->ctl_baseioh) != 0) { + printf("%s: couldn't subregion %s ctl base\n", + sc->sc_wdcdev.sc_dev.dv_xname, cp->name); + return; + } + sl->regs[chan].ctl_ioh = cp->ctl_baseioh; + + for (i = 0; i < WDC_NREG; i++) { + if (bus_space_subregion(sl->regs[chan].cmd_iot, + sl->regs[chan].cmd_baseioh, + i, i == 0 ? 4 : 1, + &sl->regs[chan].cmd_iohs[i]) != 0) { + printf("%s: couldn't subregion %s channel " + "cmd regs\n", + sc->sc_wdcdev.sc_dev.dv_xname, cp->name); + return; + } + } + sl->regs[chan].cmd_iohs[wdr_status & _WDC_REGMASK] = + sl->regs[chan].cmd_iohs[wdr_command & _WDC_REGMASK]; + sl->regs[chan].cmd_iohs[wdr_features & _WDC_REGMASK] = + sl->regs[chan].cmd_iohs[wdr_error & _WDC_REGMASK]; + wdc_cp->data32iot = wdc_cp->cmd_iot = sl->regs[chan].cmd_iot; + wdc_cp->data32ioh = wdc_cp->cmd_ioh = sl->regs[chan].cmd_iohs[0]; + wdc_cp->_vtbl = &wdc_sii3114_vtbl; + wdcattach(wdc_cp); + cp->hw_ok = 1; +} + +u_int8_t +sii3114_read_reg(struct channel_softc *chp, enum wdc_regs reg) +{ + struct pciide_channel *cp = (struct pciide_channel *)chp; + struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc; + struct pciide_satalink *sl = sc->sc_cookie; + + if (reg & _WDC_AUX) + return (bus_space_read_1(sl->regs[chp->channel].ctl_iot, + sl->regs[chp->channel].ctl_ioh, reg & _WDC_REGMASK)); + else + return (bus_space_read_1(sl->regs[chp->channel].cmd_iot, + sl->regs[chp->channel].cmd_iohs[reg & _WDC_REGMASK], 0)); +} + +void +sii3114_write_reg(struct channel_softc *chp, enum wdc_regs reg, u_int8_t val) +{ + struct pciide_channel *cp = (struct pciide_channel *)chp; + struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc; + struct pciide_satalink *sl = sc->sc_cookie; + + if (reg & _WDC_AUX) + bus_space_write_1(sl->regs[chp->channel].ctl_iot, + sl->regs[chp->channel].ctl_ioh, reg & _WDC_REGMASK, val); + else + bus_space_write_1(sl->regs[chp->channel].cmd_iot, + sl->regs[chp->channel].cmd_iohs[reg & _WDC_REGMASK], + 0, val); +} + +u_int8_t +sii3114_dmacmd_read(struct pciide_softc *sc, int chan) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + return (bus_space_read_1(sc->sc_dma_iot, + sl->regs[chan].dma_iohs[IDEDMA_CMD(0)], 0)); +} + +void +sii3114_dmacmd_write(struct pciide_softc *sc, int chan, u_int8_t val) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + bus_space_write_1(sc->sc_dma_iot, + sl->regs[chan].dma_iohs[IDEDMA_CMD(0)], 0, val); +} + +u_int8_t +sii3114_dmactl_read(struct pciide_softc *sc, int chan) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + return (bus_space_read_1(sc->sc_dma_iot, + sl->regs[chan].dma_iohs[IDEDMA_CTL(0)], 0)); +} + +void +sii3114_dmactl_write(struct pciide_softc *sc, int chan, u_int8_t val) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + bus_space_write_1(sc->sc_dma_iot, + sl->regs[chan].dma_iohs[IDEDMA_CTL(0)], 0, val); +} + +void +sii3114_dmatbl_write(struct pciide_softc *sc, int chan, u_int32_t val) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + bus_space_write_4(sc->sc_dma_iot, + sl->regs[chan].dma_iohs[IDEDMA_TBL(0)], 0, val); +} + +void cy693_chip_map(sc, pa) struct pciide_softc *sc; struct pci_attach_args *pa; diff --git a/sys/dev/pci/pciide_sii3112_reg.h b/sys/dev/pci/pciide_sii3112_reg.h index 702b91f87f0..588f3edc128 100644 --- a/sys/dev/pci/pciide_sii3112_reg.h +++ b/sys/dev/pci/pciide_sii3112_reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide_sii3112_reg.h,v 1.1 2003/05/17 18:45:15 grange Exp $ */ +/* $OpenBSD: pciide_sii3112_reg.h,v 1.2 2004/10/17 19:21:37 grange Exp $ */ /* $NetBSD: pciide_sii3112_reg.h,v 1.1 2003/03/20 04:22:50 thorpej Exp $ */ /* @@ -74,9 +74,16 @@ #define SCS_CMD_FF0_RESET (1U << 5) /* IDE0 FIFO reset */ #define SCS_CMD_IDE1_RESET (1U << 6) /* IDE1 module reset */ #define SCS_CMD_IDE0_RESET (1U << 7) /* IDE0 module reset */ -#define SCS_CMD_BA5_EN (1U << 16) /* BA5 is enabled */ +#define SCS_CMD_FF3_RESET (1U << 8) /* IDE3 FIFO reset (3114) */ +#define SCS_CMD_FF2_RESET (1U << 9) /* IDE2 FIFO reset (3114) */ +#define SCS_CMD_IDE3_RESET (1U << 10) /* IDE3 module reset (3114) */ +#define SCS_CMD_IDE2_RESET (1U << 11) /* IDE2 module reset (3114) */ +#define SCS_CMD_BA5_EN (1U << 16) /* BA5 is enabled (3112) */ +#define SCS_CMD_M66EN (1U << 16) /* 1=66MHz, 0=33MHz (3114) */ #define SCS_CMD_IDE0_INT_BLOCK (1U << 22) /* IDE0 interrupt block */ #define SCS_CMD_IDE1_INT_BLOCK (1U << 23) /* IDE1 interrupt block */ +#define SCS_CMD_IDE2_INT_BLOCK (1U << 24) /* IDE2 interrupt block */ +#define SCS_CMD_IDE3_INT_BLOCK (1U << 25) /* IDE3 interrupt block */ #define SII3112_SSDR 0x8c /* System SW Data Register */ @@ -102,4 +109,297 @@ #define SII3112_BA5_IND_DATA 0xc4 /* BA5 indirect data */ +/* + * Register map for BA5 register space, indexed by channel. + */ +static const struct { + bus_addr_t ba5_IDEDMA_CMD; + bus_addr_t ba5_IDEDMA_CTL; + bus_addr_t ba5_IDEDMA_TBL; + bus_addr_t ba5_IDEDMA_CMD2; + bus_addr_t ba5_IDEDMA_CTL2; + bus_addr_t ba5_IDE_TF0; + bus_addr_t ba5_IDE_TF1; + bus_addr_t ba5_IDE_TF2; + bus_addr_t ba5_IDE_TF3; + bus_addr_t ba5_IDE_TF4; + bus_addr_t ba5_IDE_TF5; + bus_addr_t ba5_IDE_TF6; + bus_addr_t ba5_IDE_TF7; + bus_addr_t ba5_IDE_TF8; + bus_addr_t ba5_IDE_RAD; + bus_addr_t ba5_IDE_TF9; + bus_addr_t ba5_IDE_TF10; + bus_addr_t ba5_IDE_TF11; + bus_addr_t ba5_IDE_TF12; + bus_addr_t ba5_IDE_TF13; + bus_addr_t ba5_IDE_TF14; + bus_addr_t ba5_IDE_TF15; + bus_addr_t ba5_IDE_TF16; + bus_addr_t ba5_IDE_TF17; + bus_addr_t ba5_IDE_TF18; + bus_addr_t ba5_IDE_TF19; + bus_addr_t ba5_IDE_RABC; + bus_addr_t ba5_IDE_CMD_STS; + bus_addr_t ba5_IDE_CFG_STS; + bus_addr_t ba5_IDE_DTM; + bus_addr_t ba5_SControl; + bus_addr_t ba5_SStatus; + bus_addr_t ba5_SError; + bus_addr_t ba5_SActive; /* 3114 */ + bus_addr_t ba5_SMisc; + bus_addr_t ba5_PHY_CONFIG; + bus_addr_t ba5_SIEN; + bus_addr_t ba5_SFISCfg; +} satalink_ba5_regmap[] = { + { /* Channel 0 */ + .ba5_IDEDMA_CMD = 0x000, + .ba5_IDEDMA_CTL = 0x002, + .ba5_IDEDMA_TBL = 0x004, + .ba5_IDEDMA_CMD2 = 0x010, + .ba5_IDEDMA_CTL2 = 0x012, + .ba5_IDE_TF0 = 0x080, /* wd_data */ + .ba5_IDE_TF1 = 0x081, /* wd_error */ + .ba5_IDE_TF2 = 0x082, /* wd_seccnt */ + .ba5_IDE_TF3 = 0x083, /* wd_sector */ + .ba5_IDE_TF4 = 0x084, /* wd_cyl_lo */ + .ba5_IDE_TF5 = 0x085, /* wd_cyl_hi */ + .ba5_IDE_TF6 = 0x086, /* wd_sdh */ + .ba5_IDE_TF7 = 0x087, /* wd_command */ + .ba5_IDE_TF8 = 0x08a, /* wd_altsts */ + .ba5_IDE_RAD = 0x08c, + .ba5_IDE_TF9 = 0x091, /* Features 2 */ + .ba5_IDE_TF10 = 0x092, /* Sector Count 2 */ + .ba5_IDE_TF11 = 0x093, /* Start Sector 2 */ + .ba5_IDE_TF12 = 0x094, /* Cylinder Low 2 */ + .ba5_IDE_TF13 = 0x095, /* Cylinder High 2 */ + .ba5_IDE_TF14 = 0x096, /* Device/Head 2 */ + .ba5_IDE_TF15 = 0x097, /* Cmd Sts 2 */ + .ba5_IDE_TF16 = 0x098, /* Sector Count 2 ext */ + .ba5_IDE_TF17 = 0x099, /* Start Sector 2 ext */ + .ba5_IDE_TF18 = 0x09a, /* Cyl Low 2 ext */ + .ba5_IDE_TF19 = 0x09b, /* Cyl High 2 ext */ + .ba5_IDE_RABC = 0x09c, + .ba5_IDE_CMD_STS = 0x0a0, + .ba5_IDE_CFG_STS = 0x0a1, + .ba5_IDE_DTM = 0x0b4, + .ba5_SControl = 0x100, + .ba5_SStatus = 0x104, + .ba5_SError = 0x108, + .ba5_SActive = 0x10c, + .ba5_SMisc = 0x140, + .ba5_PHY_CONFIG = 0x144, + .ba5_SIEN = 0x148, + .ba5_SFISCfg = 0x14c, + }, + { /* Channel 1 */ + .ba5_IDEDMA_CMD = 0x008, + .ba5_IDEDMA_CTL = 0x00a, + .ba5_IDEDMA_TBL = 0x00c, + .ba5_IDEDMA_CMD2 = 0x018, + .ba5_IDEDMA_CTL2 = 0x01a, + .ba5_IDE_TF0 = 0x0c0, /* wd_data */ + .ba5_IDE_TF1 = 0x0c1, /* wd_error */ + .ba5_IDE_TF2 = 0x0c2, /* wd_seccnt */ + .ba5_IDE_TF3 = 0x0c3, /* wd_sector */ + .ba5_IDE_TF4 = 0x0c4, /* wd_cyl_lo */ + .ba5_IDE_TF5 = 0x0c5, /* wd_cyl_hi */ + .ba5_IDE_TF6 = 0x0c6, /* wd_sdh */ + .ba5_IDE_TF7 = 0x0c7, /* wd_command */ + .ba5_IDE_TF8 = 0x0ca, /* wd_altsts */ + .ba5_IDE_RAD = 0x0cc, + .ba5_IDE_TF9 = 0x0d1, /* Features 2 */ + .ba5_IDE_TF10 = 0x0d2, /* Sector Count 2 */ + .ba5_IDE_TF11 = 0x0d3, /* Start Sector 2 */ + .ba5_IDE_TF12 = 0x0d4, /* Cylinder Low 2 */ + .ba5_IDE_TF13 = 0x0d5, /* Cylinder High 2 */ + .ba5_IDE_TF14 = 0x0d6, /* Device/Head 2 */ + .ba5_IDE_TF15 = 0x0d7, /* Cmd Sts 2 */ + .ba5_IDE_TF16 = 0x0d8, /* Sector Count 2 ext */ + .ba5_IDE_TF17 = 0x0d9, /* Start Sector 2 ext */ + .ba5_IDE_TF18 = 0x0da, /* Cyl Low 2 ext */ + .ba5_IDE_TF19 = 0x0db, /* Cyl High 2 ext */ + .ba5_IDE_RABC = 0x0dc, + .ba5_IDE_CMD_STS = 0x0e0, + .ba5_IDE_CFG_STS = 0x0e1, + .ba5_IDE_DTM = 0x0f4, + .ba5_SControl = 0x180, + .ba5_SStatus = 0x184, + .ba5_SError = 0x188, + .ba5_SActive = 0x18c, + .ba5_SMisc = 0x1c0, + .ba5_PHY_CONFIG = 0x1c4, + .ba5_SIEN = 0x1c8, + .ba5_SFISCfg = 0x1cc, + }, + { /* Channel 2 (3114) */ + .ba5_IDEDMA_CMD = 0x200, + .ba5_IDEDMA_CTL = 0x202, + .ba5_IDEDMA_TBL = 0x204, + .ba5_IDEDMA_CMD2 = 0x210, + .ba5_IDEDMA_CTL2 = 0x212, + .ba5_IDE_TF0 = 0x280, /* wd_data */ + .ba5_IDE_TF1 = 0x281, /* wd_error */ + .ba5_IDE_TF2 = 0x282, /* wd_seccnt */ + .ba5_IDE_TF3 = 0x283, /* wd_sector */ + .ba5_IDE_TF4 = 0x284, /* wd_cyl_lo */ + .ba5_IDE_TF5 = 0x285, /* wd_cyl_hi */ + .ba5_IDE_TF6 = 0x286, /* wd_sdh */ + .ba5_IDE_TF7 = 0x287, /* wd_command */ + .ba5_IDE_TF8 = 0x28a, /* wd_altsts */ + .ba5_IDE_RAD = 0x28c, + .ba5_IDE_TF9 = 0x291, /* Features 2 */ + .ba5_IDE_TF10 = 0x292, /* Sector Count 2 */ + .ba5_IDE_TF11 = 0x293, /* Start Sector 2 */ + .ba5_IDE_TF12 = 0x294, /* Cylinder Low 2 */ + .ba5_IDE_TF13 = 0x295, /* Cylinder High 2 */ + .ba5_IDE_TF14 = 0x296, /* Device/Head 2 */ + .ba5_IDE_TF15 = 0x297, /* Cmd Sts 2 */ + .ba5_IDE_TF16 = 0x298, /* Sector Count 2 ext */ + .ba5_IDE_TF17 = 0x299, /* Start Sector 2 ext */ + .ba5_IDE_TF18 = 0x29a, /* Cyl Low 2 ext */ + .ba5_IDE_TF19 = 0x29b, /* Cyl High 2 ext */ + .ba5_IDE_RABC = 0x29c, + .ba5_IDE_CMD_STS = 0x2a0, + .ba5_IDE_CFG_STS = 0x2a1, + .ba5_IDE_DTM = 0x2b4, + .ba5_SControl = 0x300, + .ba5_SStatus = 0x304, + .ba5_SError = 0x308, + .ba5_SActive = 0x30c, + .ba5_SMisc = 0x340, + .ba5_PHY_CONFIG = 0x344, + .ba5_SIEN = 0x348, + .ba5_SFISCfg = 0x34c, + }, + { /* Channel 3 (3114) */ + .ba5_IDEDMA_CMD = 0x208, + .ba5_IDEDMA_CTL = 0x20a, + .ba5_IDEDMA_TBL = 0x20c, + .ba5_IDEDMA_CMD2 = 0x218, + .ba5_IDEDMA_CTL2 = 0x21a, + .ba5_IDE_TF0 = 0x2c0, /* wd_data */ + .ba5_IDE_TF1 = 0x2c1, /* wd_error */ + .ba5_IDE_TF2 = 0x2c2, /* wd_seccnt */ + .ba5_IDE_TF3 = 0x2c3, /* wd_sector */ + .ba5_IDE_TF4 = 0x2c4, /* wd_cyl_lo */ + .ba5_IDE_TF5 = 0x2c5, /* wd_cyl_hi */ + .ba5_IDE_TF6 = 0x2c6, /* wd_sdh */ + .ba5_IDE_TF7 = 0x2c7, /* wd_command */ + .ba5_IDE_TF8 = 0x2ca, /* wd_altsts */ + .ba5_IDE_RAD = 0x2cc, + .ba5_IDE_TF9 = 0x2d1, /* Features 2 */ + .ba5_IDE_TF10 = 0x2d2, /* Sector Count 2 */ + .ba5_IDE_TF11 = 0x2d3, /* Start Sector 2 */ + .ba5_IDE_TF12 = 0x2d4, /* Cylinder Low 2 */ + .ba5_IDE_TF13 = 0x2d5, /* Cylinder High 2 */ + .ba5_IDE_TF14 = 0x2d6, /* Device/Head 2 */ + .ba5_IDE_TF15 = 0x2d7, /* Cmd Sts 2 */ + .ba5_IDE_TF16 = 0x2d8, /* Sector Count 2 ext */ + .ba5_IDE_TF17 = 0x2d9, /* Start Sector 2 ext */ + .ba5_IDE_TF18 = 0x2da, /* Cyl Low 2 ext */ + .ba5_IDE_TF19 = 0x2db, /* Cyl High 2 ext */ + .ba5_IDE_RABC = 0x2dc, + .ba5_IDE_CMD_STS = 0x2e0, + .ba5_IDE_CFG_STS = 0x2e1, + .ba5_IDE_DTM = 0x2f4, + .ba5_SControl = 0x380, + .ba5_SStatus = 0x384, + .ba5_SError = 0x388, + .ba5_SActive = 0x38c, + .ba5_SMisc = 0x3c0, + .ba5_PHY_CONFIG = 0x3c4, + .ba5_SIEN = 0x3c8, + .ba5_SFISCfg = 0x3cc, + }, +}; + +#define ba5_SIS 0x214 /* summary interrupt status */ + +/* Interrupt steering bit in BA5[0x200]. */ +#define IDEDMA_CMD_INT_STEER (1U << 1) + +/* Private data */ +struct pciide_satalink { + bus_space_tag_t ba5_st; + bus_space_handle_t ba5_sh; + int ba5_en; + + struct { + bus_space_tag_t cmd_iot; + bus_space_handle_t cmd_baseioh; + bus_space_handle_t cmd_iohs[WDC_NREG+WDC_NSHADOWREG]; + + bus_space_tag_t ctl_iot; + bus_space_handle_t ctl_ioh; + + bus_space_handle_t dma_iohs[IDEDMA_NREGS]; + } regs[4]; +}; + +static __inline uint32_t +ba5_read_4_ind(struct pciide_softc *sc, bus_addr_t reg) +{ + uint32_t rv; + int s; + + s = splbio(); + pci_conf_write(sc->sc_pc, sc->sc_tag, SII3112_BA5_IND_ADDR, reg); + rv = pci_conf_read(sc->sc_pc, sc->sc_tag, SII3112_BA5_IND_DATA); + splx(s); + + return (rv); +} + +static __inline uint32_t +ba5_read_4(struct pciide_softc *sc, bus_addr_t reg) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + if (__predict_true(sl->ba5_en != 0)) + return (bus_space_read_4(sl->ba5_st, sl->ba5_sh, reg)); + + return (ba5_read_4_ind(sc, reg)); +} + +#define BA5_READ_4(sc, chan, reg) \ + ba5_read_4((sc), satalink_ba5_regmap[(chan)].reg) + +static __inline void +ba5_write_4_ind(struct pciide_softc *sc, bus_addr_t reg, uint32_t val) +{ + int s; + + s = splbio(); + pci_conf_write(sc->sc_pc, sc->sc_tag, SII3112_BA5_IND_ADDR, reg); + pci_conf_write(sc->sc_pc, sc->sc_tag, SII3112_BA5_IND_DATA, val); + splx(s); +} + +static __inline void +ba5_write_4(struct pciide_softc *sc, bus_addr_t reg, uint32_t val) +{ + struct pciide_satalink *sl = sc->sc_cookie; + + if (__predict_true(sl->ba5_en != 0)) + bus_space_write_4(sl->ba5_st, sl->ba5_sh, reg, val); + else + ba5_write_4_ind(sc, reg, val); +} + +#define BA5_WRITE_4(sc, chan, reg, val) \ + ba5_write_4((sc), satalink_ba5_regmap[(chan)].reg, (val)) + +u_int8_t sii3114_read_reg(struct channel_softc *, enum wdc_regs); +void sii3114_write_reg(struct channel_softc *, enum wdc_regs, u_int8_t); + +struct channel_softc_vtbl wdc_sii3114_vtbl = { + sii3114_read_reg, + sii3114_write_reg, + wdc_default_read_raw_multi_2, + wdc_default_write_raw_multi_2, + wdc_default_read_raw_multi_4, + wdc_default_write_raw_multi_4 +}; + #endif /* _DEV_PCI_PCIIDE_SII3112_REG_H_ */ |