Author: mmel
Date: Wed Feb  3 08:59:12 2016
New Revision: 295199
URL: https://svnweb.freebsd.org/changeset/base/295199

Log:
  ARM: The arm/xscale/i80321 directory is now orphaned, but two drivers
  are shared with i8134x. In preparation for removal of i80321, copy these
  drivers to i8134x.

Added:
  head/sys/arm/xscale/i8134x/i80321_timer.c
     - copied, changed from r295197, head/sys/arm/xscale/i80321/i80321_timer.c
  head/sys/arm/xscale/i8134x/i80321_wdog.c
     - copied, changed from r295197, head/sys/arm/xscale/i80321/i80321_wdog.c
  head/sys/arm/xscale/i8134x/i80321reg.h
     - copied unchanged from r295197, head/sys/arm/xscale/i80321/i80321reg.h
  head/sys/arm/xscale/i8134x/i80321var.h
     - copied unchanged from r295197, head/sys/arm/xscale/i80321/i80321var.h
Modified:
  head/sys/arm/xscale/i8134x/crb_machdep.c
  head/sys/arm/xscale/i8134x/files.i81342

Modified: head/sys/arm/xscale/i8134x/crb_machdep.c
==============================================================================
--- head/sys/arm/xscale/i8134x/crb_machdep.c    Wed Feb  3 08:12:21 2016        
(r295198)
+++ head/sys/arm/xscale/i8134x/crb_machdep.c    Wed Feb  3 08:59:12 2016        
(r295199)
@@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/reboot.h>
 
 
-#include <arm/xscale/i80321/i80321var.h> /* For i80321_calibrate_delay() */
+#include <arm/xscale/i8134x/i80321var.h> /* For i80321_calibrate_delay() */
 
 #include <arm/xscale/i8134x/i81342reg.h>
 #include <arm/xscale/i8134x/i81342var.h>

Modified: head/sys/arm/xscale/i8134x/files.i81342
==============================================================================
--- head/sys/arm/xscale/i8134x/files.i81342     Wed Feb  3 08:12:21 2016        
(r295198)
+++ head/sys/arm/xscale/i8134x/files.i81342     Wed Feb  3 08:59:12 2016        
(r295199)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 arm/arm/bus_space_base.c               standard
-arm/xscale/i80321/i80321_timer.c       standard
-arm/xscale/i80321/i80321_wdog.c                optional        iopwdog
+arm/xscale/i8134x/i80321_timer.c       standard
+arm/xscale/i8134x/i80321_wdog.c                optional        iopwdog
 arm/xscale/i8134x/i81342.c             standard
 arm/xscale/i8134x/i81342_mcu.c         standard
 arm/xscale/i8134x/i81342_pci.c         optional        pci

Copied and modified: head/sys/arm/xscale/i8134x/i80321_timer.c (from r295197, 
head/sys/arm/xscale/i80321/i80321_timer.c)
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_timer.c   Wed Feb  3 04:02:50 2016        
(r295197, copy source)
+++ head/sys/arm/xscale/i8134x/i80321_timer.c   Wed Feb  3 08:59:12 2016        
(r295199)
@@ -59,8 +59,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
-#include <arm/xscale/i80321/i80321reg.h>
-#include <arm/xscale/i80321/i80321var.h>
+#include <arm/xscale/i8134x/i80321reg.h>
+#include <arm/xscale/i8134x/i80321var.h>
 
 #ifdef CPU_XSCALE_81342
 #define ICU_INT_TIMER0 (8) /* XXX: Can't include i81342reg.h because

Copied and modified: head/sys/arm/xscale/i8134x/i80321_wdog.c (from r295197, 
head/sys/arm/xscale/i80321/i80321_wdog.c)
==============================================================================
--- head/sys/arm/xscale/i80321/i80321_wdog.c    Wed Feb  3 04:02:50 2016        
(r295197, copy source)
+++ head/sys/arm/xscale/i8134x/i80321_wdog.c    Wed Feb  3 08:59:12 2016        
(r295199)
@@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/machdep.h>
 
-#include <arm/xscale/i80321/i80321reg.h>
-#include <arm/xscale/i80321/i80321var.h>
+#include <arm/xscale/i8134x/i80321reg.h>
+#include <arm/xscale/i8134x/i80321var.h>
 
 
 struct iopwdog_softc {

Copied: head/sys/arm/xscale/i8134x/i80321reg.h (from r295197, 
head/sys/arm/xscale/i80321/i80321reg.h)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/xscale/i8134x/i80321reg.h      Wed Feb  3 08:59:12 2016        
(r295199, copy of r295197, head/sys/arm/xscale/i80321/i80321reg.h)
@@ -0,0 +1,547 @@
+/*     $NetBSD: i80321reg.h,v 1.14 2003/12/19 10:08:11 gavan Exp $     */
+
+/*-
+ * Copyright (c) 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * 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
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed for the NetBSD Project by
+ *     Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * 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.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef _ARM_XSCALE_I80321REG_H_
+#define _ARM_XSCALE_I80321REG_H_
+
+/*
+ * Register definitions for the Intel 80321 (``Verde'') I/O processor,
+ * based on the XScale core.
+ */
+
+/*
+ * Base i80321 memory map:
+ *
+ *     0x0000.0000 - 0x7fff.ffff       ATU Outbound Direct Addressing Window
+ *     0x8000.0000 - 0x9001.ffff       ATU Outbound Translation Windows
+ *     0x9002.0000 - 0xffff.dfff       External Memory
+ *     0xffff.e000 - 0xffff.e8ff       Peripheral Memory Mapped Registers
+ *     0xffff.e900 - 0xffff.ffff       Reserved
+ */
+
+#define        VERDE_OUT_DIRECT_WIN_BASE       0x00000000UL
+#define        VERDE_OUT_DIRECT_WIN_SIZE       0x80000000UL
+
+#define        VERDE_OUT_XLATE_MEM_WIN_SIZE    0x04000000UL
+#define        VERDE_OUT_XLATE_IO_WIN_SIZE     0x00010000UL
+
+#define        VERDE_OUT_XLATE_MEM_WIN0_BASE   0x80000000UL
+#define        VERDE_OUT_XLATE_MEM_WIN1_BASE   0x84000000UL
+
+#define        VERDE_OUT_XLATE_IO_WIN0_BASE    0x90000000UL
+
+#define        VERDE_EXTMEM_BASE               0x90020000UL
+
+#define        VERDE_PMMR_BASE                 0xffffe000UL
+#define        VERDE_PMMR_SIZE                 0x00001700UL
+
+/*
+ * Peripheral Memory Mapped Registers.  Defined as offsets
+ * from the VERDE_PMMR_BASE.
+ */
+#define        VERDE_ATU_BASE                  0x0100
+#define        VERDE_ATU_SIZE                  0x0100
+
+#define        VERDE_MU_BASE                   0x0300
+#define        VERDE_MU_SIZE                   0x0100
+
+#define        VERDE_DMA_BASE                  0x0400
+#define        VERDE_DMA_BASE0                 (VERDE_DMA_BASE + 0x00)
+#define        VERDE_DMA_BASE1                 (VERDE_DMA_BASE + 0x40)
+#define        VERDE_DMA_SIZE                  0x0100
+#define        VERDE_DMA_CHSIZE                0x0040
+
+#define        VERDE_MCU_BASE                  0x0500
+#define        VERDE_MCU_SIZE                  0x0100
+
+#if defined(CPU_XSCALE_80321)
+#define        VERDE_SSP_BASE                  0x0600
+#define        VERDE_SSP_SIZE                  0x0080
+#endif
+
+#define        VERDE_PBIU_BASE                 0x0680
+#define        VERDE_PBIU_SIZE                 0x0080
+
+#if defined(CPU_XSCALE_80321)
+#define        VERDE_AAU_BASE                  0x0800
+#define        VERDE_AAU_SIZE                  0x0100
+#endif
+
+#define        VERDE_I2C_BASE                  0x1680
+#define        VERDE_I2C_BASE0                 (VERDE_I2C_BASE + 0x00)
+#define        VERDE_I2C_BASE1                 (VERDE_I2C_BASE + 0x20)
+#define        VERDE_I2C_SIZE                  0x0080
+#define        VERDE_I2C_CHSIZE                0x0020
+
+/*
+ * Address Translation Unit
+ */
+       /* 0x00 - 0x38 -- PCI configuration space header */
+#define        ATU_IALR0       0x40    /* Inbound ATU Limit 0 */
+#define        ATU_IATVR0      0x44    /* Inbound ATU Xlate Value 0 */
+#define        ATU_ERLR        0x48    /* Expansion ROM Limit */
+#define        ATU_ERTVR       0x4c    /* Expansion ROM Xlate Value */
+#define        ATU_IALR1       0x50    /* Inbound ATU Limit 1 */
+#define        ATU_IALR2       0x54    /* Inbound ATU Limit 2 */
+#define        ATU_IATVR2      0x58    /* Inbound ATU Xlate Value 2 */
+#define        ATU_OIOWTVR     0x5c    /* Outbound I/O Window Xlate Value */
+#define        ATU_OMWTVR0     0x60    /* Outbound Mem Window Xlate Value 0 */
+#define        ATU_OUMWTVR0    0x64    /* Outbound Mem Window Xlate Value 0 
Upper */
+#define        ATU_OMWTVR1     0x68    /* Outbound Mem Window Xlate Value 1 */
+#define        ATU_OUMWTVR1    0x6c    /* Outbound Mem Window Xlate Value 1 
Upper */
+#define        ATU_OUDWTVR     0x78    /* Outbound Mem Direct Xlate Value 
Upper */
+#define        ATU_ATUCR       0x80    /* ATU Configuration */
+#define        ATU_PCSR        0x84    /* PCI Configuration and Status */
+#define        ATU_ATUISR      0x88    /* ATU Interrupt Status */
+#define        ATU_ATUIMR      0x8c    /* ATU Interrupt Mask */
+#define        ATU_IABAR3      0x90    /* Inbound ATU Base Address 3 */
+#define        ATU_IAUBAR3     0x94    /* Inbound ATU Base Address 3 Upper */
+#define        ATU_IALR3       0x98    /* Inbound ATU Limit 3 */
+#define        ATU_IATVR3      0x9c    /* Inbound ATU Xlate Value 3 */
+#define        ATU_OCCAR       0xa4    /* Outbound Configuration Cycle Address 
*/
+#define        ATU_OCCDR       0xac    /* Outbound Configuration Cycle Data */
+#define        ATU_MSI_PORT    0xb4    /* MSI port */
+#define        ATU_PDSCR       0xbc    /* PCI Bus Drive Strength Control */
+#define        ATU_PCI_X_CAP_ID 0xe0   /* (1) */
+#define        ATU_PCI_X_NEXT  0xe1    /* (1) */
+#define        ATU_PCIXCMD     0xe2    /* PCI-X Command Register (2) */
+#define        ATU_PCIXSR      0xe4    /* PCI-X Status Register */
+
+#define        ATUCR_DRC_ALIAS         (1U << 19)
+#define        ATUCR_DAU2GXEN          (1U << 18)
+#define        ATUCR_P_SERR_MA         (1U << 16)
+#define        ATUCR_DTS               (1U << 15)
+#define        ATUCR_P_SERR_DIE        (1U << 9)
+#define        ATUCR_DAE               (1U << 8)
+#define        ATUCR_BIST_IE           (1U << 3)
+#define        ATUCR_OUT_EN            (1U << 1)
+
+#define        PCSR_DAAAPE             (1U << 18)
+#define        PCSR_PCI_X_CAP          (3U << 16)
+#define        PCSR_PCI_X_CAP_BORING   (0 << 16)
+#define        PCSR_PCI_X_CAP_66       (1U << 16)
+#define        PCSR_PCI_X_CAP_100      (2U << 16)
+#define        PCSR_PCI_X_CAP_133      (3U << 16)
+#define        PCSR_OTQB               (1U << 15)
+#define        PCSR_IRTQB              (1U << 14)
+#define        PCSR_DTV                (1U << 12)
+#define        PCSR_BUS66              (1U << 10)
+#define        PCSR_BUS64              (1U << 8)
+#define        PCSR_RIB                (1U << 5)
+#define        PCSR_RPB                (1U << 4)
+#define        PCSR_CCR                (1U << 2)
+#define        PCSR_CPR                (1U << 1)
+
+#define        ATUISR_IMW1BU           (1U << 14)
+#define        ATUISR_ISCEM            (1U << 13)
+#define        ATUISR_RSCEM            (1U << 12)
+#define        ATUISR_PST              (1U << 11)
+#define        ATUISR_P_SERR_ASRT      (1U << 10)
+#define        ATUISR_DPE              (1U << 9)
+#define        ATUISR_BIST             (1U << 8)
+#define        ATUISR_IBMA             (1U << 7)
+#define        ATUISR_P_SERR_DET       (1U << 4)
+#define        ATUISR_PMA              (1U << 3)
+#define        ATUISR_PTAM             (1U << 2)
+#define        ATUISR_PTAT             (1U << 1)
+#define        ATUISR_PMPE             (1U << 0)
+
+#define        ATUIMR_IMW1BU           (1U << 11)
+#define        ATUIMR_ISCEM            (1U << 10)
+#define        ATUIMR_RSCEM            (1U << 9)
+#define        ATUIMR_PST              (1U << 8)
+#define        ATUIMR_DPE              (1U << 7)
+#define        ATUIMR_P_SERR_ASRT      (1U << 6)
+#define        ATUIMR_PMA              (1U << 5)
+#define        ATUIMR_PTAM             (1U << 4)
+#define        ATUIMR_PTAT             (1U << 3)
+#define        ATUIMR_PMPE             (1U << 2)
+#define        ATUIMR_IE_SERR_EN       (1U << 1)
+#define        ATUIMR_ECC_TAE          (1U << 0)
+
+#define        PCIXCMD_MOST_1          (0 << 4)
+#define        PCIXCMD_MOST_2          (1 << 4)
+#define        PCIXCMD_MOST_3          (2 << 4)
+#define        PCIXCMD_MOST_4          (3 << 4)
+#define        PCIXCMD_MOST_8          (4 << 4)
+#define        PCIXCMD_MOST_12         (5 << 4)
+#define        PCIXCMD_MOST_16         (6 << 4)
+#define        PCIXCMD_MOST_32         (7 << 4)
+#define        PCIXCMD_MOST_MASK       (7 << 4)
+#define        PCIXCMD_MMRBC_512       (0 << 2)
+#define        PCIXCMD_MMRBC_1024      (1 << 2)
+#define        PCIXCMD_MMRBC_2048      (2 << 2)
+#define        PCIXCMD_MMRBC_4096      (3 << 2)
+#define        PCIXCMD_MMRBC_MASK      (3 << 2)
+#define        PCIXCMD_ERO             (1U << 1)
+#define        PCIXCMD_DPERE           (1U << 0)
+
+#define        PCIXSR_RSCEM            (1U << 29)
+#define        PCIXSR_DMCRS_MASK       (7 << 26)
+#define        PCIXSR_DMOST_MASK       (7 << 23)
+#define        PCIXSR_COMPLEX          (1U << 20)
+#define        PCIXSR_USC              (1U << 19)
+#define        PCIXSR_SCD              (1U << 18)
+#define        PCIXSR_133_CAP          (1U << 17)
+#define        PCIXSR_32PCI            (1U << 16)      /* 0 = 32, 1 = 64 */
+#define        PCIXSR_BUSNO(x)         (((x) & 0xff00) >> 8)
+#define        PCIXSR_DEVNO(x)         (((x) & 0xf8) >> 3)
+#define        PCIXSR_FUNCNO(x)        ((x) & 0x7)
+
+/*
+ * Memory Controller Unit
+ */
+#define        MCU_SDIR                0x00    /* DDR SDRAM Init. Register */
+#define        MCU_SDCR                0x04    /* DDR SDRAM Control Register */
+#define        MCU_SDBR                0x08    /* SDRAM Base Register */
+#define        MCU_SBR0                0x0c    /* SDRAM Boundary 0 */
+#define        MCU_SBR1                0x10    /* SDRAM Boundary 1 */
+#define        MCU_ECCR                0x34    /* ECC Control Register */
+#define        MCU_ELOG0               0x38    /* ECC Log 0 */
+#define        MCU_ELOG1               0x3c    /* ECC Log 1 */
+#define        MCU_ECAR0               0x40    /* ECC address 0 */
+#define        MCU_ECAR1               0x44    /* ECC address 1 */
+#define        MCU_ECTST               0x48    /* ECC test register */
+#define        MCU_MCISR               0x4c    /* MCU Interrupt Status 
Register */
+#define        MCU_RFR                 0x50    /* Refresh Frequency Register */
+#define        MCU_DBUDSR              0x54    /* Data Bus Pull-up Drive 
Strength */
+#define        MCU_DBDDSR              0x58    /* Data Bus Pull-down Drive 
Strength */
+#define        MCU_CUDSR               0x5c    /* Clock Pull-up Drive Strength 
*/
+#define        MCU_CDDSR               0x60    /* Clock Pull-down Drive 
Strength */
+#define        MCU_CEUDSR              0x64    /* Clock En Pull-up Drive 
Strength */
+#define        MCU_CEDDSR              0x68    /* Clock En Pull-down Drive 
Strength */
+#define        MCU_CSUDSR              0x6c    /* Chip Sel Pull-up Drive 
Strength */
+#define        MCU_CSDDSR              0x70    /* Chip Sel Pull-down Drive 
Strength */
+#define        MCU_REUDSR              0x74    /* Rx En Pull-up Drive Strength 
*/
+#define        MCU_REDDSR              0x78    /* Rx En Pull-down Drive 
Strength */
+#define        MCU_ABUDSR              0x7c    /* Addr Bus Pull-up Drive 
Strength */
+#define        MCU_ABDDSR              0x80    /* Addr Bus Pull-down Drive 
Strength */
+#define        MCU_DSDR                0x84    /* Data Strobe Delay Register */
+#define        MCU_REDR                0x88    /* Rx Enable Delay Register */
+
+#define        SDCR_DIMMTYPE           (1U << 1)       /* 0 = unbuf, 1 = reg */
+#define        SDCR_BUSWIDTH           (1U << 2)       /* 0 = 64, 1 = 32 */
+
+#define        SBRx_TECH               (1U << 31)
+#define        SBRx_BOUND              0x0000003f
+
+#define        ECCR_SBERE              (1U << 0)
+#define        ECCR_MBERE              (1U << 1)
+#define        ECCR_SBECE              (1U << 2)
+#define        ECCR_ECCEN              (1U << 3)
+
+#define        ELOGx_SYNDROME          0x000000ff
+#define        ELOGx_ERRTYPE           (1U << 8)       /* 1 = multi-bit */
+#define        ELOGx_RW                (1U << 12)      /* 1 = write error */
+       /*
+        * Dev ID       Func            Requester
+        * 2            0               XScale core
+        * 2            1               ATU
+        * 13           0               DMA channel 0
+        * 13           1               DMA channel 1
+        * 26           0               ATU
+        */
+#define        ELOGx_REQ_DEV(x)        (((x) >> 19) & 0x1f)
+#define        ELOGx_REQ_FUNC(x)       (((x) >> 16) & 0x3)
+
+#define        MCISR_ECC_ERR0          (1U << 0)
+#define        MCISR_ECC_ERR1          (1U << 1)
+#define        MCISR_ECC_ERRN          (1U << 2)
+
+/*
+ * Timers
+ *
+ * The i80321 timer registers are available in both memory-mapped
+ * and coprocessor spaces.  Most of the registers are read-only
+ * if memory-mapped, so we access them via coprocessor space.
+ *
+ *     TMR0    cp6 c0,1        0xffffe7e0
+ *     TMR1    cp6 c1,1        0xffffe7e4
+ *     TCR0    cp6 c2,1        0xffffe7e8
+ *     TCR1    cp6 c3,1        0xffffe7ec
+ *     TRR0    cp6 c4,1        0xffffe7f0
+ *     TRR1    cp6 c5,1        0xffffe7f4
+ *     TISR    cp6 c6,1        0xffffe7f8
+ *     WDTCR   cp6 c7,1        0xffffe7fc
+ */
+
+#define        TMRx_TC                 (1U << 0)
+#define        TMRx_ENABLE             (1U << 1)
+#define        TMRx_RELOAD             (1U << 2)
+#define        TMRx_CSEL_CORE          (0 << 4)
+#define        TMRx_CSEL_CORE_div4     (1 << 4)
+#define        TMRx_CSEL_CORE_div8     (2 << 4)
+#define        TMRx_CSEL_CORE_div16    (3 << 4)
+
+#define        TISR_TMR0               (1U << 0)
+#define        TISR_TMR1               (1U << 1)
+
+#define        WDTCR_ENABLE1           0x1e1e1e1e
+#define        WDTCR_ENABLE2           0xe1e1e1e1
+
+/*
+ * Interrupt Controller Unit.
+ *
+ *     INTCTL  cp6 c0,0        0xffffe7d0
+ *     INTSTR  cp6 c4,0        0xffffe7d4
+ *     IINTSRC cp6 c8,0        0xffffe7d8
+ *     FINTSRC cp6 c9,0        0xffffe7dc
+ *     PIRSR                   0xffffe1ec
+ */
+
+#define        ICU_PIRSR               0x01ec
+#define        ICU_GPOE                0x07c4
+#define        ICU_GPID                0x07c8
+#define        ICU_GPOD                0x07cc
+
+/*
+ * NOTE: WE USE THE `bitXX' BITS TO INDICATE PENDING SOFTWARE
+ * INTERRUPTS.  See i80321_icu.c
+ */
+#define        ICU_INT_HPI             31      /* high priority interrupt */
+#define        ICU_INT_XINT0           27      /* external interrupts */
+#define        ICU_INT_XINT(x)         ((x) + ICU_INT_XINT0)
+#define        ICU_INT_bit26           26
+
+#if defined (CPU_XSCALE_80219)
+#define        ICU_INT_bit25           25      /* reserved */
+#else
+/* CPU_XSCALE_80321 */
+#define        ICU_INT_SSP             25      /* SSP serial port */
+#endif
+
+#define        ICU_INT_MUE             24      /* msg unit error */
+
+#if defined (CPU_XSCALE_80219)
+#define        ICU_INT_bit23           23      /* reserved */
+#else
+/* CPU_XSCALE_80321 */
+#define        ICU_INT_AAUE            23      /* AAU error */
+#endif
+
+#define        ICU_INT_bit22           22
+#define        ICU_INT_DMA1E           21      /* DMA Ch 1 error */
+#define        ICU_INT_DMA0E           20      /* DMA Ch 0 error */
+#define        ICU_INT_MCUE            19      /* memory controller error */
+#define        ICU_INT_ATUE            18      /* ATU error */
+#define        ICU_INT_BIUE            17      /* bus interface unit error */
+#define        ICU_INT_PMU             16      /* XScale PMU */
+#define        ICU_INT_PPM             15      /* peripheral PMU */
+#define        ICU_INT_BIST            14      /* ATU Start BIST */
+#define        ICU_INT_MU              13      /* messaging unit */
+#define        ICU_INT_I2C1            12      /* i2c unit 1 */
+#define        ICU_INT_I2C0            11      /* i2c unit 0 */
+#define        ICU_INT_TMR1            10      /* timer 1 */
+#define        ICU_INT_TMR0            9       /* timer 0 */
+#define        ICU_INT_CPPM            8       /* core processor PMU */
+
+#if defined(CPU_XSCALE_80219)
+#define        ICU_INT_bit7            7 /* reserved */
+#define        ICU_INT_bit6            6 /* reserved */
+#else
+/* CPU_XSCALE_80321 */
+#define        ICU_INT_AAU_EOC         7       /* AAU end-of-chain */
+#define        ICU_INT_AAU_EOT         6       /* AAU end-of-transfer */
+#endif
+
+#define        ICU_INT_bit5            5
+#define        ICU_INT_bit4            4
+#define        ICU_INT_DMA1_EOC        3       /* DMA1 end-of-chain */
+#define        ICU_INT_DMA1_EOT        2       /* DMA1 end-of-transfer */
+#define        ICU_INT_DMA0_EOC        1       /* DMA0 end-of-chain */
+#define        ICU_INT_DMA0_EOT        0       /* DMA0 end-of-transfer */
+
+#if defined (CPU_XSCALE_80219)
+#define        ICU_INT_HWMASK          (0xffffffff &    \
+                                                        ~((1 << ICU_INT_bit26) 
|       \
+                                                          (1 << ICU_INT_bit25) 
|       \
+                                                          (1 << ICU_INT_bit23) 
|       \
+                                                          (1 << ICU_INT_bit22) 
|       \
+                                                          (1 << ICU_INT_bit7)  
|       \
+                                                          (1 << ICU_INT_bit6)  
|       \
+                                                          (1 << ICU_INT_bit5)  
|       \
+                                                          (1 << ICU_INT_bit4)))
+
+#else
+/* CPU_XSCALE_80321 */
+#define        ICU_INT_HWMASK          (0xffffffff & \
+                                       ~((1 << ICU_INT_bit26) | \
+                                         (1 << ICU_INT_bit22) | \
+                                         (1 << ICU_INT_bit5)  | \
+                                         (1 << ICU_INT_bit4)))
+#endif
+
+/*
+ * SSP Serial Port
+ */
+#if defined (CPU_XSCALE_80321)
+
+#define        SSP_SSCR0       0x00            /* SSC control 0 */
+#define        SSP_SSCR1       0x04            /* SSC control 1 */
+#define        SSP_SSSR        0x08            /* SSP status */
+#define        SSP_SSITR       0x0c            /* SSP interrupt test */
+#define        SSP_SSDR        0x10            /* SSP data */
+
+#define        SSP_SSCR0_DSIZE(x)      ((x) - 1)/* data size: 4..16 */
+#define        SSP_SSCR0_FRF_SPI       (0 << 4) /* Motorola Serial Periph 
Iface */
+#define        SSP_SSCR0_FRF_SSP       (1U << 4)/* TI Sync. Serial Protocol */
+#define        SSP_SSCR0_FRF_UWIRE     (2U << 4)/* NatSemi Microwire */
+#define        SSP_SSCR0_FRF_rsvd      (3U << 4)/* reserved */
+#define        SSP_SSCR0_ECS           (1U << 6)/* external clock select */
+#define        SSP_SSCR0_SSE           (1U << 7)/* sync. serial port enable */
+#define        SSP_SSCR0_SCR(x)        ((x) << 8)/* serial clock rate */
+                                         /* bit rate = 3.6864 * 10e6 /
+                                               (2 * (SCR + 1)) */
+
+#define        SSP_SSCR1_RIE           (1U << 0)/* Rx FIFO interrupt enable */
+#define        SSP_SSCR1_TIE           (1U << 1)/* Tx FIFO interrupt enable */
+#define        SSP_SSCR1_LBM           (1U << 2)/* loopback mode enable */
+#define        SSP_SSCR1_SPO           (1U << 3)/* Moto SPI SSCLK pol. (1 = 
high) */
+#define        SSP_SSCR1_SPH           (1U << 4)/* Moto SPI SSCLK phase:
+                                           0 = inactive full at start,
+                                               1/2 at end of frame
+                                           1 = inactive 1/2 at start,
+                                               full at end of frame */
+#define        SSP_SSCR1_MWDS          (1U << 5)/* Microwire data size:
+                                           0 = 8 bit
+                                           1 = 16 bit */
+#define        SSP_SSCR1_TFT           (((x) - 1) << 6) /* Tx FIFO threshold */
+#define        SSP_SSCR1_RFT           (((x) - 1) << 10)/* Rx FIFO threshold */
+#define        SSP_SSCR1_EFWR          (1U << 14)/* enab. FIFO write/read */
+#define        SSP_SSCR1_STRF          (1U << 15)/* FIFO write/read FIFO 
select:
+                                            0 = Tx FIFO
+                                            1 = Rx FIFO */
+
+#define        SSP_SSSR_TNF            (1U << 2)/* Tx FIFO not full */
+#define        SSP_SSSR_RNE            (1U << 3)/* Rx FIFO not empty */
+#define        SSP_SSSR_BSY            (1U << 4)/* SSP is busy */
+#define        SSP_SSSR_TFS            (1U << 5)/* Tx FIFO service request */
+#define        SSP_SSSR_RFS            (1U << 6)/* Rx FIFO service request */
+#define        SSP_SSSR_ROR            (1U << 7)/* Rx FIFO overrun */
+#define        SSP_SSSR_TFL(x)         (((x) >> 8) & 0xf) /* Tx FIFO level */
+#define        SSP_SSSR_RFL(x)         (((x) >> 12) & 0xf)/* Rx FIFO level */
+
+#define        SSP_SSITR_TTFS          (1U << 5)/* Test Tx FIFO service */
+#define        SSP_SSITR_TRFS          (1U << 6)/* Test Rx FIFO service */
+#define        SSP_SSITR_TROR          (1U << 7)/* Test Rx overrun */
+
+#endif /* CPU_XSCALE_80321 */
+
+/*
+ * Peripheral Bus Interface Unit
+ */
+
+#define PBIU_PBCR              0x00    /* PBIU Control Register */
+#define PBIU_PBBAR0            0x08    /* PBIU Base Address Register 0 */
+#define PBIU_PBLR0             0x0c    /* PBIU Limit Register 0 */
+#define PBIU_PBBAR1            0x10    /* PBIU Base Address Register 1 */
+#define PBIU_PBLR1             0x14    /* PBIU Limit Register 1 */
+#define PBIU_PBBAR2            0x18    /* PBIU Base Address Register 2 */
+#define PBIU_PBLR2             0x1c    /* PBIU Limit Register 2 */
+#define PBIU_PBBAR3            0x20    /* PBIU Base Address Register 3 */
+#define PBIU_PBLR3             0x24    /* PBIU Limit Register 3 */
+#define PBIU_PBBAR4            0x28    /* PBIU Base Address Register 4 */
+#define PBIU_PBLR4             0x2c    /* PBIU Limit Register 4 */
+#define PBIU_PBBAR5            0x30    /* PBIU Base Address Register 5 */
+#define PBIU_PBLR5             0x34    /* PBIU Limit Register 5 */
+#define PBIU_DSCR              0x38    /* PBIU Drive Strength Control Reg. */
+#define PBIU_MBR0              0x40    /* PBIU Memory-less Boot Reg. 0 */
+#define PBIU_MBR1              0x60    /* PBIU Memory-less Boot Reg. 1 */
+#define PBIU_MBR2              0x64    /* PBIU Memory-less Boot Reg. 2 */
+
+#define        PBIU_PBCR_PBIEN         (1 << 0)
+#define        PBIU_PBCR_PBI100        (1 << 1)
+#define        PBIU_PBCR_PBI66         (2 << 1)
+#define        PBIU_PBCR_PBI33         (3 << 1)
+#define        PBIU_PBCR_PBBEN         (1 << 3)
+
+#define        PBIU_PBARx_WIDTH8       (0 << 0)
+#define        PBIU_PBARx_WIDTH16      (1 << 0)
+#define        PBIU_PBARx_WIDTH32      (2 << 0)
+#define        PBIU_PBARx_ADWAIT4      (0 << 2)
+#define        PBIU_PBARx_ADWAIT8      (1 << 2)
+#define        PBIU_PBARx_ADWAIT12     (2 << 2)
+#define        PBIU_PBARx_ADWAIT16     (3 << 2)
+#define        PBIU_PBARx_ADWAIT20     (4 << 2)
+#define        PBIU_PBARx_RCWAIT1      (0 << 6)
+#define        PBIU_PBARx_RCWAIT4      (1 << 6)
+#define        PBIU_PBARx_RCWAIT8      (2 << 6)
+#define        PBIU_PBARx_RCWAIT12     (3 << 6)
+#define        PBIU_PBARx_RCWAIT16     (4 << 6)
+#define        PBIU_PBARx_RCWAIT20     (5 << 6)
+#define        PBIU_PBARx_FWE          (1 << 9)
+#define        PBIU_BASE_MASK          0xfffff000U
+
+#define        PBIU_PBLRx_SIZE(x)      (~((x) - 1))
+
+/*
+ * Messaging Unit
+ */
+#define MU_IMR0                        0x0010  /* MU Inbound Message Register 
0 */
+#define MU_IMR1                        0x0014  /* MU Inbound Message Register 
1 */
+#define MU_OMR0                        0x0018  /* MU Outbound Message Register 
0 */
+#define MU_OMR1                        0x001c  /* MU Outbound Message Register 
1 */
+#define MU_IDR                 0x0020  /* MU Inbound Doorbell Register */
+#define MU_IISR                        0x0024  /* MU Inbound Interrupt Status 
Reg */
+#define MU_IIMR                        0x0028  /* MU Inbound Interrupt Mask 
Reg */
+#define MU_ODR                 0x002c  /* MU Outbound Doorbell Register */
+#define MU_OISR                        0x0030  /* MU Outbound Interrupt Status 
Reg */
+#define MU_OIMR                        0x0034  /* MU Outbound Interrupt Mask 
Reg */
+#define MU_MUCR                        0x0050  /* MU Configuration Register */
+#define MU_QBAR                        0x0054  /* MU Queue Base Address 
Register */
+#define MU_IFHPR               0x0060  /* MU Inbound Free Head Pointer Reg */
+#define MU_IFTPR               0x0064  /* MU Inbound Free Tail Pointer Reg */
+#define MU_IPHPR               0x0068  /* MU Inbound Post Head Pointer Reg */
+#define MU_IPTPR               0x006c  /* MU Inbound Post Tail Pointer Reg */
+#define MU_OFHPR               0x0070  /* MU Outbound Free Head Pointer Reg */
+#define MU_OFTPR               0x0074  /* MU Outbound Free Tail Pointer Reg */
+#define MU_OPHPR               0x0078  /* MU Outbound Post Head Pointer Reg */
+#define MU_OPTPR               0x007c  /* MU Outbound Post Tail Pointer Reg */
+#define MU_IAR                 0x0080  /* MU Index Address Register */
+
+#define MU_IIMR_IRI    (1 << 6)        /* Index Register Interrupt */
+#define MU_IIMR_OFQFI  (1 << 5)        /* Outbound Free Queue Full Int. */
+#define MU_IIMR_IPQI   (1 << 4)        /* Inbound Post Queue Interrupt */
+#define MU_IIMR_EDI    (1 << 3)        /* Error Doorbell Interrupt */
+#define MU_IIMR_IDI    (1 << 2)        /* Inbound Doorbell Interrupt */
+#define MU_IIMR_IM1I   (1 << 1)        /* Inbound Message 1 Interrupt */
+#define MU_IIMR_IM0I   (1 << 0)        /* Inbound Message 0 Interrupt */
+
+#endif /* _ARM_XSCALE_I80321REG_H_ */

Copied: head/sys/arm/xscale/i8134x/i80321var.h (from r295197, 
head/sys/arm/xscale/i80321/i80321var.h)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/sys/arm/xscale/i8134x/i80321var.h      Wed Feb  3 08:59:12 2016        
(r295199, copy of r295197, head/sys/arm/xscale/i80321/i80321var.h)
@@ -0,0 +1,137 @@
+/*     $NetBSD: i80321var.h,v 1.8 2003/10/06 16:06:06 thorpej Exp $    */
+
+/*-
+ * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * 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
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed for the NetBSD Project by
+ *     Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * 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.
+ *
+ * $FreeBSD$
+ *
+ */
+
+#ifndef _ARM_XSCALE_I80321VAR_H_
+#define        _ARM_XSCALE_I80321VAR_H_
+
+#include <sys/queue.h>
+#include <dev/pci/pcivar.h>
+#include <sys/rman.h>
+
+extern struct bus_space i80321_bs_tag;
+
+struct i80321_softc {
+       device_t                dev;
+       bus_space_tag_t         sc_st;
+       bus_space_handle_t      sc_sh;
+       /* Handles for the various subregions. */
+       bus_space_handle_t      sc_atu_sh;
+       bus_space_handle_t      sc_mcu_sh;
+       int                     sc_is_host;
+
+       /*
+        * We expect the board-specific front-end to have already mapped
+        * the PCI I/O space .. it is only 64K, and I/O mappings tend to
+        * be smaller than a page size, so it's generally more efficient
+        * to map them all into virtual space in one fell swoop.
+        */
+       vm_offset_t             sc_iow_vaddr;           /* I/O window vaddr */
+
+       /*
+        * Variables that define the Inbound windows.  The base address of
+        * 0-2 are configured by a host via BARs.  The xlate variable
+        * defines the start of the local address space that it maps to.
+        * The size variable defines the byte size.
+        *
+        * The first 3 windows are for incoming PCI memory read/write
+        * cycles from a host.  The 4th window, not configured by the
+        * host (as it outside the normal BAR range) is the inbound
+        * window for PCI devices controlled by the i80321.
+        */
+       struct {
+               uint32_t iwin_base_hi;
+               uint32_t iwin_base_lo;
+               uint32_t iwin_xlate;
+               uint32_t iwin_size;
+       } sc_iwin[4];
+
+       /*
+        * Variables that define the Outbound windows.
+        */
+       struct {
+               uint32_t owin_xlate_lo;
+               uint32_t owin_xlate_hi;
+       } sc_owin[2];
+
+       /*
+        * This is the PCI address that the Outbound I/O
+        * window maps to.
+        */
+       uint32_t                sc_ioout_xlate;
+
+       /* Bus space, DMA, and PCI tags for the PCI bus (private devices). */
+       struct bus_space        sc_pci_iot;
+       struct bus_space        sc_pci_memt;
+
+       /* GPIO state */
+       uint8_t sc_gpio_dir;    /* GPIO pin direction (1 == output) */
+       uint8_t sc_gpio_val;    /* GPIO output pin value */
+       struct rman sc_irq_rman;
+                       
+};
+
+
+struct i80321_pci_softc {
+       device_t                sc_dev;
+       bus_space_tag_t         sc_st;
+       bus_space_handle_t      sc_atu_sh;
+       bus_space_tag_t         sc_pciio;
+       bus_space_tag_t         sc_pcimem;
+       int                     sc_busno;
+       struct rman             sc_mem_rman;
+       struct rman             sc_io_rman;
+       struct rman             sc_irq_rman;
+       uint32_t                sc_mem;
+       uint32_t                sc_io;
+};
+
+void   i80321_sdram_bounds(bus_space_tag_t, bus_space_handle_t,
+           vm_paddr_t *, vm_size_t *);
+
+void   i80321_attach(struct i80321_softc *);
+void   i80321_calibrate_delay(void);
+
+void   i80321_bs_init(bus_space_tag_t, void *);
+void   i80321_io_bs_init(bus_space_tag_t, void *);
+void   i80321_mem_bs_init(bus_space_tag_t, void *);
+extern int machdep_pci_route_interrupt(device_t pcib, device_t dev, int pin);
+
+
+#endif /* _ARM_XSCALE_I80321VAR_H_ */
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to