From owner-svn-src-all@FreeBSD.ORG  Sat Feb 23 22:46:27 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 98EE5C4B;
 Sat, 23 Feb 2013 22:46:27 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8B4538B3;
 Sat, 23 Feb 2013 22:46:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1NMkRgQ081971;
 Sat, 23 Feb 2013 22:46:27 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1NMkRHX081969;
 Sat, 23 Feb 2013 22:46:27 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201302232246.r1NMkRHX081969@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Sat, 23 Feb 2013 22:46:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247204 - head/sys/arm/broadcom/bcm2835
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Feb 2013 22:46:27 -0000

Author: gonzo
Date: Sat Feb 23 22:46:26 2013
New Revision: 247204
URL: http://svnweb.freebsd.org/changeset/base/247204

Log:
  Add macroses to properly map IO peripherals memory window from
      ARM physical memory address space to VideoCore address space

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h	Sat Feb 23 22:00:59 2013	(r247203)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h	Sat Feb 23 22:46:26 2013	(r247204)
@@ -34,14 +34,28 @@
 #define _BCM2835_VCBUS_H_
 
 #define	BCM2835_VCBUS_SDRAM_CACHED	0x40000000
+#define	BCM2835_VCBUS_IO_BASE		0x7E000000
 #define	BCM2835_VCBUS_SDRAM_UNCACHED	0xC0000000
 
+#define	BCM2835_ARM_IO_BASE		0x20000000
+#define	BCM2835_ARM_IO_SIZE		0x02000000
+
 /*
  * Convert physical address to VC bus address. Should be used 
  * when submitting address over mailbox interface 
  */
 #define	PHYS_TO_VCBUS(pa)	((pa) + BCM2835_VCBUS_SDRAM_CACHED)
 
+/* Check whether pa bellong top IO window */
+#define BCM2835_ARM_IS_IO(pa)	(((pa) >= BCM2835_ARM_IO_BASE) && \
+    ((pa) < BCM2835_ARM_IO_BASE + BCM2835_ARM_IO_SIZE))
+
+/*
+ * Convert physical address in IO space to VC bus address. 
+ */
+#define	IO_TO_VCBUS(pa)		((pa - BCM2835_ARM_IO_BASE) + \
+    BCM2835_VCBUS_IO_BASE)
+
 /*
  * Convert address from VC bus space to physical. Should be used
  * when address is returned by VC over mailbox interface. e.g.