SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-07-03 01:50:11 +00:00
parent e42955765e
commit 0c5463838b
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
28 changed files with 291 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

96
sys/arch/amd64/pci/agp_machdep.c
View file

@ -1,20 +1,5 @@
/* $OpenBSD: agp_machdep.c,v 1.14 2015/03/14 03:38:46 jsg Exp $ */
/* $OpenBSD: agp_machdep.c,v 1.17 2024/07/02 04:42:43 jsg Exp $ */
/*
* Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
* Copyright (c) 2002 Michael Shalayeff
* All rights reserved.
@ -43,90 +28,11 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/rwlock.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcidevs.h>
#include <uvm/uvm_extern.h>
#include <machine/cpufunc.h>
#include <machine/bus.h>
#include <machine/pmap.h>
void
agp_flush_cache(void)
{
wbinvd();
}
void
agp_flush_cache_range(vaddr_t va, vsize_t sz)
{
pmap_flush_cache(va, sz);
}
struct agp_map {
bus_space_tag_t bst;
bus_space_handle_t bsh;
bus_size_t size;
};
int
agp_init_map(bus_space_tag_t tag, bus_addr_t address, bus_size_t size,
int flags, struct agp_map **mapp)
{
struct agp_map *map;
int err;
map = malloc(sizeof(*map), M_AGP, M_WAITOK | M_CANFAIL);
if (map == NULL)
return (ENOMEM);
map->bst = tag;
map->size = size;
if ((err = bus_space_map(tag, address, size, flags, &map->bsh)) != 0) {
free(map, M_AGP, sizeof(*map));
return (err);
}
*mapp = map;
return (0);
}
void
agp_destroy_map(struct agp_map *map)
{
bus_space_unmap(map->bst, map->bsh, map->size);
free(map, M_AGP, sizeof(*map));
}
int
agp_map_subregion(struct agp_map *map, bus_size_t offset, bus_size_t size,
bus_space_handle_t *bshp)
{
return (bus_space_subregion(map->bst, map->bsh, offset, size, bshp));
}
void
agp_unmap_subregion(struct agp_map *map, bus_space_handle_t bsh,
bus_size_t size)
{
/* subregion doesn't need unmapping, do nothing */
}
void
agp_map_atomic(struct agp_map *map, bus_size_t offset,
bus_space_handle_t *bshp)
{
agp_map_subregion(map, offset, PAGE_SIZE, bshp);
}
void
agp_unmap_atomic(struct agp_map *map, bus_space_handle_t bsh)
{
/* subregion doesn't need unmapping, do nothing */
}