---

yaml
---
r: 261855
b: refs/heads/master
c: ca7a718
h: refs/heads/master
i:
  261853: 0938461
  261851: 8759c0a
  261847: 06b98ae
  261839: a1d6fd5
  261823: 014f9e0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 968e75fc13b6d582f42ce44172e13ba58157e11f
+refs/heads/master: ca7a71824ac957b1b9d3322656c05aad38d7275c

trunk/arch/m68k/Kconfig.mmu

@@ -372,6 +372,12 @@ config AMIGA_PCMCIA
 	  Include support in the kernel for pcmcia on Amiga 1200 and Amiga
 	  600. If you intend to use pcmcia cards say Y; otherwise say N.
 
+config STRAM_PROC
+	bool "ST-RAM statistics in /proc"
+	depends on ATARI
+	help
+	  Say Y here to report ST-RAM usage statistics in /proc/stram.
+
 config HEARTBEAT
 	bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40
 	default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300

trunk/arch/m68k/amiga/chipram.c

@@ -16,108 +16,118 @@
 #include <linux/string.h>
 #include <linux/module.h>
 
-#include <asm/atomic.h>
 #include <asm/page.h>
 #include <asm/amigahw.h>
 
 unsigned long amiga_chip_size;
 EXPORT_SYMBOL(amiga_chip_size);
 
 static struct resource chipram_res = {
-	.name = "Chip RAM", .start = CHIP_PHYSADDR
+    .name = "Chip RAM", .start = CHIP_PHYSADDR
 };
-static atomic_t chipavail;
+static unsigned long chipavail;
 
 
 void __init amiga_chip_init(void)
 {
-	if (!AMIGAHW_PRESENT(CHIP_RAM))
-		return;
+    if (!AMIGAHW_PRESENT(CHIP_RAM))
+	return;
 
-	chipram_res.end = CHIP_PHYSADDR + amiga_chip_size - 1;
-	request_resource(&iomem_resource, &chipram_res);
+    chipram_res.end = amiga_chip_size-1;
+    request_resource(&iomem_resource, &chipram_res);
 
-	atomic_set(&chipavail, amiga_chip_size);
+    chipavail = amiga_chip_size;
 }
 
 
 void *amiga_chip_alloc(unsigned long size, const char *name)
 {
-	struct resource *res;
-	void *p;
+    struct resource *res;
 
-	res = kzalloc(sizeof(struct resource), GFP_KERNEL);
-	if (!res)
-		return NULL;
+    /* round up */
+    size = PAGE_ALIGN(size);
 
-	res->name = name;
-	p = amiga_chip_alloc_res(size, res);
-	if (!p) {
-		kfree(res);
-		return NULL;
-	}
+#ifdef DEBUG
+    printk("amiga_chip_alloc: allocate %ld bytes\n", size);
+#endif
+    res = kzalloc(sizeof(struct resource), GFP_KERNEL);
+    if (!res)
+	return NULL;
+    res->name = name;
 
-	return p;
+    if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
+	kfree(res);
+	return NULL;
+    }
+    chipavail -= size;
+#ifdef DEBUG
+    printk("amiga_chip_alloc: returning %lx\n", res->start);
+#endif
+    return (void *)ZTWO_VADDR(res->start);
 }
 EXPORT_SYMBOL(amiga_chip_alloc);
 
 
-	/*
-	 *  Warning:
-	 *  amiga_chip_alloc_res is meant only for drivers that need to
-	 *  allocate Chip RAM before kmalloc() is functional. As a consequence,
-	 *  those drivers must not free that Chip RAM afterwards.
-	 */
+    /*
+     *  Warning:
+     *  amiga_chip_alloc_res is meant only for drivers that need to allocate
+     *  Chip RAM before kmalloc() is functional. As a consequence, those
+     *  drivers must not free that Chip RAM afterwards.
+     */
 
-void *amiga_chip_alloc_res(unsigned long size, struct resource *res)
+void * __init amiga_chip_alloc_res(unsigned long size, struct resource *res)
 {
-	int error;
-
-	/* round up */
-	size = PAGE_ALIGN(size);
-
-	pr_debug("amiga_chip_alloc_res: allocate %lu bytes\n", size);
-	error = allocate_resource(&chipram_res, res, size, 0, UINT_MAX,
-				  PAGE_SIZE, NULL, NULL);
-	if (error < 0) {
-		pr_err("amiga_chip_alloc_res: allocate_resource() failed %d!\n",
-		       error);
-		return NULL;
-	}
-
-	atomic_sub(size, &chipavail);
-	pr_debug("amiga_chip_alloc_res: returning %pR\n", res);
-	return (void *)ZTWO_VADDR(res->start);
+    unsigned long start;
+
+    /* round up */
+    size = PAGE_ALIGN(size);
+    /* dmesg into chipmem prefers memory at the safe end */
+    start = CHIP_PHYSADDR + chipavail - size;
+
+#ifdef DEBUG
+    printk("amiga_chip_alloc_res: allocate %ld bytes\n", size);
+#endif
+    if (allocate_resource(&chipram_res, res, size, start, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0) {
+	printk("amiga_chip_alloc_res: first alloc failed!\n");
+	if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, PAGE_SIZE, NULL, NULL) < 0)
+	    return NULL;
+    }
+    chipavail -= size;
+#ifdef DEBUG
+    printk("amiga_chip_alloc_res: returning %lx\n", res->start);
+#endif
+    return (void *)ZTWO_VADDR(res->start);
 }
 
 void amiga_chip_free(void *ptr)
 {
-	unsigned long start = ZTWO_PADDR(ptr);
-	struct resource *res;
-	unsigned long size;
-
-	res = lookup_resource(&chipram_res, start);
-	if (!res) {
-		pr_err("amiga_chip_free: trying to free nonexistent region at "
-		       "%p\n", ptr);
-		return;
-	}
-
-	size = resource_size(res);
-	pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr);
-	atomic_add(size, &chipavail);
-	release_resource(res);
+    unsigned long start = ZTWO_PADDR(ptr);
+    struct resource **p, *res;
+    unsigned long size;
+
+    for (p = &chipram_res.child; (res = *p); p = &res->sibling) {
+	if (res->start != start)
+	    continue;
+	*p = res->sibling;
+	size = res->end-start;
+#ifdef DEBUG
+	printk("amiga_chip_free: free %ld bytes at %p\n", size, ptr);
+#endif
+	chipavail += size;
 	kfree(res);
+	return;
+    }
+    printk("amiga_chip_free: trying to free nonexistent region at %p\n", ptr);
 }
 EXPORT_SYMBOL(amiga_chip_free);
 
 
 unsigned long amiga_chip_avail(void)
 {
-	unsigned long n = atomic_read(&chipavail);
-
-	pr_debug("amiga_chip_avail : %lu bytes\n", n);
-	return n;
+#ifdef DEBUG
+	printk("amiga_chip_avail : %ld bytes\n", chipavail);
+#endif
+	return chipavail;
 }
 EXPORT_SYMBOL(amiga_chip_avail);