Skip to contentSkip to conversation

gcc 14 and bsp provider fixup

PATCH In review [email protected] 2 participants 5 messages Jun 24, 2024

lore
Share & tools
lore
#0 lore raw

v2 cover gcc 14 and bsp provider fixup

From: Randolph Sapp <[email protected]>

Resolve some issues afer the new bsp-provider selection logic was added and add some patches to help with compilation flag checks in the KM.

This includes equivalent patches from the following post for GCC 14 compat:
https://lists.yoctoproject.org/g/meta-ti/topic/106806264

Randolph Sapp (2):
ti-img-rogue-*_23.3: gcc 14 compat and branch sel ti-img-rogue-driver_24.1: gcc 14 compat

 .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb       | 4 ++--
 .../powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb       | 2 +-
 .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.45.1
#1 lore raw

PATCH v2 1/2 ti-img-rogue-*_23.3: gcc 14 compat and branch sel

From: Randolph Sapp <[email protected]>

Bump this recipe to add a change to help with GCC 14 compatibility in the check-cc script used to check compiler flags before use.

Reset this back to the proper branches for kernel 6.1 since this recipe is only being used in 6.6 bsp providers.

---
 .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb       | 4 ++--
 .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb +2 -2
index 34c22cb2..607c86b2 100644
@@ -13,13 +13,13 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
 
 DEPENDS = "virtual/kernel"
 
-BRANCH = "linuxws/scarthgap/k6.6/${PV}"
+BRANCH = "linuxws/kirkstone/k6.1/${PV}"
 
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81"
+SRCREV = "174eb331a61e89184342fa57a935226f4e952bc9"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb +1 -1
index a0a9a295..288eb52b 100644
@@ -12,7 +12,7 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
 
 PR = "r3"
 
-BRANCH = "linuxws/scarthgap/k6.6/${PV}"
+BRANCH = "linuxws/kirkstone/k6.1/${PV}"
 SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
 SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199"
 S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
Signature · 1 line
2.45.1
#2 lore raw

PATCH v2 2/2 ti-img-rogue-driver_24.1: gcc 14 compat

In reply to [email protected]

From: Randolph Sapp <[email protected]>

Bump this recipe to add a change to help with GCC 14 compatibility in the check-cc script used to check compiler flags before use.

---
 .../powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb +1 -1
index 6f374f69..fc303c4f 100644
@@ -19,7 +19,7 @@ SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;
 
 S = "${WORKDIR}/git"
 
-SRCREV = "e2dfdfee991dadc18175f27fe9e8676e910a2f8d"
+SRCREV = "81e189096ef2f2479ccfb50d8b2fb24097188de3"
 
 TARGET_PRODUCT:j721e = "j721e_linux"
 TARGET_PRODUCT:j721s2 = "j721s2_linux"
Signature · 1 line
2.45.1
#3 lore raw
In reply to [email protected]
Quoted 4 lines · On Mon, Jun 24, 2024 at 01:17:12PM -0500, [email protected] wrote:

From: Randolph Sapp <[email protected]>

Resolve some issues afer the new bsp-provider selection logic was added and add some patches to help with compilation flag checks in the KM.

FWIW, the new bsp-provider selection logic was not causing any new issues.

Anyone using meta-ti master and scarthgap from early February until late May were already exposed to this.

While 6.1 LTS was still the default, this change to 23.3 got merged on Feb 9:
https://git.yoctoproject.org/meta-ti/commit/?id=737807fc4360b7fe3cbe493a6104558c4658a046

Separate new 24.1 DDK for the 6.6 LTS was added on May 2, still disabled:
https://git.yoctoproject.org/meta-ti/commit/?id=d89907ec2322f23271917d75f052217dd8a2c27a

And then 6.6 LTS got flipped to become the default on May 23:
https://git.yoctoproject.org/meta-ti/commit/?id=d41d49cfdc6deee33a40ab44d453167c36462c89

When adding the BSP provider code and setting preferred versions, I did see the first commit that switched branches from 6.1 to 6.6, and I was considering reverting it (like you are proposing here with patch #1). But I didn't want to upset anyone and figured since this was already the default config for almost 4 months (!) of using the updated 23.3 DDK with 6.1 LTS, I just left it alone.

So, the BSP provider logic just formalized all the existing defaults.

Quoted 15 lines

This includes equivalent patches from the following post for GCC 14 compat:
https://lists.yoctoproject.org/g/meta-ti/topic/106806264

Randolph Sapp (2):
ti-img-rogue-*_23.3: gcc 14 compat and branch sel ti-img-rogue-driver_24.1: gcc 14 compat

 .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb       | 4 ++--
 .../powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb       | 2 +-
 .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.45.1
#4 lore raw
Quoted 7 lines · Denys Dmytriyenko
Quoted 4 lines · On Mon, Jun 24, 2024 at 01:17:12PM -0500, [email protected] wrote:

From: Randolph Sapp <[email protected]>

Resolve some issues afer the new bsp-provider selection logic was added and add some patches to help with compilation flag checks in the KM.

FWIW, the new bsp-provider selection logic was not causing any new issues.

Fair, a change to existing behavior technically isn't a bug. That being said, the driver was rendered non-functional on AM62 as a result. Not a bug to you, but still a bug to me.

Quoted 12 lines

Anyone using meta-ti master and scarthgap from early February until late May were already exposed to this.

While 6.1 LTS was still the default, this change to 23.3 got merged on Feb 9:
https://git.yoctoproject.org/meta-ti/commit/?id=737807fc4360b7fe3cbe493a6104558c4658a046

Separate new 24.1 DDK for the 6.6 LTS was added on May 2, still disabled:
https://git.yoctoproject.org/meta-ti/commit/?id=d89907ec2322f23271917d75f052217dd8a2c27a

And then 6.6 LTS got flipped to become the default on May 23:
https://git.yoctoproject.org/meta-ti/commit/?id=d41d49cfdc6deee33a40ab44d453167c36462c89

Quoted 7 lines

When adding the BSP provider code and setting preferred versions, I did see the first commit that switched branches from 6.1 to 6.6, and I was considering reverting it (like you are proposing here with patch #1). But I didn't want to upset anyone and figured since this was already the default config for almost 4 months (!) of using the updated 23.3 DDK with 6.1 LTS, I just left it alone.

So, the BSP provider logic just formalized all the existing defaults.

The dt breaking changes made to kernel 6.6 came after I was required to get a build of the module up and running on kernel 6.6. External modules are the first things blamed during a kernel migration. For a little while that branch, despite being tagged 6.6, was actually cross compatible with 6.1 and 6.6.

I did not intend for people to use it on 6.1, nor did I intend for it to be a long term solution, assuming that when 6.6 was selected as the new default the need for cross compatibility could be dropped and our proposed dt change from last year could finally be introduced...

That assumption didn't play out as a new decision was made and this bsp logic was added post branch shuffling. Truly, there are no easy solutions.

- Randolph

Quoted 15 lines
Quoted 15 lines

This includes equivalent patches from the following post for GCC 14 compat:
https://lists.yoctoproject.org/g/meta-ti/topic/106806264

Randolph Sapp (2):
ti-img-rogue-*_23.3: gcc 14 compat and branch sel ti-img-rogue-driver_24.1: gcc 14 compat

 .../powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb       | 4 ++--
 .../powervr-drivers/ti-img-rogue-driver_24.1.6554834.bb       | 2 +-
 .../powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.45.1