Deleted Added
full compact
mv_machdep.c (259365) mv_machdep.c (266046)
1/*-
2 * Copyright (c) 1994-1998 Mark Brinicombe.
3 * Copyright (c) 1994 Brini.
4 * All rights reserved.
5 *
6 * This code is derived from software written for Brini by Mark Brinicombe
7 *
8 * Redistribution and use in source and binary forms, with or without

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

34 *
35 * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
36 */
37
38#include "opt_ddb.h"
39#include "opt_platform.h"
40
41#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1994-1998 Mark Brinicombe.
3 * Copyright (c) 1994 Brini.
4 * All rights reserved.
5 *
6 * This code is derived from software written for Brini by Mark Brinicombe
7 *
8 * Redistribution and use in source and binary forms, with or without

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

34 *
35 * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
36 */
37
38#include "opt_ddb.h"
39#include "opt_platform.h"
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: stable/10/sys/arm/mv/mv_machdep.c 259365 2013-12-14 00:16:08Z ian $");
42__FBSDID("$FreeBSD: stable/10/sys/arm/mv/mv_machdep.c 266046 2014-05-14 16:32:27Z ian $");
43
44#define _ARM32_BUS_DMA_PRIVATE
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/bus.h>
48
49#include <vm/vm.h>
50#include <vm/pmap.h>

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

324{
325 phandle_t root, child;
326 pcell_t bank_count;
327 int i, num_mapped;
328
329 i = 0;
330 arm_devmap_register_table(&fdt_devmap[0]);
331
43
44#define _ARM32_BUS_DMA_PRIVATE
45#include <sys/param.h>
46#include <sys/systm.h>
47#include <sys/bus.h>
48
49#include <vm/vm.h>
50#include <vm/pmap.h>

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

324{
325 phandle_t root, child;
326 pcell_t bank_count;
327 int i, num_mapped;
328
329 i = 0;
330 arm_devmap_register_table(&fdt_devmap[0]);
331
332#ifdef SOC_MV_ARMADAXP
333 vm_paddr_t cur_immr_pa;
334
332 /*
335 /*
336 * Acquire SoC registers' base passed by u-boot and fill devmap
337 * accordingly. DTB is going to be modified basing on this data
338 * later.
339 */
340 __asm __volatile("mrc p15, 4, %0, c15, c0, 0" : "=r" (cur_immr_pa));
341 cur_immr_pa = (cur_immr_pa << 13) & 0xff000000;
342 if (cur_immr_pa != 0)
343 fdt_immr_pa = cur_immr_pa;
344#endif
345 /*
333 * IMMR range.
334 */
335 fdt_devmap[i].pd_va = fdt_immr_va;
336 fdt_devmap[i].pd_pa = fdt_immr_pa;
337 fdt_devmap[i].pd_size = fdt_immr_size;
338 fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
339 fdt_devmap[i].pd_cache = PTE_NOCACHE;
340 i++;

--- 131 unchanged lines hidden ---
346 * IMMR range.
347 */
348 fdt_devmap[i].pd_va = fdt_immr_va;
349 fdt_devmap[i].pd_pa = fdt_immr_pa;
350 fdt_devmap[i].pd_size = fdt_immr_size;
351 fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
352 fdt_devmap[i].pd_cache = PTE_NOCACHE;
353 i++;

--- 131 unchanged lines hidden ---