Skip to contentSkip to conversation

74xx_7xx: CPCI750: Add commandline editing/history

PATCH New Stefan Roese 4 participants 13 messages Jun 4, 2009 – Jun 12, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 74xx_7xx: CPCI750: Add commandline editing/history

---
 include/configs/CPCI750.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
include/configs/CPCI750.h +2 -1
index 8494faa..3b0b888 100644
@@ -76,7 +76,8 @@
 
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
-#define CONFIG_AUTO_COMPLETE 1
+#define CONFIG_CMDLINE_EDITING		/* add command line history	*/
+#define CONFIG_AUTO_COMPLETE		/* add autocompletion support	*/
 
 /* Define which ETH port will be used for connecting the network */
 #define CONFIG_SYS_ETH_PORT		ETH_0
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 2/5 74xx_7xx: CPCI750: Add loadpci command

This command is used to load/boot an OS-image which is transferred from the CPCI host to the CPCI target/adapter.

---
 board/esd/cpci750/cpci750.c |   76 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)
board/esd/cpci750/cpci750.c +76 -0
index 4826633..3473504 100644
@@ -122,6 +122,9 @@ static char show_config_tab[][15] = {{"PCI0DLL_2     "},  /* 31 */
 
 extern flash_info_t flash_info[];
 
+extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
+extern int do_bootvx (cmd_tbl_t *, int, int, char *[]);
+
 /* ------------------------------------------------------------------------- */
 
 /* this is the current GT register space location */
@@ -538,6 +541,79 @@ int display_mem_map (void)
 	return (0);
 }
 
+/*
+ * Command loadpci: wait for signal from host and boot image.
+ */
+int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	volatile unsigned int *ptr;
+	int count = 0;
+	int count2 = 0;
+	int status;
+	char addr[16];
+	char str[] = "\\|/-";
+	char *local_args[2];
+
+	/*
+	 * Mark sync address
+	 */
+	ptr = 0;
+	ptr[0] = 0xffffffff;
+	ptr[1] = 0xffffffff;
+	puts("\nWaiting for image from pci host -");
+
+	/*
+	 * Wait for host to write the start address
+	 */
+	while (*ptr == 0xffffffff) {
+		count++;
+		if (!(count % 100)) {
+			count2++;
+			putc(0x08); /* backspace */
+			putc(str[count2 % 4]);
+		}
+
+		/* Abort if ctrl-c was pressed */
+		if (ctrlc()) {
+			puts("\nAbort\n");
+			return 0;
+		}
+
+		udelay(1000);
+	}
+
+	sprintf(addr, "%08x", *ptr);
+	printf("\nBooting Image at addr 0x%s ...\n", addr);
+	setenv("loadaddr", addr);
+
+	switch (ptr[1] == 0) {
+	case 0:
+		/*
+		 * Boot image via bootm
+		 */
+		local_args[0] = argv[0];
+		local_args[1] = NULL;
+		status = do_bootm (cmdtp, 0, 1, local_args);
+		break;
+	case 1:
+		/*
+		 * Boot image via bootvx
+		 */
+		local_args[0] = argv[0];
+		local_args[1] = NULL;
+		status = do_bootvx (cmdtp, 0, 1, local_args);
+		break;
+	}
+
+	return 0;
+}
+
+U_BOOT_CMD(
+	loadpci,	1,	1,	do_loadpci,
+	"loadpci - Wait for pci-image and boot it\n",
+	NULL
+	);
+
 /* DRAM check routines copied from gw8260 */
 
 #if defined (CONFIG_SYS_DRAM_TEST)
Signature · 1 line
1.6.2.5
#2 lore raw

PATCH 2/5 74xx_7xx: CPCI750: Add loadpci command

Hi Stefan,

doen't it make sense to use/extend the code from board/esd/common/cmd_loadpci.c in stead it copying this code? Even that code is running on 4xx only, it should be simple to modify it for cpci750. Adding support for bootvx should be simple also.

Matthias

Quoted 103 lines

This command is used to load/boot an OS-image which is transferred from the CPCI host to the CPCI target/adapter.

---
 board/esd/cpci750/cpci750.c |   76 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)
board/esd/cpci750/cpci750.c +76 -0
index 4826633..3473504 100644
@@ -122,6 +122,9 @@ static char show_config_tab[][15] = {{"PCI0DLL_2     "},  /* 31 */
 
 extern flash_info_t flash_info[];
 
+extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
+extern int do_bootvx (cmd_tbl_t *, int, int, char *[]);
+
 /* ------------------------------------------------------------------------- */
 
 /* this is the current GT register space location */
@@ -538,6 +541,79 @@ int display_mem_map (void)
 	return (0);
 }
 
+/*
+ * Command loadpci: wait for signal from host and boot image.
+ */
+int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+{
+	volatile unsigned int *ptr;
+	int count = 0;
+	int count2 = 0;
+	int status;
+	char addr[16];
+	char str[] = "\\|/-";
+	char *local_args[2];
+
+	/*
+	 * Mark sync address
+	 */
+	ptr = 0;
+	ptr[0] = 0xffffffff;
+	ptr[1] = 0xffffffff;
+	puts("\nWaiting for image from pci host -");
+
+	/*
+	 * Wait for host to write the start address
+	 */
+	while (*ptr == 0xffffffff) {
+		count++;
+		if (!(count % 100)) {
+			count2++;
+			putc(0x08); /* backspace */
+			putc(str[count2 % 4]);
+		}
+
+		/* Abort if ctrl-c was pressed */
+		if (ctrlc()) {
+			puts("\nAbort\n");
+			return 0;
+		}
+
+		udelay(1000);
+	}
+
+	sprintf(addr, "%08x", *ptr);
+	printf("\nBooting Image at addr 0x%s ...\n", addr);
+	setenv("loadaddr", addr);
+
+	switch (ptr[1] == 0) {
+	case 0:
+		/*
+		 * Boot image via bootm
+		 */
+		local_args[0] = argv[0];
+		local_args[1] = NULL;
+		status = do_bootm (cmdtp, 0, 1, local_args);
+		break;
+	case 1:
+		/*
+		 * Boot image via bootvx
+		 */
+		local_args[0] = argv[0];
+		local_args[1] = NULL;
+		status = do_bootvx (cmdtp, 0, 1, local_args);
+		break;
+	}
+
+	return 0;
+}
+
+U_BOOT_CMD(
+	loadpci,	1,	1,	do_loadpci,
+	"loadpci - Wait for pci-image and boot it\n",
+	NULL
+	);
+
 /* DRAM check routines copied from gw8260 */
 
 #if defined (CONFIG_SYS_DRAM_TEST)
#3 lore raw

PATCH 2/5 74xx_7xx: CPCI750: Add loadpci command

Hi Matthias,

Quoted 4 lines · On Thursday 04 June 2009 19:40:19 Matthias Fuchs wrote:

doen't it make sense to use/extend the code from board/esd/common/cmd_loadpci.c in stead it copying this code? Even that code is running on 4xx only, it should be simple to modify it for cpci750. Adding support for bootvx should be simple also.

I thought about this too but didn't do it mainly because of those reasons:

a) As you already mentioned the current code in common is 4xx specific.

b) The parameters used to identify the image type are incompatible on both platforms. "1" is used for booting a script on 4xx and VxWorks on CPCI750.

c) I have no means of testing any changes in this code on 4xx and/or 750.

So if you still think this should be unified then I need your assistance here. You would need to help me testing those changes on both platforms. Please let me know if you can do this.

Thanks.

Best regards,
Stefan

=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================

#4 lore raw

PATCH 2/5 74xx_7xx: CPCI750: Add loadpci command

Hi Stefan,

please leave the code as is. It is already used in a project and so modifying the parameter type may no change.

Quoted 11 lines · Stefan Roese

Hi Matthias,

Quoted 4 lines · On Thursday 04 June 2009 19:40:19 Matthias Fuchs wrote:

doen't it make sense to use/extend the code from board/esd/common/cmd_loadpci.c in stead it copying this code? Even that code is running on 4xx only, it should be simple to modify it for cpci750. Adding support for bootvx should be simple also.

I thought about this too but didn't do it mainly because of those reasons:

a) As you already mentioned the current code in common is 4xx specific.

But easy to adapt :-)

Quoted 9 lines

b) The parameters used to identify the image type are incompatible on both platforms. "1" is used for booting a script on 4xx and VxWorks on CPCI750.

c) I have no means of testing any changes in this code on 4xx and/or 750.

So if you still think this should be unified then I need your assistance here.

Of course I can do such testing on 4xx hardware.

Quoted 2 lines

You would need to help me testing those changes on both platforms. Please let me know if you can do this.

But let's shutdown this discussion.

Matthias

#5 lore raw

PATCH 2/5 74xx_7xx: CPCI750: Add loadpci command

In reply to Stefan Roese

Dear Stefan Roese,

Quoted 8 lines · In message <[email protected]> you wrote:

This command is used to load/boot an OS-image which is transferred from the CPCI host to the CPCI target/adapter.

---
 board/esd/cpci750/cpci750.c |   76 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

Applied to next, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You've no idea of what a poor opinion  I  have  of  myself,  and  how
little I deserve it.                                  - W. S. Gilbert
#6 lore raw

PATCH 3/5 74xx_7xx: CPCI750: Minor coding style cleanup of cpci750.c

In reply to Stefan Roese
---
 board/esd/cpci750/cpci750.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
board/esd/cpci750/cpci750.c +5 -6
index 3473504..69ae517 100644
@@ -451,13 +451,12 @@ int misc_init_r ()
 
 void after_reloc (ulong dest_addr, gd_t * gd)
 {
+	memoryMapDeviceSpace (BOOT_DEVICE, CONFIG_SYS_BOOT_SPACE, CONFIG_SYS_BOOT_SIZE);
 
-  memoryMapDeviceSpace (BOOT_DEVICE, CONFIG_SYS_BOOT_SPACE, CONFIG_SYS_BOOT_SIZE);
-
-  display_mem_map ();
-  /* now, jump to the main ppcboot board init code */
-  board_init_r (gd, dest_addr);
-  /* NOTREACHED */
+	display_mem_map ();
+	/* now, jump to the main ppcboot board init code */
+	board_init_r (gd, dest_addr);
+	/* NOTREACHED */
 }
 
 /* ------------------------------------------------------------------------- */
Signature · 1 line
1.6.2.5
#7 lore raw

PATCH 3/5 74xx_7xx: CPCI750: Minor coding style cleanup of cpci750.c

Dear Stefan Roese,

Quoted 5 lines · In message <[email protected]> you wrote:
---
 board/esd/cpci750/cpci750.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

Applied to next, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Buy land. They've stopped making it."                   - Mark Twain
#8 lore raw

PATCH 4/5 74xx_7xx: CPCI750: Enable access to PCI function > 0

In reply to Stefan Roese

The Marvell bridge 64360 supports serveral PCI functions, not only 0. This patch enables access to those functions.

---
 board/esd/cpci750/cpci750.c |   16 +++++++++++-----
 board/esd/cpci750/pci.c     |   14 +++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)
board/esd/cpci750/cpci750.c +11 -5
index 69ae517..18944ef 100644
@@ -187,6 +187,7 @@ original ppcboot 1.1.6 source end */
 static void gt_pci_config (void)
 {
 	unsigned int stat;
+	unsigned int data;
 	unsigned int val = 0x00fff864;	/* DINK32: BusNum 23:16,  DevNum 15:11, FuncNum 10:8, RegNum 7:2 */
 
 	/* In PCIX mode devices provide their own bus and device numbers. We query the Discovery II's
@@ -254,10 +255,11 @@ static void gt_pci_config (void)
 
 /*ronen update the pci internal registers base address.*/
 #ifdef MAP_PCI
-	for (stat = 0; stat <= PCI_HOST1; stat++)
-		pciWriteConfigReg (stat,
-				   PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS,
-				   SELF, CONFIG_SYS_GT_REGS);
+	for (stat = 0; stat <= PCI_HOST1; stat++) {
+		data = pciReadConfigReg(stat, PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS, SELF);
+		data = (data & 0x0f) | CONFIG_SYS_GT_REGS;
+		pciWriteConfigReg (stat, PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS, SELF, data);
+	}
 #endif
 
 }
@@ -451,9 +453,13 @@ int misc_init_r ()
 
 void after_reloc (ulong dest_addr, gd_t * gd)
 {
-	memoryMapDeviceSpace (BOOT_DEVICE, CONFIG_SYS_BOOT_SPACE, CONFIG_SYS_BOOT_SIZE);
+	memoryMapDeviceSpace (BOOT_DEVICE, CONFIG_SYS_BOOT_SPACE,
+			      CONFIG_SYS_BOOT_SIZE);
 
 	display_mem_map ();
+	GT_REG_WRITE (PCI_0BASE_ADDRESS_REGISTERS_ENABLE, 0xfffffdfe);
+	GT_REG_WRITE (PCI_1BASE_ADDRESS_REGISTERS_ENABLE, 0xfffffdfe);
+
 	/* now, jump to the main ppcboot board init code */
 	board_init_r (gd, dest_addr);
 	/* NOTREACHED */
board/esd/cpci750/pci.c +9 -5
index bfc7e55..3b59b16 100644
@@ -768,11 +768,12 @@ static int gt_read_config_dword (struct pci_controller *hose,
 	int bus = PCI_BUS (dev);
 
 	if ((bus == local_buses[0]) || (bus == local_buses[1])) {
-		*value = pciReadConfigReg ((PCI_HOST) hose->cfg_addr, offset,
+	        *value = pciReadConfigReg ((PCI_HOST) hose->cfg_addr,
+					   offset | (PCI_FUNC(dev) << 8),
 					   PCI_DEV (dev));
 	} else {
-		*value = pciOverBridgeReadConfigReg ((PCI_HOST) hose->
-						     cfg_addr, offset,
+		*value = pciOverBridgeReadConfigReg ((PCI_HOST) hose->cfg_addr,
+						     offset | (PCI_FUNC(dev) << 8),
 						     PCI_DEV (dev), bus);
 	}
 
@@ -785,13 +786,16 @@ static int gt_write_config_dword (struct pci_controller *hose,
 	int bus = PCI_BUS (dev);
 
 	if ((bus == local_buses[0]) || (bus == local_buses[1])) {
-		pciWriteConfigReg ((PCI_HOST) hose->cfg_addr, offset,
+		pciWriteConfigReg ((PCI_HOST) hose->cfg_addr,
+				   offset | (PCI_FUNC(dev) << 8),
 				   PCI_DEV (dev), value);
 	} else {
 		pciOverBridgeWriteConfigReg ((PCI_HOST) hose->cfg_addr,
-					     offset, PCI_DEV (dev), bus,
+					     offset | (PCI_FUNC(dev) << 8),
+					     PCI_DEV (dev), bus,
 					     value);
 	}
+
 	return 0;
 }
 
Signature · 1 line
1.6.2.5
#9 lore raw

PATCH 4/5 74xx_7xx: CPCI750: Enable access to PCI function > 0

Hi Stefan,

see one comment below.

Quoted 24 lines

The Marvell bridge 64360 supports serveral PCI functions, not only 0. This patch enables access to those functions.

---
 board/esd/cpci750/cpci750.c |   16 +++++++++++-----
 board/esd/cpci750/pci.c     |   14 +++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)
board/esd/cpci750/cpci750.c +1 -0
index 69ae517..18944ef 100644
@@ -187,6 +187,7 @@ original ppcboot 1.1.6 source end */
 static void gt_pci_config (void)
 {
 	unsigned int stat;
+	unsigned int data;
 	unsigned int val = 0x00fff864;	/* DINK32: BusNum 23:16,  DevNum 15:11, FuncNum 10:8, RegNum 7:2 */
 
 	/* In PCIX mode devices provide their own bus and device numbers. We query the Discovery II's
@@ -254,10 +255,11 @@ static void gt_pci_config (void)
 

board/esd/cpci750/cpci750.c static void gt_pci_config (void) · line 261

Quoted 10 lines
board/esd/cpci750/cpci750.c +4 -4
 /*ronen update the pci internal registers base address.*/
 #ifdef MAP_PCI
-	for (stat = 0; stat <= PCI_HOST1; stat++)
-		pciWriteConfigReg (stat,
-				   PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS,
-				   SELF, CONFIG_SYS_GT_REGS);
+	for (stat = 0; stat <= PCI_HOST1; stat++) {
+		data = pciReadConfigReg(stat, PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS, SELF);
+		data = (data & 0x0f) | CONFIG_SYS_GT_REGS;
+		pciWriteConfigReg (stat, PCI_INTERNAL_REGISTERS_MEMORY_MAPPED_BASE_ADDRESS, SELF, data);

Please break those long lines.

Matthias

#10 lore raw

PATCH 5/5 74xx_7xx: CPCI750: Add CPCI adapter/target support

In reply to Stefan Roese

The CPCI750 can be built as CPCI host or adapter/target board. This patch adds support for runtime detection of those variants.

---
 board/esd/cpci750/cpci750.c |    9 ++++++++
 board/esd/cpci750/ide.c     |    4 ++-
 board/esd/cpci750/pci.c     |   49 ++++++++++++++++++++++++++++++------------
 include/configs/CPCI750.h   |    2 +
 4 files changed, 49 insertions(+), 15 deletions(-)
board/esd/cpci750/cpci750.c +9 -0
index 18944ef..1e76bc6 100644
@@ -140,6 +140,15 @@ void board_prebootm_init (void);
 unsigned int INTERNAL_REG_BASE_ADDR = CONFIG_SYS_GT_REGS;
 int display_mem_map (void);
 
+/*
+ * Skip video initialization on slave variant.
+ * This function will overwrite the weak default in cfb_console.c
+ */
+int board_video_skip(void)
+{
+	return CPCI750_SLAVE_TEST;
+}
+
 /* ------------------------------------------------------------------------- */
 
 /*
board/esd/cpci750/ide.c +3 -1
index 9bdc523..638219f 100644
@@ -39,6 +39,8 @@ int ide_preinit (void)
 	int l;
 
 	status = 1;
+	if (CPCI750_SLAVE_TEST != 0)
+		return status;
 	for (l = 0; l < CONFIG_SYS_IDE_MAXBUS; l++) {
 		ide_bus_offset[l] = -ATA_STATUS;
 	}
@@ -57,7 +59,7 @@ int ide_preinit (void)
 		ide_bus_offset[1] &= 0xfffffffe;
 		ide_bus_offset[1] += CONFIG_SYS_PCI0_IO_SPACE;
 	}
-	return (status);
+	return status;
 }
 
 void ide_set_reset (int flag) {
board/esd/cpci750/pci.c +35 -14

93 lines not on this page · raw message

include/configs/CPCI750.h +2 -0
index 3b0b888..d516c3c 100644
@@ -627,4 +627,6 @@
 
 #define CONFIG_SYS_BOARD_ASM_INIT	1
 
+#define CPCI750_SLAVE_TEST	(((in8(0xf0300000) & 0x80) == 0) ? 0 : 1)
+
 #endif	/* __CONFIG_H */
Signature · 1 line
1.6.2.5
#11 lore raw

PATCH 5/5 74xx_7xx: CPCI750: Add CPCI adapter/target support

Dear Stefan Roese,

Quoted 11 lines · In message <[email protected]> you wrote:

The CPCI750 can be built as CPCI host or adapter/target board. This patch adds support for runtime detection of those variants.

---
 board/esd/cpci750/cpci750.c |    9 ++++++++
 board/esd/cpci750/ide.c     |    4 ++-
 board/esd/cpci750/pci.c     |   49 ++++++++++++++++++++++++++++++------------
 include/configs/CPCI750.h   |    2 +
 4 files changed, 49 insertions(+), 15 deletions(-)

Applied to next, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You are an excellent tactician, Captain. You let your second in  com-
mand attack while you sit and watch for weakness.
	-- Khan Noonian Singh, "Space Seed", stardate 3141.9
#12 lore raw

PATCH 1/5 74xx_7xx: CPCI750: Add commandline editing/history

In reply to Stefan Roese

Dear Stefan Roese,

Quoted 5 lines · In message <[email protected]> you wrote:
---
 include/configs/CPCI750.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Applied to next. Thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
You might not be as stupid as you look. This is not hard. Let's think
about this. I mean ... I'll think about this, and  you  can  join  in
when you know the words.             - Terry Pratchett, _Men at Arms_