Introduce UCLASS_SOC
Subsystems (2)
cover Introduce UCLASS_SOC
Hi,
This patch series introduces UCLASS_SOC to be used for SOC identification and attribute matching based on SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data. This is intended to be a counterpart to the soc-device framework in the Linux kernel.
I started with attempts to extend either UCLASS_CPU and UCLASS_BOARD to provide equivalent functionality, but UCLASS_CPU is focused specifically on processing units, of which multiples can exist heterogeneously in a system, and UCLASS_BOARD is focused on indentifying things connected to an SoC dynamically. Rather than try to force this into the existing UCLASS's, a new UCLASS seemed appropriate to provide same services as the soc-device functionality in the kernel.
This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant or revision in use.
Additionally, this introduces a user of UCLASS_SOC, soc_ti_k3, which provides SoC identifying information for K3 SoCs which can be used directly, for print_cpuinfo, and for selecting SoC specific data using soc_device_match.
Regards,
Dave
Dave Gerlach (8):
dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
test: Add tests for SOC uclass
dm: soc: Introduce soc_ti_k3 driver for TI K3 SoCs
arm: dts: k3-am65-wakeup: Introduce chipid node
arm: dts: k3-j721e-mcu-wakeup: Introduce chipid node
configs: am65x_evm: Enable CONFIG_SOC_DEVICE and
CONFIG_SOC_DEVICE_TI_K3
configs: j721e_evm: Enable CONFIG_SOC_DEVICE and
CONFIG_SOC_DEVICE_TI_K3
arm: mach-k3: Use SOC driver for device identification
arch/arm/dts/k3-am65-wakeup.dtsi | 5 + arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 4 + .../k3-j721e-common-proc-board-u-boot.dtsi | 4 + arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 5 + arch/arm/mach-k3/common.c | 48 +++---- arch/arm/mach-k3/include/mach/hardware.h | 1 - arch/sandbox/dts/test.dts | 4 + configs/am65x_evm_a53_defconfig | 2 + configs/am65x_evm_r5_defconfig | 2 + configs/am65x_hs_evm_a53_defconfig | 2 + configs/am65x_hs_evm_r5_defconfig | 2 + configs/j721e_evm_a72_defconfig | 2 + configs/j721e_evm_r5_defconfig | 2 + configs/j721e_hs_evm_a72_defconfig | 2 + configs/j721e_hs_evm_r5_defconfig | 2 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + drivers/soc/Kconfig | 16 +++ drivers/soc/Makefile | 3 + drivers/soc/soc-uclass.c | 102 ++++++++++++++ drivers/soc/soc_sandbox.c | 56 ++++++++ drivers/soc/soc_ti_k3.c | 124 ++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 ++++++++++++++++++ test/dm/Makefile | 1 + test/dm/soc.c | 120 ++++++++++++++++ 28 files changed, 616 insertions(+), 30 deletions(-) create mode 100644 drivers/soc/soc-uclass.c create mode 100644 drivers/soc/soc_sandbox.c create mode 100644 drivers/soc/soc_ti_k3.c create mode 100644 include/soc.h create mode 100644 test/dm/soc.c
Signature · 1 line
2.20.1
PATCH 1/8 dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
Introduce UCLASS_SOC to be used for SOC identification and attribute matching based on the SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data.
This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant in use.
--- drivers/soc/Kconfig | 9 +++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 102 ++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 drivers/soc/soc-uclass.c create mode 100644 include/soc.h
drivers/soc/Kconfig +9 -0
@@ -1,5 +1,14 @@ menu "SOC (System On Chip) specific Drivers" +config SOC_DEVICE + bool "Enable SoC Device ID drivers using Driver Model" + help + This allows drivers to be provided for SoCs to help in identifying + the SoC in use and matching SoC attributes for selecting SoC + specific data. This is useful for other device drivers that may + need different parameters or quirks enabled depending on the + specific device variant in use. + source "drivers/soc/ti/Kconfig" endmenu
drivers/soc/Makefile +1 -0
@@ -3,3 +3,4 @@ # Makefile for the U-Boot SOC specific device drivers. obj-$(CONFIG_SOC_TI) += ti/ +obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o
drivers/soc/soc-uclass.c new file +102 -0
102 lines not on this page · raw message
include/dm/uclass-id.h +1 -0
@@ -97,6 +97,7 @@ enum uclass_id {UCLASS_SERIAL ,/* Serial UART */ UCLASS_SIMPLE_BUS ,/* Bus with child devices */ UCLASS_SMEM ,/* Shared memory interface */ +UCLASS_SOC ,/* SOC Device */ UCLASS_SOUND ,/* Playing simple sounds */ UCLASS_SPI ,/* SPI bus */ UCLASS_SPI_FLASH, /* SPI flash */
include/soc.h new file +132 -0
132 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 1/8 dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
Quoted 10 lines · Dave Gerlach
Introduce
UCLASS_SOCto be used for SOC identification and attribute matching based on the SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data.This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant in use.
Signed-off-by Dave Gerlach <[email protected]>
Quoted 9 lines
--- drivers/soc/Kconfig | 9 +++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 102 ++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 drivers/soc/soc-uclass.c create mode 100644 include/soc.h
Can we please get a write-up in doc/driver-model/ as well for this? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200630/d03f452e/attachment.sig>
PATCH 1/8 dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
Tom,
Quoted 22 lines · Tom Rini
Quoted 17 lines · Dave Gerlach
Introduce
UCLASS_SOCto be used for SOC identification and attribute matching based on the SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data.This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant in use.
Signed-off-by Dave Gerlach <[email protected]>--- drivers/soc/Kconfig | 9 +++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 102 ++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+)Quoted 2 lines
create mode 100644
drivers/soc/soc-uclass.c
create mode 100644include/soc.h
Quoted 3 lines
Can we please get a write-up in doc/driver-model/ as well for this? Thanks!
Yes, will add for v2, thanks for the suggestion.
Regards,
Dave
PATCH 1/8 dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
In reply to Dave GerlachQuoted 11 lines · Dave Gerlach
Introduce
UCLASS_SOCto be used for SOC identification and attribute matching based on the SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data.This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant in use.
Signed-off-by Dave Gerlach <[email protected]>
Quoted 9 lines
--- drivers/soc/Kconfig | 9 +++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 102 ++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+) create mode 100644 drivers/soc/soc-uclass.c create mode 100644 include/soc.h
As Tom says, docs please but looks great otherwise.
Nits below. Do you think it might make sense to have an integer-encoded version? Maybe it would be more hassle than it is worth.
Quoted 157 lines
drivers/soc/Kconfig +9
-0@@ -1,5 +1,14 @@ menu "SOC (System On Chip) specific Drivers" +config SOC_DEVICE + bool "Enable SoC Device ID drivers using Driver Model" + help + This allows drivers to be provided for SoCs to help in identifying + the SoC in use and matching SoC attributes for selecting SoC + specific data. This is useful for other device drivers that may + need different parameters or quirks enabled depending on the + specific device variant in use. + source "drivers/soc/ti/Kconfig" endmenudrivers/soc/Makefile +1
-0@@ -3,3 +3,4 @@ # Makefile for the U-Boot SOC specific device drivers. obj-$(CONFIG_SOC_TI) += ti/ +obj-$(CONFIG_SOC_DEVICE) += soc-uclass.odrivers/soc/soc-uclass.c new file +102
-0@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/ +* Dave Gerlach <[email protected]> +*/ + +#include <common.h> +#include <soc.h> +#include <dm.h> +#include <errno.h> +#include <dm/lists.h> +#include <dm/root.h> + +int soc_get (struct udevice **devp) +{ +return uclass_first_device_err (UCLASS_SOC , devp); +} + +int soc_get_machine (struct udevice *dev,char *buf,int size) +{ +struct soc_ops *ops =soc_get_ops (dev); + +if (!ops->get_machine) +return -ENOSYS ; + +return ops->get_machine (dev, buf, size); +} + +int soc_get_family (struct udevice *dev,char *buf,int size) +{ +struct soc_ops *ops =soc_get_ops (dev); + +if (!ops->get_family) +return -ENOSYS ; + +return ops->get_family (dev, buf, size); +} + +int soc_get_revision (struct udevice *dev,char *buf,int size) +{ +struct soc_ops *ops =soc_get_ops (dev); + +if (!ops->get_revision) +return -ENOSYS ; + +return ops->get_revision (dev, buf, size); +} + +const struct soc_device_attribute * +soc_device_match (const struct soc_device_attribute *matches) +{ +bool match; +struct udevice *soc; +char str[SOC_MAX_STR_SIZE ]; + +if (!matches) +return NULL ; + +if (soc_get (&soc)) +return NULL ; + +while (1 ) { +if (!(matches->machine || matches->family || + matches->revision)) +break ; + + match = true; + +if (matches->machine) { +if (!soc_get_machine (soc, str,SOC_MAX_STR_SIZE )) { +if (strcmp (matches->machine, str)) + match = false; + } + } + +if (matches->family) { +if (!soc_get_family (soc, str,SOC_MAX_STR_SIZE )) { +if (strcmp (matches->family, str)) + match = false; + } + } + +if (matches->revision) { +if (!soc_get_revision (soc, str,SOC_MAX_STR_SIZE )) { +if (strcmp (matches->revision, str)) + match = false; + } + } + +if (match) +return matches; + + matches++; + } + +return NULL ; +} + +UCLASS_DRIVER (soc) = { + .id =UCLASS_SOC , + .name ="soc" , +};include/dm/uclass-id.h +1
-0@@ -97,6 +97,7 @@ enum uclass_id {UCLASS_SERIAL ,/* Serial UART */ UCLASS_SIMPLE_BUS ,/* Bus with child devices */ UCLASS_SMEM ,/* Shared memory interface */ +UCLASS_SOC ,/* SOC Device */ UCLASS_SOUND ,/* Playing simple sounds */ UCLASS_SPI ,/* SPI bus */ UCLASS_SPI_FLASH, /* SPI flash */include/soc.h new file +2
-0@@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/*
include/soc.h line 12
Quoted 10 lines
include/soc.h new file +10
-0+* (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/ +* Dave Gerlach <[email protected]> +*/ + +#ifndef __SOC_H +#define __SOC_H + +#define SOC_MAX_STR_SIZE 128 + +struct soc_device_attribute {
Could this be soc_attr or maybe soc_dev_attr? This is too long.
include/soc.h line 16
Quoted 4 lines
include/soc.h new file +4
-0+const char *machine; +const char *family; +const char *revision; +const void *data;
Please can you comment this struct with what each thing means and an example for your SoC.
include/soc.h line 19
Quoted 3 lines
include/soc.h new file +3
-0+}; + +#ifdef CONFIG_SOC_DEVICE
Please drop the #ifdef as there is no harm in defining this.
Quoted 71 lines
include/soc.h new file +71
-0+struct soc_ops { +/** +* get_machine() - Get machine name of an SOC +* +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int (*get_machine)(struct udevice *dev,char *buf,int size); + +/** +* get_revision() - Get revision name of a SOC +* +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int (*get_revision)(struct udevice *dev,char *buf,int size); + +/** +* get_family() - Get family name of an SOC +* +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int (*get_family)(struct udevice *dev,char *buf,int size); +}; + +#define soc_get_ops (dev) ((struct soc_ops *)(dev)->driver->ops) + +/** +* soc_get() - Return the soc device for the soc in use. +* @devp: Pointer to structure to receive the soc device. +* +* Since there can only be at most one SOC instance, the API can supply a +* function that returns the unique device. +* +* Return: 0 if OK, -ve on error. +*/ +int soc_get (struct udevice **devp); + +/** +* soc_get_machine() - Get machine name of an SOC +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* +* Return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int soc_get_machine (struct udevice *dev,char *buf,int size); + +/** +* soc_get_revision() - Get revision name of an SOC +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* +* Return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int soc_get_revision (struct udevice *dev,char *buf,int size); + +/** +* soc_get_family() - Get family name of an SOC +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +*
include/soc.h line 100
Quoted 10 lines
include/soc.h new file +10
-0+* Return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int soc_get_family (struct udevice *dev,char *buf,int size); + +/** +* soc_device_match() - Return match from an array of soc_device_attribute +* @matches: Array with any combination of family, revision or machine set +* +* Return: Pointer to struct from matches array with set attributes matching +* those provided by the soc device.
or NULL ?
Quoted 33 lines
include/soc.h new file +32
-1+*/ +const struct soc_device_attribute * +soc_device_match (const struct soc_device_attribute *matches); + +#else +static inline int soc_get (struct udevice **devp) +{ +return -ENOSYS ; +} + +static inline int soc_get_machine (struct udevice *dev,char *buf,int size) +{ +return -ENOSYS ; +} + +static inline int soc_get_revision (struct udevice *dev,char *buf,int size) +{ +return -ENOSYS ; +} + +static inline int soc_get_family (struct udevice *dev,char *buf,int size) +{ +return -ENOSYS ; +} + +static inline const struct soc_device_attribute * +soc_device_match (const struct soc_device_attribute *matches) +{ +return NULL ; +} +#endif +#endif /* _SOC_H */ --
Quoted 2 lines
2.20.1
Regards,
Simon
PATCH 1/8 dm: soc: Introduce UCLASS_SOC for SOC ID and attribute matching
Simon,
Quoted 22 lines · Simon Glass
Quoted 18 lines · Dave Gerlach
Introduce
UCLASS_SOCto be used for SOC identification and attribute matching based on the SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data.This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant in use.
Signed-off-by Dave Gerlach <[email protected]>--- drivers/soc/Kconfig | 9 +++ drivers/soc/Makefile | 1 + drivers/soc/soc-uclass.c | 102 ++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 245 insertions(+)Quoted 2 lines
create mode 100644
drivers/soc/soc-uclass.c
create mode 100644include/soc.h
Quoted 4 lines
Reviewed-by Simon Glass <[email protected]>As Tom says, docs please but looks great otherwise.
Yes will add docs in v2.
Quoted 3 lines
Nits below. Do you think it might make sense to have an integer-encoded version? Maybe it would be more hassle than it is worth.
Well my primary driver for using strings was to be consistent with the kernel counterpart, but I also thought it was convenient beacuse it allows the identifiers to be descriptive and also to be printed out directly once retrieved. Attributes could be added as needed in the future.
Quoted 162 lines
Quoted 162 lines
drivers/soc/Kconfig +9
-0@@ -1,5 +1,14 @@ menu "SOC (System On Chip) specific Drivers" +config SOC_DEVICE + bool "Enable SoC Device ID drivers using Driver Model" + help + This allows drivers to be provided for SoCs to help in identifying + the SoC in use and matching SoC attributes for selecting SoC + specific data. This is useful for other device drivers that may + need different parameters or quirks enabled depending on the + specific device variant in use. + source "drivers/soc/ti/Kconfig" endmenudrivers/soc/Makefile +1
-0@@ -3,3 +3,4 @@ # Makefile for the U-Boot SOC specific device drivers. obj-$(CONFIG_SOC_TI) += ti/ +obj-$(CONFIG_SOC_DEVICE) += soc-uclass.odrivers/soc/soc-uclass.c new file +102
-0@@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/ +* Dave Gerlach <[email protected]> +*/ + +#include <common.h> +#include <soc.h> +#include <dm.h> +#include <errno.h> +#include <dm/lists.h> +#include <dm/root.h> + +int soc_get (struct udevice **devp) +{ +return uclass_first_device_err (UCLASS_SOC , devp); +} + +int soc_get_machine (struct udevice *dev,char *buf,int size) +{ +struct soc_ops *ops =soc_get_ops (dev); + +if (!ops->get_machine) +return -ENOSYS ; + +return ops->get_machine (dev, buf, size); +} + +int soc_get_family (struct udevice *dev,char *buf,int size) +{ +struct soc_ops *ops =soc_get_ops (dev); + +if (!ops->get_family) +return -ENOSYS ; + +return ops->get_family (dev, buf, size); +} + +int soc_get_revision (struct udevice *dev,char *buf,int size) +{ +struct soc_ops *ops =soc_get_ops (dev); + +if (!ops->get_revision) +return -ENOSYS ; + +return ops->get_revision (dev, buf, size); +} + +const struct soc_device_attribute * +soc_device_match (const struct soc_device_attribute *matches) +{ +bool match; +struct udevice *soc; +char str[SOC_MAX_STR_SIZE ]; + +if (!matches) +return NULL ; + +if (soc_get (&soc)) +return NULL ; + +while (1 ) { +if (!(matches->machine || matches->family || + matches->revision)) +break ; + + match = true; + +if (matches->machine) { +if (!soc_get_machine (soc, str,SOC_MAX_STR_SIZE )) { +if (strcmp (matches->machine, str)) + match = false; + } + } + +if (matches->family) { +if (!soc_get_family (soc, str,SOC_MAX_STR_SIZE )) { +if (strcmp (matches->family, str)) + match = false; + } + } + +if (matches->revision) { +if (!soc_get_revision (soc, str,SOC_MAX_STR_SIZE )) { +if (strcmp (matches->revision, str)) + match = false; + } + } + +if (match) +return matches; + + matches++; + } + +return NULL ; +} + +UCLASS_DRIVER (soc) = { + .id =UCLASS_SOC , + .name ="soc" , +};include/dm/uclass-id.h +1
-0@@ -97,6 +97,7 @@ enum uclass_id {UCLASS_SERIAL ,/* Serial UART */ UCLASS_SIMPLE_BUS ,/* Bus with child devices */ UCLASS_SMEM ,/* Shared memory interface */ +UCLASS_SOC ,/* SOC Device */ UCLASS_SOUND ,/* Playing simple sounds */ UCLASS_SPI ,/* SPI bus */ UCLASS_SPI_FLASH, /* SPI flash */include/soc.h new file +6
-0@@ -0,0 +1,132 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* (C) Copyright 2020 - Texas Instruments Incorporated - http://www.ti.com/ +* Dave Gerlach <[email protected]> +*/ +
Quoted 8 lines
include/soc.h line 12
Quoted 6 lines
include/soc.h new file +6
-0+#ifndef __SOC_H +#define __SOC_H + +#define SOC_MAX_STR_SIZE 128 + +struct soc_device_attribute {Could this be
soc_attror maybesoc_dev_attr? This is too long.
Good idea, it is too long for no reason, I will shorten it.
Quoted 8 lines
include/soc.h line 16
Quoted 5 lines
include/soc.h new file +4
-0+const char *machine; +const char *family; +const char *revision; +const void *data;Please can you comment this struct with what each thing means and an example for your SoC.
Will do.
Quoted 6 lines
include/soc.h line 19
Quoted 4 lines
include/soc.h new file +3
-0+}; + +#ifdef CONFIG_SOC_DEVICE Please drop the #ifdef as there is no harm in defining this.
Ok, will move it lower to wrap the functions so that stubs are still defined when !CONFIG_SOC_DEVICE.
Quoted 76 lines
Quoted 76 lines
include/soc.h new file +75
-0+struct soc_ops { +/** +* get_machine() - Get machine name of an SOC +* +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int (*get_machine)(struct udevice *dev,char *buf,int size); + +/** +* get_revision() - Get revision name of a SOC +* +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int (*get_revision)(struct udevice *dev,char *buf,int size); + +/** +* get_family() - Get family name of an SOC +* +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* @return 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int (*get_family)(struct udevice *dev,char *buf,int size); +}; + +#define soc_get_ops (dev) ((struct soc_ops *)(dev)->driver->ops) + +/** +* soc_get() - Return the soc device for the soc in use. +* @devp: Pointer to structure to receive the soc device. +* +* Since there can only be at most one SOC instance, the API can supply a +* function that returns the unique device. +* +* Return: 0 if OK, -ve on error. +*/ +int soc_get (struct udevice **devp); + +/** +* soc_get_machine() - Get machine name of an SOC +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* +* Return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int soc_get_machine (struct udevice *dev,char *buf,int size); + +/** +* soc_get_revision() - Get revision name of an SOC +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* +* Return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int soc_get_revision (struct udevice *dev,char *buf,int size); + +/** +* soc_get_family() - Get family name of an SOC +* @dev: Device to check (UCLASS_SOC) +* @buf: Buffer to place string +* @size: Size of string space +* +* Return: 0 if OK, -ENOSPC if buffer is too small, other -ve on error +*/ +int soc_get_family (struct udevice *dev,char *buf,int size); +
Quoted 8 lines
include/soc.h line 100
Quoted 6 lines
include/soc.h new file +6
-0+/** +* soc_device_match() - Return match from an array of soc_device_attribute +* @matches: Array with any combination of family, revision or machine set +* +* Return: Pointer to struct from matches array with set attributes matching +* those provided by the soc device. or NULL ?
Yes, must document the not found case as well. Will add. Appreciate the comments!
Regards,
Dave
Quoted 40 lines
Quoted 34 lines
include/soc.h new file +32
-1+*/ +const struct soc_device_attribute * +soc_device_match (const struct soc_device_attribute *matches); + +#else +static inline int soc_get (struct udevice **devp) +{ +return -ENOSYS ; +} + +static inline int soc_get_machine (struct udevice *dev,char *buf,int size) +{ +return -ENOSYS ; +} + +static inline int soc_get_revision (struct udevice *dev,char *buf,int size) +{ +return -ENOSYS ; +} + +static inline int soc_get_family (struct udevice *dev,char *buf,int size) +{ +return -ENOSYS ; +} + +static inline const struct soc_device_attribute * +soc_device_match (const struct soc_device_attribute *matches) +{ +return NULL ; +} +#endif +#endif /* _SOC_H */ --Quoted 2 lines
2.20.1
Regards,
Simon
PATCH 2/8 test: Add tests for SOC uclass
In reply to Dave GerlachAdd a sandbox SOC driver, and some tests for the SOC uclass.
--- arch/sandbox/dts/test.dts | 4 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/soc_sandbox.c | 56 ++++++++++++++ test/dm/Makefile | 1 + test/dm/soc.c | 120 +++++++++++++++++++++++++++++ 9 files changed, 186 insertions(+) create mode 100644 drivers/soc/soc_sandbox.c create mode 100644 test/dm/soc.c
arch/sandbox/dts/test.dts +4 -0
@@ -492,6 +492,10 @@ }; }; + chipid: chipid { + compatible = "sandbox,soc"; + }; + i2s: i2s { compatible = "sandbox,i2s"; #sound-dai-cells = <1>;
configs/sandbox64_defconfig +1 -0
@@ -114,6 +114,7 @@ CONFIG_LED_GPIO=y CONFIG_DM_MAILBOX=y CONFIG_SANDBOX_MBOX=y CONFIG_MISC=y +CONFIG_SOC_DEVICE=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_LPC=y
configs/sandbox_defconfig +1 -0
@@ -133,6 +133,7 @@ CONFIG_LED_GPIO=y CONFIG_DM_MAILBOX=y CONFIG_SANDBOX_MBOX=y CONFIG_MISC=y +CONFIG_SOC_DEVICE=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_LPC=y
configs/sandbox_flattree_defconfig +1 -0
@@ -99,6 +99,7 @@ CONFIG_LED_GPIO=y CONFIG_DM_MAILBOX=y CONFIG_SANDBOX_MBOX=y CONFIG_MISC=y +CONFIG_SOC_DEVICE=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_LPC=y
configs/sandbox_spl_defconfig +1 -0
@@ -118,6 +118,7 @@ CONFIG_LED_GPIO=y CONFIG_DM_MAILBOX=y CONFIG_SANDBOX_MBOX=y CONFIG_MISC=y +CONFIG_SOC_DEVICE=y CONFIG_CROS_EC=y CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_LPC=y
drivers/soc/Makefile +1 -0
@@ -4,3 +4,4 @@ obj-$(CONFIG_SOC_TI) += ti/ obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o +obj-$(CONFIG_SANDBOX) += soc_sandbox.o
drivers/soc/soc_sandbox.c new file +56 -0
56 lines not on this page · raw message
test/dm/Makefile +1 -0
@@ -66,6 +66,7 @@ obj-$(CONFIG_AXI) += axi.o obj-$(CONFIG_MISC) += misc.o obj-$(CONFIG_DM_SERIAL) += serial.o obj-$(CONFIG_CPU) += cpu.o +obj-$(CONFIG_SOC_DEVICE) += soc.o obj-$(CONFIG_SOUND) += sound.o obj-$(CONFIG_TEE) += tee.o obj-$(CONFIG_VIRTIO_SANDBOX) += virtio.o
test/dm/soc.c new file +120 -0
120 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 2/8 test: Add tests for SOC uclass
Quoted 4 lines · Dave Gerlach
Add a sandbox SOC driver, and some tests for the SOC uclass.
Signed-off-by Dave Gerlach <[email protected]>
Quoted 14 lines
--- arch/sandbox/dts/test.dts | 4 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/soc_sandbox.c | 56 ++++++++++++++ test/dm/Makefile | 1 + test/dm/soc.c | 120 +++++++++++++++++++++++++++++ 9 files changed, 186 insertions(+) create mode 100644 drivers/soc/soc_sandbox.c create mode 100644 test/dm/soc.c
PATCH 3/8 dm: soc: Introduce soc_ti_k3 driver for TI K3 SoCs
In reply to Dave GerlachIntroduce an soc_ti_k3_driver that allows identification and selection of SoC specific data based on the JTAG ID register for device identification, as described for AM65x[0] and J721E[1] devices.
[0] http://www.ti.com/lit/ug/spruid7e/spruid7e.pdf
[1] http://www.ti.com/lit/ug/spruil1a/spruil1a.pdf
--- drivers/soc/Kconfig | 7 +++ drivers/soc/Makefile | 1 + drivers/soc/soc_ti_k3.c | 124 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+) create mode 100644 drivers/soc/soc_ti_k3.c
drivers/soc/Kconfig +7 -0
@@ -9,6 +9,13 @@ config SOC_DEVICE need different parameters or quirks enabled depending on the specific device variant in use. +config SOC_DEVICE_TI_K3 + depends on SOC_DEVICE + bool "Enable SoC Device ID driver for TI K3 SoCs" + help + This allows Texas Instruments Keystone 3 SoCs to identify + specifics about the SoC in use. + source "drivers/soc/ti/Kconfig" endmenu
drivers/soc/Makefile +1 -0
@@ -4,4 +4,5 @@ obj-$(CONFIG_SOC_TI) += ti/ obj-$(CONFIG_SOC_DEVICE) += soc-uclass.o +obj-$(CONFIG_SOC_DEVICE_TI_K3) += soc_ti_k3.o obj-$(CONFIG_SANDBOX) += soc_sandbox.o
drivers/soc/soc_ti_k3.c new file +124 -0
124 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 4/8 arm: dts: k3-am65-wakeup: Introduce chipid node
In reply to Dave GerlachIntroduce a chipid node to provide a UCLASS_SOC driver to identify TI K3 SoCs.
--- arch/arm/dts/k3-am65-wakeup.dtsi | 5 +++++ arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 4 ++++ 2 files changed, 9 insertions(+)
arch/arm/dts/k3-am65-wakeup.dtsi +5 -0
@@ -62,4 +62,9 @@ clocks = <&k3_clks 115 1>; power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>; }; + + chipid: chipid at 43000014 { + compatible = "ti,am654-chipid"; + reg = <0x43000014 0x4>; + }; };
arch/arm/dts/k3-am654-base-board-u-boot.dtsi +4 -0
@@ -393,3 +393,7 @@ u-boot,dm-spl; }; }; + +&chipid { + u-boot,dm-spl; +};
Signature · 1 line
2.20.1
PATCH 5/8 arm: dts: k3-j721e-mcu-wakeup: Introduce chipid node
In reply to Dave GerlachIntroduce a chipid node to provide a UCLASS_SOC driver to identify TI K3 SoCs.
--- arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 5 +++++ 2 files changed, 9 insertions(+)
arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi +4 -0
@@ -377,3 +377,7 @@ &mcu_fss0_ospi1_pins_default { u-boot,dm-spl; }; + +&chipid { + u-boot,dm-spl; +};
arch/arm/dts/k3-j721e-mcu-wakeup.dtsi +5 -0
@@ -199,4 +199,9 @@ clocks = <&k3_clks 195 0>; power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>; }; + + chipid: chipid at 43000014 { + compatible = "ti,am654-chipid"; + reg = <0x0 0x43000014 0x0 0x4>; + }; };
Signature · 1 line
2.20.1
PATCH 6/8 configs: am65x_evm: Enable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3
In reply to Dave GerlachEnable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3 so the TI K3 SoC driver can be used for SoC detection.
--- configs/am65x_evm_a53_defconfig | 2 ++ configs/am65x_evm_r5_defconfig | 2 ++ configs/am65x_hs_evm_a53_defconfig | 2 ++ configs/am65x_hs_evm_r5_defconfig | 2 ++ 4 files changed, 8 insertions(+)
configs/am65x_evm_a53_defconfig +2 -0
@@ -144,3 +144,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6162 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
configs/am65x_evm_r5_defconfig +2 -0
@@ -118,3 +118,5 @@ CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
configs/am65x_hs_evm_a53_defconfig +2 -0
@@ -146,3 +146,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6162 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
configs/am65x_hs_evm_r5_defconfig +2 -0
@@ -119,3 +119,5 @@ CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
Signature · 1 line
2.20.1
PATCH 7/8 configs: j721e_evm: Enable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3
In reply to Dave GerlachEnable CONFIG_SOC_DEVICE and CONFIG_SOC_DEVICE_TI_K3 so the TI K3 SoC driver can be used for SoC detection.
--- configs/j721e_evm_a72_defconfig | 2 ++ configs/j721e_evm_r5_defconfig | 2 ++ configs/j721e_hs_evm_a72_defconfig | 2 ++ configs/j721e_hs_evm_r5_defconfig | 2 ++ 4 files changed, 8 insertions(+)
configs/j721e_evm_a72_defconfig +2 -0
@@ -168,3 +168,5 @@ CONFIG_CADENCE_UFS=y CONFIG_TI_J721E_UFS=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
configs/j721e_evm_r5_defconfig +2 -0
@@ -133,3 +133,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6163 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_FS_EXT4=y CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
configs/j721e_hs_evm_a72_defconfig +2 -0
@@ -156,3 +156,5 @@ CONFIG_CADENCE_UFS=y CONFIG_TI_J721E_UFS=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
configs/j721e_hs_evm_r5_defconfig +2 -0
@@ -114,3 +114,5 @@ CONFIG_SPL_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_FS_EXT4=y CONFIG_FS_FAT_MAX_CLUSTSIZE=16384 +CONFIG_SOC_DEVICE=y +CONFIG_SOC_DEVICE_TI_K3=y
Signature · 1 line
2.20.1
PATCH 8/8 arm: mach-k3: Use SOC driver for device identification
In reply to Dave GerlachMake use of UCLASS_SOC to find device family and revision for print_cpuinfo.
--- arch/arm/mach-k3/common.c | 48 ++++++++++-------------- arch/arm/mach-k3/include/mach/hardware.h | 1 - 2 files changed, 19 insertions(+), 30 deletions(-)
arch/arm/mach-k3/common.c +19 -29
@@ -25,6 +25,7 @@#include <fs.h> #include <env.h> #include <elf.h> +#include <soc.h> struct ti_sci_handle *get_ti_sci_handle (void ) {
@@ -308,38 +309,27 @@ void reset_cpu(ulong ignored)#if defined(CONFIG_DISPLAY_CPUINFO )int print_cpuinfo (void ) { -u32 soc, rev; -char *name; - - soc = (readl (CTRLMMR_WKUP_JTAG_ID ) & -JTAG_ID_PARTNO_MASK ) >>JTAG_ID_PARTNO_SHIFT ; - rev = (readl (CTRLMMR_WKUP_JTAG_ID ) & -JTAG_ID_VARIANT_MASK ) >>JTAG_ID_VARIANT_SHIFT ; +struct udevice *soc; +char name[64 ]; +int ret;printf ("SoC: " ); -switch (soc) { -case AM65X : - name ="AM65x" ; -break ; -case J721E : - name ="J721E" ; -break ; -default : - name ="Unknown Silicon" ; - }; -printf ("%s SR " , 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); + ret =soc_get (&soc); +if (ret) { +printf ("UNKNOWN\n" ); +return 0 ; + } + + ret =soc_get_family (soc, name,64 ); +if (!ret) { +printf ("%s " , name); + } + + ret =soc_get_revision (soc, name,64 ); +if (!ret) { +printf ("%s\n" , name); + }return 0 ; }
arch/arm/mach-k3/include/mach/hardware.h +0 -1
@@ -15,7 +15,6 @@#endif /* Assuming these addresses and definitions stay common across K3 devices */ -#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
Signature · 1 line
2.20.1
cover Introduce UCLASS_SOC
In reply to Dave GerlachHi Dave,
Quoted 16 lines · Dave Gerlach
Hi,
This patch series introduces
UCLASS_SOCto be used for SOC identification and attribute matching based on SoC ID info. This allows drivers to be provided for SoCs to retrieve SoC identifying information and also for matching device attributes for selecting SoC specific data. This is intended to be a counterpart to the soc-device framework in the Linux kernel.I started with attempts to extend either
UCLASS_CPUandUCLASS_BOARDto provide equivalent functionality, butUCLASS_CPUis focused specifically on processing units, of which multiples can exist heterogeneously in a system, andUCLASS_BOARDis focused on indentifying things connected to an SoC dynamically. Rather than try to force this into the existing UCLASS's, a new UCLASS seemed appropriate to provide same services as the soc-device functionality in the kernel.
Quoted 7 lines
This is useful for other device drivers that may need different parameters or quirks enabled depending on the specific device variant or revision in use.
Additionally, this introduces a user of
UCLASS_SOC,soc_ti_k3, which provides SoC identifying information for K3 SoCs which can be used directly, forprint_cpuinfo, and for selecting SoC specific data usingsoc_device_match.
Series looks good to me. Can you please re post the series addressing comments from Tom and Simon?
Thanks and regards,
Lokesh
Quoted 51 lines
Regards,
DaveDave Gerlach (8):
dm: soc: IntroduceUCLASS_SOCfor SOC ID and attribute matching
test: Add tests for SOC uclass
dm: soc: Introducesoc_ti_k3driver for TI K3 SoCs
arm: dts: k3-am65-wakeup: Introduce chipid node
arm: dts: k3-j721e-mcu-wakeup: Introduce chipid node
configs:am65x_evm: EnableCONFIG_SOC_DEVICEand
CONFIG_SOC_DEVICE_TI_K3
configs:j721e_evm: EnableCONFIG_SOC_DEVICEand
CONFIG_SOC_DEVICE_TI_K3
arm: mach-k3: Use SOC driver for device identificationarch/arm/dts/k3-am65-wakeup.dtsi | 5 + arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 4 + .../k3-j721e-common-proc-board-u-boot.dtsi | 4 + arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 5 + arch/arm/mach-k3/common.c | 48 +++---- arch/arm/mach-k3/include/mach/hardware.h | 1 - arch/sandbox/dts/test.dts | 4 + configs/am65x_evm_a53_defconfig | 2 + configs/am65x_evm_r5_defconfig | 2 + configs/am65x_hs_evm_a53_defconfig | 2 + configs/am65x_hs_evm_r5_defconfig | 2 + configs/j721e_evm_a72_defconfig | 2 + configs/j721e_evm_r5_defconfig | 2 + configs/j721e_hs_evm_a72_defconfig | 2 + configs/j721e_hs_evm_r5_defconfig | 2 + configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + drivers/soc/Kconfig | 16 +++ drivers/soc/Makefile | 3 + drivers/soc/soc-uclass.c | 102 ++++++++++++++ drivers/soc/soc_sandbox.c | 56 ++++++++ drivers/soc/soc_ti_k3.c | 124 ++++++++++++++++ include/dm/uclass-id.h | 1 + include/soc.h | 132 ++++++++++++++++++ test/dm/Makefile | 1 + test/dm/soc.c | 120 ++++++++++++++++ 28 files changed, 616 insertions(+), 30 deletions(-) create mode 100644 drivers/soc/soc-uclass.c create mode 100644 drivers/soc/soc_sandbox.c create mode 100644 drivers/soc/soc_ti_k3.c create mode 100644 include/soc.h create mode 100644 test/dm/soc.c