QE/CPM: move muram management functions to qe_common
authorZhao Qiang <qiang.zhao@freescale.com>
Mon, 30 Nov 2015 02:48:55 +0000 (10:48 +0800)
committerScott Wood <scottwood@freescale.com>
Tue, 22 Dec 2015 23:10:18 +0000 (17:10 -0600)
QE and CPM have the same muram, they use the same management
functions. Now QE support both ARM and PowerPC, it is necessary
to move QE to "driver/soc", so move the muram management functions
from cpm_common to qe_common for preparing to move QE code to "driver/soc"

Signed-off-by: Zhao Qiang <qiang.zhao@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
arch/powerpc/include/asm/cpm.h
arch/powerpc/include/asm/qe.h
arch/powerpc/sysdev/Makefile
arch/powerpc/sysdev/cpm_common.c
arch/powerpc/sysdev/qe_lib/Makefile
arch/powerpc/sysdev/qe_lib/qe_common.c [new file with mode: 0644]

index 46e86b50abf30ebc781912f10765d370d50bc6dc..0958028cf31a06dad44e40c423a55441a89d23fc 100644 (file)
@@ -2,10 +2,10 @@
 #define __CPM_H
 
 #include <linux/compiler.h>
-#include <linux/genalloc.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/of.h>
+#include <asm/qe.h>
 
 /*
  * SPI Parameter RAM common to QE and CPM.
@@ -156,51 +156,6 @@ typedef struct cpm_buf_desc {
  */
 #define BD_I2C_START           (0x0400)
 
-int cpm_muram_init(void);
-
-#if defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE)
-unsigned long cpm_muram_alloc(unsigned long size, unsigned long align);
-int cpm_muram_free(unsigned long offset);
-unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
-unsigned long cpm_muram_alloc_common(unsigned long size, genpool_algo_t algo,
-                                    void *data);
-void __iomem *cpm_muram_addr(unsigned long offset);
-unsigned long cpm_muram_offset(void __iomem *addr);
-dma_addr_t cpm_muram_dma(void __iomem *addr);
-#else
-static inline unsigned long cpm_muram_alloc(unsigned long size,
-                                           unsigned long align)
-{
-       return -ENOSYS;
-}
-
-static inline int cpm_muram_free(unsigned long offset)
-{
-       return -ENOSYS;
-}
-
-static inline unsigned long cpm_muram_alloc_fixed(unsigned long offset,
-                                                 unsigned long size)
-{
-       return -ENOSYS;
-}
-
-static inline void __iomem *cpm_muram_addr(unsigned long offset)
-{
-       return NULL;
-}
-
-static inline unsigned long cpm_muram_offset(void __iomem *addr)
-{
-       return -ENOSYS;
-}
-
-static inline dma_addr_t cpm_muram_dma(void __iomem *addr)
-{
-       return 0;
-}
-#endif /* defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE) */
-
 #ifdef CONFIG_CPM
 int cpm_command(u32 command, u8 opcode);
 #else
index 32b9bfa0c9bd39a3b17083afe4eda86dfbd34057..ceeaf91854b5608bbc62c2b8015d9ca351f19939 100644 (file)
 #define _ASM_POWERPC_QE_H
 #ifdef __KERNEL__
 
+#include <linux/compiler.h>
+#include <linux/genalloc.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/err.h>
 #include <asm/cpm.h>
 #include <asm/immap_qe.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/types.h>
 
 #define QE_NUM_OF_SNUM 256     /* There are 256 serial number in QE */
 #define QE_NUM_OF_BRGS 16
@@ -92,6 +97,51 @@ extern void qe_reset(void);
 static inline void qe_reset(void) {}
 #endif
 
+int cpm_muram_init(void);
+
+#if defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE)
+unsigned long cpm_muram_alloc(unsigned long size, unsigned long align);
+int cpm_muram_free(unsigned long offset);
+unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
+unsigned long cpm_muram_alloc_common(unsigned long size, genpool_algo_t algo,
+                                    void *data);
+void __iomem *cpm_muram_addr(unsigned long offset);
+unsigned long cpm_muram_offset(void __iomem *addr);
+dma_addr_t cpm_muram_dma(void __iomem *addr);
+#else
+static inline unsigned long cpm_muram_alloc(unsigned long size,
+                                           unsigned long align)
+{
+       return -ENOSYS;
+}
+
+static inline int cpm_muram_free(unsigned long offset)
+{
+       return -ENOSYS;
+}
+
+static inline unsigned long cpm_muram_alloc_fixed(unsigned long offset,
+                                                 unsigned long size)
+{
+       return -ENOSYS;
+}
+
+static inline void __iomem *cpm_muram_addr(unsigned long offset)
+{
+       return NULL;
+}
+
+static inline unsigned long cpm_muram_offset(void __iomem *addr)
+{
+       return -ENOSYS;
+}
+
+static inline dma_addr_t cpm_muram_dma(void __iomem *addr)
+{
+       return 0;
+}
+#endif /* defined(CONFIG_CPM) || defined(CONFIG_QUICC_ENGINE) */
+
 /* QE PIO */
 #define QE_PIO_PINS 32
 
index 5b492a6438ffa8723ca9e78feaa17d92bff57da2..f1d47498ddf24db8be814a71c9f17a63f0c25a6f 100644 (file)
@@ -27,6 +27,7 @@ obj-$(CONFIG_SIMPLE_GPIO)     += simple_gpio.o
 obj-$(CONFIG_FSL_RIO)          += fsl_rio.o fsl_rmu.o
 obj-$(CONFIG_TSI108_BRIDGE)    += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)     += qe_lib/
+obj-$(CONFIG_CPM)              += qe_lib/
 mv64x60-$(CONFIG_PCI)          += mv64x60_pci.o
 obj-$(CONFIG_MV64X60)          += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \
                                   mv64x60_udbg.o
index fcc83cd9cc2f97d2a5f4d87c9dd55681a6931e4d..6993aa8e72427799b5eac6f1b0e5016b45573111 100644 (file)
@@ -17,7 +17,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/genalloc.h>
 #include <linux/init.h>
 #include <linux/of_device.h>
 #include <linux/spinlock.h>
@@ -29,6 +28,7 @@
 #include <asm/udbg.h>
 #include <asm/io.h>
 #include <asm/cpm.h>
+#include <asm/qe.h>
 
 #include <mm/mmu_decl.h>
 
@@ -65,212 +65,6 @@ void __init udbg_init_cpm(void)
 }
 #endif
 
-static struct gen_pool *muram_pool;
-static spinlock_t cpm_muram_lock;
-static u8 __iomem *muram_vbase;
-static phys_addr_t muram_pbase;
-
-struct muram_block {
-       struct list_head head;
-       unsigned long start;
-       int size;
-};
-
-static LIST_HEAD(muram_block_list);
-
-/* max address size we deal with */
-#define OF_MAX_ADDR_CELLS      4
-#define GENPOOL_OFFSET         (4096 * 8)
-
-int cpm_muram_init(void)
-{
-       struct device_node *np;
-       struct resource r;
-       u32 zero[OF_MAX_ADDR_CELLS] = {};
-       resource_size_t max = 0;
-       int i = 0;
-       int ret = 0;
-
-       if (muram_pbase)
-               return 0;
-
-       spin_lock_init(&cpm_muram_lock);
-       np = of_find_compatible_node(NULL, NULL, "fsl,cpm-muram-data");
-       if (!np) {
-               /* try legacy bindings */
-               np = of_find_node_by_name(NULL, "data-only");
-               if (!np) {
-                       pr_err("Cannot find CPM muram data node");
-                       ret = -ENODEV;
-                       goto out_muram;
-               }
-       }
-
-       muram_pool = gen_pool_create(0, -1);
-       muram_pbase = of_translate_address(np, zero);
-       if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
-               pr_err("Cannot translate zero through CPM muram node");
-               ret = -ENODEV;
-               goto out_pool;
-       }
-
-       while (of_address_to_resource(np, i++, &r) == 0) {
-               if (r.end > max)
-                       max = r.end;
-               ret = gen_pool_add(muram_pool, r.start - muram_pbase +
-                                  GENPOOL_OFFSET, resource_size(&r), -1);
-               if (ret) {
-                       pr_err("QE: couldn't add muram to pool!\n");
-                       goto out_pool;
-               }
-       }
-
-       muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
-       if (!muram_vbase) {
-               pr_err("Cannot map QE muram");
-               ret = -ENOMEM;
-               goto out_pool;
-       }
-       goto out_muram;
-out_pool:
-       gen_pool_destroy(muram_pool);
-out_muram:
-       of_node_put(np);
-       return ret;
-}
-
-/*
- * cpm_muram_alloc - allocate the requested size worth of multi-user ram
- * @size: number of bytes to allocate
- * @align: requested alignment, in bytes
- *
- * This function returns an offset into the muram area.
- * Use cpm_dpram_addr() to get the virtual address of the area.
- * Use cpm_muram_free() to free the allocation.
- */
-unsigned long cpm_muram_alloc(unsigned long size, unsigned long align)
-{
-       unsigned long start;
-       unsigned long flags;
-       struct genpool_data_align muram_pool_data;
-
-       spin_lock_irqsave(&cpm_muram_lock, flags);
-       muram_pool_data.align = align;
-       start = cpm_muram_alloc_common(size, gen_pool_first_fit_align,
-                                      &muram_pool_data);
-       spin_unlock_irqrestore(&cpm_muram_lock, flags);
-       return start;
-}
-EXPORT_SYMBOL(cpm_muram_alloc);
-
-/**
- * cpm_muram_free - free a chunk of multi-user ram
- * @offset: The beginning of the chunk as returned by cpm_muram_alloc().
- */
-int cpm_muram_free(unsigned long offset)
-{
-       unsigned long flags;
-       int size;
-       struct muram_block *tmp;
-
-       size = 0;
-       spin_lock_irqsave(&cpm_muram_lock, flags);
-       list_for_each_entry(tmp, &muram_block_list, head) {
-               if (tmp->start == offset) {
-                       size = tmp->size;
-                       list_del(&tmp->head);
-                       kfree(tmp);
-                       break;
-               }
-       }
-       gen_pool_free(muram_pool, offset + GENPOOL_OFFSET, size);
-       spin_unlock_irqrestore(&cpm_muram_lock, flags);
-       return size;
-}
-EXPORT_SYMBOL(cpm_muram_free);
-
-/*
- * cpm_muram_alloc_fixed - reserve a specific region of multi-user ram
- * @offset: offset of allocation start address
- * @size: number of bytes to allocate
- * This function returns an offset into the muram area
- * Use cpm_dpram_addr() to get the virtual address of the area.
- * Use cpm_muram_free() to free the allocation.
- */
-unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size)
-{
-       unsigned long start;
-       unsigned long flags;
-       struct genpool_data_fixed muram_pool_data_fixed;
-
-       spin_lock_irqsave(&cpm_muram_lock, flags);
-       muram_pool_data_fixed.offset = offset + GENPOOL_OFFSET;
-       start = cpm_muram_alloc_common(size, gen_pool_fixed_alloc,
-                                      &muram_pool_data_fixed);
-       spin_unlock_irqrestore(&cpm_muram_lock, flags);
-       return start;
-}
-EXPORT_SYMBOL(cpm_muram_alloc_fixed);
-
-/*
- * cpm_muram_alloc_common - cpm_muram_alloc common code
- * @size: number of bytes to allocate
- * @algo: algorithm for alloc.
- * @data: data for genalloc's algorithm.
- *
- * This function returns an offset into the muram area.
- */
-unsigned long cpm_muram_alloc_common(unsigned long size, genpool_algo_t algo,
-                                    void *data)
-{
-       struct muram_block *entry;
-       unsigned long start;
-
-       start = gen_pool_alloc_algo(muram_pool, size, algo, data);
-       if (!start)
-               goto out2;
-       start = start - GENPOOL_OFFSET;
-       memset_io(cpm_muram_addr(start), 0, size);
-       entry = kmalloc(sizeof(*entry), GFP_KERNEL);
-       if (!entry)
-               goto out1;
-       entry->start = start;
-       entry->size = size;
-       list_add(&entry->head, &muram_block_list);
-
-       return start;
-out1:
-       gen_pool_free(muram_pool, start, size);
-out2:
-       return (unsigned long)-ENOMEM;
-}
-
-/**
- * cpm_muram_addr - turn a muram offset into a virtual address
- * @offset: muram offset to convert
- */
-void __iomem *cpm_muram_addr(unsigned long offset)
-{
-       return muram_vbase + offset;
-}
-EXPORT_SYMBOL(cpm_muram_addr);
-
-unsigned long cpm_muram_offset(void __iomem *addr)
-{
-       return addr - (void __iomem *)muram_vbase;
-}
-EXPORT_SYMBOL(cpm_muram_offset);
-
-/**
- * cpm_muram_dma - turn a muram virtual address into a DMA address
- * @offset: virtual address from cpm_muram_addr() to convert
- */
-dma_addr_t cpm_muram_dma(void __iomem *addr)
-{
-       return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
-}
-EXPORT_SYMBOL(cpm_muram_dma);
-
 #if defined(CONFIG_CPM2) || defined(CONFIG_8xx_GPIO)
 
 struct cpm2_ioports {
index f1855c185291aa923b02dff0b668ae2e061c8f34..ffac5410c5c7fef25bc7bf00e36fe7e96699848c 100644 (file)
@@ -1,8 +1,8 @@
 #
 # Makefile for the linux ppc-specific parts of QE
 #
-obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_ic.o qe_io.o
-
+obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_common.o qe_ic.o qe_io.o
+obj-$(CONFIG_CPM)      += qe_common.o
 obj-$(CONFIG_UCC)      += ucc.o
 obj-$(CONFIG_UCC_SLOW) += ucc_slow.o
 obj-$(CONFIG_UCC_FAST) += ucc_fast.o
diff --git a/arch/powerpc/sysdev/qe_lib/qe_common.c b/arch/powerpc/sysdev/qe_lib/qe_common.c
new file mode 100644 (file)
index 0000000..b90043f
--- /dev/null
@@ -0,0 +1,235 @@
+/*
+ * Common CPM code
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright 2007-2008,2010 Freescale Semiconductor, Inc.
+ *
+ * Some parts derived from commproc.c/cpm2_common.c, which is:
+ * Copyright (c) 1997 Dan error_act (dmalek@jlc.net)
+ * Copyright (c) 1999-2001 Dan Malek <dan@embeddedalley.com>
+ * Copyright (c) 2000 MontaVista Software, Inc (source@mvista.com)
+ * 2006 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ */
+#include <linux/genalloc.h>
+#include <linux/init.h>
+#include <linux/list.h>
+#include <linux/of_device.h>
+#include <linux/spinlock.h>
+#include <linux/export.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <asm/qe.h>
+
+static struct gen_pool *muram_pool;
+static spinlock_t cpm_muram_lock;
+static u8 __iomem *muram_vbase;
+static phys_addr_t muram_pbase;
+
+struct muram_block {
+       struct list_head head;
+       unsigned long start;
+       int size;
+};
+
+static LIST_HEAD(muram_block_list);
+
+/* max address size we deal with */
+#define OF_MAX_ADDR_CELLS      4
+#define GENPOOL_OFFSET         (4096 * 8)
+
+int cpm_muram_init(void)
+{
+       struct device_node *np;
+       struct resource r;
+       u32 zero[OF_MAX_ADDR_CELLS] = {};
+       resource_size_t max = 0;
+       int i = 0;
+       int ret = 0;
+
+       if (muram_pbase)
+               return 0;
+
+       spin_lock_init(&cpm_muram_lock);
+       np = of_find_compatible_node(NULL, NULL, "fsl,cpm-muram-data");
+       if (!np) {
+               /* try legacy bindings */
+               np = of_find_node_by_name(NULL, "data-only");
+               if (!np) {
+                       pr_err("Cannot find CPM muram data node");
+                       ret = -ENODEV;
+                       goto out_muram;
+               }
+       }
+
+       muram_pool = gen_pool_create(0, -1);
+       muram_pbase = of_translate_address(np, zero);
+       if (muram_pbase == (phys_addr_t)OF_BAD_ADDR) {
+               pr_err("Cannot translate zero through CPM muram node");
+               ret = -ENODEV;
+               goto out_pool;
+       }
+
+       while (of_address_to_resource(np, i++, &r) == 0) {
+               if (r.end > max)
+                       max = r.end;
+               ret = gen_pool_add(muram_pool, r.start - muram_pbase +
+                                  GENPOOL_OFFSET, resource_size(&r), -1);
+               if (ret) {
+                       pr_err("QE: couldn't add muram to pool!\n");
+                       goto out_pool;
+               }
+       }
+
+       muram_vbase = ioremap(muram_pbase, max - muram_pbase + 1);
+       if (!muram_vbase) {
+               pr_err("Cannot map QE muram");
+               ret = -ENOMEM;
+               goto out_pool;
+       }
+       goto out_muram;
+out_pool:
+       gen_pool_destroy(muram_pool);
+out_muram:
+       of_node_put(np);
+       return ret;
+}
+
+/*
+ * cpm_muram_alloc - allocate the requested size worth of multi-user ram
+ * @size: number of bytes to allocate
+ * @align: requested alignment, in bytes
+ *
+ * This function returns an offset into the muram area.
+ * Use cpm_dpram_addr() to get the virtual address of the area.
+ * Use cpm_muram_free() to free the allocation.
+ */
+unsigned long cpm_muram_alloc(unsigned long size, unsigned long align)
+{
+       unsigned long start;
+       unsigned long flags;
+       struct genpool_data_align muram_pool_data;
+
+       spin_lock_irqsave(&cpm_muram_lock, flags);
+       muram_pool_data.align = align;
+       start = cpm_muram_alloc_common(size, gen_pool_first_fit_align,
+                                      &muram_pool_data);
+       spin_unlock_irqrestore(&cpm_muram_lock, flags);
+       return start;
+}
+EXPORT_SYMBOL(cpm_muram_alloc);
+
+/**
+ * cpm_muram_free - free a chunk of multi-user ram
+ * @offset: The beginning of the chunk as returned by cpm_muram_alloc().
+ */
+int cpm_muram_free(unsigned long offset)
+{
+       unsigned long flags;
+       int size;
+       struct muram_block *tmp;
+
+       size = 0;
+       spin_lock_irqsave(&cpm_muram_lock, flags);
+       list_for_each_entry(tmp, &muram_block_list, head) {
+               if (tmp->start == offset) {
+                       size = tmp->size;
+                       list_del(&tmp->head);
+                       kfree(tmp);
+                       break;
+               }
+       }
+       gen_pool_free(muram_pool, offset + GENPOOL_OFFSET, size);
+       spin_unlock_irqrestore(&cpm_muram_lock, flags);
+       return size;
+}
+EXPORT_SYMBOL(cpm_muram_free);
+
+/*
+ * cpm_muram_alloc_fixed - reserve a specific region of multi-user ram
+ * @offset: offset of allocation start address
+ * @size: number of bytes to allocate
+ * This function returns an offset into the muram area
+ * Use cpm_dpram_addr() to get the virtual address of the area.
+ * Use cpm_muram_free() to free the allocation.
+ */
+unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size)
+{
+       unsigned long start;
+       unsigned long flags;
+       struct genpool_data_fixed muram_pool_data_fixed;
+
+       spin_lock_irqsave(&cpm_muram_lock, flags);
+       muram_pool_data_fixed.offset = offset + GENPOOL_OFFSET;
+       start = cpm_muram_alloc_common(size, gen_pool_fixed_alloc,
+                                      &muram_pool_data_fixed);
+       spin_unlock_irqrestore(&cpm_muram_lock, flags);
+       return start;
+}
+EXPORT_SYMBOL(cpm_muram_alloc_fixed);
+
+/*
+ * cpm_muram_alloc_common - cpm_muram_alloc common code
+ * @size: number of bytes to allocate
+ * @algo: algorithm for alloc.
+ * @data: data for genalloc's algorithm.
+ *
+ * This function returns an offset into the muram area.
+ */
+unsigned long cpm_muram_alloc_common(unsigned long size, genpool_algo_t algo,
+                                    void *data)
+{
+       struct muram_block *entry;
+       unsigned long start;
+
+       start = gen_pool_alloc_algo(muram_pool, size, algo, data);
+       if (!start)
+               goto out2;
+       start = start - GENPOOL_OFFSET;
+       memset_io(cpm_muram_addr(start), 0, size);
+       entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+       if (!entry)
+               goto out1;
+       entry->start = start;
+       entry->size = size;
+       list_add(&entry->head, &muram_block_list);
+
+       return start;
+out1:
+       gen_pool_free(muram_pool, start, size);
+out2:
+       return (unsigned long)-ENOMEM;
+}
+
+/**
+ * cpm_muram_addr - turn a muram offset into a virtual address
+ * @offset: muram offset to convert
+ */
+void __iomem *cpm_muram_addr(unsigned long offset)
+{
+       return muram_vbase + offset;
+}
+EXPORT_SYMBOL(cpm_muram_addr);
+
+unsigned long cpm_muram_offset(void __iomem *addr)
+{
+       return addr - (void __iomem *)muram_vbase;
+}
+EXPORT_SYMBOL(cpm_muram_offset);
+
+/**
+ * cpm_muram_dma - turn a muram virtual address into a DMA address
+ * @offset: virtual address from cpm_muram_addr() to convert
+ */
+dma_addr_t cpm_muram_dma(void __iomem *addr)
+{
+       return muram_pbase + ((u8 __iomem *)addr - muram_vbase);
+}
+EXPORT_SYMBOL(cpm_muram_dma);