Added legacy in order to get pcib to work correctly and resoleved fxp attach issue.

The fxp attach has a resource allocation issue still to address, but
should work as soon as that is debugged.

3 files changed, 189 insertions, 1 deletions

diff --git a/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h b/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
index dad640c5..0e31d3ec 100644
--- a/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
+++ b/rtemsbsd/freebsd/machine/rtems-bsd-sysinit.h
@@ -59,7 +59,8 @@
 	SYSINIT_DRIVER_REFERENCE(mmcsd, mmc)
 
 #define SYSINIT_NEED_PCIB \
-	SYSINIT_REFERENCE(p0init); \
+	SYSINIT_DRIVER_REFERENCE(legacy, nexus); \
+	SYSINIT_DRIVER_REFERENCE(pcib, legacy);  \
 	SYSINIT_DRIVER_REFERENCE(pci, pcib);
 
 #define SYSINIT_NEED_NET_IF_BFE \
diff --git a/rtemsbsd/src/rtems-bsd-pci_bus.c b/rtemsbsd/src/rtems-bsd-pci_bus.c
new file mode 100644
index 00000000..199acffc
--- /dev/null
+++ b/rtemsbsd/src/rtems-bsd-pci_bus.c
@@ -0,0 +1,71 @@
+#include <freebsd/machine/rtems-bsd-config.h>
+
+/**
+ * @file
+ *
+ * @ingroup rtems_bsd_rtems
+ *
+ * @brief This file contains methods that are rtems specific implementation
+ * of methods in pci_bus.c.
+ */
+
+/*
+ * COPYRIGHT (c) 2012. On-Line Applications Research Corporation (OAR).
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 <freebsd/sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <freebsd/local/opt_cpu.h>
+
+#include <freebsd/sys/param.h>
+#include <freebsd/sys/systm.h>
+#include <freebsd/sys/bus.h>
+#include <freebsd/sys/kernel.h>
+
+#include <freebsd/dev/pci/pcivar.h>
+#include <freebsd/dev/pci/pcireg.h>
+#include <freebsd/dev/pci/pcib_private.h>
+#include <freebsd/machine/pci_cfgreg.h>
+#include <freebsd/machine/resource.h>
+
+#include <freebsd/local/pcib_if.h>
+#include <rtems/pci.h>
+
+int
+pcibios_pcib_route_interrupt(device_t pcib, device_t dev, int pin)
+{
+  int     bus;
+  int     slot;
+  int     func;
+  uint8_t irq;
+ 
+  bus  = pci_get_bus(dev);
+  slot = pci_get_slot(dev);
+  func = pci_get_function(dev);
+
+  pci_read_config_byte(bus, slot, func, PCI_INTERRUPT_LINE, &irq);
+  return irq;
+}
diff --git a/rtemsbsd/src/rtems-bsd-pci_cfgreg.c b/rtemsbsd/src/rtems-bsd-pci_cfgreg.c
new file mode 100644
index 00000000..5606219d
--- /dev/null
+++ b/rtemsbsd/src/rtems-bsd-pci_cfgreg.c
@@ -0,0 +1,116 @@
+#include <freebsd/machine/rtems-bsd-config.h>
+
+/**
+ * @file
+ *
+ * @ingroup rtems_bsd_rtems
+ *
+ * @brief This is the rtems version for the FreeBSD cpu specific
+ * file pci_cfgreg.c.  Please note that the Ether Express is not
+ * supported in this version.
+ */
+
+/*
+ * COPYRIGHT (c) 2012. On-Line Applications Research Corporation (OAR).
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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 <freebsd/sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <freebsd/sys/param.h>
+#include <freebsd/sys/systm.h>
+#include <freebsd/sys/bus.h>
+#include <freebsd/sys/lock.h>
+#include <freebsd/sys/kernel.h>
+#include <freebsd/sys/malloc.h>
+#include <freebsd/sys/sysctl.h>
+#include <freebsd/dev/pci/pcivar.h>
+#include <freebsd/dev/pci/pcireg.h>
+#include <freebsd/machine/pci_cfgreg.h>
+
+#include <rtems/pci.h>
+
+
+/* 
+ * Initialise access to PCI configuration space 
+ */
+int
+pci_cfgregopen(void)
+{
+  return(1);
+}
+
+/* 
+ * Read configuration space register
+ */
+u_int32_t
+pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
+{
+  u_int32_t value;
+  uint8_t   v8;
+  uint16_t  v16;
+  uint32_t  v32;
+  int       data;
+
+  switch (bytes) {
+    case 1:
+      data = pci_read_config_byte( bus, slot, func, reg, &v8 );
+      value = v8;
+      break;
+    case 2:
+      data = pci_read_config_word( bus, slot, func, reg, &v16 );
+      value = v16;
+      break;
+    case 4:
+      data = pci_read_config_dword( bus, slot, func, reg, &v32 );
+      value = v32;
+      break;
+  }
+
+  return value;
+}
+
+/* 
+ * Write configuration space register 
+ */
+void
+pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
+{
+  uint8_t   v8  = data & 0xff;
+  uint16_t  v16 = data & 0xffff;
+  uint32_t  v32 = data;
+
+  switch (bytes) {
+    case 1:
+      pci_write_config_byte( bus, slot, func, reg, v8 );
+      break;
+    case 2:
+      pci_write_config_word( bus, slot, func, reg, v16 );
+      break;
+    case 4:
+      pci_write_config_dword( bus, slot, func, reg, v32 );
+      break;
+  }
+}