mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
0a827ebd2f
This patch is to upgrade kernel to 4.14 for layerscape. patches-4.14 for layerscape included two categories. - NXP Layerscape SDK kernel-4.14 patches All patches on tag LSDK-18.09-V4.14 were ported to OpenWrt kernel. Since there were hundreds patches, we had to make an all-in-one patch for each IP/feature. See below links for LSDK kernel. https://lsdk.github.io/components.html https://source.codeaurora.org/external/qoriq/qoriq-components/linux - Non-LSDK kernel patches Other patches which were not in LSDK were just put in patches-4.14. Kept below patches from patches-4.9. 303-dts-layerscape-add-traverse-ls1043.patch 821-add-esdhc-vsel-to-ls1043.patch 822-rgmii-fixed-link.patch Renamed and rebase them as below in patches-4.14, 303-add-DTS-for-Traverse-LS1043-Boards.patch 712-sdk-dpaa-rgmii-fixed-link.patch 824-mmc-sdhci-of-esdhc-add-voltage-switch-support-for-ls.patch Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Signed-off-by: Biwen Li <biwen.li@nxp.com>
317 lines
9.8 KiB
Diff
317 lines
9.8 KiB
Diff
From c64d8ab6260330fa2fe9a2d676256697e4e2a83c Mon Sep 17 00:00:00 2001
|
|
From: Biwen Li <biwen.li@nxp.com>
|
|
Date: Tue, 30 Oct 2018 18:26:44 +0800
|
|
Subject: [PATCH 31/40] ls2-console: support layerscape
|
|
This is an integrated patch of ls2-console for
|
|
layerscape
|
|
|
|
Signed-off-by: Razvan Stefanescu <razvan.stefanescu@nxp.com>
|
|
Signed-off-by: Biwen Li <biwen.li@nxp.com>
|
|
---
|
|
drivers/soc/fsl/ls2-console/Kconfig | 4 +
|
|
drivers/soc/fsl/ls2-console/Makefile | 1 +
|
|
drivers/soc/fsl/ls2-console/ls2-console.c | 284 ++++++++++++++++++++++
|
|
3 files changed, 289 insertions(+)
|
|
create mode 100644 drivers/soc/fsl/ls2-console/Kconfig
|
|
create mode 100644 drivers/soc/fsl/ls2-console/Makefile
|
|
create mode 100644 drivers/soc/fsl/ls2-console/ls2-console.c
|
|
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/ls2-console/Kconfig
|
|
@@ -0,0 +1,4 @@
|
|
+config FSL_LS2_CONSOLE
|
|
+ tristate "Layerscape MC and AIOP console support"
|
|
+ depends on ARCH_LAYERSCAPE
|
|
+ default y
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/ls2-console/Makefile
|
|
@@ -0,0 +1 @@
|
|
+obj-$(CONFIG_FSL_LS2_CONSOLE) += ls2-console.o
|
|
--- /dev/null
|
|
+++ b/drivers/soc/fsl/ls2-console/ls2-console.c
|
|
@@ -0,0 +1,284 @@
|
|
+/* Copyright 2015-2016 Freescale Semiconductor Inc.
|
|
+ *
|
|
+ * Redistribution and use in source and binary forms, with or without
|
|
+ * modification, are permitted provided that the following conditions are met:
|
|
+ * * Redistributions of source code must retain the above copyright
|
|
+ * notice, this list of conditions and the following disclaimer.
|
|
+ * * Redistributions in binary form must reproduce the above copyright
|
|
+ * notice, this list of conditions and the following disclaimer in the
|
|
+ * documentation and/or other materials provided with the distribution.
|
|
+ * * Neither the name of the above-listed copyright holders nor the
|
|
+ * names of any contributors may be used to endorse or promote products
|
|
+ * derived from this software without specific prior written permission.
|
|
+ *
|
|
+ *
|
|
+ * ALTERNATIVELY, this software may be distributed under the terms of the
|
|
+ * GNU General Public License ("GPL") as published by the Free Software
|
|
+ * Foundation, either version 2 of that License or (at your option) any
|
|
+ * later version.
|
|
+ *
|
|
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
|
|
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
+ * POSSIBILITY OF SUCH DAMAGE.
|
|
+ */
|
|
+
|
|
+#include <linux/miscdevice.h>
|
|
+#include <linux/uaccess.h>
|
|
+#include <linux/poll.h>
|
|
+#include <linux/compat.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/slab.h>
|
|
+#include <linux/io.h>
|
|
+
|
|
+/* SoC address for the MC firmware base low/high registers */
|
|
+#define SOC_CCSR_MC_FW_BASE_ADDR_REGS 0x8340020
|
|
+#define SOC_CCSR_MC_FW_BASE_ADDR_REGS_SIZE 2
|
|
+/* MC firmware base low/high registers indexes */
|
|
+#define MCFBALR_OFFSET 0
|
|
+#define MCFBAHR_OFFSET 1
|
|
+
|
|
+/* Bit mask used to obtain the most significant part of the MC base address */
|
|
+#define MC_FW_HIGH_ADDR_MASK 0x1FFFF
|
|
+/* Bit mask used to obtain the least significant part of the MC base address */
|
|
+#define MC_FW_LOW_ADDR_MASK 0xE0000000
|
|
+
|
|
+#define MC_BUFFER_OFFSET 0x01000000
|
|
+#define MC_BUFFER_SIZE (1024*1024*16)
|
|
+#define MC_OFFSET_DELTA (MC_BUFFER_OFFSET)
|
|
+
|
|
+#define AIOP_BUFFER_OFFSET 0x06000000
|
|
+#define AIOP_BUFFER_SIZE (1024*1024*16)
|
|
+#define AIOP_OFFSET_DELTA (0)
|
|
+
|
|
+struct log_header {
|
|
+ char magic_word[8]; /* magic word */
|
|
+ uint32_t buf_start; /* holds the 32-bit little-endian
|
|
+ * offset of the start of the buffer
|
|
+ */
|
|
+ uint32_t buf_length; /* holds the 32-bit little-endian
|
|
+ * length of the buffer
|
|
+ */
|
|
+ uint32_t last_byte; /* holds the 32-bit little-endian offset
|
|
+ * of the byte after the last byte that
|
|
+ * was written
|
|
+ */
|
|
+ char reserved[44];
|
|
+};
|
|
+
|
|
+#define LOG_HEADER_FLAG_BUFFER_WRAPAROUND 0x80000000
|
|
+#define LOG_VERSION_MAJOR 1
|
|
+#define LOG_VERSION_MINOR 0
|
|
+
|
|
+
|
|
+#define invalidate(p) { asm volatile("dc ivac, %0" : : "r" (p) : "memory"); }
|
|
+
|
|
+struct console_data {
|
|
+ char *map_addr;
|
|
+ struct log_header *hdr;
|
|
+ char *start_addr; /* Start of buffer */
|
|
+ char *end_addr; /* End of buffer */
|
|
+ char *end_of_data; /* Current end of data */
|
|
+ char *cur_ptr; /* Last data sent to console */
|
|
+};
|
|
+
|
|
+#define LAST_BYTE(a) ((a) & ~(LOG_HEADER_FLAG_BUFFER_WRAPAROUND))
|
|
+
|
|
+static inline void __adjust_end(struct console_data *cd)
|
|
+{
|
|
+ cd->end_of_data = cd->start_addr
|
|
+ + LAST_BYTE(le32_to_cpu(cd->hdr->last_byte));
|
|
+}
|
|
+
|
|
+static inline void adjust_end(struct console_data *cd)
|
|
+{
|
|
+ invalidate(cd->hdr);
|
|
+ __adjust_end(cd);
|
|
+}
|
|
+
|
|
+static inline uint64_t get_mc_fw_base_address(void)
|
|
+{
|
|
+ u32 *mcfbaregs = (u32 *) ioremap(SOC_CCSR_MC_FW_BASE_ADDR_REGS,
|
|
+ SOC_CCSR_MC_FW_BASE_ADDR_REGS_SIZE);
|
|
+ u64 mcfwbase = 0ULL;
|
|
+
|
|
+ mcfwbase = readl(mcfbaregs + MCFBAHR_OFFSET) & MC_FW_HIGH_ADDR_MASK;
|
|
+ mcfwbase <<= 32;
|
|
+ mcfwbase |= readl(mcfbaregs + MCFBALR_OFFSET) & MC_FW_LOW_ADDR_MASK;
|
|
+ iounmap(mcfbaregs);
|
|
+ pr_info("fsl-ls2-console: MC base address at 0x%016llx\n", mcfwbase);
|
|
+ return mcfwbase;
|
|
+}
|
|
+
|
|
+static int fsl_ls2_generic_console_open(struct inode *node, struct file *fp,
|
|
+ u64 offset, u64 size,
|
|
+ uint8_t *emagic, uint8_t magic_len,
|
|
+ u32 offset_delta)
|
|
+{
|
|
+ struct console_data *cd;
|
|
+ uint8_t *magic;
|
|
+ uint32_t wrapped;
|
|
+
|
|
+ cd = kmalloc(sizeof(*cd), GFP_KERNEL);
|
|
+ if (cd == NULL)
|
|
+ return -ENOMEM;
|
|
+ fp->private_data = cd;
|
|
+ cd->map_addr = ioremap(get_mc_fw_base_address() + offset, size);
|
|
+
|
|
+ cd->hdr = (struct log_header *) cd->map_addr;
|
|
+ invalidate(cd->hdr);
|
|
+
|
|
+ magic = cd->hdr->magic_word;
|
|
+ if (memcmp(magic, emagic, magic_len)) {
|
|
+ pr_info("magic didn't match!\n");
|
|
+ pr_info("expected: %02x %02x %02x %02x %02x %02x %02x %02x\n",
|
|
+ emagic[0], emagic[1], emagic[2], emagic[3],
|
|
+ emagic[4], emagic[5], emagic[6], emagic[7]);
|
|
+ pr_info(" seen: %02x %02x %02x %02x %02x %02x %02x %02x\n",
|
|
+ magic[0], magic[1], magic[2], magic[3],
|
|
+ magic[4], magic[5], magic[6], magic[7]);
|
|
+ kfree(cd);
|
|
+ iounmap(cd->map_addr);
|
|
+ return -EIO;
|
|
+ }
|
|
+
|
|
+ cd->start_addr = cd->map_addr
|
|
+ + le32_to_cpu(cd->hdr->buf_start) - offset_delta;
|
|
+ cd->end_addr = cd->start_addr + le32_to_cpu(cd->hdr->buf_length);
|
|
+
|
|
+ wrapped = le32_to_cpu(cd->hdr->last_byte)
|
|
+ & LOG_HEADER_FLAG_BUFFER_WRAPAROUND;
|
|
+
|
|
+ __adjust_end(cd);
|
|
+ if (wrapped && (cd->end_of_data != cd->end_addr))
|
|
+ cd->cur_ptr = cd->end_of_data+1;
|
|
+ else
|
|
+ cd->cur_ptr = cd->start_addr;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int fsl_ls2_mc_console_open(struct inode *node, struct file *fp)
|
|
+{
|
|
+ uint8_t magic_word[] = { 0, 1, 'C', 'M' };
|
|
+
|
|
+ return fsl_ls2_generic_console_open(node, fp,
|
|
+ MC_BUFFER_OFFSET, MC_BUFFER_SIZE,
|
|
+ magic_word, sizeof(magic_word),
|
|
+ MC_OFFSET_DELTA);
|
|
+}
|
|
+
|
|
+static int fsl_ls2_aiop_console_open(struct inode *node, struct file *fp)
|
|
+{
|
|
+ uint8_t magic_word[] = { 'P', 'O', 'I', 'A' };
|
|
+
|
|
+ return fsl_ls2_generic_console_open(node, fp,
|
|
+ AIOP_BUFFER_OFFSET, AIOP_BUFFER_SIZE,
|
|
+ magic_word, sizeof(magic_word),
|
|
+ AIOP_OFFSET_DELTA);
|
|
+}
|
|
+
|
|
+static int fsl_ls2_console_close(struct inode *node, struct file *fp)
|
|
+{
|
|
+ struct console_data *cd = fp->private_data;
|
|
+
|
|
+ iounmap(cd->map_addr);
|
|
+ kfree(cd);
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+ssize_t fsl_ls2_console_read(struct file *fp, char __user *buf, size_t count,
|
|
+ loff_t *f_pos)
|
|
+{
|
|
+ struct console_data *cd = fp->private_data;
|
|
+ size_t bytes = 0;
|
|
+ char data;
|
|
+
|
|
+ /* Check if we need to adjust the end of data addr */
|
|
+ adjust_end(cd);
|
|
+
|
|
+ while ((count != bytes) && (cd->end_of_data != cd->cur_ptr)) {
|
|
+ if (((u64)cd->cur_ptr) % 64 == 0)
|
|
+ invalidate(cd->cur_ptr);
|
|
+
|
|
+ data = *(cd->cur_ptr);
|
|
+ if (copy_to_user(&buf[bytes], &data, 1))
|
|
+ return -EFAULT;
|
|
+ cd->cur_ptr++;
|
|
+ if (cd->cur_ptr >= cd->end_addr)
|
|
+ cd->cur_ptr = cd->start_addr;
|
|
+ ++bytes;
|
|
+ }
|
|
+ return bytes;
|
|
+}
|
|
+
|
|
+static const struct file_operations fsl_ls2_mc_console_fops = {
|
|
+ .owner = THIS_MODULE,
|
|
+ .open = fsl_ls2_mc_console_open,
|
|
+ .release = fsl_ls2_console_close,
|
|
+ .read = fsl_ls2_console_read,
|
|
+};
|
|
+
|
|
+static struct miscdevice fsl_ls2_mc_console_dev = {
|
|
+ .minor = MISC_DYNAMIC_MINOR,
|
|
+ .name = "fsl_mc_console",
|
|
+ .fops = &fsl_ls2_mc_console_fops
|
|
+};
|
|
+
|
|
+static const struct file_operations fsl_ls2_aiop_console_fops = {
|
|
+ .owner = THIS_MODULE,
|
|
+ .open = fsl_ls2_aiop_console_open,
|
|
+ .release = fsl_ls2_console_close,
|
|
+ .read = fsl_ls2_console_read,
|
|
+};
|
|
+
|
|
+static struct miscdevice fsl_ls2_aiop_console_dev = {
|
|
+ .minor = MISC_DYNAMIC_MINOR,
|
|
+ .name = "fsl_aiop_console",
|
|
+ .fops = &fsl_ls2_aiop_console_fops
|
|
+};
|
|
+
|
|
+static int __init fsl_ls2_console_init(void)
|
|
+{
|
|
+ int err = 0;
|
|
+
|
|
+ pr_info("Freescale LS2 console driver\n");
|
|
+ err = misc_register(&fsl_ls2_mc_console_dev);
|
|
+ if (err) {
|
|
+ pr_err("fsl_mc_console: cannot register device\n");
|
|
+ return err;
|
|
+ }
|
|
+ pr_info("fsl-ls2-console: device %s registered\n",
|
|
+ fsl_ls2_mc_console_dev.name);
|
|
+
|
|
+ err = misc_register(&fsl_ls2_aiop_console_dev);
|
|
+ if (err) {
|
|
+ pr_err("fsl_aiop_console: cannot register device\n");
|
|
+ return err;
|
|
+ }
|
|
+ pr_info("fsl-ls2-console: device %s registered\n",
|
|
+ fsl_ls2_aiop_console_dev.name);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void __exit fsl_ls2_console_exit(void)
|
|
+{
|
|
+ misc_deregister(&fsl_ls2_mc_console_dev);
|
|
+
|
|
+ misc_deregister(&fsl_ls2_aiop_console_dev);
|
|
+}
|
|
+
|
|
+module_init(fsl_ls2_console_init);
|
|
+module_exit(fsl_ls2_console_exit);
|
|
+
|
|
+MODULE_AUTHOR("Roy Pledge <roy.pledge@freescale.com>");
|
|
+MODULE_LICENSE("Dual BSD/GPL");
|
|
+MODULE_DESCRIPTION("Freescale LS2 console driver");
|