[src/trunk]: src/sys/arch/arm/nvidia Correct TEGRA_PCIE_A[123] window definit...

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

details:   https://anonhg.NetBSD.org/src/rev/d81d4566cef5
branches:  trunk
changeset: 811763:d81d4566cef5
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sat Nov 14 02:10:10 2015 +0000

description:
Correct TEGRA_PCIE_A[123] window definitions.  Replace existing
usages thereof (and related bus space handles, etc.) with more
appropriate names.

diffstat:

 sys/arch/arm/nvidia/tegra_pcie.c |  28 ++++++++++++++--------------
 sys/arch/arm/nvidia/tegra_reg.h  |  12 +++++++++---
 2 files changed, 23 insertions(+), 17 deletions(-)

diffs (111 lines):

diff -r 5e72bae8db4d -r d81d4566cef5 sys/arch/arm/nvidia/tegra_pcie.c
--- a/sys/arch/arm/nvidia/tegra_pcie.c  Sat Nov 14 02:00:42 2015 +0000
+++ b/sys/arch/arm/nvidia/tegra_pcie.c  Sat Nov 14 02:10:10 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.8 2015/11/14 01:31:08 jakllsch Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.9 2015/11/14 02:10:10 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.8 2015/11/14 01:31:08 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.9 2015/11/14 02:10:10 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -67,8 +67,8 @@
        bus_dma_tag_t           sc_dmat;
        bus_space_tag_t         sc_bst;
        bus_space_handle_t      sc_bsh_afi;
-       bus_space_handle_t      sc_bsh_a1;
-       bus_space_handle_t      sc_bsh_a2;
+       bus_space_handle_t      sc_bsh_rpconf;
+       bus_space_handle_t      sc_bsh_conf;
        int                     sc_intr;
 
        struct arm32_pci_chipset sc_pc;
@@ -134,12 +134,12 @@
        if (bus_space_map(sc->sc_bst, TEGRA_PCIE_AFI_BASE, TEGRA_PCIE_AFI_SIZE,
            0, &sc->sc_bsh_afi) != 0)
                panic("couldn't map PCIE AFI");
-       if (bus_space_map(sc->sc_bst, TEGRA_PCIE_A1_BASE, TEGRA_PCIE_A1_SIZE,
-           0, &sc->sc_bsh_a1) != 0)
-               panic("couldn't map PCIE A1");
-       if (bus_space_map(sc->sc_bst, TEGRA_PCIE_A2_BASE, TEGRA_PCIE_A2_SIZE,
-           0, &sc->sc_bsh_a2) != 0)
-               panic("couldn't map PCIE A2");
+       if (bus_space_map(sc->sc_bst, TEGRA_PCIE_RPCONF_BASE,
+           TEGRA_PCIE_RPCONF_SIZE, 0, &sc->sc_bsh_rpconf) != 0)
+               panic("couldn't map PCIE root ports");
+       if (bus_space_map(sc->sc_bst, TEGRA_PCIE_CONF_BASE,
+           TEGRA_PCIE_CONF_SIZE, 0, &sc->sc_bsh_conf) != 0)
+               panic("couldn't map PCIE configuration");
 
        TAILQ_INIT(&sc->sc_intrs);
        mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
@@ -332,12 +332,12 @@
                if (d >= 2 || f != 0)
                        return (pcireg_t) -1;
                reg = d * 0x1000 + offset;
-               bsh = sc->sc_bsh_a1;
+               bsh = sc->sc_bsh_rpconf;
        } else {
                if ((unsigned int)offset >= PCI_CONF_SIZE)
                        return (pcireg_t) -1;
                reg = tag | offset;
-               bsh = sc->sc_bsh_a2;
+               bsh = sc->sc_bsh_conf;
        }
 
        return bus_space_read_4(sc->sc_bst, bsh, reg);
@@ -360,12 +360,12 @@
                if (d >= 2 || f != 0)
                        return;
                reg = d * 0x1000 + offset;
-               bsh = sc->sc_bsh_a1;
+               bsh = sc->sc_bsh_rpconf;
        } else {
                if ((unsigned int)offset >= PCI_CONF_SIZE)
                        return;
                reg = tag | offset;
-               bsh = sc->sc_bsh_a2;
+               bsh = sc->sc_bsh_conf;
        }
 
        bus_space_write_4(sc->sc_bst, bsh, reg, val);
diff -r 5e72bae8db4d -r d81d4566cef5 sys/arch/arm/nvidia/tegra_reg.h
--- a/sys/arch/arm/nvidia/tegra_reg.h   Sat Nov 14 02:00:42 2015 +0000
+++ b/sys/arch/arm/nvidia/tegra_reg.h   Sat Nov 14 02:10:10 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_reg.h,v 1.15 2015/11/14 02:00:42 jakllsch Exp $ */
+/* $NetBSD: tegra_reg.h,v 1.16 2015/11/14 02:10:10 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -35,15 +35,21 @@
 
 #define TEGRA_PCIE_OFFSET      0x01000000
 #define TEGRA_PCIE_SIZE                0x3f000000
+#define TEGRA_PCIE_RPCONF_BASE 0x01000000
+#define TEGRA_PCIE_RPCONF_SIZE 0x00002000
 #define TEGRA_PCIE_PADS_BASE   0x01003000
 #define TEGRA_PCIE_PADS_SIZE   0x00000800
 #define TEGRA_PCIE_AFI_BASE    0x01003800
 #define TEGRA_PCIE_AFI_SIZE    0x00000800
 #define TEGRA_PCIE_A1_BASE     0x01000000
-#define TEGRA_PCIE_A1_SIZE     0x00002000
+#define TEGRA_PCIE_A1_SIZE     0x01000000
 #define TEGRA_PCIE_A2_BASE     0x02000000
-#define TEGRA_PCIE_A2_SIZE     0x01000000
+#define TEGRA_PCIE_A2_SIZE     0x0e000000
+#define TEGRA_PCIE_A3_BASE     0x10000000
+#define TEGRA_PCIE_A3_SIZE     0x30000000
 
+#define TEGRA_PCIE_CONF_BASE   0x02000000
+#define TEGRA_PCIE_CONF_SIZE   0x01000000
 #define TEGRA_PCIE_IO_BASE     0x12000000
 #define TEGRA_PCIE_IO_SIZE     0x00010000
 #define TEGRA_PCIE_MEM_BASE    0x13000000