m68k/amiga: Chip RAM - Always allocate from the start of memory
As of commit 5df1abdbd3
('m68k/amiga: Fix
"debug=mem"'), "debug=mem" no longer uses amiga_chip_alloc_res(), so we
can remove the hack to prefer memory at the safe end.
This allows to simplify the code and make amiga_chip_alloc() just call
amiga_chip_alloc_res() internally.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
b4f6f45302
commit
3a17bfa4fb
|
@ -43,24 +43,20 @@ void __init amiga_chip_init(void)
|
||||||
void *amiga_chip_alloc(unsigned long size, const char *name)
|
void *amiga_chip_alloc(unsigned long size, const char *name)
|
||||||
{
|
{
|
||||||
struct resource *res;
|
struct resource *res;
|
||||||
|
void *p;
|
||||||
|
|
||||||
/* round up */
|
|
||||||
size = PAGE_ALIGN(size);
|
|
||||||
|
|
||||||
pr_debug("amiga_chip_alloc: allocate %lu bytes\n", size);
|
|
||||||
res = kzalloc(sizeof(struct resource), GFP_KERNEL);
|
res = kzalloc(sizeof(struct resource), GFP_KERNEL);
|
||||||
if (!res)
|
if (!res)
|
||||||
return NULL;
|
return NULL;
|
||||||
res->name = name;
|
|
||||||
|
|
||||||
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE,
|
res->name = name;
|
||||||
NULL, NULL) < 0) {
|
p = amiga_chip_alloc_res(size, res);
|
||||||
|
if (!p) {
|
||||||
kfree(res);
|
kfree(res);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
chipavail -= size;
|
|
||||||
pr_debug("amiga_chip_alloc: returning %pR\n", res);
|
return p;
|
||||||
return (void *)ZTWO_VADDR(res->start);
|
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(amiga_chip_alloc);
|
EXPORT_SYMBOL(amiga_chip_alloc);
|
||||||
|
|
||||||
|
@ -72,23 +68,22 @@ EXPORT_SYMBOL(amiga_chip_alloc);
|
||||||
* those drivers must not free that Chip RAM afterwards.
|
* those drivers must not free that Chip RAM afterwards.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void * __init amiga_chip_alloc_res(unsigned long size, struct resource *res)
|
void *amiga_chip_alloc_res(unsigned long size, struct resource *res)
|
||||||
{
|
{
|
||||||
unsigned long start;
|
int error;
|
||||||
|
|
||||||
/* round up */
|
/* round up */
|
||||||
size = PAGE_ALIGN(size);
|
size = PAGE_ALIGN(size);
|
||||||
/* dmesg into chipmem prefers memory at the safe end */
|
|
||||||
start = CHIP_PHYSADDR + chipavail - size;
|
|
||||||
|
|
||||||
pr_debug("amiga_chip_alloc_res: allocate %lu bytes\n", size);
|
pr_debug("amiga_chip_alloc_res: allocate %lu bytes\n", size);
|
||||||
if (allocate_resource(&chipram_res, res, size, start, UINT_MAX,
|
error = allocate_resource(&chipram_res, res, size, 0, UINT_MAX,
|
||||||
PAGE_SIZE, NULL, NULL) < 0) {
|
PAGE_SIZE, NULL, NULL);
|
||||||
pr_err("amiga_chip_alloc_res: first alloc failed!\n");
|
if (error < 0) {
|
||||||
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX,
|
pr_err("amiga_chip_alloc_res: allocate_resource() failed %d!\n",
|
||||||
PAGE_SIZE, NULL, NULL) < 0)
|
error);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
chipavail -= size;
|
chipavail -= size;
|
||||||
pr_debug("amiga_chip_alloc_res: returning %pR\n", res);
|
pr_debug("amiga_chip_alloc_res: returning %pR\n", res);
|
||||||
return (void *)ZTWO_VADDR(res->start);
|
return (void *)ZTWO_VADDR(res->start);
|
||||||
|
|
Loading…
Reference in a new issue