Back out my rbus change since it seems to break things.
This commit is contained in:
augustss
parent
7a16f4991b
commit
5da7a65ca6
|
|
@ -1,4 +1,4 @@
|
||||||
/* $NetBSD: rbus.c,v 1.4 2000/05/08 14:00:05 augustss Exp $ */
|
/* $NetBSD: rbus.c,v 1.5 2000/05/08 19:25:46 augustss Exp $ */
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1999
|
* Copyright (c) 1999
|
||||||
* HAYAKAWA Koichi. All rights reserved.
|
* HAYAKAWA Koichi. All rights reserved.
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
#include <dev/cardbus/rbus.h>
|
#include <dev/cardbus/rbus.h>
|
||||||
|
|
||||||
/*#define RBUS_DEBUG*/
|
/* #define RBUS_DEBUG */
|
||||||
|
|
||||||
#if defined RBUS_DEBUG
|
#if defined RBUS_DEBUG
|
||||||
#define STATIC
|
#define STATIC
|
||||||
|
|
@ -63,16 +63,16 @@ static rbus_tag_t rbus_new_body __P((bus_space_tag_t bt, rbus_tag_t parent,
|
||||||
|
|
||||||
int
|
int
|
||||||
rbus_space_alloc(rbt, addr, size, mask, align, flags, addrp, bshp)
|
rbus_space_alloc(rbt, addr, size, mask, align, flags, addrp, bshp)
|
||||||
rbus_tag_t rbt;
|
rbus_tag_t rbt;
|
||||||
bus_addr_t addr;
|
bus_addr_t addr;
|
||||||
bus_size_t size;
|
bus_size_t size;
|
||||||
bus_addr_t mask, align;
|
bus_addr_t mask, align;
|
||||||
int flags;
|
int flags;
|
||||||
bus_addr_t *addrp;
|
bus_addr_t *addrp;
|
||||||
bus_space_handle_t *bshp;
|
bus_space_handle_t *bshp;
|
||||||
{
|
{
|
||||||
return rbus_space_alloc_subregion(rbt, rbt->rb_start, rbt->rb_end,
|
return rbus_space_alloc_subregion(rbt, rbt->rb_start, rbt->rb_end, addr,
|
||||||
addr, size, mask, align, flags, addrp, bshp);
|
size, mask, align, flags, addrp, bshp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -80,118 +80,129 @@ rbus_space_alloc(rbt, addr, size, mask, align, flags, addrp, bshp)
|
||||||
|
|
||||||
int
|
int
|
||||||
rbus_space_alloc_subregion(rbt, substart, subend, addr, size, mask, align, flags, addrp, bshp)
|
rbus_space_alloc_subregion(rbt, substart, subend, addr, size, mask, align, flags, addrp, bshp)
|
||||||
rbus_tag_t rbt;
|
rbus_tag_t rbt;
|
||||||
bus_addr_t addr;
|
bus_addr_t addr;
|
||||||
bus_addr_t substart;
|
bus_addr_t substart;
|
||||||
bus_addr_t subend;
|
bus_addr_t subend;
|
||||||
bus_size_t size;
|
bus_size_t size;
|
||||||
bus_addr_t mask, align;
|
bus_addr_t mask, align;
|
||||||
int flags;
|
int flags;
|
||||||
bus_addr_t *addrp;
|
bus_addr_t *addrp;
|
||||||
bus_space_handle_t *bshp;
|
bus_space_handle_t *bshp;
|
||||||
{
|
{
|
||||||
bus_addr_t decodesize = mask + 1;
|
bus_addr_t decodesize = mask + 1;
|
||||||
bus_addr_t boundary, search_addr;
|
bus_addr_t boundary, search_addr;
|
||||||
int val;
|
int val = 0;
|
||||||
bus_addr_t result;
|
bus_addr_t result;
|
||||||
u_long ures;
|
int exflags = EX_FAST | EX_NOWAIT;
|
||||||
int exflags = EX_FAST | EX_NOWAIT;
|
|
||||||
|
|
||||||
DPRINTF(("rbus_space_alloc: addr 0x%lx, size 0x%lx, mask 0x%lx, "
|
DPRINTF(("rbus_space_alloc: addr %lx, size %lx, mask %lx, align %lx\n",
|
||||||
"align 0x%lx, substart 0x%lx, subend 0x%lx\n",
|
addr, size, mask, align));
|
||||||
addr, size, mask, align, substart, subend));
|
|
||||||
|
|
||||||
addr += rbt->rb_offset;
|
addr += rbt->rb_offset;
|
||||||
|
|
||||||
if (mask == 0)
|
if (mask == 0) {
|
||||||
/* FULL Decode */
|
/* FULL Decode */
|
||||||
decodesize = 0;
|
decodesize = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT)
|
if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
|
||||||
return rbus_space_alloc(rbt->rb_parent, addr, size, mask,
|
return rbus_space_alloc(rbt->rb_parent, addr, size, mask, align, flags,
|
||||||
align, flags, addrp, bshp);
|
addrp, bshp);
|
||||||
|
} else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
|
||||||
|
rbt->rb_flags == RBUS_SPACE_DEDICATE) {
|
||||||
|
/* rbt has its own sh_extent */
|
||||||
|
|
||||||
if (rbt->rb_flags != RBUS_SPACE_SHARE &&
|
/* sanity check: the subregion [substart, subend] should be
|
||||||
rbt->rb_flags != RBUS_SPACE_DEDICATE)
|
smaller than the region included in sh_extent */
|
||||||
return 1;
|
if (substart < rbt->rb_ext->ex_start || subend > rbt->rb_ext->ex_end) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* rbt has its own sh_extent */
|
if (decodesize == align) {
|
||||||
|
if(extent_alloc_subregion(rbt->rb_ext, substart, subend, size, align, 0,
|
||||||
|
exflags, (u_long *)&result)) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
} else if (decodesize == 0) {
|
||||||
|
/* maybe, the resister is overflowed. */
|
||||||
|
|
||||||
|
if (extent_alloc_subregion(rbt->rb_ext, addr, addr + size, size,
|
||||||
|
0, 0, exflags, (u_long *)&result)) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
|
||||||
/* sanity check: the subregion [substart, subend] should be
|
boundary = decodesize > align ? decodesize : align;
|
||||||
smaller than the region included in sh_extent */
|
|
||||||
if (substart < rbt->rb_ext->ex_start || subend > rbt->rb_ext->ex_end)
|
|
||||||
return 1;
|
|
||||||
|
|
||||||
if (decodesize == align) {
|
search_addr = (substart & ~(boundary - 1)) + addr;
|
||||||
if (extent_alloc_subregion(rbt->rb_ext, substart, subend,
|
|
||||||
size, align, 0, exflags, &ures)) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
} else if (decodesize == 0 || addr != 0) {
|
|
||||||
/* maybe, the register is overflowed. */
|
|
||||||
if (extent_alloc_subregion(rbt->rb_ext, addr, addr + size,
|
|
||||||
size, 1, 0, exflags, &ures)) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
boundary = decodesize > align ? decodesize : align;
|
|
||||||
search_addr = (substart & ~(boundary - 1)) + addr;
|
|
||||||
|
|
||||||
if (search_addr < substart)
|
if (search_addr < substart) {
|
||||||
search_addr += boundary;
|
search_addr += boundary;
|
||||||
|
}
|
||||||
|
|
||||||
val = 1;
|
for (; search_addr + size <= subend; search_addr += boundary) {
|
||||||
for (; search_addr + size <= subend; search_addr += boundary) {
|
val = extent_alloc_subregion(rbt->rb_ext,search_addr, search_addr+size,
|
||||||
val = extent_alloc_subregion(rbt->rb_ext, search_addr,
|
size, align, 0, exflags, (u_long *)&result);
|
||||||
search_addr + size, size, align, 0, exflags,
|
if (val == 0) {
|
||||||
&ures);
|
break;
|
||||||
if (val == 0)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (val)
|
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
result = (bus_addr_t)ures;
|
}
|
||||||
|
if (val) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (md_space_map(rbt->rb_bt, result, size, flags, bshp)) {
|
if(md_space_map(rbt->rb_bt, result, size, flags, bshp)) {
|
||||||
/* map failed */
|
/* map failed */
|
||||||
extent_free(rbt->rb_ext, result, size, exflags);
|
extent_free(rbt->rb_ext, result, size, exflags);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addrp != NULL)
|
if (addrp != NULL) {
|
||||||
*addrp = result + rbt->rb_offset;
|
*addrp = result + rbt->rb_offset;
|
||||||
return 0;
|
}
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
/* error!! */
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
rbus_space_free(rbt, bsh, size, addrp)
|
rbus_space_free(rbt, bsh, size, addrp)
|
||||||
rbus_tag_t rbt;
|
rbus_tag_t rbt;
|
||||||
bus_space_handle_t bsh;
|
bus_space_handle_t bsh;
|
||||||
bus_size_t size;
|
bus_size_t size;
|
||||||
bus_addr_t *addrp;
|
bus_addr_t *addrp;
|
||||||
{
|
{
|
||||||
int exflags = EX_FAST | EX_NOWAIT;
|
int exflags = EX_FAST | EX_NOWAIT;
|
||||||
bus_addr_t addr;
|
bus_addr_t addr;
|
||||||
int status = 1;
|
int status = 1;
|
||||||
|
|
||||||
if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
|
if (rbt->rb_flags == RBUS_SPACE_ASK_PARENT) {
|
||||||
status = rbus_space_free(rbt->rb_parent, bsh, size, &addr);
|
status = rbus_space_free(rbt->rb_parent, bsh, size, &addr);
|
||||||
} else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
|
} else if (rbt->rb_flags == RBUS_SPACE_SHARE ||
|
||||||
rbt->rb_flags == RBUS_SPACE_DEDICATE) {
|
rbt->rb_flags == RBUS_SPACE_DEDICATE) {
|
||||||
md_space_unmap(rbt->rb_bt, bsh, size, &addr);
|
md_space_unmap(rbt->rb_bt, bsh, size, &addr);
|
||||||
|
|
||||||
extent_free(rbt->rb_ext, addr, size, exflags);
|
extent_free(rbt->rb_ext, addr, size, exflags);
|
||||||
|
|
||||||
status = 0;
|
status = 0;
|
||||||
} else {
|
} else {
|
||||||
/* error. INVALID rbustag */
|
/* error. INVALID rbustag */
|
||||||
status = 1;
|
status = 1;
|
||||||
}
|
}
|
||||||
if (addrp != NULL)
|
if (addrp != NULL) {
|
||||||
*addrp = addr;
|
*addrp = addr;
|
||||||
return status;
|
}
|
||||||
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -205,42 +216,43 @@ rbus_space_free(rbt, bsh, size, addrp)
|
||||||
*/
|
*/
|
||||||
static rbus_tag_t
|
static rbus_tag_t
|
||||||
rbus_new_body(bt, parent, ex, start, end, offset, flags)
|
rbus_new_body(bt, parent, ex, start, end, offset, flags)
|
||||||
bus_space_tag_t bt;
|
bus_space_tag_t bt;
|
||||||
rbus_tag_t parent;
|
rbus_tag_t parent;
|
||||||
struct extent *ex;
|
struct extent *ex;
|
||||||
bus_addr_t start, end, offset;
|
bus_addr_t start, end, offset;
|
||||||
int flags;
|
int flags;
|
||||||
{
|
{
|
||||||
rbus_tag_t rb;
|
rbus_tag_t rb;
|
||||||
|
|
||||||
/* sanity check */
|
/* sanity check */
|
||||||
if (parent != NULL) {
|
if (parent != NULL) {
|
||||||
if (start < parent->rb_start || end > parent->rb_end) {
|
if (start < parent->rb_start || end > parent->rb_end) {
|
||||||
/* out of range: [start, size] should be containd in parent space */
|
/* out of range: [start, size] should be containd in parent space */
|
||||||
return 0;
|
return 0;
|
||||||
/* Should I invoke panic? */
|
/* Should I invoke panic? */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rb = (rbus_tag_t)malloc(sizeof(struct rbustag), M_DEVBUF, M_NOWAIT);
|
if (NULL == (rb = (rbus_tag_t)malloc(sizeof(struct rbustag), M_DEVBUF,
|
||||||
if (rb == NULL)
|
M_NOWAIT))) {
|
||||||
panic("no memory for rbus instance");
|
panic("no memory for rbus instance");
|
||||||
|
}
|
||||||
|
|
||||||
rb->rb_bt = bt;
|
rb->rb_bt = bt;
|
||||||
rb->rb_parent = parent;
|
rb->rb_parent = parent;
|
||||||
rb->rb_start = start;
|
rb->rb_start = start;
|
||||||
rb->rb_end = end;
|
rb->rb_end = end;
|
||||||
rb->rb_offset = offset;
|
rb->rb_offset = offset;
|
||||||
rb->rb_flags = flags;
|
rb->rb_flags = flags;
|
||||||
rb->rb_ext = ex;
|
rb->rb_ext = ex;
|
||||||
|
|
||||||
DPRINTF(("rbus_new_body: [%lx, %lx] type %s name [%s]\n", start, end,
|
DPRINTF(("rbus_new_body: [%lx, %lx] type %s name [%s]\n", start, end,
|
||||||
flags == RBUS_SPACE_SHARE ? "share" :
|
flags == RBUS_SPACE_SHARE ? "share" :
|
||||||
flags == RBUS_SPACE_DEDICATE ? "dedicated" :
|
flags == RBUS_SPACE_DEDICATE ? "dedicated" :
|
||||||
flags == RBUS_SPACE_ASK_PARENT ? "parent" : "invalid",
|
flags == RBUS_SPACE_ASK_PARENT ? "parent" : "invalid",
|
||||||
ex != NULL ? ex->ex_name : "noname"));
|
ex != NULL ? ex->ex_name : "noname"));
|
||||||
|
|
||||||
return rb;
|
return rb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -253,39 +265,39 @@ rbus_new_body(bt, parent, ex, start, end, offset, flags)
|
||||||
*/
|
*/
|
||||||
rbus_tag_t
|
rbus_tag_t
|
||||||
rbus_new(parent, start, size, offset, flags)
|
rbus_new(parent, start, size, offset, flags)
|
||||||
rbus_tag_t parent;
|
rbus_tag_t parent;
|
||||||
bus_addr_t start;
|
bus_addr_t start;
|
||||||
bus_size_t size;
|
bus_size_t size;
|
||||||
bus_addr_t offset;
|
bus_addr_t offset;
|
||||||
int flags;
|
int flags;
|
||||||
{
|
{
|
||||||
rbus_tag_t rb;
|
rbus_tag_t rb;
|
||||||
struct extent *ex = NULL;
|
struct extent *ex = NULL;
|
||||||
bus_addr_t end = start + size;
|
bus_addr_t end = start + size;
|
||||||
|
|
||||||
if (flags == RBUS_SPACE_SHARE) {
|
if (flags == RBUS_SPACE_SHARE) {
|
||||||
ex = parent->rb_ext;
|
ex = parent->rb_ext;
|
||||||
} else if (flags == RBUS_SPACE_DEDICATE) {
|
} else if (flags == RBUS_SPACE_DEDICATE) {
|
||||||
ex = extent_create("rbus", start, end, M_DEVBUF, NULL, 0,
|
if (NULL == (ex = extent_create("rbus", start, end, M_DEVBUF, NULL, 0,
|
||||||
EX_NOCOALESCE | EX_NOWAIT);
|
EX_NOCOALESCE|EX_NOWAIT))) {
|
||||||
if (ex == NULL) {
|
free(rb, M_DEVBUF);
|
||||||
free(rb, M_DEVBUF);
|
return NULL;
|
||||||
return NULL;
|
}
|
||||||
}
|
} else if (flags == RBUS_SPACE_ASK_PARENT) {
|
||||||
} else if (flags == RBUS_SPACE_ASK_PARENT) {
|
ex = NULL;
|
||||||
ex = NULL;
|
} else {
|
||||||
} else {
|
/* Invalid flag */
|
||||||
/* Invalid flag */
|
return 0;
|
||||||
return NULL;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
rb = rbus_new_body(parent->rb_bt, parent, ex, start, start + size,
|
rb = rbus_new_body(parent->rb_bt, parent, ex, start, start + size,
|
||||||
offset, flags);
|
offset, flags);
|
||||||
|
|
||||||
if (rb == NULL && flags == RBUS_SPACE_DEDICATE)
|
|
||||||
extent_destroy(ex);
|
|
||||||
|
|
||||||
return rb;
|
if ((rb == NULL) && (flags == RBUS_SPACE_DEDICATE)) {
|
||||||
|
extent_destroy(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
return rb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -299,26 +311,27 @@ rbus_new(parent, start, size, offset, flags)
|
||||||
*/
|
*/
|
||||||
rbus_tag_t
|
rbus_tag_t
|
||||||
rbus_new_root_delegate(bt, start, size, offset)
|
rbus_new_root_delegate(bt, start, size, offset)
|
||||||
bus_space_tag_t bt;
|
bus_space_tag_t bt;
|
||||||
bus_addr_t start;
|
bus_addr_t start;
|
||||||
bus_size_t size;
|
bus_size_t size;
|
||||||
bus_addr_t offset;
|
bus_addr_t offset;
|
||||||
{
|
{
|
||||||
rbus_tag_t rb;
|
rbus_tag_t rb;
|
||||||
struct extent *ex;
|
struct extent *ex;
|
||||||
|
|
||||||
ex = extent_create("rbus root", start, start + size, M_DEVBUF,
|
if (NULL == (ex = extent_create("rbus root", start, start + size, M_DEVBUF,
|
||||||
NULL, 0, EX_NOCOALESCE | EX_NOWAIT);
|
NULL, 0, EX_NOCOALESCE|EX_NOWAIT))) {
|
||||||
if (ex == NULL)
|
return NULL;
|
||||||
return NULL;
|
}
|
||||||
|
|
||||||
rb = rbus_new_body(bt, NULL, ex, start, start + size, offset,
|
rb = rbus_new_body(bt, NULL, ex, start, start + size, offset,
|
||||||
RBUS_SPACE_DEDICATE);
|
RBUS_SPACE_DEDICATE);
|
||||||
|
|
||||||
if (rb == NULL)
|
if (rb == NULL) {
|
||||||
extent_destroy(ex);
|
extent_destroy(ex);
|
||||||
|
}
|
||||||
return rb;
|
|
||||||
|
return rb;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -331,21 +344,21 @@ rbus_new_root_delegate(bt, start, size, offset)
|
||||||
*/
|
*/
|
||||||
rbus_tag_t
|
rbus_tag_t
|
||||||
rbus_new_root_share(bt, ex, start, size, offset)
|
rbus_new_root_share(bt, ex, start, size, offset)
|
||||||
bus_space_tag_t bt;
|
bus_space_tag_t bt;
|
||||||
struct extent *ex;
|
struct extent *ex;
|
||||||
bus_addr_t start;
|
bus_addr_t start;
|
||||||
bus_size_t size;
|
bus_size_t size;
|
||||||
bus_addr_t offset;
|
bus_addr_t offset;
|
||||||
{
|
{
|
||||||
/* sanity check */
|
/* sanity check */
|
||||||
if (start < ex->ex_start || start + size > ex->ex_end) {
|
if (start < ex->ex_start || start + size > ex->ex_end) {
|
||||||
/* out of range: [start, size] should be containd in parent space */
|
/* out of range: [start, size] should be containd in parent space */
|
||||||
return 0;
|
return 0;
|
||||||
/* Should I invoke panic? */
|
/* Should I invoke panic? */
|
||||||
}
|
}
|
||||||
|
|
||||||
return rbus_new_body(bt, NULL, ex, start, start + size, offset,
|
return rbus_new_body(bt, NULL, ex, start, start + size, offset,
|
||||||
RBUS_SPACE_SHARE);
|
RBUS_SPACE_SHARE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -359,14 +372,15 @@ rbus_new_root_share(bt, ex, start, size, offset)
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
rbus_delete(rb)
|
rbus_delete(rb)
|
||||||
rbus_tag_t rb;
|
rbus_tag_t rb;
|
||||||
{
|
{
|
||||||
DPRINTF(("rbus_delete called [%s]\n",
|
DPRINTF(("rbus_delete called [%s]\n",
|
||||||
rb->rb_ext != NULL ? rb->rb_ext->ex_name : "noname"));
|
rb->rb_ext != NULL ? rb->rb_ext->ex_name : "noname"));
|
||||||
if (rb->rb_flags == RBUS_SPACE_DEDICATE)
|
if (rb->rb_flags == RBUS_SPACE_DEDICATE) {
|
||||||
extent_destroy(rb->rb_ext);
|
extent_destroy(rb->rb_ext);
|
||||||
|
}
|
||||||
|
|
||||||
free(rb, M_DEVBUF);
|
free(rb, M_DEVBUF);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue