Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for the CMD PCI0646U2, an Ultra/33 version of the 0646. 

Note: there's also a PCI0646U, for which I don't have docs for now.
This commit is contained in:
bouyer 2000-08-01 21:02:55 +00:00
parent 8451f00774
commit 76c77aca38
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/pci/pciide.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide.c,v 1.81 2000/07/27 14:28:45 bouyer Exp $ */ /* $NetBSD: pciide.c,v 1.82 2000/08/01 21:02:55 bouyer Exp $ */
/* /*
@ -2165,6 +2165,8 @@ cmd0643_9_chip_map(sc, pa)
{ {
struct pciide_channel *cp; struct pciide_channel *cp;
int channel; int channel;
int rev = PCI_REVISION(
pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_CLASS_REG));
/* /*
* For a CMD PCI064x, the use of PCI_COMMAND_IO_ENABLE * For a CMD PCI064x, the use of PCI_COMMAND_IO_ENABLE
@ -2193,7 +2195,13 @@ cmd0643_9_chip_map(sc, pa)
case PCI_PRODUCT_CMDTECH_648: case PCI_PRODUCT_CMDTECH_648:
sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA; sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
sc->sc_wdcdev.UDMA_cap = 4; sc->sc_wdcdev.UDMA_cap = 4;
sc->sc_wdcdev.irqack = cmd646_9_irqack;
break;
case PCI_PRODUCT_CMDTECH_646: case PCI_PRODUCT_CMDTECH_646:
if (rev >= CMD0646U2_REV) {
sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
sc->sc_wdcdev.UDMA_cap = 2;
}
sc->sc_wdcdev.irqack = cmd646_9_irqack; sc->sc_wdcdev.irqack = cmd646_9_irqack;
break; break;
default: default:
@ -2219,6 +2227,7 @@ cmd0643_9_chip_map(sc, pa)
continue; continue;
cmd0643_9_setup_channel(&cp->wdc_channel); cmd0643_9_setup_channel(&cp->wdc_channel);
} }
/* note - this also make sure we clear the irq disable and reset bits */
pciide_pci_write(sc->sc_pc, sc->sc_tag, CMD_DMA_MODE, CMD_DMA_MULTIPLE); pciide_pci_write(sc->sc_pc, sc->sc_tag, CMD_DMA_MODE, CMD_DMA_MULTIPLE);
WDCDEBUG_PRINT(("cmd0643_9_chip_map: timings reg now 0x%x 0x%x\n", WDCDEBUG_PRINT(("cmd0643_9_chip_map: timings reg now 0x%x 0x%x\n",
pci_conf_read(sc->sc_pc, sc->sc_tag, 0x54), pci_conf_read(sc->sc_pc, sc->sc_tag, 0x54),
@ -2250,7 +2259,7 @@ cmd0643_9_setup_channel(chp)
tim = cmd0643_9_data_tim_pio[drvp->PIO_mode]; tim = cmd0643_9_data_tim_pio[drvp->PIO_mode];
if (drvp->drive_flags & (DRIVE_DMA | DRIVE_UDMA)) { if (drvp->drive_flags & (DRIVE_DMA | DRIVE_UDMA)) {
if (drvp->drive_flags & DRIVE_UDMA) { if (drvp->drive_flags & DRIVE_UDMA) {
/* UltraDMA on a 0648 or 0649 */ /* UltraDMA on a 646U2, 0648 or 0649 */
udma_reg = pciide_pci_read(sc->sc_pc, udma_reg = pciide_pci_read(sc->sc_pc,
sc->sc_tag, CMD_UDMATIM(chp->channel)); sc->sc_tag, CMD_UDMATIM(chp->channel));
if (drvp->UDMA_mode > 2 && if (drvp->UDMA_mode > 2 &&
@ -2260,13 +2269,13 @@ cmd0643_9_setup_channel(chp)
drvp->UDMA_mode = 2; drvp->UDMA_mode = 2;
if (drvp->UDMA_mode > 2) if (drvp->UDMA_mode > 2)
udma_reg &= ~CMD_UDMATIM_UDMA33(drive); udma_reg &= ~CMD_UDMATIM_UDMA33(drive);
else else if (sc->sc_wdcdev.UDMA_cap > 2)
udma_reg |= CMD_UDMATIM_UDMA33(drive); udma_reg |= CMD_UDMATIM_UDMA33(drive);
udma_reg |= CMD_UDMATIM_UDMA(drive); udma_reg |= CMD_UDMATIM_UDMA(drive);
udma_reg &= ~(CMD_UDMATIM_TIM_MASK << udma_reg &= ~(CMD_UDMATIM_TIM_MASK <<
CMD_UDMATIM_TIM_OFF(drive)); CMD_UDMATIM_TIM_OFF(drive));
udma_reg |= udma_reg |=
(cmd0648_9_tim_udma[drvp->UDMA_mode] << (cmd0646_9_tim_udma[drvp->UDMA_mode] <<
CMD_UDMATIM_TIM_OFF(drive)); CMD_UDMATIM_TIM_OFF(drive));
pciide_pci_write(sc->sc_pc, sc->sc_tag, pciide_pci_write(sc->sc_pc, sc->sc_tag,
CMD_UDMATIM(chp->channel), udma_reg); CMD_UDMATIM(chp->channel), udma_reg);
@ -2275,7 +2284,7 @@ cmd0643_9_setup_channel(chp)
* use Multiword DMA. * use Multiword DMA.
* Timings will be used for both PIO and DMA, * Timings will be used for both PIO and DMA,
* so adjust DMA mode if needed * so adjust DMA mode if needed
* if we have a 0648/9, turn off UDMA * if we have a 0646U2/8/9, turn off UDMA
*/ */
if (sc->sc_wdcdev.cap & WDC_CAPABILITY_UDMA) { if (sc->sc_wdcdev.cap & WDC_CAPABILITY_UDMA) {
udma_reg = pciide_pci_read(sc->sc_pc, udma_reg = pciide_pci_read(sc->sc_pc,

16
sys/dev/pci/pciide_cmd_reg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pciide_cmd_reg.h,v 1.7 2000/06/26 10:07:52 bouyer Exp $ */ /* $NetBSD: pciide_cmd_reg.h,v 1.8 2000/08/01 21:02:56 bouyer Exp $ */
/* /*
* Copyright (c) 1998 Manuel Bouyer. * Copyright (c) 1998 Manuel Bouyer.
@ -37,6 +37,9 @@
* Available from http://www.cmd.com/ * Available from http://www.cmd.com/
*/ */
/* revision of the 0646U2 */
#define CMD0646U2_REV 0x05
/* Configuration (RO) */ /* Configuration (RO) */
#define CMD_CONF 0x50 #define CMD_CONF 0x50
#define CMD_CONF_REV_MASK 0x03 /* 0640/3/6 only */ #define CMD_CONF_REV_MASK 0x03 /* 0640/3/6 only */
@ -74,11 +77,16 @@
/* DMA master read mode select */ /* DMA master read mode select */
#define CMD_DMA_MODE 0x71 #define CMD_DMA_MODE 0x71
#define CMD_DMA_MASK 0x03
#define CMD_DMA 0x00 #define CMD_DMA 0x00
#define CMD_DMA_MULTIPLE 0x01 #define CMD_DMA_MULTIPLE 0x01
#define CMD_DMA_LINE 0x10 #define CMD_DMA_LINE 0x03
/* the followings bits are only for 0646U/646U2/648/649 */
#define CMD_DMA_IRQ(chan) (0x4 << (chan))
#define CMD_DMA_IRQ_DIS(chan) (0x10 << (chan))
#define CMD_DMA_RST 0x40
/* the followings are only for 0648/9 */ /* the followings are only for 0646U/646U2/648/649 */
/* busmaster control/status register */ /* busmaster control/status register */
#define CMD_BICSR 0x79 #define CMD_BICSR 0x79
#define CMD_BICSR_80(chan) (0x01 << (chan)) #define CMD_BICSR_80(chan) (0x01 << (chan))
@ -88,7 +96,7 @@
#define CMD_UDMATIM_UDMA33(drive) (0x04 << (drive)) #define CMD_UDMATIM_UDMA33(drive) (0x04 << (drive))
#define CMD_UDMATIM_TIM_MASK 0x3 #define CMD_UDMATIM_TIM_MASK 0x3
#define CMD_UDMATIM_TIM_OFF(drive) (4 + ((drive) * 2)) #define CMD_UDMATIM_TIM_OFF(drive) (4 + ((drive) * 2))
static int8_t cmd0648_9_tim_udma[] = {0x03, 0x02, 0x01, 0x02, 0x01}; static int8_t cmd0646_9_tim_udma[] = {0x03, 0x02, 0x01, 0x02, 0x01};
/* /*
* timings values for the 0643/6/8/9 * timings values for the 0643/6/8/9