* [U-Boot] [PATCH] eSPI and Intel E1000 support for P1/P2 RDB
2010-08-08 19:57 ` Wolfgang Denk
@ 2010-08-19 7:13 ` Kumar Gala
2010-09-15 7:02 ` Can Aydin
1 sibling, 0 replies; 5+ messages in thread
From: Kumar Gala @ 2010-08-19 7:13 UTC (permalink / raw)
To: u-boot
On Aug 8, 2010, at 2:57 PM, Wolfgang Denk wrote:
> Dear Kumar Gala,
>
> In message <57CDB146-383A-4629-B7E4-C2729200A43F@kernel.crashing.org> you wrote:
>>
>> On Jun 23, 2010, at 8:56 AM, Poonam Aggrwal wrote:
>>
>>> This patch enables the eSPI configuration to use
>>> the Spansion Flash on P1 and P2 RDB Platforms
>>>
>>> This also enables the Intel Pro/1000 PT Gb Ethernet
>>> PCI-E Network Adapter configuration support
>>>
>>> Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
>>> ---
>>> include/configs/P1_P2_RDB.h | 15 +++++++++++++++
>>> 1 files changed, 15 insertions(+), 0 deletions(-)
>>
>> applied to 85xx
>
> I think I haven't seen this in a pull request yet?
>
> Best regards,
>
> Wolfgang Denk
I think there was some issue with SPI change so I dropped this patch and replaced with:
commit ddac6f08db3d539d05fad5400ed3dc815b1a196b
Author: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Date: Thu Jul 1 14:24:36 2010 +0530
85xx/p1_p2_rdb: PCIe E1000 card support added.
which is already in your tree.
- k
^ permalink raw reply [flat|nested] 5+ messages in thread* [U-Boot] [PATCH] eSPI and Intel E1000 support for P1/P2 RDB
2010-08-08 19:57 ` Wolfgang Denk
2010-08-19 7:13 ` Kumar Gala
@ 2010-09-15 7:02 ` Can Aydin
1 sibling, 0 replies; 5+ messages in thread
From: Can Aydin @ 2010-09-15 7:02 UTC (permalink / raw)
To: u-boot
On 9/08/2010 5:57 AM, Wolfgang Denk wrote:
> Dear Kumar Gala,
>
> In message<57CDB146-383A-4629-B7E4-C2729200A43F@kernel.crashing.org> you wrote:
>> On Jun 23, 2010, at 8:56 AM, Poonam Aggrwal wrote:
>>
>>> This patch enables the eSPI configuration to use
>>> the Spansion Flash on P1 and P2 RDB Platforms
>>>
>>> This also enables the Intel Pro/1000 PT Gb Ethernet
>>> PCI-E Network Adapter configuration support
>>>
>>> Signed-off-by: Poonam Aggrwal<poonam.aggrwal@freescale.com>
>>> ---
>>> include/configs/P1_P2_RDB.h | 15 +++++++++++++++
>>> 1 files changed, 15 insertions(+), 0 deletions(-)
>> applied to 85xx
> I think I haven't seen this in a pull request yet?
>
> Best regards,
>
> Wolfgang Denk
>
I've been looking at past messages and I don't think the Freescale eSPI
controller patch ever made it in.
The most recent discussion I could find was here:
http://lists.denx.de/pipermail/u-boot/2009-March/049114.html
I'm not sure why exactly a driver like this needs the activate and
deactivate functions as it's for a SoC, so I was wondering whether
something like the below would not work? (this is just for discussion
purposes so please disregard formatting).
Index: a/u-boot/include/configs/P1_P2_RDB.h
===================================================================
--- a/u-boot/include/configs/P1_P2_RDB.h
+++ b/u-boot/include/configs/P1_P2_RDB.h
@@ -97,6 +97,21 @@
#define CONFIG_TSEC_ENET /* tsec ethernet support */
#define CONFIG_ENV_OVERWRITE
+#define CONFIG_E1000 1 /* Defind e1000 pci Ethernet card*/
+
+/*
+ * eSPI - Enhanced SPI
+ */
+#define CONFIG_SPI_FLASH
+#define CONFIG_SPI_FLASH_SPANSION
+
+#define CONFIG_HARD_SPI
+#define CONFIG_FSL_ESPI
+
+#define CONFIG_CMD_SF
+#define CONFIG_SF_DEFAULT_SPEED 10000000
+#define CONFIG_SF_DEFAULT_MODE 0
+
#ifndef __ASSEMBLY__
extern unsigned long get_board_sys_clk(unsigned long dummy);
#endif
Index: a/u-boot/drivers/spi/fsl_espi.c
===================================================================
--- /dev/null
+++ b/u-boot/drivers/spi/fsl_espi.c
@@ -0,0 +1,225 @@
+/*
+ * eSPI controller driver.
+ *
+ * Copyright 2009 Freescale Semiconductor, Inc.
+ * Author: Mingkai Hu (Mingkai.hu at freescale.com)
+ *
+ * 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; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+
+#include <malloc.h>
+#include <spi.h>
+#include <asm/immap_85xx.h>
+
+#define ESPI_MAX_CS_NUM 4
+
+#define ESPI_EV_RNE (1 << 9)
+#define ESPI_EV_TNF (1 << 8)
+
+#define ESPI_MODE_EN (1 << 31) /* Enable interface */
+#define ESPI_MODE_TXTHR(x) ((x) << 8) /* Tx FIFO threshold */
+#define ESPI_MODE_RXTHR(x) ((x) << 0) /* Rx FIFO threshold */
+
+#define ESPI_COM_CS(x) ((x) << 30)
+#define ESPI_COM_TRANLEN(x) ((x) << 0)
+
+#define ESPI_CSMODE_CI_INACTIVEHIGH (1 << 31)
+#define ESPI_CSMODE_CP_BEGIN_EDGCLK (1 << 30)
+#define ESPI_CSMODE_REV_MSB_FIRST (1 << 29)
+#define ESPI_CSMODE_DIV16 (1 << 28)
+#define ESPI_CSMODE_PM(x) ((x) << 24)
+#define ESPI_CSMODE_POL_ASSERTED_LOW (1 << 20)
+#define ESPI_CSMODE_LEN(x) ((x) << 16)
+#define ESPI_CSMODE_CSBEF(x) ((x) << 12)
+#define ESPI_CSMODE_CSAFT(x) ((x) << 8)
+#define ESPI_CSMODE_CSCG(x) ((x) << 3)
+
+#define ESPI_CSMODE_INIT_VAL (ESPI_CSMODE_POL_ASSERTED_LOW | \
+ ESPI_CSMODE_CSBEF(0) | ESPI_CSMODE_CSAFT(0) | \
+ ESPI_CSMODE_CSCG(1))
+
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+ unsigned int max_hz, unsigned int mode)
+{
+ volatile ccsr_espi_t *espi = (void *)(CONFIG_SYS_MPC85xx_ESPI_ADDR);
+ struct spi_slave *slave;
+ sys_info_t sysinfo;
+ unsigned long spibrg = 0;
+ unsigned char pm = 0;
+ int i;
+
+ if (!spi_cs_is_valid(bus, cs))
+ return NULL;
+
+ slave = malloc(sizeof(struct spi_slave));
+ if (!slave)
+ return NULL;
+
+ slave->bus = bus;
+ slave->cs = cs;
+
+ /* Enable eSPI interface */
+ espi->mode = ESPI_MODE_RXTHR(3) | ESPI_MODE_TXTHR(4) | ESPI_MODE_EN;
+
+ espi->event = 0xffffffff; /* Clear all eSPI events */
+ espi->mask = 0x00000000; /* Mask all eSPI interrupts */
+
+ /* Init CS mode interface */
+ for (i = 0; i < ESPI_MAX_CS_NUM; i++)
+ espi->csmode[i] = ESPI_CSMODE_INIT_VAL;
+
+ espi->csmode[cs] &= ~(ESPI_CSMODE_PM(0xF) | ESPI_CSMODE_DIV16
+ | ESPI_CSMODE_CI_INACTIVEHIGH | ESPI_CSMODE_CP_BEGIN_EDGCLK
+ | ESPI_CSMODE_REV_MSB_FIRST | ESPI_CSMODE_LEN(0xF));
+
+ /* Set eSPI BRG clock source */
+ get_sys_info(&sysinfo);
+ spibrg = sysinfo.freqSystemBus / 2;
+ if ((spibrg / max_hz) > 32) {
+ espi->csmode[cs] |= ESPI_CSMODE_DIV16;
+ pm = spibrg / (max_hz * 16 * 2);
+ if (pm > 16) {
+ pm = 16;
+ debug("Requested speed is too low: %d Hz"
+ " %d Hz is used.\n", max_hz, spibrg / (32 * 16));
+ }
+ } else
+ pm = spibrg / (max_hz * 2);
+ if (pm)
+ pm--;
+ espi->csmode[cs] |= ESPI_CSMODE_PM(pm);
+
+ /* Set eSPI mode */
+ if (mode & SPI_CPHA)
+ espi->csmode[cs] |= ESPI_CSMODE_CP_BEGIN_EDGCLK;
+ if (mode & SPI_CPOL)
+ espi->csmode[cs] |= ESPI_CSMODE_CI_INACTIVEHIGH;
+
+ /* Character bit order: msb first */
+ espi->csmode[cs] |= ESPI_CSMODE_REV_MSB_FIRST;
+
+ /* Character length in bits, between 0x3~0xf, i.e. 4bits~16bits */
+ espi->csmode[cs] |= ESPI_CSMODE_LEN(7);
+
+ return slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+ free(slave);
+}
+
+void spi_init(void)
+{
+
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+ return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+
+}
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void
*dout,
+ void *din, unsigned long flags)
+{
+ volatile ccsr_espi_t *espi = (void *)(CONFIG_SYS_MPC85xx_ESPI_ADDR);
+ unsigned int tmpdout, tmpdin, event;
+ unsigned int len = bitlen / 8 + ( bitlen % 4 ? 1 : 0 );
+ int numBlks = bitlen / 32 + (bitlen % 32 ? 1 : 0);
+ unsigned char charsize = 32;
+
+ debug("spi_xfer: slave %u:%u dout %08X(%08x) din %08X(%08x) len %u\n",
+ slave->bus, slave->cs, *(uint *) dout, dout, *(uint *) din,
din, len);
+
+ if (flags & SPI_XFER_BEGIN)
+ {
+ unsigned int com = 0;
+ com &= ~(ESPI_COM_CS(0x3) | ESPI_COM_TRANLEN(0xFFFF));
+ com |= ESPI_COM_CS(espi_cs_state.cs);
+ com |= ESPI_COM_TRANLEN(len - 1);
+ espi->com = com;
+ }
+
+ /* Clear all eSPI events */
+ espi->event = 0xffffffff;
+
+ /* handle data in 32-bit chunks */
+ while (numBlks--) {
+ charsize = (bitlen >= 32 ? 32 : bitlen);
+
+ event = espi->event;
+ if (event & ESPI_EV_TNF) {
+ tmpdout = *(u32 *)dout;
+
+ /* Set up the next iteration if sending > 4 bytes */
+ if (len > 4) {
+ len -= 4;
+ dout += 4;
+ }
+
+ espi->tx = tmpdout;
+ espi->event |= ESPI_EV_TNF;
+ }
+ debug("*** spi_xfer: ... %08x written\n", tmpdout);
+
+ /* Wait for eSPI transmit to get out */
+ udelay(80);
+
+ event = espi->event;
+ if (event & ESPI_EV_RNE) {
+ tmpdin = espi->rx;
+ *(u32 *) din = tmpdin;
+
+ if (charsize == 32) {
+ din += 4;
+ }
+
+ espi->event |= ESPI_EV_RNE;
+ }
+ debug("*** spi_xfer: ... %08x readed\n", tmpdin);
+ }
+
+ if (flags & SPI_XFER_END) {
+
+ /* clear the RXCNT and TXCNT */
+ espi->mode &= ~ESPI_MODE_EN;
+ espi->mode |= ESPI_MODE_EN;
+ }
+
+ return 0;
+}
+
+int spi_cs_is_valid(unsigned int bus, unsigned int cs)
+{
+ return bus == 0 && cs < ESPI_MAX_CS_NUM;
+}
+
+void spi_cs_activate(struct spi_slave *slave)
+{
+
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+
+}
Index: a/u-boot/drivers/spi/Makefile
===================================================================
--- a/u-boot/drivers/spi/Makefile
+++ b/u-boot/drivers/spi/Makefile
@@ -36,6 +36,7 @@
COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o
COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o
COBJS-$(CONFIG_SOFT_SPI) += soft_spi.o
+COBJS-$(CONFIG_FSL_ESPI) += fsl_espi.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
^ permalink raw reply [flat|nested] 5+ messages in thread