diff mbox series

[meta-ti,scarthgap,RFC,3/6] ti-bsp: Use same version for both UM and KM driver

Message ID 20250909151028.272925-3-afd@ti.com
State New
Headers show
Series [meta-ti,scarthgap,RFC,1/6] ti-sgx-ddk-um: UM side driver depends on KM side driver | expand

Commit Message

Andrew Davis Sept. 9, 2025, 3:10 p.m. UTC 
The DRIVER and matching UMLIBS must always match, no need to define a
version number for both. Keep this simple and remove the extra defines.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 meta-beagle/conf/machine/include/beagle-bsp.inc |  4 ----
 meta-ti-bsp/conf/machine/include/ti-bsp.inc     | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

Comments

Ryan Eatmon Sept. 9, 2025, 8:42 p.m. UTC | #1 
On 9/9/2025 10:10 AM, Andrew Davis wrote:
> The DRIVER and matching UMLIBS must always match, no need to define a
> version number for both. Keep this simple and remove the extra defines.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>   meta-beagle/conf/machine/include/beagle-bsp.inc |  4 ----
>   meta-ti-bsp/conf/machine/include/ti-bsp.inc     | 10 ++--------
>   2 files changed, 2 insertions(+), 12 deletions(-)
> 
> diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc
> index d180c297..448e2086 100644
> --- a/meta-beagle/conf/machine/include/beagle-bsp.inc
> +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
> @@ -18,10 +18,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
>   
>   BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
>   BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
> -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%"
>   BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
>   BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
> -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%"
>   BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"
>   
>   # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
> @@ -41,10 +39,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
>   
>   BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
>   BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
> -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
>   BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
>   BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
> -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
>   BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
>   
>   # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
> diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
> index a5d9a51f..dc0473de 100644
> --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
> +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
> @@ -44,10 +44,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
>   
>   BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
>   BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
> -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%"
>   BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
>   BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
> -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
>   BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
>   
>   # ==========
> @@ -61,10 +59,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
>   
>   BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
>   BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
> -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
>   BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
>   BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
> -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
>   BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
>   
>   # GC320 support requires out-of-tree drivers not yet available in 6.6
> @@ -84,8 +80,6 @@ BSP_SGX_DRIVER_PROVIDER ?= ""
>   BSP_SGX_DRIVER_VERSION ?= ""
>   BSP_ROGUE_DRIVER_PROVIDER ?= ""
>   BSP_ROGUE_DRIVER_VERSION ?= ""
> -BSP_SGX_UMLIBS_VERSION ?= ""
> -BSP_ROGUE_UMLIBS_VERSION ?= ""
>   BSP_MESA_PVR_VERSION ?= ""
>   
>   # ==========
> @@ -101,7 +95,7 @@ PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
>   # GPU provider gets set in machine configs, as some machines are headless
>   # Select default preferred versions here
>   PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
> -PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
> +PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}"

Since we are simplifying, do we want to take it further and rename the 
XXX_DRIVER_VERSION to just XXX_VERSION?

BSP_ROGUE_DRIVER_VERSION -> BSP_ROGUE_VERSION
BSP_SGX_DRIVER_VERSION -> BSP_SGX_VERSION

>   PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
> -PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
> +PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}"
>   PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"
Andrew Davis Sept. 12, 2025, 4:28 p.m. UTC | #2 
On 9/9/25 3:42 PM, Ryan Eatmon wrote:
> 
> 
> On 9/9/2025 10:10 AM, Andrew Davis wrote:
>> The DRIVER and matching UMLIBS must always match, no need to define a
>> version number for both. Keep this simple and remove the extra defines.
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   meta-beagle/conf/machine/include/beagle-bsp.inc |  4 ----
>>   meta-ti-bsp/conf/machine/include/ti-bsp.inc     | 10 ++--------
>>   2 files changed, 2 insertions(+), 12 deletions(-)
>>
>> diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc
>> index d180c297..448e2086 100644
>> --- a/meta-beagle/conf/machine/include/beagle-bsp.inc
>> +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
>> @@ -18,10 +18,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
>>   BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
>>   BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
>> -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%"
>>   BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
>>   BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
>> -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%"
>>   BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"
>>   # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
>> @@ -41,10 +39,8 @@ KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
>>   BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
>>   BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
>> -BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
>>   BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
>>   BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
>> -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
>>   BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
>>   # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
>> diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
>> index a5d9a51f..dc0473de 100644
>> --- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
>> +++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
>> @@ -44,10 +44,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
>>   BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
>>   BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
>> -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%"
>>   BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
>>   BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
>> -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
>>   BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
>>   # ==========
>> @@ -61,10 +59,8 @@ BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
>>   BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
>>   BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
>> -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
>>   BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
>>   BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
>> -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
>>   BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
>>   # GC320 support requires out-of-tree drivers not yet available in 6.6
>> @@ -84,8 +80,6 @@ BSP_SGX_DRIVER_PROVIDER ?= ""
>>   BSP_SGX_DRIVER_VERSION ?= ""
>>   BSP_ROGUE_DRIVER_PROVIDER ?= ""
>>   BSP_ROGUE_DRIVER_VERSION ?= ""
>> -BSP_SGX_UMLIBS_VERSION ?= ""
>> -BSP_ROGUE_UMLIBS_VERSION ?= ""
>>   BSP_MESA_PVR_VERSION ?= ""
>>   # ==========
>> @@ -101,7 +95,7 @@ PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
>>   # GPU provider gets set in machine configs, as some machines are headless
>>   # Select default preferred versions here
>>   PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
>> -PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
>> +PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}"
> 
> Since we are simplifying, do we want to take it further and rename the XXX_DRIVER_VERSION to just XXX_VERSION?
> 
> BSP_ROGUE_DRIVER_VERSION -> BSP_ROGUE_VERSION
> BSP_SGX_DRIVER_VERSION -> BSP_SGX_VERSION

My only worry would be to me this looks like it should contain the
version of the GPU itself. Including "driver" makes it clear this
is for the SW version. No huge preference either way.

Andrew

> 
>>   PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
>> -PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
>> +PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}"
>>   PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"
>
diff mbox series

Patch

diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc
index d180c297..448e2086 100644
--- a/meta-beagle/conf/machine/include/beagle-bsp.inc
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -18,10 +18,8 @@  KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = ""
 
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%"
 BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"
 
 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.12
@@ -41,10 +39,8 @@  KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = ""
 
 BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
 BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
 
 # GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
index a5d9a51f..dc0473de 100644
--- a/meta-ti-bsp/conf/machine/include/ti-bsp.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -44,10 +44,8 @@  BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
 
 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
 
 # ==========
@@ -61,10 +59,8 @@  BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
 
 BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
 BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
-BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
 BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
 BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
-BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
 BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
 
 # GC320 support requires out-of-tree drivers not yet available in 6.6
@@ -84,8 +80,6 @@  BSP_SGX_DRIVER_PROVIDER ?= ""
 BSP_SGX_DRIVER_VERSION ?= ""
 BSP_ROGUE_DRIVER_PROVIDER ?= ""
 BSP_ROGUE_DRIVER_VERSION ?= ""
-BSP_SGX_UMLIBS_VERSION ?= ""
-BSP_ROGUE_UMLIBS_VERSION ?= ""
 BSP_MESA_PVR_VERSION ?= ""
 
 # ==========
@@ -101,7 +95,7 @@  PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
 # GPU provider gets set in machine configs, as some machines are headless
 # Select default preferred versions here
 PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
-PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
+PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_DRIVER_VERSION}"
 PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
-PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
+PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_DRIVER_VERSION}"
 PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"