ASoC: SOF: core: modify the signature for snd_sof_create_page_table

Modify the signature for snd_sof_create_page_table to
take struct device pointer as an argument instead of
struct snd_sof_dev as this will be used by both the SOF
core device and its clients. Also, move the definition
out of core.c to utils.c.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191204211556.12671-6-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
index 805918d3bcc09df6b68fa3626ef46dcbd3496758..6a7f342203e93b6ebdc9eba46a0905921c1b3f57 100644 (file)
--- a/sound/soc/sof/core.c
+++ b/sound/soc/sof/core.c
@@ -10,7 +10,6 @@
 
 #include <linux/firmware.h>
 #include <linux/module.h>
-#include <asm/unaligned.h>
 #include <sound/soc.h>
 #include <sound/sof.h>
 #include "sof-priv.h"
@@ -213,64 +212,6 @@ out:
 }
 EXPORT_SYMBOL(snd_sof_get_status);
 
-/*
- * Generic buffer page table creation.
- * Take the each physical page address and drop the least significant unused
- * bits from each (based on PAGE_SIZE). Then pack valid page address bits
- * into compressed page table.
- */
-
-int snd_sof_create_page_table(struct snd_sof_dev *sdev,
-                             struct snd_dma_buffer *dmab,
-                             unsigned char *page_table, size_t size)
-{
-       int i, pages;
-
-       pages = snd_sgbuf_aligned_pages(size);
-
-       dev_dbg(sdev->dev, "generating page table for %p size 0x%zx pages %d\n",
-               dmab->area, size, pages);
-
-       for (i = 0; i < pages; i++) {
-               /*
-                * The number of valid address bits for each page is 20.
-                * idx determines the byte position within page_table
-                * where the current page's address is stored
-                * in the compressed page_table.
-                * This can be calculated by multiplying the page number by 2.5.
-                */
-               u32 idx = (5 * i) >> 1;
-               u32 pfn = snd_sgbuf_get_addr(dmab, i * PAGE_SIZE) >> PAGE_SHIFT;
-               u8 *pg_table;
-
-               dev_vdbg(sdev->dev, "pfn i %i idx %d pfn %x\n", i, idx, pfn);
-
-               pg_table = (u8 *)(page_table + idx);
-
-               /*
-                * pagetable compression:
-                * byte 0     byte 1     byte 2     byte 3     byte 4     byte 5
-                * ___________pfn 0__________ __________pfn 1___________  _pfn 2...
-                * .... ....  .... ....  .... ....  .... ....  .... ....  ....
-                * It is created by:
-                * 1. set current location to 0, PFN index i to 0
-                * 2. put pfn[i] at current location in Little Endian byte order
-                * 3. calculate an intermediate value as
-                *    x = (pfn[i+1] << 4) | (pfn[i] & 0xf)
-                * 4. put x at offset (current location + 2) in LE byte order
-                * 5. increment current location by 5 bytes, increment i by 2
-                * 6. continue to (2)
-                */
-               if (i & 1)
-                       put_unaligned_le32((pg_table[0] & 0xf) | pfn << 4,
-                                          pg_table);
-               else
-                       put_unaligned_le32(pfn, pg_table);
-       }
-
-       return pages;
-}
-
 /*
  * SOF Driver enumeration.
  */

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 549238a98b2ab5bda27d411ecd2de67bd427c24c..9fd73ef08904c31c9fe2ded5d0ce6050ca898939 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -33,7 +33,7 @@ static int create_page_table(struct snd_soc_component *component,
        if (!spcm)
                return -EINVAL;
 
-       return snd_sof_create_page_table(sdev, dmab,
+       return snd_sof_create_page_table(sdev->dev, dmab,
                spcm->stream[stream].page_table.area, size);
 }
 

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index 31f0eb31598a46952dccfee9d20b346a9adcc17d..18dd832f2053a84a059c1bc6edb494940bb2a204 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -499,7 +499,7 @@ int snd_sof_set_d0_substate(struct snd_sof_dev *sdev,
 
 void snd_sof_new_platform_drv(struct snd_sof_dev *sdev);
 
-int snd_sof_create_page_table(struct snd_sof_dev *sdev,
+int snd_sof_create_page_table(struct device *dev,
                              struct snd_dma_buffer *dmab,
                              unsigned char *page_table, size_t size);
 

diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c
index b0e4556c8536a3487719e2c242a7e6a37828c76f..4bb65030819d314684f0b346a329b2cbd85f85c4 100644 (file)
--- a/sound/soc/sof/trace.c
+++ b/sound/soc/sof/trace.c
@@ -250,8 +250,8 @@ int snd_sof_init_trace(struct snd_sof_dev *sdev)
        }
 
        /* create compressed page table for audio firmware */
-       ret = snd_sof_create_page_table(sdev, &sdev->dmatb, sdev->dmatp.area,
-                                       sdev->dmatb.bytes);
+       ret = snd_sof_create_page_table(sdev->dev, &sdev->dmatb,
+                                       sdev->dmatp.area, sdev->dmatb.bytes);
        if (ret < 0)
                goto table_err;
 

diff --git a/sound/soc/sof/utils.c b/sound/soc/sof/utils.c
index 2ac4c3da03206d4ed614630d19bebfb72e18714d..9831eb57df6ce017f6a34f3544aeec4dda7d62e3 100644 (file)
--- a/sound/soc/sof/utils.c
+++ b/sound/soc/sof/utils.c
@@ -10,6 +10,7 @@
 
 #include <linux/io-64-nonatomic-lo-hi.h>
 #include <linux/platform_device.h>
+#include <asm/unaligned.h>
 #include <sound/soc.h>
 #include <sound/sof.h>
 #include "sof-priv.h"
@@ -110,3 +111,62 @@ void sof_block_read(struct snd_sof_dev *sdev, u32 bar, u32 offset, void *dest,
        memcpy_fromio(dest, src, size);
 }
 EXPORT_SYMBOL(sof_block_read);
+
+/*
+ * Generic buffer page table creation.
+ * Take the each physical page address and drop the least significant unused
+ * bits from each (based on PAGE_SIZE). Then pack valid page address bits
+ * into compressed page table.
+ */
+
+int snd_sof_create_page_table(struct device *dev,
+                             struct snd_dma_buffer *dmab,
+                             unsigned char *page_table, size_t size)
+{
+       int i, pages;
+
+       pages = snd_sgbuf_aligned_pages(size);
+
+       dev_dbg(dev, "generating page table for %p size 0x%zx pages %d\n",
+               dmab->area, size, pages);
+
+       for (i = 0; i < pages; i++) {
+               /*
+                * The number of valid address bits for each page is 20.
+                * idx determines the byte position within page_table
+                * where the current page's address is stored
+                * in the compressed page_table.
+                * This can be calculated by multiplying the page number by 2.5.
+                */
+               u32 idx = (5 * i) >> 1;
+               u32 pfn = snd_sgbuf_get_addr(dmab, i * PAGE_SIZE) >> PAGE_SHIFT;
+               u8 *pg_table;
+
+               dev_vdbg(dev, "pfn i %i idx %d pfn %x\n", i, idx, pfn);
+
+               pg_table = (u8 *)(page_table + idx);
+
+               /*
+                * pagetable compression:
+                * byte 0     byte 1     byte 2     byte 3     byte 4     byte 5
+                * ___________pfn 0__________ __________pfn 1___________  _pfn 2...
+                * .... ....  .... ....  .... ....  .... ....  .... ....  ....
+                * It is created by:
+                * 1. set current location to 0, PFN index i to 0
+                * 2. put pfn[i] at current location in Little Endian byte order
+                * 3. calculate an intermediate value as
+                *    x = (pfn[i+1] << 4) | (pfn[i] & 0xf)
+                * 4. put x at offset (current location + 2) in LE byte order
+                * 5. increment current location by 5 bytes, increment i by 2
+                * 6. continue to (2)
+                */
+               if (i & 1)
+                       put_unaligned_le32((pg_table[0] & 0xf) | pfn << 4,
+                                          pg_table);
+               else
+                       put_unaligned_le32(pfn, pg_table);
+       }
+
+       return pages;
+}
+EXPORT_SYMBOL(snd_sof_create_page_table);