* [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00
2021-04-21 20:53 [dunfell/master PATCH 0/4] K2/AM3/AM4 Build fixes for 5.10 praneeth
@ 2021-04-21 20:53 ` praneeth
2021-04-21 20:59 ` Suman Anna
[not found] ` <1677FB31053272E2.8702@lists.yoctoproject.org>
2021-04-21 20:53 ` [dunfell/master PATCH 2/4] gdbc6x: bump SRCREV for kernel 5.10 build fix praneeth
` (3 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: praneeth @ 2021-04-21 20:53 UTC (permalink / raw)
To: Praneeth Bajjuri
Cc: Denys Dmytriyenko, Lokesh Vutla, Suman Anna, Yogesh Siraswar,
Nishanth Menon, meta-ti
From: Praneeth Bajjuri <praneeth@ti.com>
The update brings the fix for 5.10.x linux kernel.
commit 8aba20e20bf7 ("cmemk: Fix build errors for 5.10+ kernels")
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
---
recipes-bsp/cmem/cmem.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-bsp/cmem/cmem.inc b/recipes-bsp/cmem/cmem.inc
index c2719403..385e1084 100644
--- a/recipes-bsp/cmem/cmem.inc
+++ b/recipes-bsp/cmem/cmem.inc
@@ -4,10 +4,10 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
BRANCH = "master"
-# This corresponds to version 4.16.00.00
-SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"
+# This corresponds to version 4.20.00.00
+SRCREV = "b0b57a4e810d27cbb23cb752ef437019f56a5506"
-PV = "4.16.00.00+git${SRCPV}"
+PV = "4.20.00.00+git${SRCPV}"
SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00
2021-04-21 20:53 ` [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00 praneeth
@ 2021-04-21 20:59 ` Suman Anna
[not found] ` <1677FB31053272E2.8702@lists.yoctoproject.org>
1 sibling, 0 replies; 11+ messages in thread
From: Suman Anna @ 2021-04-21 20:59 UTC (permalink / raw)
To: praneeth
Cc: Denys Dmytriyenko, Lokesh Vutla, Yogesh Siraswar, Nishanth Menon,
meta-ti
On 4/21/21 3:53 PM, praneeth@ti.com wrote:
> From: Praneeth Bajjuri <praneeth@ti.com>
>
> The update brings the fix for 5.10.x linux kernel.
> commit 8aba20e20bf7 ("cmemk: Fix build errors for 5.10+ kernels")
>
> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Reviewed-by: Suman Anna <s-anna@ti.com>
regards
Suman
> ---
> recipes-bsp/cmem/cmem.inc | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/recipes-bsp/cmem/cmem.inc b/recipes-bsp/cmem/cmem.inc
> index c2719403..385e1084 100644
> --- a/recipes-bsp/cmem/cmem.inc
> +++ b/recipes-bsp/cmem/cmem.inc
> @@ -4,10 +4,10 @@ LICENSE = "GPLv2"
> LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
>
> BRANCH = "master"
> -# This corresponds to version 4.16.00.00
> -SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"
> +# This corresponds to version 4.20.00.00
> +SRCREV = "b0b57a4e810d27cbb23cb752ef437019f56a5506"
>
> -PV = "4.16.00.00+git${SRCPV}"
> +PV = "4.20.00.00+git${SRCPV}"
>
> SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread[parent not found: <1677FB31053272E2.8702@lists.yoctoproject.org>]
* Re: [meta-ti] [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00
[not found] ` <1677FB31053272E2.8702@lists.yoctoproject.org>
@ 2021-04-22 15:00 ` Suman Anna
2021-04-22 21:57 ` praneeth
0 siblings, 1 reply; 11+ messages in thread
From: Suman Anna @ 2021-04-22 15:00 UTC (permalink / raw)
To: praneeth
Cc: Denys Dmytriyenko, Lokesh Vutla, Yogesh Siraswar, Nishanth Menon,
meta-ti
Hi Praneeth,
On 4/21/21 3:59 PM, Suman Anna via lists.yoctoproject.org wrote:
> On 4/21/21 3:53 PM, praneeth@ti.com wrote:
>> From: Praneeth Bajjuri <praneeth@ti.com>
>>
>> The update brings the fix for 5.10.x linux kernel.
>> commit 8aba20e20bf7 ("cmemk: Fix build errors for 5.10+ kernels")
>>
>> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
>
> Reviewed-by: Suman Anna <s-anna@ti.com>
Sorry, realized that my patches fixed the issue only for K2 builds originally,
and I had a bug that fails the builds for non-K2 platforms. I have since fixed
those, so please update use 4.20.00.01 instead.
regards
Suman
>
> regards
> Suman
>
>> ---
>> recipes-bsp/cmem/cmem.inc | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/recipes-bsp/cmem/cmem.inc b/recipes-bsp/cmem/cmem.inc
>> index c2719403..385e1084 100644
>> --- a/recipes-bsp/cmem/cmem.inc
>> +++ b/recipes-bsp/cmem/cmem.inc
>> @@ -4,10 +4,10 @@ LICENSE = "GPLv2"
>> LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
>>
>> BRANCH = "master"
>> -# This corresponds to version 4.16.00.00
>> -SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"
>> +# This corresponds to version 4.20.00.00
>> +SRCREV = "b0b57a4e810d27cbb23cb752ef437019f56a5506"
>>
>> -PV = "4.16.00.00+git${SRCPV}"
>> +PV = "4.20.00.00+git${SRCPV}"
>>
>> SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
>>
>>
>
>
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [meta-ti] [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00
2021-04-22 15:00 ` [meta-ti] " Suman Anna
@ 2021-04-22 21:57 ` praneeth
0 siblings, 0 replies; 11+ messages in thread
From: praneeth @ 2021-04-22 21:57 UTC (permalink / raw)
To: Suman Anna
Cc: Denys Dmytriyenko, Lokesh Vutla, Yogesh Siraswar, Nishanth Menon,
meta-ti
On 4/22/2021 10:00 AM, Suman Anna wrote:
> Hi Praneeth,
>
> On 4/21/21 3:59 PM, Suman Anna via lists.yoctoproject.org wrote:
>> On 4/21/21 3:53 PM, praneeth@ti.com wrote:
>>> From: Praneeth Bajjuri <praneeth@ti.com>
>>>
>>> The update brings the fix for 5.10.x linux kernel.
>>> commit 8aba20e20bf7 ("cmemk: Fix build errors for 5.10+ kernels")
>>>
>>> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
>>
>> Reviewed-by: Suman Anna <s-anna@ti.com>
>
> Sorry, realized that my patches fixed the issue only for K2 builds originally,
> and I had a bug that fails the builds for non-K2 platforms. I have since fixed
> those, so please update use 4.20.00.01 instead.
Thanks for the note, sent a v2.
>
> regards
> Suman
>
>>
>> regards
>> Suman
>>
>>> ---
>>> recipes-bsp/cmem/cmem.inc | 6 +++---
>>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/recipes-bsp/cmem/cmem.inc b/recipes-bsp/cmem/cmem.inc
>>> index c2719403..385e1084 100644
>>> --- a/recipes-bsp/cmem/cmem.inc
>>> +++ b/recipes-bsp/cmem/cmem.inc
>>> @@ -4,10 +4,10 @@ LICENSE = "GPLv2"
>>> LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
>>>
>>> BRANCH = "master"
>>> -# This corresponds to version 4.16.00.00
>>> -SRCREV = "4f970f053b42e8d2a6f1a8cd4b14786196468fd3"
>>> +# This corresponds to version 4.20.00.00
>>> +SRCREV = "b0b57a4e810d27cbb23cb752ef437019f56a5506"
>>>
>>> -PV = "4.16.00.00+git${SRCPV}"
>>> +PV = "4.20.00.00+git${SRCPV}"
>>>
>>> SRC_URI = "git://git.ti.com/ipc/ludev.git;protocol=git;branch=${BRANCH}"
>>>
>>>
>>
>>
>>
>>
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dunfell/master PATCH 2/4] gdbc6x: bump SRCREV for kernel 5.10 build fix
2021-04-21 20:53 [dunfell/master PATCH 0/4] K2/AM3/AM4 Build fixes for 5.10 praneeth
2021-04-21 20:53 ` [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00 praneeth
@ 2021-04-21 20:53 ` praneeth
2021-04-21 20:58 ` Suman Anna
2021-04-21 20:53 ` [dunfell/master PATCH 3/4] dsptop: " praneeth
` (2 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: praneeth @ 2021-04-21 20:53 UTC (permalink / raw)
To: Praneeth Bajjuri
Cc: Denys Dmytriyenko, Lokesh Vutla, Suman Anna, Yogesh Siraswar,
Nishanth Menon, meta-ti
From: Praneeth Bajjuri <praneeth@ti.com>
bump SRCREV to latest to pick build fix for 5.10 kernel.
this update picks
commit dd0c82fb5763 ("Merge pull request #1 in DBG/gdbc6x from for-5.10 to master")
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
---
recipes-devtools/gdbc6x/gdbc6x.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-devtools/gdbc6x/gdbc6x.inc b/recipes-devtools/gdbc6x/gdbc6x.inc
index f0d702a0..eeb18fb1 100644
--- a/recipes-devtools/gdbc6x/gdbc6x.inc
+++ b/recipes-devtools/gdbc6x/gdbc6x.inc
@@ -1,8 +1,8 @@
# This corresponds to version 1.1.0
-SRCREV = "d1d32c32fa9e40b48fabf5893487ccbd5790499c"
+SRCREV = "dd0c82fb5763a6b32dc6d68e561efb66ab8283d7"
PV = "1.1.0"
-INC_PR = "r6"
+INC_PR = "r7"
SRC_URI = "git://git.ti.com/sdo-emu/gdbc6x.git;protocol=git;branch=${BRANCH}"
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [dunfell/master PATCH 2/4] gdbc6x: bump SRCREV for kernel 5.10 build fix
2021-04-21 20:53 ` [dunfell/master PATCH 2/4] gdbc6x: bump SRCREV for kernel 5.10 build fix praneeth
@ 2021-04-21 20:58 ` Suman Anna
0 siblings, 0 replies; 11+ messages in thread
From: Suman Anna @ 2021-04-21 20:58 UTC (permalink / raw)
To: praneeth
Cc: Denys Dmytriyenko, Lokesh Vutla, Yogesh Siraswar, Nishanth Menon,
meta-ti
On 4/21/21 3:53 PM, praneeth@ti.com wrote:
> From: Praneeth Bajjuri <praneeth@ti.com>
>
> bump SRCREV to latest to pick build fix for 5.10 kernel.
> this update picks
> commit dd0c82fb5763 ("Merge pull request #1 in DBG/gdbc6x from for-5.10 to master")
>
> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Reviewed-by: Suman Anna <s-anna@ti.com>
regards
Suman
> ---
> recipes-devtools/gdbc6x/gdbc6x.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-devtools/gdbc6x/gdbc6x.inc b/recipes-devtools/gdbc6x/gdbc6x.inc
> index f0d702a0..eeb18fb1 100644
> --- a/recipes-devtools/gdbc6x/gdbc6x.inc
> +++ b/recipes-devtools/gdbc6x/gdbc6x.inc
> @@ -1,8 +1,8 @@
> # This corresponds to version 1.1.0
> -SRCREV = "d1d32c32fa9e40b48fabf5893487ccbd5790499c"
> +SRCREV = "dd0c82fb5763a6b32dc6d68e561efb66ab8283d7"
>
> PV = "1.1.0"
> -INC_PR = "r6"
> +INC_PR = "r7"
>
> SRC_URI = "git://git.ti.com/sdo-emu/gdbc6x.git;protocol=git;branch=${BRANCH}"
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dunfell/master PATCH 3/4] dsptop: bump SRCREV for kernel 5.10 build fix
2021-04-21 20:53 [dunfell/master PATCH 0/4] K2/AM3/AM4 Build fixes for 5.10 praneeth
2021-04-21 20:53 ` [dunfell/master PATCH 1/4] cmem: Update to new version 4.20.00.00 praneeth
2021-04-21 20:53 ` [dunfell/master PATCH 2/4] gdbc6x: bump SRCREV for kernel 5.10 build fix praneeth
@ 2021-04-21 20:53 ` praneeth
2021-04-21 20:58 ` Suman Anna
2021-04-21 20:53 ` [dunfell/master PATCH 4/4] uio-module-drv: Build fix for linux kernel 5.10 praneeth
[not found] ` <1677FADB0573C7FC.32615@lists.yoctoproject.org>
4 siblings, 1 reply; 11+ messages in thread
From: praneeth @ 2021-04-21 20:53 UTC (permalink / raw)
To: Praneeth Bajjuri
Cc: Denys Dmytriyenko, Lokesh Vutla, Suman Anna, Yogesh Siraswar,
Nishanth Menon, meta-ti
From: Praneeth Bajjuri <praneeth@ti.com>
bump SRCREV to latest to pick build fix for 5.10 kernel.
this update picks
commit 816485e68430 ("Merge pull request #1 in DBG/dsptop from for-5.10 to master")
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
---
recipes-bsp/dsptop/dsptop.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-bsp/dsptop/dsptop.inc b/recipes-bsp/dsptop/dsptop.inc
index 6bc38373..31f775e2 100644
--- a/recipes-bsp/dsptop/dsptop.inc
+++ b/recipes-bsp/dsptop/dsptop.inc
@@ -1,7 +1,7 @@
# This corresponds to version 1.4.0
-SRCREV = "25e823b04e62af224dce97b90359b7569ce3fbb5"
+SRCREV = "816485e68430bbec643eac9498bfa5303eb2c2e1"
PV = "1.4.0"
-INC_PR = "r1"
+INC_PR = "r2"
SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [dunfell/master PATCH 3/4] dsptop: bump SRCREV for kernel 5.10 build fix
2021-04-21 20:53 ` [dunfell/master PATCH 3/4] dsptop: " praneeth
@ 2021-04-21 20:58 ` Suman Anna
0 siblings, 0 replies; 11+ messages in thread
From: Suman Anna @ 2021-04-21 20:58 UTC (permalink / raw)
To: praneeth
Cc: Denys Dmytriyenko, Lokesh Vutla, Yogesh Siraswar, Nishanth Menon,
meta-ti
On 4/21/21 3:53 PM, praneeth@ti.com wrote:
> From: Praneeth Bajjuri <praneeth@ti.com>
>
> bump SRCREV to latest to pick build fix for 5.10 kernel.
> this update picks
> commit 816485e68430 ("Merge pull request #1 in DBG/dsptop from for-5.10 to master")
>
> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Reviewed-by: Suman Anna <s-anna@ti.com>
regards
Suman
> ---
> recipes-bsp/dsptop/dsptop.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-bsp/dsptop/dsptop.inc b/recipes-bsp/dsptop/dsptop.inc
> index 6bc38373..31f775e2 100644
> --- a/recipes-bsp/dsptop/dsptop.inc
> +++ b/recipes-bsp/dsptop/dsptop.inc
> @@ -1,7 +1,7 @@
> # This corresponds to version 1.4.0
> -SRCREV = "25e823b04e62af224dce97b90359b7569ce3fbb5"
> +SRCREV = "816485e68430bbec643eac9498bfa5303eb2c2e1"
> PV = "1.4.0"
> -INC_PR = "r1"
> +INC_PR = "r2"
>
> SRC_URI = "git://git.ti.com/sdo-emu/dsptop.git;protocol=git;branch=${BRANCH}"
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [dunfell/master PATCH 4/4] uio-module-drv: Build fix for linux kernel 5.10
2021-04-21 20:53 [dunfell/master PATCH 0/4] K2/AM3/AM4 Build fixes for 5.10 praneeth
` (2 preceding siblings ...)
2021-04-21 20:53 ` [dunfell/master PATCH 3/4] dsptop: " praneeth
@ 2021-04-21 20:53 ` praneeth
[not found] ` <1677FADB0573C7FC.32615@lists.yoctoproject.org>
4 siblings, 0 replies; 11+ messages in thread
From: praneeth @ 2021-04-21 20:53 UTC (permalink / raw)
To: Praneeth Bajjuri
Cc: Denys Dmytriyenko, Lokesh Vutla, Suman Anna, Yogesh Siraswar,
Nishanth Menon, meta-ti
From: Praneeth Bajjuri <praneeth@ti.com>
This update contains build fix for linux kernel 5.10
* uio-module-drv: Replace ioremap_nocache with ioremap
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
---
recipes-bsp/uio-module-drv/uio-module-drv.inc | 7 +++-
...Replace-ioremap_nocache-with-ioremap.patch | 35 +++++++++++++++++++
2 files changed, 41 insertions(+), 1 deletion(-)
create mode 100644 recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
diff --git a/recipes-bsp/uio-module-drv/uio-module-drv.inc b/recipes-bsp/uio-module-drv/uio-module-drv.inc
index f483010e..ab1beb9f 100644
--- a/recipes-bsp/uio-module-drv/uio-module-drv.inc
+++ b/recipes-bsp/uio-module-drv/uio-module-drv.inc
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend:= "${THISDIR}/${PN}:"
+
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
@@ -9,7 +11,10 @@ PV = "2.2.1.0+git${SRCPV}"
UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git"
UIO_MODULE_DRV_GIT_PROTOCOL = "git"
-SRC_URI = "${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}"
+SRC_URI = " \
+ ${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH} \
+ file://0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch \
+"
SRCREV = "${UIO_MODULE_DRV_SRCREV}"
diff --git a/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch b/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
new file mode 100644
index 00000000..955ef558
--- /dev/null
+++ b/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
@@ -0,0 +1,35 @@
+From b5c4036dac06817bffd0be21c5fa1b7f75f74e4b Mon Sep 17 00:00:00 2001
+From: Suman Anna <s-anna@ti.com>
+Date: Mon, 19 Apr 2021 13:15:51 -0500
+Subject: [PATCH] uio-module-drv: Replace ioremap_nocache with ioremap
+
+The ioremap_nocache is the same as the regular ioremap and its
+definition has been dropped from the Linux kernel v5.6 onwards in
+commit 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
+[1]. The uio-module-drv module fails to build against these newer
+kernels, so fix it by simply replacing ioremap_nocache with ioremap.
+
+[1]
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4bdc0d676a643140bdf17dbf7eafedee3d496a3c
+
+Signed-off-by: Suman Anna <s-anna@ti.com>
+---
+ uio_module_drv.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/uio_module_drv.c b/uio_module_drv.c
+index 5a67dd199e21..7cc6005d1f05 100644
+--- a/uio_module_drv.c
++++ b/uio_module_drv.c
+@@ -240,7 +240,7 @@ static ssize_t uio_module_drv_transfer(struct file *file, char __user *buf,
+ return -EINVAL;
+ }
+
+- virt_addr_p = ioremap_nocache(phys_addr, count);
++ virt_addr_p = ioremap(phys_addr, count);
+ if (!virt_addr_p) {
+ dev_err(uio_module_drv->dev, "Mapping of virtual memory failed\n");
+ return(-ENOMEM);
+--
+2.30.1
+
--
2.17.1
^ permalink raw reply related [flat|nested] 11+ messages in thread[parent not found: <1677FADB0573C7FC.32615@lists.yoctoproject.org>]
* Re: [meta-ti] [dunfell/master PATCH 4/4] uio-module-drv: Build fix for linux kernel 5.10
[not found] ` <1677FADB0573C7FC.32615@lists.yoctoproject.org>
@ 2021-04-22 6:35 ` praneeth
0 siblings, 0 replies; 11+ messages in thread
From: praneeth @ 2021-04-22 6:35 UTC (permalink / raw)
To: meta-ti
Cc: Denys Dmytriyenko, Lokesh Vutla, Suman Anna, Yogesh Siraswar,
Nishanth Menon
On 4/21/2021 3:53 PM, praneeth via lists.yoctoproject.org wrote:
> From: Praneeth Bajjuri <praneeth@ti.com>
>
> This update contains build fix for linux kernel 5.10
> * uio-module-drv: Replace ioremap_nocache with ioremap
>
> Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
> ---
> recipes-bsp/uio-module-drv/uio-module-drv.inc | 7 +++-
> ...Replace-ioremap_nocache-with-ioremap.patch | 35 +++++++++++++++++++
> 2 files changed, 41 insertions(+), 1 deletion(-)
> create mode 100644 recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
>
> diff --git a/recipes-bsp/uio-module-drv/uio-module-drv.inc b/recipes-bsp/uio-module-drv/uio-module-drv.inc
> index f483010e..ab1beb9f 100644
> --- a/recipes-bsp/uio-module-drv/uio-module-drv.inc
> +++ b/recipes-bsp/uio-module-drv/uio-module-drv.inc
> @@ -1,3 +1,5 @@
> +FILESEXTRAPATHS_prepend:= "${THISDIR}/${PN}:"
> +
> LICENSE = "BSD"
> LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2b7c96eb2aed7b0f6f922214dbde9016"
>
> @@ -9,7 +11,10 @@ PV = "2.2.1.0+git${SRCPV}"
>
> UIO_MODULE_DRV_GIT_URI = "git://git.ti.com/keystone-linux/uio-module-drv.git"
> UIO_MODULE_DRV_GIT_PROTOCOL = "git"
> -SRC_URI = "${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH}"
> +SRC_URI = " \
> + ${UIO_MODULE_DRV_GIT_URI};protocol=${UIO_MODULE_DRV_GIT_PROTOCOL};branch=${BRANCH} \
> + file://0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch \
> +"
uio-module-drv.inc doesnt look like a right place. Will send v2 only for
this patch.
>
> SRCREV = "${UIO_MODULE_DRV_SRCREV}"
>
> diff --git a/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch b/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
> new file mode 100644
> index 00000000..955ef558
> --- /dev/null
> +++ b/recipes-bsp/uio-module-drv/uio-module-drv/0001-uio-module-drv-Replace-ioremap_nocache-with-ioremap.patch
> @@ -0,0 +1,35 @@
> +From b5c4036dac06817bffd0be21c5fa1b7f75f74e4b Mon Sep 17 00:00:00 2001
> +From: Suman Anna <s-anna@ti.com>
> +Date: Mon, 19 Apr 2021 13:15:51 -0500
> +Subject: [PATCH] uio-module-drv: Replace ioremap_nocache with ioremap
> +
> +The ioremap_nocache is the same as the regular ioremap and its
> +definition has been dropped from the Linux kernel v5.6 onwards in
> +commit 4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")
> +[1]. The uio-module-drv module fails to build against these newer
> +kernels, so fix it by simply replacing ioremap_nocache with ioremap.
> +
> +[1]
> +https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4bdc0d676a643140bdf17dbf7eafedee3d496a3c
> +
> +Signed-off-by: Suman Anna <s-anna@ti.com>
> +---
> + uio_module_drv.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/uio_module_drv.c b/uio_module_drv.c
> +index 5a67dd199e21..7cc6005d1f05 100644
> +--- a/uio_module_drv.c
> ++++ b/uio_module_drv.c
> +@@ -240,7 +240,7 @@ static ssize_t uio_module_drv_transfer(struct file *file, char __user *buf,
> + return -EINVAL;
> + }
> +
> +- virt_addr_p = ioremap_nocache(phys_addr, count);
> ++ virt_addr_p = ioremap(phys_addr, count);
> + if (!virt_addr_p) {
> + dev_err(uio_module_drv->dev, "Mapping of virtual memory failed\n");
> + return(-ENOMEM);
> +--
> +2.30.1
> +
>
>
>
>
>
^ permalink raw reply [flat|nested] 11+ messages in thread