* [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot
@ 2019-09-27 8:02 Lokesh Vutla
2019-09-27 8:02 ` [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO Lokesh Vutla
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Lokesh Vutla @ 2019-09-27 8:02 UTC (permalink / raw)
To: u-boot
This series adds support for printing CPU name and board name for all
k3 devices. Also a misc update for getting tisci handle
Changes since v1:
- Dropped unused headers
- Dropped using array names for Soc and revision
Lokesh Vutla (5):
arm: k3: Add support for printing CPUINFO
board: am65x: Print board name and version during boot
configs: j721e_evm_a72: Enable DISPLAY_CPUINFO
configs: am65x_evm_a53: Enable DISPLAY_CPUINFO
arm: k3: Use driver_name to get ti_sci handle
arch/arm/mach-k3/common.c | 45 +++++++++++++++++++++++-
arch/arm/mach-k3/common.h | 6 ++++
arch/arm/mach-k3/include/mach/hardware.h | 18 ++++++++++
board/ti/am65x/evm.c | 15 +++++++-
configs/am65x_evm_a53_defconfig | 1 -
configs/am65x_hs_evm_a53_defconfig | 1 -
configs/j721e_evm_a72_defconfig | 1 -
7 files changed, 82 insertions(+), 5 deletions(-)
--
2.23.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO
2019-09-27 8:02 [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot Lokesh Vutla
@ 2019-09-27 8:02 ` Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 2/5] board: am65x: Print board name and version during boot Lokesh Vutla
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Lokesh Vutla @ 2019-09-27 8:02 UTC (permalink / raw)
To: u-boot
Add support for printing CPU info for all K3 devices.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
arch/arm/mach-k3/common.c | 42 ++++++++++++++++++++++++
arch/arm/mach-k3/common.h | 6 ++++
arch/arm/mach-k3/include/mach/hardware.h | 18 ++++++++++
3 files changed, 66 insertions(+)
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 3e36d90ace..2b6c7d237e 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -14,6 +14,8 @@
#include <linux/soc/ti/ti_sci_protocol.h>
#include <fdt_support.h>
#include <asm/arch/sys_proto.h>
+#include <asm/hardware.h>
+#include <asm/io.h>
struct ti_sci_handle *get_ti_sci_handle(void)
{
@@ -144,3 +146,43 @@ void reset_cpu(ulong ignored)
{
}
#endif
+
+#if defined(CONFIG_DISPLAY_CPUINFO)
+int print_cpuinfo(void)
+{
+ u32 soc, rev;
+ char *name;
+
+ soc = (readl(CTRLMMR_WKUP_JTAG_DEVICE_ID) &
+ DEVICE_ID_FAMILY_MASK) >> DEVICE_ID_FAMILY_SHIFT;
+ rev = (readl(CTRLMMR_WKUP_JTAG_ID) &
+ JTAG_ID_VARIANT_MASK) >> JTAG_ID_VARIANT_SHIFT;
+
+ printf("SoC: ");
+ switch (soc) {
+ case AM654:
+ name = "AM654";
+ break;
+ case J721E:
+ name = "J721E";
+ break;
+ default:
+ name = "Unknown Silicon";
+ };
+
+ printf("%s PG ", name);
+ switch (rev) {
+ case REV_PG1_0:
+ name = "1.0";
+ break;
+ case REV_PG2_0:
+ name = "2.0";
+ break;
+ default:
+ name = "Unknown Revision";
+ };
+ printf("%s\n", name);
+
+ return 0;
+}
+#endif
diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
index ac7e80d9af..1db253c8c6 100644
--- a/arch/arm/mach-k3/common.h
+++ b/arch/arm/mach-k3/common.h
@@ -8,4 +8,10 @@
#include <asm/armv7_mpu.h>
+#define AM654 2
+#define J721E 4
+
+#define REV_PG1_0 0
+#define REV_PG2_0 1
+
void setup_k3_mpu_regions(void);
diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h
index 4e629822aa..d670d5a56e 100644
--- a/arch/arm/mach-k3/include/mach/hardware.h
+++ b/arch/arm/mach-k3/include/mach/hardware.h
@@ -13,4 +13,22 @@
#ifdef CONFIG_SOC_K3_J721E
#include "j721e_hardware.h"
#endif
+
+/* Assuming these addresses and definitions stay common across K3 devices */
+#define CTRLMMR_WKUP_JTAG_DEVICE_ID 0x43000018
+#define DEVICE_ID_FAMILY_SHIFT 26
+#define DEVICE_ID_FAMILY_MASK (0x3f << 26)
+#define DEVICE_ID_BASE_SHIFT 11
+#define DEVICE_ID_BASE_MASK (0x1fff << 11)
+#define DEVICE_ID_SPEED_SHIFT 6
+#define DEVICE_ID_SPEED_MASK (0x1f << 6)
+#define DEVICE_ID_TEMP_SHIFT 3
+#define DEVICE_ID_TEMP_MASK (0x7 << 3)
+
+#define CTRLMMR_WKUP_JTAG_ID 0x43000014
+#define JTAG_ID_VARIANT_SHIFT 28
+#define JTAG_ID_VARIANT_MASK (0xf << 28)
+#define JTAG_ID_PARTNO_SHIFT 12
+#define JTAG_ID_PARTNO_MASK (0x7ff << 1)
+
#endif /* _ASM_ARCH_HARDWARE_H_ */
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 2/5] board: am65x: Print board name and version during boot
2019-09-27 8:02 [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot Lokesh Vutla
2019-09-27 8:02 ` [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO Lokesh Vutla
@ 2019-09-27 8:02 ` Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 3/5] configs: j721e_evm_a72: Enable DISPLAY_CPUINFO Lokesh Vutla
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Lokesh Vutla @ 2019-09-27 8:02 UTC (permalink / raw)
To: u-boot
Print the board name and ver along with the DT Model.
While at it print the ver for all the detected daughter cards.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
board/ti/am65x/evm.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index e01adcd642..85a2b261e7 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -116,6 +116,19 @@ int do_board_detect(void)
return ret;
}
+int checkboard(void)
+{
+ struct ti_am6_eeprom *ep = TI_AM6_EEPROM_DATA;
+
+ if (do_board_detect())
+ /* EEPROM not populated */
+ printf("Board: %s rev %s\n", "AM6-COMPROCEVM", "E3");
+ else
+ printf("Board: %s rev %s\n", ep->name, ep->version);
+
+ return 0;
+}
+
static void setup_board_eeprom_env(void)
{
char *name = "am65x";
@@ -261,7 +274,7 @@ static int probe_daughtercards(void)
if (strncmp(ep.name, cards[i].card_name, sizeof(ep.name)))
continue;
- printf("detected %s\n", cards[i].card_name);
+ printf("Detected: %s rev %s\n", ep.name, ep.version);
/*
* Populate any MAC addresses from daughtercard into the U-Boot
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 3/5] configs: j721e_evm_a72: Enable DISPLAY_CPUINFO
2019-09-27 8:02 [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot Lokesh Vutla
2019-09-27 8:02 ` [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO Lokesh Vutla
2019-09-27 8:02 ` [U-Boot] [PATCH v2 2/5] board: am65x: Print board name and version during boot Lokesh Vutla
@ 2019-09-27 8:02 ` Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 4/5] configs: am65x_evm_a53: " Lokesh Vutla
2019-09-27 8:02 ` [U-Boot] [PATCH v2 5/5] arm: k3: Use driver_name to get ti_sci handle Lokesh Vutla
4 siblings, 1 reply; 11+ messages in thread
From: Lokesh Vutla @ 2019-09-27 8:02 UTC (permalink / raw)
To: u-boot
Enable CONFIG_DISPLAY_CPUINFO so that cpuinfo is printed during boot.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
configs/j721e_evm_a72_defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/configs/j721e_evm_a72_defconfig b/configs/j721e_evm_a72_defconfig
index 46667da36e..cc8f99d21d 100644
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@ -20,7 +20,6 @@ CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
CONFIG_SPL_LOAD_FIT=y
CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
-# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 4/5] configs: am65x_evm_a53: Enable DISPLAY_CPUINFO
2019-09-27 8:02 [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot Lokesh Vutla
` (2 preceding siblings ...)
2019-09-27 8:02 ` [U-Boot] [PATCH v2 3/5] configs: j721e_evm_a72: Enable DISPLAY_CPUINFO Lokesh Vutla
@ 2019-09-27 8:02 ` Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 5/5] arm: k3: Use driver_name to get ti_sci handle Lokesh Vutla
4 siblings, 1 reply; 11+ messages in thread
From: Lokesh Vutla @ 2019-09-27 8:02 UTC (permalink / raw)
To: u-boot
Enable CONFIG_DISPLAY_CPUINFO so that cpuinfo is printed during boot.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
configs/am65x_evm_a53_defconfig | 1 -
configs/am65x_hs_evm_a53_defconfig | 1 -
2 files changed, 2 deletions(-)
diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index 17065a3813..cb7140a574 100644
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -19,7 +19,6 @@ CONFIG_DISTRO_DEFAULTS=y
CONFIG_SPL_LOAD_FIT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
-# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
index e9fceea58c..caee953426 100644
--- a/configs/am65x_hs_evm_a53_defconfig
+++ b/configs/am65x_hs_evm_a53_defconfig
@@ -21,7 +21,6 @@ CONFIG_SPL_LOAD_FIT=y
CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_fit_${boot}; run get_overlaystring; run run_fit"
-# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y
CONFIG_SPL_STACK_R=y
CONFIG_SPL_SEPARATE_BSS=y
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 5/5] arm: k3: Use driver_name to get ti_sci handle
2019-09-27 8:02 [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot Lokesh Vutla
` (3 preceding siblings ...)
2019-09-27 8:02 ` [U-Boot] [PATCH v2 4/5] configs: am65x_evm_a53: " Lokesh Vutla
@ 2019-09-27 8:02 ` Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
4 siblings, 1 reply; 11+ messages in thread
From: Lokesh Vutla @ 2019-09-27 8:02 UTC (permalink / raw)
To: u-boot
Use the driver name to get ti_sci handle rather than relying
on just the FIRMWARE uclass.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
arch/arm/mach-k3/common.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 2b6c7d237e..374e889210 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -22,7 +22,8 @@ struct ti_sci_handle *get_ti_sci_handle(void)
struct udevice *dev;
int ret;
- ret = uclass_get_device(UCLASS_FIRMWARE, 0, &dev);
+ ret = uclass_get_device_by_driver(UCLASS_FIRMWARE,
+ DM_GET_DRIVER(ti_sci), &dev);
if (ret)
panic("Failed to get SYSFW (%d)\n", ret);
--
2.23.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO
2019-09-27 8:02 ` [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO Lokesh Vutla
@ 2019-10-12 20:27 ` Tom Rini
0 siblings, 0 replies; 11+ messages in thread
From: Tom Rini @ 2019-10-12 20:27 UTC (permalink / raw)
To: u-boot
On Fri, Sep 27, 2019 at 01:32:11PM +0530, Lokesh Vutla wrote:
> Add support for printing CPU info for all K3 devices.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/17d656b4/attachment.sig>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 2/5] board: am65x: Print board name and version during boot
2019-09-27 8:02 ` [U-Boot] [PATCH v2 2/5] board: am65x: Print board name and version during boot Lokesh Vutla
@ 2019-10-12 20:27 ` Tom Rini
0 siblings, 0 replies; 11+ messages in thread
From: Tom Rini @ 2019-10-12 20:27 UTC (permalink / raw)
To: u-boot
On Fri, Sep 27, 2019 at 01:32:12PM +0530, Lokesh Vutla wrote:
> Print the board name and ver along with the DT Model.
> While at it print the ver for all the detected daughter cards.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/74fb1d87/attachment.sig>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 3/5] configs: j721e_evm_a72: Enable DISPLAY_CPUINFO
2019-09-27 8:02 ` [U-Boot] [PATCH v2 3/5] configs: j721e_evm_a72: Enable DISPLAY_CPUINFO Lokesh Vutla
@ 2019-10-12 20:27 ` Tom Rini
0 siblings, 0 replies; 11+ messages in thread
From: Tom Rini @ 2019-10-12 20:27 UTC (permalink / raw)
To: u-boot
On Fri, Sep 27, 2019 at 01:32:13PM +0530, Lokesh Vutla wrote:
> Enable CONFIG_DISPLAY_CPUINFO so that cpuinfo is printed during boot.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/b09c337c/attachment.sig>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 4/5] configs: am65x_evm_a53: Enable DISPLAY_CPUINFO
2019-09-27 8:02 ` [U-Boot] [PATCH v2 4/5] configs: am65x_evm_a53: " Lokesh Vutla
@ 2019-10-12 20:27 ` Tom Rini
0 siblings, 0 replies; 11+ messages in thread
From: Tom Rini @ 2019-10-12 20:27 UTC (permalink / raw)
To: u-boot
On Fri, Sep 27, 2019 at 01:32:14PM +0530, Lokesh Vutla wrote:
> Enable CONFIG_DISPLAY_CPUINFO so that cpuinfo is printed during boot.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/5269996d/attachment.sig>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [U-Boot] [PATCH v2 5/5] arm: k3: Use driver_name to get ti_sci handle
2019-09-27 8:02 ` [U-Boot] [PATCH v2 5/5] arm: k3: Use driver_name to get ti_sci handle Lokesh Vutla
@ 2019-10-12 20:27 ` Tom Rini
0 siblings, 0 replies; 11+ messages in thread
From: Tom Rini @ 2019-10-12 20:27 UTC (permalink / raw)
To: u-boot
On Fri, Sep 27, 2019 at 01:32:15PM +0530, Lokesh Vutla wrote:
> Use the driver name to get ti_sci handle rather than relying
> on just the FIRMWARE uclass.
>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191012/5cad6b70/attachment.sig>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-10-12 20:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-27 8:02 [U-Boot] [PATCH v2 0/5] arm: k3: Print cpu and board names during boot Lokesh Vutla
2019-09-27 8:02 ` [U-Boot] [PATCH v2 1/5] arm: k3: Add support for printing CPUINFO Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 2/5] board: am65x: Print board name and version during boot Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 3/5] configs: j721e_evm_a72: Enable DISPLAY_CPUINFO Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 4/5] configs: am65x_evm_a53: " Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
2019-09-27 8:02 ` [U-Boot] [PATCH v2 5/5] arm: k3: Use driver_name to get ti_sci handle Lokesh Vutla
2019-10-12 20:27 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.