diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4b03505da99f33d3017c8370843446eca1870a08..96efa27e3f07dbcce9f9c54bd0a4a464c2dae067 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,4 +30,3 @@ build: name: "$CI_PROJECT_NAME-ti-linux-5.10.y-$CI_JOB_ID" paths: - "deploy/linux-image-*.deb" - diff --git a/3rdparty/readme/.gitlab-ci.yml b/3rdparty/readme/.gitlab-ci.yml index 68383d09e9d05baafc0e1284823fa8acc76415e5..997434c71736522f76a5a335e41a239c70a4e641 100644 --- a/3rdparty/readme/.gitlab-ci.yml +++ b/3rdparty/readme/.gitlab-ci.yml @@ -1,19 +1,28 @@ -image: robertcnelson/debian-bullseye-slim-linux-compile:latest +image: robertcnelson/debian-bookworm-slim-linux-compile:latest + +cache: + key: "$CI_PROJECT_NAME-ti-linux-5.10.y" + paths: + - ccache.tar.gz build: tags: - docker-amd64 stage: build script: - - CORES=$(getconf _NPROCESSORS_ONLN) - - export CC=/usr/bin/arm-linux-gnueabihf- - - make ARCH=arm CROSS_COMPILE=${CC} clean - - make ARCH=arm CROSS_COMPILE=${CC} bb.org_defconfig - - echo "make -j${CORES} ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=${CC} LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg" - - make -j${CORES} ARCH=arm KBUILD_DEBARCH=armhf KDEB_PKGVERSION=1xross CROSS_COMPILE=${CC} LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg + - mkdir -p /root/.cache/ccache/ || true + - ccache -s + - tar -xf ccache.tar.gz -C / || true + - ccache -s + - make ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- clean + - make ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- bb.org_defconfig + - echo "make -j ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg" + - make -j ARCH=arm KBUILD_DEBARCH=armhf KDEB_PKGVERSION=1xross CROSS_COMPILE="ccache /usr/bin/arm-linux-gnueabihf-" LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg - mv ../*.deb ./ + - ccache -s + - tar -cf ccache.tar.gz /root/.cache/ccache/ artifacts: - expire_in: 5 days + expire_in: 28 days name: "$CI_PROJECT_NAME-$CI_JOB_ID" paths: - - "linux-image*.deb" + - "linux-image-*.deb" diff --git a/patch.sh b/patch.sh index 7be282dbc1738fb258fa42389f80c03cfd1e68b0..4ab0af292e6abf94756938e376d1414d6a20aa27 100644 --- a/patch.sh +++ b/patch.sh @@ -579,7 +579,7 @@ backports () { dir 'backports/spidev' - backport_tag="v5.10.188" + backport_tag="v5.10.193" subsystem="spi" #regenerate="enable" @@ -594,7 +594,7 @@ backports () { patch_backports fi - backport_tag="v5.10.188" + backport_tag="v5.10.193" subsystem="iio" #regenerate="enable" diff --git a/patches/backports/iio/0001-backports-iio-from-linux.git.patch b/patches/backports/iio/0001-backports-iio-from-linux.git.patch index 85d33785d789c01fc5b3044ba8d107244aff5398..e509352c3bf03b23650580666bd13378048b98f6 100644 --- a/patches/backports/iio/0001-backports-iio-from-linux.git.patch +++ b/patches/backports/iio/0001-backports-iio-from-linux.git.patch @@ -1,30 +1,62 @@ -From aee11a2e144d4faa8ea0e5a3c9e963e5062c4822 Mon Sep 17 00:00:00 2001 +From f8d5eb3414d9a520127db4dc713baa09f5391449 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:48:46 -0500 +Date: Thu, 31 Aug 2023 15:33:39 -0500 Subject: [PATCH] backports: iio: from: linux.git -Reference: v5.10.188 +Reference: v5.10.193 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- - drivers/iio/accel/mma9551_core.c | 10 ++++++++-- - drivers/iio/adc/ad7192.c | 8 ++------ - drivers/iio/adc/ad7791.c | 2 +- - drivers/iio/adc/at91-sama5d2_adc.c | 2 +- - drivers/iio/adc/meson_saradc.c | 2 +- - drivers/iio/adc/mxs-lradc-adc.c | 10 +++++----- - drivers/iio/adc/palmas_gpadc.c | 2 +- - drivers/iio/adc/ti-ads7950.c | 1 + - drivers/iio/dac/Makefile | 2 +- - drivers/iio/dac/cio-dac.c | 4 ++-- - drivers/iio/dac/mcp4725.c | 16 ++++++++++++++-- - .../iio/imu/inv_icm42600/inv_icm42600_buffer.c | 10 +++++----- - drivers/iio/light/cm32181.c | 12 ++++++++++++ - drivers/iio/light/max44009.c | 13 +++++++------ - drivers/iio/light/tsl2772.c | 1 + - drivers/iio/light/vcnl4035.c | 3 +++ - drivers/staging/iio/resolver/ad2s1210.c | 2 +- - 17 files changed, 66 insertions(+), 34 deletions(-) + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/mma9551_core.c | 10 +- + drivers/iio/adc/ad7192.c | 8 +- + drivers/iio/adc/ad7791.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 2 +- + drivers/iio/adc/meson_saradc.c | 2 +- + drivers/iio/adc/mxs-lradc-adc.c | 10 +- + drivers/iio/adc/palmas_gpadc.c | 2 +- + drivers/iio/adc/stx104.c | 96 +++++++++++++------ + drivers/iio/adc/ti-ads7950.c | 1 + + drivers/iio/addac/Kconfig | 8 ++ + drivers/iio/addac/Makefile | 6 ++ + .../cros_ec_sensors/cros_ec_sensors_core.c | 2 +- + drivers/iio/dac/Makefile | 2 +- + drivers/iio/dac/cio-dac.c | 4 +- + drivers/iio/dac/mcp4725.c | 16 +++- + .../imu/inv_icm42600/inv_icm42600_buffer.c | 10 +- + drivers/iio/light/cm32181.c | 12 +++ + drivers/iio/light/max44009.c | 13 +-- + drivers/iio/light/tsl2772.c | 1 + + drivers/iio/light/vcnl4035.c | 3 + + drivers/staging/iio/resolver/ad2s1210.c | 2 +- + 23 files changed, 151 insertions(+), 63 deletions(-) + create mode 100644 drivers/iio/addac/Kconfig + create mode 100644 drivers/iio/addac/Makefile +diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig +index 267553386c71..2ed303aa7de3 100644 +--- a/drivers/iio/Kconfig ++++ b/drivers/iio/Kconfig +@@ -70,6 +70,7 @@ config IIO_TRIGGERED_EVENT + + source "drivers/iio/accel/Kconfig" + source "drivers/iio/adc/Kconfig" ++source "drivers/iio/addac/Kconfig" + source "drivers/iio/afe/Kconfig" + source "drivers/iio/amplifiers/Kconfig" + source "drivers/iio/chemical/Kconfig" +diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile +index 1712011c0f4a..d6690e449cce 100644 +--- a/drivers/iio/Makefile ++++ b/drivers/iio/Makefile +@@ -15,6 +15,7 @@ obj-$(CONFIG_IIO_TRIGGERED_EVENT) += industrialio-triggered-event.o + + obj-y += accel/ + obj-y += adc/ ++obj-y += addac/ + obj-y += afe/ + obj-y += amplifiers/ + obj-y += buffer/ diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c index 666e7a04a7d7..9bb5c2fea08c 100644 --- a/drivers/iio/accel/mma9551_core.c @@ -184,6 +216,248 @@ index f4756671cddb..6ed0d151ad21 100644 struct palmas_gpadc *adc = iio_priv(indio_dev); if (adc->wakeup1_enable || adc->wakeup2_enable) +diff --git a/drivers/iio/adc/stx104.c b/drivers/iio/adc/stx104.c +index 55bd2dc514e9..b658a75d4e3a 100644 +--- a/drivers/iio/adc/stx104.c ++++ b/drivers/iio/adc/stx104.c +@@ -15,7 +15,9 @@ + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/moduleparam.h> ++#include <linux/mutex.h> + #include <linux/spinlock.h> ++#include <linux/types.h> + + #define STX104_OUT_CHAN(chan) { \ + .type = IIO_VOLTAGE, \ +@@ -44,14 +46,38 @@ static unsigned int num_stx104; + module_param_hw_array(base, uint, ioport, &num_stx104, 0); + MODULE_PARM_DESC(base, "Apex Embedded Systems STX104 base addresses"); + ++/** ++ * struct stx104_reg - device register structure ++ * @ssr_ad: Software Strobe Register and ADC Data ++ * @achan: ADC Channel ++ * @dio: Digital I/O ++ * @dac: DAC Channels ++ * @cir_asr: Clear Interrupts and ADC Status ++ * @acr: ADC Control ++ * @pccr_fsh: Pacer Clock Control and FIFO Status MSB ++ * @acfg: ADC Configuration ++ */ ++struct stx104_reg { ++ u16 ssr_ad; ++ u8 achan; ++ u8 dio; ++ u16 dac[2]; ++ u8 cir_asr; ++ u8 acr; ++ u8 pccr_fsh; ++ u8 acfg; ++}; ++ + /** + * struct stx104_iio - IIO device private data structure ++ * @lock: synchronization lock to prevent I/O race conditions + * @chan_out_states: channels' output states +- * @base: base port address of the IIO device ++ * @reg: I/O address offset for the device registers + */ + struct stx104_iio { ++ struct mutex lock; + unsigned int chan_out_states[STX104_NUM_OUT_CHAN]; +- unsigned int base; ++ struct stx104_reg __iomem *reg; + }; + + /** +@@ -64,7 +90,7 @@ struct stx104_iio { + struct stx104_gpio { + struct gpio_chip chip; + spinlock_t lock; +- unsigned int base; ++ u8 __iomem *base; + unsigned int out_state; + }; + +@@ -72,6 +98,7 @@ static int stx104_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, int *val, int *val2, long mask) + { + struct stx104_iio *const priv = iio_priv(indio_dev); ++ struct stx104_reg __iomem *const reg = priv->reg; + unsigned int adc_config; + int adbu; + int gain; +@@ -79,7 +106,7 @@ static int stx104_read_raw(struct iio_dev *indio_dev, + switch (mask) { + case IIO_CHAN_INFO_HARDWAREGAIN: + /* get gain configuration */ +- adc_config = inb(priv->base + 11); ++ adc_config = ioread8(®->acfg); + gain = adc_config & 0x3; + + *val = 1 << gain; +@@ -90,25 +117,31 @@ static int stx104_read_raw(struct iio_dev *indio_dev, + return IIO_VAL_INT; + } + ++ mutex_lock(&priv->lock); ++ + /* select ADC channel */ +- outb(chan->channel | (chan->channel << 4), priv->base + 2); ++ iowrite8(chan->channel | (chan->channel << 4), ®->achan); ++ ++ /* trigger ADC sample capture by writing to the 8-bit ++ * Software Strobe Register and wait for completion ++ */ ++ iowrite8(0, ®->ssr_ad); ++ while (ioread8(®->cir_asr) & BIT(7)); + +- /* trigger ADC sample capture and wait for completion */ +- outb(0, priv->base); +- while (inb(priv->base + 8) & BIT(7)); ++ *val = ioread16(®->ssr_ad); + +- *val = inw(priv->base); ++ mutex_unlock(&priv->lock); + return IIO_VAL_INT; + case IIO_CHAN_INFO_OFFSET: + /* get ADC bipolar/unipolar configuration */ +- adc_config = inb(priv->base + 11); ++ adc_config = ioread8(®->acfg); + adbu = !(adc_config & BIT(2)); + + *val = -32768 * adbu; + return IIO_VAL_INT; + case IIO_CHAN_INFO_SCALE: + /* get ADC bipolar/unipolar and gain configuration */ +- adc_config = inb(priv->base + 11); ++ adc_config = ioread8(®->acfg); + adbu = !(adc_config & BIT(2)); + gain = adc_config & 0x3; + +@@ -130,16 +163,16 @@ static int stx104_write_raw(struct iio_dev *indio_dev, + /* Only four gain states (x1, x2, x4, x8) */ + switch (val) { + case 1: +- outb(0, priv->base + 11); ++ iowrite8(0, &priv->reg->acfg); + break; + case 2: +- outb(1, priv->base + 11); ++ iowrite8(1, &priv->reg->acfg); + break; + case 4: +- outb(2, priv->base + 11); ++ iowrite8(2, &priv->reg->acfg); + break; + case 8: +- outb(3, priv->base + 11); ++ iowrite8(3, &priv->reg->acfg); + break; + default: + return -EINVAL; +@@ -152,9 +185,12 @@ static int stx104_write_raw(struct iio_dev *indio_dev, + if ((unsigned int)val > 65535) + return -EINVAL; + ++ mutex_lock(&priv->lock); ++ + priv->chan_out_states[chan->channel] = val; +- outw(val, priv->base + 4 + 2 * chan->channel); ++ iowrite16(val, &priv->reg->dac[chan->channel]); + ++ mutex_unlock(&priv->lock); + return 0; + } + return -EINVAL; +@@ -222,7 +258,7 @@ static int stx104_gpio_get(struct gpio_chip *chip, unsigned int offset) + if (offset >= 4) + return -EINVAL; + +- return !!(inb(stx104gpio->base) & BIT(offset)); ++ return !!(ioread8(stx104gpio->base) & BIT(offset)); + } + + static int stx104_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, +@@ -230,7 +266,7 @@ static int stx104_gpio_get_multiple(struct gpio_chip *chip, unsigned long *mask, + { + struct stx104_gpio *const stx104gpio = gpiochip_get_data(chip); + +- *bits = inb(stx104gpio->base); ++ *bits = ioread8(stx104gpio->base); + + return 0; + } +@@ -252,7 +288,7 @@ static void stx104_gpio_set(struct gpio_chip *chip, unsigned int offset, + else + stx104gpio->out_state &= ~mask; + +- outb(stx104gpio->out_state, stx104gpio->base); ++ iowrite8(stx104gpio->out_state, stx104gpio->base); + + spin_unlock_irqrestore(&stx104gpio->lock, flags); + } +@@ -279,7 +315,7 @@ static void stx104_gpio_set_multiple(struct gpio_chip *chip, + + stx104gpio->out_state &= ~*mask; + stx104gpio->out_state |= *mask & *bits; +- outb(stx104gpio->out_state, stx104gpio->base); ++ iowrite8(stx104gpio->out_state, stx104gpio->base); + + spin_unlock_irqrestore(&stx104gpio->lock, flags); + } +@@ -306,11 +342,16 @@ static int stx104_probe(struct device *dev, unsigned int id) + return -EBUSY; + } + ++ priv = iio_priv(indio_dev); ++ priv->reg = devm_ioport_map(dev, base[id], STX104_EXTENT); ++ if (!priv->reg) ++ return -ENOMEM; ++ + indio_dev->info = &stx104_info; + indio_dev->modes = INDIO_DIRECT_MODE; + + /* determine if differential inputs */ +- if (inb(base[id] + 8) & BIT(5)) { ++ if (ioread8(&priv->reg->cir_asr) & BIT(5)) { + indio_dev->num_channels = ARRAY_SIZE(stx104_channels_diff); + indio_dev->channels = stx104_channels_diff; + } else { +@@ -320,18 +361,17 @@ static int stx104_probe(struct device *dev, unsigned int id) + + indio_dev->name = dev_name(dev); + +- priv = iio_priv(indio_dev); +- priv->base = base[id]; ++ mutex_init(&priv->lock); + + /* configure device for software trigger operation */ +- outb(0, base[id] + 9); ++ iowrite8(0, &priv->reg->acr); + + /* initialize gain setting to x1 */ +- outb(0, base[id] + 11); ++ iowrite8(0, &priv->reg->acfg); + + /* initialize DAC output to 0V */ +- outw(0, base[id] + 4); +- outw(0, base[id] + 6); ++ iowrite16(0, &priv->reg->dac[0]); ++ iowrite16(0, &priv->reg->dac[1]); + + stx104gpio->chip.label = dev_name(dev); + stx104gpio->chip.parent = dev; +@@ -346,7 +386,7 @@ static int stx104_probe(struct device *dev, unsigned int id) + stx104gpio->chip.get_multiple = stx104_gpio_get_multiple; + stx104gpio->chip.set = stx104_gpio_set; + stx104gpio->chip.set_multiple = stx104_gpio_set_multiple; +- stx104gpio->base = base[id] + 3; ++ stx104gpio->base = &priv->reg->dio; + stx104gpio->out_state = 0x0; + + spin_lock_init(&stx104gpio->lock); diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c index a2b83f0bd526..d4583b76f1fe 100644 --- a/drivers/iio/adc/ti-ads7950.c @@ -196,6 +470,45 @@ index a2b83f0bd526..d4583b76f1fe 100644 st->chip.base = -1; st->chip.ngpio = TI_ADS7950_NUM_GPIOS; st->chip.get_direction = ti_ads7950_get_direction; +diff --git a/drivers/iio/addac/Kconfig b/drivers/iio/addac/Kconfig +new file mode 100644 +index 000000000000..2e64d7755d5e +--- /dev/null ++++ b/drivers/iio/addac/Kconfig +@@ -0,0 +1,8 @@ ++# ++# ADC DAC drivers ++# ++# When adding new entries keep the list in alphabetical order ++ ++menu "Analog to digital and digital to analog converters" ++ ++endmenu +diff --git a/drivers/iio/addac/Makefile b/drivers/iio/addac/Makefile +new file mode 100644 +index 000000000000..b888b9ee12da +--- /dev/null ++++ b/drivers/iio/addac/Makefile +@@ -0,0 +1,6 @@ ++# SPDX-License-Identifier: GPL-2.0 ++# ++# Makefile for industrial I/O ADDAC drivers ++# ++ ++# When adding new entries keep the list in alphabetical order +diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +index e3f507771f17..829077bcd09d 100644 +--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c ++++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c +@@ -263,7 +263,7 @@ int cros_ec_sensors_core_init(struct platform_device *pdev, + platform_set_drvdata(pdev, indio_dev); + + state->ec = ec->ec_dev; +- state->msg = devm_kzalloc(&pdev->dev, ++ state->msg = devm_kzalloc(&pdev->dev, sizeof(*state->msg) + + max((u16)sizeof(struct ec_params_motion_sense), + state->ec->max_response), GFP_KERNEL); + if (!state->msg) diff --git a/drivers/iio/dac/Makefile b/drivers/iio/dac/Makefile index 2fc481167724..09506d248c9e 100644 --- a/drivers/iio/dac/Makefile diff --git a/patches/backports/spi/0001-backports-spi-from-linux.git.patch b/patches/backports/spi/0001-backports-spi-from-linux.git.patch index fdc334219ed8a786b28de97aa4513942ba123b1a..e5f916f3cbdc90ec39ce03b8d161cee47dcfb3f3 100644 --- a/patches/backports/spi/0001-backports-spi-from-linux.git.patch +++ b/patches/backports/spi/0001-backports-spi-from-linux.git.patch @@ -1,9 +1,9 @@ -From 4a25da3395317604332029387fae5075b4958205 Mon Sep 17 00:00:00 2001 +From 1777ec78938ce4246af24a4a48ad7cc255ca82aa Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:47:34 -0500 +Date: Thu, 31 Aug 2023 15:32:32 -0500 Subject: [PATCH] backports: spi: from: linux.git -Reference: v5.10.188 +Reference: v5.10.193 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- drivers/spi/spi-omap2-mcspi.c | 156 +++++++++++++++++++++++----------- diff --git a/patches/defconfig b/patches/defconfig index 282c2d45cb2ddfaa547c787577a0e97d34855a31..b274a283cc2021f9a859f10e1f21300d0138118e 100644 --- a/patches/defconfig +++ b/patches/defconfig @@ -6443,6 +6443,10 @@ CONFIG_TI_TLC4541=m # CONFIG_XILINX_XADC is not set # end of Analog to digital converters +# +# Analog to digital and digital to analog converters +# + # # Analog Front Ends # diff --git a/patches/external/aufs/0001-merge-aufs-kbuild.patch b/patches/external/aufs/0001-merge-aufs-kbuild.patch index 20aaf2265d4e771b5d7d772d076a24d34bfb4849..52b82c3c4176f29424aa2b3f91681e3fb152485f 100644 --- a/patches/external/aufs/0001-merge-aufs-kbuild.patch +++ b/patches/external/aufs/0001-merge-aufs-kbuild.patch @@ -1,6 +1,6 @@ -From 9d30b7cb640e3d09c82ce1914949f5ed46f5d7e5 Mon Sep 17 00:00:00 2001 +From cfdc908a7f74fc32c153b96d1d219917d4329849 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:41:56 -0500 +Date: Thu, 31 Aug 2023 15:21:49 -0500 Subject: [PATCH 1/6] merge: aufs-kbuild Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0002-merge-aufs-base.patch b/patches/external/aufs/0002-merge-aufs-base.patch index 6dbc544688a563b393d79616d7aa049bc9b6fe57..99d29989403c7a8a30fc9975439195deb6e5fd00 100644 --- a/patches/external/aufs/0002-merge-aufs-base.patch +++ b/patches/external/aufs/0002-merge-aufs-base.patch @@ -1,6 +1,6 @@ -From fa67832807dd4be0ab6b3d3d88abbaf6bdde9cc2 Mon Sep 17 00:00:00 2001 +From 0378f42378a2d44dcfbfa9fa4355725ebdb4c35f Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:41:57 -0500 +Date: Thu, 31 Aug 2023 15:21:49 -0500 Subject: [PATCH 2/6] merge: aufs-base Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0003-merge-aufs-mmap.patch b/patches/external/aufs/0003-merge-aufs-mmap.patch index 265aa9963d5c20540e6da7e43349f8abd96df2ad..c2b255bf9de04caf4414a3847f43e3ca5c13e2a1 100644 --- a/patches/external/aufs/0003-merge-aufs-mmap.patch +++ b/patches/external/aufs/0003-merge-aufs-mmap.patch @@ -1,6 +1,6 @@ -From 16462a2c5fda57c00962bbb5e43a4c36e665c9a5 Mon Sep 17 00:00:00 2001 +From 200d453348cfc266ef512f292260e0fdbd41ed1d Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:41:57 -0500 +Date: Thu, 31 Aug 2023 15:21:50 -0500 Subject: [PATCH 3/6] merge: aufs-mmap Signed-off-by: Robert Nelson <robertcnelson@gmail.com> @@ -14,10 +14,10 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com> kernel/fork.c | 2 +- mm/Makefile | 1 + mm/filemap.c | 2 +- - mm/mmap.c | 39 +++++++++++++++--- + mm/mmap.c | 41 +++++++++++++++---- mm/nommu.c | 10 ++--- mm/prfile.c | 86 ++++++++++++++++++++++++++++++++++++++++ - 12 files changed, 184 insertions(+), 18 deletions(-) + 12 files changed, 185 insertions(+), 19 deletions(-) create mode 100644 mm/prfile.c diff --git a/fs/proc/base.c b/fs/proc/base.c @@ -198,7 +198,7 @@ index 3a983bc1a71c..509e00390361 100644 if (page->mapping != inode->i_mapping) { unlock_page(page); diff --git a/mm/mmap.c b/mm/mmap.c -index 33ebda8385b9..2d588b244b72 100644 +index 33ebda8385b9..c55bfc8b79e2 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -179,7 +179,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -219,6 +219,15 @@ index 33ebda8385b9..2d588b244b72 100644 } if (next->anon_vma) anon_vma_merge(vma, next); +@@ -1834,7 +1834,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + * fput the vma->vm_file here or we would add an extra fput for file + * and cause general protection fault ultimately. + */ +- fput(vma->vm_file); ++ vma_fput(vma); + vm_area_free(vma); + vma = merge; + /* Update vm_flags to pick up the change. */ @@ -1904,8 +1904,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr, if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); @@ -273,7 +282,7 @@ index 33ebda8385b9..2d588b244b72 100644 + new_vma = find_vma(mm, ret); + if (!new_vma->vm_prfile) + new_vma->vm_prfile = prfile; -+ if (new_vma != vma) ++ if (prfile) + get_file(prfile); + } + /* diff --git a/patches/external/aufs/0004-merge-aufs-standalone.patch b/patches/external/aufs/0004-merge-aufs-standalone.patch index 63707209a7bb9f0aa9163f6731f76e08650da7f3..a5af8dfbe85035fd36472dd28ee2022719d5c56f 100644 --- a/patches/external/aufs/0004-merge-aufs-standalone.patch +++ b/patches/external/aufs/0004-merge-aufs-standalone.patch @@ -1,6 +1,6 @@ -From e94bb28b98a81576a887e105fa2bf8f75a3942fe Mon Sep 17 00:00:00 2001 +From d0841b4e69f84fb9547be73a7180e94398800813 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:41:57 -0500 +Date: Thu, 31 Aug 2023 15:21:51 -0500 Subject: [PATCH 4/6] merge: aufs-standalone Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/aufs/0005-merge-aufs.patch b/patches/external/aufs/0005-merge-aufs.patch index 5dd6f1defac7e1ad651854dbcbfd9c899d15bac4..e1f26190435e45b5ef3758bd2547c04482bb8993 100644 --- a/patches/external/aufs/0005-merge-aufs.patch +++ b/patches/external/aufs/0005-merge-aufs.patch @@ -1,9 +1,9 @@ -From bec3ad12e4e7a8a231ad96b06c67154d5489fcae Mon Sep 17 00:00:00 2001 +From 7bb0fb47529a03c891ef9b777908aea0194410f5 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:41:58 -0500 +Date: Thu, 31 Aug 2023 15:21:52 -0500 Subject: [PATCH 5/6] merge: aufs -https://github.com/sfjro/aufs-standalone/commit/7d72a088928cc75b73509f42595186cc17325973 +https://github.com/sfjro/aufs-standalone/commit/0c55dd9dcf13d5de98218aca4b1a6ad1181acb33 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- Documentation/ABI/testing/debugfs-aufs | 55 + @@ -294,7 +294,7 @@ index 000000000000..48500c0569e6 + will be empty. About XINO files, see the aufs manual. diff --git a/Documentation/filesystems/aufs/README b/Documentation/filesystems/aufs/README new file mode 100644 -index 000000000000..7ce0cf2bf917 +index 000000000000..81832bf923f5 --- /dev/null +++ b/Documentation/filesystems/aufs/README @@ -0,0 +1,396 @@ @@ -675,7 +675,7 @@ index 000000000000..7ce0cf2bf917 +James Burry made a donation (2016/12). +Carsten Rose made a donation (2018/9). +Porteus Kiosk made a donation (2018/10). -+huronOS team: Enya Quetzalli made donations (2022/5 and 2023/5). ++huronOS team: Enya Quetzalli made donations (2022/5, 2023/5 and 8). +Vasily Mikhaylichenko made a donation (2023/5). + +Thank you very much. @@ -38278,7 +38278,7 @@ index 000000000000..e8337fd8bd07 +} diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h new file mode 100644 -index 000000000000..7bd12397530c +index 000000000000..cd10edccf3e2 --- /dev/null +++ b/include/uapi/linux/aufs_type.h @@ -0,0 +1,452 @@ @@ -38324,7 +38324,7 @@ index 000000000000..7bd12397530c +#include <limits.h> +#endif /* __KERNEL__ */ + -+#define AUFS_VERSION "5.10.140-20230724" ++#define AUFS_VERSION "5.10.140-20230828" + +/* todo? move this to linux-2.6.19/include/magic.h */ +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') diff --git a/patches/external/aufs/0006-merge-aufs-rt.patch b/patches/external/aufs/0006-merge-aufs-rt.patch index 07bd0506f211fbe146ab7eda2a14c4d77994830e..6e8a734b454933b64e4101cce8670c35dc1153c8 100644 --- a/patches/external/aufs/0006-merge-aufs-rt.patch +++ b/patches/external/aufs/0006-merge-aufs-rt.patch @@ -1,6 +1,6 @@ -From 8f6a860391912a1c23c8311fb491c33dc0f06767 Mon Sep 17 00:00:00 2001 +From 7b66be7d56ff3448661a00c21736b409b345de09 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:41:59 -0500 +Date: Thu, 31 Aug 2023 15:21:53 -0500 Subject: [PATCH 6/6] merge: aufs-rt Signed-off-by: Robert Nelson <robertcnelson@gmail.com> diff --git a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch index ea01e07ef5dc73d96a7858ceacb4665a083ca61f..feae3b099a6568add931134dfbb521db7e50e29a 100644 --- a/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch +++ b/patches/external/bcfserial/0001-merge-bcfserial-https-git.beagleboard.org-beagleconn.patch @@ -1,6 +1,6 @@ -From 8404ec94183820c09cdd44f2ad2af5cec88c84bb Mon Sep 17 00:00:00 2001 +From 6442e5fae8d85d956cb5730b987e825641a6825d Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:43:45 -0500 +Date: Thu, 31 Aug 2023 15:23:58 -0500 Subject: [PATCH] merge: bcfserial: https://git.beagleboard.org/beagleconnect/linux/bcfserial.git diff --git a/patches/external/git/AUFS b/patches/external/git/AUFS index e82ac4a7f0976563d66f20a60217b84cd7fab3ac..15f5826aea49e30f5f85a7c3ebe9b9ed359be6dc 100644 --- a/patches/external/git/AUFS +++ b/patches/external/git/AUFS @@ -1 +1 @@ -AUFS: https://github.com/sfjro/aufs-standalone/commit/7d72a088928cc75b73509f42595186cc17325973 +AUFS: https://github.com/sfjro/aufs-standalone/commit/0c55dd9dcf13d5de98218aca4b1a6ad1181acb33 diff --git a/patches/external/git/BBDTBS b/patches/external/git/BBDTBS index 310e9006312e6cc50d213f51a8e45ecdcbb814c6..e659c3249abd01a1db9b915d36e32df8053a4729 100644 --- a/patches/external/git/BBDTBS +++ b/patches/external/git/BBDTBS @@ -1 +1 @@ -BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/fe6a775f9b61d75bbf4299c30dfb51cce820ad97 +BBDTBS: https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/78e0d983987866149da4b77d926ece5139feb314 diff --git a/patches/external/ksmbd/0001-merge-ksmbd-https-github.com-cifsd-team-ksmbd.patch b/patches/external/ksmbd/0001-merge-ksmbd-https-github.com-cifsd-team-ksmbd.patch index 543d8f3f0b9cc0f4a7406ec2c3809feb07545410..3c39c71b5034e28189011af928473dfb53941384 100644 --- a/patches/external/ksmbd/0001-merge-ksmbd-https-github.com-cifsd-team-ksmbd.patch +++ b/patches/external/ksmbd/0001-merge-ksmbd-https-github.com-cifsd-team-ksmbd.patch @@ -1,6 +1,6 @@ -From 94e335983e692fadc014102c9f5c109e6e07d0cd Mon Sep 17 00:00:00 2001 +From 2a9f8c8f22c8efbacb792b438f0a20c6b0416c18 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:44:28 -0500 +Date: Thu, 31 Aug 2023 15:29:01 -0500 Subject: [PATCH] merge: ksmbd: https://github.com/cifsd-team/ksmbd https://github.com/cifsd-team/ksmbd/commit/bf249dcef4d5a20eabf9656154419a0042769b90 diff --git a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch index b7d5696145189b22ad43e205619bc967650f617a..3e9d740497a5dcb3e9b6f59e31cf0c28aa4fafad 100644 --- a/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch +++ b/patches/external/rt/0001-merge-CONFIG_PREEMPT_RT-Patch-Set.patch @@ -1,6 +1,6 @@ -From 6000f90f46864f099814a4f75a7652637f048af8 Mon Sep 17 00:00:00 2001 +From 95f1d7b86493196c553b2f1861762e8cb9cb5318 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Wed, 5 Jul 2023 16:10:20 -0500 +Date: Thu, 31 Aug 2023 15:42:19 -0500 Subject: [PATCH] merge: CONFIG_PREEMPT_RT Patch Set patch-5.10.168-rt83.patch.xz diff --git a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch index c44a7ae898071da0d460a7a6d1035d0fad97242e..b588ab2a1fc4dc187527bbef2eaeb75381b24439 100644 --- a/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch +++ b/patches/external/wireless_regdb/0001-Add-wireless-regdb-regulatory-database-file.patch @@ -1,6 +1,6 @@ -From e6efa77bd2038a9abfe5c43768db5123c7c18745 Mon Sep 17 00:00:00 2001 +From 2ccf5c80ebe81a4175de064a9bd2e0ace18be6e1 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:45:06 -0500 +Date: Thu, 31 Aug 2023 15:30:09 -0500 Subject: [PATCH] Add wireless-regdb regulatory database file https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git/commit/?id=ae1421fc746f456c6124d6265413c28460a85f31 diff --git a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch index 7cb4459fadac6c71d5dfc1dd50e74cd03cf1a89f..70fecdc4b7a03660c1f35b982be26d1ad9733ea1 100644 --- a/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch +++ b/patches/external/wpanusb/0001-merge-wpanusb-https-git.beagleboard.org-beagleconnec.patch @@ -1,6 +1,6 @@ -From aab580b772869b3022cc392b4b4b5622121cfea6 Mon Sep 17 00:00:00 2001 +From e5ca30b69836ac87260ee18f1968d9f27efe8e1a Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:42:55 -0500 +Date: Thu, 31 Aug 2023 15:23:08 -0500 Subject: [PATCH] merge: wpanusb: https://git.beagleboard.org/beagleconnect/linux/wpanusb diff --git a/patches/readme/0001-enable-gitlab-ci.patch b/patches/readme/0001-enable-gitlab-ci.patch index 0ee129fc6c0d8bc2d3aae2315311787d318485da..447df12f50335c45c7f452dcda926d7f3cc4ef02 100644 --- a/patches/readme/0001-enable-gitlab-ci.patch +++ b/patches/readme/0001-enable-gitlab-ci.patch @@ -1,15 +1,15 @@ -From e113cae9338320d439e415da01d0c34bb390d4b5 Mon Sep 17 00:00:00 2001 +From 22e929afd6ba2bceda3e99bb1a53539219e77e03 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Tue, 27 Jun 2023 14:24:25 -0500 +Date: Thu, 31 Aug 2023 15:46:22 -0500 Subject: [PATCH] enable: gitlab-ci Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- .github/FUNDING.yml | 12 ++++++++++++ .github/ISSUE_TEMPLATE/bug_report.md | 20 ++++++++++++++++++++ - .gitlab-ci.yml | 19 +++++++++++++++++++ + .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++ README.md | 3 +++ - 4 files changed, 54 insertions(+) + 4 files changed, 63 insertions(+) create mode 100644 .github/FUNDING.yml create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .gitlab-ci.yml @@ -61,29 +61,38 @@ index 000000000000..94be17e338b3 +``` diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 -index 000000000000..ea036cc8ef89 +index 000000000000..997434c71736 --- /dev/null +++ b/.gitlab-ci.yml -@@ -0,0 +1,19 @@ -+image: robertcnelson/debian-bullseye-slim-linux-compile:latest +@@ -0,0 +1,28 @@ ++image: robertcnelson/debian-bookworm-slim-linux-compile:latest ++ ++cache: ++ key: "$CI_PROJECT_NAME-ti-linux-5.10.y" ++ paths: ++ - ccache.tar.gz + +build: + tags: + - docker-amd64 + stage: build + script: -+ - CORES=$(getconf _NPROCESSORS_ONLN) -+ - export CC=/usr/bin/arm-linux-gnueabihf- -+ - make ARCH=arm CROSS_COMPILE=${CC} clean -+ - make ARCH=arm CROSS_COMPILE=${CC} bb.org_defconfig -+ - echo "make -j${CORES} ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=${CC} LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg" -+ - make -j${CORES} ARCH=arm KBUILD_DEBARCH=armhf KDEB_PKGVERSION=1xross CROSS_COMPILE=${CC} LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg ++ - mkdir -p /root/.cache/ccache/ || true ++ - ccache -s ++ - tar -xf ccache.tar.gz -C / || true ++ - ccache -s ++ - make ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- clean ++ - make ARCH=arm CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- bb.org_defconfig ++ - echo "make -j ARCH=arm KBUILD_DEBARCH=armhf CROSS_COMPILE=/usr/bin/arm-linux-gnueabihf- LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg" ++ - make -j ARCH=arm KBUILD_DEBARCH=armhf KDEB_PKGVERSION=1xross CROSS_COMPILE="ccache /usr/bin/arm-linux-gnueabihf-" LOCALVERSION=-ti-r$CI_JOB_ID KDEB_SOURCENAME=linux-upstream KDEB_COMPRESS=xz bindeb-pkg + - mv ../*.deb ./ ++ - ccache -s ++ - tar -cf ccache.tar.gz /root/.cache/ccache/ + artifacts: -+ expire_in: 5 days ++ expire_in: 28 days + name: "$CI_PROJECT_NAME-$CI_JOB_ID" + paths: -+ - "linux-image*.deb" ++ - "linux-image-*.deb" diff --git a/README.md b/README.md new file mode 100644 index 000000000000..35f4caf8a15a diff --git a/patches/ref_omap2plus_defconfig b/patches/ref_omap2plus_defconfig index 3c85d7e00d9b887abb392fda91f3f76935cd6721..7f128c84dd07b374a648559eaa2496b83a4d4892 100644 --- a/patches/ref_omap2plus_defconfig +++ b/patches/ref_omap2plus_defconfig @@ -5546,6 +5546,10 @@ CONFIG_TWL4030_MADC=m # CONFIG_XILINX_XADC is not set # end of Analog to digital converters +# +# Analog to digital and digital to analog converters +# + # # Analog Front Ends # diff --git a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch index 9262c733f306967cc57696897bb990ca1cf177fc..c6964ba1bde5112c7d39c6e3da804e9ebc0c8b3c 100644 --- a/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch +++ b/patches/soc/ti/beagleboard_dtbs/0001-Add-BeagleBoard.org-Device-Tree-Changes.patch @@ -1,11 +1,11 @@ -From 5d202e2a7e635e3ffd2917e0ac95421b8168fa0e Mon Sep 17 00:00:00 2001 +From fb3f28282c23ac6646588aa1fe84ae774f8ae0f6 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> -Date: Mon, 7 Aug 2023 11:46:35 -0500 +Date: Thu, 31 Aug 2023 15:31:11 -0500 Subject: [PATCH] Add BeagleBoard.org Device Tree Changes https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/tree/v5.10.x-ti-unified -https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/fe6a775f9b61d75bbf4299c30dfb51cce820ad97 +https://git.beagleboard.org/beagleboard/BeagleBoard-DeviceTrees/-/commit/78e0d983987866149da4b77d926ece5139feb314 Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- arch/arm/boot/dts/Makefile | 13 + diff --git a/patches/ti_sdk_am3x_release_defconfig b/patches/ti_sdk_am3x_release_defconfig index 15ec9d06be62fe48566ff0f9cc8de82e218de526..e37949e7846398d257ddd9f6f6d336a42e9c2611 100644 --- a/patches/ti_sdk_am3x_release_defconfig +++ b/patches/ti_sdk_am3x_release_defconfig @@ -6076,6 +6076,10 @@ CONFIG_VF610_ADC=m CONFIG_XILINX_XADC=y # end of Analog to digital converters +# +# Analog to digital and digital to analog converters +# + # # Analog Front Ends # diff --git a/patches/ti_sdk_dra7x_release_defconfig b/patches/ti_sdk_dra7x_release_defconfig index b95838b0bcb432f93f42e4f64521e3096cb5db4c..135ef8bebb2a36cc892a3c67b1fa4116090595fb 100644 --- a/patches/ti_sdk_dra7x_release_defconfig +++ b/patches/ti_sdk_dra7x_release_defconfig @@ -6133,6 +6133,10 @@ CONFIG_VF610_ADC=m CONFIG_XILINX_XADC=y # end of Analog to digital converters +# +# Analog to digital and digital to analog converters +# + # # Analog Front Ends # diff --git a/version.sh b/version.sh index 56d07b866cb46e851f12b78ffc5d2918a6f7107c..14632f5cddc23ab33dcb8f59945a1dc23b78f6c9 100644 --- a/version.sh +++ b/version.sh @@ -48,7 +48,7 @@ KERNEL_REL=5.10 KERNEL_TAG=${KERNEL_REL}.168 kernel_rt=".168-rt83" #Kernel Build -BUILD=${build_prefix}69 +BUILD=${build_prefix}69.1 #v6.X-rcX + upto SHA #prev_KERNEL_SHA=""