Deleted Added
full compact
mp_machdep.c (266374) mp_machdep.c (278613)
1/*-
2 * Copyright (c) 2011 Semihalf.
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

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

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#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2011 Semihalf.
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

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

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#include <sys/cdefs.h>
27__FBSDID("$FreeBSD: stable/10/sys/arm/arm/mp_machdep.c 266374 2014-05-17 23:03:04Z ian $");
27__FBSDID("$FreeBSD: stable/10/sys/arm/arm/mp_machdep.c 278613 2015-02-12 03:50:33Z ian $");
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/bus.h>
31#include <sys/kernel.h>
32#include <sys/lock.h>
33#include <sys/mutex.h>
34#include <sys/proc.h>
35#include <sys/pcpu.h>
36#include <sys/sched.h>
37#include <sys/smp.h>
38#include <sys/ktr.h>
39#include <sys/malloc.h>
40
41#include <vm/vm.h>
42#include <vm/vm_extern.h>
43#include <vm/vm_kern.h>
44#include <vm/pmap.h>
45
28#include <sys/param.h>
29#include <sys/systm.h>
30#include <sys/bus.h>
31#include <sys/kernel.h>
32#include <sys/lock.h>
33#include <sys/mutex.h>
34#include <sys/proc.h>
35#include <sys/pcpu.h>
36#include <sys/sched.h>
37#include <sys/smp.h>
38#include <sys/ktr.h>
39#include <sys/malloc.h>
40
41#include <vm/vm.h>
42#include <vm/vm_extern.h>
43#include <vm/vm_kern.h>
44#include <vm/pmap.h>
45
46#include <machine/armreg.h>
46#include <machine/cpu.h>
47#include <machine/cpufunc.h>
48#include <machine/smp.h>
49#include <machine/pcb.h>
50#include <machine/pte.h>
51#include <machine/physmem.h>
52#include <machine/intr.h>
53#include <machine/vmparam.h>

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

231 end = IPI_IRQ_END;
232#else
233 end = IPI_IRQ_START;
234#endif
235#endif
236
237 for (int i = start; i <= end; i++)
238 arm_unmask_irq(i);
47#include <machine/cpu.h>
48#include <machine/cpufunc.h>
49#include <machine/smp.h>
50#include <machine/pcb.h>
51#include <machine/pte.h>
52#include <machine/physmem.h>
53#include <machine/intr.h>
54#include <machine/vmparam.h>

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

232 end = IPI_IRQ_END;
233#else
234 end = IPI_IRQ_START;
235#endif
236#endif
237
238 for (int i = start; i <= end; i++)
239 arm_unmask_irq(i);
239 enable_interrupts(I32_bit);
240 enable_interrupts(PSR_I);
240
241 loop_counter = 0;
242 while (smp_started == 0) {
243 DELAY(100);
244 loop_counter++;
245 if (loop_counter == 1000)
246 CTR0(KTR_SMP, "AP still wait for smp_started");
247 }

--- 188 unchanged lines hidden ---
241
242 loop_counter = 0;
243 while (smp_started == 0) {
244 DELAY(100);
245 loop_counter++;
246 if (loop_counter == 1000)
247 CTR0(KTR_SMP, "AP still wait for smp_started");
248 }

--- 188 unchanged lines hidden ---