[PATCH 1/6 v4] serial: qcom: add support for GENI serial driver
Generic Interface (GENI) Serial Engine (SE) based uart can be found on newer qualcomm SOCs, starting from SDM845. Tested on Samsung SM-G9600(starqltechn) by chain-loading u-boot with stock bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com --- Changes for v2: - change functions return type to void, where possible - remove '.' from summary line Changes for v3: - move function open brace on new line - use tab between define name and value - define: wrap expression with braces, remove braces from constants Changes for v4: - add linux/delay.h header
MAINTAINERS | 1 + .../serial/msm-geni-serial.txt | 6 + drivers/serial/Kconfig | 17 + drivers/serial/Makefile | 1 + drivers/serial/serial_msm_geni.c | 603 ++++++++++++++++++ 5 files changed, 628 insertions(+) create mode 100644 doc/device-tree-bindings/serial/msm-geni-serial.txt create mode 100644 drivers/serial/serial_msm_geni.c
diff --git a/MAINTAINERS b/MAINTAINERS index 776ff703b9..52ddc99cda 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -390,6 +390,7 @@ F: drivers/gpio/msm_gpio.c F: drivers/mmc/msm_sdhci.c F: drivers/phy/msm8916-usbh-phy.c F: drivers/serial/serial_msm.c +F: drivers/serial/serial_msm_geni.c F: drivers/smem/msm_smem.c F: drivers/usb/host/ehci-msm.c
diff --git a/doc/device-tree-bindings/serial/msm-geni-serial.txt b/doc/device-tree-bindings/serial/msm-geni-serial.txt new file mode 100644 index 0000000000..9eadc2561b --- /dev/null +++ b/doc/device-tree-bindings/serial/msm-geni-serial.txt @@ -0,0 +1,6 @@ +Qualcomm GENI UART + +Required properties: +- compatible: must be "qcom,msm-geni-uart" +- reg: start address and size of the registers +- clock: interface clock (must accept baudrate as a frequency) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 93348c0929..b420a5720d 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -278,6 +278,14 @@ config DEBUG_UART_S5P will need to provide parameters to make this work. The driver will be available until the real driver-model serial is running.
+config DEBUG_UART_MSM_GENI + bool "Qualcomm snapdragon" + depends on ARCH_SNAPDRAGON + help + Select this to enable a debug UART using the serial_msm driver. You + will need to provide parameters to make this work. The driver will + be available until the real driver-model serial is running. + config DEBUG_UART_MESON bool "Amlogic Meson" depends on MESON_SERIAL @@ -783,6 +791,15 @@ config MSM_SERIAL for example APQ8016 and MSM8916. Single baudrate is supported in current implementation (115200).
+config MSM_GENI_SERIAL + bool "Qualcomm on-chip GENI UART" + help + Support UART based on Generic Interface (GENI) Serial Engine (SE), used on Qualcomm Snapdragon SoCs. + Should support all qualcomm SOCs with Qualcomm Universal Peripheral (QUP) Wrapper cores, + i.e. newer ones, starting from SDM845. + Driver works in FIFO mode. + Multiple baudrates supported. + config OCTEON_SERIAL_BOOTCMD bool "MIPS Octeon PCI remote bootcmd input" depends on ARCH_OCTEON diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 3cbea8156f..d44caf4ea2 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o obj-$(CONFIG_BCM283X_PL011_SERIAL) += serial_bcm283x_pl011.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o +obj-$(CONFIG_MSM_GENI_SERIAL) += serial_msm_geni.o obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o obj-$(CONFIG_MPC8XX_CONS) += serial_mpc8xx.o obj-$(CONFIG_NULLDEV_SERIAL) += serial_nulldev.o diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c new file mode 100644 index 0000000000..c656d54cbb --- /dev/null +++ b/drivers/serial/serial_msm_geni.c @@ -0,0 +1,603 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Qualcomm GENI serial engine UART driver + * + * (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com + * + * Based on Linux driver. + */ + +#include <asm/io.h> +#include <clk.h> +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <errno.h> +#include <linux/compiler.h> +#include <log.h> +#include <linux/delay.h> +#include <malloc.h> +#include <serial.h> +#include <watchdog.h> + +#define UART_OVERSAMPLING 32 +#define STALE_TIMEOUT 160 +#define SE_UART_RX_STALE_CNT 0x294 +#define S_GENI_CMD_ABORT (BIT(1)) + +#define SE_GENI_S_CMD_CTRL_REG 0x634 +#define SE_GENI_M_CMD_CTRL_REG 0x604 + +/* GENI_M_CMD_CTRL_REG */ +#define M_GENI_CMD_CANCEL (BIT(2)) +#define M_GENI_CMD_ABORT (BIT(1)) +#define M_GENI_DISABLE (BIT(0)) + +/* GENI_S_CMD0 fields */ +#define S_OPCODE_MSK (GENMASK(31, 27)) +#define S_OPCODE_SHFT 27 +#define S_PARAMS_MSK (GENMASK(26, 0)) + +/* GENI_STATUS fields */ +#define M_GENI_CMD_ACTIVE (BIT(0)) +#define S_GENI_CMD_ACTIVE (BIT(12)) +#define S_CMD_DONE_EN (BIT(0)) +#define M_CMD_DONE_EN (BIT(0)) + +#define USEC_PER_SEC 1000000L + +#define SE_GENI_STATUS 0x40 +#define GENI_SER_M_CLK_CFG 0x48 +#define GENI_SER_S_CLK_CFG 0x4C +#define SE_GENI_M_CMD0 0x600 +#define SE_GENI_M_IRQ_CLEAR 0x618 +#define SE_GENI_S_IRQ_STATUS 0x640 +#define SE_GENI_S_IRQ_CLEAR 0x648 +#define SE_GENI_S_IRQ_EN 0x644 +#define SE_GENI_M_IRQ_EN 0x614 +#define SE_GENI_TX_FIFOn 0x700 +#define SE_GENI_RX_FIFOn 0x780 +#define SE_GENI_TX_FIFO_STATUS 0x800 +#define SE_GENI_RX_FIFO_STATUS 0x804 +#define SE_GENI_TX_WATERMARK_REG 0x80C +#define M_TX_FIFO_WATERMARK_EN (BIT(30)) +#define DEF_TX_WM 2 +#define SE_UART_TX_TRANS_LEN 0x270 +#define SE_GENI_TX_PACKING_CFG0 0x260 +#define SE_GENI_TX_PACKING_CFG1 0x264 +#define SE_GENI_RX_PACKING_CFG0 0x284 +#define SE_GENI_RX_PACKING_CFG1 0x288 +#define SE_UART_TX_STOP_BIT_LEN 0x26c +#define SE_UART_TX_WORD_LEN 0x268 +#define SE_UART_RX_WORD_LEN 0x28c +#define SE_UART_RX_TRANS_CFG 0x280 +#define SE_UART_RX_PARITY_CFG 0x2a8 +#define SE_UART_TX_TRANS_CFG 0x25c +#define SE_UART_TX_PARITY_CFG 0x2a4 + +#define GENI_FORCE_DEFAULT_REG 0x20 +/* GENI_FORCE_DEFAULT_REG fields */ +#define FORCE_DEFAULT (BIT(0)) + +#define S_CMD_ABORT_EN (BIT(5)) + +#define SE_GENI_S_CMD0 0x630 +#define UART_START_READ 0x1 + +/* GENI_M_CMD_CTRL_REG */ +#define M_GENI_CMD_CANCEL (BIT(2)) +#define M_GENI_CMD_ABORT (BIT(1)) +#define M_GENI_DISABLE (BIT(0)) + +#define M_CMD_ABORT_EN (BIT(5)) + +#define M_CMD_DONE_EN (BIT(0)) +#define M_CMD_DONE_DISABLE_MASK (~M_CMD_DONE_EN) +#define SE_GENI_M_IRQ_STATUS 0x610 + +#define M_OPCODE_SHIFT 27 +#define S_OPCODE_SHIFT 27 +#define M_TX_FIFO_WATERMARK_EN (BIT(30)) +#define UART_START_TX 0x1 +#define UART_CTS_MASK (BIT(1)) +#define M_SEC_IRQ_EN (BIT(31)) +#define TX_FIFO_WC_MSK (GENMASK(27, 0)) +#define RX_FIFO_WC_MSK (GENMASK(24, 0)) + +#define S_RX_FIFO_WATERMARK_EN (BIT(26)) +#define S_RX_FIFO_LAST_EN (BIT(27)) +#define M_RX_FIFO_WATERMARK_EN (BIT(26)) +#define M_RX_FIFO_LAST_EN (BIT(27)) + +/* GENI_SER_M_CLK_CFG/GENI_SER_S_CLK_CFG */ +#define SER_CLK_EN (BIT(0)) +#define CLK_DIV_MSK (GENMASK(15, 4)) +#define CLK_DIV_SHFT 4 + +#define SE_HW_PARAM_0 0xE24 +/* SE_HW_PARAM_0 fields */ +#define TX_FIFO_WIDTH_MSK (GENMASK(29, 24)) +#define TX_FIFO_WIDTH_SHFT 24 +#define TX_FIFO_DEPTH_MSK (GENMASK(21, 16)) +#define TX_FIFO_DEPTH_SHFT 16 + +DECLARE_GLOBAL_DATA_PTR; + +struct msm_serial_data { + phys_addr_t base; + u32 baud; +}; + +static int get_clk_cfg(unsigned long clk_freq, unsigned long *ser_clk) +{ + unsigned long root_freq[] = {7372800, 14745600, 19200000, 29491200, + 32000000, 48000000, 64000000, 80000000, + 96000000, 100000000}; + int i; + int match = -1; + + for (i = 0; i < ARRAY_SIZE(root_freq); i++) { + if (clk_freq > root_freq[i]) + continue; + + if (!(root_freq[i] % clk_freq)) { + match = i; + break; + } + } + if (match != -1) + *ser_clk = root_freq[match]; + else + pr_err("clk_freq %ld\n", clk_freq); + return match; +} + +static int get_clk_div_rate(u32 baud, u64 *desired_clk_rate) +{ + unsigned long ser_clk; + int dfs_index; + int clk_div = 0; + + *desired_clk_rate = baud * UART_OVERSAMPLING; + dfs_index = get_clk_cfg(*desired_clk_rate, &ser_clk); + if (dfs_index < 0) { + pr_err("%s: Can't find matching DFS entry for baud %d\n", + __func__, baud); + clk_div = -EINVAL; + goto exit_get_clk_div_rate; + } + + clk_div = ser_clk / *desired_clk_rate; + *desired_clk_rate = ser_clk; +exit_get_clk_div_rate: + return clk_div; +} + +static int geni_serial_set_clock_rate(struct udevice *dev, u64 rate) +{ + struct clk *clk; + int ret; + + clk = devm_clk_get(dev, "se-clk"); + if (!clk) + return -EINVAL; + + ret = clk_set_rate(clk, rate); + return ret; +} + +/** + * geni_se_get_tx_fifo_depth() - Get the TX fifo depth of the serial engine + * @base: Pointer to the concerned serial engine. + * + * This function is used to get the depth i.e. number of elements in the + * TX fifo of the serial engine. + * + * Return: TX fifo depth in units of FIFO words. + */ +static inline u32 geni_se_get_tx_fifo_depth(long base) +{ + u32 tx_fifo_depth; + + tx_fifo_depth = ((readl(base + SE_HW_PARAM_0) & TX_FIFO_DEPTH_MSK) >> + TX_FIFO_DEPTH_SHFT); + return tx_fifo_depth; +} + +/** + * geni_se_get_tx_fifo_width() - Get the TX fifo width of the serial engine + * @base: Pointer to the concerned serial engine. + * + * This function is used to get the width i.e. word size per element in the + * TX fifo of the serial engine. + * + * Return: TX fifo width in bits + */ +static inline u32 geni_se_get_tx_fifo_width(long base) +{ + u32 tx_fifo_width; + + tx_fifo_width = ((readl(base + SE_HW_PARAM_0) & TX_FIFO_WIDTH_MSK) >> + TX_FIFO_WIDTH_SHFT); + return tx_fifo_width; +} + +static inline void geni_serial_baud(phys_addr_t base_address, u64 uclk, + int baud) +{ + u32 clk_div; + u32 s_clk_cfg = 0; + + clk_div = get_clk_div_rate(baud, &uclk); + + s_clk_cfg |= SER_CLK_EN; + s_clk_cfg |= (clk_div << CLK_DIV_SHFT); + + writel(s_clk_cfg, base_address + GENI_SER_M_CLK_CFG); + writel(s_clk_cfg, base_address + GENI_SER_S_CLK_CFG); +} + +int msm_serial_setbrg(struct udevice *dev, int baud) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + + priv->baud = baud; + u32 clk_div; + u64 clk_rate; + + clk_div = get_clk_div_rate(baud, &clk_rate); + geni_serial_set_clock_rate(dev, clk_rate); + geni_serial_baud(priv->base, clk_rate, baud); + + return 0; +} + +static bool qcom_geni_serial_poll_bit(const struct udevice *dev, int offset, + int field, bool set) +{ + u32 reg; + struct msm_serial_data *priv = dev_get_priv(dev); + unsigned int baud; + unsigned int tx_fifo_depth; + unsigned int tx_fifo_width; + unsigned int fifo_bits; + unsigned long timeout_us = 10000; + + baud = 115200; + + if (priv) { + baud = priv->baud; + if (!baud) + baud = 115200; + tx_fifo_depth = geni_se_get_tx_fifo_depth(priv->base); + tx_fifo_width = geni_se_get_tx_fifo_width(priv->base); + fifo_bits = tx_fifo_depth * tx_fifo_width; + /* + * Total polling iterations based on FIFO worth of bytes to be + * sent at current baud. Add a little fluff to the wait. + */ + timeout_us = ((fifo_bits * USEC_PER_SEC) / baud) + 500; + } + + /* + * Use custom implementation instead of readl_poll_atomic since ktimer + * is not ready at the time of early console. + */ + timeout_us = DIV_ROUND_UP(timeout_us, 10) * 10; + while (timeout_us) { + reg = readl(priv->base + offset); + if ((bool)(reg & field) == set) + return true; + udelay(10); + timeout_us -= 10; + } + return false; +} + +static void qcom_geni_serial_setup_tx(u64 base, u32 xmit_size) +{ + u32 m_cmd; + + writel(xmit_size, base + SE_UART_TX_TRANS_LEN); + m_cmd = UART_START_TX << M_OPCODE_SHIFT; + writel(m_cmd, base + SE_GENI_M_CMD0); +} + +static inline void qcom_geni_serial_poll_tx_done(const struct udevice *dev) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + int done = 0; + u32 irq_clear = M_CMD_DONE_EN; + + done = qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS, + M_CMD_DONE_EN, true); + if (!done) { + writel(M_GENI_CMD_ABORT, priv->base + SE_GENI_M_CMD_CTRL_REG); + irq_clear |= M_CMD_ABORT_EN; + qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS, + M_CMD_ABORT_EN, true); + } + writel(irq_clear, priv->base + SE_GENI_M_IRQ_CLEAR); +} + +static u32 qcom_geni_serial_tx_empty(u64 base) +{ + return !readl(base + SE_GENI_TX_FIFO_STATUS); +} + +/** + * geni_se_setup_s_cmd() - Setup the secondary sequencer + * @se: Pointer to the concerned serial engine. + * @cmd: Command/Operation to setup in the secondary sequencer. + * @params: Parameter for the sequencer command. + * + * This function is used to configure the secondary sequencer with the + * command and its associated parameters. + */ +static inline void geni_se_setup_s_cmd(u64 base, u32 cmd, u32 params) +{ + u32 s_cmd; + + s_cmd = readl(base + SE_GENI_S_CMD0); + s_cmd &= ~(S_OPCODE_MSK | S_PARAMS_MSK); + s_cmd |= (cmd << S_OPCODE_SHFT); + s_cmd |= (params & S_PARAMS_MSK); + writel(s_cmd, base + SE_GENI_S_CMD0); +} + +static void qcom_geni_serial_start_tx(u64 base) +{ + u32 irq_en; + u32 status; + + status = readl(base + SE_GENI_STATUS); + if (status & M_GENI_CMD_ACTIVE) + return; + + if (!qcom_geni_serial_tx_empty(base)) + return; + + irq_en = readl(base + SE_GENI_M_IRQ_EN); + irq_en |= M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN; + + writel(DEF_TX_WM, base + SE_GENI_TX_WATERMARK_REG); + writel(irq_en, base + SE_GENI_M_IRQ_EN); +} + +static void qcom_geni_serial_start_rx(struct udevice *dev) +{ + u32 irq_en; + u32 status; + struct msm_serial_data *priv = dev_get_priv(dev); + + status = readl(priv->base + SE_GENI_STATUS); + + geni_se_setup_s_cmd(priv->base, UART_START_READ, 0); + + irq_en = readl(priv->base + SE_GENI_S_IRQ_EN); + irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN; + writel(irq_en, priv->base + SE_GENI_S_IRQ_EN); + + irq_en = readl(priv->base + SE_GENI_M_IRQ_EN); + irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN; + writel(irq_en, priv->base + SE_GENI_M_IRQ_EN); +} + +static void msm_geni_serial_setup_rx(struct udevice *dev) +{ + u32 irq_clear = S_CMD_DONE_EN; + u32 geni_s_irq_en; + u32 geni_m_irq_en; + u32 cfg0; + u32 cfg1; + struct msm_serial_data *priv = dev_get_priv(dev); + + irq_clear |= S_CMD_ABORT_EN; + + writel(S_GENI_CMD_ABORT, priv->base + SE_GENI_S_CMD_CTRL_REG); + qcom_geni_serial_poll_bit(dev, SE_GENI_S_CMD_CTRL_REG, S_GENI_CMD_ABORT, + false); + writel(irq_clear, priv->base + SE_GENI_S_IRQ_CLEAR); + writel(FORCE_DEFAULT, priv->base + GENI_FORCE_DEFAULT_REG); + + cfg0 = 0xf; + cfg1 = 0x0; + writel(cfg0, priv->base + SE_GENI_RX_PACKING_CFG0); + writel(cfg1, priv->base + SE_GENI_RX_PACKING_CFG1); + + geni_se_setup_s_cmd(priv->base, UART_START_READ, 0); + + geni_s_irq_en = readl(priv->base + SE_GENI_S_IRQ_EN); + geni_m_irq_en = readl(priv->base + SE_GENI_M_IRQ_EN); + + geni_s_irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN; + geni_m_irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN; + + writel(geni_s_irq_en, priv->base + SE_GENI_S_IRQ_EN); + writel(geni_m_irq_en, priv->base + SE_GENI_M_IRQ_EN); +} + +static int msm_serial_putc(struct udevice *dev, const char ch) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + + writel(DEF_TX_WM, priv->base + SE_GENI_TX_WATERMARK_REG); + qcom_geni_serial_setup_tx(priv->base, 1); + + qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS, + M_TX_FIFO_WATERMARK_EN, true); + + writel(ch, priv->base + SE_GENI_TX_FIFOn); + writel(M_TX_FIFO_WATERMARK_EN, priv->base + SE_GENI_M_IRQ_CLEAR); + + qcom_geni_serial_poll_tx_done(dev); + + return 0; +} + +static int msm_serial_getc(struct udevice *dev) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + u32 rx_fifo; + u32 m_irq_status; + u32 s_irq_status; + + writel(1 << S_OPCODE_SHIFT, priv->base + SE_GENI_S_CMD0); + + qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS, M_SEC_IRQ_EN, + true); + + m_irq_status = readl(priv->base + SE_GENI_M_IRQ_STATUS); + s_irq_status = readl(priv->base + SE_GENI_S_IRQ_STATUS); + writel(m_irq_status, priv->base + SE_GENI_M_IRQ_CLEAR); + writel(s_irq_status, priv->base + SE_GENI_S_IRQ_CLEAR); + qcom_geni_serial_poll_bit(dev, SE_GENI_RX_FIFO_STATUS, RX_FIFO_WC_MSK, + true); + + if (!readl(priv->base + SE_GENI_RX_FIFO_STATUS)) + return 0; + + rx_fifo = readl(priv->base + SE_GENI_RX_FIFOn); + return rx_fifo & 0xff; +} + +static int msm_serial_pending(struct udevice *dev, bool input) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + + if (input) + return readl(priv->base + SE_GENI_RX_FIFO_STATUS) & + RX_FIFO_WC_MSK; + else + return readl(priv->base + SE_GENI_TX_FIFO_STATUS) & + TX_FIFO_WC_MSK; + + return 0; +} + +static const struct dm_serial_ops msm_serial_ops = { + .putc = msm_serial_putc, + .pending = msm_serial_pending, + .getc = msm_serial_getc, + .setbrg = msm_serial_setbrg, +}; + +static inline void geni_serial_init(phys_addr_t base_address) +{ + u32 tx_trans_cfg; + u32 tx_parity_cfg = 0; /* Disable Tx Parity */ + u32 rx_trans_cfg = 0; + u32 rx_parity_cfg = 0; /* Disable Rx Parity */ + u32 stop_bit_len = 0; /* Default stop bit length - 1 bit */ + u32 bits_per_char; + + /* + * Ignore Flow control. + * n = 8. + */ + tx_trans_cfg = UART_CTS_MASK; + bits_per_char = BITS_PER_BYTE; + + u32 cfg0 = 0xf; + + u32 cfg1 = 0x0; + + /* + * Make an unconditional cancel on the main sequencer to reset + * it else we could end up in data loss scenarios. + */ + writel(cfg0, base_address + SE_GENI_TX_PACKING_CFG0); + writel(cfg1, base_address + SE_GENI_TX_PACKING_CFG1); + writel(cfg0, base_address + SE_GENI_RX_PACKING_CFG0); + writel(cfg1, base_address + SE_GENI_RX_PACKING_CFG1); + + writel(tx_trans_cfg, base_address + SE_UART_TX_TRANS_CFG); + writel(tx_parity_cfg, base_address + SE_UART_TX_PARITY_CFG); + writel(rx_trans_cfg, base_address + SE_UART_RX_TRANS_CFG); + writel(rx_parity_cfg, base_address + SE_UART_RX_PARITY_CFG); + writel(bits_per_char, base_address + SE_UART_TX_WORD_LEN); + writel(bits_per_char, base_address + SE_UART_RX_WORD_LEN); + writel(stop_bit_len, base_address + SE_UART_TX_STOP_BIT_LEN); +} + +static int msm_serial_probe(struct udevice *dev) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + + /* No need to reinitialize the UART after relocation */ + if (gd->flags & GD_FLG_RELOC) + return 0; + + geni_serial_init(priv->base); + msm_geni_serial_setup_rx(dev); + qcom_geni_serial_start_rx(dev); + qcom_geni_serial_start_tx(priv->base); + + pinctrl_select_state(dev, "uart"); + + return 0; +} + +static int msm_serial_ofdata_to_platdata(struct udevice *dev) +{ + struct msm_serial_data *priv = dev_get_priv(dev); + + priv->base = dev_read_addr(dev); + if (priv->base == FDT_ADDR_T_NONE) + return -EINVAL; + + return 0; +} + +static const struct udevice_id msm_serial_ids[] = { + {.compatible = "qcom,msm-geni-uart"}, {}}; + +U_BOOT_DRIVER(serial_msm_geni) = { + .name = "serial_msm_geni", + .id = UCLASS_SERIAL, + .of_match = msm_serial_ids, + .of_to_plat = msm_serial_ofdata_to_platdata, + .priv_auto = sizeof(struct msm_serial_data), + .probe = msm_serial_probe, + .ops = &msm_serial_ops, +}; + +#ifdef CONFIG_DEBUG_UART_MSM_GENI + +static struct msm_serial_data init_serial_data = { + .base = CONFIG_DEBUG_UART_BASE +}; + +/* Serial dumb device, to reuse driver code */ +static struct udevice init_dev = { + .priv_ = &init_serial_data, +}; + +#include <debug_uart.h> + +static inline void _debug_uart_init(void) +{ + phys_addr_t base = CONFIG_DEBUG_UART_BASE; + + geni_serial_init(base); + geni_serial_baud(base, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE); + qcom_geni_serial_start_tx(base); +} + +static inline void _debug_uart_putc(int ch) +{ + phys_addr_t base = CONFIG_DEBUG_UART_BASE; + + writel(DEF_TX_WM, base + SE_GENI_TX_WATERMARK_REG); + qcom_geni_serial_setup_tx(base, 1); + qcom_geni_serial_poll_bit(&init_dev, SE_GENI_M_IRQ_STATUS, + M_TX_FIFO_WATERMARK_EN, true); + + writel(ch, base + SE_GENI_TX_FIFOn); + writel(M_TX_FIFO_WATERMARK_EN, base + SE_GENI_M_IRQ_CLEAR); + qcom_geni_serial_poll_tx_done(&init_dev); +} + +DEBUG_UART_FUNCS + +#endif
Currently driver supports only version 1 and 2. Version 5 has slightly different registers structure
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com --- Changes for v2: - change string formats in debug statements Changes for v3: - remove if else braces where possible Changes for v4: - change variable type to fix pointer cast warning
MAINTAINERS | 1 + drivers/spmi/spmi-msm.c | 154 +++++++++++++++++++++++++++------------- 2 files changed, 105 insertions(+), 50 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS index 52ddc99cda..6b8b0783d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -392,6 +392,7 @@ F: drivers/phy/msm8916-usbh-phy.c F: drivers/serial/serial_msm.c F: drivers/serial/serial_msm_geni.c F: drivers/smem/msm_smem.c +F: drivers/spmi/spmi-msm.c F: drivers/usb/host/ehci-msm.c
ARM STI diff --git a/drivers/spmi/spmi-msm.c b/drivers/spmi/spmi-msm.c index 5a335e50aa..27a035c0a5 100644 --- a/drivers/spmi/spmi-msm.c +++ b/drivers/spmi/spmi-msm.c @@ -19,39 +19,63 @@ DECLARE_GLOBAL_DATA_PTR;
/* PMIC Arbiter configuration registers */ -#define PMIC_ARB_VERSION 0x0000 -#define PMIC_ARB_VERSION_V2_MIN 0x20010000 - -#define ARB_CHANNEL_OFFSET(n) (0x4 * (n)) -#define SPMI_CH_OFFSET(chnl) ((chnl) * 0x8000) - -#define SPMI_REG_CMD0 0x0 -#define SPMI_REG_CONFIG 0x4 -#define SPMI_REG_STATUS 0x8 -#define SPMI_REG_WDATA 0x10 -#define SPMI_REG_RDATA 0x18 - -#define SPMI_CMD_OPCODE_SHIFT 27 -#define SPMI_CMD_SLAVE_ID_SHIFT 20 -#define SPMI_CMD_ADDR_SHIFT 12 -#define SPMI_CMD_ADDR_OFFSET_SHIFT 4 -#define SPMI_CMD_BYTE_CNT_SHIFT 0 - -#define SPMI_CMD_EXT_REG_WRITE_LONG 0x00 -#define SPMI_CMD_EXT_REG_READ_LONG 0x01 - -#define SPMI_STATUS_DONE 0x1 +#define PMIC_ARB_VERSION 0x0000 +#define PMIC_ARB_VERSION_V2_MIN 0x20010000 +#define PMIC_ARB_VERSION_V3_MIN 0x30000000 +#define PMIC_ARB_VERSION_V5_MIN 0x50000000 + +#define APID_MAP_OFFSET_V1_V2_V3 (0x800) +#define APID_MAP_OFFSET_V5 (0x900) +#define ARB_CHANNEL_OFFSET(n) (0x4 * (n)) +#define SPMI_CH_OFFSET(chnl) ((chnl) * 0x8000) +#define SPMI_V5_OBS_CH_OFFSET(chnl) ((chnl) * 0x80) +#define SPMI_V5_RW_CH_OFFSET(chnl) ((chnl) * 0x10000) + +#define SPMI_REG_CMD0 0x0 +#define SPMI_REG_CONFIG 0x4 +#define SPMI_REG_STATUS 0x8 +#define SPMI_REG_WDATA 0x10 +#define SPMI_REG_RDATA 0x18 + +#define SPMI_CMD_OPCODE_SHIFT 27 +#define SPMI_CMD_SLAVE_ID_SHIFT 20 +#define SPMI_CMD_ADDR_SHIFT 12 +#define SPMI_CMD_ADDR_OFFSET_SHIFT 4 +#define SPMI_CMD_BYTE_CNT_SHIFT 0 + +#define SPMI_CMD_EXT_REG_WRITE_LONG 0x00 +#define SPMI_CMD_EXT_REG_READ_LONG 0x01 + +#define SPMI_STATUS_DONE 0x1 + +#define SPMI_MAX_CHANNELS 128 +#define SPMI_MAX_SLAVES 16 +#define SPMI_MAX_PERIPH 256 + +enum arb_ver { + V1 = 1, + V2, + V3, + V5 = 5 +};
-#define SPMI_MAX_CHANNELS 128 -#define SPMI_MAX_SLAVES 16 -#define SPMI_MAX_PERIPH 256 +/* + * PMIC arbiter version 5 uses different register offsets for read/write vs + * observer channels. + */ +enum pmic_arb_channel { + PMIC_ARB_CHANNEL_RW, + PMIC_ARB_CHANNEL_OBS, +};
struct msm_spmi_priv { - phys_addr_t arb_chnl; /* ARB channel mapping base */ + phys_addr_t arb_chnl; /* ARB channel mapping base */ phys_addr_t spmi_core; /* SPMI core */ - phys_addr_t spmi_obs; /* SPMI observer */ + phys_addr_t spmi_obs; /* SPMI observer */ /* SPMI channel map */ uint8_t channel_map[SPMI_MAX_SLAVES][SPMI_MAX_PERIPH]; + /* SPMI bus arbiter version */ + u32 arb_ver; };
static int msm_spmi_write(struct udevice *dev, int usid, int pid, int off, @@ -59,6 +83,7 @@ static int msm_spmi_write(struct udevice *dev, int usid, int pid, int off, { struct msm_spmi_priv *priv = dev_get_priv(dev); unsigned channel; + unsigned int ch_offset; uint32_t reg = 0;
if (usid >= SPMI_MAX_SLAVES) @@ -69,8 +94,8 @@ static int msm_spmi_write(struct udevice *dev, int usid, int pid, int off, channel = priv->channel_map[usid][pid];
/* Disable IRQ mode for the current channel*/ - writel(0x0, priv->spmi_core + SPMI_CH_OFFSET(channel) + - SPMI_REG_CONFIG); + writel(0x0, + priv->spmi_core + SPMI_CH_OFFSET(channel) + SPMI_REG_CONFIG);
/* Write single byte */ writel(val, priv->spmi_core + SPMI_CH_OFFSET(channel) + SPMI_REG_WDATA); @@ -82,6 +107,11 @@ static int msm_spmi_write(struct udevice *dev, int usid, int pid, int off, reg |= (off << SPMI_CMD_ADDR_OFFSET_SHIFT); reg |= 1; /* byte count */
+ if (priv->arb_ver == V5) + ch_offset = SPMI_V5_RW_CH_OFFSET(channel); + else + ch_offset = SPMI_CH_OFFSET(channel); + /* Send write command */ writel(reg, priv->spmi_core + SPMI_CH_OFFSET(channel) + SPMI_REG_CMD0);
@@ -104,6 +134,7 @@ static int msm_spmi_read(struct udevice *dev, int usid, int pid, int off) { struct msm_spmi_priv *priv = dev_get_priv(dev); unsigned channel; + unsigned int ch_offset; uint32_t reg = 0;
if (usid >= SPMI_MAX_SLAVES) @@ -113,8 +144,13 @@ static int msm_spmi_read(struct udevice *dev, int usid, int pid, int off)
channel = priv->channel_map[usid][pid];
+ if (priv->arb_ver == V5) + ch_offset = SPMI_V5_OBS_CH_OFFSET(channel); + else + ch_offset = SPMI_CH_OFFSET(channel); + /* Disable IRQ mode for the current channel*/ - writel(0x0, priv->spmi_obs + SPMI_CH_OFFSET(channel) + SPMI_REG_CONFIG); + writel(0x0, priv->spmi_obs + ch_offset + SPMI_REG_CONFIG);
/* Prepare read command */ reg |= SPMI_CMD_EXT_REG_READ_LONG << SPMI_CMD_OPCODE_SHIFT; @@ -124,13 +160,12 @@ static int msm_spmi_read(struct udevice *dev, int usid, int pid, int off) reg |= 1; /* byte count */
/* Request read */ - writel(reg, priv->spmi_obs + SPMI_CH_OFFSET(channel) + SPMI_REG_CMD0); + writel(reg, priv->spmi_obs + ch_offset + SPMI_REG_CMD0);
/* Wait till CMD DONE status */ reg = 0; while (!reg) { - reg = readl(priv->spmi_obs + SPMI_CH_OFFSET(channel) + - SPMI_REG_STATUS); + reg = readl(priv->spmi_obs + ch_offset + SPMI_REG_STATUS); }
if (reg ^ SPMI_STATUS_DONE) { @@ -139,8 +174,8 @@ static int msm_spmi_read(struct udevice *dev, int usid, int pid, int off) }
/* Read the data */ - return readl(priv->spmi_obs + SPMI_CH_OFFSET(channel) + - SPMI_REG_RDATA) & 0xFF; + return readl(priv->spmi_obs + ch_offset + + SPMI_REG_RDATA) & 0xFF; }
static struct dm_spmi_ops msm_spmi_ops = { @@ -150,31 +185,50 @@ static struct dm_spmi_ops msm_spmi_ops = {
static int msm_spmi_probe(struct udevice *dev) { - struct udevice *parent = dev->parent; struct msm_spmi_priv *priv = dev_get_priv(dev); - int node = dev_of_offset(dev); + phys_addr_t config_addr; u32 hw_ver; - bool is_v1; + u32 version; int i; + int err; + + config_addr = dev_read_addr_index(dev, 0); + priv->spmi_core = dev_read_addr_index(dev, 1); + priv->spmi_obs = dev_read_addr_index(dev, 2); + + hw_ver = readl(config_addr + PMIC_ARB_VERSION); + + if (hw_ver < PMIC_ARB_VERSION_V3_MIN) { + priv->arb_ver = V2; + version = 2; + priv->arb_chnl = config_addr + APID_MAP_OFFSET_V1_V2_V3; + } else if (hw_ver < PMIC_ARB_VERSION_V5_MIN) { + priv->arb_ver = V3; + version = 3; + priv->arb_chnl = config_addr + APID_MAP_OFFSET_V1_V2_V3; + } else { + priv->arb_ver = V5; + version = 5; + priv->arb_chnl = config_addr + APID_MAP_OFFSET_V5; + + if (err) { + dev_err(dev, "could not read APID->PPID mapping table, rc= %d\n", err); + return -1; + } + }
- priv->arb_chnl = dev_read_addr(dev); - priv->spmi_core = fdtdec_get_addr_size_auto_parent(gd->fdt_blob, - dev_of_offset(parent), node, "reg", 1, NULL, false); - priv->spmi_obs = fdtdec_get_addr_size_auto_parent(gd->fdt_blob, - dev_of_offset(parent), node, "reg", 2, NULL, false); - - hw_ver = readl(priv->arb_chnl + PMIC_ARB_VERSION - 0x800); - is_v1 = (hw_ver < PMIC_ARB_VERSION_V2_MIN); - - dev_dbg(dev, "PMIC Arb Version-%d (0x%x)\n", (is_v1 ? 1 : 2), hw_ver); + dev_dbg(dev, "PMIC Arb Version-%d (0x%x)\n", version, hw_ver);
if (priv->arb_chnl == FDT_ADDR_T_NONE || priv->spmi_core == FDT_ADDR_T_NONE || priv->spmi_obs == FDT_ADDR_T_NONE) return -EINVAL;
+ dev_dbg(dev, "priv->arb_chnl address (%llu)\n", priv->arb_chnl); + dev_dbg(dev, "priv->spmi_core address (%llu)\n", priv->spmi_core); + dev_dbg(dev, "priv->spmi_obs address (%llu)\n", priv->spmi_obs); /* Scan peripherals connected to each SPMI channel */ - for (i = 0; i < SPMI_MAX_PERIPH ; i++) { + for (i = 0; i < SPMI_MAX_PERIPH; i++) { uint32_t periph = readl(priv->arb_chnl + ARB_CHANNEL_OFFSET(i)); uint8_t slave_id = (periph & 0xf0000) >> 16; uint8_t pid = (periph & 0xff00) >> 8; @@ -195,5 +249,5 @@ U_BOOT_DRIVER(msm_spmi) = { .of_match = msm_spmi_ids, .ops = &msm_spmi_ops, .probe = msm_spmi_probe, - .priv_auto = sizeof(struct msm_spmi_priv), + .priv_auto = sizeof(struct msm_spmi_priv), };
On Fri, 8 Oct 2021 at 05:43, Dzmitry Sankouski dsankouski@gmail.com wrote:
Currently driver supports only version 1 and 2. Version 5 has slightly different registers structure
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com
Changes for v2:
- change string formats in debug statements
Changes for v3:
- remove if else braces where possible
Changes for v4:
- change variable type to fix pointer cast warning
MAINTAINERS | 1 + drivers/spmi/spmi-msm.c | 154 +++++++++++++++++++++++++++------------- 2 files changed, 105 insertions(+), 50 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Samsung S9 SM-G9600 - Snapdragon SDM845 version of the phone, for China \ Hong Kong markets. Has unlockable bootloader, unlike SM-G960U (American market version), which allows running u-boot as a chain-loaded bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com --- Changes for v2: - Create documentation file for SDM845 boards - Add starqltechn board documentation Changes for v3: - fix comment in starqltechn.c Changes for v4: - move configs to Kconfig file - remove starqltechn.h file - set SYS_CONFIG_NAME to default of sdm845 - remove unneeded options from starqltechn_defconfig
arch/arm/dts/Makefile | 1 + arch/arm/dts/starqltechn-uboot.dtsi | 39 ++++++++++++++++++ arch/arm/dts/starqltechn.dts | 53 +++++++++++++++++++++++++ arch/arm/mach-snapdragon/Kconfig | 17 ++++++++ board/samsung/starqltechn/Kconfig | 22 ++++++++++ board/samsung/starqltechn/MAINTAINERS | 6 +++ board/samsung/starqltechn/Makefile | 9 +++++ board/samsung/starqltechn/starqltechn.c | 10 +++++ configs/starqltechn_defconfig | 30 ++++++++++++++ doc/board/qualcomm/index.rst | 1 + doc/board/qualcomm/sdm845.rst | 38 ++++++++++++++++++ 11 files changed, 226 insertions(+) create mode 100644 arch/arm/dts/starqltechn-uboot.dtsi create mode 100644 arch/arm/dts/starqltechn.dts create mode 100644 board/samsung/starqltechn/Kconfig create mode 100644 board/samsung/starqltechn/MAINTAINERS create mode 100644 board/samsung/starqltechn/Makefile create mode 100644 board/samsung/starqltechn/starqltechn.c create mode 100644 configs/starqltechn_defconfig create mode 100644 doc/board/qualcomm/sdm845.rst
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 82a0790cc0..90d922dab7 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -467,6 +467,7 @@ dtb-$(CONFIG_TARGET_SL28) += fsl-ls1028a-kontron-sl28.dtb \
dtb-$(CONFIG_TARGET_DRAGONBOARD410C) += dragonboard410c.dtb dtb-$(CONFIG_TARGET_DRAGONBOARD820C) += dragonboard820c.dtb +dtb-$(CONFIG_TARGET_STARQLTECHN) += starqltechn.dtb
dtb-$(CONFIG_TARGET_STEMMY) += ste-ux500-samsung-stemmy.dtb
diff --git a/arch/arm/dts/starqltechn-uboot.dtsi b/arch/arm/dts/starqltechn-uboot.dtsi new file mode 100644 index 0000000000..d8d75e018a --- /dev/null +++ b/arch/arm/dts/starqltechn-uboot.dtsi @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * U-Boot addition to handle Samsung S9 SM-G9600 (starqltechn) pins + * + * (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com + * + */ + +/ +{ + soc { + u-boot,dm-pre-reloc; + gcc { + clock-controller@100000 { + u-boot,dm-pre-reloc; + }; + serial@0xa84000 { + u-boot,dm-pre-reloc; + }; + gpio_north@3900000 { + u-boot,dm-pre-reloc; + }; + pinctrl@3900000 { + u-boot,dm-pre-reloc; + }; + }; + }; +}; + +&pm8998_pon { + key_vol_down { + gpios = <&pm8998_pon 1 0>; + label = "key_vol_down"; + }; + key_power { + gpios = <&pm8998_pon 0 0>; + label = "key_power"; + }; +}; diff --git a/arch/arm/dts/starqltechn.dts b/arch/arm/dts/starqltechn.dts new file mode 100644 index 0000000000..387420f30b --- /dev/null +++ b/arch/arm/dts/starqltechn.dts @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Samsung S9 SM-G9600 (starqltechn) board device tree source + * + * (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com + * + */ + +/dts-v1/; + +#include "sdm845.dtsi" + +/ { + model = "Samsung S9 (SM-G9600)"; + compatible = "qcom,sdm845-mtp", "qcom,sdm845", "qcom,mtp"; + #address-cells = <2>; + #size-cells = <2>; + + chosen { + stdout-path = "serial0:921600n8"; + }; + + aliases { + serial0 = &debug_uart; + }; + + memory { + device_type = "memory"; + reg = <0 0x80000000 0 0xfe1bffff>; + }; + + psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + + soc: soc { + serial@0xa84000 { + status = "ok"; + }; + + pinctrl@3900000 { + muic_i2c: muic_i2c { + pins = "GPIO_33", "GPIO_34"; + drive-strength = <0x2>; + function = "gpio"; + bias-disable; + }; + }; + }; +}; + +#include "starqltechn-uboot.dtsi" diff --git a/arch/arm/mach-snapdragon/Kconfig b/arch/arm/mach-snapdragon/Kconfig index 1a6a608967..12cf02a56a 100644 --- a/arch/arm/mach-snapdragon/Kconfig +++ b/arch/arm/mach-snapdragon/Kconfig @@ -12,6 +12,10 @@ config SPL_SYS_MALLOC_F_LEN config SDM845 bool "Qualcomm Snapdragon 845 SoC" default n + select LINUX_KERNEL_IMAGE_HEADER + +config LNX_KRNL_IMG_TEXT_OFFSET_BASE + default 0x80000000
choice prompt "Snapdragon board select" @@ -40,9 +44,22 @@ config TARGET_DRAGONBOARD820C - 3GiB RAM - 32GiB UFS drive
+config TARGET_STARQLTECHN + bool "Samsung S9 SM-G9600(starqltechn)" + help + Support for Samsung S9 SM-G9600(starqltechn) board. + Features: + - Qualcomm Snapdragon SDM845 SoC + - 4GiB RAM + - 64GiB UFS drive + select MISC_INIT_R + select SDM845 + select DM_ETH if NET + endchoice
source "board/qualcomm/dragonboard410c/Kconfig" source "board/qualcomm/dragonboard820c/Kconfig" +source "board/samsung/starqltechn/Kconfig"
endif diff --git a/board/samsung/starqltechn/Kconfig b/board/samsung/starqltechn/Kconfig new file mode 100644 index 0000000000..0eea666d03 --- /dev/null +++ b/board/samsung/starqltechn/Kconfig @@ -0,0 +1,22 @@ +if TARGET_STARQLTECHN + +config SYS_BOARD + default "starqltechn" + help + starqltechn is a production board for S9 and S9+ phones(SM-G96x0) phones based on SDM845 SoC. + +config SYS_CONFIG_NAME + string "Board configuration name" + default "sdm845" + help + This option contains information about board configuration name. + Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header + will be used for board configuration. + +config SYS_VENDOR + default "samsung" + +config SYS_CONFIG_NAME + default "starqltechn" + +endif diff --git a/board/samsung/starqltechn/MAINTAINERS b/board/samsung/starqltechn/MAINTAINERS new file mode 100644 index 0000000000..135cafdd69 --- /dev/null +++ b/board/samsung/starqltechn/MAINTAINERS @@ -0,0 +1,6 @@ +Samsung S9 (SM-G9600)(starqltechn) Board +M: Dzmitry Sankouski dsankouski@gmail.com +S: Maintained +F: board/samsung/starqltechn/ +F: include/configs/starqltechn.h +F: configs/starqltechn_defconfig diff --git a/board/samsung/starqltechn/Makefile b/board/samsung/starqltechn/Makefile new file mode 100644 index 0000000000..c38c0b4710 --- /dev/null +++ b/board/samsung/starqltechn/Makefile @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com +# +# This empty file prevents make error. +# Board logic defined in board/qualcomm/common/sdm845.c, no custom logic for starqltechn so far. +# + +obj-y += starqltechn.o diff --git a/board/samsung/starqltechn/starqltechn.c b/board/samsung/starqltechn/starqltechn.c new file mode 100644 index 0000000000..f2cdb4eec2 --- /dev/null +++ b/board/samsung/starqltechn/starqltechn.c @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * This empty file prevents make linking error. + * No custom logic for starqltechn so far. + * + * (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com + * + */ + +void nooop(void) {} diff --git a/configs/starqltechn_defconfig b/configs/starqltechn_defconfig new file mode 100644 index 0000000000..438a6c2f05 --- /dev/null +++ b/configs/starqltechn_defconfig @@ -0,0 +1,30 @@ +CONFIG_TARGET_STARQLTECHN=y +CONFIG_ARM=y +CONFIG_ARM_SMCCC=y +CONFIG_ARCH_SNAPDRAGON=y +CONFIG_IDENT_STRING="\nSamsung S9 SM-G9600" +CONFIG_DEFAULT_DEVICE_TREE="starqltechn" +CONFIG_SYS_TEXT_BASE=0x80000000 +CONFIG_POSITION_INDEPENDENT=y +CONFIG_BOARD_EARLY_INIT_F=n +CONFIG_SKIP_LOWLEVEL_INIT=y +CONFIG_DISPLAY_CPUINFO=n +CONFIG_HUSH_PARSER=y +CONFIG_OF_CONTROL=y +CONFIG_DM_STDIO=n +CONFIG_MSM_GPIO=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_PM8916=y +CONFIG_PM8916_GPIO=y +CONFIG_SPMI_MSM=y +CONFIG_CLK=y +CONFIG_NET=n +CONFIG_USE_PREBOOT=y +CONFIG_CMD_GPIO=y +CONFIG_PINCTRL=y +CONFIG_MSM_GENI_SERIAL=y +# CONFIG_DEBUG_UART=y +# CONFIG_DEBUG_UART_MSM_GENI=y +# CONFIG_DEBUG_UART_BASE=0xa84000 +# CONFIG_DEBUG_UART_CLOCK=7372800 +# CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/doc/board/qualcomm/index.rst b/doc/board/qualcomm/index.rst index f7e0aa9298..10b98214e9 100644 --- a/doc/board/qualcomm/index.rst +++ b/doc/board/qualcomm/index.rst @@ -7,3 +7,4 @@ Qualcomm :maxdepth: 2
dragonboard410c + sdm845 diff --git a/doc/board/qualcomm/sdm845.rst b/doc/board/qualcomm/sdm845.rst new file mode 100644 index 0000000000..cd46cbe9cf --- /dev/null +++ b/doc/board/qualcomm/sdm845.rst @@ -0,0 +1,38 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. sectionauthor:: Dzmitry Sankouski dsankouski@gmail.com + +Snapdragon 845 +================ + +About this +---------- +This document describes the information about Qualcomm Snapdragon 845 +supported boards and it's usage steps. + +SDM845 - hi-end qualcomm chip, introduced in late 2017. +Mostly used in flagship phones and tablets of 2018. + +U-Boot can be used as a replacement for Qualcomm's original ABL (UEFI) bootloader. +It is loaded as an Android boot image through ABL + +Installation +------------ +First, setup ``CROSS_COMPILE`` for aarch64. Then, build U-Boot for your board:: + + $ export CROSS_COMPILE=<aarch64 toolchain prefix> + $ make <your board name here, see Boards section>_defconfig + $ make + +This will build ``u-boot.bin`` in the configured output directory. + +Boards +------------ +starqlte +^^^^^^^^^^^^ + +The starqltechn is a production board for Samsung S9 (SM-G9600) phone, +based on the Qualcomm SDM845 SoC. + +More information can be found on the `Samsung S9 page`_. + +.. _Samsung S9 page: https://en.wikipedia.org/wiki/Samsung_Galaxy_S9
Hi Dzmitry,
On Sat, 9 Oct 2021 at 22:11, Dzmitry Sankouski dsankouski@gmail.com wrote:
Samsung S9 SM-G9600 - Snapdragon SDM845 version of the phone, for China \ Hong Kong markets. Has unlockable bootloader, unlike SM-G960U (American market version), which allows running u-boot as a chain-loaded bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com
Changes for v2:
- Create documentation file for SDM845 boards
- Add starqltechn board documentation
Changes for v3:
- fix comment in starqltechn.c
Changes for v4:
- move configs to Kconfig file
- remove starqltechn.h file
- set SYS_CONFIG_NAME to default of sdm845
- remove unneeded options from starqltechn_defconfig
arch/arm/dts/Makefile | 1 + arch/arm/dts/starqltechn-uboot.dtsi | 39 ++++++++++++++++++ arch/arm/dts/starqltechn.dts | 53 +++++++++++++++++++++++++ arch/arm/mach-snapdragon/Kconfig | 17 ++++++++ board/samsung/starqltechn/Kconfig | 22 ++++++++++ board/samsung/starqltechn/MAINTAINERS | 6 +++ board/samsung/starqltechn/Makefile | 9 +++++ board/samsung/starqltechn/starqltechn.c | 10 +++++ configs/starqltechn_defconfig | 30 ++++++++++++++ doc/board/qualcomm/index.rst | 1 + doc/board/qualcomm/sdm845.rst | 38 ++++++++++++++++++ 11 files changed, 226 insertions(+) create mode 100644 arch/arm/dts/starqltechn-uboot.dtsi create mode 100644 arch/arm/dts/starqltechn.dts create mode 100644 board/samsung/starqltechn/Kconfig create mode 100644 board/samsung/starqltechn/MAINTAINERS create mode 100644 board/samsung/starqltechn/Makefile create mode 100644 board/samsung/starqltechn/starqltechn.c create mode 100644 configs/starqltechn_defconfig create mode 100644 doc/board/qualcomm/sdm845.rst
Reviewed-by: Simon Glass sjg@chromium.org
In the docs, can you explain how to load U-Boot on the board?
Hi Simon,
Currently, I test u-boot with linux kexec method, it's the easy non-invasive way to get debug uart on starqltechn phone. I wasn't able to boot something with u-boot on that phone yet.
I'm planning to add a followup patch, once I'll have clear working instruction, i.e. once I manage to boot something on that phone, and pack that into Android boot image.
чт, 14 окт. 2021 г. в 18:10, Simon Glass sjg@chromium.org:
Hi Dzmitry,
On Sat, 9 Oct 2021 at 22:11, Dzmitry Sankouski dsankouski@gmail.com wrote:
Samsung S9 SM-G9600 - Snapdragon SDM845 version of the phone, for China \ Hong Kong markets. Has unlockable bootloader, unlike SM-G960U (American market version), which allows running u-boot as a chain-loaded bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com
Changes for v2:
- Create documentation file for SDM845 boards
- Add starqltechn board documentation
Changes for v3:
- fix comment in starqltechn.c
Changes for v4:
- move configs to Kconfig file
- remove starqltechn.h file
- set SYS_CONFIG_NAME to default of sdm845
- remove unneeded options from starqltechn_defconfig
arch/arm/dts/Makefile | 1 + arch/arm/dts/starqltechn-uboot.dtsi | 39 ++++++++++++++++++ arch/arm/dts/starqltechn.dts | 53 +++++++++++++++++++++++++ arch/arm/mach-snapdragon/Kconfig | 17 ++++++++ board/samsung/starqltechn/Kconfig | 22 ++++++++++ board/samsung/starqltechn/MAINTAINERS | 6 +++ board/samsung/starqltechn/Makefile | 9 +++++ board/samsung/starqltechn/starqltechn.c | 10 +++++ configs/starqltechn_defconfig | 30 ++++++++++++++ doc/board/qualcomm/index.rst | 1 + doc/board/qualcomm/sdm845.rst | 38 ++++++++++++++++++ 11 files changed, 226 insertions(+) create mode 100644 arch/arm/dts/starqltechn-uboot.dtsi create mode 100644 arch/arm/dts/starqltechn.dts create mode 100644 board/samsung/starqltechn/Kconfig create mode 100644 board/samsung/starqltechn/MAINTAINERS create mode 100644 board/samsung/starqltechn/Makefile create mode 100644 board/samsung/starqltechn/starqltechn.c create mode 100644 configs/starqltechn_defconfig create mode 100644 doc/board/qualcomm/sdm845.rst
Reviewed-by: Simon Glass sjg@chromium.org
In the docs, can you explain how to load U-Boot on the board?
Hi Dzmitry,
On Fri, 8 Oct 2021 at 00:46, Dzmitry Sankouski dsankouski@gmail.com wrote:
Generic Interface (GENI) Serial Engine (SE) based uart can be found on newer qualcomm SOCs, starting from SDM845. Tested on Samsung SM-G9600(starqltechn) by chain-loading u-boot with stock bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com
Changes for v2:
- change functions return type to void, where possible
- remove '.' from summary line
Changes for v3:
- move function open brace on new line
- use tab between define name and value
- define: wrap expression with braces, remove braces from constants
Changes for v4:
- add linux/delay.h header
MAINTAINERS | 1 + .../serial/msm-geni-serial.txt | 6 + drivers/serial/Kconfig | 17 + drivers/serial/Makefile | 1 + drivers/serial/serial_msm_geni.c | 603 ++++++++++++++++++ 5 files changed, 628 insertions(+) create mode 100644 doc/device-tree-bindings/serial/msm-geni-serial.txt create mode 100644 drivers/serial/serial_msm_geni.c
Reviewed-by: Simon Glass sjg@chromium.org
Some nits below
diff --git a/MAINTAINERS b/MAINTAINERS index 776ff703b9..52ddc99cda 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -390,6 +390,7 @@ F: drivers/gpio/msm_gpio.c F: drivers/mmc/msm_sdhci.c F: drivers/phy/msm8916-usbh-phy.c F: drivers/serial/serial_msm.c +F: drivers/serial/serial_msm_geni.c F: drivers/smem/msm_smem.c F: drivers/usb/host/ehci-msm.c
diff --git a/doc/device-tree-bindings/serial/msm-geni-serial.txt b/doc/device-tree-bindings/serial/msm-geni-serial.txt new file mode 100644 index 0000000000..9eadc2561b --- /dev/null +++ b/doc/device-tree-bindings/serial/msm-geni-serial.txt @@ -0,0 +1,6 @@ +Qualcomm GENI UART
+Required properties: +- compatible: must be "qcom,msm-geni-uart" +- reg: start address and size of the registers +- clock: interface clock (must accept baudrate as a frequency) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 93348c0929..b420a5720d 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -278,6 +278,14 @@ config DEBUG_UART_S5P will need to provide parameters to make this work. The driver will be available until the real driver-model serial is running.
+config DEBUG_UART_MSM_GENI
Do you need this? Most drivers just use the existing DEBUG_UART Kconfig.
bool "Qualcomm snapdragon"depends on ARCH_SNAPDRAGONhelpSelect this to enable a debug UART using the serial_msm driver. Youwill need to provide parameters to make this work. The driver willbe available until the real driver-model serial is running.config DEBUG_UART_MESON bool "Amlogic Meson" depends on MESON_SERIAL @@ -783,6 +791,15 @@ config MSM_SERIAL for example APQ8016 and MSM8916. Single baudrate is supported in current implementation (115200).
+config MSM_GENI_SERIAL
bool "Qualcomm on-chip GENI UART"helpSupport UART based on Generic Interface (GENI) Serial Engine (SE), used on Qualcomm Snapdragon SoCs.Should support all qualcomm SOCs with Qualcomm Universal Peripheral (QUP) Wrapper cores,
80cols
i.e. newer ones, starting from SDM845.Driver works in FIFO mode.Multiple baudrates supported.config OCTEON_SERIAL_BOOTCMD bool "MIPS Octeon PCI remote bootcmd input" depends on ARCH_OCTEON diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 3cbea8156f..d44caf4ea2 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o obj-$(CONFIG_BCM283X_PL011_SERIAL) += serial_bcm283x_pl011.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o +obj-$(CONFIG_MSM_GENI_SERIAL) += serial_msm_geni.o obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o obj-$(CONFIG_MPC8XX_CONS) += serial_mpc8xx.o obj-$(CONFIG_NULLDEV_SERIAL) += serial_nulldev.o diff --git a/drivers/serial/serial_msm_geni.c b/drivers/serial/serial_msm_geni.c new file mode 100644 index 0000000000..c656d54cbb --- /dev/null +++ b/drivers/serial/serial_msm_geni.c @@ -0,0 +1,603 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Qualcomm GENI serial engine UART driver
- (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com
- Based on Linux driver.
- */
+#include <asm/io.h> +#include <clk.h> +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <errno.h> +#include <linux/compiler.h> +#include <log.h> +#include <linux/delay.h> +#include <malloc.h> +#include <serial.h> +#include <watchdog.h>
+#define UART_OVERSAMPLING 32 +#define STALE_TIMEOUT 160 +#define SE_UART_RX_STALE_CNT 0x294 +#define S_GENI_CMD_ABORT (BIT(1))
+#define SE_GENI_S_CMD_CTRL_REG 0x634 +#define SE_GENI_M_CMD_CTRL_REG 0x604
+/* GENI_M_CMD_CTRL_REG */ +#define M_GENI_CMD_CANCEL (BIT(2)) +#define M_GENI_CMD_ABORT (BIT(1)) +#define M_GENI_DISABLE (BIT(0))
+/* GENI_S_CMD0 fields */ +#define S_OPCODE_MSK (GENMASK(31, 27)) +#define S_OPCODE_SHFT 27 +#define S_PARAMS_MSK (GENMASK(26, 0))
+/* GENI_STATUS fields */ +#define M_GENI_CMD_ACTIVE (BIT(0)) +#define S_GENI_CMD_ACTIVE (BIT(12)) +#define S_CMD_DONE_EN (BIT(0)) +#define M_CMD_DONE_EN (BIT(0))
+#define USEC_PER_SEC 1000000L
+#define SE_GENI_STATUS 0x40 +#define GENI_SER_M_CLK_CFG 0x48 +#define GENI_SER_S_CLK_CFG 0x4C +#define SE_GENI_M_CMD0 0x600 +#define SE_GENI_M_IRQ_CLEAR 0x618 +#define SE_GENI_S_IRQ_STATUS 0x640 +#define SE_GENI_S_IRQ_CLEAR 0x648 +#define SE_GENI_S_IRQ_EN 0x644 +#define SE_GENI_M_IRQ_EN 0x614 +#define SE_GENI_TX_FIFOn 0x700 +#define SE_GENI_RX_FIFOn 0x780 +#define SE_GENI_TX_FIFO_STATUS 0x800 +#define SE_GENI_RX_FIFO_STATUS 0x804 +#define SE_GENI_TX_WATERMARK_REG 0x80C +#define M_TX_FIFO_WATERMARK_EN (BIT(30)) +#define DEF_TX_WM 2 +#define SE_UART_TX_TRANS_LEN 0x270 +#define SE_GENI_TX_PACKING_CFG0 0x260 +#define SE_GENI_TX_PACKING_CFG1 0x264 +#define SE_GENI_RX_PACKING_CFG0 0x284 +#define SE_GENI_RX_PACKING_CFG1 0x288 +#define SE_UART_TX_STOP_BIT_LEN 0x26c +#define SE_UART_TX_WORD_LEN 0x268 +#define SE_UART_RX_WORD_LEN 0x28c +#define SE_UART_RX_TRANS_CFG 0x280 +#define SE_UART_RX_PARITY_CFG 0x2a8 +#define SE_UART_TX_TRANS_CFG 0x25c +#define SE_UART_TX_PARITY_CFG 0x2a4
+#define GENI_FORCE_DEFAULT_REG 0x20 +/* GENI_FORCE_DEFAULT_REG fields */ +#define FORCE_DEFAULT (BIT(0))
+#define S_CMD_ABORT_EN (BIT(5))
+#define SE_GENI_S_CMD0 0x630 +#define UART_START_READ 0x1
+/* GENI_M_CMD_CTRL_REG */ +#define M_GENI_CMD_CANCEL (BIT(2)) +#define M_GENI_CMD_ABORT (BIT(1)) +#define M_GENI_DISABLE (BIT(0))
+#define M_CMD_ABORT_EN (BIT(5))
+#define M_CMD_DONE_EN (BIT(0)) +#define M_CMD_DONE_DISABLE_MASK (~M_CMD_DONE_EN) +#define SE_GENI_M_IRQ_STATUS 0x610
+#define M_OPCODE_SHIFT 27 +#define S_OPCODE_SHIFT 27 +#define M_TX_FIFO_WATERMARK_EN (BIT(30)) +#define UART_START_TX 0x1 +#define UART_CTS_MASK (BIT(1)) +#define M_SEC_IRQ_EN (BIT(31)) +#define TX_FIFO_WC_MSK (GENMASK(27, 0)) +#define RX_FIFO_WC_MSK (GENMASK(24, 0))
+#define S_RX_FIFO_WATERMARK_EN (BIT(26)) +#define S_RX_FIFO_LAST_EN (BIT(27)) +#define M_RX_FIFO_WATERMARK_EN (BIT(26)) +#define M_RX_FIFO_LAST_EN (BIT(27))
+/* GENI_SER_M_CLK_CFG/GENI_SER_S_CLK_CFG */ +#define SER_CLK_EN (BIT(0)) +#define CLK_DIV_MSK (GENMASK(15, 4)) +#define CLK_DIV_SHFT 4
+#define SE_HW_PARAM_0 0xE24 +/* SE_HW_PARAM_0 fields */ +#define TX_FIFO_WIDTH_MSK (GENMASK(29, 24)) +#define TX_FIFO_WIDTH_SHFT 24 +#define TX_FIFO_DEPTH_MSK (GENMASK(21, 16)) +#define TX_FIFO_DEPTH_SHFT 16
+DECLARE_GLOBAL_DATA_PTR;
+struct msm_serial_data {
phys_addr_t base;u32 baud;+};
+static int get_clk_cfg(unsigned long clk_freq, unsigned long *ser_clk)
function comment...what does it return?
+{
unsigned long root_freq[] = {7372800, 14745600, 19200000, 29491200,32000000, 48000000, 64000000, 80000000,96000000, 100000000};int i;int match = -1;for (i = 0; i < ARRAY_SIZE(root_freq); i++) {if (clk_freq > root_freq[i])continue;if (!(root_freq[i] % clk_freq)) {match = i;break;}}if (match != -1)*ser_clk = root_freq[match];elsepr_err("clk_freq %ld\n", clk_freq);return match;+}
+static int get_clk_div_rate(u32 baud, u64 *desired_clk_rate)
function comment
+{
unsigned long ser_clk;int dfs_index;int clk_div = 0;*desired_clk_rate = baud * UART_OVERSAMPLING;dfs_index = get_clk_cfg(*desired_clk_rate, &ser_clk);if (dfs_index < 0) {pr_err("%s: Can't find matching DFS entry for baud %d\n",__func__, baud);clk_div = -EINVAL;goto exit_get_clk_div_rate;}clk_div = ser_clk / *desired_clk_rate;*desired_clk_rate = ser_clk;+exit_get_clk_div_rate:
return clk_div;+}
+static int geni_serial_set_clock_rate(struct udevice *dev, u64 rate) +{
struct clk *clk;int ret;clk = devm_clk_get(dev, "se-clk");if (!clk)return -EINVAL;ret = clk_set_rate(clk, rate);return ret;+}
+/**
- geni_se_get_tx_fifo_depth() - Get the TX fifo depth of the serial engine
- @base: Pointer to the concerned serial engine.
- This function is used to get the depth i.e. number of elements in the
- TX fifo of the serial engine.
- Return: TX fifo depth in units of FIFO words.
- */
+static inline u32 geni_se_get_tx_fifo_depth(long base) +{
u32 tx_fifo_depth;tx_fifo_depth = ((readl(base + SE_HW_PARAM_0) & TX_FIFO_DEPTH_MSK) >>TX_FIFO_DEPTH_SHFT);return tx_fifo_depth;+}
+/**
- geni_se_get_tx_fifo_width() - Get the TX fifo width of the serial engine
- @base: Pointer to the concerned serial engine.
- This function is used to get the width i.e. word size per element in the
- TX fifo of the serial engine.
- Return: TX fifo width in bits
- */
+static inline u32 geni_se_get_tx_fifo_width(long base) +{
u32 tx_fifo_width;tx_fifo_width = ((readl(base + SE_HW_PARAM_0) & TX_FIFO_WIDTH_MSK) >>TX_FIFO_WIDTH_SHFT);return tx_fifo_width;+}
+static inline void geni_serial_baud(phys_addr_t base_address, u64 uclk,
int baud)+{
u32 clk_div;u32 s_clk_cfg = 0;clk_div = get_clk_div_rate(baud, &uclk);s_clk_cfg |= SER_CLK_EN;s_clk_cfg |= (clk_div << CLK_DIV_SHFT);writel(s_clk_cfg, base_address + GENI_SER_M_CLK_CFG);writel(s_clk_cfg, base_address + GENI_SER_S_CLK_CFG);+}
+int msm_serial_setbrg(struct udevice *dev, int baud) +{
struct msm_serial_data *priv = dev_get_priv(dev);priv->baud = baud;u32 clk_div;u64 clk_rate;clk_div = get_clk_div_rate(baud, &clk_rate);geni_serial_set_clock_rate(dev, clk_rate);geni_serial_baud(priv->base, clk_rate, baud);return 0;+}
+static bool qcom_geni_serial_poll_bit(const struct udevice *dev, int offset,
int field, bool set)
function comment
+{
u32 reg;struct msm_serial_data *priv = dev_get_priv(dev);unsigned int baud;unsigned int tx_fifo_depth;unsigned int tx_fifo_width;unsigned int fifo_bits;unsigned long timeout_us = 10000;baud = 115200;if (priv) {baud = priv->baud;if (!baud)baud = 115200;tx_fifo_depth = geni_se_get_tx_fifo_depth(priv->base);tx_fifo_width = geni_se_get_tx_fifo_width(priv->base);fifo_bits = tx_fifo_depth * tx_fifo_width;/** Total polling iterations based on FIFO worth of bytes to be* sent at current baud. Add a little fluff to the wait.*/timeout_us = ((fifo_bits * USEC_PER_SEC) / baud) + 500;}/** Use custom implementation instead of readl_poll_atomic since ktimer* is not ready at the time of early console.
This comment seems to relate only to Linux?
*/timeout_us = DIV_ROUND_UP(timeout_us, 10) * 10;while (timeout_us) {reg = readl(priv->base + offset);if ((bool)(reg & field) == set)return true;udelay(10);timeout_us -= 10;}return false;+}
+static void qcom_geni_serial_setup_tx(u64 base, u32 xmit_size) +{
u32 m_cmd;writel(xmit_size, base + SE_UART_TX_TRANS_LEN);m_cmd = UART_START_TX << M_OPCODE_SHIFT;writel(m_cmd, base + SE_GENI_M_CMD0);+}
+static inline void qcom_geni_serial_poll_tx_done(const struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);int done = 0;u32 irq_clear = M_CMD_DONE_EN;done = qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_CMD_DONE_EN, true);if (!done) {writel(M_GENI_CMD_ABORT, priv->base + SE_GENI_M_CMD_CTRL_REG);irq_clear |= M_CMD_ABORT_EN;qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_CMD_ABORT_EN, true);}writel(irq_clear, priv->base + SE_GENI_M_IRQ_CLEAR);+}
+static u32 qcom_geni_serial_tx_empty(u64 base) +{
return !readl(base + SE_GENI_TX_FIFO_STATUS);+}
+/**
- geni_se_setup_s_cmd() - Setup the secondary sequencer
- @se: Pointer to the concerned serial engine.
- @cmd: Command/Operation to setup in the secondary sequencer.
- @params: Parameter for the sequencer command.
- This function is used to configure the secondary sequencer with the
- command and its associated parameters.
- */
+static inline void geni_se_setup_s_cmd(u64 base, u32 cmd, u32 params) +{
u32 s_cmd;s_cmd = readl(base + SE_GENI_S_CMD0);s_cmd &= ~(S_OPCODE_MSK | S_PARAMS_MSK);s_cmd |= (cmd << S_OPCODE_SHFT);s_cmd |= (params & S_PARAMS_MSK);writel(s_cmd, base + SE_GENI_S_CMD0);+}
+static void qcom_geni_serial_start_tx(u64 base) +{
u32 irq_en;u32 status;status = readl(base + SE_GENI_STATUS);if (status & M_GENI_CMD_ACTIVE)return;if (!qcom_geni_serial_tx_empty(base))return;irq_en = readl(base + SE_GENI_M_IRQ_EN);irq_en |= M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN;writel(DEF_TX_WM, base + SE_GENI_TX_WATERMARK_REG);writel(irq_en, base + SE_GENI_M_IRQ_EN);+}
+static void qcom_geni_serial_start_rx(struct udevice *dev) +{
u32 irq_en;u32 status;struct msm_serial_data *priv = dev_get_priv(dev);status = readl(priv->base + SE_GENI_STATUS);geni_se_setup_s_cmd(priv->base, UART_START_READ, 0);irq_en = readl(priv->base + SE_GENI_S_IRQ_EN);irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;writel(irq_en, priv->base + SE_GENI_S_IRQ_EN);
setbits_le32() ?
irq_en = readl(priv->base + SE_GENI_M_IRQ_EN);irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;writel(irq_en, priv->base + SE_GENI_M_IRQ_EN);
here too
+}
+static void msm_geni_serial_setup_rx(struct udevice *dev) +{
u32 irq_clear = S_CMD_DONE_EN;u32 geni_s_irq_en;u32 geni_m_irq_en;u32 cfg0;u32 cfg1;struct msm_serial_data *priv = dev_get_priv(dev);irq_clear |= S_CMD_ABORT_EN;writel(S_GENI_CMD_ABORT, priv->base + SE_GENI_S_CMD_CTRL_REG);qcom_geni_serial_poll_bit(dev, SE_GENI_S_CMD_CTRL_REG, S_GENI_CMD_ABORT,false);writel(irq_clear, priv->base + SE_GENI_S_IRQ_CLEAR);writel(FORCE_DEFAULT, priv->base + GENI_FORCE_DEFAULT_REG);cfg0 = 0xf;
What is this? Can we have #define/enum/comment?
cfg1 = 0x0;writel(cfg0, priv->base + SE_GENI_RX_PACKING_CFG0);writel(cfg1, priv->base + SE_GENI_RX_PACKING_CFG1);geni_se_setup_s_cmd(priv->base, UART_START_READ, 0);geni_s_irq_en = readl(priv->base + SE_GENI_S_IRQ_EN);geni_m_irq_en = readl(priv->base + SE_GENI_M_IRQ_EN);geni_s_irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;geni_m_irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;writel(geni_s_irq_en, priv->base + SE_GENI_S_IRQ_EN);writel(geni_m_irq_en, priv->base + SE_GENI_M_IRQ_EN);+}
+static int msm_serial_putc(struct udevice *dev, const char ch) +{
struct msm_serial_data *priv = dev_get_priv(dev);writel(DEF_TX_WM, priv->base + SE_GENI_TX_WATERMARK_REG);qcom_geni_serial_setup_tx(priv->base, 1);qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_TX_FIFO_WATERMARK_EN, true);writel(ch, priv->base + SE_GENI_TX_FIFOn);writel(M_TX_FIFO_WATERMARK_EN, priv->base + SE_GENI_M_IRQ_CLEAR);qcom_geni_serial_poll_tx_done(dev);return 0;+}
+static int msm_serial_getc(struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);u32 rx_fifo;u32 m_irq_status;u32 s_irq_status;writel(1 << S_OPCODE_SHIFT, priv->base + SE_GENI_S_CMD0);qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS, M_SEC_IRQ_EN,true);m_irq_status = readl(priv->base + SE_GENI_M_IRQ_STATUS);s_irq_status = readl(priv->base + SE_GENI_S_IRQ_STATUS);writel(m_irq_status, priv->base + SE_GENI_M_IRQ_CLEAR);writel(s_irq_status, priv->base + SE_GENI_S_IRQ_CLEAR);qcom_geni_serial_poll_bit(dev, SE_GENI_RX_FIFO_STATUS, RX_FIFO_WC_MSK,true);if (!readl(priv->base + SE_GENI_RX_FIFO_STATUS))return 0;rx_fifo = readl(priv->base + SE_GENI_RX_FIFOn);return rx_fifo & 0xff;+}
+static int msm_serial_pending(struct udevice *dev, bool input) +{
struct msm_serial_data *priv = dev_get_priv(dev);if (input)return readl(priv->base + SE_GENI_RX_FIFO_STATUS) &RX_FIFO_WC_MSK;elsereturn readl(priv->base + SE_GENI_TX_FIFO_STATUS) &TX_FIFO_WC_MSK;return 0;+}
+static const struct dm_serial_ops msm_serial_ops = {
.putc = msm_serial_putc,.pending = msm_serial_pending,.getc = msm_serial_getc,.setbrg = msm_serial_setbrg,+};
+static inline void geni_serial_init(phys_addr_t base_address) +{
u32 tx_trans_cfg;u32 tx_parity_cfg = 0; /* Disable Tx Parity */u32 rx_trans_cfg = 0;u32 rx_parity_cfg = 0; /* Disable Rx Parity */u32 stop_bit_len = 0; /* Default stop bit length - 1 bit */u32 bits_per_char;/** Ignore Flow control.* n = 8.*/tx_trans_cfg = UART_CTS_MASK;bits_per_char = BITS_PER_BYTE;u32 cfg0 = 0xf;u32 cfg1 = 0x0;/** Make an unconditional cancel on the main sequencer to reset* it else we could end up in data loss scenarios.*/writel(cfg0, base_address + SE_GENI_TX_PACKING_CFG0);writel(cfg1, base_address + SE_GENI_TX_PACKING_CFG1);writel(cfg0, base_address + SE_GENI_RX_PACKING_CFG0);writel(cfg1, base_address + SE_GENI_RX_PACKING_CFG1);writel(tx_trans_cfg, base_address + SE_UART_TX_TRANS_CFG);writel(tx_parity_cfg, base_address + SE_UART_TX_PARITY_CFG);writel(rx_trans_cfg, base_address + SE_UART_RX_TRANS_CFG);writel(rx_parity_cfg, base_address + SE_UART_RX_PARITY_CFG);writel(bits_per_char, base_address + SE_UART_TX_WORD_LEN);writel(bits_per_char, base_address + SE_UART_RX_WORD_LEN);writel(stop_bit_len, base_address + SE_UART_TX_STOP_BIT_LEN);+}
+static int msm_serial_probe(struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);/* No need to reinitialize the UART after relocation */if (gd->flags & GD_FLG_RELOC)return 0;geni_serial_init(priv->base);msm_geni_serial_setup_rx(dev);qcom_geni_serial_start_rx(dev);qcom_geni_serial_start_tx(priv->base);pinctrl_select_state(dev, "uart");
Does this not happen automatically with the correct pinctrl properties in the devicetree?
return 0;+}
+static int msm_serial_ofdata_to_platdata(struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);priv->base = dev_read_addr(dev);if (priv->base == FDT_ADDR_T_NONE)return -EINVAL;return 0;+}
+static const struct udevice_id msm_serial_ids[] = {
{.compatible = "qcom,msm-geni-uart"}, {}};+U_BOOT_DRIVER(serial_msm_geni) = {
.name = "serial_msm_geni",.id = UCLASS_SERIAL,.of_match = msm_serial_ids,.of_to_plat = msm_serial_ofdata_to_platdata,.priv_auto = sizeof(struct msm_serial_data),.probe = msm_serial_probe,.ops = &msm_serial_ops,+};
+#ifdef CONFIG_DEBUG_UART_MSM_GENI
+static struct msm_serial_data init_serial_data = {
.base = CONFIG_DEBUG_UART_BASE+};
+/* Serial dumb device, to reuse driver code */ +static struct udevice init_dev = {
.priv_ = &init_serial_data,+};
+#include <debug_uart.h>
+static inline void _debug_uart_init(void) +{
phys_addr_t base = CONFIG_DEBUG_UART_BASE;geni_serial_init(base);geni_serial_baud(base, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);qcom_geni_serial_start_tx(base);+}
+static inline void _debug_uart_putc(int ch) +{
phys_addr_t base = CONFIG_DEBUG_UART_BASE;writel(DEF_TX_WM, base + SE_GENI_TX_WATERMARK_REG);qcom_geni_serial_setup_tx(base, 1);qcom_geni_serial_poll_bit(&init_dev, SE_GENI_M_IRQ_STATUS,M_TX_FIFO_WATERMARK_EN, true);writel(ch, base + SE_GENI_TX_FIFOn);writel(M_TX_FIFO_WATERMARK_EN, base + SE_GENI_M_IRQ_CLEAR);qcom_geni_serial_poll_tx_done(&init_dev);+}
+DEBUG_UART_FUNCS
+#endif
2.20.1
Regards, Simon
чт, 14 окт. 2021 г. в 18:10, Simon Glass sjg@chromium.org:
Hi Dzmitry,
On Fri, 8 Oct 2021 at 00:46, Dzmitry Sankouski dsankouski@gmail.com wrote:
Generic Interface (GENI) Serial Engine (SE) based uart can be found on newer qualcomm SOCs, starting from SDM845. Tested on Samsung SM-G9600(starqltechn) by chain-loading u-boot with stock bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com
Changes for v2:
- change functions return type to void, where possible
- remove '.' from summary line
Changes for v3:
- move function open brace on new line
- use tab between define name and value
- define: wrap expression with braces, remove braces from constants
Changes for v4:
- add linux/delay.h header
MAINTAINERS | 1 + .../serial/msm-geni-serial.txt | 6 + drivers/serial/Kconfig | 17 + drivers/serial/Makefile | 1 + drivers/serial/serial_msm_geni.c | 603 ++++++++++++++++++ 5 files changed, 628 insertions(+) create mode 100644 doc/device-tree-bindings/serial/msm-geni-serial.txt create mode 100644 drivers/serial/serial_msm_geni.c
Reviewed-by: Simon Glass sjg@chromium.org
Some nits below
diff --git a/MAINTAINERS b/MAINTAINERS index 776ff703b9..52ddc99cda 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -390,6 +390,7 @@ F: drivers/gpio/msm_gpio.c F: drivers/mmc/msm_sdhci.c F: drivers/phy/msm8916-usbh-phy.c F: drivers/serial/serial_msm.c +F: drivers/serial/serial_msm_geni.c F: drivers/smem/msm_smem.c F: drivers/usb/host/ehci-msm.c
diff --git a/doc/device-tree-bindings/serial/msm-geni-serial.txt
b/doc/device-tree-bindings/serial/msm-geni-serial.txt
new file mode 100644 index 0000000000..9eadc2561b --- /dev/null +++ b/doc/device-tree-bindings/serial/msm-geni-serial.txt @@ -0,0 +1,6 @@ +Qualcomm GENI UART
+Required properties: +- compatible: must be "qcom,msm-geni-uart" +- reg: start address and size of the registers +- clock: interface clock (must accept baudrate as a frequency) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 93348c0929..b420a5720d 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -278,6 +278,14 @@ config DEBUG_UART_S5P will need to provide parameters to make this work. The driver
will
be available until the real driver-model serial is running.+config DEBUG_UART_MSM_GENI
Do you need this? Most drivers just use the existing DEBUG_UART Kconfig.
Documentation for CONFIG_DEBUG_UART says: `- Enable the CONFIG for your UART to tell it to provide this interface (e.g. CONFIG_DEBUG_UART_NS16550)` Debug functionality is controlled by chip specific CONFIG_DEBUG_UART_*. So no serial driver uses plain DEBUG_UART for adding debug functionality.
bool "Qualcomm snapdragon"depends on ARCH_SNAPDRAGONhelpSelect this to enable a debug UART using the serial_msmdriver. You
will need to provide parameters to make this work. The driverwill
be available until the real driver-model serial is running.config DEBUG_UART_MESON bool "Amlogic Meson" depends on MESON_SERIAL @@ -783,6 +791,15 @@ config MSM_SERIAL for example APQ8016 and MSM8916. Single baudrate is supported in current implementation
(115200).
+config MSM_GENI_SERIAL
bool "Qualcomm on-chip GENI UART"helpSupport UART based on Generic Interface (GENI) Serial Engine(SE), used on Qualcomm Snapdragon SoCs.
Should support all qualcomm SOCs with Qualcomm UniversalPeripheral (QUP) Wrapper cores,
80cols
i.e. newer ones, starting from SDM845.Driver works in FIFO mode.Multiple baudrates supported.config OCTEON_SERIAL_BOOTCMD bool "MIPS Octeon PCI remote bootcmd input" depends on ARCH_OCTEON diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 3cbea8156f..d44caf4ea2 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -62,6 +62,7 @@ obj-$(CONFIG_PIC32_SERIAL) += serial_pic32.o obj-$(CONFIG_BCM283X_MU_SERIAL) += serial_bcm283x_mu.o obj-$(CONFIG_BCM283X_PL011_SERIAL) += serial_bcm283x_pl011.o obj-$(CONFIG_MSM_SERIAL) += serial_msm.o +obj-$(CONFIG_MSM_GENI_SERIAL) += serial_msm_geni.o obj-$(CONFIG_MVEBU_A3700_UART) += serial_mvebu_a3700.o obj-$(CONFIG_MPC8XX_CONS) += serial_mpc8xx.o obj-$(CONFIG_NULLDEV_SERIAL) += serial_nulldev.o diff --git a/drivers/serial/serial_msm_geni.c
b/drivers/serial/serial_msm_geni.c
new file mode 100644 index 0000000000..c656d54cbb --- /dev/null +++ b/drivers/serial/serial_msm_geni.c @@ -0,0 +1,603 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Qualcomm GENI serial engine UART driver
- (C) Copyright 2021 Dzmitry Sankouski dsankouski@gmail.com
- Based on Linux driver.
- */
+#include <asm/io.h> +#include <clk.h> +#include <common.h> +#include <dm.h> +#include <dm/pinctrl.h> +#include <errno.h> +#include <linux/compiler.h> +#include <log.h> +#include <linux/delay.h> +#include <malloc.h> +#include <serial.h> +#include <watchdog.h>
+#define UART_OVERSAMPLING 32 +#define STALE_TIMEOUT 160 +#define SE_UART_RX_STALE_CNT 0x294 +#define S_GENI_CMD_ABORT (BIT(1))
+#define SE_GENI_S_CMD_CTRL_REG 0x634 +#define SE_GENI_M_CMD_CTRL_REG 0x604
+/* GENI_M_CMD_CTRL_REG */ +#define M_GENI_CMD_CANCEL (BIT(2)) +#define M_GENI_CMD_ABORT (BIT(1)) +#define M_GENI_DISABLE (BIT(0))
+/* GENI_S_CMD0 fields */ +#define S_OPCODE_MSK (GENMASK(31, 27)) +#define S_OPCODE_SHFT 27 +#define S_PARAMS_MSK (GENMASK(26, 0))
+/* GENI_STATUS fields */ +#define M_GENI_CMD_ACTIVE (BIT(0)) +#define S_GENI_CMD_ACTIVE (BIT(12)) +#define S_CMD_DONE_EN (BIT(0)) +#define M_CMD_DONE_EN (BIT(0))
+#define USEC_PER_SEC 1000000L
+#define SE_GENI_STATUS 0x40 +#define GENI_SER_M_CLK_CFG 0x48 +#define GENI_SER_S_CLK_CFG 0x4C +#define SE_GENI_M_CMD0 0x600 +#define SE_GENI_M_IRQ_CLEAR 0x618 +#define SE_GENI_S_IRQ_STATUS 0x640 +#define SE_GENI_S_IRQ_CLEAR 0x648 +#define SE_GENI_S_IRQ_EN 0x644 +#define SE_GENI_M_IRQ_EN 0x614 +#define SE_GENI_TX_FIFOn 0x700 +#define SE_GENI_RX_FIFOn 0x780 +#define SE_GENI_TX_FIFO_STATUS 0x800 +#define SE_GENI_RX_FIFO_STATUS 0x804 +#define SE_GENI_TX_WATERMARK_REG 0x80C +#define M_TX_FIFO_WATERMARK_EN (BIT(30)) +#define DEF_TX_WM 2 +#define SE_UART_TX_TRANS_LEN 0x270 +#define SE_GENI_TX_PACKING_CFG0 0x260 +#define SE_GENI_TX_PACKING_CFG1 0x264 +#define SE_GENI_RX_PACKING_CFG0 0x284 +#define SE_GENI_RX_PACKING_CFG1 0x288 +#define SE_UART_TX_STOP_BIT_LEN 0x26c +#define SE_UART_TX_WORD_LEN 0x268 +#define SE_UART_RX_WORD_LEN 0x28c +#define SE_UART_RX_TRANS_CFG 0x280 +#define SE_UART_RX_PARITY_CFG 0x2a8 +#define SE_UART_TX_TRANS_CFG 0x25c +#define SE_UART_TX_PARITY_CFG 0x2a4
+#define GENI_FORCE_DEFAULT_REG 0x20 +/* GENI_FORCE_DEFAULT_REG fields */ +#define FORCE_DEFAULT (BIT(0))
+#define S_CMD_ABORT_EN (BIT(5))
+#define SE_GENI_S_CMD0 0x630 +#define UART_START_READ 0x1
+/* GENI_M_CMD_CTRL_REG */ +#define M_GENI_CMD_CANCEL (BIT(2)) +#define M_GENI_CMD_ABORT (BIT(1)) +#define M_GENI_DISABLE (BIT(0))
+#define M_CMD_ABORT_EN (BIT(5))
+#define M_CMD_DONE_EN (BIT(0)) +#define M_CMD_DONE_DISABLE_MASK (~M_CMD_DONE_EN) +#define SE_GENI_M_IRQ_STATUS 0x610
+#define M_OPCODE_SHIFT 27 +#define S_OPCODE_SHIFT 27 +#define M_TX_FIFO_WATERMARK_EN (BIT(30)) +#define UART_START_TX 0x1 +#define UART_CTS_MASK (BIT(1)) +#define M_SEC_IRQ_EN (BIT(31)) +#define TX_FIFO_WC_MSK (GENMASK(27, 0)) +#define RX_FIFO_WC_MSK (GENMASK(24, 0))
+#define S_RX_FIFO_WATERMARK_EN (BIT(26)) +#define S_RX_FIFO_LAST_EN (BIT(27)) +#define M_RX_FIFO_WATERMARK_EN (BIT(26)) +#define M_RX_FIFO_LAST_EN (BIT(27))
+/* GENI_SER_M_CLK_CFG/GENI_SER_S_CLK_CFG */ +#define SER_CLK_EN (BIT(0)) +#define CLK_DIV_MSK (GENMASK(15, 4)) +#define CLK_DIV_SHFT 4
+#define SE_HW_PARAM_0 0xE24 +/* SE_HW_PARAM_0 fields */ +#define TX_FIFO_WIDTH_MSK (GENMASK(29, 24)) +#define TX_FIFO_WIDTH_SHFT 24 +#define TX_FIFO_DEPTH_MSK (GENMASK(21, 16)) +#define TX_FIFO_DEPTH_SHFT 16
+DECLARE_GLOBAL_DATA_PTR;
+struct msm_serial_data {
phys_addr_t base;u32 baud;+};
+static int get_clk_cfg(unsigned long clk_freq, unsigned long *ser_clk)
function comment...what does it return?
+{
unsigned long root_freq[] = {7372800, 14745600, 19200000,29491200,
32000000, 48000000, 64000000,80000000,
96000000, 100000000};int i;int match = -1;for (i = 0; i < ARRAY_SIZE(root_freq); i++) {if (clk_freq > root_freq[i])continue;if (!(root_freq[i] % clk_freq)) {match = i;break;}}if (match != -1)*ser_clk = root_freq[match];elsepr_err("clk_freq %ld\n", clk_freq);return match;+}
+static int get_clk_div_rate(u32 baud, u64 *desired_clk_rate)
function comment
+{
unsigned long ser_clk;int dfs_index;int clk_div = 0;*desired_clk_rate = baud * UART_OVERSAMPLING;dfs_index = get_clk_cfg(*desired_clk_rate, &ser_clk);if (dfs_index < 0) {pr_err("%s: Can't find matching DFS entry for baud %d\n",__func__, baud);clk_div = -EINVAL;goto exit_get_clk_div_rate;}clk_div = ser_clk / *desired_clk_rate;*desired_clk_rate = ser_clk;+exit_get_clk_div_rate:
return clk_div;+}
+static int geni_serial_set_clock_rate(struct udevice *dev, u64 rate) +{
struct clk *clk;int ret;clk = devm_clk_get(dev, "se-clk");if (!clk)return -EINVAL;ret = clk_set_rate(clk, rate);return ret;+}
+/**
- geni_se_get_tx_fifo_depth() - Get the TX fifo depth of the serial
engine
- @base: Pointer to the concerned serial engine.
- This function is used to get the depth i.e. number of elements in the
- TX fifo of the serial engine.
- Return: TX fifo depth in units of FIFO words.
- */
+static inline u32 geni_se_get_tx_fifo_depth(long base) +{
u32 tx_fifo_depth;tx_fifo_depth = ((readl(base + SE_HW_PARAM_0) &TX_FIFO_DEPTH_MSK) >>
TX_FIFO_DEPTH_SHFT);return tx_fifo_depth;+}
+/**
- geni_se_get_tx_fifo_width() - Get the TX fifo width of the serial
engine
- @base: Pointer to the concerned serial engine.
- This function is used to get the width i.e. word size per element in
the
- TX fifo of the serial engine.
- Return: TX fifo width in bits
- */
+static inline u32 geni_se_get_tx_fifo_width(long base) +{
u32 tx_fifo_width;tx_fifo_width = ((readl(base + SE_HW_PARAM_0) &TX_FIFO_WIDTH_MSK) >>
TX_FIFO_WIDTH_SHFT);return tx_fifo_width;+}
+static inline void geni_serial_baud(phys_addr_t base_address, u64 uclk,
int baud)
+{
u32 clk_div;u32 s_clk_cfg = 0;clk_div = get_clk_div_rate(baud, &uclk);s_clk_cfg |= SER_CLK_EN;s_clk_cfg |= (clk_div << CLK_DIV_SHFT);writel(s_clk_cfg, base_address + GENI_SER_M_CLK_CFG);writel(s_clk_cfg, base_address + GENI_SER_S_CLK_CFG);+}
+int msm_serial_setbrg(struct udevice *dev, int baud) +{
struct msm_serial_data *priv = dev_get_priv(dev);priv->baud = baud;u32 clk_div;u64 clk_rate;clk_div = get_clk_div_rate(baud, &clk_rate);geni_serial_set_clock_rate(dev, clk_rate);geni_serial_baud(priv->base, clk_rate, baud);return 0;+}
+static bool qcom_geni_serial_poll_bit(const struct udevice *dev, int
offset,
int field, bool set)function comment
+{
u32 reg;struct msm_serial_data *priv = dev_get_priv(dev);unsigned int baud;unsigned int tx_fifo_depth;unsigned int tx_fifo_width;unsigned int fifo_bits;unsigned long timeout_us = 10000;baud = 115200;if (priv) {baud = priv->baud;if (!baud)baud = 115200;tx_fifo_depth = geni_se_get_tx_fifo_depth(priv->base);tx_fifo_width = geni_se_get_tx_fifo_width(priv->base);fifo_bits = tx_fifo_depth * tx_fifo_width;/** Total polling iterations based on FIFO worth of bytesto be
* sent at current baud. Add a little fluff to the wait.*/timeout_us = ((fifo_bits * USEC_PER_SEC) / baud) + 500;}/** Use custom implementation instead of readl_poll_atomic sincektimer
* is not ready at the time of early console.This comment seems to relate only to Linux?
*/timeout_us = DIV_ROUND_UP(timeout_us, 10) * 10;while (timeout_us) {reg = readl(priv->base + offset);if ((bool)(reg & field) == set)return true;udelay(10);timeout_us -= 10;}return false;+}
+static void qcom_geni_serial_setup_tx(u64 base, u32 xmit_size) +{
u32 m_cmd;writel(xmit_size, base + SE_UART_TX_TRANS_LEN);m_cmd = UART_START_TX << M_OPCODE_SHIFT;writel(m_cmd, base + SE_GENI_M_CMD0);+}
+static inline void qcom_geni_serial_poll_tx_done(const struct udevice
*dev)
+{
struct msm_serial_data *priv = dev_get_priv(dev);int done = 0;u32 irq_clear = M_CMD_DONE_EN;done = qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_CMD_DONE_EN, true);if (!done) {writel(M_GENI_CMD_ABORT, priv->base +SE_GENI_M_CMD_CTRL_REG);
irq_clear |= M_CMD_ABORT_EN;qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_CMD_ABORT_EN, true);}writel(irq_clear, priv->base + SE_GENI_M_IRQ_CLEAR);+}
+static u32 qcom_geni_serial_tx_empty(u64 base) +{
return !readl(base + SE_GENI_TX_FIFO_STATUS);+}
+/**
- geni_se_setup_s_cmd() - Setup the secondary sequencer
- @se: Pointer to the concerned serial engine.
- @cmd: Command/Operation to setup in the secondary sequencer.
- @params: Parameter for the sequencer command.
- This function is used to configure the secondary sequencer with the
- command and its associated parameters.
- */
+static inline void geni_se_setup_s_cmd(u64 base, u32 cmd, u32 params) +{
u32 s_cmd;s_cmd = readl(base + SE_GENI_S_CMD0);s_cmd &= ~(S_OPCODE_MSK | S_PARAMS_MSK);s_cmd |= (cmd << S_OPCODE_SHFT);s_cmd |= (params & S_PARAMS_MSK);writel(s_cmd, base + SE_GENI_S_CMD0);+}
+static void qcom_geni_serial_start_tx(u64 base) +{
u32 irq_en;u32 status;status = readl(base + SE_GENI_STATUS);if (status & M_GENI_CMD_ACTIVE)return;if (!qcom_geni_serial_tx_empty(base))return;irq_en = readl(base + SE_GENI_M_IRQ_EN);irq_en |= M_TX_FIFO_WATERMARK_EN | M_CMD_DONE_EN;writel(DEF_TX_WM, base + SE_GENI_TX_WATERMARK_REG);writel(irq_en, base + SE_GENI_M_IRQ_EN);+}
+static void qcom_geni_serial_start_rx(struct udevice *dev) +{
u32 irq_en;u32 status;struct msm_serial_data *priv = dev_get_priv(dev);status = readl(priv->base + SE_GENI_STATUS);geni_se_setup_s_cmd(priv->base, UART_START_READ, 0);irq_en = readl(priv->base + SE_GENI_S_IRQ_EN);irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;writel(irq_en, priv->base + SE_GENI_S_IRQ_EN);setbits_le32() ?
irq_en = readl(priv->base + SE_GENI_M_IRQ_EN);irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;writel(irq_en, priv->base + SE_GENI_M_IRQ_EN);here too
+}
+static void msm_geni_serial_setup_rx(struct udevice *dev) +{
u32 irq_clear = S_CMD_DONE_EN;u32 geni_s_irq_en;u32 geni_m_irq_en;u32 cfg0;u32 cfg1;struct msm_serial_data *priv = dev_get_priv(dev);irq_clear |= S_CMD_ABORT_EN;writel(S_GENI_CMD_ABORT, priv->base + SE_GENI_S_CMD_CTRL_REG);qcom_geni_serial_poll_bit(dev, SE_GENI_S_CMD_CTRL_REG,S_GENI_CMD_ABORT,
false);writel(irq_clear, priv->base + SE_GENI_S_IRQ_CLEAR);writel(FORCE_DEFAULT, priv->base + GENI_FORCE_DEFAULT_REG);cfg0 = 0xf;What is this? Can we have #define/enum/comment?
cfg1 = 0x0;writel(cfg0, priv->base + SE_GENI_RX_PACKING_CFG0);writel(cfg1, priv->base + SE_GENI_RX_PACKING_CFG1);geni_se_setup_s_cmd(priv->base, UART_START_READ, 0);geni_s_irq_en = readl(priv->base + SE_GENI_S_IRQ_EN);geni_m_irq_en = readl(priv->base + SE_GENI_M_IRQ_EN);geni_s_irq_en |= S_RX_FIFO_WATERMARK_EN | S_RX_FIFO_LAST_EN;geni_m_irq_en |= M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN;writel(geni_s_irq_en, priv->base + SE_GENI_S_IRQ_EN);writel(geni_m_irq_en, priv->base + SE_GENI_M_IRQ_EN);+}
+static int msm_serial_putc(struct udevice *dev, const char ch) +{
struct msm_serial_data *priv = dev_get_priv(dev);writel(DEF_TX_WM, priv->base + SE_GENI_TX_WATERMARK_REG);qcom_geni_serial_setup_tx(priv->base, 1);qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_TX_FIFO_WATERMARK_EN, true);writel(ch, priv->base + SE_GENI_TX_FIFOn);writel(M_TX_FIFO_WATERMARK_EN, priv->base + SE_GENI_M_IRQ_CLEAR);qcom_geni_serial_poll_tx_done(dev);return 0;+}
+static int msm_serial_getc(struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);u32 rx_fifo;u32 m_irq_status;u32 s_irq_status;writel(1 << S_OPCODE_SHIFT, priv->base + SE_GENI_S_CMD0);qcom_geni_serial_poll_bit(dev, SE_GENI_M_IRQ_STATUS,M_SEC_IRQ_EN,
true);m_irq_status = readl(priv->base + SE_GENI_M_IRQ_STATUS);s_irq_status = readl(priv->base + SE_GENI_S_IRQ_STATUS);writel(m_irq_status, priv->base + SE_GENI_M_IRQ_CLEAR);writel(s_irq_status, priv->base + SE_GENI_S_IRQ_CLEAR);qcom_geni_serial_poll_bit(dev, SE_GENI_RX_FIFO_STATUS,RX_FIFO_WC_MSK,
true);if (!readl(priv->base + SE_GENI_RX_FIFO_STATUS))return 0;rx_fifo = readl(priv->base + SE_GENI_RX_FIFOn);return rx_fifo & 0xff;+}
+static int msm_serial_pending(struct udevice *dev, bool input) +{
struct msm_serial_data *priv = dev_get_priv(dev);if (input)return readl(priv->base + SE_GENI_RX_FIFO_STATUS) &RX_FIFO_WC_MSK;elsereturn readl(priv->base + SE_GENI_TX_FIFO_STATUS) &TX_FIFO_WC_MSK;return 0;+}
+static const struct dm_serial_ops msm_serial_ops = {
.putc = msm_serial_putc,.pending = msm_serial_pending,.getc = msm_serial_getc,.setbrg = msm_serial_setbrg,+};
+static inline void geni_serial_init(phys_addr_t base_address) +{
u32 tx_trans_cfg;u32 tx_parity_cfg = 0; /* Disable Tx Parity */u32 rx_trans_cfg = 0;u32 rx_parity_cfg = 0; /* Disable Rx Parity */u32 stop_bit_len = 0; /* Default stop bit length - 1 bit */u32 bits_per_char;/** Ignore Flow control.* n = 8.*/tx_trans_cfg = UART_CTS_MASK;bits_per_char = BITS_PER_BYTE;u32 cfg0 = 0xf;u32 cfg1 = 0x0;/** Make an unconditional cancel on the main sequencer to reset* it else we could end up in data loss scenarios.*/writel(cfg0, base_address + SE_GENI_TX_PACKING_CFG0);writel(cfg1, base_address + SE_GENI_TX_PACKING_CFG1);writel(cfg0, base_address + SE_GENI_RX_PACKING_CFG0);writel(cfg1, base_address + SE_GENI_RX_PACKING_CFG1);writel(tx_trans_cfg, base_address + SE_UART_TX_TRANS_CFG);writel(tx_parity_cfg, base_address + SE_UART_TX_PARITY_CFG);writel(rx_trans_cfg, base_address + SE_UART_RX_TRANS_CFG);writel(rx_parity_cfg, base_address + SE_UART_RX_PARITY_CFG);writel(bits_per_char, base_address + SE_UART_TX_WORD_LEN);writel(bits_per_char, base_address + SE_UART_RX_WORD_LEN);writel(stop_bit_len, base_address + SE_UART_TX_STOP_BIT_LEN);+}
+static int msm_serial_probe(struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);/* No need to reinitialize the UART after relocation */if (gd->flags & GD_FLG_RELOC)return 0;geni_serial_init(priv->base);msm_geni_serial_setup_rx(dev);qcom_geni_serial_start_rx(dev);qcom_geni_serial_start_tx(priv->base);pinctrl_select_state(dev, "uart");Does this not happen automatically with the correct pinctrl properties in the devicetree?
I'll test it
return 0;+}
+static int msm_serial_ofdata_to_platdata(struct udevice *dev) +{
struct msm_serial_data *priv = dev_get_priv(dev);priv->base = dev_read_addr(dev);if (priv->base == FDT_ADDR_T_NONE)return -EINVAL;return 0;+}
+static const struct udevice_id msm_serial_ids[] = {
{.compatible = "qcom,msm-geni-uart"}, {}};+U_BOOT_DRIVER(serial_msm_geni) = {
.name = "serial_msm_geni",.id = UCLASS_SERIAL,.of_match = msm_serial_ids,.of_to_plat = msm_serial_ofdata_to_platdata,.priv_auto = sizeof(struct msm_serial_data),.probe = msm_serial_probe,.ops = &msm_serial_ops,+};
+#ifdef CONFIG_DEBUG_UART_MSM_GENI
+static struct msm_serial_data init_serial_data = {
.base = CONFIG_DEBUG_UART_BASE+};
+/* Serial dumb device, to reuse driver code */ +static struct udevice init_dev = {
.priv_ = &init_serial_data,+};
+#include <debug_uart.h>
+static inline void _debug_uart_init(void) +{
phys_addr_t base = CONFIG_DEBUG_UART_BASE;geni_serial_init(base);geni_serial_baud(base, CONFIG_DEBUG_UART_CLOCK, CONFIG_BAUDRATE);qcom_geni_serial_start_tx(base);+}
+static inline void _debug_uart_putc(int ch) +{
phys_addr_t base = CONFIG_DEBUG_UART_BASE;writel(DEF_TX_WM, base + SE_GENI_TX_WATERMARK_REG);qcom_geni_serial_setup_tx(base, 1);qcom_geni_serial_poll_bit(&init_dev, SE_GENI_M_IRQ_STATUS,M_TX_FIFO_WATERMARK_EN, true);writel(ch, base + SE_GENI_TX_FIFOn);writel(M_TX_FIFO_WATERMARK_EN, base + SE_GENI_M_IRQ_CLEAR);qcom_geni_serial_poll_tx_done(&init_dev);+}
+DEBUG_UART_FUNCS
+#endif
2.20.1
Regards, Simon
Hi Dzmitry,
On Fri, 15 Oct 2021 at 10:22, Dzmitry Sankouski dsankouski@gmail.com wrote:
чт, 14 окт. 2021 г. в 18:10, Simon Glass sjg@chromium.org:
Hi Dzmitry,
On Fri, 8 Oct 2021 at 00:46, Dzmitry Sankouski dsankouski@gmail.com wrote:
Generic Interface (GENI) Serial Engine (SE) based uart can be found on newer qualcomm SOCs, starting from SDM845. Tested on Samsung SM-G9600(starqltechn) by chain-loading u-boot with stock bootloader.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Cc: Ramon Fried rfried.dev@gmail.com Cc: Tom Rini trini@konsulko.com
Changes for v2:
- change functions return type to void, where possible
- remove '.' from summary line
Changes for v3:
- move function open brace on new line
- use tab between define name and value
- define: wrap expression with braces, remove braces from constants
Changes for v4:
- add linux/delay.h header
MAINTAINERS | 1 + .../serial/msm-geni-serial.txt | 6 + drivers/serial/Kconfig | 17 + drivers/serial/Makefile | 1 + drivers/serial/serial_msm_geni.c | 603 ++++++++++++++++++ 5 files changed, 628 insertions(+) create mode 100644 doc/device-tree-bindings/serial/msm-geni-serial.txt create mode 100644 drivers/serial/serial_msm_geni.c
Reviewed-by: Simon Glass sjg@chromium.org
Some nits below
diff --git a/MAINTAINERS b/MAINTAINERS index 776ff703b9..52ddc99cda 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -390,6 +390,7 @@ F: drivers/gpio/msm_gpio.c F: drivers/mmc/msm_sdhci.c F: drivers/phy/msm8916-usbh-phy.c F: drivers/serial/serial_msm.c +F: drivers/serial/serial_msm_geni.c F: drivers/smem/msm_smem.c F: drivers/usb/host/ehci-msm.c
diff --git a/doc/device-tree-bindings/serial/msm-geni-serial.txt b/doc/device-tree-bindings/serial/msm-geni-serial.txt new file mode 100644 index 0000000000..9eadc2561b --- /dev/null +++ b/doc/device-tree-bindings/serial/msm-geni-serial.txt @@ -0,0 +1,6 @@ +Qualcomm GENI UART
+Required properties: +- compatible: must be "qcom,msm-geni-uart" +- reg: start address and size of the registers +- clock: interface clock (must accept baudrate as a frequency) diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 93348c0929..b420a5720d 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -278,6 +278,14 @@ config DEBUG_UART_S5P will need to provide parameters to make this work. The driver will be available until the real driver-model serial is running.
+config DEBUG_UART_MSM_GENI
Do you need this? Most drivers just use the existing DEBUG_UART Kconfig.
Documentation for CONFIG_DEBUG_UART says: `- Enable the CONFIG for your UART to tell it to provide this interface (e.g. CONFIG_DEBUG_UART_NS16550)` Debug functionality is controlled by chip specific CONFIG_DEBUG_UART_*. So no serial driver uses plain DEBUG_UART for adding debug functionality.
Ah yes. Well I suppose I am allow to forgot something I wrote 6 years ago.
For my own information, the reason is basically because we can only have one debug UART, but can have multiple UART drivers with driver model. So we need to select which to use as a debug UART.
It is a bit unfortunate, since in the vast majority of cases, we only have a single UART driver in use.
Regards, Simon
participants (2)
-
Dzmitry Sankouski -
Simon Glass