From 76e472ece2b86dd957b14dce9b78d409b5f23fbb Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Tue, 1 Jun 2021 11:13:59 -0500 Subject: [PATCH] kernel v5.13-rc4 rebase with: device-tree/etc AUFS: https://github.com/sfjro/aufs5-standalone/commit/f6866937f66eb6ceacfed9b4fe534611030cc813 BBDTBS: https://github.com/beagleboard/BeagleBoard-DeviceTrees/commit/2f0e7da6ad520375b72f9fc6a63828f06f985ae7 TI_AMX3_CM3: http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c WPANUSB: https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a WIRELESS_REGDB: https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=04f3e5411b1cdc59292775e7b8e05a5d35ea4a80 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- patch.sh | 8 +- patches/defconfig | 25 ++-- ...onfigure-pinmux-from-pins-debug-file.patch | 121 ------------------ ...ngle-set-pinmux-from-pins-debug-file.patch | 62 --------- ...-AM335x-CM3-Power-Managment-Firmware.patch | 4 +- patches/ref_omap2plus_defconfig | 19 ++- ...001-Add-BeagleBoard.org-DTBS-v5.13.x.patch | 4 +- ...eless-regdb-regulatory-database-file.patch | 4 +- ...sb-https-github.com-statropy-wpanusb.patch | 4 +- version.sh | 4 +- 10 files changed, 42 insertions(+), 213 deletions(-) delete mode 100644 patches/drivers/pinctrl/0001-pinctrl-core-configure-pinmux-from-pins-debug-file.patch delete mode 100644 patches/drivers/pinctrl/0002-pinctrl-single-set-pinmux-from-pins-debug-file.patch diff --git a/patch.sh b/patch.sh index dc2ff6281..6aceb6f73 100644 --- a/patch.sh +++ b/patch.sh @@ -377,10 +377,10 @@ beagleboard_dtbs () { cp -vr ../${work_dir}/src/arm/* arch/arm/boot/dts/ cp -vr ../${work_dir}/include/dt-bindings/* ./include/dt-bindings/ -# device="am335x-bonegreen-gateway.dtb" ; dtb_makefile_append + #device="am335x-bonegreen-gateway.dtb" ; dtb_makefile_append -# device="am335x-boneblack-uboot.dtb" ; dtb_makefile_append -# device="am335x-sancloud-bbe-uboot.dtb" ; dtb_makefile_append + #device="am335x-boneblack-uboot.dtb" ; dtb_makefile_append + #device="am335x-sancloud-bbe-uboot.dtb" ; dtb_makefile_append #device="am335x-bone-uboot-univ.dtb" ; dtb_makefile_append #device="am335x-boneblack-uboot-univ.dtb" ; dtb_makefile_append @@ -543,7 +543,7 @@ soc packaging () { #do_backport="enable" if [ "x${do_backport}" = "xenable" ] ; then - backport_tag="v5.10.39" + backport_tag="v5.10.41" subsystem="bindeb-pkg" #regenerate="enable" diff --git a/patches/defconfig b/patches/defconfig index b9988f265..1ad287697 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.13.0-rc3 Kernel Configuration +# Linux/arm 5.13.0-rc4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y @@ -79,6 +79,20 @@ CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y # end of Timers subsystem +CONFIG_BPF=y +CONFIG_HAVE_EBPF_JIT=y + +# +# BPF subsystem +# +CONFIG_BPF_SYSCALL=y +CONFIG_BPF_JIT=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set +# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set +# CONFIG_BPF_PRELOAD is not set +CONFIG_BPF_LSM=y +# end of BPF subsystem + # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y @@ -176,7 +190,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y CONFIG_LD_ORPHAN_WARN=y CONFIG_SYSCTL=y CONFIG_HAVE_UID16=y -CONFIG_BPF=y CONFIG_EXPERT=y CONFIG_UID16=y CONFIG_MULTIUSER=y @@ -203,10 +216,6 @@ CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_BASE_RELATIVE=y -CONFIG_BPF_LSM=y -CONFIG_BPF_SYSCALL=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set -# CONFIG_BPF_PRELOAD is not set CONFIG_USERFAULTFD=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y @@ -1572,7 +1581,6 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -CONFIG_BPF_JIT=y CONFIG_BPF_STREAM_PARSER=y # @@ -1806,7 +1814,6 @@ CONFIG_NET_SOCK_MSG=y CONFIG_PAGE_POOL=y CONFIG_FAILOVER=m CONFIG_ETHTOOL_NETLINK=y -CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -2055,6 +2062,7 @@ CONFIG_BLK_DEV_RBD=m # NVME Support # # CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -3082,7 +3090,6 @@ CONFIG_SPI_MEM=y # SPI Master Controller Drivers # # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BITBANG=y # CONFIG_SPI_CADENCE is not set diff --git a/patches/drivers/pinctrl/0001-pinctrl-core-configure-pinmux-from-pins-debug-file.patch b/patches/drivers/pinctrl/0001-pinctrl-core-configure-pinmux-from-pins-debug-file.patch deleted file mode 100644 index 1dd742a80..000000000 --- a/patches/drivers/pinctrl/0001-pinctrl-core-configure-pinmux-from-pins-debug-file.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 9349bdfd90fb62f593d36d3522ad301575e30cc9 Mon Sep 17 00:00:00 2001 -From: Dario Binacchi <dariobin@libero.it> -Date: Sun, 16 May 2021 15:55:30 +0200 -Subject: [PATCH 1/2] pinctrl: core: configure pinmux from pins debug file - -The MPUs of some architectures (e.g AM335x) must be in privileged -operating mode to write on the pinmux registers. In such cases, where -writes will not work from user space, now it can be done from the pins -debug file if the platform driver exports the pin_dbg_set() helper among -the registered operations. - -Signed-off-by: Dario Binacchi <dariobin@libero.it> ---- - drivers/pinctrl/core.c | 56 +++++++++++++++++++++++++++++++-- - include/linux/pinctrl/pinctrl.h | 2 ++ - 2 files changed, 56 insertions(+), 2 deletions(-) - -diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c -index a4ac87c8b4f8..f5c9a7d44039 100644 ---- a/drivers/pinctrl/core.c -+++ b/drivers/pinctrl/core.c -@@ -1620,6 +1620,46 @@ EXPORT_SYMBOL_GPL(pinctrl_pm_select_idle_state); - - #ifdef CONFIG_DEBUG_FS - -+static ssize_t pinctrl_pins_write(struct file *file, -+ const char __user *user_buf, size_t count, -+ loff_t *ppos) -+{ -+ struct seq_file *s = file->private_data; -+ struct pinctrl_dev *pctldev = s->private; -+ const struct pinctrl_ops *ops = pctldev->desc->pctlops; -+ char buf[32]; -+ char *c = &buf[0]; -+ char *token; -+ int ret, buf_size; -+ unsigned int i, pin; -+ -+ if (!ops->pin_dbg_set) -+ return -EFAULT; -+ -+ /* Get userspace string and assure termination */ -+ buf_size = min(count, sizeof(buf) - 1); -+ if (copy_from_user(buf, user_buf, buf_size)) -+ return -EFAULT; -+ -+ buf[buf_size] = 0; -+ token = strsep(&c, " "); -+ if (kstrtouint(token, 0, &pin)) -+ return -EINVAL; -+ -+ for (i = 0; i < pctldev->desc->npins; i++) { -+ if (pin != pctldev->desc->pins[i].number) -+ continue; -+ -+ ret = ops->pin_dbg_set(pctldev, pin, c); -+ if (ret) -+ return ret; -+ -+ return count; -+ } -+ -+ return -EINVAL; -+} -+ - static int pinctrl_pins_show(struct seq_file *s, void *what) - { - struct pinctrl_dev *pctldev = s->private; -@@ -1677,7 +1717,11 @@ static int pinctrl_pins_show(struct seq_file *s, void *what) - - return 0; - } --DEFINE_SHOW_ATTRIBUTE(pinctrl_pins); -+ -+static int pinctrl_pins_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, pinctrl_pins_show, inode->i_private); -+} - - static int pinctrl_groups_show(struct seq_file *s, void *what) - { -@@ -1886,6 +1930,14 @@ static int pinctrl_show(struct seq_file *s, void *what) - } - DEFINE_SHOW_ATTRIBUTE(pinctrl); - -+static const struct file_operations pinctrl_pins_fops = { -+ .open = pinctrl_pins_open, -+ .read = seq_read, -+ .write = pinctrl_pins_write, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ - static struct dentry *debugfs_root; - - static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev) -@@ -1915,7 +1967,7 @@ static void pinctrl_init_device_debugfs(struct pinctrl_dev *pctldev) - dev_name(pctldev->dev)); - return; - } -- debugfs_create_file("pins", 0444, -+ debugfs_create_file("pins", 0644, - device_root, pctldev, &pinctrl_pins_fops); - debugfs_create_file("pingroups", 0444, - device_root, pctldev, &pinctrl_groups_fops); -diff --git a/include/linux/pinctrl/pinctrl.h b/include/linux/pinctrl/pinctrl.h -index 70b45d28e7a9..6db4a775f549 100644 ---- a/include/linux/pinctrl/pinctrl.h -+++ b/include/linux/pinctrl/pinctrl.h -@@ -95,6 +95,8 @@ struct pinctrl_ops { - unsigned *num_pins); - void (*pin_dbg_show) (struct pinctrl_dev *pctldev, struct seq_file *s, - unsigned offset); -+ int (*pin_dbg_set) (struct pinctrl_dev *pctldev, unsigned int offset, -+ char *buf); - int (*dt_node_to_map) (struct pinctrl_dev *pctldev, - struct device_node *np_config, - struct pinctrl_map **map, unsigned *num_maps); --- -2.30.2 - diff --git a/patches/drivers/pinctrl/0002-pinctrl-single-set-pinmux-from-pins-debug-file.patch b/patches/drivers/pinctrl/0002-pinctrl-single-set-pinmux-from-pins-debug-file.patch deleted file mode 100644 index faf0af6ee..000000000 --- a/patches/drivers/pinctrl/0002-pinctrl-single-set-pinmux-from-pins-debug-file.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 78587f70752936f614b74564e97c49541fd9f10c Mon Sep 17 00:00:00 2001 -From: Dario Binacchi <dariobin@libero.it> -Date: Sun, 16 May 2021 15:55:31 +0200 -Subject: [PATCH 2/2] pinctrl: single: set pinmux from pins debug file - -As described in section 9.1 of the TI reference manual for AM335x [1], -"For writing to the control module registers, the MPU will need to be in -privileged mode of operation and writes will not work from user mode". -By adding the pin_dbg_set helper to pcs_pinctrl_ops it will be possible -to write these registers from the pins debug: - -cd /sys/kernel/debug/pinctrl/44e10800.pinmux-pinctrl-single/ -echo <pin-number> <reg-value> >pins - -[1] https://www.ti.com/lit/ug/spruh73q/spruh73q.pdf - -Signed-off-by: Dario Binacchi <dariobin@libero.it> ---- - drivers/pinctrl/pinctrl-single.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c -index 2c9c9835f375..cdbc2298360d 100644 ---- a/drivers/pinctrl/pinctrl-single.c -+++ b/drivers/pinctrl/pinctrl-single.c -@@ -313,6 +313,23 @@ static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev, - seq_printf(s, "%zx %08x %s ", pa, val, DRIVER_NAME); - } - -+static int pcs_pin_dbg_set(struct pinctrl_dev *pctldev, unsigned int pin, -+ char *buf) -+{ -+ struct pcs_device *pcs; -+ unsigned int val, mux_bytes; -+ -+ buf = skip_spaces(buf); -+ if (kstrtouint(buf, 0, &val)) -+ return -EINVAL; -+ -+ pcs = pinctrl_dev_get_drvdata(pctldev); -+ -+ mux_bytes = pcs->width / BITS_PER_BYTE; -+ pcs->write(val, pcs->base + pin * mux_bytes); -+ return 0; -+} -+ - static void pcs_dt_free_map(struct pinctrl_dev *pctldev, - struct pinctrl_map *map, unsigned num_maps) - { -@@ -331,6 +348,9 @@ static const struct pinctrl_ops pcs_pinctrl_ops = { - .get_group_name = pinctrl_generic_get_group_name, - .get_group_pins = pinctrl_generic_get_group_pins, - .pin_dbg_show = pcs_pin_dbg_show, -+#if IS_ENABLED(CONFIG_DEVMEM) && IS_ENABLED(CONFIG_SOC_AM33XX) -+ .pin_dbg_set = pcs_pin_dbg_set, -+#endif - .dt_node_to_map = pcs_dt_node_to_map, - .dt_free_map = pcs_dt_free_map, - }; --- -2.30.2 - diff --git a/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch b/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch index 5be76ff01..c67706b34 100644 --- a/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch +++ b/patches/drivers/ti/firmware/0001-Add-AM335x-CM3-Power-Managment-Firmware.patch @@ -1,6 +1,6 @@ -From beb0e9343221190e440e9b685bb5ee7763e98a76 Mon Sep 17 00:00:00 2001 +From 79bfd7fade7a006c880bb9219999a43fb331a747 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 25 May 2021 09:37:35 -0500 +Date: Tue, 1 Jun 2021 10:59:07 -0500 Subject: [PATCH] Add AM335x CM3 Power Managment Firmware http://git.ti.com/gitweb/?p=processor-firmware/ti-amx3-cm3-pm-firmware.git;a=commit;h=fb484c5e54f2e31cf0a338d2927a06a2870bcc2c diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 38ba32b2a..832edd3e4 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.13.0-rc3 Kernel Configuration +# Linux/arm 5.13.0-rc4 Kernel Configuration # CONFIG_CC_VERSION_TEXT="arm-linux-gnueabi-gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y @@ -87,6 +87,16 @@ CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y # end of Timers subsystem +CONFIG_BPF=y +CONFIG_HAVE_EBPF_JIT=y + +# +# BPF subsystem +# +# CONFIG_BPF_SYSCALL is not set +# CONFIG_BPF_JIT is not set +# end of BPF subsystem + CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -177,7 +187,6 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y CONFIG_LD_ORPHAN_WARN=y CONFIG_SYSCTL=y CONFIG_HAVE_UID16=y -CONFIG_BPF=y CONFIG_EXPERT=y CONFIG_UID16=y CONFIG_MULTIUSER=y @@ -204,7 +213,6 @@ CONFIG_MEMBARRIER=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_ALL is not set CONFIG_KALLSYMS_BASE_RELATIVE=y -# CONFIG_BPF_SYSCALL is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y CONFIG_KCMP=y @@ -1349,7 +1357,6 @@ CONFIG_XPS=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_NET_RX_BUSY_POLL=y CONFIG_BQL=y -# CONFIG_BPF_JIT is not set CONFIG_NET_FLOW_LIMIT=y # @@ -1521,7 +1528,6 @@ CONFIG_NET_DEVLINK=y CONFIG_PAGE_POOL=y # CONFIG_FAILOVER is not set CONFIG_ETHTOOL_NETLINK=y -CONFIG_HAVE_EBPF_JIT=y # # Device Drivers @@ -1857,6 +1863,7 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 # # CONFIG_BLK_DEV_NVME is not set # CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -2901,7 +2908,6 @@ CONFIG_SPI_MEM=y # SPI Master Controller Drivers # # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BITBANG=m # CONFIG_SPI_CADENCE is not set @@ -6349,7 +6355,6 @@ CONFIG_AUTOFS_FS=m # # Caches # -# CONFIG_NETFS_SUPPORT is not set # CONFIG_FSCACHE is not set # end of Caches diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch index e9aaae880..19760fb92 100644 --- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch +++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-DTBS-v5.13.x.patch @@ -1,6 +1,6 @@ -From 6ed22502e1ebde4cd1662363e91bb99e39ac5b9b Mon Sep 17 00:00:00 2001 +From 2385027305417e2ac564019f56a18a94f8b4e904 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Fri, 28 May 2021 14:59:03 -0500 +Date: Tue, 1 Jun 2021 10:59:55 -0500 Subject: [PATCH] Add BeagleBoard.org DTBS: v5.13.x https://github.com/beagleboard/BeagleBoard-DeviceTrees/tree/v5.13.x diff --git a/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch index bc3b5e69d..2825a85e5 100644 --- a/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch +++ b/patches/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch @@ -1,6 +1,6 @@ -From a3093eca720c086488f914f32922ff261598a21f Mon Sep 17 00:00:00 2001 +From 37858bff46a50215f4b6dfa2c1822a97983fbb3e Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 25 May 2021 09:36:41 -0500 +Date: Tue, 1 Jun 2021 10:58:47 -0500 Subject: [PATCH] Add wireless-regdb regulatory database file https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=04f3e5411b1cdc59292775e7b8e05a5d35ea4a80 diff --git a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch index 726b8844a..eec2621c5 100644 --- a/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch +++ b/patches/wpanusb/0001-merge-wpanusb-https-github.com-statropy-wpanusb.patch @@ -1,6 +1,6 @@ -From 1cd9de856bca1d73bbf6bf843386d7c0dd3b93c7 Mon Sep 17 00:00:00 2001 +From 532363d4bcbabf6a3bd2e7c4c86ccb8922871be9 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 25 May 2021 09:36:31 -0500 +Date: Tue, 1 Jun 2021 10:58:25 -0500 Subject: [PATCH] merge: wpanusb: https://github.com/statropy/wpanusb https://github.com/statropy/wpanusb/commit/251f0167545bf2dcaa3cad991a59dbf5ab05490a diff --git a/version.sh b/version.sh index dd827c9d1..baf870b1d 100644 --- a/version.sh +++ b/version.sh @@ -35,10 +35,10 @@ toolchain="gcc_10_arm" #Kernel KERNEL_REL=5.13 -KERNEL_TAG=${KERNEL_REL}-rc3 +KERNEL_TAG=${KERNEL_REL}-rc4 kernel_rt=".X-rtY" #Kernel Build -BUILD=${build_prefix}3 +BUILD=${build_prefix}3.1 #v5.X-rcX + upto SHA #prev_KERNEL_SHA="" -- GitLab