RevolutionPi · linosanfilippo-kunbus · May 1, 2023 · May 1, 2023 · Jan 13, 2023 · Jan 27, 2023
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -0,0 +1,14 @@
+name: Linter
+on:
+  #- push
+  - pull_request
+jobs:      
+  checkpatch_linter:
+    name: checkpatch
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Run checkpatch linter
+      uses: webispy/checkpatch-action@master
diff --git a/.github/workflows/merge-packages.yml b/.github/workflows/merge-packages.yml
@@ -0,0 +1,22 @@
+name: Build
+on:
+  push:
+    branches:
+      - revpi-5.10
+jobs:
+  kernelbakery_snapshot_arm:
+    name: Snapshot Packages ARM
+    uses:  RevolutionPi/ci-workflows/.github/workflows/kernel-snapshot.yml@main
+    with:
+      kernelbakery_branch: master
+      picontrol_branch: master
+      build_commit: ${{ github.event.pull_request.head.sha }}
+      arch: arm
+  kernelbakery_snapshot_arm64:
+    name: Snapshot Packages ARM64
+    uses:  RevolutionPi/ci-workflows/.github/workflows/kernel-snapshot.yml@main
+    with:
+      kernelbakery_branch: master
+      picontrol_branch: master
+      build_commit: ${{ github.event.pull_request.head.sha }}
+      arch: arm64
diff --git a/.github/workflows/snapshot-packages.yml b/.github/workflows/snapshot-packages.yml
@@ -0,0 +1,54 @@
+name: Build
+on:
+  pull_request:
+    types:
+      - labeled
+jobs:
+  kernelbakery_snapshot_arm:
+    name: Snapshot Packages ARM
+    if: |
+      github.event_name == 'pull_request' && 
+      (github.event.label.name == 'snapshot-packages' || github.event.label.name == 'snapshot-packages-arm')
+    uses:  RevolutionPi/ci-workflows/.github/workflows/kernel-snapshot.yml@main
+    with:
+      kernelbakery_branch: master
+      picontrol_branch: master
+      build_commit: ${{ github.event.pull_request.head.sha }}
+      arch: arm
+  kernelbakery_snapshot_arm64:
+    name: Snapshot Packages ARM64
+    if: |
+      github.event_name == 'pull_request' && 
+      (github.event.label.name == 'snapshot-packages' || github.event.label.name == 'snapshot-packages-arm64')
+    uses:  RevolutionPi/ci-workflows/.github/workflows/kernel-snapshot.yml@main
+    with:
+      kernelbakery_branch: master
+      picontrol_branch: master
+      build_commit: ${{ github.event.pull_request.head.sha }}
+      arch: arm64
+  # link_artifacts:
+  #   name: link artifacts in PR
+  #   if: ${{ (github.event_name == 'pull_request' && github.event.label.name == 'snapshot-packages') }}
+  #   needs: kernelbakery_snapshot
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/github-script@v5
+  #       with:
+  #         github-token: ${{secrets.GITHUB_TOKEN}}
+  #         script: |
+  #           github.rest.issues.createComment({
+  #             issue_number: context.issue.number,
+  #             owner: context.repo.owner,
+  #             repo: context.repo.repo,
+  #             body: '📦 Your snapshot packages are ready! https://github.com/RevolutionPi/linux/actions/runs/${{github.run_id}}'
+  #           })
+  #     - uses: actions/github-script@v5
+  #       with:
+  #         github-token: ${{secrets.GITHUB_TOKEN}}
+  #         script: |
+  #           github.rest.issues.removeLabel({
+  #             issue_number: context.issue.number,
+  #             owner: context.repo.owner,
+  #             repo: context.repo.repo,
+  #             name: 'snapshot-packages'
+  #           })
diff --git a/Documentation/devicetree/bindings/mux/gpio-mux.yaml b/Documentation/devicetree/bindings/mux/gpio-mux.yaml
@@ -34,6 +34,11 @@ properties:
   idle-state:
     default: -1
 
+  settling-time-us:
+    description:
+      Time required to switch from one stable mux state to another
+      (in microseconds).
+
 required:
   - compatible
   - mux-gpios

diff --git a/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt b/Documentation/devicetree/bindings/net/wireless/marvell-8xxx.txt
@@ -1,4 +1,4 @@
-Marvell 8787/8897/8997 (sd8787/sd8897/sd8997/pcie8997) SDIO/PCIE devices
+Marvell 8787/8897/8978/8997 (sd8787/sd8897/sd8978/sd8997/pcie8997) SDIO/PCIE devices
 ------
 
 This node provides properties for controlling the Marvell SDIO/PCIE wireless device.
@@ -10,7 +10,9 @@ Required properties:
   - compatible : should be one of the following:
 	* "marvell,sd8787"
 	* "marvell,sd8897"
+	* "marvell,sd8978"
 	* "marvell,sd8997"
+	* "nxp,iw416"
 	* "pci11ab,2b42"
 	* "pci1b4b,2b42"
 

diff --git a/Documentation/devicetree/bindings/serial/pl011.yaml b/Documentation/devicetree/bindings/serial/pl011.yaml
@@ -100,12 +100,6 @@ properties:
       on the device.
     enum: [1, 4]
 
-  cts-event-workaround:
-    description:
-      Enables the (otherwise vendor-specific) workaround for the
-      CTS-induced TX lockup.
-    type: boolean
-
 required:
   - compatible
   - reg

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -689,6 +689,8 @@ patternProperties:
     description: Sutajio Ko-Usagi PTE Ltd.
   "^kvg,.*":
     description: Kverneland Group
+  "^kunbus,.*":
+    description: KUNBUS GmbH
   "^kyo,.*":
     description: Kyocera Corporation
   "^lacie,.*":

diff --git a/Documentation/kbuild/kbuild.rst b/Documentation/kbuild/kbuild.rst
@@ -237,6 +237,15 @@ The output directory is often set using "O=..." on the commandline.
 
 The value can be overridden in which case the default value is ignored.
 
+INSTALL_KBUILD_PATH
+-------------------
+INSTALL_KBUILD_PATH specifies where to install a build environment for
+external modules.
+
+The default value is::
+
+    /usr/src/linux-headers-$(KERNELVERSION)
+
 KBUILD_ABS_SRCTREE
 --------------------------------------------------
 Kbuild uses a relative path to point to the tree when possible. For instance,

diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst
@@ -913,6 +913,21 @@ Both possibilities are described in the following.
 	This will tell kbuild to build lxdialog even if not referenced in
 	any rule.
 
+4.6 Host programs necessary to build external modules
+-----------------------------------------------------
+
+	If a host program is necessary to build external modules,
+	it shall be added to extmodprogs in addition to hostprogs.
+
+	Example::
+
+		hostprogs     := fixdep
+		extmodprogs   := fixdep
+
+	This ensures that the host program is installed to a module build
+	environment with "make kbuild_install". It will be cross-compiled
+	for the target architecture if necessary.
+
 5 Userspace Program support
 ===========================
 

diff --git a/Documentation/riscv/vm-layout.rst b/Documentation/riscv/vm-layout.rst
@@ -47,7 +47,7 @@ RISC-V Linux Kernel SV39
                                                               | Kernel-space virtual memory, shared between all processes:
   ____________________________________________________________|___________________________________________________________
                     |            |                  |         |
-   ffffffc6fee00000 | -228    GB | ffffffc6feffffff |    2 MB | fixmap
+   ffffffc6fea00000 | -228    GB | ffffffc6feffffff |    6 MB | fixmap
    ffffffc6ff000000 | -228    GB | ffffffc6ffffffff |   16 MB | PCI io
    ffffffc700000000 | -228    GB | ffffffc7ffffffff |    4 GB | vmemmap
    ffffffc800000000 | -224    GB | ffffffd7ffffffff |   64 GB | vmalloc/ioremap space
@@ -83,7 +83,7 @@ RISC-V Linux Kernel SV48
                                                               | Kernel-space virtual memory, shared between all processes:
   ____________________________________________________________|___________________________________________________________
                     |            |                  |         |
-   ffff8d7ffee00000 |  -114.5 TB | ffff8d7ffeffffff |    2 MB | fixmap
+   ffff8d7ffea00000 |  -114.5 TB | ffff8d7ffeffffff |    6 MB | fixmap
    ffff8d7fff000000 |  -114.5 TB | ffff8d7fffffffff |   16 MB | PCI io
    ffff8d8000000000 |  -114.5 TB | ffff8f7fffffffff |    2 TB | vmemmap
    ffff8f8000000000 |  -112.5 TB | ffffaf7fffffffff |   32 TB | vmalloc/ioremap space

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 1
-SUBLEVEL = 25
+SUBLEVEL = 27
 EXTRAVERSION =
 NAME = Hurr durr I'ma ninja sloth
 
@@ -744,6 +744,11 @@ endif
 
 export KBUILD_MODULES KBUILD_BUILTIN
 
+# Decide whether to install the build environment for external modules.
+ifneq ($(filter kbuild_install,$(MAKECMDGOALS)),)
+  export KBUILD_INSTALL=y
+endif
+
 ifdef need-config
 include include/config/auto.conf
 endif
@@ -1160,6 +1165,12 @@ export	INSTALL_PATH ?= /boot
 #
 export INSTALL_DTBS_PATH ?= $(INSTALL_PATH)/dtbs/$(KERNELRELEASE)
 
+#
+# INSTALL_KBUILD_PATH specifies where to install the build environment for
+# external modules.  Can be overridden by passing it as an argument.
+#
+export INSTALL_KBUILD_PATH = /usr/src/linux-headers-$(KERNELVERSION)
+
 #
 # INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory
 # relocations required by build roots.  This is not defined in the
@@ -1694,7 +1705,9 @@ help:
 	@echo  '  kernelversion	  - Output the version stored in Makefile (use with make -s)'
 	@echo  '  image_name	  - Output the image name (use with make -s)'
 	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
-	 echo  '                    (default: $(INSTALL_HDR_PATH))'; \
+	 echo  '                    (default: $(INSTALL_HDR_PATH))'
+	@echo  '  kbuild_install  - Install module build environment to INSTALL_KBUILD_PATH'; \
+	 echo  '                    (default: $(INSTALL_KBUILD_PATH))'; \
 	 echo  ''
 	@echo  'Static analysers:'
 	@echo  '  checkstack      - Generate a list of stack hogs'
@@ -1856,6 +1869,16 @@ PHONY += rust-analyzer
 rust-analyzer:
 	$(Q)$(MAKE) $(build)=rust $@
 
+
+# Module build environment target
+# ---------------------------------------------------------------------------
+PHONY += kbuild_install
+kbuild_install: asm-generic
+	$(Q)$(MAKE) $(build)=scripts/basic
+	$(Q)$(MAKE) $(build)=scripts/mod
+	$(Q)$(MAKE) $(build)=scripts
+
+
 # Misc
 # ---------------------------------------------------------------------------
 

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -32,6 +32,7 @@ config ARM
 	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
 	select ARCH_SUPPORTS_ATOMIC_RMW
 	select ARCH_SUPPORTS_HUGETLBFS if ARM_LPAE
+	select ARCH_SUPPORTS_RT if HAVE_POSIX_CPU_TIMERS_TASK_WORK
 	select ARCH_USE_BUILTIN_BSWAP
 	select ARCH_USE_CMPXCHG_LOCKREF
 	select ARCH_USE_MEMTEST
@@ -70,7 +71,7 @@ config ARM
 	select HARDIRQS_SW_RESEND
 	select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT
 	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
-	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
+	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT
 	select HAVE_ARCH_KFENCE if MMU && !XIP_KERNEL
 	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
 	select HAVE_ARCH_KASAN if MMU && !XIP_KERNEL
@@ -114,6 +115,8 @@ config ARM
 	select HAVE_PERF_EVENTS
 	select HAVE_PERF_REGS
 	select HAVE_PERF_USER_STACK_DUMP
+	select HAVE_POSIX_CPU_TIMERS_TASK_WORK if !KVM
+	select HAVE_PREEMPT_LAZY
 	select MMU_GATHER_RCU_TABLE_FREE if SMP && ARM_LPAE
 	select HAVE_REGS_AND_STACK_ACCESS_API
 	select HAVE_RSEQ

diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
@@ -4,7 +4,7 @@
 / {
 	chosen: chosen {
 		// Disable audio by default
-		bootargs = "coherent_pool=1M snd_bcm2835.enable_headphones=0";
+		bootargs = "coherent_pool=4M snd_bcm2835.enable_headphones=0";
 		/delete-property/ stdout-path;
 	};
 

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
@@ -194,6 +194,26 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
 	qca7000-uart0.dtbo \
 	ramoops.dtbo \
 	ramoops-pi4.dtbo \
+	revpi-dt-blob.dtbo \
+	revpi-compact.dtbo \
+	revpi-compact-dt-blob.dtbo \
+	revpi-connect.dtbo \
+	revpi-connect-dt-blob.dtbo \
+	revpi-connect-se.dtbo \
+	revpi-connect-se-dt-blob.dtbo \
+	revpi-connect4.dtbo \
+	revpi-con-can.dtbo \
+	revpi-flat.dtbo \
+	revpi-flat-s-2022.dtbo \
+	revpi-flat-dt-blob.dtbo \
+	revpi-hat-eeprom.dtbo \
+	revpi-core.dtbo \
+	revpi-core-cm1.dtbo \
+	revpi-core-dt-blob.dtbo \
+	revpi-core-2022.dtbo \
+	revpi-core-s-2022.dtbo \
+	revpi-core-se-2022.dtbo \
+	cmio-jtag-dt-blob.dtbo \
 	rotary-encoder.dtbo \
 	rpi-backlight.dtbo \
 	rpi-codeczero.dtbo \

diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
@@ -3441,6 +3441,60 @@ Params: base-addr               Where to place the capture buffer (default
         console-size            Size of non-panic dmesg captures (default 0)
 
 
+Name:   revpi-compact
+Info:   Overlay for RevPi Compact by KUNBUS
+Load:   dtoverlay=revpi-compact
+Params: <None>
+
+
+Name:   revpi-compact-dt-blob
+Info:   dt-blob.bin for RevPi Compact by KUNBUS
+Load:   dtoverlay=revpi-compact-dt-blob
+Params: <None>
+
+
+Name:   revpi-connect
+Info:   Overlay for RevPi Connect by KUNBUS
+Load:   dtoverlay=revpi-connect
+Params: <None>
+
+
+Name:   revpi-connect-dt-blob
+Info:   dt-blob.bin for RevPi Connect by KUNBUS
+Load:   dtoverlay=revpi-connect-dt-blob
+Params: <None>
+
+
+Name:   revpi-con-can
+Info:   Overlay for RevPi CON CAN by KUNBUS
+Load:   dtoverlay=revpi-con-can
+Params: <None>
+
+
+Name:   revpi-flat
+Info:   Overlay for RevPi Flat by KUNBUS
+Load:   dtoverlay=revpi-flat
+Params: <None>
+
+
+Name:   revpi-flat-dt-blob
+Info:   dt-blob.bin for RevPi Flat by KUNBUS
+Load:   dtoverlay=revpi-flat-dt-blob
+Params: <None>
+
+
+Name:   revpi-core
+Info:   Overlay for RevPi Core by KUNBUS
+Load:   dtoverlay=revpi-core
+Params: <None>
+
+
+Name:   revpi-core-dt-blob
+Info:   dt-blob.bin for RevPi Core by KUNBUS
+Load:   dtoverlay=revpi-core-dt-blob
+Params: <None>
+
+
 Name:   rotary-encoder
 Info:   Overlay for GPIO connected rotary encoder.
 Load:   dtoverlay=rotary-encoder,<param>=<val>