Changeset 351 for GPL/branches

Timestamp:

Apr 21, 2008, 11:41:48 AM (17 years ago)

Author:

Paul Smedley

Message:

Add fixes for Via 823x chipsets

Location:

GPL/branches/uniaud32-2.0

Files:

• alsa-kernel/core/memalloc.c (modified) (3 diffs)
• alsa-kernel/core/sgbuf.c (modified) (4 diffs)
• alsa-kernel/core/sound_oss.c (modified) (1 diff)
• alsa-kernel/include/sound/config.h (modified) (2 diffs)
• alsa-kernel/include/sound/core.h (modified) (1 diff)
• alsa-kernel/pci/via82xx.c (modified) (1 diff)
• include/linux/sched.h (modified) (1 diff)

GPL/branches/uniaud32-2.0/alsa-kernel/core/memalloc.c

@@ -250 +250 @@
 #ifdef CONFIG_HAS_DMA
 /* allocate the coherent DMA pages */
+#ifndef TARGET_OS2
 static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma)
+#else
+void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *dma)
+#endif
 {
         int pg;
@@ -271 +275 @@
 
 /* free the coherent DMA pages */
+#ifndef TARGET_OS2
 static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
+#else
+void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
+#endif
                                dma_addr_t dma)
 {
@@ -340 +348 @@
                         struct snd_dma_buffer *dmab)
 {
+#ifdef DEBUG
+    dprintf(("snd_dma_alloc_pages with size = %d",size));
+#endif
         snd_assert(size > 0, return -ENXIO);
         snd_assert(dmab != NULL, return -ENXIO);

GPL/branches/uniaud32-2.0/alsa-kernel/core/sgbuf.c

@@ -33 +33 @@
 #define sgbuf_align_table(tbl)  ALIGN((tbl), SGBUF_TBL_ALIGN)
 
+#ifndef TARGET_OS2
 int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
 {
@@ -63 +64 @@
         return 0;
 }
+#else
+/* base this fn on the one in Uniaud 1.1.4 */
+int snd_free_sgbuf_pages(struct snd_dma_buffer *dmab)
+{
+        struct snd_sg_buf *sgbuf = dmab->private_data;
+
+        sgbuf_shrink(sgbuf, 0);
+        if (sgbuf->table)
+                kfree(sgbuf->table);
+        sgbuf->table = NULL;
+        if (sgbuf->page_table)
+                kfree(sgbuf->page_table);
+        kfree(sgbuf);
+        dmab->private_data = NULL;
+        
+        return 0;
+}
+
+/*
+ * shrink to the given pages.
+ * free the unused pages
+ */
+static void sgbuf_shrink(struct snd_sg_buf *sgbuf, int pages)
+{
+        snd_assert(sgbuf, return);
+        if (! sgbuf->table)
+                return;
+        while (sgbuf->pages > pages) {
+                sgbuf->pages--;
+                snd_free_dev_pages(sgbuf->dev, PAGE_SIZE,
+                                   sgbuf->table[sgbuf->pages].buf,
+                                   sgbuf->table[sgbuf->pages].addr);
+        }
+}
+#endif
 
 void *snd_malloc_sgbuf_pages(struct device *device,
@@ -71 +107 @@
         unsigned int i, pages;
         struct snd_dma_buffer tmpb;
+#ifdef TARGET_OS2
+        void *ptr;
+        dma_addr_t addr;
+#endif
+
+#ifdef DEBUG
+        dprintf(("snd_malloc_sgbuf_pages. size %x",size));
+#endif
 
         dmab->area = NULL;
         dmab->addr = 0;
         dmab->private_data = sgbuf = kzalloc(sizeof(*sgbuf), GFP_KERNEL);
-        if (! sgbuf)
+        if (! sgbuf) {
+#ifdef DEBUG
+                dprintf(("snd_malloc_sgbuf_pages failed: error allocating sgbuf"));
+#endif
                 return NULL;
+        }
         sgbuf->dev = device;
         pages = snd_sgbuf_aligned_pages(size);
         sgbuf->tblsize = sgbuf_align_table(pages);
         sgbuf->table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->table), GFP_KERNEL);
-        if (! sgbuf->table)
+        if (! sgbuf->table) {
+#ifdef DEBUG
+                dprintf(("snd_malloc_sgbuf_pages failed: error allocating sgbuf->table"));
+#endif
                 goto _failed;
+        }
         sgbuf->page_table = kcalloc(sgbuf->tblsize, sizeof(*sgbuf->page_table), GFP_KERNEL);
-        if (! sgbuf->page_table)
+        if (! sgbuf->page_table) {
+#ifdef DEBUG
+                dprintf(("snd_malloc_sgbuf_pages failed: error allocating sgbuf->page_table"));
+#endif
                 goto _failed;
+        }
 
+#ifdef DEBUG
+            dprintf(("allocating %d pages",pages));
+#endif
+#ifndef TARGET_OS2
         /* allocate each page */
         for (i = 0; i < pages; i++) {
@@ -107 +167 @@
         if (! dmab->area)
                 goto _failed;
+#else
+            ptr = snd_malloc_dev_pages(sgbuf->dev, size, &addr);
+            if (! ptr)
+                goto _failed;
+
+            /* allocate each page */
+            while (sgbuf->pages < pages) {
+                mem_map_t *page;
+
+                sgbuf->table[sgbuf->pages].buf = (char*)ptr + PAGE_SIZE*sgbuf->pages;
+                sgbuf->table[sgbuf->pages].addr = addr + PAGE_SIZE*sgbuf->pages;
+                page = (mem_map_t *)virt_to_page((int)sgbuf->table[sgbuf->pages].buf);
+                sgbuf->page_table[sgbuf->pages] = page;
+                SetPageReserved(page);
+                sgbuf->pages++;
+            }
+
+            memset(ptr,0,size);
+
+            dmab->area = ptr;
+            sgbuf->size = size;
+#endif
         return dmab->area;
 

GPL/branches/uniaud32-2.0/alsa-kernel/core/sound_oss.c

@@ -98 +98 @@
 
 int snd_register_oss_device(int type, struct snd_card *card, int dev,
+#ifndef TARGET_OS2
                             const struct file_operations *f_ops, void *private_data,
+#else
+                            struct file_operations *f_ops, void *private_data,
+#endif
                             const char *name)
 {

GPL/branches/uniaud32-2.0/alsa-kernel/include/sound/config.h

@@ -140 +140 @@
 #endif
 #ifndef virt_to_page
-//#define virt_to_page(x) (&mem_map[MAP_NR(x)])
+#define virt_to_page(x) (&mem_map[MAP_NR(x)])
 #endif
 #define snd_request_region request_region
@@ -298 +298 @@
 #define CONFIG_PM
 #define CONFIG_HAVE_PCI_DEV_PRESENT
+#define CONFIG_SND_DEBUG_DETECT
 #define CONFIG_SYSFS_DEPRECATED
 #undef interrupt

GPL/branches/uniaud32-2.0/alsa-kernel/include/sound/core.h

@@ -282 +282 @@
 #ifdef CONFIG_SND_OSSEMUL
 int snd_register_oss_device(int type, struct snd_card *card, int dev,
+#ifndef TARGET_OS2
                             const struct file_operations *f_ops, void *private_data,
+#else
+                            struct file_operations *f_ops, void *private_data,
+#endif
                             const char *name);
 int snd_unregister_oss_device(int type, struct snd_card *card, int dev);

GPL/branches/uniaud32-2.0/alsa-kernel/pci/via82xx.c

@@ -2406 +2406 @@
         w = snd_pci_quirk_lookup(pci, dxs_whitelist);
         if (w) {
-#ifndef TARGET_OS2
                 snd_printdd(KERN_INFO "via82xx: DXS white list for %s found\n",
                             w->name);
-#endif
                 return w->value;
         }

GPL/branches/uniaud32-2.0/include/linux/sched.h

@@ -5 +5 @@
 
 #include <asm/param.h>  /* for HZ */
+#include <asm/atomic.h> 
 
 #define TASK_RUNNING            0