Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gross hack to get around the fact that there are currently devices with 

common back-ends that live on multiple very-different busses (e.g. PCI and
TC), which need bus-specific DMA mapping support.  As a nice side effect,
this will allow the especially nasty (vtophys(va) | 0x40000000) expressions
to go away in favor of less nasty bus-specific function calls.
This commit is contained in:
cgd 1996-06-03 20:18:48 +00:00
parent e038a84b34
commit c6dd609e7f
4 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/alpha/include/bus.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus.h,v 1.2 1996/04/18 05:47:29 cgd Exp $ */
/* $NetBSD: bus.h,v 1.3 1996/06/03 20:18:48 cgd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -136,6 +136,9 @@ struct alpha_bus_chipset {
bus_mem_size_t off, u_int32_t val));
void (*bc_mw8) __P((void *v, bus_mem_handle_t memh,
bus_mem_size_t off, u_int64_t val));
/* XXX THIS DOES NOT YET BELONG HERE */
vm_offset_t (*bc_XXX_dmamap) __P((void *addr));
};
#define __bc_CONCAT(A,B) __CONCAT(A,B)
@ -199,4 +202,7 @@ struct alpha_bus_chipset {
#define bus_mem_write_4(t, h, o, v) __bc_wr((t),(h),(o),(v),4,m)
#define bus_mem_write_8(t, h, o, v) __bc_wr((t),(h),(o),(v),8,m)
/* XXX THIS DOES NOT BELONG HERE YET. */
#define __alpha_bus_XXX_dmamap(t, va) (*(t)->bc_XXX_dmamap)((va))
#endif /* _ALPHA_BUS_H_ */

16
sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.1 1996/04/12 04:35:01 cgd Exp $ */
/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.2 1996/06/03 20:18:53 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -60,6 +60,9 @@ void __C(CHIP,_mem_write_4) __P((void *, bus_mem_handle_t,
void __C(CHIP,_mem_write_8) __P((void *, bus_mem_handle_t,
bus_mem_size_t, u_int64_t));
/* XXX DOES NOT BELONG */
vm_offset_t __C(CHIP,_XXX_dmamap) __P((void *));
void
__C(CHIP,_bus_mem_init)(bc, memv)
bus_chipset_tag_t bc;
@ -80,6 +83,9 @@ __C(CHIP,_bus_mem_init)(bc, memv)
bc->bc_mw2 = __C(CHIP,_mem_write_2);
bc->bc_mw4 = __C(CHIP,_mem_write_4);
bc->bc_mw8 = __C(CHIP,_mem_write_8);
/* XXX DOES NOT BELONG */
bc->bc_XXX_dmamap = __C(CHIP,_XXX_dmamap);
}
int
@ -290,3 +296,11 @@ __C(CHIP,_mem_write_8)(v, memh, off, val)
}
wbflush();
}
vm_offset_t
__C(CHIP,_XXX_dmamap)(addr)
void *addr;
{
return (vtophys(addr) | 0x40000000);
}

16
sys/arch/alpha/pci/pcs_bus_mem_common.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcs_bus_mem_common.c,v 1.1 1996/04/12 04:35:01 cgd Exp $ */
/* $NetBSD: pcs_bus_mem_common.c,v 1.2 1996/06/03 20:18:53 cgd Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@ -60,6 +60,9 @@ void __C(CHIP,_mem_write_4) __P((void *, bus_mem_handle_t,
void __C(CHIP,_mem_write_8) __P((void *, bus_mem_handle_t,
bus_mem_size_t, u_int64_t));
/* XXX DOES NOT BELONG */
vm_offset_t __C(CHIP,_XXX_dmamap) __P((void *));
void
__C(CHIP,_bus_mem_init)(bc, memv)
bus_chipset_tag_t bc;
@ -80,6 +83,9 @@ __C(CHIP,_bus_mem_init)(bc, memv)
bc->bc_mw2 = __C(CHIP,_mem_write_2);
bc->bc_mw4 = __C(CHIP,_mem_write_4);
bc->bc_mw8 = __C(CHIP,_mem_write_8);
/* XXX DOES NOT BELONG */
bc->bc_XXX_dmamap = __C(CHIP,_XXX_dmamap);
}
int
@ -290,3 +296,11 @@ __C(CHIP,_mem_write_8)(v, memh, off, val)
}
wbflush();
}
vm_offset_t
__C(CHIP,_XXX_dmamap)(addr)
void *addr;
{
return (vtophys(addr) | 0x40000000);
}

17
sys/arch/alpha/tc/tc_bus_mem.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tc_bus_mem.c,v 1.2 1996/05/20 03:14:07 cgd Exp $ */
/* $NetBSD: tc_bus_mem.c,v 1.3 1996/06/03 20:18:57 cgd Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -61,6 +61,9 @@ void tc_mem_write_4 __P((void *, bus_mem_handle_t,
void tc_mem_write_8 __P((void *, bus_mem_handle_t,
bus_mem_size_t, u_int64_t));
/* XXX DOES NOT BELONG */
vm_offset_t tc_XXX_dmamap __P((void *));
void
tc_bus_mem_init(bc, memv)
bus_chipset_tag_t bc;
@ -81,6 +84,9 @@ tc_bus_mem_init(bc, memv)
bc->bc_mw2 = tc_mem_write_2;
bc->bc_mw4 = tc_mem_write_4;
bc->bc_mw8 = tc_mem_write_8;
/* XXX DOES NOT BELONG */
bc->bc_XXX_dmamap = tc_XXX_dmamap;
}
int
@ -274,3 +280,12 @@ tc_mem_write_8(v, memh, off, val)
*p = val;
wbflush();
}
/* XXX DOES NOT BELONG */
vm_offset_t
tc_XXX_dmamap(addr)
void *addr;
{
return (vtophys(addr));
}