Page MenuHomeFreeBSD
Files F106065108

D9907.diff
No OneTemporary
Actions

D9907.diff
View Options

Index: head/sys/arm/conf/IMX6
===================================================================
--- head/sys/arm/conf/IMX6
+++ head/sys/arm/conf/IMX6
@@ -30,6 +30,7 @@
#options NFSD # Network Filesystem Server
options INCLUDE_CONFIG_FILE # Include this file in kernel
options PLATFORM
+options PLATFORM_SMP
options SMP # Enable multiple cores
# NFS root from boopt/dhcp
Index: head/sys/arm/freescale/imx/imx6_machdep.c
===================================================================
--- head/sys/arm/freescale/imx/imx6_machdep.c
+++ head/sys/arm/freescale/imx/imx6_machdep.c
@@ -50,6 +50,8 @@
#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
+#include <arm/freescale/imx/imx6_mp.h>
+
#include "platform_if.h"
static uint32_t gpio1_node;
@@ -346,6 +348,11 @@
PLATFORMMETHOD(platform_late_init, imx6_late_init),
PLATFORMMETHOD(platform_cpu_reset, imx6_cpu_reset),
+#ifdef SMP
+ PLATFORMMETHOD(platform_mp_start_ap, imx6_mp_start_ap),
+ PLATFORMMETHOD(platform_mp_setmaxid, imx6_mp_setmaxid),
+#endif
+
PLATFORMMETHOD_END,
};
Index: head/sys/arm/freescale/imx/imx6_mp.h
===================================================================
--- head/sys/arm/freescale/imx/imx6_mp.h
+++ head/sys/arm/freescale/imx/imx6_mp.h
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2017 Andrew Turner
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef IMX6_MP_H
+#define IMX6_MP_H
+
+void imx6_mp_start_ap(platform_t);
+void imx6_mp_setmaxid(platform_t);
+
+#endif /* IMX6_MP_H */
Index: head/sys/arm/freescale/imx/imx6_mp.c
===================================================================
--- head/sys/arm/freescale/imx/imx6_mp.c
+++ head/sys/arm/freescale/imx/imx6_mp.c
@@ -41,6 +41,10 @@
#include <machine/smp.h>
#include <machine/fdt.h>
#include <machine/intr.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
+
+#include <arm/freescale/imx/imx6_mp.h>
#define SCU_PHYSBASE 0x00a00000
#define SCU_SIZE 0x00001000
@@ -67,7 +71,7 @@
#define SRC_GPR1_C1ARG 0x24 /* Register for Core 1 entry arg */
void
-platform_mp_setmaxid(void)
+imx6_mp_setmaxid(platform_t plat)
{
bus_space_handle_t scu;
int hwcpu, ncpu;
@@ -92,8 +96,8 @@
mp_maxid = ncpu - 1;
}
-void
-platform_mp_start_ap(void)
+void
+imx6_mp_start_ap(platform_t plat)
{
bus_space_handle_t scu;
bus_space_handle_t src;

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 7:29 PM (10 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15598189
Default Alt Text
D9907.diff (3 KB)

Event Timeline