m68k/amiga: Chip RAM - Use tabs for indentation
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
02f8c6aee8
commit
5be3246306
|
@ -23,101 +23,105 @@ unsigned long amiga_chip_size;
|
||||||
EXPORT_SYMBOL(amiga_chip_size);
|
EXPORT_SYMBOL(amiga_chip_size);
|
||||||
|
|
||||||
static struct resource chipram_res = {
|
static struct resource chipram_res = {
|
||||||
.name = "Chip RAM", .start = CHIP_PHYSADDR
|
.name = "Chip RAM", .start = CHIP_PHYSADDR
|
||||||
};
|
};
|
||||||
static unsigned long chipavail;
|
static unsigned long chipavail;
|
||||||
|
|
||||||
|
|
||||||
void __init amiga_chip_init(void)
|
void __init amiga_chip_init(void)
|
||||||
{
|
{
|
||||||
if (!AMIGAHW_PRESENT(CHIP_RAM))
|
if (!AMIGAHW_PRESENT(CHIP_RAM))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
chipram_res.end = amiga_chip_size-1;
|
chipram_res.end = amiga_chip_size-1;
|
||||||
request_resource(&iomem_resource, &chipram_res);
|
request_resource(&iomem_resource, &chipram_res);
|
||||||
|
|
||||||
chipavail = amiga_chip_size;
|
chipavail = amiga_chip_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
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;
|
||||||
|
|
||||||
/* round up */
|
/* round up */
|
||||||
size = PAGE_ALIGN(size);
|
size = PAGE_ALIGN(size);
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk("amiga_chip_alloc: allocate %ld bytes\n", size);
|
printk("amiga_chip_alloc: allocate %ld bytes\n", size);
|
||||||
#endif
|
#endif
|
||||||
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;
|
res->name = name;
|
||||||
|
|
||||||
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
|
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE,
|
||||||
kfree(res);
|
NULL, NULL) < 0) {
|
||||||
return NULL;
|
kfree(res);
|
||||||
}
|
return NULL;
|
||||||
chipavail -= size;
|
}
|
||||||
|
chipavail -= size;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk("amiga_chip_alloc: returning %lx\n", res->start);
|
printk("amiga_chip_alloc: returning %lx\n", res->start);
|
||||||
#endif
|
#endif
|
||||||
return (void *)ZTWO_VADDR(res->start);
|
return (void *)ZTWO_VADDR(res->start);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(amiga_chip_alloc);
|
EXPORT_SYMBOL(amiga_chip_alloc);
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Warning:
|
* Warning:
|
||||||
* amiga_chip_alloc_res is meant only for drivers that need to allocate
|
* amiga_chip_alloc_res is meant only for drivers that need to
|
||||||
* Chip RAM before kmalloc() is functional. As a consequence, those
|
* allocate Chip RAM before kmalloc() is functional. As a consequence,
|
||||||
* 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 * __init amiga_chip_alloc_res(unsigned long size, struct resource *res)
|
||||||
{
|
{
|
||||||
unsigned long start;
|
unsigned long start;
|
||||||
|
|
||||||
/* round up */
|
/* round up */
|
||||||
size = PAGE_ALIGN(size);
|
size = PAGE_ALIGN(size);
|
||||||
/* dmesg into chipmem prefers memory at the safe end */
|
/* dmesg into chipmem prefers memory at the safe end */
|
||||||
start = CHIP_PHYSADDR + chipavail - size;
|
start = CHIP_PHYSADDR + chipavail - size;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk("amiga_chip_alloc_res: allocate %ld bytes\n", size);
|
printk("amiga_chip_alloc_res: allocate %ld bytes\n", size);
|
||||||
#endif
|
#endif
|
||||||
if (allocate_resource(&chipram_res, res, size, start, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
|
if (allocate_resource(&chipram_res, res, size, start, UINT_MAX,
|
||||||
printk("amiga_chip_alloc_res: first alloc failed!\n");
|
PAGE_SIZE, NULL, NULL) < 0) {
|
||||||
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0)
|
printk("amiga_chip_alloc_res: first alloc failed!\n");
|
||||||
return NULL;
|
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX,
|
||||||
}
|
PAGE_SIZE, NULL, NULL) < 0)
|
||||||
chipavail -= size;
|
return NULL;
|
||||||
|
}
|
||||||
|
chipavail -= size;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk("amiga_chip_alloc_res: returning %lx\n", res->start);
|
printk("amiga_chip_alloc_res: returning %lx\n", res->start);
|
||||||
#endif
|
#endif
|
||||||
return (void *)ZTWO_VADDR(res->start);
|
return (void *)ZTWO_VADDR(res->start);
|
||||||
}
|
}
|
||||||
|
|
||||||
void amiga_chip_free(void *ptr)
|
void amiga_chip_free(void *ptr)
|
||||||
{
|
{
|
||||||
unsigned long start = ZTWO_PADDR(ptr);
|
unsigned long start = ZTWO_PADDR(ptr);
|
||||||
struct resource **p, *res;
|
struct resource **p, *res;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
|
|
||||||
for (p = &chipram_res.child; (res = *p); p = &res->sibling) {
|
for (p = &chipram_res.child; (res = *p); p = &res->sibling) {
|
||||||
if (res->start != start)
|
if (res->start != start)
|
||||||
continue;
|
continue;
|
||||||
*p = res->sibling;
|
*p = res->sibling;
|
||||||
size = res->end-start;
|
size = res->end-start;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
printk("amiga_chip_free: free %ld bytes at %p\n", size, ptr);
|
printk("amiga_chip_free: free %ld bytes at %p\n", size, ptr);
|
||||||
#endif
|
#endif
|
||||||
chipavail += size;
|
chipavail += size;
|
||||||
kfree(res);
|
kfree(res);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
printk("amiga_chip_free: trying to free nonexistent region at %p\n", ptr);
|
printk("amiga_chip_free: trying to free nonexistent region at %p\n",
|
||||||
|
ptr);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(amiga_chip_free);
|
EXPORT_SYMBOL(amiga_chip_free);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue