Module Name: src
Committed By: jmcneill
Date: Mon Sep 28 11:54:24 UTC 2020
Modified Files:
src/sys/arch/arm/acpi: acpi_platform.c
src/sys/arch/arm/altera: cycv_platform.c
src/sys/arch/arm/amlogic: meson_platform.c
src/sys/arch/arm/broadcom: bcm2835_com.c bcm283x_platform.c
src/sys/arch/arm/fdt: arm_platform.c
src/sys/arch/arm/nvidia: tegra_com.c tegra_platform.c
src/sys/arch/arm/rockchip: rk_platform.c
src/sys/arch/arm/samsung: exynos_platform.c
src/sys/arch/arm/sunxi: sunxi_platform.c
src/sys/arch/arm/ti: am3_platform.c omap3_platform.c ti_com.c
src/sys/arch/arm/vexpress: vexpress_platform.c
src/sys/arch/arm/virt: virt_platform.c
src/sys/arch/arm/xilinx: zynq_platform.c
src/sys/dev/fdt: fdtvar.h
Log Message:
Get rid of a4x bus_space tag from fdtbus_attach_args. The only consumer
of this was various com(4) glue so modify all of that to use the new
com_init_regs_stride instead.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/acpi/acpi_platform.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/altera/cycv_platform.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/amlogic/meson_platform.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_com.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/fdt/arm_platform.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_com.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/am3_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/omap3_platform.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/ti/ti_com.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/vexpress/vexpress_platform.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/virt/virt_platform.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/xilinx/zynq_platform.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/fdt/fdtvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/acpi/acpi_platform.c
diff -u src/sys/arch/arm/acpi/acpi_platform.c:1.19 src/sys/arch/arm/acpi/acpi_platform.c:1.20
--- src/sys/arch/arm/acpi/acpi_platform.c:1.19 Sun Sep 13 21:41:17 2020
+++ src/sys/arch/arm/acpi/acpi_platform.c Mon Sep 28 11:54:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.19 2020/09/13 21:41:17 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.20 2020/09/28 11:54:22 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.19 2020/09/13 21:41:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.20 2020/09/28 11:54:22 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -239,10 +239,8 @@ static void
acpi_platform_init_attach_args(struct fdt_attach_args *faa)
{
extern struct bus_space arm_generic_bs_tag;
- extern struct bus_space arm_generic_a4x_bs_tag;
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &acpi_coherent_dma_tag;
}
Index: src/sys/arch/arm/altera/cycv_platform.c
diff -u src/sys/arch/arm/altera/cycv_platform.c:1.13 src/sys/arch/arm/altera/cycv_platform.c:1.14
--- src/sys/arch/arm/altera/cycv_platform.c:1.13 Fri Jul 10 12:25:08 2020
+++ src/sys/arch/arm/altera/cycv_platform.c Mon Sep 28 11:54:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cycv_platform.c,v 1.13 2020/07/10 12:25:08 skrll Exp $ */
+/* $NetBSD: cycv_platform.c,v 1.14 2020/09/28 11:54:22 jmcneill Exp $ */
/* This file is in the public domain. */
@@ -7,7 +7,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.13 2020/07/10 12:25:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.14 2020/09/28 11:54:22 jmcneill Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -131,7 +131,6 @@ cycv_mpstart(void)
static void
cycv_platform_init_attach_args(struct fdt_attach_args *faa) {
faa->faa_bst = &armv7_generic_bs_tag;
- faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/amlogic/meson_platform.c
diff -u src/sys/arch/arm/amlogic/meson_platform.c:1.15 src/sys/arch/arm/amlogic/meson_platform.c:1.16
--- src/sys/arch/arm/amlogic/meson_platform.c:1.15 Fri Jul 10 12:25:08 2020
+++ src/sys/arch/arm/amlogic/meson_platform.c Mon Sep 28 11:54:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.15 2020/07/10 12:25:08 skrll Exp $ */
+/* $NetBSD: meson_platform.c,v 1.16 2020/09/28 11:54:22 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.15 2020/07/10 12:25:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.16 2020/09/28 11:54:22 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -118,11 +118,9 @@ __KERNEL_RCSID(0, "$NetBSD: meson_platfo
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct bus_space arm_generic_bs_tag;
-extern struct bus_space arm_generic_a4x_bs_tag;
#define meson_dma_tag arm_generic_dma_tag
#define meson_bs_tag arm_generic_bs_tag
-#define meson_a4x_bs_tag arm_generic_a4x_bs_tag
static const struct pmap_devmap *
meson_platform_devmap(void)
@@ -150,7 +148,6 @@ static void
meson_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &meson_bs_tag;
- faa->faa_a4x_bst = &meson_a4x_bs_tag;
faa->faa_dmat = &meson_dma_tag;
}
Index: src/sys/arch/arm/broadcom/bcm2835_com.c
diff -u src/sys/arch/arm/broadcom/bcm2835_com.c:1.5 src/sys/arch/arm/broadcom/bcm2835_com.c:1.6
--- src/sys/arch/arm/broadcom/bcm2835_com.c:1.5 Sat Dec 8 17:46:09 2018
+++ src/sys/arch/arm/broadcom/bcm2835_com.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_com.c,v 1.5 2018/12/08 17:46:09 thorpej Exp $ */
+/* $NetBSD: bcm2835_com.c,v 1.6 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.5 2018/12/08 17:46:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.6 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -70,7 +70,7 @@ bcm_com_attach(device_t parent, device_t
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
- bus_space_tag_t bst = faa->faa_a4x_bst;
+ bus_space_tag_t bst = faa->faa_bst;
bus_space_handle_t bsh;
bus_addr_t addr;
bus_size_t size;
@@ -105,7 +105,7 @@ bcm_com_attach(device_t parent, device_t
sc->sc_frequency *= 2;
- com_init_regs(&sc->sc_regs, bst, bsh, addr);
+ com_init_regs_stride(&sc->sc_regs, bst, bsh, addr, 2);
com_attach_subr(sc);
aprint_naive("\n");
@@ -137,7 +137,9 @@ static void
bcmaux_com_console_consinit(struct fdt_attach_args *faa, u_int uart_freq)
{
const int phandle = faa->faa_phandle;
- bus_space_tag_t bst = faa->faa_a4x_bst;
+ bus_space_tag_t bst = faa->faa_bst;
+ bus_space_handle_t dummy_bsh;
+ struct com_regs regs;
bus_addr_t addr;
tcflag_t flags;
int speed;
@@ -148,7 +150,10 @@ bcmaux_com_console_consinit(struct fdt_a
speed = 115200; /* default */
flags = fdtbus_get_stdout_flags();
- if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_BCMAUXUART,
+ memset(&dummy_bsh, 0, sizeof(dummy_bsh));
+ com_init_regs_stride(®s, bst, dummy_bsh, addr, 2);
+
+ if (comcnattach1(®s, speed, uart_freq, COM_TYPE_BCMAUXUART,
flags))
panic("Cannot initialize bcm com console");
Index: src/sys/arch/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.40 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.41
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.40 Fri Jul 10 12:25:09 2020
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.40 2020/07/10 12:25:09 skrll Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.41 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.40 2020/07/10 12:25:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.41 2020/09/28 11:54:23 jmcneill Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -1307,7 +1307,6 @@ bcm2835_platform_init_attach_args(struct
{
faa->faa_bst = &bcm2835_bs_tag;
- faa->faa_a4x_bst = &bcm2835_a4x_bs_tag;
}
#endif
@@ -1317,7 +1316,6 @@ bcm2836_platform_init_attach_args(struct
{
faa->faa_bst = &bcm2836_bs_tag;
- faa->faa_a4x_bst = &bcm2836_a4x_bs_tag;
}
static void
@@ -1325,7 +1323,6 @@ bcm2711_platform_init_attach_args(struct
{
faa->faa_bst = &bcm2711_bs_tag;
- faa->faa_a4x_bst = &bcm2711_a4x_bs_tag;
}
#endif
Index: src/sys/arch/arm/fdt/arm_platform.c
diff -u src/sys/arch/arm/fdt/arm_platform.c:1.2 src/sys/arch/arm/fdt/arm_platform.c:1.3
--- src/sys/arch/arm/fdt/arm_platform.c:1.2 Mon Jan 6 08:29:08 2020
+++ src/sys/arch/arm/fdt/arm_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_platform.c,v 1.2 2020/01/06 08:29:08 skrll Exp $ */
+/* $NetBSD: arm_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2020 Jared McNeill <jmcne...@invisible.ca>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.2 2020/01/06 08:29:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -64,13 +64,11 @@ __KERNEL_RCSID(0, "$NetBSD: arm_platform
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct bus_space arm_generic_bs_tag;
-extern struct bus_space arm_generic_a4x_bs_tag;
static void
arm_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/nvidia/tegra_com.c
diff -u src/sys/arch/arm/nvidia/tegra_com.c:1.12 src/sys/arch/arm/nvidia/tegra_com.c:1.13
--- src/sys/arch/arm/nvidia/tegra_com.c:1.12 Sun Oct 13 06:11:31 2019
+++ src/sys/arch/arm/nvidia/tegra_com.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_com.c,v 1.12 2019/10/13 06:11:31 skrll Exp $ */
+/* $NetBSD: tegra_com.c,v 1.13 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.12 2019/10/13 06:11:31 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.13 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -83,8 +83,8 @@ tegra_com_attach(device_t parent, device
struct tegra_com_softc * const tsc = device_private(self);
struct com_softc * const sc = &tsc->tsc_sc;
struct fdt_attach_args * const faa = aux;
+ bus_space_tag_t bst = faa->faa_bst;
bus_space_handle_t bsh;
- bus_space_tag_t bst;
char intrstr[128];
bus_addr_t addr;
bus_size_t size;
@@ -98,17 +98,7 @@ tegra_com_attach(device_t parent, device
if (of_getprop_uint32(faa->faa_phandle, "reg-shift", ®_shift)) {
/* missing or bad reg-shift property, assume 2 */
- bst = faa->faa_a4x_bst;
- } else {
- if (reg_shift == 2) {
- bst = faa->faa_a4x_bst;
- } else if (reg_shift == 0) {
- bst = faa->faa_bst;
- } else {
- aprint_error(": unsupported reg-shift value %d\n",
- reg_shift);
- return;
- }
+ reg_shift = 2;
}
sc->sc_dev = self;
@@ -130,7 +120,7 @@ tegra_com_attach(device_t parent, device
return;
}
- com_init_regs(&sc->sc_regs, bst, bsh, addr);
+ com_init_regs_stride(&sc->sc_regs, bst, bsh, addr, reg_shift);
com_attach_subr(sc);
aprint_naive("\n");
@@ -163,9 +153,12 @@ static void
tegra_com_console_consinit(struct fdt_attach_args *faa, u_int uart_freq)
{
const int phandle = faa->faa_phandle;
- bus_space_tag_t bst = faa->faa_a4x_bst;
+ bus_space_tag_t bst = faa->faa_bst;
+ bus_space_handle_t dummy_bsh;
+ struct com_regs regs;
bus_addr_t addr;
tcflag_t flags;
+ u_int reg_shift;
int speed;
fdtbus_get_reg(phandle, 0, &addr, NULL);
@@ -174,7 +167,15 @@ tegra_com_console_consinit(struct fdt_at
speed = 115200; /* default */
flags = fdtbus_get_stdout_flags();
- if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_TEGRA, flags))
+ if (of_getprop_uint32(faa->faa_phandle, "reg-shift", ®_shift)) {
+ /* missing or bad reg-shift property, assume 2 */
+ reg_shift = 2;
+ }
+
+ memset(&dummy_bsh, 0, sizeof(dummy_bsh));
+ com_init_regs_stride(®s, bst, dummy_bsh, addr, reg_shift);
+
+ if (comcnattach1(®s, speed, uart_freq, COM_TYPE_TEGRA, flags))
panic("Cannot initialize tegra com console");
}
Index: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.23 src/sys/arch/arm/nvidia/tegra_platform.c:1.24
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.23 Fri Aug 21 23:30:02 2020
+++ src/sys/arch/arm/nvidia/tegra_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.23 2020/08/21 23:30:02 uwe Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.24 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -34,7 +34,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.23 2020/08/21 23:30:02 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.24 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -140,11 +140,9 @@ static void
tegra_platform_init_attach_args(struct fdt_attach_args *faa)
{
extern struct bus_space arm_generic_bs_tag;
- extern struct bus_space arm_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/rockchip/rk_platform.c
diff -u src/sys/arch/arm/rockchip/rk_platform.c:1.9 src/sys/arch/arm/rockchip/rk_platform.c:1.10
--- src/sys/arch/arm/rockchip/rk_platform.c:1.9 Fri Jul 10 12:25:09 2020
+++ src/sys/arch/arm/rockchip/rk_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.9 2020/07/10 12:25:09 skrll Exp $ */
+/* $NetBSD: rk_platform.c,v 1.10 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.9 2020/07/10 12:25:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.10 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -59,13 +59,11 @@ __KERNEL_RCSID(0, "$NetBSD: rk_platform.
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct bus_space arm_generic_bs_tag;
-extern struct bus_space arm_generic_a4x_bs_tag;
static void
rk_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.29 src/sys/arch/arm/samsung/exynos_platform.c:1.30
--- src/sys/arch/arm/samsung/exynos_platform.c:1.29 Fri Jul 10 12:25:09 2020
+++ src/sys/arch/arm/samsung/exynos_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.29 2020/07/10 12:25:09 skrll Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.30 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,7 +35,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.29 2020/07/10 12:25:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.30 2020/09/28 11:54:23 jmcneill Exp $");
/*
@@ -222,11 +222,9 @@ static void
exynos_platform_init_attach_args(struct fdt_attach_args *faa)
{
extern struct bus_space armv7_generic_bs_tag;
- extern struct bus_space armv7_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
faa->faa_bst = &armv7_generic_bs_tag;
- faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.39 src/sys/arch/arm/sunxi/sunxi_platform.c:1.40
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.39 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.39 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.40 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.39 2020/07/10 12:25:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.40 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -108,11 +108,9 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_platfo
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct bus_space arm_generic_bs_tag;
-extern struct bus_space arm_generic_a4x_bs_tag;
#define sunxi_dma_tag arm_generic_dma_tag
#define sunxi_bs_tag arm_generic_bs_tag
-#define sunxi_a4x_bs_tag arm_generic_a4x_bs_tag
static bus_space_handle_t reset_bsh;
@@ -177,7 +175,6 @@ static void
sunxi_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &sunxi_bs_tag;
- faa->faa_a4x_bst = &sunxi_a4x_bs_tag;
faa->faa_dmat = &sunxi_dma_tag;
}
Index: src/sys/arch/arm/ti/am3_platform.c
diff -u src/sys/arch/arm/ti/am3_platform.c:1.2 src/sys/arch/arm/ti/am3_platform.c:1.3
--- src/sys/arch/arm/ti/am3_platform.c:1.2 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/arm/ti/am3_platform.c Mon Sep 28 11:54:23 2020
@@ -1,9 +1,9 @@
-/* $NetBSD: am3_platform.c,v 1.2 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: am3_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $ */
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am3_platform.c,v 1.2 2020/07/10 12:25:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am3_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
@@ -18,7 +18,6 @@ __KERNEL_RCSID(0, "$NetBSD: am3_platform
#include <arch/evbarm/fdt/platform.h>
extern struct bus_space armv7_generic_bs_tag;
-extern struct bus_space armv7_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
void am33xx_platform_early_putchar(char);
@@ -57,7 +56,6 @@ static void
am33xx_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &armv7_generic_bs_tag;
- faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/ti/omap3_platform.c
diff -u src/sys/arch/arm/ti/omap3_platform.c:1.3 src/sys/arch/arm/ti/omap3_platform.c:1.4
--- src/sys/arch/arm/ti/omap3_platform.c:1.3 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/arm/ti/omap3_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_platform.c,v 1.3 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: omap3_platform.c,v 1.4 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.3 2020/07/10 12:25:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.4 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -99,7 +99,6 @@ omap3_phystovirt(paddr_t pa)
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct bus_space arm_generic_bs_tag;
-extern struct bus_space arm_generic_a4x_bs_tag;
static const struct pmap_devmap *
omap3_platform_devmap(void)
@@ -124,7 +123,6 @@ static void
omap3_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/ti/ti_com.c
diff -u src/sys/arch/arm/ti/ti_com.c:1.8 src/sys/arch/arm/ti/ti_com.c:1.9
--- src/sys/arch/arm/ti/ti_com.c:1.8 Tue Oct 29 22:19:13 2019
+++ src/sys/arch/arm/ti/ti_com.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_com.c,v 1.8 2019/10/29 22:19:13 jmcneill Exp $ */
+/* $NetBSD: ti_com.c,v 1.9 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.8 2019/10/29 22:19:13 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ti_com.c,v 1.9 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -76,8 +76,8 @@ ti_com_attach(device_t parent, device_t
struct com_softc * const sc = &ssc->ssc_sc;
struct fdt_attach_args * const faa = aux;
const int phandle = faa->faa_phandle;
+ bus_space_tag_t bst = faa->faa_bst;
bus_space_handle_t bsh;
- bus_space_tag_t bst;
char intrstr[128];
bus_addr_t addr;
bus_size_t size;
@@ -88,8 +88,6 @@ ti_com_attach(device_t parent, device_t
return;
}
- bst = faa->faa_a4x_bst;
-
sc->sc_dev = self;
if (of_getprop_uint32(phandle, "clock-frequency", &sc->sc_frequency) != 0) {
@@ -110,7 +108,7 @@ ti_com_attach(device_t parent, device_t
return;
}
- com_init_regs(&sc->sc_regs, bst, bsh, addr);
+ com_init_regs_stride(&sc->sc_regs, bst, bsh, addr, 2);
com_attach_subr(sc);
aprint_naive("\n");
@@ -143,7 +141,9 @@ static void
ti_com_console_consinit(struct fdt_attach_args *faa, u_int uart_freq)
{
const int phandle = faa->faa_phandle;
- bus_space_tag_t bst = faa->faa_a4x_bst;
+ bus_space_tag_t bst = faa->faa_bst;
+ bus_space_handle_t dummy_bsh;
+ struct com_regs regs;
bus_addr_t addr;
tcflag_t flags;
int speed;
@@ -154,7 +154,10 @@ ti_com_console_consinit(struct fdt_attac
speed = 115200; /* default */
flags = fdtbus_get_stdout_flags();
- if (comcnattach(bst, addr, speed, uart_freq, COM_TYPE_NORMAL, flags))
+ memset(&dummy_bsh, 0, sizeof(dummy_bsh));
+ com_init_regs_stride(®s, bst, dummy_bsh, addr, 2);
+
+ if (comcnattach1(®s, speed, uart_freq, COM_TYPE_NORMAL, flags))
panic("Cannot initialize ti com console");
}
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.17 src/sys/arch/arm/vexpress/vexpress_platform.c:1.18
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.17 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.17 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.18 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.17 2020/07/10 12:25:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.18 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: vexpress_pla
#define VEXPRESS_REF_FREQ 24000000
extern struct bus_space armv7_generic_bs_tag;
-extern struct bus_space armv7_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
#define SYSREG_BASE 0x1c010000
@@ -190,7 +189,6 @@ static void
vexpress_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &armv7_generic_bs_tag;
- faa->faa_a4x_bst = &armv7_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/virt/virt_platform.c
diff -u src/sys/arch/arm/virt/virt_platform.c:1.10 src/sys/arch/arm/virt/virt_platform.c:1.11
--- src/sys/arch/arm/virt/virt_platform.c:1.10 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/arm/virt/virt_platform.c Mon Sep 28 11:54:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: virt_platform.c,v 1.10 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: virt_platform.c,v 1.11 2020/09/28 11:54:23 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.10 2020/07/10 12:25:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.11 2020/09/28 11:54:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -99,10 +99,8 @@ virt_platform_init_attach_args(struct fd
{
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
extern struct bus_space arm_generic_bs_tag;
- extern struct bus_space arm_generic_a4x_bs_tag;
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/arch/arm/xilinx/zynq_platform.c
diff -u src/sys/arch/arm/xilinx/zynq_platform.c:1.2 src/sys/arch/arm/xilinx/zynq_platform.c:1.3
--- src/sys/arch/arm/xilinx/zynq_platform.c:1.2 Fri Jul 10 12:25:10 2020
+++ src/sys/arch/arm/xilinx/zynq_platform.c Mon Sep 28 11:54:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_platform.c,v 1.2 2020/07/10 12:25:10 skrll Exp $ */
+/* $NetBSD: zynq_platform.c,v 1.3 2020/09/28 11:54:24 jmcneill Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.2 2020/07/10 12:25:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.3 2020/09/28 11:54:24 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -76,7 +76,6 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_platfor
#define ZYNQ_ARMCORE_SIZE 0x00003000
extern struct bus_space arm_generic_bs_tag;
-extern struct bus_space arm_generic_a4x_bs_tag;
extern struct arm32_bus_dma_tag arm_generic_dma_tag;
void zynq_platform_early_putchar(char);
@@ -104,7 +103,6 @@ static void
zynq_platform_init_attach_args(struct fdt_attach_args *faa)
{
faa->faa_bst = &arm_generic_bs_tag;
- faa->faa_a4x_bst = &arm_generic_a4x_bs_tag;
faa->faa_dmat = &arm_generic_dma_tag;
}
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.60 src/sys/dev/fdt/fdtvar.h:1.61
--- src/sys/dev/fdt/fdtvar.h:1.60 Thu Feb 20 01:35:55 2020
+++ src/sys/dev/fdt/fdtvar.h Mon Sep 28 11:54:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.60 2020/02/20 01:35:55 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.61 2020/09/28 11:54:24 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -54,7 +54,6 @@ typedef void *audio_dai_tag_t;
struct fdt_attach_args {
const char *faa_name;
bus_space_tag_t faa_bst;
- bus_space_tag_t faa_a4x_bst;
bus_dma_tag_t faa_dmat;
int faa_phandle;
int faa_quiet;
