Re: [meta-ti] [PATCH] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
On Thu, Dec 9, 2021 at 2:34 PM Denys Dmytriyenko wrote: > > On Thu, Dec 09, 2021 at 10:48:42AM -0800, Khem Raj wrote: > > This adds a patch to fix runtime problems loading the kernel module with > > kernel 5.10 > > > > Adds support to build with musl targets > > > > Add yoe to recognised OE distributions > > Looks good to me. Should the patch have Upstream-Status? Not sure if it should > be "Pending" or something else though... Perhaps makes sense, I can spin a v2 with status 'Pending' > > > > Signed-off-by: Khem Raj > > Cc: Denys Dmytriyenko > > Reviewed-by: Denys Dmytriyenko > > > > --- > > ...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 18 > > ...02-Fix-driver-config-for-5.10-kernel.patch | 28 +++ > > .../ti-sgx-ddk-km_1.17.4948957.bb | 1 + > > 3 files changed, 42 insertions(+), 5 deletions(-) > > create mode 100644 > > recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > > > diff --git > > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > index 15105eac..d58764fe 100644 > > --- > > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > +++ > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > @@ -1,23 +1,31 @@ > > -From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 > > +From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001 > > From: Denys Dmytriyenko > > Date: Mon, 9 Sep 2019 17:05:48 -0400 > > -Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > > +Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o > > -gnueabihf > > suffix > > > > +OE toolchains are not having armhf in its name but they still are armhf > > +ABI, teach this to sgx module build system > > + > > +recognize musleabi in tuples as well > > + > > +Add yoe distro support > > + > > Signed-off-by: Denys Dmytriyenko > > +Signed-off-by: Khem Raj > > --- > > eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > -index dead2f9..2ba3e5e 100644 > > +index dead2f9..1b5f090 100644 > > --- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > +++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > > @@ -68,12 +68,12 @@ define calculate-compiler-preferred-target > > ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) > > $(1)_compiler_preferred_target := aarch64-linux-gnu > > endif > > -+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > > arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > > ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > > arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi > > arm-poky-linux-musleabi > > arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),) > > + $(1)_compiler_preferred_target := arm-linux-gnueabihf > > + endif > > ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi > > armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > > @@ -30,5 +38,5 @@ index dead2f9..2ba3e5e 100644 > > endef > > > > -- > > -2.7.4 > > +2.34.1 > > > > diff --git > > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > new file mode 100644 > > index ..d9745703 > > --- /dev/null > > +++ > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > @@ -0,0 +1,28 @@ > > +From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001 > > +From: Paul Barker > > +Date: Wed, 27 Oct 2021 10:34:32 +0100 > > +Subject: [PATCH 2/2] Fix driver config for 5.10 kernel > > + > > +See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3. > > + > > +Ref: BSP-66 > > +Signed-off-by: Paul Barker > > +--- > > + eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 + > > + 1 file changed, 1 insertion(+) > > + > > +diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk > > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > > +index 3f27926..18d515a 100644 > > +--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk > > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > > +@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),) > > + $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE))) > > + endif > > + > > ++PVR_LINUX_MEM_AREA_USE_VMAP = 1 > > + ifneq ($(strip $(KERNELDIR)),) > > + PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0 > > +
Re: [meta-ti] [PATCH] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
On Thu, Dec 09, 2021 at 10:48:42AM -0800, Khem Raj wrote: > This adds a patch to fix runtime problems loading the kernel module with > kernel 5.10 > > Adds support to build with musl targets > > Add yoe to recognised OE distributions Looks good to me. Should the patch have Upstream-Status? Not sure if it should be "Pending" or something else though... > Signed-off-by: Khem Raj > Cc: Denys Dmytriyenko Reviewed-by: Denys Dmytriyenko > --- > ...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 18 > ...02-Fix-driver-config-for-5.10-kernel.patch | 28 +++ > .../ti-sgx-ddk-km_1.17.4948957.bb | 1 + > 3 files changed, 42 insertions(+), 5 deletions(-) > create mode 100644 > recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > diff --git > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > index 15105eac..d58764fe 100644 > --- > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > +++ > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch > @@ -1,23 +1,31 @@ > -From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001 > +From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001 > From: Denys Dmytriyenko > Date: Mon, 9 Sep 2019 17:05:48 -0400 > -Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > +Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf > suffix > > +OE toolchains are not having armhf in its name but they still are armhf > +ABI, teach this to sgx module build system > + > +recognize musleabi in tuples as well > + > +Add yoe distro support > + > Signed-off-by: Denys Dmytriyenko > +Signed-off-by: Khem Raj > --- > eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > -index dead2f9..2ba3e5e 100644 > +index dead2f9..1b5f090 100644 > --- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > +++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk > @@ -68,12 +68,12 @@ define calculate-compiler-preferred-target > ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),) > $(1)_compiler_preferred_target := aarch64-linux-gnu > endif > -+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > ++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi > arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi > arm-poky-linux-musleabi > arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),) > + $(1)_compiler_preferred_target := arm-linux-gnueabihf > + endif > ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi > armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),) > @@ -30,5 +38,5 @@ index dead2f9..2ba3e5e 100644 > endef > > -- > -2.7.4 > +2.34.1 > > diff --git > a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > new file mode 100644 > index ..d9745703 > --- /dev/null > +++ > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch > @@ -0,0 +1,28 @@ > +From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001 > +From: Paul Barker > +Date: Wed, 27 Oct 2021 10:34:32 +0100 > +Subject: [PATCH 2/2] Fix driver config for 5.10 kernel > + > +See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3. > + > +Ref: BSP-66 > +Signed-off-by: Paul Barker > +--- > + eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 + > + 1 file changed, 1 insertion(+) > + > +diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > +index 3f27926..18d515a 100644 > +--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk > b/eurasia_km/eurasiacon/build/linux2/config/core.mk > +@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),) > + $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE))) > + endif > + > ++PVR_LINUX_MEM_AREA_USE_VMAP = 1 > + ifneq ($(strip $(KERNELDIR)),) > + PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0 > + ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0) > +-- > +2.34.1 > + > diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > index 3848e84e..e6247e08 100644 > --- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb > +++
[meta-ti] [PATCH] ti-sgx-ddk-km: Fix build with kernel 5.10 and musl support
This adds a patch to fix runtime problems loading the kernel module with
kernel 5.10
Adds support to build with musl targets
Add yoe to recognised OE distributions
Signed-off-by: Khem Raj
Cc: Denys Dmytriyenko
---
...mbedded-hardfp-toolchain-w-o-gnueabi.patch | 18
...02-Fix-driver-config-for-5.10-kernel.patch | 28 +++
.../ti-sgx-ddk-km_1.17.4948957.bb | 1 +
3 files changed, 42 insertions(+), 5 deletions(-)
create mode 100644
recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
diff --git
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
index 15105eac..d58764fe 100644
---
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
+++
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch
@@ -1,23 +1,31 @@
-From 755632b4f3a40996a12bc7816a9839af7112040a Mon Sep 17 00:00:00 2001
+From a1c191a020f6eebc9a94b641be1fca7885fc9dd2 Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko
Date: Mon, 9 Sep 2019 17:05:48 -0400
-Subject: [PATCH] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf
+Subject: [PATCH 1/2] km: support OpenEmbedded hardfp toolchain w/o -gnueabihf
suffix
+OE toolchains are not having armhf in its name but they still are armhf
+ABI, teach this to sgx module build system
+
+recognize musleabi in tuples as well
+
+Add yoe distro support
+
Signed-off-by: Denys Dmytriyenko
+Signed-off-by: Khem Raj
---
eurasia_km/eurasiacon/build/linux2/config/compiler.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
-index dead2f9..2ba3e5e 100644
+index dead2f9..1b5f090 100644
--- a/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
+++ b/eurasia_km/eurasiacon/build/linux2/config/compiler.mk
@@ -68,12 +68,12 @@ define calculate-compiler-preferred-target
ifneq ($$(filter aarch64-%,$$($(1)_compiler_preferred_target)),)
$(1)_compiler_preferred_target := aarch64-linux-gnu
endif
-+ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi
arm-poky-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
++ ifneq ($$(filter arm-%-gnueabihf arm-oe-linux-gnueabi
arm-poky-linux-gnueabi arm-yoe-linux-gnueabi arm-oe-linux-musleabi
arm-poky-linux-musleabi
arm-yoe-linux-musleabi,$$($(1)_compiler_preferred_target)),)
+ $(1)_compiler_preferred_target := arm-linux-gnueabihf
+ endif
ifneq ($$(filter arm-%-gnueabi armv7a-cros-linux-gnueabi
armv7hl-redhat-linux-gnueabi,$$($(1)_compiler_preferred_target)),)
@@ -30,5 +38,5 @@ index dead2f9..2ba3e5e 100644
endef
--
-2.7.4
+2.34.1
diff --git
a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
new file mode 100644
index ..d9745703
--- /dev/null
+++
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km/0002-Fix-driver-config-for-5.10-kernel.patch
@@ -0,0 +1,28 @@
+From 57c3aafacde126786077afa7bfc07ec261acffaf Mon Sep 17 00:00:00 2001
+From: Paul Barker
+Date: Wed, 27 Oct 2021 10:34:32 +0100
+Subject: [PATCH 2/2] Fix driver config for 5.10 kernel
+
+See https://github.com/openpvrsgx-devgroup/linux_openpvrsgx/issues/3.
+
+Ref: BSP-66
+Signed-off-by: Paul Barker
+---
+ eurasia_km/eurasiacon/build/linux2/config/core.mk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/eurasia_km/eurasiacon/build/linux2/config/core.mk
b/eurasia_km/eurasiacon/build/linux2/config/core.mk
+index 3f27926..18d515a 100644
+--- a/eurasia_km/eurasiacon/build/linux2/config/core.mk
b/eurasia_km/eurasiacon/build/linux2/config/core.mk
+@@ -590,6 +590,7 @@ ifneq ($(BUFFERCLASS_MODULE),)
+ $(eval $(call BothConfigMake,BUFFERCLASS_MODULE,$(BUFFERCLASS_MODULE)))
+ endif
+
++PVR_LINUX_MEM_AREA_USE_VMAP = 1
+ ifneq ($(strip $(KERNELDIR)),)
+ PVR_LINUX_MEM_AREA_POOL_MAX_PAGES ?= 0
+ ifneq ($(PVR_LINUX_MEM_AREA_POOL_MAX_PAGES),0)
+--
+2.34.1
+
diff --git a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index 3848e84e..e6247e08 100644
--- a/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -22,6 +22,7 @@ BRANCH = "ti-img-sgx/${PV}/k5.10"
SRC_URI =
"git://git.ti.com/graphics/omap5-sgx-ddk-linux.git;protocol=git;branch=${BRANCH}
\
file://0001-km-support-OpenEmbedded-hardfp-toolchain-w-o-gnueabi.patch \
+file://0002-Fix-driver-config-for-5.10-kernel.patch \
"
S = "${WORKDIR}/git"
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14276):
