Deleted Added
full compact
octeon_machdep.c (242302) octeon_machdep.c (242342)
1/*-
2 * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2006 Wojciech A. Koszek <wkoszek@FreeBSD.org>
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/mips/cavium/octeon_machdep.c 242302 2012-10-29 07:06:23Z jmallett $
26 * $FreeBSD: head/sys/mips/cavium/octeon_machdep.c 242342 2012-10-30 06:07:30Z jmallett $
27 */
28#include <sys/cdefs.h>
27 */
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/mips/cavium/octeon_machdep.c 242302 2012-10-29 07:06:23Z jmallett $");
29__FBSDID("$FreeBSD: head/sys/mips/cavium/octeon_machdep.c 242342 2012-10-30 06:07:30Z jmallett $");
30
31#include <sys/param.h>
32#include <sys/conf.h>
33#include <sys/kernel.h>
34#include <sys/systm.h>
35#include <sys/imgact.h>
36#include <sys/bio.h>
37#include <sys/buf.h>

--- 33 unchanged lines hidden (view full) ---

71#include <machine/pcpu.h>
72#include <machine/pte.h>
73#include <machine/trap.h>
74#include <machine/vmparam.h>
75
76#include <contrib/octeon-sdk/cvmx.h>
77#include <contrib/octeon-sdk/cvmx-bootmem.h>
78#include <contrib/octeon-sdk/cvmx-ebt3000.h>
30
31#include <sys/param.h>
32#include <sys/conf.h>
33#include <sys/kernel.h>
34#include <sys/systm.h>
35#include <sys/imgact.h>
36#include <sys/bio.h>
37#include <sys/buf.h>

--- 33 unchanged lines hidden (view full) ---

71#include <machine/pcpu.h>
72#include <machine/pte.h>
73#include <machine/trap.h>
74#include <machine/vmparam.h>
75
76#include <contrib/octeon-sdk/cvmx.h>
77#include <contrib/octeon-sdk/cvmx-bootmem.h>
78#include <contrib/octeon-sdk/cvmx-ebt3000.h>
79#include <contrib/octeon-sdk/cvmx-helper-cfg.h>
79#include <contrib/octeon-sdk/cvmx-interrupt.h>
80#include <contrib/octeon-sdk/cvmx-version.h>
81
82#include <mips/cavium/octeon_irq.h>
83
84#if defined(__mips_n64)
85#define MAX_APP_DESC_ADDR 0xffffffffafffffff
86#else

--- 506 unchanged lines hidden (view full) ---

593 else
594 ebt3000_str_write("FreeBSD!");
595 }
596
597 if (cvmx_sysinfo_get()->phy_mem_desc_addr == (uint64_t)0)
598 panic("Your boot loader did not supply a memory descriptor.");
599 cvmx_bootmem_init(cvmx_sysinfo_get()->phy_mem_desc_addr);
600
80#include <contrib/octeon-sdk/cvmx-interrupt.h>
81#include <contrib/octeon-sdk/cvmx-version.h>
82
83#include <mips/cavium/octeon_irq.h>
84
85#if defined(__mips_n64)
86#define MAX_APP_DESC_ADDR 0xffffffffafffffff
87#else

--- 506 unchanged lines hidden (view full) ---

594 else
595 ebt3000_str_write("FreeBSD!");
596 }
597
598 if (cvmx_sysinfo_get()->phy_mem_desc_addr == (uint64_t)0)
599 panic("Your boot loader did not supply a memory descriptor.");
600 cvmx_bootmem_init(cvmx_sysinfo_get()->phy_mem_desc_addr);
601
602 octeon_feature_init();
603
604 __cvmx_helper_cfg_init();
605
601 printf("Boot Descriptor Ver: %u -> %u/%u",
602 app_desc_ptr->desc_version, octeon_bootinfo->major_version,
603 octeon_bootinfo->minor_version);
604 printf(" CPU clock: %uMHz Core Mask: %#x\n",
605 cvmx_sysinfo_get()->cpu_clock_hz / 1000000,
606 cvmx_sysinfo_get()->core_mask);
607 printf(" Board Type: %u Revision: %u/%u\n",
608 cvmx_sysinfo_get()->board_type,

--- 31 unchanged lines hidden ---
606 printf("Boot Descriptor Ver: %u -> %u/%u",
607 app_desc_ptr->desc_version, octeon_bootinfo->major_version,
608 octeon_bootinfo->minor_version);
609 printf(" CPU clock: %uMHz Core Mask: %#x\n",
610 cvmx_sysinfo_get()->cpu_clock_hz / 1000000,
611 cvmx_sysinfo_get()->core_mask);
612 printf(" Board Type: %u Revision: %u/%u\n",
613 cvmx_sysinfo_get()->board_type,

--- 31 unchanged lines hidden ---