 @@ -1,14 +1,14 @@
-/*	$NetBSD: exynos_soc.c,v 1.4 2014/04/13 20:52:29 reinoud Exp $	*/
+/*	$NetBSD: exynos_soc.c,v 1.5 2014/04/16 21:28:51 reinoud Exp $	*/
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Reinoud Zandijk.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -23,27 +23,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include "opt_exynos.h"
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.4 2014/04/13 20:52:29 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.5 2014/04/16 21:28:51 reinoud Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <prop/proplib.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 #include <arm/locore.h>
 @@ -195,46 +195,52 @@ exynos_l2cc_init(void)
 	exynos_smc(SMC_CMD_L2X0SETUP1, tag_latency, data_latency, prefetch);
 	exynos_smc(SMC_CMD_L2X0SETUP2,
 		POWERCTL_DYNCLKGATE | POWERCTL_STANDBY,
 		aux_val, aux_keepmask);
 	exynos_smc(SMC_CMD_L2X0INVALL, 0, 0, 0);
 	exynos_smc(SMC_CMD_L2X0CTRL, 1, 0, 0);
 	return 0;
+}
 #endif /* ARM_TRUSTZONE_FIRMWARE */
 #ifndef EXYNOS4
 #	define EXYNOS4_CORE_SIZE 0
 #endif
 #ifndef EXYNOS5
 #	define EXYNOS5_CORE_SIZE 0
 #endif
 void
 exynos_bootstrap(vaddr_t iobase, vaddr_t uartbase)
+{
-// 	int error;
+	int error;
 	size_t core_size = IS_EXYNOS4_P() ?
 		EXYNOS4_CORE_SIZE : EXYNOS5_CORE_SIZE;
 	/* set up early console so we can use printf() and friends */
 #ifdef EXYNOS_CONSOLE_EARLY
 	uart_base = (volatile uint8_t *) uartbase;
 	cn_tab = &exynos_earlycons;
 	printf("Exynos early console operational\n\n");
 #endif
 #if 0
 	/* map in the exynos io registers */
 	error = bus_space_map(&exynos_bs_tag, EXYNOS_CORE_PBASE,
-x04000000 /*EXYNOS_CORE_SIZE*/, 0, &exynos_core_bsh);
+		core_size, 0, &exynos_core_bsh);
 	if (error)
 		panic("%s: failed to map in Exynos io registers: %d",
 			__func__, error);
 	KASSERT(exynos_core_bsh == iobase);
 #endif
+}
 void
 exynos_device_register(device_t self, void *aux)
+{
 	if (device_is_a(self, "armperiph")
 	    && device_is_a(device_parent(self), "mainbus")) {
 		/*
 		 * XXX KLUDGE ALERT XXX
 		 * The iot mainbus supplies is completely wrong since it scales
 		 * addresses by 2.  The simpliest remedy is to replace with our
 		 * bus space used for the armcore regisers (which armperiph uses).

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exynos_sscom.c,v 1.2 2014/04/14 21:16:15 reinoud Exp $ */
+/*	$NetBSD: exynos_sscom.c,v 1.3 2014/04/16 21:28:51 reinoud Exp $ */
 /*
  * Copyright (c) 2014 Reinoud Zandijk
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003 Genetec Corporation
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -24,27 +24,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL FUJITSU COMPONENT LIMITED OR GENETEC
  * CORPORATION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_sscom.c,v 1.2 2014/04/14 21:16:15 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_sscom.c,v 1.3 2014/04/16 21:28:51 reinoud Exp $");
 #include "opt_sscom.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 @@ -131,43 +131,45 @@ exynos_clear_interrupts(struct sscom_sof
 	if (flags & SSCOM_HW_RXINT)
 		val |= sc->sc_rx_irqno;
 	if (flags & SSCOM_HW_TXINT)
 		val |= sc->sc_tx_irqno;
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, SSCOM_UINTP, val);
+}
 static void
 sscom_attach(device_t parent, device_t self, void *aux)
+{
 	struct sscom_softc *sc = device_private(self);
 	struct exyo_attach_args *exyo = aux;
 	int unit = exyo->exyo_loc.loc_port;
 	bus_addr_t iobase = exyo->exyo_loc.loc_offset;
-	aprint_normal( ": UART%d addr=%lx", unit, iobase );
+	/* debug */
 //	bus_addr_t iobase = exyo->exyo_loc.loc_offset;
 //	aprint_normal( ": UART%d addr=%lx", unit, iobase );
 	sc->sc_dev = self;
 	sc->sc_iot = exyo->exyo_core_bst;
 	sc->sc_unit = unit;
 	sc->sc_frequency = EXYNOS_UART_FREQ;
 	sc->sc_change_txrx_interrupts = exynos_change_txrx_interrupts;
 	sc->sc_clear_interrupts = exynos_clear_interrupts;
 	sc->sc_rx_irqno = UINT_RXD;
 	sc->sc_tx_irqno = UINT_TXD;
 	if (!sscom_is_console(sc->sc_iot, unit, &sc->sc_ioh)
-	    && bus_space_map(sc->sc_iot, iobase, SSCOM_SIZE, 0, &sc->sc_ioh)) {
+	    && bus_space_subregion(sc->sc_iot, exyo->exyo_core_bsh,
 		    exyo->exyo_loc.loc_offset, SSCOM_SIZE, &sc->sc_ioh)) {
 		printf( ": failed to map registers\n" );
 		return;
+	}
 	printf("\n");
 	void *ih = intr_establish(exyo->exyo_loc.loc_intr, IPL_SERIAL,
 	    IST_LEVEL, sscomintr, sc);
 	if (ih != NULL) {
 		aprint_normal_dev(self, "interrupting at irq %d\n",
 		    exyo->exyo_loc.loc_intr);
+	}
 	sscom_attach_subr(sc);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sscom.c,v 1.2 2014/04/14 21:16:15 reinoud Exp $ */
+/*	$NetBSD: sscom.c,v 1.3 2014/04/16 21:28:51 reinoud Exp $ */
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003 Genetec Corporation
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -88,27 +88,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)com.c	7.5 (Berkeley) 5/16/91
  */
 /*
  * Support integrated UARTs of Samsung S3C2800/2400X/2410X
  * Derived from sys/dev/ic/com.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.2 2014/04/14 21:16:15 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sscom.c,v 1.3 2014/04/16 21:28:51 reinoud Exp $");
 #include "opt_sscom.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "rnd.h"
 #ifdef RND_COM
 #include <sys/rnd.h>
 #endif
 /*
 @@ -171,27 +171,28 @@ integrate void sscom_schedrx	(struct ssc
 static void	sscom_modem(struct sscom_softc *, int);
 static void	sscom_break(struct sscom_softc *, int);
 static void	sscom_iflush(struct sscom_softc *);
 static void	sscom_hwiflow(struct sscom_softc *);
 static void	sscom_loadchannelregs(struct sscom_softc *);
 static void	tiocm_to_sscom(struct sscom_softc *, u_long, int);
 static int	sscom_to_tiocm(struct sscom_softc *);
 static void	tiocm_to_sscom(struct sscom_softc *, u_long, int);
 static int	sscom_to_tiocm(struct sscom_softc *);
 static void	sscom_iflush(struct sscom_softc *);
 static int	sscomhwiflow(struct tty *tp, int block);
 #if defined(KGDB) || defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE)
-static int	sscom_init(bus_space_tag_t, const struct sscom_uart_info *,
+static int	sscom_init(bus_space_tag_t, bus_space_handle_t,
 		    const struct sscom_uart_info *,
 		    int, int, tcflag_t, bus_space_handle_t *);
 #endif
 extern struct cfdriver sscom_cd;
 const struct cdevsw sscom_cdevsw = {
 	.d_open = sscomopen,
 	.d_close = sscomclose,
 	.d_read = sscomread,
 	.d_write = sscomwrite,
 	.d_ioctl = sscomioctl,
 	.d_stop = sscomstop,
 	.d_tty = sscomtty,
 @@ -1829,35 +1830,35 @@ sscomintr(void *v)
 	if (clear)
 		sc->sc_clear_interrupts(sc, clear);
 	return clear? 1: 0;
+}
 #if defined(KGDB) || defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE)
 /*
  * Initialize UART for use as console or KGDB line.
  */
 static int
-sscom_init(bus_space_tag_t iot, const struct sscom_uart_info *config,
+sscom_init(bus_space_tag_t iot, bus_space_handle_t base_ioh,
     const struct sscom_uart_info *config,
     int rate, int frequency, tcflag_t cflag, bus_space_handle_t *iohp)
+{
 	bus_space_handle_t ioh;
 	bus_addr_t iobase = config->iobase;
 	int timo = 150000;
-	if (bus_space_map(iot, iobase, SSCOM_SIZE, 0, &ioh))
+	bus_space_subregion(iot, base_ioh, iobase, SSCOM_SIZE, &ioh);
 		return ENOMEM; /* ??? */
 	/* wait until all is transmitted until we enable this device */
 	while (!(bus_space_read_4(iot, ioh, SSCOM_UTRSTAT) &
 		UTRSTAT_TXSHIFTER_EMPTY) && --timo);
 	/* reset UART control */
 	bus_space_write_4(iot, ioh, SSCOM_UCON, 0);
 	/* set RX/TX trigger to half values */
 	bus_space_write_4(iot, ioh, SSCOM_UFCON,
 	    __SHIFTIN(4, UFCON_TXTRIGGER) |
 	    __SHIFTIN(4, UFCON_RXTRIGGER) |
 	    UFCON_FIFO_ENABLE |
 @@ -1883,32 +1884,34 @@ sscom_init(bus_space_tag_t iot, const st
 #endif
 #if defined(SSCOM0CONSOLE) || defined(SSCOM1CONSOLE)
 /*
  * Following are all routines needed for SSCOM to act as console
  */
 struct consdev sscomcons = {
 	NULL, NULL, sscomcngetc, sscomcnputc, sscomcnpollc, NULL,
 	NULL, NULL, NODEV, CN_NORMAL
 };
 int
-sscom_cnattach(bus_space_tag_t iot, const struct sscom_uart_info *config,
+sscom_cnattach(bus_space_tag_t iot, bus_space_handle_t ioh,
     const struct sscom_uart_info *config,
     int rate, int frequency, tcflag_t cflag)
+{
 	int res;
-	res = sscom_init(iot, config, rate, frequency, cflag, &sscomconsioh);
+	res = sscom_init(iot, ioh, config,
 		rate, frequency, cflag, &sscomconsioh);
 	if (res)
 		return res;
 	cn_tab = &sscomcons;
 	cn_init_magic(&sscom_cnm_state);
 	cn_set_magic("\047\001"); /* default magic is BREAK */
 	sscomconstag = iot;
 	sscomconsunit = config->unit;
 	sscomconsrate = rate;
 	sscomconscflag = cflag;
 	return 0;
 @@ -2012,37 +2015,39 @@ sscomcnputc(dev_t dev, int c)
+}
 void
 sscomcnpollc(dev_t dev, int on)
+{
 	sscom_readaheadcount = 0;
+}
 #endif /* SSCOM0CONSOLE||SSCOM1CONSOLE */
 #ifdef KGDB
 int
-sscom_kgdb_attach(bus_space_tag_t iot, const struct sscom_uart_info *config,
+sscom_kgdb_attach(bus_space_tag_t iot, bus_space_handle_t ioh,
     const struct sscom_uart_info *config,
     int rate, int frequency, tcflag_t cflag)
+{
 	int res;
 	if (iot == sscomconstag && config->unit == sscomconsunit) {
 		printf( "console==kgdb_port (%d): kgdb disabled\n", sscomconsunit);
 		return EBUSY; /* cannot share with console */
+	}
-	res = sscom_init(iot, config, rate, frequency, cflag, &sscom_kgdb_ioh);
+	res = sscom_init(iot, ioh, config,
 		rate, frequency, cflag, &sscom_kgdb_ioh);
 	if (res)
 		return res;
 	kgdb_attach(sscom_kgdb_getc, sscom_kgdb_putc, NULL);
 	kgdb_dev = 123; /* unneeded, only to satisfy some tests */
 	sscom_kgdb_iot = iot;
 	sscom_kgdb_unit = config->unit;
 	return 0;
+}
 /* ARGSUSED */

 @@ -1,14 +1,14 @@
-/* $NetBSD: sscom_var.h,v 1.2 2014/04/14 21:16:15 reinoud Exp $ */
+/* $NetBSD: sscom_var.h,v 1.3 2014/04/16 21:28:51 reinoud Exp $ */
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003 Genetec Corporation
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -233,25 +233,26 @@ void	sscom_attach_subr(struct sscom_soft
 int	sscom_detach(device_t, int);
 int	sscom_activate(device_t, enum devact);
 void	sscom_shutdown(struct sscom_softc *);
 void	sscomdiag(void *);
 void	sscomstart(struct tty *);
 int	sscomparam(struct tty *, struct termios *);
 int	sscomread(dev_t, struct uio *, int);
 void	sscom_config(struct sscom_softc *);
 int	sscomtxintr(void *);
 int	sscomrxintr(void *);
 int	sscomintr(void *);
-int	sscom_cnattach(bus_space_tag_t, const struct sscom_uart_info *,
+int	sscom_cnattach(bus_space_tag_t, bus_space_handle_t,
-	    int, int, tcflag_t);
+	    const struct sscom_uart_info *, int, int, tcflag_t);
 void	sscom_cndetach(void);
 int	sscom_is_console(bus_space_tag_t, int, bus_space_handle_t *);
 #ifdef KGDB
-int	sscom_kgdb_attach(bus_space_tag_t, const struct sscom_uart_info *,
+int	sscom_kgdb_attach(bus_space_tag_t, bus_space_handle_t,
 	    const struct sscom_uart_info *,
 	    int, int, tcflag_t);
 #endif
 #endif /* _ARM_SAMSUNG_SSCOM_VAR_H */