[src/trunk]: src/sys/dev/marvell Avoid configuring root complex on MV78460.

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

details:   https://anonhg.NetBSD.org/src/rev/a80283cf6ebc
branches:  trunk
changeset: 786548:a80283cf6ebc
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Wed May 01 12:21:47 2013 +0000

description:
Avoid configuring root complex on MV78460.

Obtained from Marvell, Semihalf.

diffstat:

 sys/dev/marvell/mvpex.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r bfb2a2aee279 -r a80283cf6ebc sys/dev/marvell/mvpex.c
--- a/sys/dev/marvell/mvpex.c   Wed May 01 12:19:49 2013 +0000
+++ b/sys/dev/marvell/mvpex.c   Wed May 01 12:21:47 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvpex.c,v 1.7 2012/09/07 04:25:37 matt Exp $   */
+/*     $NetBSD: mvpex.c,v 1.8 2013/05/01 12:21:47 rkujawa Exp $        */
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.7 2012/09/07 04:25:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvpex.c,v 1.8 2013/05/01 12:21:47 rkujawa Exp $");
 
 #include "opt_pci.h"
 #include "pci.h"
@@ -592,6 +592,14 @@
        if (bus == 0 && dev == 0)       /* don't configure GT */
                return 0;
 
+       /* 
+        * Do not configure PCI Express root complex on MV78460 - avoid
+        * setting up IO and memory windows. 
+        * XXX: should also avoid that other Aramadas.
+        */
+       else if ((dev == 0) && (PCI_PRODUCT(id) == MARVELL_ARMADAXP_MV78460))
+               return 0;
+
        return PCI_CONF_DEFAULT;
 }