diff options
author | mux <mux@FreeBSD.org> | 2003-02-25 03:21:22 +0000 |
---|---|---|
committer | mux <mux@FreeBSD.org> | 2003-02-25 03:21:22 +0000 |
commit | 541937cf7373ff6a61c871266ea041503bb02233 (patch) | |
tree | a4ad6d456fdd984cdf9c6c6abd5e4654a9b7e3e0 /sys/amd64 | |
parent | f52965fa5d8b4bdc23c2e702d17f5537a81f6d01 (diff) | |
download | FreeBSD-src-541937cf7373ff6a61c871266ea041503bb02233.zip FreeBSD-src-541937cf7373ff6a61c871266ea041503bb02233.tar.gz |
Cleanup of the d_mmap_t interface.
- Get rid of the useless atop() / pmap_phys_address() detour. The
device mmap handlers must now give back the physical address
without atop()'ing it.
- Don't borrow the physical address of the mapping in the returned
int. Now we properly pass a vm_offset_t * and expect it to be
filled by the mmap handler when the mapping was successful. The
mmap handler must now return 0 when successful, any other value
is considered as an error. Previously, returning -1 was the only
way to fail. This change thus accidentally fixes some devices
which were bogusly returning errno constants which would have been
considered as addresses by the device pager.
- Garbage collect the poorly named pmap_phys_address() now that it's
no longer used.
- Convert all the d_mmap_t consumers to the new API.
I'm still not sure wheter we need a __FreeBSD_version bump for this,
since and we didn't guarantee API/ABI stability until 5.1-RELEASE.
Discussed with: alc, phk, jake
Reviewed by: peter
Compile-tested on: LINT (i386), GENERIC (alpha and sparc64)
Runtime-tested on: i386
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/mem.c | 9 | ||||
-rw-r--r-- | sys/amd64/amd64/pmap.c | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/amd64/amd64/mem.c b/sys/amd64/amd64/mem.c index 41fa636..a045d96 100644 --- a/sys/amd64/amd64/mem.c +++ b/sys/amd64/amd64/mem.c @@ -215,22 +215,25 @@ mmrw(dev_t dev, struct uio *uio, int flags) * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) { switch (minor(dev)) { /* minor device 0 is physical memory */ case 0: - return (i386_btop(offset)); + *paddr = offset; + break; /* minor device 1 is kernel memory */ case 1: - return (i386_btop(vtophys(offset))); + *paddr = vtophys(offset); + break; default: return (-1); } + return (0); } /* diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 8d6df39..ca469aa 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -3124,13 +3124,6 @@ pmap_page_protect(vm_page_t m, vm_prot_t prot) } } -vm_offset_t -pmap_phys_address(ppn) - int ppn; -{ - return (i386_ptob(ppn)); -} - /* * pmap_ts_referenced: * |