mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

- provide a more informative panic if mdesc_update() fails

Browse Source 
- handle some cases where the return value of mdesc_update() is not zero
  when it should be
This commit is contained in:
Kip Macy 2006-12-12 02:50:12 +00:00
parent 9ac317cd2e
commit 8401edeb32
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=165108
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/sun4v/mdesc/mdesc_init.c
View File

@ -197,19 +197,22 @@ mdesc_update(void)
(mdesc_memops->mm_buf_free)(buf, mdesc_buf_size);
mdesc_size = 0LL;
hv_mach_desc((uint64_t)0, &mdesc_size);
do {
rv = hv_mach_desc((uint64_t)0, &mdesc_size);
if (rv != H_EOK && rv != H_EINVAL)
printf("retrying to fetch mdesc size\n");
} while (rv != H_EOK && rv != H_EINVAL);
mdesc_size = mdesc_buf_size = round_page(mdesc_size);
if ((buf = (*mdesc_memops->mm_buf_alloc)(mdesc_buf_size, PAGE_SIZE)) == NULL) {
rv = -1;
rv = ENOMEM;
goto done;
}
rv = hv_mach_desc(vtophys(buf), &mdesc_size);
if (rv != H_EOK && rv != H_EINVAL) {
rv = -1;
goto done;
}
} while (mdesc_size > mdesc_buf_size);
@ -235,7 +238,7 @@ mdesc_update(void)
curr_mdesc->md_buf_size = mdesc_buf_size;
mtx_unlock(&curr_mdesc_lock);
return (rv);
return (0);
done:
if (buf != NULL)
@ -247,16 +250,16 @@ md_t *
md_get(void)
{
md_t *mdp;
int rc;
/*
* XXX This should actually happen in init
*/
if (curr_mdesc == NULL) {
if ((curr_mdesc = mdesc_alloc()) == NULL)
panic("machine description allocation failed");
if (mdesc_update())
panic("machine description update failed");
if ((rc = mdesc_update()) != 0)
panic("machine description update failed: %d", rc);
}
mtx_lock(&curr_mdesc_lock);