Deleted Added
sdiff udiff text old ( 266160 ) new ( 266386 )
full compact
mv_pci.c (266160) mv_pci.c (266386)
1/*-
2 * Copyright (c) 2008 MARVELL INTERNATIONAL LTD.
3 * Copyright (c) 2010 The FreeBSD Foundation
4 * Copyright (c) 2010-2012 Semihalf
5 * All rights reserved.
6 *
7 * Developed by Semihalf.
8 *

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

34 * SUCH DAMAGE.
35 */
36
37/*
38 * Marvell integrated PCI/PCI-Express controller driver.
39 */
40
41#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 MARVELL INTERNATIONAL LTD.
3 * Copyright (c) 2010 The FreeBSD Foundation
4 * Copyright (c) 2010-2012 Semihalf
5 * All rights reserved.
6 *
7 * Developed by Semihalf.
8 *

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

34 * SUCH DAMAGE.
35 */
36
37/*
38 * Marvell integrated PCI/PCI-Express controller driver.
39 */
40
41#include <sys/cdefs.h>
42__FBSDID("$FreeBSD: stable/10/sys/arm/mv/mv_pci.c 266160 2014-05-15 17:30:16Z ian $");
42__FBSDID("$FreeBSD: stable/10/sys/arm/mv/mv_pci.c 266386 2014-05-18 00:32:35Z ian $");
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/kernel.h>
47#include <sys/lock.h>
48#include <sys/malloc.h>
49#include <sys/module.h>
50#include <sys/mutex.h>

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

230
231 if ((error = mv_pci_ranges_decode(node, &io_space, &mem_space)) != 0)
232 return (error);
233
234 devmap->pd_va = (io_va ? io_va : io_space.base_parent);
235 devmap->pd_pa = io_space.base_parent;
236 devmap->pd_size = io_space.len;
237 devmap->pd_prot = VM_PROT_READ | VM_PROT_WRITE;
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/kernel.h>
47#include <sys/lock.h>
48#include <sys/malloc.h>
49#include <sys/module.h>
50#include <sys/mutex.h>

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

230
231 if ((error = mv_pci_ranges_decode(node, &io_space, &mem_space)) != 0)
232 return (error);
233
234 devmap->pd_va = (io_va ? io_va : io_space.base_parent);
235 devmap->pd_pa = io_space.base_parent;
236 devmap->pd_size = io_space.len;
237 devmap->pd_prot = VM_PROT_READ | VM_PROT_WRITE;
238 devmap->pd_cache = PTE_NOCACHE;
238 devmap->pd_cache = PTE_DEVICE;
239 devmap++;
240
241 devmap->pd_va = (mem_va ? mem_va : mem_space.base_parent);
242 devmap->pd_pa = mem_space.base_parent;
243 devmap->pd_size = mem_space.len;
244 devmap->pd_prot = VM_PROT_READ | VM_PROT_WRITE;
239 devmap++;
240
241 devmap->pd_va = (mem_va ? mem_va : mem_space.base_parent);
242 devmap->pd_pa = mem_space.base_parent;
243 devmap->pd_size = mem_space.len;
244 devmap->pd_prot = VM_PROT_READ | VM_PROT_WRITE;
245 devmap->pd_cache = PTE_NOCACHE;
245 devmap->pd_cache = PTE_DEVICE;
246 return (0);
247}
248
249/*
250 * Code and data related to the Marvell pcib driver.
251 */
252
253#define PCI_CFG_ENA (1U << 31)

--- 945 unchanged lines hidden --- 		246 return (0);
247}
248
249/*
250 * Code and data related to the Marvell pcib driver.
251 */
252
253#define PCI_CFG_ENA (1U << 31)

--- 945 unchanged lines hidden ---