diff options
author | Jan Sommer <jan.sommer@dlr.de> | 2020-02-07 12:40:13 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2020-02-10 10:44:28 +0100 |
commit | af291fa3a04222bb7fe99b7ce1eab3036e529f29 (patch) | |
tree | b56aa0234229a6410d024767ad2df47e19cff452 /freebsd/sys | |
parent | i386: Add to build (diff) | |
download | rtems-libbsd-af291fa3a04222bb7fe99b7ce1eab3036e529f29.tar.bz2 |
i386: Port to RTEMS
- Update imported files to compile rtems-libbsd for i386 based BSPs
- Currently does not support the option "dev_nic_e1000 = on"
Diffstat (limited to 'freebsd/sys')
-rw-r--r-- | freebsd/sys/dev/pci/pci_pci.c | 2 | ||||
-rw-r--r-- | freebsd/sys/i386/i386/legacy.c | 381 | ||||
-rw-r--r-- | freebsd/sys/i386/include/machine/cpufunc.h | 2 | ||||
-rw-r--r-- | freebsd/sys/sys/mbuf.h | 2 | ||||
-rw-r--r-- | freebsd/sys/x86/pci/pci_bus.c | 4 | ||||
-rw-r--r-- | freebsd/sys/x86/x86/legacy.c | 14 |
6 files changed, 24 insertions, 381 deletions
diff --git a/freebsd/sys/dev/pci/pci_pci.c b/freebsd/sys/dev/pci/pci_pci.c index cdcba150..7b048c83 100644 --- a/freebsd/sys/dev/pci/pci_pci.c +++ b/freebsd/sys/dev/pci/pci_pci.c @@ -1593,6 +1593,7 @@ pcib_attach_common(device_t dev) sc->flags |= PCIB_SUBTRACTIVE; break; +#ifndef __rtems__ #if !(defined(NEW_PCIB) && defined(PCI_RES_BUS)) /* Compaq R3000 BIOS sets wrong subordinate bus number. */ case 0x00dd10de: @@ -1620,6 +1621,7 @@ pcib_attach_common(device_t dev) break; } #endif +#endif /* __rtems__ */ } if (pci_msi_device_blacklisted(dev)) diff --git a/freebsd/sys/i386/i386/legacy.c b/freebsd/sys/i386/i386/legacy.c deleted file mode 100644 index 50fa9aa2..00000000 --- a/freebsd/sys/i386/i386/legacy.c +++ /dev/null @@ -1,381 +0,0 @@ -#include <machine/rtems-bsd-kernel-space.h> - -/*- - * Copyright 1998 Massachusetts Institute of Technology - * - * Permission to use, copy, modify, and distribute this software and - * its documentation for any purpose and without fee is hereby - * granted, provided that both the above copyright notice and this - * permission notice appear in all copies, that both the above - * copyright notice and this permission notice appear in all - * supporting documentation, and that the name of M.I.T. not be used - * in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. M.I.T. makes - * no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied - * warranty. - * - * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''. M.I.T. DISCLAIMS - * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT - * SHALL M.I.T. 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> -__FBSDID("$FreeBSD$"); - -/* - * This code implements a system driver for legacy systems that do not - * support ACPI or when ACPI support is not present in the kernel. - */ - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/bus.h> -#include <sys/cpu.h> -#include <sys/kernel.h> -#include <sys/malloc.h> -#include <sys/module.h> -#include <machine/bus.h> -#include <sys/pcpu.h> -#include <sys/rman.h> -#include <sys/smp.h> - -#include <rtems/bsd/local/opt_mca.h> -#ifdef DEV_MCA -#include <i386/bios/mca_machdep.h> -#endif - -#include <machine/clock.h> -#include <machine/legacyvar.h> -#include <machine/resource.h> - -static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device"); -struct legacy_device { - int lg_pcibus; - int lg_pcislot; - int lg_pcifunc; -}; - -#define DEVTOAT(dev) ((struct legacy_device *)device_get_ivars(dev)) - -static int legacy_probe(device_t); -static int legacy_attach(device_t); -static int legacy_print_child(device_t, device_t); -static device_t legacy_add_child(device_t bus, u_int order, const char *name, - int unit); -static int legacy_read_ivar(device_t, device_t, int, uintptr_t *); -static int legacy_write_ivar(device_t, device_t, int, uintptr_t); - -static device_method_t legacy_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, legacy_probe), - DEVMETHOD(device_attach, legacy_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - - /* Bus interface */ - DEVMETHOD(bus_print_child, legacy_print_child), - DEVMETHOD(bus_add_child, legacy_add_child), - DEVMETHOD(bus_read_ivar, legacy_read_ivar), - DEVMETHOD(bus_write_ivar, legacy_write_ivar), - DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), - DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource), - DEVMETHOD(bus_release_resource, bus_generic_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - - { 0, 0 } -}; - -static driver_t legacy_driver = { - "legacy", - legacy_methods, - 1, /* no softc */ -}; -static devclass_t legacy_devclass; - -DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0); - -static int -legacy_probe(device_t dev) -{ - - device_set_desc(dev, "legacy system"); - device_quiet(dev); - return (0); -} - -static int -legacy_attach(device_t dev) -{ - device_t child; - - /* - * Let our child drivers identify any child devices that they - * can find. Once that is done attach any devices that we - * found. - */ - bus_generic_probe(dev); - bus_generic_attach(dev); - -#ifndef PC98 - /* - * If we didn't see EISA or ISA on a pci bridge, create some - * connection points now so they show up "on motherboard". - */ - if (!devclass_get_device(devclass_find("eisa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "eisa", 0); - if (child == NULL) - panic("legacy_attach eisa"); - device_probe_and_attach(child); - } -#endif -#ifdef DEV_MCA - if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "mca", 0); - if (child == 0) - panic("legacy_probe mca"); - device_probe_and_attach(child); - } -#endif - if (!devclass_get_device(devclass_find("isa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "isa", 0); - if (child == NULL) - panic("legacy_attach isa"); - device_probe_and_attach(child); - } - - return 0; -} - -static int -legacy_print_child(device_t bus, device_t child) -{ - struct legacy_device *atdev = DEVTOAT(child); - int retval = 0; - - retval += bus_print_child_header(bus, child); - if (atdev->lg_pcibus != -1) - retval += printf(" pcibus %d", atdev->lg_pcibus); - retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ - - return (retval); -} - -static device_t -legacy_add_child(device_t bus, u_int order, const char *name, int unit) -{ - device_t child; - struct legacy_device *atdev; - - atdev = malloc(sizeof(struct legacy_device), M_LEGACYDEV, - M_NOWAIT | M_ZERO); - if (atdev == NULL) - return(NULL); - atdev->lg_pcibus = -1; - atdev->lg_pcislot = -1; - atdev->lg_pcifunc = -1; - - child = device_add_child_ordered(bus, order, name, unit); - if (child == NULL) - free(atdev, M_LEGACYDEV); - else - /* should we free this in legacy_child_detached? */ - device_set_ivars(child, atdev); - - return (child); -} - -static int -legacy_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) -{ - struct legacy_device *atdev = DEVTOAT(child); - - switch (which) { - case LEGACY_IVAR_PCIDOMAIN: - *result = 0; - break; - case LEGACY_IVAR_PCIBUS: - *result = atdev->lg_pcibus; - break; - case LEGACY_IVAR_PCISLOT: - *result = atdev->lg_pcislot; - break; - case LEGACY_IVAR_PCIFUNC: - *result = atdev->lg_pcifunc; - break; - default: - return ENOENT; - } - return 0; -} - - -static int -legacy_write_ivar(device_t dev, device_t child, int which, uintptr_t value) -{ - struct legacy_device *atdev = DEVTOAT(child); - - switch (which) { - case LEGACY_IVAR_PCIDOMAIN: - return EINVAL; - case LEGACY_IVAR_PCIBUS: - atdev->lg_pcibus = value; - break; - case LEGACY_IVAR_PCISLOT: - atdev->lg_pcislot = value; - break; - case LEGACY_IVAR_PCIFUNC: - atdev->lg_pcifunc = value; - break; - default: - return ENOENT; - } - return 0; -} - -/* - * Legacy CPU attachment when ACPI is not available. Drivers like - * cpufreq(4) hang off this. - */ -static void cpu_identify(driver_t *driver, device_t parent); -static int cpu_read_ivar(device_t dev, device_t child, int index, - uintptr_t *result); -static device_t cpu_add_child(device_t bus, u_int order, const char *name, - int unit); -static struct resource_list *cpu_get_rlist(device_t dev, device_t child); - -struct cpu_device { - struct resource_list cd_rl; -#ifndef __rtems__ - struct pcpu *cd_pcpu; -#endif /* __rtems__ */ -}; - -static device_method_t cpu_methods[] = { - /* Device interface */ - DEVMETHOD(device_identify, cpu_identify), - DEVMETHOD(device_probe, bus_generic_probe), - DEVMETHOD(device_attach, bus_generic_attach), - DEVMETHOD(device_detach, bus_generic_detach), - DEVMETHOD(device_shutdown, bus_generic_shutdown), - DEVMETHOD(device_suspend, bus_generic_suspend), - DEVMETHOD(device_resume, bus_generic_resume), - - /* Bus interface */ - DEVMETHOD(bus_add_child, cpu_add_child), - DEVMETHOD(bus_read_ivar, cpu_read_ivar), - DEVMETHOD(bus_get_resource_list, cpu_get_rlist), - DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource), - DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource), - DEVMETHOD(bus_alloc_resource, bus_generic_rl_alloc_resource), - DEVMETHOD(bus_release_resource, bus_generic_rl_release_resource), - DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), - DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), - DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), - DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), - - DEVMETHOD_END -}; - -static driver_t cpu_driver = { - "cpu", - cpu_methods, - 1, /* no softc */ -}; -static devclass_t cpu_devclass; -DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); - -static void -cpu_identify(driver_t *driver, device_t parent) -{ - device_t child; - int i; - - /* - * Attach a cpuX device for each CPU. We use an order of 150 - * so that these devices are attached after the Host-PCI - * bridges (which are added at order 100). - */ - CPU_FOREACH(i) { - child = BUS_ADD_CHILD(parent, 150, "cpu", i); - if (child == NULL) - panic("legacy_attach cpu"); - } -} - -static device_t -cpu_add_child(device_t bus, u_int order, const char *name, int unit) -{ - struct cpu_device *cd; - device_t child; -#ifndef __rtems__ - struct pcpu *pc; -#endif /* __rtems__ */ - - if ((cd = malloc(sizeof(*cd), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) - return (NULL); - - resource_list_init(&cd->cd_rl); -#ifndef __rtems__ - pc = pcpu_find(device_get_unit(bus)); - cd->cd_pcpu = pc; -#endif /* __rtems__ */ - - child = device_add_child_ordered(bus, order, name, unit); - if (child != NULL) { -#ifndef __rtems__ - pc->pc_device = child; -#endif /* __rtems__ */ - device_set_ivars(child, cd); - } else - free(cd, M_DEVBUF); - return (child); -} - -static struct resource_list * -cpu_get_rlist(device_t dev, device_t child) -{ - struct cpu_device *cpdev; - - cpdev = device_get_ivars(child); - return (&cpdev->cd_rl); -} - -static int -cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) -{ - struct cpu_device *cpdev; - - switch (index) { -#ifndef __rtems__ - case CPU_IVAR_PCPU: - cpdev = device_get_ivars(child); - *result = (uintptr_t)cpdev->cd_pcpu; - break; - case CPU_IVAR_NOMINAL_MHZ: - if (tsc_is_invariant) { - *result = (uintptr_t)(atomic_load_acq_64(&tsc_freq) / - 1000000); - break; - } - /* FALLTHROUGH */ -#endif /* __rtems__ */ - default: - return (ENOENT); - } - return (0); -} diff --git a/freebsd/sys/i386/include/machine/cpufunc.h b/freebsd/sys/i386/include/machine/cpufunc.h index a029da3b..e50ef9d7 100644 --- a/freebsd/sys/i386/include/machine/cpufunc.h +++ b/freebsd/sys/i386/include/machine/cpufunc.h @@ -233,11 +233,13 @@ fls(int mask) #define HAVE_INLINE_FLSL +#ifndef __rtems__ static __inline __pure2 int flsl(long mask) { return (fls((int)mask)); } +#endif /* __rtems__ */ #endif /* _KERNEL */ diff --git a/freebsd/sys/sys/mbuf.h b/freebsd/sys/sys/mbuf.h index ba2e1873..bf48acbb 100644 --- a/freebsd/sys/sys/mbuf.h +++ b/freebsd/sys/sys/mbuf.h @@ -348,6 +348,7 @@ struct mbuf_ext_pgs { vm_paddr_t pa[MBUF_PEXT_MAX_PGS]; /* phys addrs of pages */ char hdr[MBUF_PEXT_HDR_LEN]; /* TLS header */ struct ktls_session *tls; /* TLS session */ +#if defined(__rtems__) && !defined(__i386__) #if defined(__i386__) || \ (defined(__powerpc__) && !defined(__powerpc64__) && defined(BOOKE)) /* @@ -356,6 +357,7 @@ struct mbuf_ext_pgs { */ uint32_t pad; #endif +#endif /* __rtems__ && !__i386__ */ union { char trail[MBUF_PEXT_TRAIL_LEN]; /* TLS trailer */ struct { diff --git a/freebsd/sys/x86/pci/pci_bus.c b/freebsd/sys/x86/pci/pci_bus.c index 0db41c18..ff4ef68e 100644 --- a/freebsd/sys/x86/pci/pci_bus.c +++ b/freebsd/sys/x86/pci/pci_bus.c @@ -49,7 +49,11 @@ __FBSDID("$FreeBSD$"); #ifdef CPU_ELAN #include <machine/md_var.h> #endif +#ifdef __rtems__ +#include <machine/legacyvar.h> +#else /* __rtems__ */ #include <x86/legacyvar.h> +#endif /* __rtems__ */ #include <machine/pci_cfgreg.h> #include <machine/resource.h> diff --git a/freebsd/sys/x86/x86/legacy.c b/freebsd/sys/x86/x86/legacy.c index 4c2174ba..9297f1f3 100644 --- a/freebsd/sys/x86/x86/legacy.c +++ b/freebsd/sys/x86/x86/legacy.c @@ -115,6 +115,7 @@ legacy_probe(device_t dev) return (0); } +#ifndef __rtems__ /* * Grope around in the PCI config space to see if this is a chipset * that is capable of doing memory-mapped config cycles. This also @@ -154,13 +155,16 @@ legacy_pci_cfgregopen(device_t dev) if (bootverbose && cfgmech == CFGMECH_PCIE) device_printf(dev, "Enabled ECAM PCIe accesses\n"); } +#endif /* __rtems__ */ static int legacy_attach(device_t dev) { device_t child; +#ifndef __rtems__ legacy_pci_cfgregopen(dev); +#endif /* __rtems__ */ /* * Let our child drivers identify any child devices that they @@ -282,7 +286,9 @@ static struct resource_list *cpu_get_rlist(device_t dev, device_t child); struct cpu_device { struct resource_list cd_rl; +#ifndef __rtems__ struct pcpu *cd_pcpu; +#endif /* __rtems__ */ }; static device_method_t cpu_methods[] = { @@ -342,18 +348,24 @@ cpu_add_child(device_t bus, u_int order, const char *name, int unit) { struct cpu_device *cd; device_t child; +#ifndef __rtems__ struct pcpu *pc; +#endif /* __rtems__ */ if ((cd = malloc(sizeof(*cd), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) return (NULL); resource_list_init(&cd->cd_rl); +#ifndef __rtems__ pc = pcpu_find(device_get_unit(bus)); cd->cd_pcpu = pc; +#endif /* __rtems__ */ child = device_add_child_ordered(bus, order, name, unit); if (child != NULL) { +#ifndef __rtems__ pc->pc_device = child; +#endif /* __rtems__ */ device_set_ivars(child, cd); } else free(cd, M_DEVBUF); @@ -375,6 +387,7 @@ cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) struct cpu_device *cpdev; switch (index) { +#ifndef __rtems__ case CPU_IVAR_PCPU: cpdev = device_get_ivars(child); *result = (uintptr_t)cpdev->cd_pcpu; @@ -386,6 +399,7 @@ cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result) break; } /* FALLTHROUGH */ +#endif /* __rtems__ */ default: return (ENOENT); } |