diff options
author | 2022-05-30 18:51:36 -0400 | |
---|---|---|
committer | 2022-05-31 10:05:28 -0400 | |
commit | 797bcf304890120d1e81dd1f5726c7de23da51cb (patch) | |
tree | 2c7c316e7221874ee93566eb175c3217d4adcd33 /recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch | |
parent | 63512e51692b48ad645dba0a21858cc48d5b416f (diff) |
sllin: switch to updated upstream
Changes:
- Switch the SRC_URI of the sllin driver recipe to point at the new
revived upstream location, update to their latest commit to get
newer kernel support, and drop all the now unnecessary local
patches.
- Added a patch to fix compilation against 5.4 kernels before
5.4.110. This will be worked with upstream as time permits.
- Rename the sllin driver recipe with a _git suffix to match OE
style expectations.
- Added the sllin driver to packagegroup-agl-demo as was being done
in previous releases.
- Split the demo script + service unit and lin_config configuration
out of the sllin driver recipe into a new sllin-demo recipe so
that they're no longer conflated. This should make it easier for
others to reuse the sllin driver recipe.
- Update the SRC_URI and SRCREV of the lin_config recipe to also
point at the new upstream location/version since it comes out of
the same repository.
- Add the new master mode "-m" flag to the lin_config command line
in the start_lin_demo.sh script (now in sllin-demo). This turns
out to be required for our demo usecase as upstream seem to have
inadvertently changed the default behavior.
Bug-AGL: SPEC-4404
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Ic6081184d43c516fc4372919b2cf1ed597a90624
Diffstat (limited to 'recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch')
-rw-r--r-- | recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch b/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch deleted file mode 100644 index f3bcda9f..00000000 --- a/recipes-kernel/sllin/files/0004-Fix-build-with-5.9-kernel.patch +++ /dev/null @@ -1,48 +0,0 @@ -Use sched_set_fifo on newer kernels - -The 5.9 kernel removed the export of sched_setscheduler, use -the new sched_set_fifo API if building on 5.9 or newer. There -is a slight difference in resulting priority level, the new -API will yield a priority of 50 instead of the explicit value -of 40 being used with sched_setscheduler, but this should not -be an issue. - -Upstream-Status: Inappropriate [no upstream] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - ---- -diff --git a/sllin/sllin.c b/sllin/sllin.c -index 133d6e9..92c52ad 100644 ---- a/sllin/sllin.c -+++ b/sllin/sllin.c -@@ -1059,14 +1059,20 @@ static int sllin_kwthread(void *ptr) - { - struct sllin *sl = (struct sllin *)ptr; - struct tty_struct *tty = sl->tty; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0) - struct sched_param schparam = { .sched_priority = 40 }; -+#endif - int tx_bytes = 0; /* Used for Network statistics */ - unsigned long flags; - int lin_id; - struct sllin_conf_entry *sce; - - netdev_dbg(sl->dev, "sllin_kwthread started.\n"); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,9,0) - sched_setscheduler(current, SCHED_FIFO, &schparam); -+#else -+ sched_set_fifo(current); -+#endif - - clear_bit(SLF_ERROR, &sl->flags); - sltty_change_speed(tty, sl->lin_baud); -@@ -1274,8 +1280,8 @@ slstate_response_wait: - sl->lin_state = SLSTATE_RESPONSE_WAIT_BUS; - } - } -+ fallthrough; - -- /* Be aware, no BREAK here */ - case SLSTATE_RESPONSE_WAIT_BUS: - if (sl->rx_cnt < sl->rx_expect) - continue; |