[coreboot-gerrit] Patch set updated for coreboot: mediatek/mt8173: Add SPI support

Martin Roth (martinroth@google.com) gerrit at coreboot.org
Wed Jan 13 21:43:00 CET 2016


Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12611

-gerrit

commit 9688a9fc0a21ba0c9d91ed783b652b4f1cf80380
Author: Leilk Liu <leilk.liu at mediatek.com>
Date:   Fri Jul 31 17:10:46 2015 +0800

    mediatek/mt8173: Add SPI support
    
    BUG=none
    TEST=emerge-oak coreboot
    BRANCH=none
    
    Change-Id: I82d982b40dd0bfaa7770a6b08c70b20337a46955
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: 41acc14e9fe54924d20e4e5a2d1519251f0e1c87
    Original-Change-Id: I2559be4191da9af523944563729171bd92a86cd0
    Original-Signed-off-by: Leilk Liu <leilk.liu at mediatek.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/292661
    Original-Commit-Ready: Yidi Lin <yidi.lin at mediatek.com>
    Original-Tested-by: Yidi Lin <yidi.lin at mediatek.com>
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
---
 src/mainboard/google/oak/bootblock.c      |   3 +
 src/soc/mediatek/mt8173/Makefile.inc      |   3 +
 src/soc/mediatek/mt8173/include/soc/spi.h | 113 +++++++++++
 src/soc/mediatek/mt8173/spi.c             | 306 ++++++++++++++++++++++++++++++
 4 files changed, 425 insertions(+)

diff --git a/src/mainboard/google/oak/bootblock.c b/src/mainboard/google/oak/bootblock.c
index 023c90e..3d78551 100644
--- a/src/mainboard/google/oak/bootblock.c
+++ b/src/mainboard/google/oak/bootblock.c
@@ -21,6 +21,7 @@
 #include <soc/mt6391.h>
 #include <soc/pericfg.h>
 #include <soc/pinmux.h>
+#include <soc/spi.h>
 
 #include "gpio.h"
 
@@ -46,6 +47,8 @@ void bootblock_mainboard_init(void)
 	/* set i2c related gpio */
 	i2c_set_gpio_pinmux();
 
+	mtk_spi_init(CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS, SPI_PAD1_MASK, 6*MHz);
+
 	setup_chromeos_gpios();
 
 	if (board_id() < 4)
diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc
index ba0712b..eec1cac 100644
--- a/src/soc/mediatek/mt8173/Makefile.inc
+++ b/src/soc/mediatek/mt8173/Makefile.inc
@@ -18,6 +18,7 @@ ifeq ($(CONFIG_SOC_MEDIATEK_MT8173),y)
 bootblock-y += bootblock.c
 bootblock-y += cbfs.c
 bootblock-y += pll.c
+bootblock-y += spi.c
 bootblock-y += timer.c
 
 ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)
@@ -33,11 +34,13 @@ romstage-y += timer.c
 
 romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-y += cbmem.c
+romstage-y += spi.c
 romstage-y += gpio.c
 
 ################################################################################
 
 ramstage-y += cbmem.c
+ramstage-y += spi.c
 ramstage-y += cbfs.c
 ramstage-y += soc.c
 ramstage-y += timer.c
diff --git a/src/soc/mediatek/mt8173/include/soc/spi.h b/src/soc/mediatek/mt8173/include/soc/spi.h
new file mode 100644
index 0000000..a39eff6
--- /dev/null
+++ b/src/soc/mediatek/mt8173/include/soc/spi.h
@@ -0,0 +1,113 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2015 MediaTek Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef MTK_MT8173_SPI_H
+#define MTK_MT8173_SPI_H
+
+#include <spi-generic.h>
+#include <types.h>
+
+/* SPI peripheral register map. */
+typedef struct mtk_spi_regs {
+	uint32_t spi_cfg0_reg;
+	uint32_t spi_cfg1_reg;
+	uint32_t spi_tx_src_reg;
+	uint32_t spi_rx_dst_reg;
+	uint32_t spi_tx_data_reg;
+	uint32_t spi_rx_data_reg;
+	uint32_t spi_cmd_reg;
+	uint32_t spi_status0_reg;
+	uint32_t spi_status1_reg;
+	uint32_t spi_pad_macro_sel_reg;
+} mtk_spi_regs;
+
+check_member(mtk_spi_regs, spi_pad_macro_sel_reg, 0x24);
+
+/* SPI_CFG0_REG */
+enum {
+	SPI_CFG0_SCK_HIGH_SHIFT = 0,
+	SPI_CFG0_SCK_LOW_SHIFT = 8,
+	SPI_CFG0_CS_HOLD_SHIFT = 16,
+	SPI_CFG0_CS_SETUP_SHIFT = 24,
+};
+
+/*SPI_CFG1_REG*/
+enum {
+	SPI_CFG1_CS_IDLE_SHIFT = 0,
+	SPI_CFG1_PACKET_LOOP_SHIFT = 8,
+	SPI_CFG1_PACKET_LENGTH_SHIFT = 16,
+
+	SPI_CFG1_CS_IDLE_MASK = 0xff << SPI_CFG1_CS_IDLE_SHIFT,
+	SPI_CFG1_PACKET_LOOP_MASK = 0xff << SPI_CFG1_PACKET_LOOP_SHIFT,
+	SPI_CFG1_PACKET_LENGTH_MASK = 0x3ff << SPI_CFG1_PACKET_LENGTH_SHIFT,
+};
+
+enum {
+	SPI_CMD_ACT_SHIFT = 0,
+	SPI_CMD_RESUME_SHIFT = 1,
+	SPI_CMD_RST_SHIFT = 2,
+	SPI_CMD_PAUSE_EN_SHIFT = 4,
+	SPI_CMD_DEASSERT_SHIFT = 5,
+	SPI_CMD_CPHA_SHIFT = 8,
+	SPI_CMD_CPOL_SHIFT = 9,
+	SPI_CMD_RX_DMA_SHIFT = 10,
+	SPI_CMD_TX_DMA_SHIFT = 11,
+	SPI_CMD_TXMSBF_SHIFT = 12,
+	SPI_CMD_RXMSBF_SHIFT = 13,
+	SPI_CMD_RX_ENDIAN_SHIFT = 14,
+	SPI_CMD_TX_ENDIAN_SHIFT = 15,
+	SPI_CMD_FINISH_IE_SHIFT = 16,
+	SPI_CMD_PAUSE_IE_SHIFT = 17,
+
+	SPI_CMD_ACT_EN = BIT(SPI_CMD_ACT_SHIFT),
+	SPI_CMD_RESUME_EN = BIT(SPI_CMD_RESUME_SHIFT),
+	SPI_CMD_RST_EN = BIT(SPI_CMD_RST_SHIFT),
+	SPI_CMD_PAUSE_EN = BIT(SPI_CMD_PAUSE_EN_SHIFT),
+	SPI_CMD_DEASSERT_EN = BIT(SPI_CMD_DEASSERT_SHIFT),
+	SPI_CMD_CPHA_EN = BIT(SPI_CMD_CPHA_SHIFT),
+	SPI_CMD_CPOL_EN = BIT(SPI_CMD_CPOL_SHIFT),
+	SPI_CMD_RX_DMA_EN = BIT(SPI_CMD_RX_DMA_SHIFT),
+	SPI_CMD_TX_DMA_EN = BIT(SPI_CMD_TX_DMA_SHIFT),
+	SPI_CMD_TXMSBF_EN = BIT(SPI_CMD_TXMSBF_SHIFT),
+	SPI_CMD_RXMSBF_EN = BIT(SPI_CMD_RXMSBF_SHIFT),
+	SPI_CMD_RX_ENDIAN_EN = BIT(SPI_CMD_RX_ENDIAN_SHIFT),
+	SPI_CMD_TX_ENDIAN_EN = BIT(SPI_CMD_TX_ENDIAN_SHIFT),
+	SPI_CMD_FINISH_IE_EN = BIT(SPI_CMD_FINISH_IE_SHIFT),
+	SPI_CMD_PAUSE_IE_EN = BIT(SPI_CMD_PAUSE_IE_SHIFT),
+};
+
+enum spi_pad_mask {
+	SPI_PAD0_MASK = 0x0,
+	SPI_PAD1_MASK = 0x1,
+	SPI_PAD2_MASK = 0x2,
+	SPI_PAD3_MASK = 0x3,
+	SPI_PAD_SEL_MASK = 0x3
+};
+
+
+struct mtk_spi_bus {
+	struct spi_slave slave;
+	struct mtk_spi_regs *regs;
+	int initialized;
+	int state;
+};
+
+void mtk_spi_init(unsigned int bus, unsigned int pad_select,
+		  unsigned int speed_hz);
+#endif
diff --git a/src/soc/mediatek/mt8173/spi.c b/src/soc/mediatek/mt8173/spi.c
new file mode 100644
index 0000000..30b228b
--- /dev/null
+++ b/src/soc/mediatek/mt8173/spi.c
@@ -0,0 +1,306 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2015 MediaTek Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <arch/io.h>
+#include <assert.h>
+#include <console/console.h>
+#include <delay.h>
+#include <endian.h>
+#include <spi_flash.h>
+#include <stdlib.h>
+#include <string.h>
+#include <timer.h>
+#include <soc/addressmap.h>
+#include <soc/gpio.h>
+#include <soc/pinmux.h>
+#include <soc/pll.h>
+#include <soc/spi.h>
+
+enum {
+	MTK_FIFO_DEPTH = 32,
+	MTK_TXRX_TIMEOUT_US = 1000 * 1000,
+	MTK_ARBITRARY_VALUE = 0xdeaddead
+};
+
+enum {
+	MTK_SPI_IDLE = 0,
+	MTK_SPI_PAUSE_IDLE = 1
+};
+
+enum {
+	MTK_SPI_BUSY_STATUS = 1,
+	MTK_SPI_PAUSE_FINISH_INT_STATUS = 3
+};
+
+static struct mtk_spi_bus spi_bus[1] = {
+	{
+		.slave = {
+			.bus = 0,
+		},
+		.regs = (void *)SPI_BASE,
+		.state = MTK_SPI_IDLE,
+	}
+};
+
+static inline struct mtk_spi_bus *to_mtk_spi(struct spi_slave *slave)
+{
+	return container_of(slave, struct mtk_spi_bus, slave);
+}
+
+static void spi_sw_reset(struct mtk_spi_regs *regs)
+{
+	setbits_le32(&regs->spi_cmd_reg, SPI_CMD_RST_EN);
+	clrbits_le32(&regs->spi_cmd_reg, SPI_CMD_RST_EN);
+}
+
+static void mtk_spi_set_gpio_pinmux(enum spi_pad_mask pad_select)
+{
+	/* TODO: implement support for other pads when needed */
+	assert(pad_select == SPI_PAD1_MASK);
+	gpio_set_mode(PAD_MSDC2_DAT2, PAD_MSDC2_DAT2_FUNC_SPI_CK_1);
+	gpio_set_mode(PAD_MSDC2_DAT3, PAD_MSDC2_DAT3_FUNC_SPI_MI_1);
+	gpio_set_mode(PAD_MSDC2_CLK, PAD_MSDC2_CLK_FUNC_SPI_MO_1);
+	gpio_set_mode(PAD_MSDC2_CMD, PAD_MSDC2_CMD_FUNC_SPI_CS_1);
+}
+
+void mtk_spi_init(unsigned int bus, unsigned int pad_select,
+		  unsigned int speed_hz)
+{
+	u32 div, sck_ticks, cs_ticks, reg_val;
+	/* mtk spi HW just support bus 0 */
+	assert(bus == 0);
+	struct mtk_spi_bus *slave = &spi_bus[bus];
+	struct mtk_spi_regs *regs = slave->regs;
+
+	if (speed_hz < SPI_HZ / 2)
+		div = div_round_up(SPI_HZ, speed_hz);
+	else
+		div = 1;
+
+	sck_ticks = div_round_up(div, 2);
+	cs_ticks = sck_ticks * 2;
+
+	printk(BIOS_DEBUG, "SPI%u initialized at %u Hz",
+	       pad_select, SPI_HZ / (sck_ticks * 2));
+
+	/* set the timing */
+	write32(&regs->spi_cfg0_reg,
+		((sck_ticks - 1) << SPI_CFG0_SCK_HIGH_SHIFT) |
+		((sck_ticks - 1) << SPI_CFG0_SCK_LOW_SHIFT) |
+		((cs_ticks - 1) << SPI_CFG0_CS_HOLD_SHIFT) |
+		((cs_ticks - 1) << SPI_CFG0_CS_SETUP_SHIFT));
+	clrsetbits_le32(&regs->spi_cfg1_reg, SPI_CFG1_CS_IDLE_MASK,
+			((cs_ticks - 1) << SPI_CFG1_CS_IDLE_SHIFT));
+
+	reg_val = read32(&regs->spi_cmd_reg);
+
+	reg_val &= ~SPI_CMD_CPHA_EN;
+	reg_val &= ~SPI_CMD_CPOL_EN;
+
+	/* set the mlsbx and mlsbtx */
+	reg_val |= SPI_CMD_TXMSBF_EN;
+	reg_val |= SPI_CMD_RXMSBF_EN;
+
+	/* set the tx/rx endian */
+#ifdef __LITTLE_ENDIAN
+	reg_val &= ~SPI_CMD_TX_ENDIAN_EN;
+	reg_val &= ~SPI_CMD_RX_ENDIAN_EN;
+#else
+	reg_val |= SPI_CMD_TX_ENDIAN_EN;
+	reg_val |= SPI_CMD_RX_ENDIAN_EN;
+#endif
+
+	/* clear pause mode */
+	reg_val &= ~SPI_CMD_PAUSE_EN;
+
+	/* set finish interrupt always enable */
+	reg_val |= SPI_CMD_FINISH_IE_EN;
+
+	/* set pause interrupt always enable */
+	reg_val |= SPI_CMD_PAUSE_IE_EN;
+
+	/* disable dma mode */
+	reg_val &= ~(SPI_CMD_TX_DMA_EN | SPI_CMD_RX_DMA_EN);
+
+	/* set deassert mode */
+	reg_val &= ~SPI_CMD_DEASSERT_EN;
+
+	write32(&regs->spi_cmd_reg, reg_val);
+
+	mtk_spi_set_gpio_pinmux(pad_select);
+	/* pad select */
+	clrsetbits_le32(&regs->spi_pad_macro_sel_reg, SPI_PAD_SEL_MASK,
+			pad_select);
+}
+
+static void mtk_spi_dump_data(const char *name, const uint8_t *data,
+			      int size)
+{
+#ifdef MTK_SPI_DEBUG
+	int i;
+
+	printk(BIOS_DEBUG, "%s: 0x ", name);
+	for (i = 0; i < size; i++)
+		printk(BIOS_INFO, "%#x ", data[i]);
+	printk(BIOS_DEBUG, "\n");
+#endif
+}
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs)
+{
+	struct mtk_spi_bus *eslave;
+
+	switch (bus) {
+	case CONFIG_EC_GOOGLE_CHROMEEC_SPI_BUS:
+		eslave = &spi_bus[bus];
+		assert(read32(&eslave->regs->spi_cfg0_reg) != 0);
+		spi_sw_reset(eslave->regs);
+		return &eslave->slave;
+	default:
+		die ("wrong bus number.\n");
+	};
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+	struct mtk_spi_bus *mtk_slave = to_mtk_spi(slave);
+	struct mtk_spi_regs *regs = mtk_slave->regs;
+
+	setbits_le32(&regs->spi_cmd_reg, 1 << SPI_CMD_PAUSE_EN_SHIFT);
+	mtk_slave->state = MTK_SPI_IDLE;
+
+	return 0;
+}
+
+static int mtk_spi_fifo_transfer(struct spi_slave *slave, void *in,
+				 const void *out, u32 size)
+{
+	struct mtk_spi_bus *mtk_slave = to_mtk_spi(slave);
+	struct mtk_spi_regs *regs = mtk_slave->regs;
+	uint8_t *inb = (uint8_t *)in;
+	const uint32_t *outb = (const uint32_t *)out;
+	uint32_t reg_val, i, word_count;
+	struct stopwatch sw;
+
+	if (!size || size > MTK_FIFO_DEPTH)
+		return -1;
+
+	clrsetbits_le32(&regs->spi_cfg1_reg,
+			SPI_CFG1_PACKET_LENGTH_MASK | SPI_CFG1_PACKET_LOOP_MASK,
+			((size - 1) << SPI_CFG1_PACKET_LENGTH_SHIFT) |
+			(0 << SPI_CFG1_PACKET_LOOP_SHIFT));
+
+	word_count = div_round_up(size, sizeof(u32));
+	if (inb) {
+		/* The SPI controller will transmit in full-duplex for RX,
+		 * therefore we need arbitrary data on MOSI which the slave
+		 * must ignore.
+		 */
+		for (i = 0; i < word_count; i++)
+			write32(&regs->spi_tx_data_reg, MTK_ARBITRARY_VALUE);
+	}
+	if (outb) {
+		for (i = 0; i < word_count; i++)
+			write32(&regs->spi_tx_data_reg, outb[i]);
+		mtk_spi_dump_data("the outb data is",
+				  (const uint8_t *)outb, size);
+	}
+
+	if (mtk_slave->state == MTK_SPI_IDLE) {
+		setbits_le32(&regs->spi_cmd_reg, SPI_CMD_ACT_EN);
+		mtk_slave->state = MTK_SPI_PAUSE_IDLE;
+	} else if (mtk_slave->state == MTK_SPI_PAUSE_IDLE) {
+		setbits_le32(&regs->spi_cmd_reg, SPI_CMD_RESUME_EN);
+	}
+
+	stopwatch_init_usecs_expire(&sw, MTK_TXRX_TIMEOUT_US);
+	while ((read32(&regs->spi_status1_reg) & MTK_SPI_BUSY_STATUS) == 0) {
+		if (stopwatch_expired(&sw)) {
+			printk(BIOS_ERR,
+			       "Timeout waiting for status1 status.\n");
+			goto error;
+		}
+	}
+	stopwatch_init_usecs_expire(&sw, MTK_TXRX_TIMEOUT_US);
+	while ((read32(&regs->spi_status0_reg) &
+	       MTK_SPI_PAUSE_FINISH_INT_STATUS) == 0) {
+		if (stopwatch_expired(&sw)) {
+			printk(BIOS_ERR,
+			       "Timeout waiting for status0 status.\n");
+			goto error;
+		}
+	}
+
+	if (inb) {
+		for (i = 0; i < size; i++) {
+			if (i % 4 == 0)
+				reg_val = read32(&regs->spi_rx_data_reg);
+			*(inb + i) = (reg_val >> ((i % 4) * 8)) & 0xff;
+		}
+		mtk_spi_dump_data("the inb data is", inb, size);
+	}
+
+	return 0;
+error:
+	spi_sw_reset(regs);
+	mtk_slave->state = MTK_SPI_IDLE;
+	return -1;
+}
+
+int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bytes_out,
+	     void *din, unsigned int bytes_in)
+{
+	uint32_t min_size;
+	int ret;
+
+	while (bytes_out || bytes_in) {
+		if (bytes_in && bytes_out)
+			min_size = MIN(MIN(bytes_out, bytes_in), MTK_FIFO_DEPTH);
+		else if (bytes_out)
+			min_size = MIN(bytes_out, MTK_FIFO_DEPTH);
+		else if (bytes_in)
+			min_size = MIN(bytes_in, MTK_FIFO_DEPTH);
+
+		ret = mtk_spi_fifo_transfer(slave, din, dout, min_size);
+		if (ret != 0)
+			return ret;
+
+		if (bytes_out) {
+			bytes_out -= min_size;
+			dout = (const uint8_t *)dout + min_size;
+		}
+
+		if (bytes_in) {
+			bytes_in -= min_size;
+			din = (uint8_t *)din + min_size;
+		}
+	}
+
+	return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+	struct mtk_spi_bus *mtk_slave = to_mtk_spi(slave);
+	struct mtk_spi_regs *regs = mtk_slave->regs;
+
+	clrbits_le32(&regs->spi_cmd_reg, SPI_CMD_PAUSE_EN);
+	spi_sw_reset(regs);
+	mtk_slave->state = MTK_SPI_IDLE;
+}



More information about the coreboot-gerrit mailing list