d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak nForce3 SATA support.

Browse Source
This commit is contained in:
sos 2006-08-05 11:41:46 +00:00
parent 89fb95df13
commit 960ae2041b
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/dev/ata/ata-chipset.c
View File

@ -2772,17 +2772,17 @@ ata_nvidia_ident(device_t dev)
{ ATA_NFORCE3_PRO_S1, 0, 0, 0, ATA_SA150, "nForce3 Pro" }, { ATA_NFORCE3_PRO_S1, 0, 0, 0, ATA_SA150, "nForce3 Pro" },
{ ATA_NFORCE3_PRO_S2, 0, 0, 0, ATA_SA150, "nForce3 Pro" }, { ATA_NFORCE3_PRO_S2, 0, 0, 0, ATA_SA150, "nForce3 Pro" },
{ ATA_NFORCE_MCP04, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP" }, { ATA_NFORCE_MCP04, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP" },
{ ATA_NFORCE_MCP04_S1, 0, 0, NV4BYTE, ATA_SA150, "nForce MCP" }, { ATA_NFORCE_MCP04_S1, 0, 0, NV4, ATA_SA150, "nForce MCP" },
{ ATA_NFORCE_MCP04_S2, 0, 0, NV4BYTE, ATA_SA150, "nForce MCP" }, { ATA_NFORCE_MCP04_S2, 0, 0, NV4, ATA_SA150, "nForce MCP" },
{ ATA_NFORCE_CK804, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce CK804" }, { ATA_NFORCE_CK804, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce CK804" },
{ ATA_NFORCE_CK804_S1, 0, 0, NV4BYTE, ATA_SA300, "nForce CK804" }, { ATA_NFORCE_CK804_S1, 0, 0, NV4, ATA_SA300, "nForce CK804" },
{ ATA_NFORCE_CK804_S2, 0, 0, NV4BYTE, ATA_SA300, "nForce CK804" }, { ATA_NFORCE_CK804_S2, 0, 0, NV4, ATA_SA300, "nForce CK804" },
{ ATA_NFORCE_MCP51, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP51" }, { ATA_NFORCE_MCP51, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP51" },
{ ATA_NFORCE_MCP51_S1, 0, 0, NV4WORD, ATA_SA300, "nForce MCP51" }, { ATA_NFORCE_MCP51_S1, 0, 0, NV4LONG, ATA_SA300, "nForce MCP51" },
{ ATA_NFORCE_MCP51_S2, 0, 0, NV4WORD, ATA_SA300, "nForce MCP51" }, { ATA_NFORCE_MCP51_S2, 0, 0, NV4LONG, ATA_SA300, "nForce MCP51" },
{ ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" },
{ ATA_NFORCE_MCP55_S1, 0, 0, NV4WORD, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S1, 0, 0, NV4LONG, ATA_SA300, "nForce MCP55" },
{ ATA_NFORCE_MCP55_S2, 0, 0, NV4WORD, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S2, 0, 0, NV4LONG, ATA_SA300, "nForce MCP55" },
{ 0, 0, 0, 0, 0, 0}} ; { 0, 0, 0, 0, 0, 0}} ;
char buffer[64] ; char buffer[64] ;
@ -2821,19 +2821,19 @@ ata_nvidia_chipinit(device_t dev)
/* enable control access */ /* enable control access */
pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1); pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1);
if (ctlr->chip->cfg2 == NV4BYTE) { if (ctlr->chip->cfg2 & NV4LONG) {
/* clear interrupt status */
ATA_OUTB(ctlr->r_res2, offset, 0xff);
/* enable device and PHY state change interrupts */
ATA_OUTB(ctlr->r_res2, offset + 1, 0xdd);
}
else {
/* clear interrupt status */ /* clear interrupt status */
ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff); ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff);
/* enable device and PHY state change interrupts */ /* enable device and PHY state change interrupts */
ATA_OUTL(ctlr->r_res2, offset + 4, 0x00dd00dd); ATA_OUTL(ctlr->r_res2, offset + 4, 0x00dd00dd);
}
else {
/* clear interrupt status */
ATA_OUTB(ctlr->r_res2, offset, 0xff);
/* enable device and PHY state change interrupts */
ATA_OUTB(ctlr->r_res2, offset + 1, 0xdd);
} }
/* enable PCI interrupt */ /* enable PCI interrupt */
@ -2881,18 +2881,18 @@ ata_nvidia_status(device_t dev)
struct ata_channel *ch = device_get_softc(dev); struct ata_channel *ch = device_get_softc(dev);
int offset = ctlr->chip->cfg2 & NV4 ? 0x0440 : 0x0010; int offset = ctlr->chip->cfg2 & NV4 ? 0x0440 : 0x0010;
struct ata_connect_task *tp; struct ata_connect_task *tp;
int shift = ch->unit << (ctlr->chip->cfg2 == NV4BYTE ? 2 : 4); int shift = ch->unit << (ctlr->chip->cfg2 & NV4LONG ? 4 : 2);
u_int32_t status; u_int32_t status;
/* get and clear interrupt status */ /* get and clear interrupt status */
if (ctlr->chip->cfg2 == NV4BYTE) { if (ctlr->chip->cfg2 & NV4LONG) {
status = ATA_INB(ctlr->r_res2, offset);
ATA_OUTB(ctlr->r_res2, offset, (0x0f << shift));
}
else {
status = ATA_INL(ctlr->r_res2, offset); status = ATA_INL(ctlr->r_res2, offset);
ATA_OUTL(ctlr->r_res2, offset, (0x0f << shift)); ATA_OUTL(ctlr->r_res2, offset, (0x0f << shift));
} }
else {
status = ATA_INB(ctlr->r_res2, offset);
ATA_OUTB(ctlr->r_res2, offset, (0x0f << shift));
}
/* check for and handle connect events */ /* check for and handle connect events */
if (((status & (0x0c << shift)) == (0x04 << shift)) && if (((status & (0x0c << shift)) == (0x04 << shift)) &&

3
sys/dev/ata/ata-pci.h
View File

@ -392,8 +392,7 @@ struct ata_connect_task {
#define AMDBUG 0x0002 #define AMDBUG 0x0002
#define NVIDIA 0x0004 #define NVIDIA 0x0004
#define NV4 0x0010 #define NV4 0x0010
#define NV4BYTE 0x0030 #define NV4LONG 0x0030
#define NV4WORD 0x0050
#define VIACLK 0x0100 #define VIACLK 0x0100
#define VIABUG 0x0200 #define VIABUG 0x0200
#define VIABAR 0x0400 #define VIABAR 0x0400