 @@ -1,33 +1,33 @@
-/* $NetBSD: rk3399_pcie.c,v 1.7 2019/11/29 00:36:22 jmcneill Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.8 2019/12/07 16:00:36 jmcneill Exp $ */
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.7 2019/11/29 00:36:22 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.8 2019/12/07 16:00:36 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bitops.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/kmem.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/syscon.h>
 #include <arm/cpufunc.h>
 @@ -111,30 +111,30 @@ __KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.
 #define  PCIE_ATR_HDR_IO		0x6
 #define  PCIE_ATR_HDR_CFG_TYPE0		0xa
 #define  PCIE_ATR_HDR_CFG_TYPE1		0xb
 #define  PCIE_ATR_HDR_RID		__BIT(23)
 /* AXI region */
 #define PCIE_ATR_OB_REGION0_SIZE	(32 * 1024 * 1024)
 #define PCIE_ATR_OB_REGION_SIZE		(1 * 1024 * 1024)
 #define HREAD4(sc, reg)							\
 	bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg))
 #define HWRITE4(sc, reg, val)						\
 	bus_space_write_4((sc)->sc_iot, (sc)->sc_ioh, (reg), (val))
-#define AXIREAD4(sc, reg)						\
+#define AXIPEEK4(sc, reg, valp)						\
-	bus_space_read_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg))
+	bus_space_peek_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg), (valp))
-#define AXIWRITE4(sc, reg, val)						\
+#define AXIPOKE4(sc, reg, val)						\
-	bus_space_write_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg), (val))
+	bus_space_poke_4((sc)->sc_iot, (sc)->sc_axi_ioh, (reg), (val))
 struct rkpcie_softc {
 	struct pcihost_softc	sc_phsc;
 	bus_space_tag_t		sc_iot;
 	bus_space_handle_t	sc_ioh;
 	bus_space_handle_t	sc_axi_ioh;
 	bus_addr_t		sc_axi_addr;
 	bus_addr_t		sc_apb_addr;
 	bus_size_t		sc_axi_size;
 	bus_size_t		sc_apb_size;
 };
 static int rkpcie_match(device_t, cfdata_t, void *);
 @@ -530,50 +530,54 @@ rkpcie_conf_read(void *v, pcitag_t tag,
 	int bus, dev, fn;
 	u_int reg;
 	KASSERT(offset >= 0);
 	KASSERT(offset < PCI_EXTCONF_SIZE);
 	rkpcie_decompose_tag(sc, tag, &bus, &dev, &fn);
 	if (!rkpcie_conf_ok(bus, dev, fn, phsc->sc_bus_min))
 		return 0xffffffff;
 	reg = (bus << 20) | (dev << 15) | (fn << 12) | offset;
 	if (bus == phsc->sc_bus_min)
 		return HREAD4(sc, PCIE_RC_NORMAL_BASE + reg);
-	else
+	else {
-		return AXIREAD4(sc, reg);
+		uint32_t val;
 		if (AXIPEEK4(sc, reg, &val) != 0)
 			return 0xffffffff;
 		return val;
+	}
+}
 void
 rkpcie_conf_write(void *v, pcitag_t tag, int offset, pcireg_t data)
+{
 	struct rkpcie_softc *sc = v;
 	struct pcihost_softc *phsc = &sc->sc_phsc;
 	int bus, dev, fn;
 	u_int reg;
 	KASSERT(offset >= 0);
 	KASSERT(offset < PCI_EXTCONF_SIZE);
 	rkpcie_decompose_tag(sc, tag, &bus, &dev, &fn);
 	if (!rkpcie_conf_ok(bus, dev, fn, phsc->sc_bus_min))
 		return;
 	reg = (bus << 20) | (dev << 15) | (fn << 12) | offset;
 	if (bus == phsc->sc_bus_min)
 		HWRITE4(sc, PCIE_RC_NORMAL_BASE + reg, data);
 	else
-		AXIWRITE4(sc, reg, data);
+		AXIPOKE4(sc, reg, data);
+}
 static int
 rkpcie_conf_hook(void *v, int b, int d, int f, pcireg_t id)
+{
         return (PCI_CONF_DEFAULT & ~PCI_CONF_ENABLE_BM) | PCI_CONF_MAP_ROM;
+}
 /* INTx interrupt controller */
 static void *
 rkpcie_intx_establish(device_t dev, u_int *specifier, int ipl, int flags,
     int (*func)(void *), void *arg)
+{