Deleted Added
full compact
mv_machdep.c (266084) mv_machdep.c (266386)
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 266084 2014-05-14 19:18:58Z ian $");
42__FBSDID("$FreeBSD: stable/10/sys/arm/mv/mv_machdep.c 266386 2014-05-18 00:32:35Z 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>

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

279moveon:
280 if (fdt_regsize(child, &base, &size) != 0)
281 return (EINVAL);
282
283 map->pd_va = MV_CESA_SRAM_BASE; /* XXX */
284 map->pd_pa = base;
285 map->pd_size = size;
286 map->pd_prot = VM_PROT_READ | VM_PROT_WRITE;
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>

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

279moveon:
280 if (fdt_regsize(child, &base, &size) != 0)
281 return (EINVAL);
282
283 map->pd_va = MV_CESA_SRAM_BASE; /* XXX */
284 map->pd_pa = base;
285 map->pd_size = size;
286 map->pd_prot = VM_PROT_READ | VM_PROT_WRITE;
287 map->pd_cache = PTE_NOCACHE;
287 map->pd_cache = PTE_DEVICE;
288
289 return (0);
290out:
291#endif
292 return (ENOENT);
293
294}
295

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

345#endif
346 /*
347 * IMMR range.
348 */
349 fdt_devmap[i].pd_va = fdt_immr_va;
350 fdt_devmap[i].pd_pa = fdt_immr_pa;
351 fdt_devmap[i].pd_size = fdt_immr_size;
352 fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
288
289 return (0);
290out:
291#endif
292 return (ENOENT);
293
294}
295

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

345#endif
346 /*
347 * IMMR range.
348 */
349 fdt_devmap[i].pd_va = fdt_immr_va;
350 fdt_devmap[i].pd_pa = fdt_immr_pa;
351 fdt_devmap[i].pd_size = fdt_immr_size;
352 fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
353 fdt_devmap[i].pd_cache = PTE_NOCACHE;
353 fdt_devmap[i].pd_cache = PTE_DEVICE;
354 i++;
355
356 /*
357 * SRAM range.
358 */
359 if (i < FDT_DEVMAP_MAX)
360 if (platform_sram_devmap(&fdt_devmap[i]) == 0)
361 i++;

--- 124 unchanged lines hidden ---
354 i++;
355
356 /*
357 * SRAM range.
358 */
359 if (i < FDT_DEVMAP_MAX)
360 if (platform_sram_devmap(&fdt_devmap[i]) == 0)
361 i++;

--- 124 unchanged lines hidden ---