Skip to contentSkip to conversation

MIPS Malta board support

PATCH Superseded Paul Burton 3 participants 35 messages Oct 23, 2013 – Oct 24, 2013

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover MIPS Malta board support

This series adds support for booting on a physical MIPS Malta board using a coreFPGA6 core card.

The first 6 patches lay some groundwork, then the next 8 genericise the existing qemu-malta board to also function on a physical Malta.

In the final patch I stake my claim upon, errm I mean step up to support :), the malta(el) board(s).

Paul Burton (15):
mips32: detect L1 cache sizes if they're not defined
pcnet: code style cleanup
pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send
pcnet: add cache flushing & invalidation
pcnet: enable the NOUFLO feature
pci.h: allow inclusion in assembly source
qemu-malta: rename to just "malta"
malta: setup super I/O UARTs
malta: support for coreFPGA6 boards
malta: display "U-boot" on the LCD screen
malta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCP
malta: remove cache size definitions
malta: disable L2 caches
malta: add script & instructions to flash U-boot
malta: add myself to maintainers

 arch/mips/cpu/mips32/cache.S     |  90 +++++++++++--
 arch/mips/cpu/mips32/cpu.c       |  73 +++++++++-
 arch/mips/include/asm/malta.h    |  45 ++++++-
 arch/mips/include/asm/mipsregs.h |   6 +
 arch/mips/lib/bootm.c            |  12 +-
 board/malta/Makefile             |  29 ++++
 board/malta/README               |  16 +++
 board/malta/flash-malta-boot.tcl |  40 ++++++
 board/malta/lowlevel_init.S      | 238 +++++++++++++++++++++++++++++++++
 board/malta/malta.c              | 186 ++++++++++++++++++++++++++
 board/malta/superio.c            |  63 +++++++++
 board/malta/superio.h            |  15 +++
 board/qemu-malta/Makefile        |  29 ----
 board/qemu-malta/lowlevel_init.S |  69 ----------
 board/qemu-malta/qemu-malta.c    |  47 -------
 boards.cfg                       |   4 +-
 drivers/net/pcnet.c              | 279 +++++++++++++++++++++------------------
 drivers/pci/Makefile             |   1 +
 drivers/pci/pci_msc01.c          | 126 ++++++++++++++++++
 include/configs/malta.h          | 115 ++++++++++++++++
 include/configs/qemu-malta.h     | 114 ----------------
 include/msc01.h                  | 135 +++++++++++++++++++
 include/pci.h                    |   6 +-
 include/pci_ids.h                |   3 +
 include/pci_msc01.h              |  17 +++
 25 files changed, 1340 insertions(+), 418 deletions(-)
 create mode 100644 board/malta/Makefile
 create mode 100644 board/malta/README
 create mode 100644 board/malta/flash-malta-boot.tcl
 create mode 100644 board/malta/lowlevel_init.S
 create mode 100644 board/malta/malta.c
 create mode 100644 board/malta/superio.c
 create mode 100644 board/malta/superio.h
 delete mode 100644 board/qemu-malta/Makefile
 delete mode 100644 board/qemu-malta/lowlevel_init.S
 delete mode 100644 board/qemu-malta/qemu-malta.c
 create mode 100644 drivers/pci/pci_msc01.c
 create mode 100644 include/configs/malta.h
 delete mode 100644 include/configs/qemu-malta.h
 create mode 100644 include/msc01.h
 create mode 100644 include/pci_msc01.h
Signature · 1 line
1.8.4
#1 lore raw

PATCH 1/15 mips32: detect L1 cache sizes if they're not defined

For boards such as the MIPS Malta with an FPGA core card it is desirable to be able to detect the L1 cache sizes at runtime, since they are not dependant upon the board but on the FPGA bitstream in use. This patch performs that detection when the CONFIG_SYS_[DI]CACHE_SIZE macros are not defined by the board configuration. In cases where the sizes are detected this patch also removes the restriction that the I-cache & D-cache line sizes must be the same, as this is not necessarily true.

If the cache sizes are defined by a configuration then they will be hardcoded as before, so this patch will not add overhead to such boards.

---
 arch/mips/cpu/mips32/cache.S     | 90 ++++++++++++++++++++++++++++++++++------
 arch/mips/cpu/mips32/cpu.c       | 73 +++++++++++++++++++++++++++++---
 arch/mips/include/asm/mipsregs.h |  6 +++
 3 files changed, 150 insertions(+), 19 deletions(-)
arch/mips/cpu/mips32/cache.S +77 -13
index 12f656c..22bd844 100644
@@ -20,15 +20,6 @@
 
 #define RA		t9
 
-/*
- * 16kB is the maximum size of instruction and data caches on MIPS 4K,
- * 64kB is on 4KE, 24K, 5K, etc. Set bigger size for convenience.
- *
- * Note that the above size is the maximum size of primary cache. U-Boot
- * doesn't have L2 cache support for now.
- */
-#define MIPS_MAX_CACHE_SIZE	0x10000
-
 #define INDEX_BASE	CKSEG0
 
 	.macro	cache_op op addr
@@ -126,12 +117,85 @@ LEAF(mips_init_dcache)
  */
 NESTED(mips_cache_reset, 0, ra)
 	move	RA, ra
-	li	t2, CONFIG_SYS_ICACHE_SIZE
-	li	t3, CONFIG_SYS_DCACHE_SIZE
+
+#if !defined(CONFIG_SYS_ICACHE_SIZE) || !defined(CONFIG_SYS_DCACHE_SIZE) || \
+    !defined(CONFIG_SYS_CACHELINE_SIZE)
+	/* read Config1 for use below */
+	mfc0	t5, CP0_CONFIG, 1
+#endif
+
+#ifdef CONFIG_SYS_CACHELINE_SIZE
+	li	t7, CONFIG_SYS_CACHELINE_SIZE
 	li	t8, CONFIG_SYS_CACHELINE_SIZE
+#else
+	/* Detect I-cache line size. */
+	srl	t8, t5, MIPS_CONF1_IL_SHIFT
+	andi	t8, t8, (MIPS_CONF1_IL >> MIPS_CONF1_IL_SHIFT)
+	beqz	t8, 1f
+	li	t6, 2
+	sllv	t8, t6, t8
 
-	li	v0, MIPS_MAX_CACHE_SIZE
+1:	/* Detect D-cache line size. */
+	srl	t7, t5, MIPS_CONF1_DL_SHIFT
+	andi	t7, t7, (MIPS_CONF1_DL >> MIPS_CONF1_DL_SHIFT)
+	beqz	t7, 1f
+	li	t6, 2
+	sllv	t7, t6, t7
+1:
+#endif
 
+#ifdef CONFIG_SYS_ICACHE_SIZE
+	li	t2, CONFIG_SYS_ICACHE_SIZE
+#else
+	/* Detect I-cache size. */
+	srl	t6, t5, MIPS_CONF1_IS_SHIFT
+	andi	t6, t6, (MIPS_CONF1_IS >> MIPS_CONF1_IS_SHIFT)
+	li	t4, 32
+	xori	t2, t6, 0x7
+	beqz	t2, 1f
+	addi	t6, t6, 1
+	sllv	t4, t4, t6
+1:	/* At this point t4 == I-cache sets. */
+	mul	t2, t4, t8
+	srl	t6, t5, MIPS_CONF1_IA_SHIFT
+	andi	t6, t6, (MIPS_CONF1_IA >> MIPS_CONF1_IA_SHIFT)
+	addi	t6, t6, 1
+	/* At this point t6 == I-cache ways. */
+	mul	t2, t2, t6
+#endif
+
+#ifdef CONFIG_SYS_DCACHE_SIZE
+	li	t3, CONFIG_SYS_DCACHE_SIZE
+#else
+	/* Detect D-cache size. */
+	srl	t6, t5, MIPS_CONF1_DS_SHIFT
+	andi	t6, t6, (MIPS_CONF1_DS >> MIPS_CONF1_DS_SHIFT)
+	li	t4, 32
+	xori	t3, t6, 0x7
+	beqz	t3, 1f
+	addi	t6, t6, 1
+	sllv	t4, t4, t6
+1:	/* At this point t4 == I-cache sets. */
+	mul	t3, t4, t7
+	srl	t6, t5, MIPS_CONF1_DA_SHIFT
+	andi	t6, t6, (MIPS_CONF1_DA >> MIPS_CONF1_DA_SHIFT)
+	addi	t6, t6, 1
+	/* At this point t6 == I-cache ways. */
+	mul	t3, t3, t6
+#endif
+
+	/* Determine the largest L1 cache size */
+#if defined(CONFIG_SYS_ICACHE_SIZE) && defined(CONFIG_SYS_DCACHE_SIZE)
+#if CONFIG_SYS_ICACHE_SIZE > CONFIG_SYS_DCACHE_SIZE
+	li	v0, CONFIG_SYS_ICACHE_SIZE
+#else
+	li	v0, CONFIG_SYS_DCACHE_SIZE
+#endif
+#else
+	move	v0, t2
+	sltu	t1, t2, t3
+	movn	v0, t3, t1
+#endif
 	/*
 	 * Now clear that much memory starting from zero.
 	 */
@@ -163,7 +227,7 @@ NESTED(mips_cache_reset, 0, ra)
 	 * then initialize D-cache.
 	 */
 	move	a1, t3
-	move	a2, t8
+	move	a2, t7
 	PTR_LA	v1, mips_init_dcache
 	jalr	v1
 
arch/mips/cpu/mips32/cpu.c +67 -6

102 lines not on this page · raw message

arch/mips/include/asm/mipsregs.h +6 -0
index be7e5c6..3571e4f 100644
@@ -494,11 +494,17 @@
 #define MIPS_CONF1_PC		(_ULCAST_(1) <<  4)
 #define MIPS_CONF1_MD		(_ULCAST_(1) <<  5)
 #define MIPS_CONF1_C2		(_ULCAST_(1) <<  6)
+#define MIPS_CONF1_DA_SHIFT	7
 #define MIPS_CONF1_DA		(_ULCAST_(7) <<  7)
+#define MIPS_CONF1_DL_SHIFT	10
 #define MIPS_CONF1_DL		(_ULCAST_(7) << 10)
+#define MIPS_CONF1_DS_SHIFT	13
 #define MIPS_CONF1_DS		(_ULCAST_(7) << 13)
+#define MIPS_CONF1_IA_SHIFT	16
 #define MIPS_CONF1_IA		(_ULCAST_(7) << 16)
+#define MIPS_CONF1_IL_SHIFT	19
 #define MIPS_CONF1_IL		(_ULCAST_(7) << 19)
+#define MIPS_CONF1_IS_SHIFT	22
 #define MIPS_CONF1_IS		(_ULCAST_(7) << 22)
 #define MIPS_CONF1_TLBS		(_ULCAST_(63)<< 25)
 
Signature · 1 line
1.8.4
#2 lore raw

PATCH 2/15 pcnet: code style cleanup

In reply to Paul Burton

Fix up the code to match Documentation/CodingStyle. This is mostly removing extraneous spaces.

No functional change is intended.

---
 drivers/net/pcnet.c | 248 ++++++++++++++++++++++++++--------------------------
 1 file changed, 123 insertions(+), 125 deletions(-)
drivers/net/pcnet.c +123 -125
index 283cb48..a30a0bc 100644
@@ -89,39 +89,39 @@ static pcnet_priv_t *lp;
 #define PCNET_RESET		0x14
 #define PCNET_BDP		0x16
 
-static u16 pcnet_read_csr (struct eth_device *dev, int index)
+static u16 pcnet_read_csr(struct eth_device *dev, int index)
 {
-	outw (index, dev->iobase + PCNET_RAP);
-	return inw (dev->iobase + PCNET_RDP);
+	outw(index, dev->iobase + PCNET_RAP);
+	return inw(dev->iobase + PCNET_RDP);
 }
 
-static void pcnet_write_csr (struct eth_device *dev, int index, u16 val)
+static void pcnet_write_csr(struct eth_device *dev, int index, u16 val)
 {
-	outw (index, dev->iobase + PCNET_RAP);
-	outw (val, dev->iobase + PCNET_RDP);
+	outw(index, dev->iobase + PCNET_RAP);
+	outw(val, dev->iobase + PCNET_RDP);
 }
 
-static u16 pcnet_read_bcr (struct eth_device *dev, int index)
+static u16 pcnet_read_bcr(struct eth_device *dev, int index)
 {
-	outw (index, dev->iobase + PCNET_RAP);
-	return inw (dev->iobase + PCNET_BDP);
+	outw(index, dev->iobase + PCNET_RAP);
+	return inw(dev->iobase + PCNET_BDP);
 }
 
-static void pcnet_write_bcr (struct eth_device *dev, int index, u16 val)
+static void pcnet_write_bcr(struct eth_device *dev, int index, u16 val)
 {
-	outw (index, dev->iobase + PCNET_RAP);
-	outw (val, dev->iobase + PCNET_BDP);
+	outw(index, dev->iobase + PCNET_RAP);
+	outw(val, dev->iobase + PCNET_BDP);
 }
 
-static void pcnet_reset (struct eth_device *dev)
+static void pcnet_reset(struct eth_device *dev)
 {
-	inw (dev->iobase + PCNET_RESET);
+	inw(dev->iobase + PCNET_RESET);
 }
 
-static int pcnet_check (struct eth_device *dev)
+static int pcnet_check(struct eth_device *dev)
 {
-	outw (88, dev->iobase + PCNET_RAP);
-	return (inw (dev->iobase + PCNET_RAP) == 88);
+	outw(88, dev->iobase + PCNET_RAP);
+	return inw(dev->iobase + PCNET_RAP) == 88;
 }
 
 static int pcnet_init (struct eth_device *dev, bd_t * bis);
@@ -139,63 +139,64 @@ static struct pci_device_id supported[] = {
 };
 
 
-int pcnet_initialize (bd_t * bis)
+int pcnet_initialize(bd_t *bis)
 {
 	pci_dev_t devbusfn;
 	struct eth_device *dev;
 	u16 command, status;
 	int dev_nr = 0;
 
-	PCNET_DEBUG1 ("\npcnet_initialize...\n");
+	PCNET_DEBUG1("\npcnet_initialize...\n");
 
 	for (dev_nr = 0;; dev_nr++) {
 
 		/*
 		 * Find the PCnet PCI device(s).
 		 */
-		if ((devbusfn = pci_find_devices (supported, dev_nr)) < 0) {
+		devbusfn = pci_find_devices(supported, dev_nr);
+		if (devbusfn < 0)
 			break;
-		}
 
 		/*
 		 * Allocate and pre-fill the device structure.
 		 */
-		dev = (struct eth_device *) malloc (sizeof *dev);
+		dev = (struct eth_device *)malloc(sizeof(*dev));
 		if (!dev) {
 			printf("pcnet: Can not allocate memory\n");
 			break;
 		}
 		memset(dev, 0, sizeof(*dev));
-		dev->priv = (void *) devbusfn;
-		sprintf (dev->name, "pcnet#%d", dev_nr);
+		dev->priv = (void *)devbusfn;
+		sprintf(dev->name, "pcnet#%d", dev_nr);
 
 		/*
 		 * Setup the PCI device.
 		 */
-		pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0,
-				       (unsigned int *) &dev->iobase);
-		dev->iobase=pci_io_to_phys (devbusfn, dev->iobase);
+		pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0,
+				      (unsigned int *)&dev->iobase);
+		dev->iobase = pci_io_to_phys(devbusfn, dev->iobase);
 		dev->iobase &= ~0xf;
 
-		PCNET_DEBUG1 ("%s: devbusfn=0x%x iobase=0x%x: ",
-			      dev->name, devbusfn, dev->iobase);
+		PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%x: ",
+			     dev->name, devbusfn, dev->iobase);
 
 		command = PCI_COMMAND_IO | PCI_COMMAND_MASTER;
-		pci_write_config_word (devbusfn, PCI_COMMAND, command);
-		pci_read_config_word (devbusfn, PCI_COMMAND, &status);
+		pci_write_config_word(devbusfn, PCI_COMMAND, command);
+		pci_read_config_word(devbusfn, PCI_COMMAND, &status);
 		if ((status & command) != command) {
-			printf ("%s: Couldn't enable IO access or Bus Mastering\n", dev->name);
-			free (dev);
+			printf("%s: Couldn't enable IO access or Bus Mastering\n",
+			       dev->name);
+			free(dev);
 			continue;
 		}
 
-		pci_write_config_byte (devbusfn, PCI_LATENCY_TIMER, 0x40);
+		pci_write_config_byte(devbusfn, PCI_LATENCY_TIMER, 0x40);
 
 		/*
 		 * Probe the PCnet chip.
 		 */
-		if (pcnet_probe (dev, bis, dev_nr) < 0) {
-			free (dev);
+		if (pcnet_probe(dev, bis, dev_nr) < 0) {
+			free(dev);
 			continue;
 		}
 
@@ -207,15 +208,15 @@ int pcnet_initialize (bd_t * bis)
 		dev->send = pcnet_send;
 		dev->recv = pcnet_recv;
 
-		eth_register (dev);
+		eth_register(dev);
 	}
 
-	udelay (10 * 1000);
+	udelay(10 * 1000);
 
 	return dev_nr;
 }
 
-static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_nr)
+static int pcnet_probe(struct eth_device *dev, bd_t *bis, int dev_nr)
 {
 	int chip_version;
 	char *chipname;
@@ -225,17 +226,17 @@ static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_nr)
 #endif
 
 	/* Reset the PCnet controller */
-	pcnet_reset (dev);
+	pcnet_reset(dev);
 
 	/* Check if register access is working */
-	if (pcnet_read_csr (dev, 0) != 4 || !pcnet_check (dev)) {
-		printf ("%s: CSR register access check failed\n", dev->name);
+	if (pcnet_read_csr(dev, 0) != 4 || !pcnet_check(dev)) {
+		printf("%s: CSR register access check failed\n", dev->name);
 		return -1;
 	}
 
 	/* Identify the chip */
 	chip_version =
-		pcnet_read_csr (dev, 88) | (pcnet_read_csr (dev, 89) << 16);
+		pcnet_read_csr(dev, 88) | (pcnet_read_csr(dev, 89) << 16);
 	if ((chip_version & 0xfff) != 0x003)
 		return -1;
 	chip_version = (chip_version >> 12) & 0xffff;
@@ -254,12 +255,12 @@ static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_nr)
 		break;
 #endif
 	default:
-		printf ("%s: PCnet version %#x not supported\n",
-			dev->name, chip_version);
+		printf("%s: PCnet version %#x not supported\n",
+		       dev->name, chip_version);
 		return -1;
 	}
 
-	PCNET_DEBUG1 ("AMD %s\n", chipname);
+	PCNET_DEBUG1("AMD %s\n", chipname);
 
 #ifdef PCNET_HAS_PROM
 	/*
@@ -270,7 +271,7 @@ static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_nr)
 	for (i = 0; i < 3; i++) {
 		unsigned int val;
 
-		val = pcnet_read_csr (dev, i + 12) & 0x0ffff;
+		val = pcnet_read_csr(dev, i + 12) & 0x0ffff;
 		/* There may be endianness issues here. */
 		dev->enetaddr[2 * i] = val & 0x0ff;
 		dev->enetaddr[2 * i + 1] = (val >> 8) & 0x0ff;
@@ -280,35 +281,35 @@ static int pcnet_probe (struct eth_device *dev, bd_t * bis, int dev_nr)
 	return 0;
 }
 
-static int pcnet_init (struct eth_device *dev, bd_t * bis)
+static int pcnet_init(struct eth_device *dev, bd_t *bis)
 {
 	int i, val;
 	u32 addr;
 
-	PCNET_DEBUG1 ("%s: pcnet_init...\n", dev->name);
+	PCNET_DEBUG1("%s: pcnet_init...\n", dev->name);
 
 	/* Switch pcnet to 32bit mode */
-	pcnet_write_bcr (dev, 20, 2);
+	pcnet_write_bcr(dev, 20, 2);
 
 #ifdef CONFIG_PN62
 	/* Setup LED registers */
-	val = pcnet_read_bcr (dev, 2) | 0x1000;
-	pcnet_write_bcr (dev, 2, val);	/* enable LEDPE */
-	pcnet_write_bcr (dev, 4, 0x5080);	/* 100MBit */
-	pcnet_write_bcr (dev, 5, 0x40c0);	/* LNKSE */
-	pcnet_write_bcr (dev, 6, 0x4090);	/* TX Activity */
-	pcnet_write_bcr (dev, 7, 0x4084);	/* RX Activity */
+	val = pcnet_read_bcr(dev, 2) | 0x1000;
+	pcnet_write_bcr(dev, 2, val);	/* enable LEDPE */
+	pcnet_write_bcr(dev, 4, 0x5080);	/* 100MBit */
+	pcnet_write_bcr(dev, 5, 0x40c0);	/* LNKSE */
+	pcnet_write_bcr(dev, 6, 0x4090);	/* TX Activity */
+	pcnet_write_bcr(dev, 7, 0x4084);	/* RX Activity */
 #endif
 
 	/* Set/reset autoselect bit */
-	val = pcnet_read_bcr (dev, 2) & ~2;
+	val = pcnet_read_bcr(dev, 2) & ~2;
 	val |= 2;
-	pcnet_write_bcr (dev, 2, val);
+	pcnet_write_bcr(dev, 2, val);
 
 	/* Enable auto negotiate, setup, disable fd */
-	val = pcnet_read_bcr (dev, 32) & ~0x98;
+	val = pcnet_read_bcr(dev, 32) & ~0x98;
 	val |= 0x20;
-	pcnet_write_bcr (dev, 32, val);
+	pcnet_write_bcr(dev, 32, val);
 
 	/*
 	 * We only maintain one structure because the drivers will never
@@ -316,12 +317,12 @@ static int pcnet_init (struct eth_device *dev, bd_t * bis)
 	 * must be aligned on 16-byte boundaries.
 	 */
 	if (lp == NULL) {
-		addr = (u32) malloc (sizeof (pcnet_priv_t) + 0x10);
+		addr = (u32)malloc(sizeof(pcnet_priv_t) + 0x10);
 		addr = (addr + 0xf) & ~0xf;
-		lp = (pcnet_priv_t *) addr;
+		lp = (pcnet_priv_t *)addr;
 	}
 
-	lp->init_block.mode = cpu_to_le16 (0x0000);
+	lp->init_block.mode = cpu_to_le16(0x0000);
 	lp->init_block.filter[0] = 0x00000000;
 	lp->init_block.filter[1] = 0x00000000;
 
@@ -330,9 +331,9 @@ static int pcnet_init (struct eth_device *dev, bd_t * bis)
 	 */
 	lp->cur_rx = 0;
 	for (i = 0; i < RX_RING_SIZE; i++) {
-		lp->rx_ring[i].base = PCI_TO_MEM_LE (dev, lp->rx_buf[i]);
-		lp->rx_ring[i].buf_length = cpu_to_le16 (-PKT_BUF_SZ);
-		lp->rx_ring[i].status = cpu_to_le16 (0x8000);
+		lp->rx_ring[i].base = PCI_TO_MEM_LE(dev, lp->rx_buf[i]);
+		lp->rx_ring[i].buf_length = cpu_to_le16(-PKT_BUF_SZ);
+		lp->rx_ring[i].status = cpu_to_le16(0x8000);
 		PCNET_DEBUG1
 			("Rx%d: base=0x%x buf_length=0x%hx status=0x%hx\n", i,
 			 lp->rx_ring[i].base, lp->rx_ring[i].buf_length,
@@ -352,48 +353,48 @@ static int pcnet_init (struct eth_device *dev, bd_t * bis)
 	/*
 	 * Setup Init Block.
 	 */
-	PCNET_DEBUG1 ("Init block at 0x%p: MAC", &lp->init_block);
+	PCNET_DEBUG1("Init block at 0x%p: MAC", &lp->init_block);
 
 	for (i = 0; i < 6; i++) {
 		lp->init_block.phys_addr[i] = dev->enetaddr[i];
-		PCNET_DEBUG1 (" %02x", lp->init_block.phys_addr[i]);
+		PCNET_DEBUG1(" %02x", lp->init_block.phys_addr[i]);
 	}
 
-	lp->init_block.tlen_rlen = cpu_to_le16 (TX_RING_LEN_BITS |
-						RX_RING_LEN_BITS);
-	lp->init_block.rx_ring = PCI_TO_MEM_LE (dev, lp->rx_ring);
-	lp->init_block.tx_ring = PCI_TO_MEM_LE (dev, lp->tx_ring);
+	lp->init_block.tlen_rlen = cpu_to_le16(TX_RING_LEN_BITS |
+					       RX_RING_LEN_BITS);
+	lp->init_block.rx_ring = PCI_TO_MEM_LE(dev, lp->rx_ring);
+	lp->init_block.tx_ring = PCI_TO_MEM_LE(dev, lp->tx_ring);
 
-	PCNET_DEBUG1 ("\ntlen_rlen=0x%x rx_ring=0x%x tx_ring=0x%x\n",
-		      lp->init_block.tlen_rlen,
-		      lp->init_block.rx_ring, lp->init_block.tx_ring);
+	PCNET_DEBUG1("\ntlen_rlen=0x%x rx_ring=0x%x tx_ring=0x%x\n",
+		     lp->init_block.tlen_rlen,
+		     lp->init_block.rx_ring, lp->init_block.tx_ring);
 
 	/*
 	 * Tell the controller where the Init Block is located.
 	 */
-	addr = PCI_TO_MEM (dev, &lp->init_block);
-	pcnet_write_csr (dev, 1, addr & 0xffff);
-	pcnet_write_csr (dev, 2, (addr >> 16) & 0xffff);
+	addr = PCI_TO_MEM(dev, &lp->init_block);
+	pcnet_write_csr(dev, 1, addr & 0xffff);
+	pcnet_write_csr(dev, 2, (addr >> 16) & 0xffff);
 
-	pcnet_write_csr (dev, 4, 0x0915);
-	pcnet_write_csr (dev, 0, 0x0001);	/* start */
+	pcnet_write_csr(dev, 4, 0x0915);
+	pcnet_write_csr(dev, 0, 0x0001);	/* start */
 
 	/* Wait for Init Done bit */
 	for (i = 10000; i > 0; i--) {
-		if (pcnet_read_csr (dev, 0) & 0x0100)
+		if (pcnet_read_csr(dev, 0) & 0x0100)
 			break;
-		udelay (10);
+		udelay(10);
 	}
 	if (i <= 0) {
-		printf ("%s: TIMEOUT: controller init failed\n", dev->name);
-		pcnet_reset (dev);
+		printf("%s: TIMEOUT: controller init failed\n", dev->name);
+		pcnet_reset(dev);
 		return -1;
 	}
 
 	/*
 	 * Finally start network controller operation.
 	 */
-	pcnet_write_csr (dev, 0, 0x0002);
+	pcnet_write_csr(dev, 0, 0x0002);
 
 	return 0;
 }
@@ -403,20 +404,20 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 	int i, status;
 	struct pcnet_tx_head *entry = &lp->tx_ring[lp->cur_tx];
 
-	PCNET_DEBUG2 ("Tx%d: %d bytes from 0x%p ", lp->cur_tx, pkt_len,
-		      packet);
+	PCNET_DEBUG2("Tx%d: %d bytes from 0x%p ", lp->cur_tx, pkt_len,
+		     packet);
 
 	/* Wait for completion by testing the OWN bit */
 	for (i = 1000; i > 0; i--) {
-		status = le16_to_cpu (entry->status);
+		status = le16_to_cpu(entry->status);
 		if ((status & 0x8000) == 0)
 			break;
-		udelay (100);
-		PCNET_DEBUG2 (".");
+		udelay(100);
+		PCNET_DEBUG2(".");
 	}
 	if (i <= 0) {
-		printf ("%s: TIMEOUT: Tx%d failed (status = 0x%x)\n",
-			dev->name, lp->cur_tx, status);
+		printf("%s: TIMEOUT: Tx%d failed (status = 0x%x)\n",
+		       dev->name, lp->cur_tx, status);
 		pkt_len = 0;
 		goto failure;
 	}
@@ -426,19 +427,19 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 	 * set the status with the "ownership" bits last.
 	 */
 	status = 0x8300;
-	entry->length = le16_to_cpu (-pkt_len);
+	entry->length = le16_to_cpu(-pkt_len);
 	entry->misc = 0x00000000;
-	entry->base = PCI_TO_MEM_LE (dev, packet);
-	entry->status = le16_to_cpu (status);
+	entry->base = PCI_TO_MEM_LE(dev, packet);
+	entry->status = le16_to_cpu(status);
 
 	/* Trigger an immediate send poll. */
-	pcnet_write_csr (dev, 0, 0x0008);
+	pcnet_write_csr(dev, 0, 0x0008);
 
       failure:
 	if (++lp->cur_tx >= TX_RING_SIZE)
 		lp->cur_tx = 0;
 
-	PCNET_DEBUG2 ("done\n");
+	PCNET_DEBUG2("done\n");
 	return pkt_len;
 }
 
@@ -453,40 +454,38 @@ static int pcnet_recv (struct eth_device *dev)
 		/*
 		 * If we own the next entry, it's a new packet. Send it up.
 		 */
-		if (((status = le16_to_cpu (entry->status)) & 0x8000) != 0) {
+		status = le16_to_cpu(entry->status);
+		if ((status & 0x8000) != 0)
 			break;
-		}
 		status >>= 8;
 
 		if (status != 0x03) {	/* There was an error. */
-
-			printf ("%s: Rx%d", dev->name, lp->cur_rx);
-			PCNET_DEBUG1 (" (status=0x%x)", status);
+			printf("%s: Rx%d", dev->name, lp->cur_rx);
+			PCNET_DEBUG1(" (status=0x%x)", status);
 			if (status & 0x20)
-				printf (" Frame");
+				printf(" Frame");
 			if (status & 0x10)
-				printf (" Overflow");
+				printf(" Overflow");
 			if (status & 0x08)
-				printf (" CRC");
+				printf(" CRC");
 			if (status & 0x04)
-				printf (" Fifo");
-			printf (" Error\n");
-			entry->status &= le16_to_cpu (0x03ff);
+				printf(" Fifo");
+			printf(" Error\n");
+			entry->status &= le16_to_cpu(0x03ff);
 
 		} else {
-
-			pkt_len =
-				(le32_to_cpu (entry->msg_length) & 0xfff) - 4;
+			pkt_len = (le32_to_cpu(entry->msg_length) & 0xfff) - 4;
 			if (pkt_len < 60) {
-				printf ("%s: Rx%d: invalid packet length %d\n", dev->name, lp->cur_rx, pkt_len);
+				printf("%s: Rx%d: invalid packet length %d\n",
+				       dev->name, lp->cur_rx, pkt_len);
 			} else {
-				NetReceive (lp->rx_buf[lp->cur_rx], pkt_len);
-				PCNET_DEBUG2 ("Rx%d: %d bytes from 0x%p\n",
-					      lp->cur_rx, pkt_len,
-					      lp->rx_buf[lp->cur_rx]);
+				NetReceive(lp->rx_buf[lp->cur_rx], pkt_len);
+				PCNET_DEBUG2("Rx%d: %d bytes from 0x%p\n",
+					     lp->cur_rx, pkt_len,
+					     lp->rx_buf[lp->cur_rx]);
 			}
 		}
-		entry->status |= cpu_to_le16 (0x8000);
+		entry->status |= cpu_to_le16(0x8000);
 
 		if (++lp->cur_rx >= RX_RING_SIZE)
 			lp->cur_rx = 0;
@@ -494,22 +493,21 @@ static int pcnet_recv (struct eth_device *dev)
 	return pkt_len;
 }
 
-static void pcnet_halt (struct eth_device *dev)
+static void pcnet_halt(struct eth_device *dev)
 {
 	int i;
 
-	PCNET_DEBUG1 ("%s: pcnet_halt...\n", dev->name);
+	PCNET_DEBUG1("%s: pcnet_halt...\n", dev->name);
 
 	/* Reset the PCnet controller */
-	pcnet_reset (dev);
+	pcnet_reset(dev);
 
 	/* Wait for Stop bit */
 	for (i = 1000; i > 0; i--) {
-		if (pcnet_read_csr (dev, 0) & 0x4)
+		if (pcnet_read_csr(dev, 0) & 0x4)
 			break;
-		udelay (10);
-	}
-	if (i <= 0) {
-		printf ("%s: TIMEOUT: controller reset failed\n", dev->name);
+		udelay(10);
 	}
+	if (i <= 0)
+		printf("%s: TIMEOUT: controller reset failed\n", dev->name);
 }
Signature · 1 line
1.8.4
#3 lore raw

PATCH 3/15 pcnet: s/le16_to_cpu/cpu_to_le16/ in pcnet_send

In reply to Paul Burton

This should cause no change to the generated code, but is semantically correct.

---
 drivers/net/pcnet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/pcnet.c +2 -2
index a30a0bc..843a6fc 100644
@@ -427,10 +427,10 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 	 * set the status with the "ownership" bits last.
 	 */
 	status = 0x8300;
-	entry->length = le16_to_cpu(-pkt_len);
+	entry->length = cpu_to_le16(-pkt_len);
 	entry->misc = 0x00000000;
 	entry->base = PCI_TO_MEM_LE(dev, packet);
-	entry->status = le16_to_cpu(status);
+	entry->status = cpu_to_le16(status);
 
 	/* Trigger an immediate send poll. */
 	pcnet_write_csr(dev, 0, 0x0008);
Signature · 1 line
1.8.4
#4 lore raw

PATCH 4/15 pcnet: add cache flushing & invalidation

In reply to Paul Burton

Ensure that the view of memory from the CPU & the ethernet controller is coherent at the various points where they exchange data. This prevents stale data from being transmitted or received, and prevents the driver from getting stuck waiting for the ethernet controller to update descriptors when in reality it has but the old values are being read from cache.

---
 drivers/net/pcnet.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
drivers/net/pcnet.c +16 -0
index 843a6fc..7b87660 100644
@@ -364,6 +364,7 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
 					       RX_RING_LEN_BITS);
 	lp->init_block.rx_ring = PCI_TO_MEM_LE(dev, lp->rx_ring);
 	lp->init_block.tx_ring = PCI_TO_MEM_LE(dev, lp->tx_ring);
+	flush_dcache_range((unsigned long)lp, (unsigned long)&lp->rx_buf);
 
 	PCNET_DEBUG1("\ntlen_rlen=0x%x rx_ring=0x%x tx_ring=0x%x\n",
 		     lp->init_block.tlen_rlen,
@@ -407,8 +408,13 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 	PCNET_DEBUG2("Tx%d: %d bytes from 0x%p ", lp->cur_tx, pkt_len,
 		     packet);
 
+	flush_dcache_range((unsigned long)packet,
+			   (unsigned long)packet + pkt_len);
+
 	/* Wait for completion by testing the OWN bit */
 	for (i = 1000; i > 0; i--) {
+		invalidate_dcache_range((unsigned long)entry,
+					(unsigned long)entry + sizeof(*entry));
 		status = le16_to_cpu(entry->status);
 		if ((status & 0x8000) == 0)
 			break;
@@ -431,6 +437,8 @@ static int pcnet_send(struct eth_device *dev, void *packet, int pkt_len)
 	entry->misc = 0x00000000;
 	entry->base = PCI_TO_MEM_LE(dev, packet);
 	entry->status = cpu_to_le16(status);
+	flush_dcache_range((unsigned long)entry,
+			   (unsigned long)entry + sizeof(*entry));
 
 	/* Trigger an immediate send poll. */
 	pcnet_write_csr(dev, 0, 0x0008);
@@ -451,6 +459,8 @@ static int pcnet_recv (struct eth_device *dev)
 
 	while (1) {
 		entry = &lp->rx_ring[lp->cur_rx];
+		invalidate_dcache_range((unsigned long)entry,
+					(unsigned long)entry + sizeof(*entry));
 		/*
 		 * If we own the next entry, it's a new packet. Send it up.
 		 */
@@ -479,6 +489,10 @@ static int pcnet_recv (struct eth_device *dev)
 				printf("%s: Rx%d: invalid packet length %d\n",
 				       dev->name, lp->cur_rx, pkt_len);
 			} else {
+				invalidate_dcache_range(
+					(unsigned long)lp->rx_buf[lp->cur_rx],
+					(unsigned long)lp->rx_buf[lp->cur_rx] +
+					pkt_len);
 				NetReceive(lp->rx_buf[lp->cur_rx], pkt_len);
 				PCNET_DEBUG2("Rx%d: %d bytes from 0x%p\n",
 					     lp->cur_rx, pkt_len,
@@ -486,6 +500,8 @@ static int pcnet_recv (struct eth_device *dev)
 			}
 		}
 		entry->status |= cpu_to_le16(0x8000);
+		flush_dcache_range((unsigned long)entry,
+				   (unsigned long)entry + sizeof(*entry));
 
 		if (++lp->cur_rx >= RX_RING_SIZE)
 			lp->cur_rx = 0;
Signature · 1 line
1.8.4
#5 lore raw

PATCH 5/15 pcnet: enable the NOUFLO feature

In reply to Paul Burton

On relatively slow boards (such as the MIPS Malta with an FPGA core card) it can be extremely common for transmits to underflow - to the point where it appears they simply do not work at all. Setting the NOUFLO bit causes the ethernet controller to not begin transmission on the wire until a transmit start point is reached. Setting that transmit start point to the full packet will cause the controller to only transmit the packet once it has buffered it entirely thus preventing any transmit underflows from occuring and allowing the controller to function on slower boards.

---
 drivers/net/pcnet.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
drivers/net/pcnet.c +15 -0
index 7b87660..5b248be 100644
@@ -312,6 +312,21 @@ static int pcnet_init(struct eth_device *dev, bd_t *bis)
 	pcnet_write_bcr(dev, 32, val);
 
 	/*
+	 * Enable NOUFLO on supported controllers, with the transmit
+	 * start point set to the full packet. This will cause entire
+	 * packets to be buffered by the ethernet controller before
+	 * transmission, eliminating underflows which are common on
+	 * slower devices. Controllers which do not support NOUFLO will
+	 * simply be left with a larger transmit FIFO threshold.
+	 */
+	val = pcnet_read_bcr(dev, 18);
+	val |= 1 << 11;
+	pcnet_write_bcr(dev, 18, val);
+	val = pcnet_read_csr(dev, 80);
+	val |= 0x3 << 10;
+	pcnet_write_csr(dev, 80, val);
+
+	/*
 	 * We only maintain one structure because the drivers will never
 	 * be used concurrently. In 32bit mode the RX and TX ring entries
 	 * must be aligned on 16-byte boundaries.
Signature · 1 line
1.8.4
#6 lore raw

PATCH 6/15 pci.h: allow inclusion in assembly source

In reply to Paul Burton

This patch simply #ifdef's out the C-specific parts of pci.h when it is included by an assembly file. This will allow the macros it contains to be used from assembly source as will be done in a followup commit adding support for more modern MIPS Malta boards.

---
 include/pci.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
include/pci.h +5 -1
index 911ba89..cf1046d 100644
@@ -414,6 +414,8 @@
 
 #include <pci_ids.h>
 
+#ifndef __ASSEMBLY__
+
 #ifdef CONFIG_SYS_PCI_64BIT
 typedef u64 pci_addr_t;
 typedef u64 pci_size_t;
@@ -657,4 +659,6 @@ extern void pci_mpc824x_init (struct pci_controller *hose);
 #ifdef CONFIG_MPC85xx
 extern void pci_mpc85xx_init (struct pci_controller *hose);
 #endif
-#endif	/* _PCI_H */
+
+#endif /* __ASSEMBLY__ */
+#endif /* _PCI_H */
Signature · 1 line
1.8.4
#7 lore raw

PATCH 7/15 qemu-malta: rename to just "malta"

In reply to Paul Burton

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board.

---
 arch/mips/lib/bootm.c            |  12 ++---
 board/malta/Makefile             |  29 ++++++++++
 board/malta/lowlevel_init.S      |  69 ++++++++++++++++++++++++
 board/malta/malta.c              |  47 ++++++++++++++++
 board/qemu-malta/Makefile        |  29 ----------
 board/qemu-malta/lowlevel_init.S |  69 ------------------------
 board/qemu-malta/qemu-malta.c    |  47 ----------------
 boards.cfg                       |   4 +-
 include/configs/malta.h          | 114 +++++++++++++++++++++++++++++++++++++++
 include/configs/qemu-malta.h     | 114 ---------------------------------------
 10 files changed, 267 insertions(+), 267 deletions(-)
 create mode 100644 board/malta/Makefile
 create mode 100644 board/malta/lowlevel_init.S
 create mode 100644 board/malta/malta.c
 delete mode 100644 board/qemu-malta/Makefile
 delete mode 100644 board/qemu-malta/lowlevel_init.S
 delete mode 100644 board/qemu-malta/qemu-malta.c
 create mode 100644 include/configs/malta.h
 delete mode 100644 include/configs/qemu-malta.h
arch/mips/lib/bootm.c +6 -6
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define	LINUX_MAX_ENVS		256
 #define	LINUX_MAX_ARGS		256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta	1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta		1
 #else
-#define mips_boot_qemu_malta	0
+#define mips_boot_malta		0
 #endif
 
 static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
 		strcpy(linux_env_p, env_name);
 		linux_env_p += strlen(env_name);
 
-		if (mips_boot_qemu_malta) {
+		if (mips_boot_malta) {
 			linux_env_p++;
 			linux_env[++linux_env_idx] = linux_env_p;
 		} else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
 	if (cp)
 		linux_env_set("eth1addr", cp);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_env_set("modetty0", "38400n8r");
 }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_extra = gd->ram_size;
 
 	/* we assume that the kernel is in place */
board/malta/Makefile new file +29 -0
new file mode 100644
index 0000000..7060341
@@ -0,0 +1,29 @@
+#
+# (C) Copyright 2003-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	= $(BOARD).o
+SOBJS	= lowlevel_init.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	 $(OBJS) $(SOBJS)
+	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
board/malta/lowlevel_init.S new file +69 -0

69 lines not on this page · raw message

board/malta/malta.c new file +47 -0

47 lines not on this page · raw message

board/qemu-malta/Makefile deleted +0 -29
deleted file mode 100644
index 7060341..0000000
@@ -1,29 +0,0 @@
-#
-# (C) Copyright 2003-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-include $(TOPDIR)/config.mk
-
-LIB	= $(obj)lib$(BOARD).o
-
-COBJS	= $(BOARD).o
-SOBJS	= lowlevel_init.o
-
-SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	 $(OBJS) $(SOBJS)
-	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
board/qemu-malta/lowlevel_init.S deleted +0 -69

69 lines not on this page · raw message

board/qemu-malta/qemu-malta.c deleted +0 -47

47 lines not on this page · raw message

boards.cfg +2 -2
index aa2ee64..60b3f8b 100644
@@ -480,8 +480,8 @@ Active  m68k        mcf547x_8x     -           freescale       m548xevb
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485GFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64                                                                          TsiChung Liew <[email protected]>
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485HFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO                                                  TsiChung Liew <[email protected]>
 Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <[email protected]>
-Active  mips        mips32         -           -               qemu-malta          qemu_malta                           qemu-malta:MIPS32,SYS_BIG_ENDIAN                                                                                                  -
-Active  mips        mips32         -           -               qemu-malta          qemu_maltael                         qemu-malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                               -
+Active  mips        mips32         -           -               malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       -
+Active  mips        mips32         -           -               malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    -
 Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
 Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
include/configs/malta.h new file +114 -0

114 lines not on this page · raw message

include/configs/qemu-malta.h deleted +0 -114

114 lines not on this page · raw message

Signature · 1 line
1.8.4
#8 lore raw

PATCH 7/15 qemu-malta: rename to just "malta"

2013/10/23 Paul Burton <[email protected]>:

Quoted 2 lines

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board.

do you plan to add support for other MIPS boards? In that case it would be better to move malta to a vendor directory like "mips" or "imagination".

Quoted 14 lines
---
 arch/mips/lib/bootm.c            |  12 ++---
 board/malta/Makefile             |  29 ++++++++++
 board/malta/lowlevel_init.S      |  69 ++++++++++++++++++++++++
 board/malta/malta.c              |  47 ++++++++++++++++
 board/qemu-malta/Makefile        |  29 ----------
 board/qemu-malta/lowlevel_init.S |  69 ------------------------
 board/qemu-malta/qemu-malta.c    |  47 ----------------
 boards.cfg                       |   4 +-
 include/configs/malta.h          | 114 +++++++++++++++++++++++++++++++++++++++
 include/configs/qemu-malta.h     | 114 ---------------------------------------
 10 files changed, 267 insertions(+), 267 deletions(-)
Quoted 8 lines
 create mode 100644 board/malta/Makefile
 create mode 100644 board/malta/lowlevel_init.S
 create mode 100644 board/malta/malta.c
 delete mode 100644 board/qemu-malta/Makefile
 delete mode 100644 board/qemu-malta/lowlevel_init.S
 delete mode 100644 board/qemu-malta/qemu-malta.c
 create mode 100644 include/configs/malta.h
 delete mode 100644 include/configs/qemu-malta.h

you should turn on rename detection in git-format-patch to reduce the diff and to ease review

Quoted 631 lines
arch/mips/lib/bootm.c +6 -6
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define        LINUX_MAX_ENVS          256
 #define        LINUX_MAX_ARGS          256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta   1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta                1
 #else
-#define mips_boot_qemu_malta   0
+#define mips_boot_malta                0
 #endif
 
 static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
                strcpy(linux_env_p, env_name);
                linux_env_p += strlen(env_name);
 
-               if (mips_boot_qemu_malta) {
+               if (mips_boot_malta) {
                        linux_env_p++;
                        linux_env[++linux_env_idx] = linux_env_p;
                } else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
        if (cp)
                linux_env_set("eth1addr", cp);
 
-       if (mips_boot_qemu_malta)
+       if (mips_boot_malta)
                linux_env_set("modetty0", "38400n8r");
 }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
        bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-       if (mips_boot_qemu_malta)
+       if (mips_boot_malta)
                linux_extra = gd->ram_size;
 
        /* we assume that the kernel is in place */
board/malta/Makefile new file +29 -0
new file mode 100644
index 0000000..7060341
@@ -0,0 +1,29 @@
+#
+# (C) Copyright 2003-2006
+# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+include $(TOPDIR)/config.mk
+
+LIB    = $(obj)lib$(BOARD).o
+
+COBJS  = $(BOARD).o
+SOBJS  = lowlevel_init.o
+
+SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+SOBJS  := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):         $(OBJS) $(SOBJS)
+       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
board/malta/lowlevel_init.S new file +69 -0
new file mode 100644
index 0000000..fa0b6a7
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2013 Gabor Juhos <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#include <config.h>
+#include <gt64120.h>
+
+#include <asm/addrspace.h>
+#include <asm/regdef.h>
+#include <asm/malta.h>
+
+#ifdef CONFIG_SYS_BIG_ENDIAN
+#define CPU_TO_GT32(_x)                ((_x))
+#else
+#define CPU_TO_GT32(_x) (                                      \
+       (((_x) & 0xff) << 24) | (((_x) & 0xff00) << 8) |        \
+       (((_x) & 0xff0000) >> 8) | (((_x) & 0xff000000) >> 24))
+#endif
+
+       .text
+       .set noreorder
+       .set mips32
+
+       .globl  lowlevel_init
+lowlevel_init:
+
+       /*
+        * Load BAR registers of GT64120 as done by YAMON
+        *
+        * based on a patch sent by Antony Pavlov <[email protected]>
+        * to the barebox mailing list.
+        * The subject of the original patch:
+        *   'MIPS: qemu-malta: add YAMON-style GT64120 memory map'
+        * URL:
+        * http://www.mail-archive.com/barebox at lists.infradead.org/msg06128.html
+        *
+        * based on write_bootloader() in qemu.git/hw/mips_malta.c
+        * see GT64120 manual and qemu.git/hw/gt64xxx.c for details
+        */
+
+       /* move GT64120 registers from 0x14000000 to 0x1be00000 */
+       li      t1, KSEG1ADDR(GT_DEF_BASE)
+       li      t0, CPU_TO_GT32(0xdf000000)
+       sw      t0, GT_ISD_OFS(t1)
+
+       /* setup MEM-to-PCI0 mapping */
+       li      t1, KSEG1ADDR(MALTA_GT_BASE)
+
+       /* setup PCI0 io window to 0x18000000-0x181fffff */
+       li      t0, CPU_TO_GT32(0xc0000000)
+       sw      t0, GT_PCI0IOLD_OFS(t1)
+       li      t0, CPU_TO_GT32(0x40000000)
+       sw      t0, GT_PCI0IOHD_OFS(t1)
+
+       /* setup PCI0 mem windows */
+       li      t0, CPU_TO_GT32(0x80000000)
+       sw      t0, GT_PCI0M0LD_OFS(t1)
+       li      t0, CPU_TO_GT32(0x3f000000)
+       sw      t0, GT_PCI0M0HD_OFS(t1)
+
+       li      t0, CPU_TO_GT32(0xc1000000)
+       sw      t0, GT_PCI0M1LD_OFS(t1)
+       li      t0, CPU_TO_GT32(0x5e000000)
+       sw      t0, GT_PCI0M1HD_OFS(t1)
+
+       jr      ra
+        nop
board/malta/malta.c new file +47 -0
new file mode 100644
index 0000000..7eddf1c
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2013 Gabor Juhos <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#include <common.h>
+#include <netdev.h>
+
+#include <asm/addrspace.h>
+#include <asm/io.h>
+#include <asm/malta.h>
+#include <pci_gt64120.h>
+
+phys_size_t initdram(int board_type)
+{
+       return CONFIG_SYS_MEM_SIZE;
+}
+
+int checkboard(void)
+{
+       puts("Board: MIPS Malta CoreLV (Qemu)\n");
+       return 0;
+}
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}
+
+void _machine_restart(void)
+{
+       void __iomem *reset_base;
+
+       reset_base = (void __iomem *)CKSEG1ADDR(MALTA_RESET_BASE);
+       __raw_writel(GORESET, reset_base);
+}
+
+void pci_init_board(void)
+{
+       set_io_port_base(CKSEG1ADDR(MALTA_IO_PORT_BASE));
+
+       gt64120_pci_init((void *)CKSEG1ADDR(MALTA_GT_BASE),
+                        0x00000000, 0x00000000, CONFIG_SYS_MEM_SIZE,
+                        0x10000000, 0x10000000, 128 * 1024 * 1024,
+                        0x00000000, 0x00000000, 0x20000);
+}
board/qemu-malta/Makefile deleted +0 -29
deleted file mode 100644
index 7060341..0000000
@@ -1,29 +0,0 @@
-#
-# (C) Copyright 2003-2006
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-include $(TOPDIR)/config.mk
-
-LIB    = $(obj)lib$(BOARD).o
-
-COBJS  = $(BOARD).o
-SOBJS  = lowlevel_init.o
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))
-
-$(LIB):         $(OBJS) $(SOBJS)
-       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
board/qemu-malta/lowlevel_init.S deleted +0 -69
deleted file mode 100644
index fa0b6a7..0000000
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2013 Gabor Juhos <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0
- */
-
-#include <config.h>
-#include <gt64120.h>
-
-#include <asm/addrspace.h>
-#include <asm/regdef.h>
-#include <asm/malta.h>
-
-#ifdef CONFIG_SYS_BIG_ENDIAN
-#define CPU_TO_GT32(_x)                ((_x))
-#else
-#define CPU_TO_GT32(_x) (                                      \
-       (((_x) & 0xff) << 24) | (((_x) & 0xff00) << 8) |        \
-       (((_x) & 0xff0000) >> 8) | (((_x) & 0xff000000) >> 24))
-#endif
-
-       .text
-       .set noreorder
-       .set mips32
-
-       .globl  lowlevel_init
-lowlevel_init:
-
-       /*
-        * Load BAR registers of GT64120 as done by YAMON
-        *
-        * based on a patch sent by Antony Pavlov <[email protected]>
-        * to the barebox mailing list.
-        * The subject of the original patch:
-        *   'MIPS: qemu-malta: add YAMON-style GT64120 memory map'
-        * URL:
-        * http://www.mail-archive.com/barebox at lists.infradead.org/msg06128.html
-        *
-        * based on write_bootloader() in qemu.git/hw/mips_malta.c
-        * see GT64120 manual and qemu.git/hw/gt64xxx.c for details
-        */
-
-       /* move GT64120 registers from 0x14000000 to 0x1be00000 */
-       li      t1, KSEG1ADDR(GT_DEF_BASE)
-       li      t0, CPU_TO_GT32(0xdf000000)
-       sw      t0, GT_ISD_OFS(t1)
-
-       /* setup MEM-to-PCI0 mapping */
-       li      t1, KSEG1ADDR(MALTA_GT_BASE)
-
-       /* setup PCI0 io window to 0x18000000-0x181fffff */
-       li      t0, CPU_TO_GT32(0xc0000000)
-       sw      t0, GT_PCI0IOLD_OFS(t1)
-       li      t0, CPU_TO_GT32(0x40000000)
-       sw      t0, GT_PCI0IOHD_OFS(t1)
-
-       /* setup PCI0 mem windows */
-       li      t0, CPU_TO_GT32(0x80000000)
-       sw      t0, GT_PCI0M0LD_OFS(t1)
-       li      t0, CPU_TO_GT32(0x3f000000)
-       sw      t0, GT_PCI0M0HD_OFS(t1)
-
-       li      t0, CPU_TO_GT32(0xc1000000)
-       sw      t0, GT_PCI0M1LD_OFS(t1)
-       li      t0, CPU_TO_GT32(0x5e000000)
-       sw      t0, GT_PCI0M1HD_OFS(t1)
-
-       jr      ra
-        nop
board/qemu-malta/qemu-malta.c deleted +0 -47
deleted file mode 100644
index 7eddf1c..0000000
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2013 Gabor Juhos <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0
- */
-
-#include <common.h>
-#include <netdev.h>
-
-#include <asm/addrspace.h>
-#include <asm/io.h>
-#include <asm/malta.h>
-#include <pci_gt64120.h>
-
-phys_size_t initdram(int board_type)
-{
-       return CONFIG_SYS_MEM_SIZE;
-}
-
-int checkboard(void)
-{
-       puts("Board: MIPS Malta CoreLV (Qemu)\n");
-       return 0;
-}
-
-int board_eth_init(bd_t *bis)
-{
-       return pci_eth_init(bis);
-}
-
-void _machine_restart(void)
-{
-       void __iomem *reset_base;
-
-       reset_base = (void __iomem *)CKSEG1ADDR(MALTA_RESET_BASE);
-       __raw_writel(GORESET, reset_base);
-}
-
-void pci_init_board(void)
-{
-       set_io_port_base(CKSEG1ADDR(MALTA_IO_PORT_BASE));
-
-       gt64120_pci_init((void *)CKSEG1ADDR(MALTA_GT_BASE),
-                        0x00000000, 0x00000000, CONFIG_SYS_MEM_SIZE,
-                        0x10000000, 0x10000000, 128 * 1024 * 1024,
-                        0x00000000, 0x00000000, 0x20000);
-}
boards.cfg +2 -2
index aa2ee64..60b3f8b 100644
@@ -480,8 +480,8 @@ Active  m68k        mcf547x_8x     -           freescale       m548xevb
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485GFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64                                                                          TsiChung Liew <[email protected]>
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485HFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO                                                  TsiChung Liew <[email protected]>
 Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <[email protected]>
-Active  mips        mips32         -           -               qemu-malta          qemu_malta                           qemu-malta:MIPS32,SYS_BIG_ENDIAN                                                                                                  -
-Active  mips        mips32         -           -               qemu-malta          qemu_maltael                         qemu-malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                               -
+Active  mips        mips32         -           -               malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       -
+Active  mips        mips32         -           -               malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    -
 Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
 Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
include/configs/malta.h new file +114 -0
new file mode 100644
index 0000000..f6f6cc1
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2013 Gabor Juhos <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _QEMU_MALTA_CONFIG_H
+#define _QEMU_MALTA_CONFIG_H
+
+#include <asm/addrspace.h>
+#include <asm/malta.h>
+
+/*
+ * System configuration
+ */
+#define CONFIG_MALTA
+
+#define CONFIG_PCI
+#define CONFIG_PCI_GT64120
+#define CONFIG_PCI_PNP
+#define CONFIG_PCNET
+
+/*
+ * CPU Configuration
+ */
+#define CONFIG_SYS_MHZ                 250     /* arbitrary value */
+#define CONFIG_SYS_MIPS_TIMER_FREQ     (CONFIG_SYS_MHZ * 1000000)
+#define CONFIG_SYS_HZ                  1000
+
+#define CONFIG_SYS_DCACHE_SIZE         16384   /* arbitrary value */
+#define CONFIG_SYS_ICACHE_SIZE         16384   /* arbitrary value */
+#define CONFIG_SYS_CACHELINE_SIZE      32      /* arbitrary value */
+
+#define CONFIG_SWAP_IO_SPACE
+
+/*
+ * Memory map
+ */
+#define CONFIG_SYS_TEXT_BASE           0xbfc00000 /* Rom version */
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
+
+#define CONFIG_SYS_SDRAM_BASE          0x80000000 /* Cached addr */
+#define CONFIG_SYS_MEM_SIZE            (256 * 1024 * 1024)
+
+#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
+
+#define CONFIG_SYS_LOAD_ADDR           0x81000000
+#define CONFIG_SYS_MEMTEST_START       0x80100000
+#define CONFIG_SYS_MEMTEST_END         0x80800000
+
+#define CONFIG_SYS_MALLOC_LEN          (128 * 1024)
+#define CONFIG_SYS_BOOTPARAMS_LEN      (128 * 1024)
+
+/*
+ * Console configuration
+ */
+#if defined(CONFIG_SYS_LITTLE_ENDIAN)
+#define CONFIG_SYS_PROMPT              "qemu-maltael # "
+#else
+#define CONFIG_SYS_PROMPT              "qemu-malta # "
+#endif
+
+#define CONFIG_SYS_CBSIZE              256
+#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
+                                        sizeof(CONFIG_SYS_PROMPT) + 16)
+#define CONFIG_SYS_MAXARGS             16
+
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+
+/*
+ * Serial driver
+ */
+#define CONFIG_BAUDRATE                        115200
+
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    1
+#define CONFIG_SYS_NS16550_CLK         115200
+#define CONFIG_SYS_NS16550_COM1                CKSEG1ADDR(MALTA_UART_BASE)
+#define CONFIG_CONS_INDEX              1
+
+/*
+ * Environment
+ */
+#define CONFIG_ENV_IS_NOWHERE
+#define CONFIG_ENV_SIZE                        0x10000
+
+/*
+ * Flash configuration
+ */
+#define CONFIG_SYS_FLASH_BASE          (KSEG1 | MALTA_FLASH_BASE)
+#define CONFIG_SYS_MAX_FLASH_BANKS     1
+#define CONFIG_SYS_MAX_FLASH_SECT      128
+#define CONFIG_SYS_FLASH_CFI
+#define CONFIG_FLASH_CFI_DRIVER
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+
+/*
+ * Commands
+ */
+#include <config_cmd_default.h>
+
+#undef CONFIG_CMD_FPGA
+#undef CONFIG_CMD_LOADB
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_NFS
+
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+
+#define CONFIG_SYS_LONGHELP            /* verbose help, undef to save memory */
+
+#endif /* _QEMU_MALTA_CONFIG_H */
include/configs/qemu-malta.h deleted +0 -115
deleted file mode 100644
index 4e7ad33..0000000
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2013 Gabor Juhos <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0
- */
-
-#ifndef _QEMU_MALTA_CONFIG_H
-#define _QEMU_MALTA_CONFIG_H
-
-#include <asm/addrspace.h>
-#include <asm/malta.h>
-
-/*
- * System configuration
- */
-#define CONFIG_QEMU_MALTA
-
-#define CONFIG_PCI
-#define CONFIG_PCI_GT64120
-#define CONFIG_PCI_PNP
-#define CONFIG_PCNET
-
-/*
- * CPU Configuration
- */
-#define CONFIG_SYS_MHZ                 250     /* arbitrary value */
-#define CONFIG_SYS_MIPS_TIMER_FREQ     (CONFIG_SYS_MHZ * 1000000)
-#define CONFIG_SYS_HZ                  1000
-
-#define CONFIG_SYS_DCACHE_SIZE         16384   /* arbitrary value */
-#define CONFIG_SYS_ICACHE_SIZE         16384   /* arbitrary value */
-#define CONFIG_SYS_CACHELINE_SIZE      32      /* arbitrary value */
-
-#define CONFIG_SWAP_IO_SPACE
-
-/*
- * Memory map
- */
-#define CONFIG_SYS_TEXT_BASE           0xbfc00000 /* Rom version */
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
-
-#define CONFIG_SYS_SDRAM_BASE          0x80000000 /* Cached addr */
-#define CONFIG_SYS_MEM_SIZE            (256 * 1024 * 1024)
-
-#define CONFIG_SYS_INIT_SP_OFFSET      0x400000
-
-#define CONFIG_SYS_LOAD_ADDR           0x81000000
-#define CONFIG_SYS_MEMTEST_START       0x80100000
-#define CONFIG_SYS_MEMTEST_END         0x80800000
-
-#define CONFIG_SYS_MALLOC_LEN          (128 * 1024)
-#define CONFIG_SYS_BOOTPARAMS_LEN      (128 * 1024)
-
-/*
- * Console configuration
- */
-#if defined(CONFIG_SYS_LITTLE_ENDIAN)
-#define CONFIG_SYS_PROMPT              "qemu-maltael # "
-#else
-#define CONFIG_SYS_PROMPT              "qemu-malta # "
-#endif
-
-#define CONFIG_SYS_CBSIZE              256
-#define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \
-                                        sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
-/*
- * Serial driver
- */
-#define CONFIG_BAUDRATE                        115200
-
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    1
-#define CONFIG_SYS_NS16550_CLK         115200
-#define CONFIG_SYS_NS16550_COM1                CKSEG1ADDR(MALTA_UART_BASE)
-#define CONFIG_CONS_INDEX              1
-
-/*
- * Environment
- */
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE                        0x10000
-
-/*
- * Flash configuration
- */
-#define CONFIG_SYS_FLASH_BASE          (KSEG1 | MALTA_FLASH_BASE)
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_SYS_MAX_FLASH_SECT      128
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-
-/*
- * Commands
- */
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADB
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_NFS
-
-#define CONFIG_CMD_PCI
-#define CONFIG_CMD_PING
-
-#define CONFIG_SYS_LONGHELP            /* verbose help, undef to save memory */
-
-#endif /* _QEMU_MALTA_CONFIG_H */
--

1.8.4

Signature · 2 lines
Best regards,
Daniel
#9 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
 arch/mips/lib/bootm.c                                   | 12 ++++++------
 board/{qemu-malta => imgtec/malta}/Makefile             |  0
 board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
 board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
 boards.cfg                                              |  4 ++--
 include/configs/{qemu-malta.h => malta.h}               |  2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename board/{qemu-malta => imgtec/malta}/Makefile (100%)
 rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%)
 rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%)
 rename include/configs/{qemu-malta.h => malta.h} (98%)
arch/mips/lib/bootm.c +6 -6
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define	LINUX_MAX_ENVS		256
 #define	LINUX_MAX_ARGS		256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta	1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta		1
 #else
-#define mips_boot_qemu_malta	0
+#define mips_boot_malta		0
 #endif
 
 static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
 		strcpy(linux_env_p, env_name);
 		linux_env_p += strlen(env_name);
 
-		if (mips_boot_qemu_malta) {
+		if (mips_boot_malta) {
 			linux_env_p++;
 			linux_env[++linux_env_idx] = linux_env_p;
 		} else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
 	if (cp)
 		linux_env_set("eth1addr", cp);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_env_set("modetty0", "38400n8r");
 }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_extra = gd->ram_size;
 
 	/* we assume that the kernel is in place */
board/imgtec/malta/Makefile renamed from board/qemu-malta/Makefile +0 -0
similarity index 100%
rename from board/qemu-malta/Makefile
rename to board/imgtec/malta/Makefile
board/imgtec/malta/lowlevel_init.S renamed from board/qemu-malta/lowlevel_init.S +0 -0
similarity index 100%
rename from board/qemu-malta/lowlevel_init.S
rename to board/imgtec/malta/lowlevel_init.S
board/imgtec/malta/malta.c renamed from board/qemu-malta/qemu-malta.c +0 -0
similarity index 100%
rename from board/qemu-malta/qemu-malta.c
rename to board/imgtec/malta/malta.c
boards.cfg +2 -2
index aa2ee64..5c92868 100644
@@ -480,10 +480,10 @@ Active  m68k        mcf547x_8x     -           freescale       m548xevb
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485GFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64                                                                          TsiChung Liew <[email protected]>
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485HFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO                                                  TsiChung Liew <[email protected]>
 Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <[email protected]>
-Active  mips        mips32         -           -               qemu-malta          qemu_malta                           qemu-malta:MIPS32,SYS_BIG_ENDIAN                                                                                                  -
-Active  mips        mips32         -           -               qemu-malta          qemu_maltael                         qemu-malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                               -
 Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
+Active  mips        mips32         -           imgtec          malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       -
+Active  mips        mips32         -           imgtec          malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    -
 Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
 Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand                 vct:VCT_PLATINUM,VCT_ONENAND                                                                                                      -
 Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand_small           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE                                                                                      -
include/configs/malta.h renamed from include/configs/qemu-malta.h +1 -1
similarity index 98%
rename from include/configs/qemu-malta.h
rename to include/configs/malta.h
index 4e7ad33..f6f6cc1 100644
@@ -13,7 +13,7 @@
 /*
  * System configuration
  */
-#define CONFIG_QEMU_MALTA
+#define CONFIG_MALTA
 
 #define CONFIG_PCI
 #define CONFIG_PCI_GT64120
Signature · 1 line
1.8.4
#10 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

2013.10.24. 11:31 keltez?ssel, Paul Burton ?rta:

Quoted 61 lines

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
 arch/mips/lib/bootm.c                                   | 12 ++++++------
 board/{qemu-malta => imgtec/malta}/Makefile             |  0
 board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
 board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
 boards.cfg                                              |  4 ++--
 include/configs/{qemu-malta.h => malta.h}               |  2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename board/{qemu-malta => imgtec/malta}/Makefile (100%)
 rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%)
 rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%)
 rename include/configs/{qemu-malta.h => malta.h} (98%)
arch/mips/lib/bootm.c +5 -5
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define	LINUX_MAX_ENVS		256
 #define	LINUX_MAX_ARGS		256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta	1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta		1
 #else
-#define mips_boot_qemu_malta	0
+#define mips_boot_malta		0
 #endif
 
 static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
 		strcpy(linux_env_p, env_name);
 		linux_env_p += strlen(env_name);
 
-		if (mips_boot_qemu_malta) {
+		if (mips_boot_malta) {
 			linux_env_p++;
 			linux_env[++linux_env_idx] = linux_env_p;
 		} else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
 	if (cp)
 		linux_env_set("eth1addr", cp);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_env_set("modetty0", "38400n8r");
 }
 

arch/mips/lib/bootm.c static void boot_jump_linux(bootm_headers_t *images) · line 216

Quoted 8 lines
arch/mips/lib/bootm.c +1 -1
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_extra = gd->ram_size;
 
 	/* we assume that the kernel is in place */

The changes in bootm.c are not strictly related to the rename. It would be better to do these in a separate patch.

<...>

include/configs/malta.h line 16

Quoted 13 lines
include/configs/malta.h renamed from include/configs/qemu-malta.h +1 -1
similarity index 98%
rename from include/configs/qemu-malta.h
rename to include/configs/malta.h
index 4e7ad33..f6f6cc1 100644
@@ -13,7 +13,7 @@
 /*
  * System configuration
  */
-#define CONFIG_QEMU_MALTA
+#define CONFIG_MALTA

This change also should be done in a separate patch. Additionaly, CONFIG_QEMU_MALTA is used in arch/mips/cpu/mips32/start.S so it should be changed as well.

-Gabor

#11 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

Quoted 65 lines · Gabor Juhos

2013.10.24. 11:31 keltez?ssel, Paul Burton ?rta:

Quoted 64 lines

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
  arch/mips/lib/bootm.c                                   | 12 ++++++------
  board/{qemu-malta => imgtec/malta}/Makefile             |  0
  board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
  board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
  boards.cfg                                              |  4 ++--
  include/configs/{qemu-malta.h => malta.h}               |  2 +-
  6 files changed, 9 insertions(+), 9 deletions(-)

rename board/{qemu-malta => imgtec/malta}/Makefile (100%) rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%) rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%) rename include/configs/{qemu-malta.h => malta.h} (98%)

arch/mips/lib/bootm.c +5 -5
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
  #define	LINUX_MAX_ENVS		256
  #define	LINUX_MAX_ARGS		256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta	1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta		1
  #else
-#define mips_boot_qemu_malta	0
+#define mips_boot_malta		0
  #endif
 
  static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
  		strcpy(linux_env_p, env_name);
  		linux_env_p += strlen(env_name);
 
-		if (mips_boot_qemu_malta) {
+		if (mips_boot_malta) {
  			linux_env_p++;
  			linux_env[++linux_env_idx] = linux_env_p;
  		} else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
  	if (cp)
  		linux_env_set("eth1addr", cp);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
  		linux_env_set("modetty0", "38400n8r");
  }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
  	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
Quoted 8 lines

arch/mips/lib/bootm.c static void boot_jump_linux(bootm_headers_t *images) · line 216

Quoted 5 lines
arch/mips/lib/bootm.c +1 -1
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
  		linux_extra = gd->ram_size;
 
  	/* we assume that the kernel is in place */

The changes in bootm.c are not strictly related to the rename. It would be better to do these in a separate patch.

I disagree. The board was renamed from qemu-malta to malta, so it makes perfect sense to change CONFIG_QEMU_MALTA to CONFIG_MALTA and mips_boot_qemu_malta to mips_boot_malta at the same time. These changes are purely a part of the rename, made for consistency.

Quoted 21 lines

<...>

include/configs/malta.h line 16

Quoted 13 lines
include/configs/malta.h renamed from include/configs/qemu-malta.h +1 -1
similarity index 98%
rename from include/configs/qemu-malta.h
rename to include/configs/malta.h
index 4e7ad33..f6f6cc1 100644
@@ -13,7 +13,7 @@
  /*
   * System configuration
   */
-#define CONFIG_QEMU_MALTA
+#define CONFIG_MALTA

This change also should be done in a separate patch. Additionaly, CONFIG_QEMU_MALTA is used in arch/mips/cpu/mips32/start.S so it should be changed as well.

Quoted 2 lines

-Gabor

Again it's part of the rename so I don't agree about splitting to a separate patch, but you're right about start.S - I missed that and didn't notice because I'm not running an old QEMU.

Thanks,
Paul

#12 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

2013.10.24. 12:10 keltez?ssel, Paul Burton ?rta:

Quoted 76 lines · Gabor Juhos
Quoted 66 lines

2013.10.24. 11:31 keltez?ssel, Paul Burton ?rta:

Quoted 65 lines

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
  arch/mips/lib/bootm.c                                   | 12 ++++++------
  board/{qemu-malta => imgtec/malta}/Makefile             |  0
  board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
  board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
  boards.cfg                                              |  4 ++--
  include/configs/{qemu-malta.h => malta.h}               |  2 +-
  6 files changed, 9 insertions(+), 9 deletions(-)

rename board/{qemu-malta => imgtec/malta}/Makefile (100%) rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%) rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%) rename include/configs/{qemu-malta.h => malta.h} (98%)

arch/mips/lib/bootm.c +4 -4
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
  #define    LINUX_MAX_ENVS        256
  #define    LINUX_MAX_ARGS        256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta    1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta        1
  #else
-#define mips_boot_qemu_malta    0
+#define mips_boot_malta        0
  #endif
 
  static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const
 char *env_val)
          strcpy(linux_env_p, env_name);
          linux_env_p += strlen(env_name);
 
-        if (mips_boot_qemu_malta) {
+        if (mips_boot_malta) {
              linux_env_p++;
              linux_env[++linux_env_idx] = linux_env_p;
          } else {
arch/mips/lib/bootm.c +1 -1
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
      if (cp)
          linux_env_set("eth1addr", cp);
 
-    if (mips_boot_qemu_malta)
+    if (mips_boot_malta)
          linux_env_set("modetty0", "38400n8r");
  }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
      bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
Quoted 8 lines

arch/mips/lib/bootm.c static void boot_jump_linux(bootm_headers_t *images) · line 216

Quoted 5 lines
arch/mips/lib/bootm.c +1 -1
-    if (mips_boot_qemu_malta)
+    if (mips_boot_malta)
          linux_extra = gd->ram_size;
 
      /* we assume that the kernel is in place */

The changes in bootm.c are not strictly related to the rename. It would be better to do these in a separate patch.

Quoted 4 lines

I disagree. The board was renamed from qemu-malta to malta, so it makes perfect sense to change CONFIG_QEMU_MALTA to CONFIG_MALTA and mips_boot_qemu_malta to mips_boot_malta at the same time. These changes are purely a part of the rename, made for consistency.

I agree that it is related to the rename. However renaming the mips_boot_qemu_malta constant is a simple cleanup which can be done in a preceding patch. The same is true for the CONFIG_QEMU_MALTA->CONFIG_MALTA conversion.

In general, renaming a file and altering that within the same patch makes the review harder.

-Gabor

#13 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

Quoted 87 lines · Gabor Juhos

2013.10.24. 12:10 keltez?ssel, Paul Burton ?rta:

Quoted 76 lines · Gabor Juhos
Quoted 66 lines

2013.10.24. 11:31 keltez?ssel, Paul Burton ?rta:

Quoted 65 lines

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
   arch/mips/lib/bootm.c                                   | 12 ++++++------
   board/{qemu-malta => imgtec/malta}/Makefile             |  0
   board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
   board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
   boards.cfg                                              |  4 ++--
   include/configs/{qemu-malta.h => malta.h}               |  2 +-
   6 files changed, 9 insertions(+), 9 deletions(-)

rename board/{qemu-malta => imgtec/malta}/Makefile (100%) rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%) rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%) rename include/configs/{qemu-malta.h => malta.h} (98%)

arch/mips/lib/bootm.c +4 -4
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
   #define    LINUX_MAX_ENVS        256
   #define    LINUX_MAX_ARGS        256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta    1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta        1
   #else
-#define mips_boot_qemu_malta    0
+#define mips_boot_malta        0
   #endif
 
   static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const
 char *env_val)
           strcpy(linux_env_p, env_name);
           linux_env_p += strlen(env_name);
 
-        if (mips_boot_qemu_malta) {
+        if (mips_boot_malta) {
               linux_env_p++;
               linux_env[++linux_env_idx] = linux_env_p;
           } else {
arch/mips/lib/bootm.c +1 -1
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
       if (cp)
           linux_env_set("eth1addr", cp);
 
-    if (mips_boot_qemu_malta)
+    if (mips_boot_malta)
           linux_env_set("modetty0", "38400n8r");
   }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
       bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
Quoted 8 lines

arch/mips/lib/bootm.c static void boot_jump_linux(bootm_headers_t *images) · line 216

Quoted 5 lines
arch/mips/lib/bootm.c +1 -1
-    if (mips_boot_qemu_malta)
+    if (mips_boot_malta)
           linux_extra = gd->ram_size;
 
       /* we assume that the kernel is in place */

The changes in bootm.c are not strictly related to the rename. It would be better to do these in a separate patch.

Quoted 4 lines

I disagree. The board was renamed from qemu-malta to malta, so it makes perfect sense to change CONFIG_QEMU_MALTA to CONFIG_MALTA and mips_boot_qemu_malta to mips_boot_malta at the same time. These changes are purely a part of the rename, made for consistency.

I agree that it is related to the rename. However renaming the mips_boot_qemu_malta constant is a simple cleanup which can be done in a preceding patch. The same is true for the CONFIG_QEMU_MALTA->CONFIG_MALTA conversion.

Quoted 6 lines

In general, renaming a file and altering that within the same patch makes the review harder.

-Gabor

And for more complex changes I might agree, but only a single file is both renamed and modified by this patch: include/configs/qemu-malta.h => include/configs/malta.h. Only a single line is modified within that file, changing CONFIG_QEMU_MALTA to CONFIG_MALTA. I don't think it's very difficult to understand and I think splitting it would be overkill. So if Daniel tells me (v3 of) this patch isn't getting in as-is then I'll split it, but short of that I'm not changing it.

Thanks,
Paul

#14 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

2013/10/24 Paul Burton <[email protected]>:

Quoted 122 lines · Gabor Juhos
Quoted 103 lines

2013.10.24. 12:10 keltez?ssel, Paul Burton ?rta:

Quoted 87 lines · Gabor Juhos
Quoted 77 lines

2013.10.24. 11:31 keltez?ssel, Paul Burton ?rta:

Quoted 75 lines

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
   arch/mips/lib/bootm.c                                   | 12
++++++------
   board/{qemu-malta => imgtec/malta}/Makefile             |  0
   board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
   board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
   boards.cfg                                              |  4 ++--
   include/configs/{qemu-malta.h => malta.h}               |  2 +-
   6 files changed, 9 insertions(+), 9 deletions(-)

rename board/{qemu-malta => imgtec/malta}/Makefile (100%) rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%) rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c}
(100%)
rename include/configs/{qemu-malta.h => malta.h} (98%)

arch/mips/lib/bootm.c +3 -3
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
   #define    LINUX_MAX_ENVS        256
   #define    LINUX_MAX_ARGS        256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta    1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta        1
   #else
-#define mips_boot_qemu_malta    0
+#define mips_boot_malta        0
   #endif
 
   static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name,

const
char *env_val)

           strcpy(linux_env_p, env_name);
           linux_env_p += strlen(env_name);
arch/mips/lib/bootm.c +3 -3
-        if (mips_boot_qemu_malta) {
+        if (mips_boot_malta) {
               linux_env_p++;
               linux_env[++linux_env_idx] = linux_env_p;
           } else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t
 *images)
       if (cp)
           linux_env_set("eth1addr", cp);
 
-    if (mips_boot_qemu_malta)
+    if (mips_boot_malta)
           linux_env_set("modetty0", "38400n8r");
   }
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t
 *images)
 
       bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-    if (mips_boot_qemu_malta)
+    if (mips_boot_malta)
           linux_extra = gd->ram_size;
 
Quoted 6 lines
Quoted 1 line
       /* we assume that the kernel is in place */

The changes in bootm.c are not strictly related to the rename. It would be
better to do these in a separate patch.

Quoted 7 lines

I disagree. The board was renamed from qemu-malta to malta, so it makes perfect
sense to change CONFIG_QEMU_MALTA to CONFIG_MALTA and mips_boot_qemu_malta to
mips_boot_malta at the same time. These changes are purely a part of the rename,
made for consistency.

I agree that it is related to the rename. However renaming the mips_boot_qemu_malta constant is a simple cleanup which can be done in a preceding patch. The same is true for the CONFIG_QEMU_MALTA->CONFIG_MALTA conversion.

Quoted 7 lines

In general, renaming a file and altering that within the same patch makes the
review harder.

-Gabor

And for more complex changes I might agree, but only a single file is both renamed and modified by this patch: include/configs/qemu-malta.h => include/configs/malta.h. Only a single line is modified within that file, changing CONFIG_QEMU_MALTA to CONFIG_MALTA. I don't think it's very difficult to understand and I think splitting it would be overkill. So if Daniel tells me (v3 of) this patch isn't getting in as-is then I'll split it, but short of that I'm not changing it.

Quoted 3 lines

Thanks,
Paul

Actually I don't care. It is one logical change which is also trivial and bisectable. If you want, you could move the renaming of CONFIG_QEMU_MALTA and mips_boot_qemu_malta to a separate patch.

Signature · 2 lines
Best regards,
Daniel
#15 lore raw

PATCH v2 7/15 qemu-malta: rename to just "malta"

In reply to Paul Burton

2013.10.24. 12:54 keltez?ssel, Paul Burton ?rta:

<...>

Quoted 12 lines
Quoted 11 lines

I agree that it is related to the rename. However renaming the mips_boot_qemu_malta constant is a simple cleanup which can be done in a preceding patch. The same is true for the CONFIG_QEMU_MALTA->CONFIG_MALTA conversion.

In general, renaming a file and altering that within the same patch makes the review harder.

-Gabor

Quoted 7 lines

And for more complex changes I might agree, but only a single file is both renamed and modified by this patch: include/configs/qemu-malta.h => include/configs/malta.h. Only a single line is modified within that file, changing CONFIG_QEMU_MALTA to CONFIG_MALTA. I don't think it's very difficult to understand and I think splitting it would be overkill. So if Daniel tells me (v3 of) this patch isn't getting in as-is then I'll split it, but short of that I'm not changing it.

I don't say that it is hard to understand that. Simply the first two version of the patch introduced a regression on older qemu version due to the missing change in mips32/start.S, and it took some time to me to figure out why a rename patch causes such thing. If it would have been a separate change, it would have been obvious.

-Gabor

#16 lore raw

PATCH v3 7/15 qemu-malta: rename to just "malta"

In reply to Gabor Juhos

This is in preparation for adapting this board to function correctly on a physical MIPS Malta board. The board is moved into an "imgtec" vendor directory at the same time in order to ready us for any other boards supported by Imagination in the future.

---
Changes in v3:
- modify a missed CONFIG_QEMU_MALTA in arch/mips/cpu/mips32/start.S which would affect old QEMU builds

Changes in v2:
- move to an imgtec vendor directory to reduce churn should other Imagination boards be added later
- enable rename detection for the patch

---
 arch/mips/cpu/mips32/start.S                            |  2 +-
 arch/mips/lib/bootm.c                                   | 12 ++++++------
 board/{qemu-malta => imgtec/malta}/Makefile             |  0
 board/{qemu-malta => imgtec/malta}/lowlevel_init.S      |  0
 board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} |  0
 boards.cfg                                              |  4 ++--
 include/configs/{qemu-malta.h => malta.h}               |  2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename board/{qemu-malta => imgtec/malta}/Makefile (100%)
 rename board/{qemu-malta => imgtec/malta}/lowlevel_init.S (100%)
 rename board/{qemu-malta/qemu-malta.c => imgtec/malta/malta.c} (100%)
 rename include/configs/{qemu-malta.h => malta.h} (98%)
arch/mips/cpu/mips32/start.S +1 -1
index 70ad198..68e59b5 100644
@@ -51,7 +51,7 @@ _start:
 	 */
 	.word CONFIG_SYS_XWAY_EBU_BOOTCFG
 	.word 0x0
-#elif defined(CONFIG_QEMU_MALTA)
+#elif defined(CONFIG_MALTA)
 	/*
 	 * Linux expects the Board ID here.
 	 */
arch/mips/lib/bootm.c +6 -6
index 66340ea..1febf29 100644
@@ -17,10 +17,10 @@ DECLARE_GLOBAL_DATA_PTR;
 #define	LINUX_MAX_ENVS		256
 #define	LINUX_MAX_ARGS		256
 
-#if defined(CONFIG_QEMU_MALTA)
-#define mips_boot_qemu_malta	1
+#if defined(CONFIG_MALTA)
+#define mips_boot_malta		1
 #else
-#define mips_boot_qemu_malta	0
+#define mips_boot_malta		0
 #endif
 
 static int linux_argc;
@@ -139,7 +139,7 @@ static void linux_env_set(const char *env_name, const char *env_val)
 		strcpy(linux_env_p, env_name);
 		linux_env_p += strlen(env_name);
 
-		if (mips_boot_qemu_malta) {
+		if (mips_boot_malta) {
 			linux_env_p++;
 			linux_env[++linux_env_idx] = linux_env_p;
 		} else {
@@ -196,7 +196,7 @@ static void boot_prep_linux(bootm_headers_t *images)
 	if (cp)
 		linux_env_set("eth1addr", cp);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_env_set("modetty0", "38400n8r");
 }
 
@@ -210,7 +210,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 
-	if (mips_boot_qemu_malta)
+	if (mips_boot_malta)
 		linux_extra = gd->ram_size;
 
 	/* we assume that the kernel is in place */
board/imgtec/malta/Makefile renamed from board/qemu-malta/Makefile +0 -0
similarity index 100%
rename from board/qemu-malta/Makefile
rename to board/imgtec/malta/Makefile
board/imgtec/malta/lowlevel_init.S renamed from board/qemu-malta/lowlevel_init.S +0 -0
similarity index 100%
rename from board/qemu-malta/lowlevel_init.S
rename to board/imgtec/malta/lowlevel_init.S
board/imgtec/malta/malta.c renamed from board/qemu-malta/qemu-malta.c +0 -0
similarity index 100%
rename from board/qemu-malta/qemu-malta.c
rename to board/imgtec/malta/malta.c
boards.cfg +2 -2
index aa2ee64..5c92868 100644
@@ -480,10 +480,10 @@ Active  m68k        mcf547x_8x     -           freescale       m548xevb
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485GFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64                                                                          TsiChung Liew <[email protected]>
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485HFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO                                                  TsiChung Liew <[email protected]>
 Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <[email protected]>
-Active  mips        mips32         -           -               qemu-malta          qemu_malta                           qemu-malta:MIPS32,SYS_BIG_ENDIAN                                                                                                  -
-Active  mips        mips32         -           -               qemu-malta          qemu_maltael                         qemu-malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                               -
 Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
+Active  mips        mips32         -           imgtec          malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       -
+Active  mips        mips32         -           imgtec          malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    -
 Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
 Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand                 vct:VCT_PLATINUM,VCT_ONENAND                                                                                                      -
 Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand_small           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE                                                                                      -
include/configs/malta.h renamed from include/configs/qemu-malta.h +1 -1
similarity index 98%
rename from include/configs/qemu-malta.h
rename to include/configs/malta.h
index 4e7ad33..f6f6cc1 100644
@@ -13,7 +13,7 @@
 /*
  * System configuration
  */
-#define CONFIG_QEMU_MALTA
+#define CONFIG_MALTA
 
 #define CONFIG_PCI
 #define CONFIG_PCI_GT64120
Signature · 1 line
1.8.4
#17 lore raw

PATCH 8/15 malta: setup super I/O UARTs

In reply to Paul Burton

On a real Malta the Super I/O needs to be configured before we are able to access the UARTs. This patch performs that configuration, setting up the UARTs in the same way that YAMON would.

---
 board/malta/Makefile  |  2 +-
 board/malta/malta.c   | 10 ++++++++
 board/malta/superio.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++
 board/malta/superio.h | 15 ++++++++++++
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 board/malta/superio.c
 create mode 100644 board/malta/superio.h
board/malta/Makefile +1 -1
index 7060341..e3ee08a 100644
@@ -9,7 +9,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	= $(BOARD).o
+COBJS	= $(BOARD).o superio.o
 SOBJS	= lowlevel_init.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/malta/malta.c +10 -0
index 7eddf1c..09da9ea 100644
@@ -12,6 +12,8 @@
 #include <asm/malta.h>
 #include <pci_gt64120.h>
 
+#include "superio.h"
+
 phys_size_t initdram(int board_type)
 {
 	return CONFIG_SYS_MEM_SIZE;
@@ -36,6 +38,14 @@ void _machine_restart(void)
 	__raw_writel(GORESET, reset_base);
 }
 
+int board_early_init_f(void)
+{
+	/* setup FDC37M817 super I/O controller */
+	malta_superio_init((void *)CKSEG1ADDR(MALTA_IO_PORT_BASE));
+
+	return 0;
+}
+
 void pci_init_board(void)
 {
 	set_io_port_base(CKSEG1ADDR(MALTA_IO_PORT_BASE));
board/malta/superio.c new file +63 -0

63 lines not on this page · raw message

board/malta/superio.h new file +15 -0
new file mode 100644
index 0000000..1450da5
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * Setup code for the FDC37M817 super I/O controller
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __BOARD_MALTA_SUPERIO_H__
+#define __BOARD_MALTA_SUPERIO_H__
+
+extern void malta_superio_init(void *io_base);
+
+#endif /* __BOARD_MALTA_SUPERIO_H__ */
Signature · 1 line
1.8.4
#18 lore raw

PATCH v2 8/15 malta: setup super I/O UARTs

On a real Malta the Super I/O needs to be configured before we are able to access the UARTs. This patch performs that configuration, setting up the UARTs in the same way that YAMON would.

---
Changes in v2:
- rebased after malta moved to board/imgtec/malta

---
 board/imgtec/malta/Makefile  |  2 +-
 board/imgtec/malta/malta.c   | 10 +++++++
 board/imgtec/malta/superio.c | 63 ++++++++++++++++++++++++++++++++++++++++++++
 board/imgtec/malta/superio.h | 15 +++++++++++
 4 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 board/imgtec/malta/superio.c
 create mode 100644 board/imgtec/malta/superio.h
board/imgtec/malta/Makefile +1 -1
index 7060341..e3ee08a 100644
@@ -9,7 +9,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(BOARD).o
 
-COBJS	= $(BOARD).o
+COBJS	= $(BOARD).o superio.o
 SOBJS	= lowlevel_init.o
 
 SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/imgtec/malta/malta.c +10 -0
index 7eddf1c..09da9ea 100644
@@ -12,6 +12,8 @@
 #include <asm/malta.h>
 #include <pci_gt64120.h>
 
+#include "superio.h"
+
 phys_size_t initdram(int board_type)
 {
 	return CONFIG_SYS_MEM_SIZE;
@@ -36,6 +38,14 @@ void _machine_restart(void)
 	__raw_writel(GORESET, reset_base);
 }
 
+int board_early_init_f(void)
+{
+	/* setup FDC37M817 super I/O controller */
+	malta_superio_init((void *)CKSEG1ADDR(MALTA_IO_PORT_BASE));
+
+	return 0;
+}
+
 void pci_init_board(void)
 {
 	set_io_port_base(CKSEG1ADDR(MALTA_IO_PORT_BASE));
board/imgtec/malta/superio.c new file +63 -0

63 lines not on this page · raw message

board/imgtec/malta/superio.h new file +15 -0
new file mode 100644
index 0000000..1450da5
@@ -0,0 +1,15 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * Setup code for the FDC37M817 super I/O controller
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __BOARD_MALTA_SUPERIO_H__
+#define __BOARD_MALTA_SUPERIO_H__
+
+extern void malta_superio_init(void *io_base);
+
+#endif /* __BOARD_MALTA_SUPERIO_H__ */
Signature · 1 line
1.8.4
#19 lore raw

PATCH 9/15 malta: support for coreFPGA6 boards

In reply to Paul Burton

This patch adds support for running on Malta boards using coreFPGA6 core cards, including support for the msc01 system controller used with them. The system controller is detected at runtime allowing one U-boot binary to run on a Malta with either.

Due to the PCI I/O base differing between Maltas using gt64120 & msc01 system controllers, the UART setup is modified slightly. A second UART is added so that there is one pointing at the correct address for each system controller. The Malta board then defines its own default_serial_console function to select the correct one at runtime. The incorrect UART will simply not function.

Tested on:
- A coreFPGA6 Malta running interAptiv and proAptiv bitstreams, both with and without an L2 cache.
- QEMU, which seems to be broken but boots as far as it did before this patch (including correctly printing CoreLV on serial).

---
 arch/mips/include/asm/malta.h |  35 +++++++--
 board/malta/lowlevel_init.S   | 164 +++++++++++++++++++++++++++++++++++++++++-
 board/malta/malta.c           | 124 ++++++++++++++++++++++++++++++--
 drivers/pci/Makefile          |   1 +
 drivers/pci/pci_msc01.c       | 126 ++++++++++++++++++++++++++++++++
 include/configs/malta.h       |   4 +-
 include/msc01.h               | 135 ++++++++++++++++++++++++++++++++++
 include/pci_ids.h             |   3 +
 include/pci_msc01.h           |  17 +++++
 9 files changed, 594 insertions(+), 15 deletions(-)
 create mode 100644 drivers/pci/pci_msc01.c
 create mode 100644 include/msc01.h
 create mode 100644 include/pci_msc01.h
arch/mips/include/asm/malta.h +29 -6
index d4d44a2..0b50a66 100644
@@ -9,15 +9,38 @@
 #ifndef _MIPS_ASM_MALTA_H
 #define _MIPS_ASM_MALTA_H
 
-#define MALTA_IO_PORT_BASE	0x18000000
+#define MALTA_GT_BASE			0x1be00000
+#define MALTA_GT_PCIIO_BASE		0x18000000
+#define MALTA_GT_UART0_BASE		(MALTA_GT_PCIIO_BASE + 0x3f8)
 
-#define MALTA_UART_BASE		(MALTA_IO_PORT_BASE + 0x3f8)
+#define MALTA_MSC01_BIU_BASE		0x1bc80000
+#define MALTA_MSC01_PCI_BASE		0x1bd00000
+#define MALTA_MSC01_PBC_BASE		0x1bd40000
+#define MALTA_MSC01_IP1_BASE		0x1bc00000
+#define MALTA_MSC01_IP1_SIZE		0x00400000
+#define MALTA_MSC01_IP2_BASE1		0x10000000
+#define MALTA_MSC01_IP2_SIZE1		0x08000000
+#define MALTA_MSC01_IP2_BASE2		0x18000000
+#define MALTA_MSC01_IP2_SIZE2		0x04000000
+#define MALTA_MSC01_IP3_BASE		0x1c000000
+#define MALTA_MSC01_IP3_SIZE		0x04000000
+#define MALTA_MSC01_PCIMEM_BASE		0x10000000
+#define MALTA_MSC01_PCIMEM_SIZE		0x10000000
+#define MALTA_MSC01_PCIMEM_MAP		0x10000000
+#define MALTA_MSC01_PCIIO_BASE		0x1b000000
+#define MALTA_MSC01_PCIIO_SIZE		0x00800000
+#define MALTA_MSC01_PCIIO_MAP		0x00000000
+#define MALTA_MSC01_UART0_BASE		(MALTA_MSC01_PCIIO_BASE + 0x3f8)
 
-#define MALTA_GT_BASE		0x1be00000
+#define MALTA_RESET_BASE		0x1f000500
+#define GORESET				0x42
 
-#define MALTA_RESET_BASE	0x1f000500
-#define GORESET			0x42
+#define MALTA_FLASH_BASE		0x1fc00000
 
-#define MALTA_FLASH_BASE	0x1fc00000
+#define MALTA_REVISION			0x1fc00010
+#define MALTA_REVISION_CORID_SHF	10
+#define MALTA_REVISION_CORID_MSK	(0x3f << MALTA_REVISION_CORID_SHF)
+#define MALTA_REVISION_CORID_CORE_LV		1
+#define MALTA_REVISION_CORID_CORE_FPGA6		14
 
 #endif /* _MIPS_ASM_MALTA_H */
board/malta/lowlevel_init.S +163 -1

185 lines not on this page · raw message

board/malta/malta.c +117 -7

161 lines not on this page · raw message

drivers/pci/Makefile +1 -0
index be26b60..77df010 100644
@@ -13,6 +13,7 @@ COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
 COBJS-$(CONFIG_PCI) += pci.o pci_auto.o
 COBJS-$(CONFIG_PCI_INDIRECT_BRIDGE) += pci_indirect.o
 COBJS-$(CONFIG_PCI_GT64120) += pci_gt64120.o
+COBJS-$(CONFIG_PCI_MSC01) += pci_msc01.o
 COBJS-$(CONFIG_FTPCI100) += pci_ftpci100.o
 COBJS-$(CONFIG_IXP_PCI) += pci_ixp.o
 COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
drivers/pci/pci_msc01.c new file +126 -0

126 lines not on this page · raw message

include/configs/malta.h +3 -1
index f6f6cc1..e347b38 100644
@@ -17,6 +17,7 @@
 
 #define CONFIG_PCI
 #define CONFIG_PCI_GT64120
+#define CONFIG_PCI_MSC01
 #define CONFIG_PCI_PNP
 #define CONFIG_PCNET
 
@@ -77,7 +78,8 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		115200
-#define CONFIG_SYS_NS16550_COM1		CKSEG1ADDR(MALTA_UART_BASE)
+#define CONFIG_SYS_NS16550_COM1		CKSEG1ADDR(MALTA_GT_UART0_BASE)
+#define CONFIG_SYS_NS16550_COM2		CKSEG1ADDR(MALTA_MSC01_UART0_BASE)
 #define CONFIG_CONS_INDEX		1
 
 /*
include/msc01.h new file +135 -0

135 lines not on this page · raw message

include/pci_ids.h +3 -0
index 2c6dfd4..6bab677 100644
@@ -2170,6 +2170,9 @@
 #define PCI_DEVICE_ID_ENE_720		0x1421
 #define PCI_DEVICE_ID_ENE_722		0x1422
 
+#define PCI_VENDOR_ID_MIPS		0x153f
+#define PCI_DEVICE_ID_MIPS_MSC01	0x0001
+
 #define PCI_SUBVENDOR_ID_PERLE          0x155f
 #define PCI_SUBDEVICE_ID_PCI_RAS4       0xf001
 #define PCI_SUBDEVICE_ID_PCI_RAS8       0xf010
include/pci_msc01.h new file +17 -0
new file mode 100644
index 0000000..54945a7
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __PCI_MSC01_H__
+#define __PCI_MSC01_H__
+
+extern void msc01_pci_init(void *base, unsigned long sys_bus,
+			   unsigned long sys_phys, unsigned long sys_size,
+			   unsigned long mem_bus, unsigned long mem_phys,
+			   unsigned long mem_size, unsigned long io_bus,
+			   unsigned long io_phys, unsigned long io_size);
+
+#endif /* __PCI_MSC01_H__ */
Signature · 1 line
1.8.4
#20 lore raw

PATCH 9/15 malta: support for coreFPGA6 boards

2013/10/23 Paul Burton <[email protected]>:

Quoted 490 lines

This patch adds support for running on Malta boards using coreFPGA6 core cards, including support for the msc01 system controller used with them. The system controller is detected at runtime allowing one U-boot binary to run on a Malta with either.

Due to the PCI I/O base differing between Maltas using gt64120 & msc01 system controllers, the UART setup is modified slightly. A second UART is added so that there is one pointing at the correct address for each system controller. The Malta board then defines its own default_serial_console function to select the correct one at runtime. The incorrect UART will simply not function.

Tested on:
- A coreFPGA6 Malta running interAptiv and proAptiv bitstreams, both with and without an L2 cache.
- QEMU, which seems to be broken but boots as far as it did before this patch (including correctly printing CoreLV on serial).

---
 arch/mips/include/asm/malta.h |  35 +++++++--
 board/malta/lowlevel_init.S   | 164 +++++++++++++++++++++++++++++++++++++++++-
 board/malta/malta.c           | 124 ++++++++++++++++++++++++++++++--
 drivers/pci/Makefile          |   1 +
 drivers/pci/pci_msc01.c       | 126 ++++++++++++++++++++++++++++++++
 include/configs/malta.h       |   4 +-
 include/msc01.h               | 135 ++++++++++++++++++++++++++++++++++
 include/pci_ids.h             |   3 +
 include/pci_msc01.h           |  17 +++++
 9 files changed, 594 insertions(+), 15 deletions(-)
 create mode 100644 drivers/pci/pci_msc01.c
 create mode 100644 include/msc01.h
 create mode 100644 include/pci_msc01.h
arch/mips/include/asm/malta.h +29 -6
index d4d44a2..0b50a66 100644
@@ -9,15 +9,38 @@
 #ifndef _MIPS_ASM_MALTA_H
 #define _MIPS_ASM_MALTA_H
 
-#define MALTA_IO_PORT_BASE     0x18000000
+#define MALTA_GT_BASE                  0x1be00000
+#define MALTA_GT_PCIIO_BASE            0x18000000
+#define MALTA_GT_UART0_BASE            (MALTA_GT_PCIIO_BASE + 0x3f8)
 
-#define MALTA_UART_BASE                (MALTA_IO_PORT_BASE + 0x3f8)
+#define MALTA_MSC01_BIU_BASE           0x1bc80000
+#define MALTA_MSC01_PCI_BASE           0x1bd00000
+#define MALTA_MSC01_PBC_BASE           0x1bd40000
+#define MALTA_MSC01_IP1_BASE           0x1bc00000
+#define MALTA_MSC01_IP1_SIZE           0x00400000
+#define MALTA_MSC01_IP2_BASE1          0x10000000
+#define MALTA_MSC01_IP2_SIZE1          0x08000000
+#define MALTA_MSC01_IP2_BASE2          0x18000000
+#define MALTA_MSC01_IP2_SIZE2          0x04000000
+#define MALTA_MSC01_IP3_BASE           0x1c000000
+#define MALTA_MSC01_IP3_SIZE           0x04000000
+#define MALTA_MSC01_PCIMEM_BASE                0x10000000
+#define MALTA_MSC01_PCIMEM_SIZE                0x10000000
+#define MALTA_MSC01_PCIMEM_MAP         0x10000000
+#define MALTA_MSC01_PCIIO_BASE         0x1b000000
+#define MALTA_MSC01_PCIIO_SIZE         0x00800000
+#define MALTA_MSC01_PCIIO_MAP          0x00000000
+#define MALTA_MSC01_UART0_BASE         (MALTA_MSC01_PCIIO_BASE + 0x3f8)
 
-#define MALTA_GT_BASE          0x1be00000
+#define MALTA_RESET_BASE               0x1f000500
+#define GORESET                                0x42
 
-#define MALTA_RESET_BASE       0x1f000500
-#define GORESET                        0x42
+#define MALTA_FLASH_BASE               0x1fc00000
 
-#define MALTA_FLASH_BASE       0x1fc00000
+#define MALTA_REVISION                 0x1fc00010
+#define MALTA_REVISION_CORID_SHF       10
+#define MALTA_REVISION_CORID_MSK       (0x3f << MALTA_REVISION_CORID_SHF)
+#define MALTA_REVISION_CORID_CORE_LV           1
+#define MALTA_REVISION_CORID_CORE_FPGA6                14
 
 #endif /* _MIPS_ASM_MALTA_H */
board/malta/lowlevel_init.S +163 -1
index fa0b6a7..1af34f1 100644
@@ -6,6 +6,8 @@
 
 #include <config.h>
 #include <gt64120.h>
+#include <msc01.h>
+#include <pci.h>
 
 #include <asm/addrspace.h>
 #include <asm/regdef.h>
@@ -25,6 +27,25 @@
 
        .globl  lowlevel_init
 lowlevel_init:
+       /* detect the core card */
+       li      t0, KSEG1ADDR(MALTA_REVISION)
+       lw      t0, 0(t0)
+       srl     t0, t0, MALTA_REVISION_CORID_SHF
+       andi    t0, t0, (MALTA_REVISION_CORID_MSK >> \
+                        MALTA_REVISION_CORID_SHF)
+
+       /* core cards using the gt64120 system controller */
+       li      t1, MALTA_REVISION_CORID_CORE_LV
+       beq     t0, t1, _gt64120
+
+       /* core cards using the MSC01 system controller */
+        li     t1, MALTA_REVISION_CORID_CORE_FPGA6
+       beq     t0, t1, _msc01
+        nop
+
+       /* unknown system controller */
+       b       .
+        nop
 
        /*
         * Load BAR registers of GT64120 as done by YAMON
@@ -39,7 +60,7 @@ lowlevel_init:
         * based on write_bootloader() in qemu.git/hw/mips_malta.c
         * see GT64120 manual and qemu.git/hw/gt64xxx.c for details
         */
-
+_gt64120:
        /* move GT64120 registers from 0x14000000 to 0x1be00000 */
        li      t1, KSEG1ADDR(GT_DEF_BASE)
        li      t0, CPU_TO_GT32(0xdf000000)
@@ -67,3 +88,144 @@ lowlevel_init:
 
        jr      ra
         nop
+
+       /*
+        *
+        */
+_msc01:
+       /* setup peripheral bus controller clock divide */
+       li      t0, KSEG1ADDR(MALTA_MSC01_PBC_BASE)
+       li      t1, 0x1 << MSC01_PBC_CLKCFG_SHF
+       sw      t1, MSC01_PBC_CLKCFG_OFS(t0)
+
+       /* tweak peripheral bus controller timings */
+       li      t1, (0x1 << MSC01_PBC_CS0TIM_CDT_SHF) | \
+                   (0x1 << MSC01_PBC_CS0TIM_CAT_SHF)
+       sw      t1, MSC01_PBC_CS0TIM_OFS(t0)
+       li      t1, (0x0 << MSC01_PBC_CS0RW_RDT_SHF) | \
+                   (0x2 << MSC01_PBC_CS0RW_RAT_SHF) | \
+                   (0x0 << MSC01_PBC_CS0RW_WDT_SHF) | \
+                   (0x2 << MSC01_PBC_CS0RW_WAT_SHF)
+       sw      t1, MSC01_PBC_CS0RW_OFS(t0)
+       lw      t1, MSC01_PBC_CS0CFG_OFS(t0)
+       li      t2, MSC01_PBC_CS0CFG_DTYP_MSK
+       and     t1, t2
+       ori     t1, (0x0 << MSC01_PBC_CS0CFG_ADM_SHF) | \
+                   (0x3 << MSC01_PBC_CS0CFG_WSIDLE_SHF) | \
+                   (0x10 << MSC01_PBC_CS0CFG_WS_SHF)
+       sw      t1, MSC01_PBC_CS0CFG_OFS(t0)
+
+       /* setup basic address decode */
+       li      t0, KSEG1ADDR(MALTA_MSC01_BIU_BASE)
+       li      t1, 0x0
+       li      t2, -CONFIG_SYS_MEM_SIZE
+       sw      t1, MSC01_BIU_MCBAS1L_OFS(t0)
+       sw      t2, MSC01_BIU_MCMSK1L_OFS(t0)
+       sw      t1, MSC01_BIU_MCBAS2L_OFS(t0)
+       sw      t2, MSC01_BIU_MCMSK2L_OFS(t0)
+
+       /* initialise IP1 - unused */
+       li      t1, MALTA_MSC01_IP1_BASE
+       li      t2, -MALTA_MSC01_IP1_SIZE
+       sw      t1, MSC01_BIU_IP1BAS1L_OFS(t0)
+       sw      t2, MSC01_BIU_IP1MSK1L_OFS(t0)
+       sw      t1, MSC01_BIU_IP1BAS2L_OFS(t0)
+       sw      t2, MSC01_BIU_IP1MSK2L_OFS(t0)
+
+       /* initialise IP2 - PCI */
+       li      t1, MALTA_MSC01_IP2_BASE1
+       li      t2, -MALTA_MSC01_IP2_SIZE1
+       sw      t1, MSC01_BIU_IP2BAS1L_OFS(t0)
+       sw      t2, MSC01_BIU_IP2MSK1L_OFS(t0)
+       li      t1, MALTA_MSC01_IP2_BASE2
+       li      t2, -MALTA_MSC01_IP2_SIZE2
+       sw      t1, MSC01_BIU_IP2BAS2L_OFS(t0)
+       sw      t2, MSC01_BIU_IP2MSK2L_OFS(t0)
+
+       /* initialise IP3 - peripheral bus controller */
+       li      t1, MALTA_MSC01_IP3_BASE
+       li      t2, -MALTA_MSC01_IP3_SIZE
+       sw      t1, MSC01_BIU_IP3BAS1L_OFS(t0)
+       sw      t2, MSC01_BIU_IP3MSK1L_OFS(t0)
+       sw      t1, MSC01_BIU_IP3BAS2L_OFS(t0)
+       sw      t2, MSC01_BIU_IP3MSK2L_OFS(t0)
+
+       /* setup PCI memory */
+       li      t0, KSEG1ADDR(MALTA_MSC01_PCI_BASE)
+       li      t1, MALTA_MSC01_PCIMEM_BASE
+       li      t2, (-MALTA_MSC01_PCIMEM_SIZE) & MSC01_PCI_SC2PMMSKL_MSK_MSK
+       li      t3, MALTA_MSC01_PCIMEM_MAP
+       sw      t1, MSC01_PCI_SC2PMBASL_OFS(t0)
+       sw      t2, MSC01_PCI_SC2PMMSKL_OFS(t0)
+       sw      t3, MSC01_PCI_SC2PMMAPL_OFS(t0)
+
+       /* setup PCI I/O */
+       li      t1, MALTA_MSC01_PCIIO_BASE
+       li      t2, (-MALTA_MSC01_PCIIO_SIZE) & MSC01_PCI_SC2PIOMSKL_MSK_MSK
+       li      t3, MALTA_MSC01_PCIIO_MAP
+       sw      t1, MSC01_PCI_SC2PIOBASL_OFS(t0)
+       sw      t2, MSC01_PCI_SC2PIOMSKL_OFS(t0)
+       sw      t3, MSC01_PCI_SC2PIOMAPL_OFS(t0)
+
+       /* setup PCI_BAR0 memory window */
+       li      t1, -CONFIG_SYS_MEM_SIZE
+       sw      t1, MSC01_PCI_BAR0_OFS(t0)
+
+       /* setup PCI to SysCon/CPU translation */
+       sw      t1, MSC01_PCI_P2SCMSKL_OFS(t0)
+       sw      zero, MSC01_PCI_P2SCMAPL_OFS(t0)
+
+       /* setup PCI vendor & device IDs */
+       li      t1, (PCI_VENDOR_ID_MIPS << MSC01_PCI_HEAD0_VENDORID_SHF) | \
+                   (PCI_DEVICE_ID_MIPS_MSC01 << MSC01_PCI_HEAD0_DEVICEID_SHF)
+       sw      t1, MSC01_PCI_HEAD0_OFS(t0)
+
+       /* setup PCI subsystem vendor & device IDs */
+       sw      t1, MSC01_PCI_HEAD11_OFS(t0)
+
+       /* setup PCI class, revision */
+       li      t1, (PCI_CLASS_BRIDGE_HOST << MSC01_PCI_HEAD2_CLASS_SHF) | \
+                   (0x1 << MSC01_PCI_HEAD2_REV_SHF)
+       sw      t1, MSC01_PCI_HEAD2_OFS(t0)
+
+       /* ensure a sane setup */
+       sw      zero, MSC01_PCI_HEAD3_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD4_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD5_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD6_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD7_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD8_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD9_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD10_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD12_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD13_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD14_OFS(t0)
+       sw      zero, MSC01_PCI_HEAD15_OFS(t0)
+
+       /* setup PCI command register */
+       li      t1, (PCI_COMMAND_FAST_BACK | \
+                    PCI_COMMAND_SERR | \
+                    PCI_COMMAND_PARITY | \
+                    PCI_COMMAND_MASTER | \
+                    PCI_COMMAND_MEMORY)
+       sw      t1, MSC01_PCI_HEAD1_OFS(t0)
+
+       /* setup PCI byte swapping */
+#ifdef CONFIG_SYS_BIG_ENDIAN
+       li      t1, (0x1 << MSC01_PCI_SWAP_BAR0_BSWAP_SHF) | \
+                   (0x1 << MSC01_PCI_SWAP_IO_BSWAP_SHF)
+       sw      t1, MSC01_PCI_SWAP_OFS(t0)
+#else
+       sw      zero, MSC01_PCI_SWAP_OFS(t0)
+#endif
+
+       /* enable PCI host configuration cycles */
+       lw      t1, MSC01_PCI_CFG_OFS(t0)
+       li      t2, MSC01_PCI_CFG_RA_MSK | \
+                   MSC01_PCI_CFG_G_MSK | \
+                   MSC01_PCI_CFG_EN_MSK
+       or      t1, t1, t2
+       sw      t1, MSC01_PCI_CFG_OFS(t0)
+
+       jr      ra
+        nop
board/malta/malta.c +117 -7
index 09da9ea..96c6f23 100644
@@ -1,19 +1,67 @@
 /*
  * Copyright (C) 2013 Gabor Juhos <[email protected]>
+ * Copyright (C) 2013 Imagination Technologies
  *
  * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
 #include <netdev.h>
+#include <serial.h>
 
 #include <asm/addrspace.h>
 #include <asm/io.h>
 #include <asm/malta.h>
 #include <pci_gt64120.h>
+#include <pci_msc01.h>
 
 #include "superio.h"
 
+enum core_card {
+       CORE_UNKNOWN,
+       CORE_LV,
+       CORE_FPGA6,
+};
+
+enum sys_con {
+       SYSCON_UNKNOWN,
+       SYSCON_GT64120,
+       SYSCON_MSC01,
+};
+
+static enum core_card malta_core_card(void)
+{
+       u32 corid, rev;
+
+       rev = __raw_readl(CKSEG1ADDR(MALTA_REVISION));
+       corid = (rev & MALTA_REVISION_CORID_MSK) >> MALTA_REVISION_CORID_SHF;
+
+       switch (corid) {
+       case MALTA_REVISION_CORID_CORE_LV:
+               return CORE_LV;
+
+       case MALTA_REVISION_CORID_CORE_FPGA6:
+               return CORE_FPGA6;
+
+       default:
+               return CORE_UNKNOWN;
+       }
+}
+
+static enum sys_con malta_sys_con(void)
+{
+       switch (malta_core_card()) {
+       case CORE_LV:
+               return SYSCON_GT64120;
+
+       case CORE_FPGA6:
+               return SYSCON_MSC01;
+
+       default:
+               return SYSCON_UNKNOWN;
+       }
+}
+
 phys_size_t initdram(int board_type)
 {
        return CONFIG_SYS_MEM_SIZE;
@@ -21,7 +69,25 @@ phys_size_t initdram(int board_type)
 
 int checkboard(void)
 {
-       puts("Board: MIPS Malta CoreLV (Qemu)\n");
+       enum core_card core;
+
+       puts("Board: MIPS Malta");
+
+       core = malta_core_card();
+       switch (core) {
+       case CORE_LV:
+               puts(" CoreLV");
+               break;
+
+       case CORE_FPGA6:
+               puts(" CoreFPGA6");
+               break;
+
+       default:
+               puts(" CoreUnknown");
+       }
+
+       putc('\n');
        return 0;
 }
 
@@ -40,18 +106,62 @@ void _machine_restart(void)
 
 int board_early_init_f(void)
 {
+       void *io_base;
+
+       /* choose correct PCI I/O base */
+       switch (malta_sys_con()) {
+       case SYSCON_GT64120:
+               io_base = (void *)CKSEG1ADDR(MALTA_GT_PCIIO_BASE);
+               break;
+
+       case SYSCON_MSC01:
+               io_base = (void *)CKSEG1ADDR(MALTA_MSC01_PCIIO_BASE);
+               break;
+
+       default:
+               return -1;
+       }
+
        /* setup FDC37M817 super I/O controller */
-       malta_superio_init((void *)CKSEG1ADDR(MALTA_IO_PORT_BASE));
+       malta_superio_init(io_base);
 
        return 0;
 }
 
+struct serial_device *default_serial_console(void)
+{
+       switch (malta_sys_con()) {
+       case SYSCON_GT64120:
+               return &eserial1_device;
+
+       default:
+       case SYSCON_MSC01:
+               return &eserial2_device;
+       }
+}
+
 void pci_init_board(void)
 {
-       set_io_port_base(CKSEG1ADDR(MALTA_IO_PORT_BASE));
+       switch (malta_sys_con()) {
+       case SYSCON_GT64120:
+               set_io_port_base(CKSEG1ADDR(MALTA_GT_PCIIO_BASE));
+
+               gt64120_pci_init((void *)CKSEG1ADDR(MALTA_GT_BASE),
+                                0x00000000, 0x00000000, CONFIG_SYS_MEM_SIZE,
+                                0x10000000, 0x10000000, 128 * 1024 * 1024,
+                                0x00000000, 0x00000000, 0x20000);
+               break;
+
+       default:
+       case SYSCON_MSC01:
+               set_io_port_base(CKSEG1ADDR(MALTA_MSC01_PCIIO_BASE));
 
-       gt64120_pci_init((void *)CKSEG1ADDR(MALTA_GT_BASE),
-                        0x00000000, 0x00000000, CONFIG_SYS_MEM_SIZE,
-                        0x10000000, 0x10000000, 128 * 1024 * 1024,
-                        0x00000000, 0x00000000, 0x20000);
+               msc01_pci_init((void *)CKSEG1ADDR(MALTA_MSC01_PCI_BASE),
+                              0x00000000, 0x00000000, CONFIG_SYS_MEM_SIZE,
+                              MALTA_MSC01_PCIMEM_MAP,
+                              CKSEG1ADDR(MALTA_MSC01_PCIMEM_BASE),
+                              MALTA_MSC01_PCIMEM_SIZE, MALTA_MSC01_PCIIO_MAP,
+                              0x00000000, MALTA_MSC01_PCIIO_SIZE);
+               break;
+       }
 }
drivers/pci/Makefile +1 -0
index be26b60..77df010 100644
@@ -13,6 +13,7 @@ COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
 COBJS-$(CONFIG_PCI) += pci.o pci_auto.o
 COBJS-$(CONFIG_PCI_INDIRECT_BRIDGE) += pci_indirect.o
 COBJS-$(CONFIG_PCI_GT64120) += pci_gt64120.o
+COBJS-$(CONFIG_PCI_MSC01) += pci_msc01.o
 COBJS-$(CONFIG_FTPCI100) += pci_ftpci100.o
 COBJS-$(CONFIG_IXP_PCI) += pci_ixp.o
 COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
drivers/pci/pci_msc01.c new file +28 -0
new file mode 100644
index 0000000..7904378
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <msc01.h>
+#include <pci.h>
+#include <pci_msc01.h>
+#include <asm/io.h>
+
+#define PCI_ACCESS_READ  0
+#define PCI_ACCESS_WRITE 1
+
+struct msc01_pci_controller {
+       struct pci_controller hose;
+       void *base;
+};
+
+static inline struct msc01_pci_controller *
+hose_to_msc01(struct pci_controller *hose)
+{
+       return container_of(hose, struct msc01_pci_controller, hose);
+}
+
+static int msc01_config_access(struct msc01_pci_controller *msc01,

drivers/pci/pci_msc01.c line 38

Quoted 10 lines
drivers/pci/pci_msc01.c new file +10 -0
+                              unsigned char access_type, pci_dev_t bdf,
+                              int where, u32 *data)
+{
+       const u32 aborts = MSC01_PCI_INTSTAT_MA_MSK | MSC01_PCI_INTSTAT_TA_MSK;
+       void *intstat = msc01->base + MSC01_PCI_INTSTAT_OFS;
+       void *cfgdata = msc01->base + MSC01_PCI_CFGDATA_OFS;
+       unsigned int bus = PCI_BUS(bdf);
+       unsigned int dev = PCI_DEV(bdf);
+       unsigned int devfn = PCI_DEV(bdf) << 3 | PCI_FUNC(bdf);
+       u32 status;

gcc-4.8 shows a warning:

pci_msc01.c: In function 'msc01_config_access':
pci_msc01.c:38:6: warning: unused variable 'status' [-Wunused-variable]

  u32 status;
      ^

drivers/pci/pci_msc01.c line 48

Quoted 10 lines
drivers/pci/pci_msc01.c new file +10 -0
+
+       /* clear abort status */
+       __raw_writel(aborts, intstat);
+
+       /* setup address */
+       __raw_writel((bus << MSC01_PCI_CFGADDR_BNUM_SHF) |
+                    (dev << MSC01_PCI_CFGADDR_DNUM_SHF) |
+                    (devfn << MSC01_PCI_CFGADDR_FNUM_SHF) |
+                    ((where / 4) << MSC01_PCI_CFGADDR_RNUM_SHF),
+                    msc01->base + MSC01_PCI_CFGADDR_OFS);

Contrary to the kernel U-Boot code must not use base + offset in IO primitives. Registers should be implemented with a struct. For example:

struct foobar_regs {
    u32 foo;
    u32 bar;
};

struct foobar_regs *regs = (struct foobar_regs *)CKSEG1ADDR(FOOBAR_BASE); u32 val = __raw_readl(&regs->foo);

Quoted 282 lines
drivers/pci/pci_msc01.c new file +78 -0
+
+       /* perform access */
+       if (access_type == PCI_ACCESS_WRITE)
+               __raw_writel(*data, cfgdata);
+       else
+               *data = __raw_readl(cfgdata);
+
+       /* check for aborts */
+       if (__raw_readl(intstat) & aborts) {
+               /* clear abort status */
+               __raw_writel(aborts, intstat);
+               return -1;
+       }
+
+       return 0;
+}
+
+static int msc01_read_config_dword(struct pci_controller *hose, pci_dev_t dev,
+                                  int where, u32 *value)
+{
+       struct msc01_pci_controller *msc01 = hose_to_msc01(hose);
+
+       *value = 0xffffffff;
+       return msc01_config_access(msc01, PCI_ACCESS_READ, dev, where, value);
+}
+
+static int msc01_write_config_dword(struct pci_controller *hose, pci_dev_t dev,
+                                   int where, u32 value)
+{
+       struct msc01_pci_controller *gt = hose_to_msc01(hose);
+       u32 data = value;
+
+       return msc01_config_access(gt, PCI_ACCESS_WRITE, dev, where, &data);
+}
+
+void msc01_pci_init(void *base, unsigned long sys_bus, unsigned long sys_phys,
+                   unsigned long sys_size, unsigned long mem_bus,
+                   unsigned long mem_phys, unsigned long mem_size,
+                   unsigned long io_bus, unsigned long io_phys,
+                   unsigned long io_size)
+{
+       static struct msc01_pci_controller global_msc01;
+       struct msc01_pci_controller *msc01;
+       struct pci_controller *hose;
+
+       msc01 = &global_msc01;
+       msc01->base = base;
+
+       hose = &msc01->hose;
+
+       hose->first_busno = 0;
+       hose->last_busno = 0;
+
+       /* System memory space */
+       pci_set_region(&hose->regions[0], sys_bus, sys_phys, sys_size,
+                      PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+
+       /* PCI memory space */
+       pci_set_region(&hose->regions[1], mem_bus, mem_phys, mem_size,
+                      PCI_REGION_MEM);
+
+       /* PCI I/O space */
+       pci_set_region(&hose->regions[2], io_bus, io_phys, io_size,
+                      PCI_REGION_IO);
+
+       hose->region_count = 3;
+
+       pci_set_ops(hose,
+                   pci_hose_read_config_byte_via_dword,
+                   pci_hose_read_config_word_via_dword,
+                   msc01_read_config_dword,
+                   pci_hose_write_config_byte_via_dword,
+                   pci_hose_write_config_word_via_dword,
+                   msc01_write_config_dword);
+
+       pci_register_hose(hose);
+       hose->last_busno = pci_hose_scan(hose);
+}
include/configs/malta.h +3 -1
index f6f6cc1..e347b38 100644
@@ -17,6 +17,7 @@
 
 #define CONFIG_PCI
 #define CONFIG_PCI_GT64120
+#define CONFIG_PCI_MSC01
 #define CONFIG_PCI_PNP
 #define CONFIG_PCNET
 
@@ -77,7 +78,8 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    1
 #define CONFIG_SYS_NS16550_CLK         115200
-#define CONFIG_SYS_NS16550_COM1                CKSEG1ADDR(MALTA_UART_BASE)
+#define CONFIG_SYS_NS16550_COM1                CKSEG1ADDR(MALTA_GT_UART0_BASE)
+#define CONFIG_SYS_NS16550_COM2                CKSEG1ADDR(MALTA_MSC01_UART0_BASE)
 #define CONFIG_CONS_INDEX              1
 
 /*
include/msc01.h new file +135 -0
new file mode 100644
index 0000000..37cf963
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __MSC01_H__
+#define __MSC01_H__
+
+/*
+ * Bus Interface Unit
+ */
+
+#define MSC01_BIU_IP1BAS1L_OFS         0x0208
+#define MSC01_BIU_IP1MSK1L_OFS         0x0218
+#define MSC01_BIU_IP1BAS2L_OFS         0x0248
+#define MSC01_BIU_IP1MSK2L_OFS         0x0258
+#define MSC01_BIU_IP2BAS1L_OFS         0x0288
+#define MSC01_BIU_IP2MSK1L_OFS         0x0298
+#define MSC01_BIU_IP2BAS2L_OFS         0x02c8
+#define MSC01_BIU_IP2MSK2L_OFS         0x02d8
+#define MSC01_BIU_IP3BAS1L_OFS         0x0308
+#define MSC01_BIU_IP3MSK1L_OFS         0x0318
+#define MSC01_BIU_IP3BAS2L_OFS         0x0348
+#define MSC01_BIU_IP3MSK2L_OFS         0x0358
+#define MSC01_BIU_MCBAS1L_OFS          0x0388
+#define MSC01_BIU_MCMSK1L_OFS          0x0398
+#define MSC01_BIU_MCBAS2L_OFS          0x03c8
+#define MSC01_BIU_MCMSK2L_OFS          0x03d8
+
+/*
+ * PCI Bridge
+ */
+
+#define MSC01_PCI_SC2PMBASL_OFS                0x0208
+#define MSC01_PCI_SC2PMMSKL_OFS                0x0218
+#define MSC01_PCI_SC2PMMAPL_OFS                0x0228
+#define MSC01_PCI_SC2PIOBASL_OFS       0x0248
+#define MSC01_PCI_SC2PIOMSKL_OFS       0x0258
+#define MSC01_PCI_SC2PIOMAPL_OFS       0x0268
+#define MSC01_PCI_P2SCMSKL_OFS         0x0308
+#define MSC01_PCI_P2SCMAPL_OFS         0x0318
+#define MSC01_PCI_INTSTAT_OFS          0x0608
+#define MSC01_PCI_CFGADDR_OFS          0x0610
+#define MSC01_PCI_CFGDATA_OFS          0x0618
+#define MSC01_PCI_HEAD0_OFS            0x2000
+#define MSC01_PCI_HEAD1_OFS            0x2008
+#define MSC01_PCI_HEAD2_OFS            0x2010
+#define MSC01_PCI_HEAD3_OFS            0x2018
+#define MSC01_PCI_HEAD4_OFS            0x2020
+#define MSC01_PCI_HEAD5_OFS            0x2028
+#define MSC01_PCI_HEAD6_OFS            0x2030
+#define MSC01_PCI_HEAD7_OFS            0x2038
+#define MSC01_PCI_HEAD8_OFS            0x2040
+#define MSC01_PCI_HEAD9_OFS            0x2048
+#define MSC01_PCI_HEAD10_OFS           0x2050
+#define MSC01_PCI_HEAD11_OFS           0x2058
+#define MSC01_PCI_HEAD12_OFS           0x2060
+#define MSC01_PCI_HEAD13_OFS           0x2068
+#define MSC01_PCI_HEAD14_OFS           0x2070
+#define MSC01_PCI_HEAD15_OFS           0x2078
+#define MSC01_PCI_BAR0_OFS             0x2220
+#define MSC01_PCI_CFG_OFS              0x2380
+#define MSC01_PCI_SWAP_OFS             0x2388
+
+#define MSC01_PCI_SC2PMMSKL_MSK_MSK    0xff000000
+#define MSC01_PCI_SC2PIOMSKL_MSK_MSK   0xff000000
+
+#define MSC01_PCI_INTSTAT_TA_SHF       6
+#define MSC01_PCI_INTSTAT_TA_MSK       (0x1 << MSC01_PCI_INTSTAT_TA_SHF)
+#define MSC01_PCI_INTSTAT_MA_SHF       7
+#define MSC01_PCI_INTSTAT_MA_MSK       (0x1 << MSC01_PCI_INTSTAT_MA_SHF)
+
+#define MSC01_PCI_CFGADDR_BNUM_SHF     16
+#define MSC01_PCI_CFGADDR_BNUM_MSK     (0xff << MSC01_PCI_CFGADDR_BNUM_SHF)
+#define MSC01_PCI_CFGADDR_DNUM_SHF     11
+#define MSC01_PCI_CFGADDR_DNUM_MSK     (0x1f << MSC01_PCI_CFGADDR_DNUM_SHF)
+#define MSC01_PCI_CFGADDR_FNUM_SHF     8
+#define MSC01_PCI_CFGADDR_FNUM_MSK     (0x3 << MSC01_PCI_CFGADDR_FNUM_SHF)
+#define MSC01_PCI_CFGADDR_RNUM_SHF     2
+#define MSC01_PCI_CFGADDR_RNUM_MSK     (0x3f << MSC01_PCI_CFGADDR_RNUM_SHF)
+
+#define MSC01_PCI_HEAD0_VENDORID_SHF   0
+#define MSC01_PCI_HEAD0_DEVICEID_SHF   16
+
+#define MSC01_PCI_HEAD2_REV_SHF                0
+#define MSC01_PCI_HEAD2_CLASS_SHF      16
+
+#define MSC01_PCI_CFG_EN_SHF           15
+#define MSC01_PCI_CFG_EN_MSK           (0x1 << MSC01_PCI_CFG_EN_SHF)
+#define MSC01_PCI_CFG_G_SHF            16
+#define MSC01_PCI_CFG_G_MSK            (0x1 << MSC01_PCI_CFG_G_SHF)
+#define MSC01_PCI_CFG_RA_SHF           17
+#define MSC01_PCI_CFG_RA_MSK           (0x1 << MSC01_PCI_CFG_RA_SHF)
+
+#define MSC01_PCI_SWAP_BAR0_BSWAP_SHF  0
+#define MSC01_PCI_SWAP_IO_BSWAP_SHF    18
+
+/*
+ * Peripheral Bus Controller
+ */
+
+#define MSC01_PBC_CLKCFG_OFS           0x0100
+#define MSC01_PBC_CS0CFG_OFS           0x0400
+#define MSC01_PBC_CS0TIM_OFS           0x0500
+#define MSC01_PBC_CS0RW_OFS            0x0600
+
+#define MSC01_PBC_CLKCFG_SHF           0
+#define MSC01_PBC_CLKCFG_MSK           (0x1f << MSC01_PBC_CLKCFG_SHF)
+
+#define MSC01_PBC_CS0CFG_WS_SHF                0
+#define MSC01_PBC_CS0CFG_WS_MSK                (0x1f << MSC01_PBC_CS0CFG_WS_SHF)
+#define MSC01_PBC_CS0CFG_WSIDLE_SHF    8
+#define MSC01_PBC_CS0CFG_WSIDLE_MSK    (0x1f << MSC01_PBC_CS0CFG_WSIDLE_SHF)
+#define MSC01_PBC_CS0CFG_DTYP_SHF      16
+#define MSC01_PBC_CS0CFG_DTYP_MSK      (0x3 << MSC01_PBC_CS0CFG_DTYP_SHF)
+#define MSC01_PBC_CS0CFG_ADM_SHF       20
+#define MSC01_PBC_CS0CFG_ADM_MSK       (0x1 << MSC01_PBC_CS0CFG_ADM_SHF)
+
+#define MSC01_PBC_CS0TIM_CAT_SHF       0
+#define MSC01_PBC_CS0TIM_CAT_MSK       (0x1f << MSC01_PBC_CS0TIM_CAT_SHF)
+#define MSC01_PBC_CS0TIM_CDT_SHF       8
+#define MSC01_PBC_CS0TIM_CDT_MSK       (0x1f << MSC01_PBC_CS0TIM_CDT_SHF)
+
+#define MSC01_PBC_CS0RW_WAT_SHF                0
+#define MSC01_PBC_CS0RW_WAT_MSK                (0x1f << MSC01_PBC_CS0RW_WAT_SHF)
+#define MSC01_PBC_CS0RW_WDT_SHF                8
+#define MSC01_PBC_CS0RW_WDT_MSK                (0x1f << MSC01_PBC_CS0RW_WDT_SHF)
+#define MSC01_PBC_CS0RW_RAT_SHF                16
+#define MSC01_PBC_CS0RW_RAT_MSK                (0x1f << MSC01_PBC_CS0RW_RAT_SHF)
+#define MSC01_PBC_CS0RW_RDT_SHF                24
+#define MSC01_PBC_CS0RW_RDT_MSK                (0x1f << MSC01_PBC_CS0RW_RDT_SHF)
+
+#endif /* __MSC01_H__ */
include/pci_ids.h +3 -0
index 2c6dfd4..6bab677 100644
@@ -2170,6 +2170,9 @@
 #define PCI_DEVICE_ID_ENE_720          0x1421
 #define PCI_DEVICE_ID_ENE_722          0x1422
 
+#define PCI_VENDOR_ID_MIPS             0x153f
+#define PCI_DEVICE_ID_MIPS_MSC01       0x0001
+
 #define PCI_SUBVENDOR_ID_PERLE          0x155f
 #define PCI_SUBDEVICE_ID_PCI_RAS4       0xf001
 #define PCI_SUBDEVICE_ID_PCI_RAS8       0xf010
include/pci_msc01.h new file +17 -1
new file mode 100644
index 0000000..54945a7
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __PCI_MSC01_H__
+#define __PCI_MSC01_H__
+
+extern void msc01_pci_init(void *base, unsigned long sys_bus,
+                          unsigned long sys_phys, unsigned long sys_size,
+                          unsigned long mem_bus, unsigned long mem_phys,
+                          unsigned long mem_size, unsigned long io_bus,
+                          unsigned long io_phys, unsigned long io_size);
+
+#endif /* __PCI_MSC01_H__ */
--

1.8.4

Signature · 2 lines
Best regards,
Daniel
#21 lore raw

PATCH v2 9/15 malta: support for coreFPGA6 boards

This patch adds support for running on Malta boards using coreFPGA6 core cards, including support for the msc01 system controller used with them. The system controller is detected at runtime allowing one U-boot binary to run on a Malta with either.

Due to the PCI I/O base differing between Maltas using gt64120 & msc01 system controllers, the UART setup is modified slightly. A second UART is added so that there is one pointing at the correct address for each system controller. The Malta board then defines its own default_serial_console function to select the correct one at runtime. The incorrect UART will simply not function.

Tested on:
- A coreFPGA6 Malta running interAptiv and proAptiv bitstreams, both with and without an L2 cache.
- QEMU, which seems to be broken but boots as far as it did before this patch (including correctly printing CoreLV on serial).

---
Changes in v2:
- rebased after malta moved to board/imgtec/malta
- removed unused status variable from msc01_config_access

---
 arch/mips/include/asm/malta.h      |  35 ++++++--
 board/imgtec/malta/lowlevel_init.S | 164 ++++++++++++++++++++++++++++++++++++-
 board/imgtec/malta/malta.c         | 124 ++++++++++++++++++++++++++--
 drivers/pci/Makefile               |   1 +
 drivers/pci/pci_msc01.c            | 125 ++++++++++++++++++++++++++++
 include/configs/malta.h            |   4 +-
 include/msc01.h                    | 135 ++++++++++++++++++++++++++++++
 include/pci_ids.h                  |   3 +
 include/pci_msc01.h                |  17 ++++
 9 files changed, 593 insertions(+), 15 deletions(-)
 create mode 100644 drivers/pci/pci_msc01.c
 create mode 100644 include/msc01.h
 create mode 100644 include/pci_msc01.h
arch/mips/include/asm/malta.h +29 -6
index d4d44a2..0b50a66 100644
@@ -9,15 +9,38 @@
 #ifndef _MIPS_ASM_MALTA_H
 #define _MIPS_ASM_MALTA_H
 
-#define MALTA_IO_PORT_BASE	0x18000000
+#define MALTA_GT_BASE			0x1be00000
+#define MALTA_GT_PCIIO_BASE		0x18000000
+#define MALTA_GT_UART0_BASE		(MALTA_GT_PCIIO_BASE + 0x3f8)
 
-#define MALTA_UART_BASE		(MALTA_IO_PORT_BASE + 0x3f8)
+#define MALTA_MSC01_BIU_BASE		0x1bc80000
+#define MALTA_MSC01_PCI_BASE		0x1bd00000
+#define MALTA_MSC01_PBC_BASE		0x1bd40000
+#define MALTA_MSC01_IP1_BASE		0x1bc00000
+#define MALTA_MSC01_IP1_SIZE		0x00400000
+#define MALTA_MSC01_IP2_BASE1		0x10000000
+#define MALTA_MSC01_IP2_SIZE1		0x08000000
+#define MALTA_MSC01_IP2_BASE2		0x18000000
+#define MALTA_MSC01_IP2_SIZE2		0x04000000
+#define MALTA_MSC01_IP3_BASE		0x1c000000
+#define MALTA_MSC01_IP3_SIZE		0x04000000
+#define MALTA_MSC01_PCIMEM_BASE		0x10000000
+#define MALTA_MSC01_PCIMEM_SIZE		0x10000000
+#define MALTA_MSC01_PCIMEM_MAP		0x10000000
+#define MALTA_MSC01_PCIIO_BASE		0x1b000000
+#define MALTA_MSC01_PCIIO_SIZE		0x00800000
+#define MALTA_MSC01_PCIIO_MAP		0x00000000
+#define MALTA_MSC01_UART0_BASE		(MALTA_MSC01_PCIIO_BASE + 0x3f8)
 
-#define MALTA_GT_BASE		0x1be00000
+#define MALTA_RESET_BASE		0x1f000500
+#define GORESET				0x42
 
-#define MALTA_RESET_BASE	0x1f000500
-#define GORESET			0x42
+#define MALTA_FLASH_BASE		0x1fc00000
 
-#define MALTA_FLASH_BASE	0x1fc00000
+#define MALTA_REVISION			0x1fc00010
+#define MALTA_REVISION_CORID_SHF	10
+#define MALTA_REVISION_CORID_MSK	(0x3f << MALTA_REVISION_CORID_SHF)
+#define MALTA_REVISION_CORID_CORE_LV		1
+#define MALTA_REVISION_CORID_CORE_FPGA6		14
 
 #endif /* _MIPS_ASM_MALTA_H */
board/imgtec/malta/lowlevel_init.S +163 -1

185 lines not on this page · raw message

board/imgtec/malta/malta.c +117 -7

161 lines not on this page · raw message

drivers/pci/Makefile +1 -0
index be26b60..77df010 100644
@@ -13,6 +13,7 @@ COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
 COBJS-$(CONFIG_PCI) += pci.o pci_auto.o
 COBJS-$(CONFIG_PCI_INDIRECT_BRIDGE) += pci_indirect.o
 COBJS-$(CONFIG_PCI_GT64120) += pci_gt64120.o
+COBJS-$(CONFIG_PCI_MSC01) += pci_msc01.o
 COBJS-$(CONFIG_FTPCI100) += pci_ftpci100.o
 COBJS-$(CONFIG_IXP_PCI) += pci_ixp.o
 COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
drivers/pci/pci_msc01.c new file +125 -0

125 lines not on this page · raw message

include/configs/malta.h +3 -1
index f6f6cc1..e347b38 100644
@@ -17,6 +17,7 @@
 
 #define CONFIG_PCI
 #define CONFIG_PCI_GT64120
+#define CONFIG_PCI_MSC01
 #define CONFIG_PCI_PNP
 #define CONFIG_PCNET
 
@@ -77,7 +78,8 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
 #define CONFIG_SYS_NS16550_CLK		115200
-#define CONFIG_SYS_NS16550_COM1		CKSEG1ADDR(MALTA_UART_BASE)
+#define CONFIG_SYS_NS16550_COM1		CKSEG1ADDR(MALTA_GT_UART0_BASE)
+#define CONFIG_SYS_NS16550_COM2		CKSEG1ADDR(MALTA_MSC01_UART0_BASE)
 #define CONFIG_CONS_INDEX		1
 
 /*
include/msc01.h new file +135 -0

135 lines not on this page · raw message

include/pci_ids.h +3 -0
index 2c6dfd4..6bab677 100644
@@ -2170,6 +2170,9 @@
 #define PCI_DEVICE_ID_ENE_720		0x1421
 #define PCI_DEVICE_ID_ENE_722		0x1422
 
+#define PCI_VENDOR_ID_MIPS		0x153f
+#define PCI_DEVICE_ID_MIPS_MSC01	0x0001
+
 #define PCI_SUBVENDOR_ID_PERLE          0x155f
 #define PCI_SUBDEVICE_ID_PCI_RAS4       0xf001
 #define PCI_SUBDEVICE_ID_PCI_RAS8       0xf010
include/pci_msc01.h new file +17 -0
new file mode 100644
index 0000000..54945a7
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __PCI_MSC01_H__
+#define __PCI_MSC01_H__
+
+extern void msc01_pci_init(void *base, unsigned long sys_bus,
+			   unsigned long sys_phys, unsigned long sys_size,
+			   unsigned long mem_bus, unsigned long mem_phys,
+			   unsigned long mem_size, unsigned long io_bus,
+			   unsigned long io_phys, unsigned long io_size);
+
+#endif /* __PCI_MSC01_H__ */
Signature · 1 line
1.8.4
#22 lore raw

PATCH v2 9/15 malta: support for coreFPGA6 boards

2013.10.24. 11:33 keltez?ssel, Paul Burton ?rta:

Quoted 12 lines

This patch adds support for running on Malta boards using coreFPGA6 core cards, including support for the msc01 system controller used with them. The system controller is detected at runtime allowing one U-boot binary to run on a Malta with either.

Due to the PCI I/O base differing between Maltas using gt64120 & msc01 system controllers, the UART setup is modified slightly. A second UART is added so that there is one pointing at the correct address for each system controller. The Malta board then defines its own default_serial_console function to select the correct one at runtime. The incorrect UART will simply not function.

Quoted 5 lines

Tested on:
- A coreFPGA6 Malta running interAptiv and proAptiv bitstreams, both with and without an L2 cache.
- QEMU, which seems to be broken but boots as far as it did before this patch (including correctly printing CoreLV on serial).

It is indeed broken with qemu 1.6.1. However it boots fine on older qemu versions if the memory size is explicitly set to 256M with the '-m 256' option. Tested with qemu versions 1.2.2, 1.4.2 and 1.5.3.

-GAbor

#23 lore raw

PATCH 9/15 malta: support for coreFPGA6 boards

In reply to Daniel Schwierzeck
Quoted 47 lines
Quoted 34 lines
drivers/pci/pci_msc01.c new file +28 -0
new file mode 100644
index 0000000..7904378
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2013 Imagination Technologies
+ * Author: Paul Burton <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <msc01.h>
+#include <pci.h>
+#include <pci_msc01.h>
+#include <asm/io.h>
+
+#define PCI_ACCESS_READ  0
+#define PCI_ACCESS_WRITE 1
+
+struct msc01_pci_controller {
+       struct pci_controller hose;
+       void *base;
+};
+
+static inline struct msc01_pci_controller *
+hose_to_msc01(struct pci_controller *hose)
+{
+       return container_of(hose, struct msc01_pci_controller, hose);
+}
+
+static int msc01_config_access(struct msc01_pci_controller *msc01,

drivers/pci/pci_msc01.c line 38

Quoted 10 lines
drivers/pci/pci_msc01.c new file +10 -0
+                              unsigned char access_type, pci_dev_t bdf,
+                              int where, u32 *data)
+{
+       const u32 aborts = MSC01_PCI_INTSTAT_MA_MSK | MSC01_PCI_INTSTAT_TA_MSK;
+       void *intstat = msc01->base + MSC01_PCI_INTSTAT_OFS;
+       void *cfgdata = msc01->base + MSC01_PCI_CFGDATA_OFS;
+       unsigned int bus = PCI_BUS(bdf);
+       unsigned int dev = PCI_DEV(bdf);
+       unsigned int devfn = PCI_DEV(bdf) << 3 | PCI_FUNC(bdf);
+       u32 status;

gcc-4.8 shows a warning:

Quoted 4 lines

pci_msc01.c: In function 'msc01_config_access':
pci_msc01.c:38:6: warning: unused variable 'status' [-Wunused-variable]

   u32 status;
       ^

Right you are.

Quoted 17 lines

drivers/pci/pci_msc01.c line 48

Quoted 12 lines
drivers/pci/pci_msc01.c new file +10 -0
+
+       /* clear abort status */
+       __raw_writel(aborts, intstat);
+
+       /* setup address */
+       __raw_writel((bus << MSC01_PCI_CFGADDR_BNUM_SHF) |
+                    (dev << MSC01_PCI_CFGADDR_DNUM_SHF) |
+                    (devfn << MSC01_PCI_CFGADDR_FNUM_SHF) |
+                    ((where / 4) << MSC01_PCI_CFGADDR_RNUM_SHF),
+                    msc01->base + MSC01_PCI_CFGADDR_OFS);

Contrary to the kernel U-Boot code must not use base + offset in IO primitives. Registers should be implemented with a struct. For example:

Quoted 7 lines
struct foobar_regs {
     u32 foo;
     u32 bar;
};

struct foobar_regs *regs = (struct foobar_regs *)CKSEG1ADDR(FOOBAR_BASE); u32 val = __raw_readl(&regs->foo);

Could you point me to somewhere stating that? (and why?) I can't find anything in README and I can see plenty of code using base+offset already in U-boot. In this case the assembly in lowlevel_init.S has to access various registers so using the offsets in C means I don't need to duplicate the information in both struct & offset macro forms. I don't mind too much if it's a rule but I'd like to see some justification/reasoning before I change this.

Thanks for the review,
Paul

#24 lore raw

PATCH 10/15 malta: display "U-boot" on the LCD screen

In reply to Paul Burton

Displaying a message on the LCD screen is a simple yet effective way to show the user that the board has booted successfully.

---
 arch/mips/include/asm/malta.h | 10 ++++++++++
 board/malta/malta.c           | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)
arch/mips/include/asm/malta.h +10 -0
index 0b50a66..d8ec57c 100644
@@ -32,6 +32,16 @@
 #define MALTA_MSC01_PCIIO_MAP		0x00000000
 #define MALTA_MSC01_UART0_BASE		(MALTA_MSC01_PCIIO_BASE + 0x3f8)
 
+#define MALTA_ASCIIWORD			0x1f000410
+#define MALTA_ASCIIPOS0			0x1f000418
+#define MALTA_ASCIIPOS1			0x1f000420
+#define MALTA_ASCIIPOS2			0x1f000428
+#define MALTA_ASCIIPOS3			0x1f000430
+#define MALTA_ASCIIPOS4			0x1f000438
+#define MALTA_ASCIIPOS5			0x1f000440
+#define MALTA_ASCIIPOS6			0x1f000448
+#define MALTA_ASCIIPOS7			0x1f000450
+
 #define MALTA_RESET_BASE		0x1f000500
 #define GORESET				0x42
 
board/malta/malta.c +19 -0
index 96c6f23..d876507 100644
@@ -29,6 +29,24 @@ enum sys_con {
 	SYSCON_MSC01,
 };
 
+static void malta_lcd_puts(const char *str)
+{
+	int i;
+	void *reg = (void *)CKSEG1ADDR(MALTA_ASCIIPOS0);
+
+	/* print up to 8 characters of the string */
+	for (i = 0; i < min(strlen(str), 8); i++) {
+		__raw_writel(str[i], reg);
+		reg += MALTA_ASCIIPOS1 - MALTA_ASCIIPOS0;
+	}
+
+	/* fill the rest of the display with spaces */
+	for (; i < 8; i++) {
+		__raw_writel(' ', reg);
+		reg += MALTA_ASCIIPOS1 - MALTA_ASCIIPOS0;
+	}
+}
+
 static enum core_card malta_core_card(void)
 {
 	u32 corid, rev;
@@ -71,6 +89,7 @@ int checkboard(void)
 {
 	enum core_card core;
 
+	malta_lcd_puts("U-boot");
 	puts("Board: MIPS Malta");
 
 	core = malta_core_card();
Signature · 1 line
1.8.4
#25 lore raw

PATCH v2 10/15 malta: display "U-boot" on the LCD screen

Displaying a message on the LCD screen is a simple yet effective way to show the user that the board has booted successfully.

---
Changes in v2:
- rebased after malta moved to board/imgtec/malta

---
 arch/mips/include/asm/malta.h | 10 ++++++++++
 board/imgtec/malta/malta.c    | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+)
arch/mips/include/asm/malta.h +10 -0
index 0b50a66..d8ec57c 100644
@@ -32,6 +32,16 @@
 #define MALTA_MSC01_PCIIO_MAP		0x00000000
 #define MALTA_MSC01_UART0_BASE		(MALTA_MSC01_PCIIO_BASE + 0x3f8)
 
+#define MALTA_ASCIIWORD			0x1f000410
+#define MALTA_ASCIIPOS0			0x1f000418
+#define MALTA_ASCIIPOS1			0x1f000420
+#define MALTA_ASCIIPOS2			0x1f000428
+#define MALTA_ASCIIPOS3			0x1f000430
+#define MALTA_ASCIIPOS4			0x1f000438
+#define MALTA_ASCIIPOS5			0x1f000440
+#define MALTA_ASCIIPOS6			0x1f000448
+#define MALTA_ASCIIPOS7			0x1f000450
+
 #define MALTA_RESET_BASE		0x1f000500
 #define GORESET				0x42
 
board/imgtec/malta/malta.c +19 -0
index 96c6f23..d876507 100644
@@ -29,6 +29,24 @@ enum sys_con {
 	SYSCON_MSC01,
 };
 
+static void malta_lcd_puts(const char *str)
+{
+	int i;
+	void *reg = (void *)CKSEG1ADDR(MALTA_ASCIIPOS0);
+
+	/* print up to 8 characters of the string */
+	for (i = 0; i < min(strlen(str), 8); i++) {
+		__raw_writel(str[i], reg);
+		reg += MALTA_ASCIIPOS1 - MALTA_ASCIIPOS0;
+	}
+
+	/* fill the rest of the display with spaces */
+	for (; i < 8; i++) {
+		__raw_writel(' ', reg);
+		reg += MALTA_ASCIIPOS1 - MALTA_ASCIIPOS0;
+	}
+}
+
 static enum core_card malta_core_card(void)
 {
 	u32 corid, rev;
@@ -71,6 +89,7 @@ int checkboard(void)
 {
 	enum core_card core;
 
+	malta_lcd_puts("U-boot");
 	puts("Board: MIPS Malta");
 
 	core = malta_core_card();
Signature · 1 line
1.8.4
#26 lore raw

PATCH 11/15 malta: enable CONFIG_PCNET_79C973, PCNET_HAS_PROM, CONFIG_CMD_DHCP

In reply to Paul Burton

This model of the pcnet is used in current Malta boards, at least in the Malta-R rev 3. Enable support for it.

The Malta also has the ethernet controller PROM containing its MAC address, so enable support for that in order to read that MAC address.

DHCP is a very useful feature to have available for many networks, enable support for it also.

---
 include/configs/malta.h | 3 +++
 1 file changed, 3 insertions(+)
include/configs/malta.h +3 -0
index e347b38..23a781e 100644
@@ -20,6 +20,8 @@
 #define CONFIG_PCI_MSC01
 #define CONFIG_PCI_PNP
 #define CONFIG_PCNET
+#define CONFIG_PCNET_79C973
+#define PCNET_HAS_PROM
 
 /*
  * CPU Configuration
@@ -108,6 +110,7 @@
 #undef CONFIG_CMD_LOADS
 #undef CONFIG_CMD_NFS
 
+#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_PING
 
Signature · 1 line
1.8.4
#27 lore raw

PATCH 12/15 malta: remove cache size definitions

In reply to Paul Burton

These will now be detected at runtime, allowing a single U-boot configuration to function correctly with different bitstreams. Without this you may need to re-configure, re-build and re-flash U-boot to your Malta if you flash a new bitstream with a different cache configuration to your old bitstream.

---
 include/configs/malta.h | 4 ----
 1 file changed, 4 deletions(-)
include/configs/malta.h +0 -4
index 23a781e..19acf3a 100644
@@ -30,10 +30,6 @@
 #define CONFIG_SYS_MIPS_TIMER_FREQ	(CONFIG_SYS_MHZ * 1000000)
 #define CONFIG_SYS_HZ			1000
 
-#define CONFIG_SYS_DCACHE_SIZE		16384	/* arbitrary value */
-#define CONFIG_SYS_ICACHE_SIZE		16384	/* arbitrary value */
-#define CONFIG_SYS_CACHELINE_SIZE	32	/* arbitrary value */
-
 #define CONFIG_SWAP_IO_SPACE
 
 /*
Signature · 1 line
1.8.4
#28 lore raw

PATCH 13/15 malta: disable L2 caches

In reply to Paul Burton

Malta boards may be used with cores which support L2 caches, however U-boot does not yet support L2 cache for MIPS. Thus for the moment we'll disable L2 caches by setting the L2B bit in Config2. This is specific to MTI/Imagination MIPS cores which is why this is done for the Malta board rather than generically.

---
 board/malta/lowlevel_init.S | 7 +++++++
 1 file changed, 7 insertions(+)
board/malta/lowlevel_init.S +7 -0
index 1af34f1..ae09c27 100644
@@ -12,6 +12,7 @@
 #include <asm/addrspace.h>
 #include <asm/regdef.h>
 #include <asm/malta.h>
+#include <asm/mipsregs.h>
 
 #ifdef CONFIG_SYS_BIG_ENDIAN
 #define CPU_TO_GT32(_x)		((_x))
@@ -27,6 +28,12 @@
 
 	.globl	lowlevel_init
 lowlevel_init:
+	/* disable any L2 cache for now */
+	sync
+	mfc0	t0, CP0_CONFIG, 2
+	ori	t0, t0, 0x1 << 12
+	mtc0	t0, CP0_CONFIG, 2
+
 	/* detect the core card */
 	li	t0, KSEG1ADDR(MALTA_REVISION)
 	lw	t0, 0(t0)
Signature · 1 line
1.8.4
#29 lore raw

PATCH v2 13/15 malta: disable L2 caches

Malta boards may be used with cores which support L2 caches, however U-boot does not yet support L2 cache for MIPS. Thus for the moment we'll disable L2 caches by setting the L2B bit in Config2. This is specific to MTI/Imagination MIPS cores which is why this is done for the Malta board rather than generically.

---
Changes in v2:
- rebased after malta moved to board/imgtec/malta

---
 board/imgtec/malta/lowlevel_init.S | 7 +++++++
 1 file changed, 7 insertions(+)
board/imgtec/malta/lowlevel_init.S +7 -0
index 1af34f1..ae09c27 100644
@@ -12,6 +12,7 @@
 #include <asm/addrspace.h>
 #include <asm/regdef.h>
 #include <asm/malta.h>
+#include <asm/mipsregs.h>
 
 #ifdef CONFIG_SYS_BIG_ENDIAN
 #define CPU_TO_GT32(_x)		((_x))
@@ -27,6 +28,12 @@
 
 	.globl	lowlevel_init
 lowlevel_init:
+	/* disable any L2 cache for now */
+	sync
+	mfc0	t0, CP0_CONFIG, 2
+	ori	t0, t0, 0x1 << 12
+	mtc0	t0, CP0_CONFIG, 2
+
 	/* detect the core card */
 	li	t0, KSEG1ADDR(MALTA_REVISION)
 	lw	t0, 0(t0)
Signature · 1 line
1.8.4
#30 lore raw

PATCH 14/15 malta: add script & instructions to flash U-boot

In reply to Paul Burton

This patch adds a script which may be used with MIPS Navigator Console and a MIPS Nagivator Probe in order to flash U-boot to a MIPS Malta development board.

Please see the newly added board/malta/README for usage instructions.

---
 board/malta/README               | 16 ++++++++++++++++
 board/malta/flash-malta-boot.tcl | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 board/malta/README
 create mode 100644 board/malta/flash-malta-boot.tcl
board/malta/README new file +16 -0
new file mode 100644
index 0000000..a495d02
@@ -0,0 +1,16 @@
+MIPS Malta board
+
+How to flash using a MIPS Navigator Probe:
+
+  - Ensure that your Malta has jumper JP1 fitted. Without this jumper you will
+    be unable to flash your Malta using a Navigator Probe.
+
+  - Connect Navigator Console to your probe and Malta as usual.
+
+  - Within Navigator Console run the following commands:
+
+      source /path/to/u-boot/board/malta/flash-malta-boot.tcl
+      reset
+      flash-boot /path/to/u-boot/u-boot.bin
+
+  - You should now be able to reboot your Malta to a U-boot shell.
board/malta/flash-malta-boot.tcl new file +40 -0
new file mode 100644
index 0000000..0eedf07
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2013 Imagination Technologies
+#
+# Programs a MIPS Malta boot flash with a flat binary image.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+proc flash-boot { binfile } {
+  puts "flash monitor binary $binfile"
+  config Coherent on
+  config CoherencyDuringLoad on
+
+  if {[endian]=="big"} {
+    puts "CPU in BE mode"
+    flash device sharp_16x32_be;
+  } else {
+    puts "CPU in LE mode"
+    flash device sharp_16x32;
+  }
+
+  flash clear all;
+  flash set 0xBE000000..0xBE0FFFFF
+  flash erase sector 0xbe000000;
+  flash erase sector 0xbe020000;
+  flash erase sector 0xbe040000;
+  flash erase sector 0xbe060000;
+  flash erase sector 0xbe080000;
+  flash erase sector 0xbe0a0000;
+  flash erase sector 0xbe0c0000;
+  flash erase sector 0xbe0e0000;
+  puts "finished erasing boot flash";
+
+  puts "programming flash, please be patient"
+  load bin 0xbe000000 $binfile size4
+
+  flash clear all
+  config CoherencyDuringLoad off
+  puts "finished programming boot flash";
+}
Signature · 1 line
1.8.4
#31 lore raw

PATCH 14/15 malta: add script & instructions to flash U-boot

2013/10/23 Paul Burton <[email protected]>:

board/malta/README

Quoted 19 lines

This patch adds a script which may be used with MIPS Navigator Console and a MIPS Nagivator Probe in order to flash U-boot to a MIPS Malta development board.

Please see the newly added board/malta/README for usage instructions.

---
 board/malta/README               | 16 ++++++++++++++++
 board/malta/flash-malta-boot.tcl | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 board/malta/README
 create mode 100644 board/malta/flash-malta-boot.tcl
board/malta/README new file +0 -0
new file mode 100644
index 0000000..a495d02

I think that should be moved to doc/README.malta

Quoted 67 lines
board/malta/README new file +16 -0
@@ -0,0 +1,16 @@
+MIPS Malta board
+
+How to flash using a MIPS Navigator Probe:
+
+  - Ensure that your Malta has jumper JP1 fitted. Without this jumper you will
+    be unable to flash your Malta using a Navigator Probe.
+
+  - Connect Navigator Console to your probe and Malta as usual.
+
+  - Within Navigator Console run the following commands:
+
+      source /path/to/u-boot/board/malta/flash-malta-boot.tcl
+      reset
+      flash-boot /path/to/u-boot/u-boot.bin
+
+  - You should now be able to reboot your Malta to a U-boot shell.
board/malta/flash-malta-boot.tcl new file +40 -1
new file mode 100644
index 0000000..0eedf07
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2013 Imagination Technologies
+#
+# Programs a MIPS Malta boot flash with a flat binary image.
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+proc flash-boot { binfile } {
+  puts "flash monitor binary $binfile"
+  config Coherent on
+  config CoherencyDuringLoad on
+
+  if {[endian]=="big"} {
+    puts "CPU in BE mode"
+    flash device sharp_16x32_be;
+  } else {
+    puts "CPU in LE mode"
+    flash device sharp_16x32;
+  }
+
+  flash clear all;
+  flash set 0xBE000000..0xBE0FFFFF
+  flash erase sector 0xbe000000;
+  flash erase sector 0xbe020000;
+  flash erase sector 0xbe040000;
+  flash erase sector 0xbe060000;
+  flash erase sector 0xbe080000;
+  flash erase sector 0xbe0a0000;
+  flash erase sector 0xbe0c0000;
+  flash erase sector 0xbe0e0000;
+  puts "finished erasing boot flash";
+
+  puts "programming flash, please be patient"
+  load bin 0xbe000000 $binfile size4
+
+  flash clear all
+  config CoherencyDuringLoad off
+  puts "finished programming boot flash";
+}
--

1.8.4

Signature · 2 lines
Best regards,
Daniel
#32 lore raw

PATCH v2 14/15 malta: add script & instructions to flash U-boot

This patch adds a script which may be used with MIPS Navigator Console and a MIPS Nagivator Probe in order to flash U-boot to a MIPS Malta development board.

Please see the newly added doc/README.malta for usage instructions.

---
Changes in v2:
- rebased after malta moved to board/imgtec/malta
- moved board/malta/README to doc/README.malta

---
 board/imgtec/malta/flash-malta-boot.tcl | 40 +++++++++++++++++++++++++++++++++
 doc/README.malta                        | 16 +++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 board/imgtec/malta/flash-malta-boot.tcl
 create mode 100644 doc/README.malta
board/imgtec/malta/flash-malta-boot.tcl new file +40 -0
new file mode 100644
index 0000000..0eedf07
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2013 Imagination Technologies
+#
+# Programs a MIPS Malta boot flash with a flat binary image.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+proc flash-boot { binfile } {
+  puts "flash monitor binary $binfile"
+  config Coherent on
+  config CoherencyDuringLoad on
+
+  if {[endian]=="big"} {
+    puts "CPU in BE mode"
+    flash device sharp_16x32_be;
+  } else {
+    puts "CPU in LE mode"
+    flash device sharp_16x32;
+  }
+
+  flash clear all;
+  flash set 0xBE000000..0xBE0FFFFF
+  flash erase sector 0xbe000000;
+  flash erase sector 0xbe020000;
+  flash erase sector 0xbe040000;
+  flash erase sector 0xbe060000;
+  flash erase sector 0xbe080000;
+  flash erase sector 0xbe0a0000;
+  flash erase sector 0xbe0c0000;
+  flash erase sector 0xbe0e0000;
+  puts "finished erasing boot flash";
+
+  puts "programming flash, please be patient"
+  load bin 0xbe000000 $binfile size4
+
+  flash clear all
+  config CoherencyDuringLoad off
+  puts "finished programming boot flash";
+}
doc/README.malta new file +16 -0
new file mode 100644
index 0000000..a495d02
@@ -0,0 +1,16 @@
+MIPS Malta board
+
+How to flash using a MIPS Navigator Probe:
+
+  - Ensure that your Malta has jumper JP1 fitted. Without this jumper you will
+    be unable to flash your Malta using a Navigator Probe.
+
+  - Connect Navigator Console to your probe and Malta as usual.
+
+  - Within Navigator Console run the following commands:
+
+      source /path/to/u-boot/board/malta/flash-malta-boot.tcl
+      reset
+      flash-boot /path/to/u-boot/u-boot.bin
+
+  - You should now be able to reboot your Malta to a U-boot shell.
Signature · 1 line
1.8.4
#33 lore raw

PATCH 15/15 malta: add myself to maintainers

In reply to Paul Burton

This patch adds me as a maintainer of the malta(el) board(s). I have access to physical Malta boards and the desire for U-boot to run well on them.

---
 boards.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
boards.cfg +2 -2
index 60b3f8b..2305087 100644
@@ -480,8 +480,8 @@ Active  m68k        mcf547x_8x     -           freescale       m548xevb
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485GFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=4,SYS_DRAMSZ=64                                                                          TsiChung Liew <[email protected]>
 Active  m68k        mcf547x_8x     -           freescale       m548xevb            M5485HFE                             M5485EVB:SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16,SYS_VIDEO                                                  TsiChung Liew <[email protected]>
 Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <[email protected]>
-Active  mips        mips32         -           -               malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       -
-Active  mips        mips32         -           -               malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    -
+Active  mips        mips32         -           -               malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       Paul Burton <[email protected]>
+Active  mips        mips32         -           -               malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    Paul Burton <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
 Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
Signature · 1 line
1.8.4
#34 lore raw

PATCH v2 15/15 malta: add myself to maintainers

This patch adds me as a maintainer of the malta(el) board(s). I have access to physical Malta boards and the desire for U-boot to run well on them.

---
Changes in v2:
- rebased after malta moved to board/imgtec/malta

---
 boards.cfg | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
boards.cfg +2 -2
index 5c92868..a271a8e 100644
@@ -482,8 +482,8 @@ Active  m68k        mcf547x_8x     -           freescale       m548xevb
 Active  microblaze  microblaze     -           xilinx          microblaze-generic  microblaze-generic                   -                                                                                                                                 Michal Simek <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mips                            qemu-mips:SYS_BIG_ENDIAN                                                                                                          Vlad Lungu <[email protected]>
 Active  mips        mips32         -           -               qemu-mips           qemu_mipsel                          qemu-mips:SYS_LITTLE_ENDIAN                                                                                                       -
-Active  mips        mips32         -           imgtec          malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       -
-Active  mips        mips32         -           imgtec          malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    -
+Active  mips        mips32         -           imgtec          malta               malta                                malta:MIPS32,SYS_BIG_ENDIAN                                                                                                       Paul Burton <[email protected]>
+Active  mips        mips32         -           imgtec          malta               maltael                              malta:MIPS32,SYS_LITTLE_ENDIAN                                                                                                    Paul Burton <[email protected]>
 Active  mips        mips32         -           micronas        vct                 vct_platinum                         vct:VCT_PLATINUM                                                                                                                  -
 Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand                 vct:VCT_PLATINUM,VCT_ONENAND                                                                                                      -
 Active  mips        mips32         -           micronas        vct                 vct_platinum_onenand_small           vct:VCT_PLATINUM,VCT_ONENAND,VCT_SMALL_IMAGE                                                                                      -
Signature · 1 line
1.8.4