New module which registers its memory allocation and free APIs to the sram_dynamic module, which would create a device of struct sram_device type to act as an interface for user level applications to access the backend hardware device, fsl_85xx_cache_sram, which is drived by the FSL_85XX_CACHE_SRAM module.
Signed-off-by: Wang Wenhu <wenhu.w...@vivo.com> Cc: Christophe Leroy <christophe.le...@c-s.fr> Cc: Scott Wood <o...@buserror.net> Cc: Michael Ellerman <m...@ellerman.id.au> Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: linuxppc-dev@lists.ozlabs.org --- Changes since v3: Addressed comments from Christophe * Move the module to drivers/soc/fsl/ directory * Minor changes of coding-style --- .../powerpc/include/asm/fsl_85xx_cache_sram.h | 17 ++++++++ arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h | 2 + arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 2 + arch/powerpc/sysdev/fsl_85xx_sram_uapi.c | 39 +++++++++++++++++++ drivers/soc/fsl/Kconfig | 12 ++++++ drivers/soc/fsl/Makefile | 1 + drivers/soc/fsl/fsl_85xx_sram.h | 13 +++++++ drivers/soc/fsl/fsl_85xx_sram_uapi.c | 39 +++++++++++++++++++ 8 files changed, 125 insertions(+) create mode 100644 arch/powerpc/sysdev/fsl_85xx_sram_uapi.c create mode 100644 drivers/soc/fsl/fsl_85xx_sram.h create mode 100644 drivers/soc/fsl/fsl_85xx_sram_uapi.c diff --git a/arch/powerpc/include/asm/fsl_85xx_cache_sram.h b/arch/powerpc/include/asm/fsl_85xx_cache_sram.h index 0235a0447baa..50fd6733c506 100644 --- a/arch/powerpc/include/asm/fsl_85xx_cache_sram.h +++ b/arch/powerpc/include/asm/fsl_85xx_cache_sram.h @@ -26,8 +26,25 @@ struct mpc85xx_cache_sram { unsigned int size; rh_info_t *rh; spinlock_t lock; + +#ifdef CONFIG_FSL_85XX_SRAM_UAPI + struct device *dev; +#endif }; +#ifdef CONFIG_FSL_85XX_SRAM_UAPI +static inline void set_cache_sram_dev(struct mpc85xx_cache_sram *sram, + struct device *dev) +{ + sram->dev = dev; +} +#else +static inline void set_cache_sram_dev(struct mpc85xx_cache_sram *sram, + struct device *dev) +{ +} +#endif + extern void mpc85xx_cache_sram_free(void *ptr); extern void *mpc85xx_cache_sram_alloc(unsigned int size, phys_addr_t *phys, unsigned int align); diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h b/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h index ce370749add9..beb855adcfec 100644 --- a/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h +++ b/arch/powerpc/sysdev/fsl_85xx_cache_ctlr.h @@ -10,6 +10,8 @@ #ifndef __FSL_85XX_CACHE_CTLR_H__ #define __FSL_85XX_CACHE_CTLR_H__ +#include <linux/platform_device.h> + #define L2CR_L2FI 0x40000000 /* L2 flash invalidate */ #define L2CR_L2IO 0x00200000 /* L2 instruction only */ #define L2CR_SRAM_ZERO 0x00000000 /* L2SRAM zero size */ diff --git a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c index 3de5ac8382c0..96d4a02b06fe 100644 --- a/arch/powerpc/sysdev/fsl_85xx_cache_sram.c +++ b/arch/powerpc/sysdev/fsl_85xx_cache_sram.c @@ -115,6 +115,8 @@ int instantiate_cache_sram(struct platform_device *dev, rh_attach_region(cache_sram->rh, 0, cache_sram->size); spin_lock_init(&cache_sram->lock); + set_cache_sram_dev(cache_sram, &dev->dev); + dev_info(&dev->dev, "[base:0x%llx, size:0x%x] configured and loaded\n", (unsigned long long)cache_sram->base_phys, cache_sram->size); diff --git a/arch/powerpc/sysdev/fsl_85xx_sram_uapi.c b/arch/powerpc/sysdev/fsl_85xx_sram_uapi.c new file mode 100644 index 000000000000..64fdf082d069 --- /dev/null +++ b/arch/powerpc/sysdev/fsl_85xx_sram_uapi.c @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2020 Vivo Communication Technology Co. Ltd. + * Copyright (C) 2020 Wang Wenhu <wenhu.w...@vivo.com> + * All rights reserved. + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/sram_dynamic.h> +#include <asm/fsl_85xx_cache_sram.h> +#include "fsl_85xx_sram.h" + +static struct sram_api mpc85xx_sram_api = { + .name = "mpc85xx_sram", + .alloc = mpc85xx_cache_sram_alloc, + .free = mpc85xx_cache_sram_free, +}; + +static int __init mpc85xx_sram_uapi_init(void) +{ + struct mpc85xx_cache_sram *sram = mpc85xx_get_cache_sram(); + + if (!sram) + return -ENODEV; + + return sram_register_device(sram->dev, &mpc85xx_sram_api); +} +subsys_initcall(mpc85xx_sram_uapi_init); + +static void __exit mpc85xx_sram_uapi_exit(void) +{ + sram_unregister_device(&mpc85xx_sram_api); +} +module_exit(mpc85xx_sram_uapi_exit); + +MODULE_AUTHOR("Wang Wenhu <wenhu.w...@vivo.com>"); +MODULE_DESCRIPTION("MPC85xx SRAM User-Space API Support"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig index 4df32bc4c7a6..ceeebb22f6d3 100644 --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig @@ -50,4 +50,16 @@ config FSL_RCPM tasks associated with power management, such as wakeup source control. Note that currently this driver will not support PowerPC based QorIQ processor. + +config FSL_85XX_SRAM_UAPI + tristate "Freescale MPC85xx SRAM UAPI Support" + depends on FSL_SOC_BOOKE && PPC32 + select FSL_85XX_CACHE_SRAM + select SRAM_DYNAMIC + help + This registers a device of struct sram_device type which would act as + an interface for user level applications to access the Freescale 85xx + Cache-SRAM memory dynamically, meaning allocate on demand dynamically + while they are running. + endmenu diff --git a/drivers/soc/fsl/Makefile b/drivers/soc/fsl/Makefile index 906f1cd8af01..716e38f75735 100644 --- a/drivers/soc/fsl/Makefile +++ b/drivers/soc/fsl/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_FSL_RCPM) += rcpm.o obj-$(CONFIG_FSL_GUTS) += guts.o obj-$(CONFIG_FSL_MC_DPIO) += dpio/ obj-$(CONFIG_DPAA2_CONSOLE) += dpaa2-console.o +obj-$(CONFIG_FSL_85XX_SRAM_UAPI) += fsl_85xx_sram_uapi.o diff --git a/drivers/soc/fsl/fsl_85xx_sram.h b/drivers/soc/fsl/fsl_85xx_sram.h new file mode 100644 index 000000000000..b3b88bf10538 --- /dev/null +++ b/drivers/soc/fsl/fsl_85xx_sram.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __FSL_85XX_SRAM_H__ +#define __FSL_85XX_SRAM_H__ + +extern struct mpc85xx_cache_sram *cache_sram; + +static inline struct mpc85xx_cache_sram *mpc85xx_get_cache_sram(void) +{ + return cache_sram; +} + +#endif /* __FSL_85XX_SRAM_H__ */ diff --git a/drivers/soc/fsl/fsl_85xx_sram_uapi.c b/drivers/soc/fsl/fsl_85xx_sram_uapi.c new file mode 100644 index 000000000000..64fdf082d069 --- /dev/null +++ b/drivers/soc/fsl/fsl_85xx_sram_uapi.c @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2020 Vivo Communication Technology Co. Ltd. + * Copyright (C) 2020 Wang Wenhu <wenhu.w...@vivo.com> + * All rights reserved. + */ + +#include <linux/module.h> +#include <linux/kernel.h> +#include <linux/sram_dynamic.h> +#include <asm/fsl_85xx_cache_sram.h> +#include "fsl_85xx_sram.h" + +static struct sram_api mpc85xx_sram_api = { + .name = "mpc85xx_sram", + .alloc = mpc85xx_cache_sram_alloc, + .free = mpc85xx_cache_sram_free, +}; + +static int __init mpc85xx_sram_uapi_init(void) +{ + struct mpc85xx_cache_sram *sram = mpc85xx_get_cache_sram(); + + if (!sram) + return -ENODEV; + + return sram_register_device(sram->dev, &mpc85xx_sram_api); +} +subsys_initcall(mpc85xx_sram_uapi_init); + +static void __exit mpc85xx_sram_uapi_exit(void) +{ + sram_unregister_device(&mpc85xx_sram_api); +} +module_exit(mpc85xx_sram_uapi_exit); + +MODULE_AUTHOR("Wang Wenhu <wenhu.w...@vivo.com>"); +MODULE_DESCRIPTION("MPC85xx SRAM User-Space API Support"); +MODULE_LICENSE("GPL v2"); -- 2.17.1