Module Name: src
Committed By: jmcneill
Date: Sat Feb 19 20:07:02 UTC 2011
Modified Files:
src/sys/dev/pci: agp_via.c
Log Message:
more AGP v3 fixes from FreeBSD:
- fix a typo when enabling the aperture (read wrong register)
- get_aperture/set_aperture: handle AGP v3 APSIZE register layout
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/agp_via.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/agp_via.c
diff -u src/sys/dev/pci/agp_via.c:1.20 src/sys/dev/pci/agp_via.c:1.21
--- src/sys/dev/pci/agp_via.c:1.20 Tue Feb 15 08:56:11 2011
+++ src/sys/dev/pci/agp_via.c Sat Feb 19 20:07:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.20 2011/02/15 08:56:11 jmcneill Exp $ */
+/* $NetBSD: agp_via.c,v 1.21 2011/02/19 20:07:02 jmcneill Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.20 2011/02/15 08:56:11 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.21 2011/02/19 20:07:02 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,7 +154,7 @@
gatt->ag_physical);
/* Enable the aperture. */
gartctrl = pci_conf_read(pa->pa_pc, pa->pa_tag,
- asc->regs[REG_ATTBASE]);
+ asc->regs[REG_GARTCTRL]);
pci_conf_write(pa->pa_pc, pa->pa_tag, asc->regs[REG_GARTCTRL],
gartctrl | (3 << 7));
}
@@ -188,41 +188,118 @@
struct agp_via_softc *asc = sc->as_chipc;
u_int32_t apsize;
- apsize = pci_conf_read(sc->as_pc, sc->as_tag, asc->regs[REG_APSIZE])
- & 0x1f;
+ if (asc->regs == via_v2_regs) {
+ apsize = pci_conf_read(sc->as_pc, sc->as_tag,
+ asc->regs[REG_APSIZE]) & 0xff;
- /*
- * The size is determined by the number of low bits of
- * register APBASE which are forced to zero. The low 20 bits
- * are always forced to zero and each zero bit in the apsize
- * field just read forces the corresponding bit in the 27:20
- * to be zero. We calculate the aperture size accordingly.
- */
- return (((apsize ^ 0xff) << 20) | ((1 << 20) - 1)) + 1;
+ /*
+ * The size is determined by the number of low bits of
+ * register APBASE which are forced to zero. The low 20 bits
+ * are always forced to zero and each zero bit in the apsize
+ * field just read forces the corresponding bit in the 27:20
+ * to be zero. We calculate the aperture size accordingly.
+ */
+ return (((apsize ^ 0xff) << 20) | ((1 << 20) - 1)) + 1;
+ } else {
+ apsize = pci_conf_read(sc->as_pc, sc->as_tag,
+ asc->regs[REG_APSIZE]) & 0xfff;
+ switch (apsize) {
+ case 0x800:
+ return 0x80000000;
+ case 0xc00:
+ return 0x40000000;
+ case 0xe00:
+ return 0x20000000;
+ case 0xf00:
+ return 0x10000000;
+ case 0xf20:
+ return 0x08000000;
+ case 0xf30:
+ return 0x04000000;
+ case 0xf38:
+ return 0x02000000;
+ case 0xf3c:
+ return 0x01000000;
+ case 0xf3e:
+ return 0x00800000;
+ case 0xf3f:
+ return 0x00400000;
+ default:
+ aprint_error_dev(sc->as_dev,
+ "invalid aperture setting 0x%x\n", apsize);
+ return 0;
+ }
+ }
}
static int
agp_via_set_aperture(struct agp_softc *sc, u_int32_t aperture)
{
struct agp_via_softc *asc = sc->as_chipc;
- u_int32_t apsize;
+ u_int32_t apsize, key;
pcireg_t reg;
- /*
- * Reverse the magic from get_aperture.
- */
- apsize = ((aperture - 1) >> 20) ^ 0xff;
-
- /*
- * Double check for sanity.
- */
- if ((((apsize ^ 0xff) << 20) | ((1 << 20) - 1)) + 1 != aperture)
- return EINVAL;
+ if (asc->regs == via_v2_regs) {
+ /*
+ * Reverse the magic from get_aperture.
+ */
+ apsize = ((aperture - 1) >> 20) ^ 0xff;
+
+ /*
+ * Double check for sanity.
+ */
+ if ((((apsize ^ 0xff) << 20) | ((1 << 20) - 1)) + 1 != aperture)
+ return EINVAL;
- reg = pci_conf_read(sc->as_pc, sc->as_tag, asc->regs[REG_APSIZE]);
- reg &= ~0xff;
- reg |= apsize;
- pci_conf_write(sc->as_pc, sc->as_tag, asc->regs[REG_APSIZE], reg);
+ reg = pci_conf_read(sc->as_pc, sc->as_tag,
+ asc->regs[REG_APSIZE]);
+ reg &= ~0xff;
+ reg |= apsize;
+ pci_conf_write(sc->as_pc, sc->as_tag,
+ asc->regs[REG_APSIZE], reg);
+ } else {
+ switch (aperture) {
+ case 0x80000000:
+ key = 0x800;
+ break;
+ case 0x40000000:
+ key = 0xc00;
+ break;
+ case 0x20000000:
+ key = 0xe00;
+ break;
+ case 0x10000000:
+ key = 0xf00;
+ break;
+ case 0x08000000:
+ key = 0xf20;
+ break;
+ case 0x04000000:
+ key = 0xf30;
+ break;
+ case 0x02000000:
+ key = 0xf38;
+ break;
+ case 0x01000000:
+ key = 0xf3c;
+ break;
+ case 0x00800000:
+ key = 0xf3e;
+ break;
+ case 0x00400000:
+ key = 0xf3f;
+ break;
+ default:
+ aprint_error_dev(sc->as_dev,
+ "invalid aperture size (%dMB)\n",
+ aperture / 1024 / 1024);
+ return EINVAL;
+ }
+ reg = pci_conf_read(sc->as_pc, sc->as_tag, asc->regs[REG_APSIZE]);
+ reg &= ~0xfff;
+ reg |= key;
+ pci_conf_write(sc->as_pc, sc->as_tag, asc->regs[REG_APSIZE], reg);
+ }
return 0;
}
