[src/trunk]: src/sys/arch/amd64 Add boilerplate for cardbus support.

[rjs <rjs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b411aa626903
branches:  trunk
changeset: 586485:b411aa626903
user:      rjs <rjs%NetBSD.org@localhost>
date:      Wed Dec 21 22:35:41 2005 +0000

description:
Add boilerplate for cardbus support.

diffstat:

 sys/arch/amd64/amd64/rbus_machdep.c   |  133 ++++++++++++++++++++++++++++++++++
 sys/arch/amd64/conf/files.amd64       |   14 +++-
 sys/arch/amd64/include/rbus_machdep.h |   49 ++++++++++++
 3 files changed, 195 insertions(+), 1 deletions(-)

diffs (218 lines):

diff -r c14ad40731f3 -r b411aa626903 sys/arch/amd64/amd64/rbus_machdep.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/amd64/rbus_machdep.c       Wed Dec 21 22:35:41 2005 +0000
@@ -0,0 +1,133 @@
+/*     $NetBSD: rbus_machdep.c,v 1.1 2005/12/21 22:35:41 rjs Exp $     */
+
+/*
+ * Copyright (c) 1999
+ *     HAYAKAWA Koichi.  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
+ *    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 by HAYAKAWA Koichi.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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: rbus_machdep.c,v 1.1 2005/12/21 22:35:41 rjs Exp $");
+
+#include "opt_pcifixup.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/extent.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <sys/sysctl.h>
+
+#include <machine/bus.h>
+#include <dev/cardbus/rbus.h>
+
+#include <sys/device.h>
+#include <dev/isa/isareg.h>
+#include <dev/isa/isavar.h>
+
+#include <dev/pci/pcivar.h>
+
+#ifndef RBUS_IO_BASE
+#define        RBUS_IO_BASE    0x4000
+#endif
+#ifndef RBUS_IO_SIZE
+#define        RBUS_IO_SIZE    0x2000
+#endif
+
+#ifndef RBUS_MIN_START
+#define RBUS_MIN_START 0x0000000080000000      /* 2GB */
+#endif
+bus_addr_t rbus_min_start = RBUS_MIN_START;
+
+/*
+ * rbus_tag_t rbus_fakeparent_mem(struct pci_attach_args *pa)
+ *
+ *   This function makes an rbus tag for memory space.  This rbus tag
+ *   shares the all memory region of ex_iomem.
+ */
+rbus_tag_t
+rbus_pccbb_parent_mem(struct pci_attach_args *pa)
+{
+       bus_addr_t start;
+       bus_size_t size;
+       extern struct extent *iomem_ex;
+       struct extent *ex = iomem_ex;
+
+#if defined(PCI_ADDR_FIXUP)
+       if (pciaddr.extent_mem != NULL)
+               ex = pciaddr.extent_mem;
+#endif
+
+       start = ex->ex_start;
+
+       /*
+        * XXX: unfortunately, iomem_ex cannot be used for the dynamic
+        * bus_space allocation.  There are some hidden memory (or
+        * some obstacles which are not recognised by the kernel) in
+        * the region governed by iomem_ex.  So I decide to use only
+        * very high address region.
+        *
+        * If pcibios_addr_fixup() succeeded, the PCI device is using an area
+        * which is not recognised by the kernel as already reserved.
+        */
+
+       if (start < rbus_min_start) 
+               start = rbus_min_start;
+
+       size = ex->ex_end - start;
+  
+       return rbus_new_root_share(pa->pa_memt, ex, start, size, 0);
+}
+
+
+/*
+ * rbus_tag_t rbus_pccbb_parent_io(struct pci_attach_args *pa)
+ */
+rbus_tag_t
+rbus_pccbb_parent_io(struct pci_attach_args *pa)
+{
+       bus_addr_t start;
+       bus_size_t size;
+       rbus_tag_t ret;
+       extern struct extent *ioport_ex;
+       struct extent *ex = ioport_ex;
+
+#if defined(PCI_ADDR_FIXUP)
+       if (pciaddr.extent_port != NULL)
+               ex = pciaddr.extent_port;
+#endif
+
+       start = RBUS_IO_BASE;
+       size  = RBUS_IO_SIZE;
+
+       ret = rbus_new_root_share(pa->pa_iot, ex, start, size, 0);
+       if (ret == NULL)
+         panic("failed to alloc I/O space");
+
+       return ret;
+}
diff -r c14ad40731f3 -r b411aa626903 sys/arch/amd64/conf/files.amd64
--- a/sys/arch/amd64/conf/files.amd64   Wed Dec 21 22:34:31 2005 +0000
+++ b/sys/arch/amd64/conf/files.amd64   Wed Dec 21 22:35:41 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amd64,v 1.18 2005/12/11 12:16:21 christos Exp $
+#      $NetBSD: files.amd64,v 1.19 2005/12/21 22:35:41 rjs Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -172,6 +172,18 @@
 # OSS audio driver compatibility
 include        "compat/ossaudio/files.ossaudio"
 
+#
+# CARDBUS
+#
+include        "dev/cardbus/files.cardbus"
+file   arch/amd64/amd64/rbus_machdep.c cardbus
+
+# this wants to be probed as late as possible.
+#
+# Machine-independent PCMCIA drivers
+#
+include        "dev/pcmcia/files.pcmcia"
+
 include        "dev/usb/files.usb"
 
 include        "dev/ieee1394/files.ieee1394"
diff -r c14ad40731f3 -r b411aa626903 sys/arch/amd64/include/rbus_machdep.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amd64/include/rbus_machdep.h     Wed Dec 21 22:35:41 2005 +0000
@@ -0,0 +1,49 @@
+/*     $NetBSD: rbus_machdep.h,v 1.1 2005/12/21 22:35:41 rjs Exp $     */
+
+/*
+ * Copyright (c) 1999
+ *     HAYAKAWA Koichi.  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
+ *    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 by HAYAKAWA Koichi.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 THE AUTHOR 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.
+ */
+
+
+#if !defined _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_
+#define _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_
+
+struct pci_attach_args;                /* XXX */
+
+#define md_space_map(bt, physaddr, size, flags, bshp) \
+       _x86_memio_map((bt), (physaddr), (size), (flags), (bshp))
+
+#define md_space_unmap(bt, bsh, size, adrp) \
+       _x86_memio_unmap((bt), (bsh), (size), (adrp))
+
+
+rbus_tag_t rbus_pccbb_parent_io(struct pci_attach_args *);
+rbus_tag_t rbus_pccbb_parent_mem(struct pci_attach_args *);
+
+#endif /* _ARCH_AMD64_AMD64_RBUS_MACHDEP_H_ */