[src/trunk]: src/sys/arch/ofppc Set the GPIO to enable AGP configuration spac...

[phx <phx%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c050d3234e9e
branches:  trunk
changeset: 759832:c050d3234e9e
user:      phx <phx%NetBSD.org@localhost>
date:      Fri Dec 17 19:18:49 2010 +0000

description:
Set the GPIO to enable AGP configuration space access when attaching gtpci0
and do not reset it again. This keeps AGP devices visible after configure().
Improved the match-function to look for a Discovery controller on the PCI
bus.

diffstat:

 sys/arch/ofppc/include/pegasosreg.h |   7 ++++-
 sys/arch/ofppc/pci/gt_mainbus.c     |  45 +++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diffs (115 lines):

diff -r 34dbb86cf8b5 -r c050d3234e9e sys/arch/ofppc/include/pegasosreg.h
--- a/sys/arch/ofppc/include/pegasosreg.h       Fri Dec 17 19:13:48 2010 +0000
+++ b/sys/arch/ofppc/include/pegasosreg.h       Fri Dec 17 19:18:49 2010 +0000
@@ -1,9 +1,14 @@
-/* $NetBSD: pegasosreg.h,v 1.2 2010/06/09 04:41:42 kiyohara Exp $ */
+/* $NetBSD: pegasosreg.h,v 1.3 2010/12/17 19:18:49 phx Exp $ */
 
 #ifndef _MACHINE_PEGASOSREG_H_
 #define _MACHINE_PEGASOSREG_H_
 
+/* Marvell Discovery System Controller */
 #define PEGASOS2_GT_REGBASE            0xf1000000
+
+/* GPIO to control AGP configuration space access */
+#define PEGASOS2_AGP_CONF_ENABLE       (1 << 23)
+
 #define PEGASOS2_SRAM_BASE             0xf2000000
 #define PEGASOS2_SRAM_SIZE             0x40000
 
diff -r 34dbb86cf8b5 -r c050d3234e9e sys/arch/ofppc/pci/gt_mainbus.c
--- a/sys/arch/ofppc/pci/gt_mainbus.c   Fri Dec 17 19:13:48 2010 +0000
+++ b/sys/arch/ofppc/pci/gt_mainbus.c   Fri Dec 17 19:18:49 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gt_mainbus.c,v 1.2 2010/06/20 00:25:41 matt Exp $      */
+/*     $NetBSD: gt_mainbus.c,v 1.3 2010/12/17 19:18:49 phx Exp $       */
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.2 2010/06/20 00:25:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c,v 1.3 2010/12/17 19:18:49 phx Exp $");
 
 #include "opt_pci.h"
 #include "opt_marvell.h"
@@ -49,6 +49,7 @@
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
+#include <dev/pci/pcidevs.h>
 
 #include <dev/marvell/gtreg.h>
 #include <dev/marvell/gtvar.h>
@@ -122,7 +123,8 @@
 gt_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct confargs *ca = aux;
-       int node, pci, ethernet;
+       uint32_t device_id, vendor_id;
+       int node;
        char name[32];
 
        if (strcmp(ca->ca_name, "gt") != 0 ||
@@ -130,20 +132,27 @@
                return 0;
 
        /* Paranoid check... */
-
-       pci = ethernet = 0;
        for (node = OF_child(OF_finddevice("/")); node; node = OF_peer(node)) {
                memset(name, 0, sizeof(name));
                if (OF_getprop(node, "name", name, sizeof(name)) == -1)
                        continue;
-               if (strcmp(name, "pci") == 0)
-                       pci++;
-               else if (strcmp(name, "ethernet") == 0)
-                       ethernet++;
-
+               if (strcmp(name, "pci") == 0) {
+                       for (node = OF_child(node); node;
+                           node = OF_peer(node)) {
+                               if (OF_getprop(node, "vendor-id",
+                                   &vendor_id, sizeof(vendor_id)) == -1)
+                                       continue;
+                               if (OF_getprop(node, "device-id",
+                                   &device_id, sizeof(device_id)) == -1)
+                                       continue;
+                               /* Find a Marvell system controller */
+                               if (vendor_id == PCI_VENDOR_MARVELL &&
+                                   device_id == PCI_PRODUCT_MARVELL_MV64360)
+                                       return 1;
+                       }
+                       return 0;
+               }
        }
-       if (pci == 2 && (ethernet == 1 || ethernet == 0))
-               return 1;
        return 0;
 }
 
@@ -244,19 +253,13 @@
                genppc_gtpci0_chipset.pc_iot = &gtpci0_io_bs_tag;
                genppc_gtpci0_chipset.pc_memt = &gtpci0_mem_bs_tag;
 
-               /* Enable access to space of configuration for AGP. */
-               bus_space_write_4(sc->sc_iot, sc->sc_ioh, GT_GPP_Value_Set,
-                   (1 << 23));
+               /* Enable AGP configuration space access. */
+               bus_space_write_4(sc->sc_iot, sc->sc_ioh,
+                   GT_GPP_Value_Set, PEGASOS2_AGP_CONF_ENABLE);
        }
 #endif
 
        gt_attach_common(sc);
-
-#if NGTPCI > 0
-       /* Disable access to space of configuration for AGP. */
-       bus_space_write_4(sc->sc_iot, sc->sc_ioh, GT_GPP_Value_Clear,
-           (1 << 23));
-#endif
 }