[U-Boot] [PATCH 0/8] kmp204x patches for 2014.07

[U-Boot] [PATCH 0/8] kmp204x patches for 2014.07

[Valentin Longchamp]

Things have stabilized quite a lot on the u-boot front for the Keymile
kmp204x/kmcoge4 board. There are a few remaining patches that should get
merged to have a complete support of the architecture/board in u-boot.
These include:
 - support for some additional functions of the QRIO board reset/control
   CPLD (LEDs, Factory Test signal)
 - better reset sequence according to the tests/problems noticed during
   the development
 - an update to the RCW (some external interrupts are unused and set as
   GPIOs now)
 - an additionnal workaround in the PBL file (with an implementation
   enhancement for a previous one).


Stefan Bigler (2):
  kmp204x: Add support for the unit LEDs
  kmp204x: handle dip-switch for factory settings

Valentin Longchamp (6):
  kmp204x: selftest/factory test pin support
  kmp204x: update the CONFIG_PRAM and CONFIG_KM_RESERVED_PRAM defines
  kmp204x: complete the reset sequence and PRST configuration
  kmp204x: update the RCW
  kmp204x: add workaround for A-004849
  kmp204x: enable the errata command

 board/keymile/kmp204x/kmp204x.c       | 75 ++++++++++++++++++++++++++++++-----
 board/keymile/kmp204x/kmp204x.h       |  3 ++
 board/keymile/kmp204x/pbi.cfg         | 43 +++++++++++++++++---
 board/keymile/kmp204x/pci.c           | 17 ++++----
 board/keymile/kmp204x/qrio.c          | 29 +++++++++++++-
 board/keymile/kmp204x/rcw_kmp204x.cfg |  2 +-
 include/configs/km/kmp204x-common.h   | 17 ++++----
 7 files changed, 151 insertions(+), 35 deletions(-)

-- 
1.8.0.1

[U-Boot] [PATCH 1/8] kmp204x: Add support for the unit LEDs

[Valentin Longchamp]

From: Stefan Bigler <stefan.bigler@keymile.com>

The unit LEDs are managed by the QRIO CPLD. This patch adds support for
accessing these LEDs in the QRIO.

The LEDs then are set to a correct boot state:
- UNIT-LED is red
- BOOT-LED is on.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/kmp204x/kmp204x.c |  3 +++
 board/keymile/kmp204x/kmp204x.h |  1 +
 board/keymile/kmp204x/qrio.c    | 14 ++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 95a19cd..5fceedd 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -113,6 +113,9 @@ int board_early_init_r(void)
 	if (ret)
 		printf("error triggering PCIe FPGA config\n");
 
+	/* enable the Unit LED (red) & Boot LED (on) */
+	qrio_set_leds();
+
 	return ret;
 }
 
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 0267596..34de27e 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -21,5 +21,6 @@ void qrio_gpio_direction_input(u8 port_off, u8 gpio_nr);
 
 void qrio_prst(u8 bit, bool en, bool wden);
 void qrio_prstcfg(u8 bit, u8 mode);
+void qrio_set_leds(void);
 
 void pci_of_setup(void *blob, bd_t *bd);
diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
index 49f9aa2..11949f4 100644
--- a/board/keymile/kmp204x/qrio.c
+++ b/board/keymile/kmp204x/qrio.c
@@ -144,3 +144,17 @@ void qrio_prstcfg(u8 bit, u8 mode)
 
 	out_be32(qrio_base + PRSTCFG_OFF, prstcfg);
 }
+
+#define CTRLH_OFF		0x02
+#define CTRLH_WRL_BOOT		0x01
+#define CTRLH_WRL_UNITRUN	0x02
+
+void qrio_set_leds(void)
+{
+	u8 ctrlh;
+	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+	/* set UNIT LED to RED and BOOT LED to ON */
+	ctrlh = in_8(qrio_base + CTRLH_OFF);
+	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
+	out_8(qrio_base + CTRLH_OFF, ctrlh);
+}
-- 
1.8.0.1

[U-Boot] [PATCH 2/8] kmp204x: handle dip-switch for factory settings

[Valentin Longchamp]

From: Stefan Bigler <stefan.bigler@keymile.com>

Add readout of dip-switch to revert to factory settings.
If one or more dip-switch are set, launch bank 0 that contains the
bootloader to do the required action.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/kmp204x/kmp204x.c | 15 +++++++++++++++
 board/keymile/kmp204x/kmp204x.h |  1 +
 board/keymile/kmp204x/qrio.c    | 13 +++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 5fceedd..fba1bdd 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -116,6 +116,9 @@ int board_early_init_r(void)
 	/* enable the Unit LED (red) & Boot LED (on) */
 	qrio_set_leds();
 
+	/* enable Application Buffer */
+	qrio_enable_app_buffer();
+
 	return ret;
 }
 
@@ -171,6 +174,18 @@ int hush_init_var(void)
 #if defined(CONFIG_LAST_STAGE_INIT)
 int last_stage_init(void)
 {
+#if defined(CONFIG_KMCOGE4)
+	/* on KMCOGE4, the BFTIC4 is on the LBAPP2 */
+	struct bfticu_iomap *bftic4 =
+		(struct bfticu_iomap *)CONFIG_SYS_LBAPP2_BASE;
+	u8 dip_switch = in_8((u8 *)&(bftic4->mswitch)) & BFTICU_DIPSWITCH_MASK;
+
+	if (dip_switch != 0) {
+		/* start bootloader */
+		puts("DIP:   Enabled\n");
+		setenv("actual_bank", "0");
+	}
+#endif
 	set_km_env();
 	return 0;
 }
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 34de27e..720e225 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -22,5 +22,6 @@ void qrio_gpio_direction_input(u8 port_off, u8 gpio_nr);
 void qrio_prst(u8 bit, bool en, bool wden);
 void qrio_prstcfg(u8 bit, u8 mode);
 void qrio_set_leds(void);
+void qrio_enable_app_buffer(void);
 
 void pci_of_setup(void *blob, bd_t *bd);
diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
index 11949f4..c4f8dfd 100644
--- a/board/keymile/kmp204x/qrio.c
+++ b/board/keymile/kmp204x/qrio.c
@@ -158,3 +158,16 @@ void qrio_set_leds(void)
 	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
 	out_8(qrio_base + CTRLH_OFF, ctrlh);
 }
+
+#define CTRLL_OFF		0x03
+#define CTRLL_WRB_BUFENA	0x20
+
+void qrio_enable_app_buffer(void)
+{
+	u8 ctrll;
+	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+	/* enable application buffer */
+	ctrll = in_8(qrio_base + CTRLL_OFF);
+	ctrll |= (CTRLL_WRB_BUFENA);
+	out_8(qrio_base + CTRLL_OFF, ctrll);
+}
-- 
1.8.0.1

[U-Boot] [PATCH 3/8] kmp204x: selftest/factory test pin support

[Valentin Longchamp]

This patch defines the post_hotkeys_pressed() function that is used for:
- triggering POST memory regions test
- starting the test application through the checktestboot command in
  a script by setting the active bank to testbank

The post_hotkeys_pressed return the state of the SELFTEST pin.

The patch moves from the complete POST-memory test that is too long in
its SLOW version for our production HW test procedure to the much shorter
POST-memory-regions test.

Finally, the unused #defines for the not so relevant mtest command are
removed.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/kmp204x/kmp204x.c     | 13 +++++++++++++
 include/configs/km/kmp204x-common.h |  6 +-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index fba1bdd..1ce8429 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -250,3 +250,16 @@ void ft_board_setup(void *blob, bd_t *bd)
 	fdt_fixup_fman_mac_addresses(blob);
 #endif
 }
+
+#if defined(CONFIG_POST)
+
+/* DIC26_SELFTEST GPIO used to start factory test sw */
+#define SELFTEST_PORT	GPIO_A
+#define SELFTEST_PIN	31
+
+int post_hotkeys_pressed(void)
+{
+	qrio_gpio_direction_input(SELFTEST_PORT, SELFTEST_PIN);
+	return qrio_get_gpio(SELFTEST_PORT, SELFTEST_PIN);
+}
+#endif
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 582978a..913084f 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -85,11 +85,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_ADDR_MAP
 #define CONFIG_SYS_NUM_ADDR_MAP		64	/* number of TLB1 entries */
 
-#define CONFIG_POST CONFIG_SYS_POST_MEMORY	/* test POST memory test */
-#define CONFIG_SYS_MEMTEST_START	0x00100000	/* memtest works on */
-#define CONFIG_SYS_MEMTEST_END		0x00800000
-#define CONFIG_SYS_ALT_MEMTEST
-#define CONFIG_PANIC_HANG	/* do not reset board on panic */
+#define CONFIG_POST CONFIG_SYS_POST_MEM_REGIONS	/* POST memory regions test */
 
 /*
  *  Config the L3 Cache as L3 SRAM
-- 
1.8.0.1

[U-Boot] [PATCH 4/8] kmp204x: update the CONFIG_PRAM and CONFIG_KM_RESERVED_PRAM defines

[Valentin Longchamp]

This prevents u-boot from accessing into the reserved memory areas that
we have for /var and the logbooks.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 include/configs/km/kmp204x-common.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 913084f..c8af652 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -139,10 +139,12 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_KM_PNVRAM	0x80000
 /* physical RAM MTD size [hex] */
 #define CONFIG_KM_PHRAM		0x100000
-/* resereved pram area at the end of memroy [hex] */
-#define CONFIG_KM_RESERVED_PRAM	0x0
-/* enable protected RAM */
-#define CONFIG_PRAM		0
+/* reserved pram area at the end of memory [hex]
+ * u-boot reserves some memory for the MP boot page */
+#define CONFIG_KM_RESERVED_PRAM	0x1000
+/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
+ * is not valid yet, which is the case for when u-boot copies itself to RAM */
+#define CONFIG_PRAM		((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM)>>10)
 
 #define CONFIG_KM_CRAMFS_ADDR	0x2000000
 #define CONFIG_KM_KERNEL_ADDR	0x1000000	/* max kernel size 15.5Mbytes */
-- 
1.8.0.1

[U-Boot] [PATCH 5/8] kmp204x: complete the reset sequence and PRST configuration

[Valentin Longchamp]

This adds the reset support for the following devices that was until
then not implemented:
- BFTIC4
- QSFPs

This also fixes the configuration of the prst behaviour for the other
resets: Only the u-boot and kernel relevant subsystems are taken out of
reset (pcie, ZL30158, and front eth phy).

Most of the prst config move to misc_init_f(), except for the PCIe
related ones that are in pci_init_board and the bftic and ZL30158 ones
that should be done as soon as possible.

Only the behavior of the Hooper reset is changed according to the
documentation as the application is not able to not configure the switch
when it is not reset.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/kmp204x/kmp204x.c | 44 ++++++++++++++++++++++++++++++-----------
 board/keymile/kmp204x/kmp204x.h |  1 +
 board/keymile/kmp204x/pci.c     | 17 +++++++++-------
 board/keymile/kmp204x/qrio.c    |  2 +-
 4 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 1ce8429..6bc8eb8 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -79,7 +79,7 @@ int get_scl(void)
 
 
 #define ZL30158_RST	8
-#define ZL30343_RST	9
+#define BFTIC4_RST	0
 
 int board_early_init_f(void)
 {
@@ -88,13 +88,15 @@ int board_early_init_f(void)
 	/* board only uses the DDR_MCK0, so disable the DDR_MCK1/2/3 */
 	setbits_be32(&gur->ddrclkdr, 0x001f000f);
 
-	/* take the Zarlinks out of reset as soon as possible */
-	qrio_prst(ZL30158_RST, false, false);
-	qrio_prst(ZL30343_RST, false, false);
+	/* set the BFTIC's prstcfg to reset at power-up and unit reset only */
+	qrio_prstcfg(BFTIC4_RST, PRSTCFG_POWUP_UNIT_RST);
+	/* and enable WD on it */
+	qrio_wdmask(BFTIC4_RST, true);
 
-	/* and set their reset to power-up only */
-	qrio_prstcfg(ZL30158_RST, PRSTCFG_POWUP_RST);
-	qrio_prstcfg(ZL30343_RST, PRSTCFG_POWUP_RST);
+	/* set the ZL30138's prstcfg to reset at power-up and unit reset only */
+	qrio_prstcfg(ZL30158_RST, PRSTCFG_POWUP_UNIT_RST);
+	/* and take it out of reset as soon as possible (needed for Hooper) */
+	qrio_prst(ZL30158_RST, false, false);
 
 	return 0;
 }
@@ -127,16 +129,37 @@ unsigned long get_board_sys_clk(unsigned long dummy)
 	return 66666666;
 }
 
+#define ETH_FRONT_PHY_RST	15
+#define QSFP2_RST		11
+#define QSFP1_RST		10
+#define ZL30343_RST		9
+
 int misc_init_f(void)
 {
 	/* configure QRIO pis for i2c deblocking */
 	i2c_deblock_gpio_cfg();
 
+	/* configure the front phy's prstcfg and take it out of reset */
+	qrio_prstcfg(ETH_FRONT_PHY_RST, PRSTCFG_POWUP_UNIT_CORE_RST);
+	qrio_prst(ETH_FRONT_PHY_RST, false, false);
+
+	/* set the ZL30343 prstcfg to reset at power-up and unit reset only */
+	qrio_prstcfg(ZL30343_RST, PRSTCFG_POWUP_UNIT_RST);
+	/* and enable the WD on it */
+	qrio_wdmask(ZL30343_RST, true);
+
+	/* set the QSFPs' prstcfg to reset at power-up and unit rst only */
+	qrio_prstcfg(QSFP1_RST, PRSTCFG_POWUP_UNIT_RST);
+	qrio_prstcfg(QSFP2_RST, PRSTCFG_POWUP_UNIT_RST);
+
+	/* and enable the WD on them */
+	qrio_wdmask(QSFP1_RST, true);
+	qrio_wdmask(QSFP2_RST, true);
+
 	return 0;
 }
 
 #define NUM_SRDS_BANKS	2
-#define PHY_RST		15
 
 int misc_init_r(void)
 {
@@ -157,9 +180,6 @@ int misc_init_r(void)
 		}
 	}
 
-	/* take the mgmt eth phy out of reset */
-	qrio_prst(PHY_RST, false, false);
-
 	return 0;
 }
 
@@ -172,6 +192,7 @@ int hush_init_var(void)
 #endif
 
 #if defined(CONFIG_LAST_STAGE_INIT)
+
 int last_stage_init(void)
 {
 #if defined(CONFIG_KMCOGE4)
@@ -187,6 +208,7 @@ int last_stage_init(void)
 	}
 #endif
 	set_km_env();
+
 	return 0;
 }
 #endif
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 720e225..afede99 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -20,6 +20,7 @@ void qrio_gpio_direction_input(u8 port_off, u8 gpio_nr);
 #define PRSTCFG_POWUP_RST		0x3
 
 void qrio_prst(u8 bit, bool en, bool wden);
+void qrio_wdmask(u8 bit, bool wden);
 void qrio_prstcfg(u8 bit, u8 mode);
 void qrio_set_leds(void);
 void qrio_enable_app_buffer(void);
diff --git a/board/keymile/kmp204x/pci.c b/board/keymile/kmp204x/pci.c
index a484eb5..2b0b054 100644
--- a/board/keymile/kmp204x/pci.c
+++ b/board/keymile/kmp204x/pci.c
@@ -94,20 +94,23 @@ err_out:
 }
 
 #define PCIE_SW_RST	14
-#define PEXHC_SW_RST	13
-#define HOOPER_SW_RST	12
+#define PEXHC_RST	13
+#define HOOPER_RST	12
 
 void pci_init_board(void)
 {
-	/* first wait for the PCIe FPGA to be configured
+	qrio_prstcfg(PCIE_SW_RST, PRSTCFG_POWUP_UNIT_CORE_RST);
+	qrio_prstcfg(PEXHC_RST, PRSTCFG_POWUP_UNIT_CORE_RST);
+	qrio_prstcfg(HOOPER_RST, PRSTCFG_POWUP_UNIT_CORE_RST);
+
+	/* wait for the PCIe FPGA to be configured
 	 * it has been triggered earlier in board_early_init_r */
-	int ret = wait_for_fpga_config();
-	if (ret)
+	if (wait_for_fpga_config())
 		printf("error finishing PCIe FPGA config\n");
 
 	qrio_prst(PCIE_SW_RST, false, false);
-	qrio_prst(PEXHC_SW_RST, false, false);
-	qrio_prst(HOOPER_SW_RST, false, false);
+	qrio_prst(PEXHC_RST, false, false);
+	qrio_prst(HOOPER_RST, false, false);
 	/* Hooper is not direcly PCIe capable */
 	mdelay(50);
 
diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
index c4f8dfd..44fa49d 100644
--- a/board/keymile/kmp204x/qrio.c
+++ b/board/keymile/kmp204x/qrio.c
@@ -91,7 +91,7 @@ void qrio_set_opendrain_gpio(u8 port_off, u8 gpio_nr, u8 val)
 
 #define WDMASK_OFF	0x16
 
-static void qrio_wdmask(u8 bit, bool wden)
+void qrio_wdmask(u8 bit, bool wden)
 {
 	u16 wdmask;
 	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
-- 
1.8.0.1

[U-Boot] [PATCH 6/8] kmp204x: update the RCW

[Valentin Longchamp]

Fix the IRQ/GPIO settings: all the muxed GPIO/external IRQs that are
used as internal interrupts are defined as GPIOs to avoid confusion
between the internal/external interrupts.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/kmp204x/rcw_kmp204x.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/keymile/kmp204x/rcw_kmp204x.cfg b/board/keymile/kmp204x/rcw_kmp204x.cfg
index 2d4c48c..236d513 100644
--- a/board/keymile/kmp204x/rcw_kmp204x.cfg
+++ b/board/keymile/kmp204x/rcw_kmp204x.cfg
@@ -7,5 +7,5 @@ aa55aa55 010e0100
 #64 bytes RCW data
 14600000 00000000 28200000 00000000
 148E70CF CFC02000 58000000 41000000
-00000000 00000000 00000000 F0428002
+00000000 00000000 00000000 F0428816
 00000000 00000000 00000000 00000000
-- 
1.8.0.1

[U-Boot] [PATCH 7/8] kmp204x: add workaround for A-004849

[Valentin Longchamp]

This should prevent the problems that the CCF can deadlock with certain
traffic patterns.

This also fixes the workaround for A-006559 that was not correctly
implemented before.

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 board/keymile/kmp204x/pbi.cfg | 43 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)

diff --git a/board/keymile/kmp204x/pbi.cfg b/board/keymile/kmp204x/pbi.cfg
index 9af8bd5..1e0a171 100644
--- a/board/keymile/kmp204x/pbi.cfg
+++ b/board/keymile/kmp204x/pbi.cfg
@@ -8,16 +8,47 @@
 #
 
 #PBI commands
-#Workaround for A-006559 needed for rev 2.0 of P2041 silicon
-#Freescale's errarta sheet suggests it may be done with PBI
+#Configure ALTCBAR for DCSR -> DCSR at 89000000
+091380c0 000009C4
 09000010 00000000
+091380c0 000009C4
 09000014 00000000
+091380c0 000009C4
 09000018 81d00000
-09021008 0000f000
-09021028 0000f000
-09021048 0000f000
-09021068 0000f000
+#Workaround for A-004849
+091380c0 000009C4
+890B0050 00000002
+091380c0 000009C4
+890B0054 00000002
+091380c0 000009C4
+890B0058 00000002
+091380c0 000009C4
+890B005C 00000002
+091380c0 000009C4
+890B0090 00000002
+091380c0 000009C4
+890B0094 00000002
+091380c0 000009C4
+890B0098 00000002
+091380c0 000009C4
+890B009C 00000002
+091380c0 000009C4
+890B0108 00000012
+091380c0 000009C4
+#Workaround for A-006559 needed for rev 2.0 of P2041 silicon
+89021008 0000f000
+091380c0 000009C4
+89021028 0000f000
+091380c0 000009C4
+89021048 0000f000
+091380c0 000009C4
+89021068 0000f000
+091380c0 000009C4
+#Flush PBL data
+09138000 00000000
+#Disable ALTCBAR
 09000018 00000000
+091380c0 000009C4
 #Initialize CPC1 as 1MB SRAM
 09010000 00200400
 09138000 00000000
-- 
1.8.0.1

[U-Boot] [PATCH 8/8] kmp204x: enable the errata command

[Valentin Longchamp]

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
---

 include/configs/km/kmp204x-common.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index c8af652..46e5e9f 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -381,6 +381,7 @@ int get_scl(void);
  */
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_NET
+#define CONFIG_CMD_ERRATA
 
 /* we don't need flash support */
 #define CONFIG_SYS_NO_FLASH
-- 
1.8.0.1

[U-Boot] [PATCH 1/8] kmp204x: Add support for the unit LEDs

[York Sun]

On 04/30/2014 06:01 AM, Valentin Longchamp wrote:
> From: Stefan Bigler <stefan.bigler@keymile.com>

<snip>

> diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
> index 49f9aa2..11949f4 100644
> --- a/board/keymile/kmp204x/qrio.c
> +++ b/board/keymile/kmp204x/qrio.c
> @@ -144,3 +144,17 @@ void qrio_prstcfg(u8 bit, u8 mode)
>  
>  	out_be32(qrio_base + PRSTCFG_OFF, prstcfg);
>  }
> +
> +#define CTRLH_OFF		0x02
> +#define CTRLH_WRL_BOOT		0x01
> +#define CTRLH_WRL_UNITRUN	0x02
> +
> +void qrio_set_leds(void)
> +{
> +	u8 ctrlh;
> +	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;

Please insert a blank line here.

> +	/* set UNIT LED to RED and BOOT LED to ON */
> +	ctrlh = in_8(qrio_base + CTRLH_OFF);
> +	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
> +	out_8(qrio_base + CTRLH_OFF, ctrlh);
> +}
> 

[U-Boot] [PATCH 2/8] kmp204x: handle dip-switch for factory settings

[York Sun]

On 04/30/2014 06:01 AM, Valentin Longchamp wrote:
> From: Stefan Bigler <stefan.bigler@keymile.com>

<snip>

> diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
> index 11949f4..c4f8dfd 100644
> --- a/board/keymile/kmp204x/qrio.c
> +++ b/board/keymile/kmp204x/qrio.c
> @@ -158,3 +158,16 @@ void qrio_set_leds(void)
>  	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
>  	out_8(qrio_base + CTRLH_OFF, ctrlh);
>  }
> +
> +#define CTRLL_OFF		0x03
> +#define CTRLL_WRB_BUFENA	0x20
> +
> +void qrio_enable_app_buffer(void)
> +{
> +	u8 ctrll;
> +	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;

You need a blank line here.

> +	/* enable application buffer */
> +	ctrll = in_8(qrio_base + CTRLL_OFF);
> +	ctrll |= (CTRLL_WRB_BUFENA);
> +	out_8(qrio_base + CTRLL_OFF, ctrll);
> +}
> 

[U-Boot] [PATCH 1/8] kmp204x: Add support for the unit LEDs

[Valentin Longchamp]

Hi York,

On 04/30/2014 07:04 PM, York Sun wrote:
> On 04/30/2014 06:01 AM, Valentin Longchamp wrote:
>> From: Stefan Bigler <stefan.bigler@keymile.com>
> 
> <snip>
> 
>> diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
>> index 49f9aa2..11949f4 100644
>> --- a/board/keymile/kmp204x/qrio.c
>> +++ b/board/keymile/kmp204x/qrio.c
>> @@ -144,3 +144,17 @@ void qrio_prstcfg(u8 bit, u8 mode)
>>  
>>  	out_be32(qrio_base + PRSTCFG_OFF, prstcfg);
>>  }
>> +
>> +#define CTRLH_OFF		0x02
>> +#define CTRLH_WRL_BOOT		0x01
>> +#define CTRLH_WRL_UNITRUN	0x02
>> +
>> +void qrio_set_leds(void)
>> +{
>> +	u8 ctrlh;
>> +	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
> 
> Please insert a blank line here.

OK, that's correct. Do you want me to resend the whole series or are the first 2
patches with the additional blank line OK ?

> 
>> +	/* set UNIT LED to RED and BOOT LED to ON */
>> +	ctrlh = in_8(qrio_base + CTRLH_OFF);
>> +	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
>> +	out_8(qrio_base + CTRLH_OFF, ctrlh);
>> +}
>>

[U-Boot] [PATCH 1/8] kmp204x: Add support for the unit LEDs

[York Sun]

On 05/01/2014 07:00 AM, Valentin Longchamp wrote:
> Hi York,
> 
> On 04/30/2014 07:04 PM, York Sun wrote:
>> On 04/30/2014 06:01 AM, Valentin Longchamp wrote:
>>> From: Stefan Bigler <stefan.bigler@keymile.com>
>>
>> <snip>
>>
>>> diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
>>> index 49f9aa2..11949f4 100644
>>> --- a/board/keymile/kmp204x/qrio.c
>>> +++ b/board/keymile/kmp204x/qrio.c
>>> @@ -144,3 +144,17 @@ void qrio_prstcfg(u8 bit, u8 mode)
>>>  
>>>  	out_be32(qrio_base + PRSTCFG_OFF, prstcfg);
>>>  }
>>> +
>>> +#define CTRLH_OFF		0x02
>>> +#define CTRLH_WRL_BOOT		0x01
>>> +#define CTRLH_WRL_UNITRUN	0x02
>>> +
>>> +void qrio_set_leds(void)
>>> +{
>>> +	u8 ctrlh;
>>> +	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
>>
>> Please insert a blank line here.
> 
> OK, that's correct. Do you want me to resend the whole series or are the first 2
> patches with the additional blank line OK ?
> 

For a simple change like this, you can do either way. Make sure to change the
subject prefix so it doesn't confuse me or anyone.

York

[U-Boot] [PATCH v2 1/8] kmp204x: Add support for the unit LEDs

[Valentin Longchamp]

From: Stefan Bigler <stefan.bigler@keymile.com>

The unit LEDs are managed by the QRIO CPLD. This patch adds support for
accessing these LEDs in the QRIO.

The LEDs then are set to a correct boot state:
- UNIT-LED is red
- BOOT-LED is on.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>

---

Changes in v2:
- Insert blank line after variables declaration in qrio_set_leds()

 board/keymile/kmp204x/kmp204x.c |  3 +++
 board/keymile/kmp204x/kmp204x.h |  1 +
 board/keymile/kmp204x/qrio.c    | 15 +++++++++++++++
 3 files changed, 19 insertions(+)

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 95a19cd..5fceedd 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -113,6 +113,9 @@ int board_early_init_r(void)
 	if (ret)
 		printf("error triggering PCIe FPGA config\n");
 
+	/* enable the Unit LED (red) & Boot LED (on) */
+	qrio_set_leds();
+
 	return ret;
 }
 
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 0267596..34de27e 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -21,5 +21,6 @@ void qrio_gpio_direction_input(u8 port_off, u8 gpio_nr);
 
 void qrio_prst(u8 bit, bool en, bool wden);
 void qrio_prstcfg(u8 bit, u8 mode);
+void qrio_set_leds(void);
 
 void pci_of_setup(void *blob, bd_t *bd);
diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
index 49f9aa2..86df2c7 100644
--- a/board/keymile/kmp204x/qrio.c
+++ b/board/keymile/kmp204x/qrio.c
@@ -144,3 +144,18 @@ void qrio_prstcfg(u8 bit, u8 mode)
 
 	out_be32(qrio_base + PRSTCFG_OFF, prstcfg);
 }
+
+#define CTRLH_OFF		0x02
+#define CTRLH_WRL_BOOT		0x01
+#define CTRLH_WRL_UNITRUN	0x02
+
+void qrio_set_leds(void)
+{
+	u8 ctrlh;
+	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+
+	/* set UNIT LED to RED and BOOT LED to ON */
+	ctrlh = in_8(qrio_base + CTRLH_OFF);
+	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
+	out_8(qrio_base + CTRLH_OFF, ctrlh);
+}
-- 
1.8.0.1

[U-Boot] [PATCH v2 2/8] kmp204x: handle dip-switch for factory settings

[Valentin Longchamp]

From: Stefan Bigler <stefan.bigler@keymile.com>

Add readout of dip-switch to revert to factory settings.
If one or more dip-switch are set, launch bank 0 that contains the
bootloader to do the required action.

Signed-off-by: Stefan Bigler <stefan.bigler@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>

---

Changes in v2:
- Insert blank line after variables declaration in
  qrio_enable_app_buffer()

 board/keymile/kmp204x/kmp204x.c | 15 +++++++++++++++
 board/keymile/kmp204x/kmp204x.h |  1 +
 board/keymile/kmp204x/qrio.c    | 14 ++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/board/keymile/kmp204x/kmp204x.c b/board/keymile/kmp204x/kmp204x.c
index 5fceedd..fba1bdd 100644
--- a/board/keymile/kmp204x/kmp204x.c
+++ b/board/keymile/kmp204x/kmp204x.c
@@ -116,6 +116,9 @@ int board_early_init_r(void)
 	/* enable the Unit LED (red) & Boot LED (on) */
 	qrio_set_leds();
 
+	/* enable Application Buffer */
+	qrio_enable_app_buffer();
+
 	return ret;
 }
 
@@ -171,6 +174,18 @@ int hush_init_var(void)
 #if defined(CONFIG_LAST_STAGE_INIT)
 int last_stage_init(void)
 {
+#if defined(CONFIG_KMCOGE4)
+	/* on KMCOGE4, the BFTIC4 is on the LBAPP2 */
+	struct bfticu_iomap *bftic4 =
+		(struct bfticu_iomap *)CONFIG_SYS_LBAPP2_BASE;
+	u8 dip_switch = in_8((u8 *)&(bftic4->mswitch)) & BFTICU_DIPSWITCH_MASK;
+
+	if (dip_switch != 0) {
+		/* start bootloader */
+		puts("DIP:   Enabled\n");
+		setenv("actual_bank", "0");
+	}
+#endif
 	set_km_env();
 	return 0;
 }
diff --git a/board/keymile/kmp204x/kmp204x.h b/board/keymile/kmp204x/kmp204x.h
index 34de27e..720e225 100644
--- a/board/keymile/kmp204x/kmp204x.h
+++ b/board/keymile/kmp204x/kmp204x.h
@@ -22,5 +22,6 @@ void qrio_gpio_direction_input(u8 port_off, u8 gpio_nr);
 void qrio_prst(u8 bit, bool en, bool wden);
 void qrio_prstcfg(u8 bit, u8 mode);
 void qrio_set_leds(void);
+void qrio_enable_app_buffer(void);
 
 void pci_of_setup(void *blob, bd_t *bd);
diff --git a/board/keymile/kmp204x/qrio.c b/board/keymile/kmp204x/qrio.c
index 86df2c7..08d5ca4 100644
--- a/board/keymile/kmp204x/qrio.c
+++ b/board/keymile/kmp204x/qrio.c
@@ -159,3 +159,17 @@ void qrio_set_leds(void)
 	ctrlh |= (CTRLH_WRL_BOOT | CTRLH_WRL_UNITRUN);
 	out_8(qrio_base + CTRLH_OFF, ctrlh);
 }
+
+#define CTRLL_OFF		0x03
+#define CTRLL_WRB_BUFENA	0x20
+
+void qrio_enable_app_buffer(void)
+{
+	u8 ctrll;
+	void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE;
+
+	/* enable application buffer */
+	ctrll = in_8(qrio_base + CTRLL_OFF);
+	ctrll |= (CTRLL_WRB_BUFENA);
+	out_8(qrio_base + CTRLL_OFF, ctrll);
+}
-- 
1.8.0.1

[U-Boot] [PATCH 0/8] kmp204x patches for 2014.07

[York Sun]

On 04/30/2014 08:01 AM, Valentin Longchamp wrote:
> Things have stabilized quite a lot on the u-boot front for the Keymile
> kmp204x/kmcoge4 board. There are a few remaining patches that should get
> merged to have a complete support of the architecture/board in u-boot.
> These include:
>  - support for some additional functions of the QRIO board reset/control
>    CPLD (LEDs, Factory Test signal)
>  - better reset sequence according to the tests/problems noticed during
>    the development
>  - an update to the RCW (some external interrupts are unused and set as
>    GPIOs now)
>  - an additionnal workaround in the PBL file (with an implementation
>    enhancement for a previous one).
> 
> 
> Stefan Bigler (2):
>   kmp204x: Add support for the unit LEDs
>   kmp204x: handle dip-switch for factory settings
> 
> Valentin Longchamp (6):
>   kmp204x: selftest/factory test pin support
>   kmp204x: update the CONFIG_PRAM and CONFIG_KM_RESERVED_PRAM defines
>   kmp204x: complete the reset sequence and PRST configuration
>   kmp204x: update the RCW
>   kmp204x: add workaround for A-004849
>   kmp204x: enable the errata command
> 
>  board/keymile/kmp204x/kmp204x.c       | 75 ++++++++++++++++++++++++++++++-----
>  board/keymile/kmp204x/kmp204x.h       |  3 ++
>  board/keymile/kmp204x/pbi.cfg         | 43 +++++++++++++++++---
>  board/keymile/kmp204x/pci.c           | 17 ++++----
>  board/keymile/kmp204x/qrio.c          | 29 +++++++++++++-
>  board/keymile/kmp204x/rcw_kmp204x.cfg |  2 +-
>  include/configs/km/kmp204x-common.h   | 17 ++++----
>  7 files changed, 151 insertions(+), 35 deletions(-)
> 

Applied to u-boot-mpc85xx/master.

Thanks,

York