[linux-yocto] [kernel-meta yocto-5.10] beaglebone: Drop the obsolete CONFIG_BACKLIGHT_GENERIC
This driver has been removed by kernel commit 7ecdea4a0226 ("backlight:
generic_bl: Remove this driver as it is unused"), so drop it from the
cfg file.
Signed-off-by: Kevin Hao
---
bsp/beaglebone/beaglebone.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg
index 0e465bcb0da1..7841dddb70ae 100644
--- a/bsp/beaglebone/beaglebone.cfg
+++ b/bsp/beaglebone/beaglebone.cfg
@@ -214,7 +214,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=y
#
# Console display driver support
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9345):
https://lists.yoctoproject.org/g/linux-yocto/message/9345
Mute This Topic: https://lists.yoctoproject.org/mt/79540880/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v5.10] MIPS: OCTEON: Fix the boot broken when using built-in DTB
For the OCTEON boards, it need to patch the built-in DTB before using
it. Previously it judges if it is a built-in DTB by checking
fw_passed_dtb. But after commit 37e5c69ffd41 ("MIPS: head.S: Init
fw_passed_dtb to builtin DTB", the fw_passed_dtb is initialized even
when using built-in DTB. This causes the OCTEON boards boot broken due
to an unpatched built-in DTB is used. Add more checks to judge if we
really use built-in DTB or not.
Fixed: 37e5c69ffd41 ("MIPS: head.S: Init fw_passed_dtb to builtin DTB")
Cc: sta...@vger.kernel.org
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this to v5.10/standard/edgerouter branch.
arch/mips/cavium-octeon/setup.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 982826ba0ef7..41d9c80e9666 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1149,7 +1149,8 @@ void __init device_tree_init(void)
bool do_prune;
bool fill_mac;
- if (fw_passed_dtb) {
+ if (fw_passed_dtb && (fw_passed_dtb != (ulong)&__dtb_octeon_68xx_begin)
&&
+ (fw_passed_dtb != (ulong)&__dtb_octeon_3xxx_begin)) {
fdt = (void *)fw_passed_dtb;
do_prune = false;
fill_mac = true;
--
2.29.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#9346):
https://lists.yoctoproject.org/g/linux-yocto/message/9346
Mute This Topic: https://lists.yoctoproject.org/mt/79548105/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto]: [kernel v5.10/standard/bcm-2xxx-rpi]: bcm-2xxx-rpi: add patches for raspberrypi 4b platform
On Wed, Jan 13, 2021 at 10:41:58AM +0800, Meng Li wrote: > From: Limeng > > Hi Bruce, > > I got these patches from raspberrypi sdk kernel repo > https://github.com/raspberrypi/linux.git rpi-5.10.y, > and want to merge them into linux-yocto. There are 481 patches. > So, could you please help merge these patches into linux-ycoto kernel, branch > is v5.10/standard/bcm-2xxx-rpi? > The 481 patches are in my public repo > https://github.com/limeng-linux/linux-yocto-5.10.git, branch > v5.10/standard/bcm-2xxx-rpi > > diffstat info as below: > > /arch/arm/boot/dts/overlays/sdtweak-overlay.dts| > 25 > /drivers/media/platform/bcm2835/Kconfig| > 45 > /drivers/media/platform/bcm2835/Makefile | >6 > /drivers/media/platform/bcm2835/bcm2835-unicam.c | > 5937 > /drivers/media/platform/bcm2835/vc4-regs-unicam.h | > 506 > arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi | >7 > b/.github/ISSUE_TEMPLATE/bug_report.md | > 34 Why do we need this? > b/.gitignore | >1 > b/Documentation/admin-guide/media/bcm2835-isp.rst | > 127 > b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml | > 39 > b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml | >1 > b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml | > 118 > b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt | > 55 > b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt | > 93 > b/Documentation/devicetree/bindings/media/i2c/imx219.txt | > 59 > b/Documentation/devicetree/bindings/media/i2c/imx290.txt | >7 > b/Documentation/devicetree/bindings/media/i2c/imx477.yaml | > 113 > b/Documentation/devicetree/bindings/media/i2c/irs1125.txt | > 48 > b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml | > 72 > b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt | > 17 > b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt | > 48 > b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt | >3 > b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt | > 59 > b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt | >1 > b/Documentation/devicetree/bindings/serial/pl011.yaml | >6 > b/Documentation/devicetree/bindings/vendor-prefixes.txt| > 463 > b/Documentation/devicetree/bindings/vendor-prefixes.yaml | >2 > b/Documentation/devicetree/configfs-overlays.txt | > 31 > b/Documentation/hwmon/rpi-poe-fan | > 15 > b/Documentation/userspace-api/media/drivers/index.rst | >1 > b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst| > 46 > b/Documentation/userspace-api/media/v4l/meta-formats.rst | >2 > b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst | >1 > b/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst | > 41 > b/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst| > 32 > b/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst | > 215 > b/Documentation/userspace-api/media/v4l/pixfmt-nv12.rst| > 14 > b/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst| > 45 > b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst| > 54 > b/Documentation/userspace-api/media/v4l/subdev-formats.rst | > 33 > b/Documentation/userspace-api/media/v4l/yuv-formats.rst| >3 > b/MAINTAINERS | > 35 > b/Makefile | >5 > b/arch/arm/boot/dts/Makefile | > 30 > b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | > 129 > b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | > 132 > b/arch/arm/boot/dts/bcm2708-rpi-b.dts | > 119 > b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi| > 26 > b/arch/arm/boot/dts/bcm2708-rpi-cm.dts | > 112 > b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi| > 18 > b/arch/arm/boo
Re: [linux-yocto]: [kernel v5.10/standard/bcm-2xxx-rpi]: bcm-2xxx-rpi: add patches for raspberrypi 4b platform
On Wed, Jan 13, 2021 at 06:25:34AM +, Meng Li wrote: > > > b/arch/arm/include/asm/cacheflush.h > > > | 21 > > > b/arch/arm/include/asm/glue-cache.h > > > |2 > > > b/arch/arm/include/asm/irqflags.h > > > | 16 > > > b/arch/arm/include/asm/string.h > > > |5 > > > b/arch/arm/include/asm/uaccess.h > > > |3 > > > b/arch/arm/kernel/fiq.c > > > |4 > > > b/arch/arm/kernel/fiqasm.S > > > |4 > > > b/arch/arm/kernel/reboot.c > > > |4 > > > b/arch/arm/kernel/setup.c > > > | 10 > > > b/arch/arm/lib/Makefile > > > | 14 > > > b/arch/arm/lib/arm-mem.h > > > | 159 > > > b/arch/arm/lib/copy_from_user.S > > > |4 > > > b/arch/arm/lib/exports_rpi.c > > > | 37 > > > b/arch/arm/lib/memcmp_rpi.S > > > | 285 > > > b/arch/arm/lib/memcpy_rpi.S > > > | 61 > > > b/arch/arm/lib/memcpymove.h > > > | 506 > > > b/arch/arm/lib/memmove_rpi.S > > > | 61 > > > b/arch/arm/lib/memset_rpi.S > > > | 128 > > > b/arch/arm/lib/uaccess_with_memcpy.c > > > | 130 > > > b/arch/arm/mach-bcm/Kconfig > > > |9 > > > b/arch/arm/mach-bcm/board_bcm2835.c > > > | 127 > > > b/arch/arm/mm/cache-v6.S > > > |4 > > > b/arch/arm/mm/cache-v7.S > > > |6 > > > b/arch/arm/mm/proc-macros.S > > > |2 > > > b/arch/arm/mm/proc-syms.c > > > |3 > > > b/arch/arm/mm/proc-v6.S > > > | 15 > > > b/arch/arm/mm/proc-v7.S > > > |6 > > > > Hmm, do we really need the above arm core changes for the BSP support? > > > > This patch is not related with arm64 raspberrypi4 platform. > But I think it is related with arm32 raspberrypi1/2/3. > > Do you think we should keep them in pull request? We don't have the plan to support the raspberrypi1/2/3 SoC and it should be very unlikely to support them in the future. So I would like to drop all these patches which touch the arm core codes, otherwise they may conflict with the stable update and cause the unnecessary difficulties for the sustaining. > > > b/arch/arm64/kernel/armv8_deprecated.c > > > |5 > > > b/arch/arm64/kernel/cpuinfo.c > > > | 25 > > > > Do we really need these for the BSP support? > > > > There is no comment in these 2 patches related with file armv8_deprecated.c > and cpuinfo.c. > From code, they all have special meaning. > So, I am not sure whether we can remove them. For the changes in armv8_deprecated.c, it makes no sense to force hardware emulation of the deprecated instructions. It should be safe to drop it. For the change in cpuinfo.c, this is just a unnecessary cosmetic change, we can drop it safely. > > > b/mm/zswap.c > > > | 53 > > > > This patch has special target, so I think we should keep it. I don't think we have ZSWAP enabled in our BSP, even if this is enabled, we shouldn't need a hacking like this for a specific BSP. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9361): https://lists.yoctoproject.org/g/linux-yocto/message/9361 Mute This Topic: https://lists.yoctoproject.org/mt/79642262/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][yocto-kernel-cache][yocto-5.4][PATCH] nxp-imx8: fix some warnings in do configure
On Wed, Jan 13, 2021 at 07:12:48PM +0800, Xiaolei Wang wrote: > Fixing the following warning, we can't set them to 'y', when > CONFIG_VIDEOBUF2_VMALLOC > , CONFIG_USB_CDNS3, CONFIG_NOP_USB_XCEIV, CONFIG_USB_SNP_CORE, > CONFIG_USB_SNP_UDC_PLAT It is not clear to me why these options can't be set to 'y', could you elaborate a bit more? > is 'm', it is'm', When CONFIG_DRM_TTM is'y'. CONFIG_IMX_LCDIF_CORE and Do you know why we set the CONFIG_DRM_TTM to 'm' at first? Are there any side effects if we change this to 'y'? I remember some DRM drivers can't be set to 'y' because the firmware load issue, but I am not sure if it apply to this case. Thanks, Kevin > CONFIG_DRM_IMX_SEC_DSIM are duplicate config, CONFIG_MXC_SIM and > CONFIG_MXC_EMVSIM > are not needed > > [NOTE]: 'CONFIG_VIDEOBUF2_VMALLOC' last val (y) and .config val (m) do > not match > [INFO]: CONFIG_VIDEOBUF2_VMALLOC : m ## .config: 3557 > :configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg (y) > > [NOTE]: 'CONFIG_DRM_TTM' last val (m) and .config val (y) do not match > [INFO]: CONFIG_DRM_TTM : y ## .config: 3973 > :configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg (m) > > [INFO]: Fragments with duplicated configuration options: > - fragment configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg has > a duplicated option: CONFIG_IMX_LCDIF_CORE > - fragment configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg has > a duplicated option: CONFIG_DRM_IMX_SEC_DSIM > > [INFO]: the following symbols were not found in the active configuration: > - CONFIG_MXC_SIM > - CONFIG_MXC_EMVSIM > > [NOTE]: 'CONFIG_USB_CDNS3' last val (y) and .config val (m) do not match > [INFO]: CONFIG_USB_CDNS3 : m ## .config: 4768 > :configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg (y) > > [NOTE]: 'CONFIG_NOP_USB_XCEIV' last val (y) and .config val (m) do not > match > [INFO]: CONFIG_NOP_USB_XCEIV : m ## .config: 4815 > :configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg (y) > > [NOTE]: 'CONFIG_USB_SNP_CORE' last val (y) and .config val (m) do not > match > [INFO]: CONFIG_USB_SNP_CORE : m ## .config: 4841 > :configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg (y) > > [NOTE]: 'CONFIG_USB_SNP_UDC_PLAT' last val (y) and .config val (m) do not > match > [INFO]: CONFIG_USB_SNP_UDC_PLAT : m ## .config: 4842 > :configs/v5.4/standard/nxp-imx8/bsp/nxp-imx8/nxp-imx8.cfg (y) > > Signed-off-by: Xiaolei Wang > --- > bsp/nxp-imx8/nxp-imx8.cfg | 17 ++--- > 1 file changed, 6 insertions(+), 11 deletions(-) > > diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg > index 42e4c6a5..21c0236a 100644 > --- a/bsp/nxp-imx8/nxp-imx8.cfg > +++ b/bsp/nxp-imx8/nxp-imx8.cfg > @@ -56,16 +56,16 @@ CONFIG_USB_HCD_TEST_MODE=y > CONFIG_USB_ACM=m > CONFIG_USB_STORAGE=y > CONFIG_USB_UAS=y > -CONFIG_USB_CDNS3=y > +CONFIG_USB_CDNS3=m > CONFIG_USB_CDNS3_GADGET=y > CONFIG_USB_CDNS3_HOST=y > CONFIG_USB_PHY=y > -CONFIG_NOP_USB_XCEIV=y > +CONFIG_NOP_USB_XCEIV=m > CONFIG_USB_MXS_PHY=y > CONFIG_USB_ULPI=y > CONFIG_USB_ULPI_VIEWPORT=y > -CONFIG_USB_SNP_CORE=y > -CONFIG_USB_SNP_UDC_PLAT=y > +CONFIG_USB_SNP_CORE=m > +CONFIG_USB_SNP_UDC_PLAT=m > > # > ## Random Number Generation > @@ -298,7 +298,7 @@ CONFIG_VIDEOBUF2_V4L2=y > CONFIG_VIDEOBUF2_CORE=y > CONFIG_VIDEOBUF2_MEMOPS=y > CONFIG_VIDEOBUF2_DMA_CONTIG=y > -CONFIG_VIDEOBUF2_VMALLOC=y > +CONFIG_VIDEOBUF2_VMALLOC=m > CONFIG_MEDIA_USB_SUPPORT=y > CONFIG_USB_VIDEO_CLASS=m > CONFIG_V4L_PLATFORM_DRIVERS=y > @@ -318,7 +318,6 @@ CONFIG_IMX8_PRG=y > CONFIG_IMX8_DPRC=y > CONFIG_IMX8_PC=y > CONFIG_IMX_DPU_BLIT=y > -CONFIG_IMX_LCDIF_CORE=y > CONFIG_IMX_DPU_CORE=y > CONFIG_DRM=y > CONFIG_DRM_MIPI_DSI=y > @@ -326,7 +325,7 @@ CONFIG_DRM_KMS_HELPER=y > CONFIG_DRM_KMS_FB_HELPER=y > CONFIG_DRM_FBDEV_EMULATION=y > CONFIG_DRM_FBDEV_OVERALLOC=100 > -CONFIG_DRM_TTM=m > +CONFIG_DRM_TTM=y > CONFIG_DRM_VRAM_HELPER=m > CONFIG_DRM_GEM_CMA_HELPER=y > CONFIG_DRM_KMS_CMA_HELPER=y > @@ -370,7 +369,6 @@ CONFIG_DRM_IMX8QM_LDB=y > CONFIG_IMX8MP_HDMI_PAVI=y > CONFIG_DRM_IMX_HDMI=y > CONFIG_DRM_IMX_DCSS=y > -CONFIG_DRM_IMX_SEC_DSIM=y > CONFIG_DRM_IMX_LCDIF=y > CONFIG_DRM_IMX_DPU=y > CONFIG_DRM_IMX_CDNS_MHDP=y > @@ -495,8 +493,6 @@ CONFIG_TYPEC_SWITCH_GPIO=y > CONFIG_TYPEC_TCPM=y > CONFIG_TYPEC_TCPCI=y > CONFIG_EXTCON_PTN5150=y > -CONFIG_MXC_SIM=y > -CONFIG_MXC_EMVSIM=y > CONFIG_MXC_MLB150=y > CONFIG_RESET_CONTROLLER=y > CONFIG_BACKLIGHT_PWM=y > @@ -511,4 +507,3 @@ CONFIG_IMX_DSP=y > CONFIG_IMX_SCU_PD=y > CONFIG_IIO=y > > - > -- > 2.25.1 > > > > signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9365): https://lists.yoctoproject.org/g/linux-yocto/message/9365 Mute This Topic: https://lists.yoctoproject.org/mt/79648188/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://li
Re: [linux-yocto] [v2][PATCH] Revert "mfd: syscon: Don't free allocated name for regmap_config"
On Thu, Mar 25, 2021 at 02:19:32AM +, Xiaolei Wang wrote: > Hi bruce > > Please help merge linux-yocto kernel v5.10/standard/nxp-sdk-5.4/nxp-imx8 > branch This seems not BSP specific, maybe we should merge into into v5.10/standard/base. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9618): https://lists.yoctoproject.org/g/linux-yocto/message/9618 Mute This Topic: https://lists.yoctoproject.org/mt/81593662/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [v2][PATCH] Revert "mfd: syscon: Don't free allocated name for regmap_config"
On Tue, Mar 30, 2021 at 04:46:30PM -0400, Bruce Ashfield wrote: > On Wed, Mar 24, 2021 at 11:58 PM Kevin Hao wrote: > > > > On Thu, Mar 25, 2021 at 02:19:32AM +, Xiaolei Wang wrote: > > > Hi bruce > > > > > > Please help merge linux-yocto kernel v5.10/standard/nxp-sdk-5.4/nxp-imx8 > > > branch > > > > This seems not BSP specific, maybe we should merge into into > > v5.10/standard/base. > > > > Indeed. > > Is the change that introduced this issue only in the BSP, or otherwise > specific to this BSP ? If not, we should do it in a more common > location. This is not a BSP specific issue and this issue is also reproducible on the latest kernel. Meng Li has sent this [1] to the upstream but the maintainer prefer a more sophisticated solution. So instead of waiting for the perfect resolution which may not come out forever, the revert solution should be the right approach for the sable kernel. [1] https://lore.kernel.org/lkml/20210310083148.GD4931@dell/T/ Thanks, Kevin > > Bruce > > > Thanks, > > Kevin > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9629): https://lists.yoctoproject.org/g/linux-yocto/message/9629 Mute This Topic: https://lists.yoctoproject.org/mt/81593662/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache yocto-5.10] qemuppc64: Enable the RTC driver
Enable the RTC driver to fix the following warning in boot: hwclock: can't open '/dev/misc/rtc': No such file or directory Signed-off-by: Kevin Hao --- bsp/qemu-ppc64/qemu-ppc64.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bsp/qemu-ppc64/qemu-ppc64.cfg b/bsp/qemu-ppc64/qemu-ppc64.cfg index 9aac06de0eb6..b2a5194dd1d1 100644 --- a/bsp/qemu-ppc64/qemu-ppc64.cfg +++ b/bsp/qemu-ppc64/qemu-ppc64.cfg @@ -73,3 +73,6 @@ CONFIG_USB_XHCI_PCI=y CONFIG_USB_XHCI_PLATFORM=y CONFIG_DRM_BOCHS=n + +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GENERIC=y -- 2.30.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9712): https://lists.yoctoproject.org/g/linux-yocto/message/9712 Mute This Topic: https://lists.yoctoproject.org/mt/81913368/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [PATCH] nxp-imx6: add kernel-cache configuration files for bsp nxp-imx6ul
Hi Bruce, This is for yocto-5.10 branch. Thanks, Kevin On Fri, Jun 11, 2021 at 12:51:17AM -0700, baogen.sh...@windriver.com wrote: > From: Baogen Shang > > This adds the cfg & scc files to support the nxp-imx6ul > > Signed-off-by: Baogen Shang > --- > bsp/nxp-imx6/nxp-imx6-standard.scc | 8 ++ > bsp/nxp-imx6/nxp-imx6.cfg | 190 + > bsp/nxp-imx6/nxp-imx6.scc | 7 ++ > 3 files changed, 205 insertions(+) > create mode 100644 bsp/nxp-imx6/nxp-imx6-standard.scc > create mode 100644 bsp/nxp-imx6/nxp-imx6.cfg > create mode 100644 bsp/nxp-imx6/nxp-imx6.scc > > diff --git a/bsp/nxp-imx6/nxp-imx6-standard.scc > b/bsp/nxp-imx6/nxp-imx6-standard.scc > new file mode 100644 > index ..ed64dcce > --- /dev/null > +++ b/bsp/nxp-imx6/nxp-imx6-standard.scc > @@ -0,0 +1,8 @@ > +define KMACHINE nxp-imx6 > +define KTYPE standard > +define KARCH arm > + > +include ktypes/standard > +branch nxp-imx6 > + > +include nxp-imx6.scc > diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg > new file mode 100644 > index ..b47a89a0 > --- /dev/null > +++ b/bsp/nxp-imx6/nxp-imx6.cfg > @@ -0,0 +1,190 @@ > +CONFIG_ARCH_MXC=y > +CONFIG_SOC_IMX6UL=y > + > +CONFIG_FW_LOADER=y > +CONFIG_FW_LOADER_USER_HELPER=y > +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y > + > +CONFIG_CPU_FREQ=y > +CONFIG_CPU_FREQ_GOV_POWERSAVE=y > +CONFIG_CPU_FREQ_GOV_USERSPACE=y > +CONFIG_CPU_FREQ_GOV_ONDEMAND=y > +CONFIG_ARM_IMX6Q_CPUFREQ=y > + > +CONFIG_CPU_IDLE=y > +CONFIG_CPU_IDLE_GOV_MENU=y > + > +CONFIG_VFP=y > +CONFIG_NEON=y > + > +CONFIG_MXC_CLK=y > + > +CONFIG_DMADEVICES=y > +CONFIG_IMX_SDMA=m > +CONFIG_MXS_DMA=y > +CONFIG_DMA_OF=y > + > +CONFIG_CFG80211=y > +CONFIG_MAC80211=y > + > +CONFIG_CAN=y > +CONFIG_CAN_VCAN=y > +CONFIG_CAN_FLEXCAN=y > + > +CONFIG_CMA=y > +CONFIG_IMX_WEIM=y > + > +CONFIG_MTD=y > +CONFIG_MTD_CMDLINE_PARTS=y > +CONFIG_MTD_BLOCK=y > +CONFIG_MTD_CFI=y > +CONFIG_MTD_JEDECPROBE=y > +CONFIG_MTD_CFI_INTELEXT=y > +CONFIG_MTD_CFI_AMDSTD=y > +CONFIG_MTD_CFI_STAA=y > +CONFIG_MTD_PHYSMAP=y > +CONFIG_MTD_DATAFLASH=y > +CONFIG_MTD_SPI_NOR=y > +CONFIG_SPI_FSL_QUADSPI=y > +CONFIG_SPI_FSL_LPSPI=y > +CONFIG_MTD_SST25L=y > + > +CONFIG_MTD_RAW_NAND=y > +CONFIG_MTD_NAND_GPMI_NAND=y > +CONFIG_MTD_NAND_MXC=y > +CONFIG_MTD_UBI=y > + > +CONFIG_INPUT_EVDEV=y > +CONFIG_KEYBOARD_IMX=y > +CONFIG_KEYBOARD_GPIO=y > + > +CONFIG_INPUT_TOUCHSCREEN=y > +CONFIG_TOUCHSCREEN_EGALAX=y > +CONFIG_TOUCHSCREEN_MAX11801=y > +CONFIG_TOUCHSCREEN_IMX6UL_TSC=y > + > +CONFIG_INPUT_MISC=y > +CONFIG_INPUT_MMA8450=y > + > +CONFIG_SERIAL_IMX=y > +CONFIG_SERIAL_IMX_CONSOLE=y > +CONFIG_SERIAL_FSL_LPUART=y > +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y > + > +CONFIG_NVMEM_IMX_OCOTP=y > + > +CONFIG_I2C_CHARDEV=y > +CONFIG_I2C_IMX=y > + > +CONFIG_SPI=y > +CONFIG_SPI_IMX=y > +CONFIG_SPI_GPIO=y > + > +CONFIG_GPIO_SYSFS=y > + > +CONFIG_POWER_SUPPLY=y > +CONFIG_WATCHDOG=y > +CONFIG_IMX2_WDT=y > + > +CONFIG_MFD_DA9052_I2C=y > +CONFIG_MFD_MC13XXX_SPI=y > +CONFIG_MFD_MC13XXX_I2C=y > +CONFIG_MFD_SI476X_CORE=y > + > +CONFIG_REGULATOR=y > +CONFIG_REGULATOR_FIXED_VOLTAGE=y > +CONFIG_REGULATOR_ANATOP=y > +CONFIG_REGULATOR_PFUZE100=y > + > +CONFIG_THERMAL=y > +CONFIG_CPU_THERMAL=y > +CONFIG_IMX_THERMAL=y > + > +CONFIG_MEDIA_SUPPORT=y > +CONFIG_MEDIA_CAMERA_SUPPORT=y > +CONFIG_V4L_MEM2MEM_DRIVERS=y > +CONFIG_VIDEO_CODA=y > +CONFIG_V4L_PLATFORM_DRIVERS=y > +CONFIG_STAGING=y > +CONFIG_STAGING_MEDIA=y > + > +CONFIG_DRM=y > +CONFIG_FB=y > +CONFIG_BACKLIGHT_CLASS_DEVICE=y > +CONFIG_LCD_CLASS_DEVICE=y > +CONFIG_LCD_L4F00242T03=y > +CONFIG_LCD_PLATFORM=y > +CONFIG_BACKLIGHT_PWM=y > + > +CONFIG_FRAMEBUFFER_CONSOLE=y > +CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y > + > +CONFIG_USB=y > +CONFIG_USB_OTG=y > +CONFIG_USB_EHCI_MXC=y > +CONFIG_USB_CHIPIDEA=y > +CONFIG_USB_CHIPIDEA_UDC=y > +CONFIG_USB_CHIPIDEA_HOST=y > +CONFIG_USB_PHY=y > +CONFIG_USB_MXS_PHY=y > +CONFIG_USB_GADGET=y > +CONFIG_USB_ZERO=m > +CONFIG_USB_ETH=m > +CONFIG_USB_MASS_STORAGE=m > +CONFIG_USB_G_SERIAL=m > + > +CONFIG_MMC=y > +CONFIG_MMC_SDHCI=y > +CONFIG_MMC_SDHCI_PLTFM=y > +CONFIG_MMC_SDHCI_ESDHC_IMX=y > + > +CONFIG_NEW_LEDS=y > +CONFIG_LEDS_CLASS=y > + > +CONFIG_RTC_CLASS=y > +CONFIG_RTC_INTF_DEV_UIE_EMUL=y > +CONFIG_RTC_DRV_MC13XXX=y > +CONFIG_RTC_DRV_MXC=y > +CONFIG_RTC_DRV_SNVS=y > + > +CONFIG_SOUND=y > +CONFIG_SND=y > +CONFIG_SND_SOC=y > +CONFIG_SND_IMX_SOC=y > +CONFIG_SND_SOC_FSL_ASRC=y > +CONFIG_SND_SOC_FSL_SPDIF=y > +CONFIG_SND_SOC_IMX_SPDIF=y > +CONFIG_SND_SOC_FSL_ESAI=y > + > +CONFIG_ATA=y > +CONFIG_AHCI_IMX=y > + > +CONFIG_PWM=y > +CONFIG_PWM_IMX1=y > +CONFIG_PWM_IMX27=y > +CONFIG_PWM_IMX_TPM=y > + > +CONFIG_HW_RANDOM=y > +CONFIG_CRYPTO_HW=y > +CONFIG_CRYPTO_CTS=y > +CONFIG_CRYPTO_LRW=y > +CONFIG_CRYPTO_XTS=y > +CONFIG_CRYPTO_DEV_FSL_CAAM=y > +CONFIG_CRYPTO_DEV_FSL_CAAM_JR=y > +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y > +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y > +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y > + > +CONFIG_TEE=y > +CONFIG_OPTEE=y > + > +CONFIG_ARM_PSCI=y > +CONFIG_A
Re: [linux-yocto] [PATCH] [v5.10/standard/x86 and v5.10/standard/preempt-rt/x86]
On Tue, Jul 06, 2021 at 01:41:15PM +, Yongxin Liu wrote: > > Perhaps I should remove the intel-x86 branch. I can't really force reset > > that > > merge, since it will cause fetcher issues. > > > > If I'm remembering correctly, wasn't that intel-x86 branch created for Wind > > River BSP support ? > > Actually, from kernel v5.10, Wind River is using x86 branch for both Intel > and AMD x86 CPUs. > That's why x86 branch was created. Intel-x86 branch is not used anymore. > > I am not sure whether anyone else is using intel-x86 branch. > If no one is using this branch, it is fine to remove. Yes, the v5.10/standard/*/intel-x86 branches are not used by Wind River anymore, I don't think they are used by others, so we can drop these branches to avoid this kind of confusion in the future. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10070): https://lists.yoctoproject.org/g/linux-yocto/message/10070 Mute This Topic: https://lists.yoctoproject.org/mt/83974471/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [v5.10] serial: 8250: 8250_omap: Fix possible array out of bounds access
From: Vignesh Raghavendra
commit d4548b14dd7e5c698f81ce23ce7b69a896373b45 upstream
k3_soc_devices array is missing a sentinel entry which may result in out
of bounds access as reported by kernel KASAN.
Fix this by adding a sentinel entry.
Fixes: 439c7183e5b9 ("serial: 8250: 8250_omap: Disable RX interrupt after DMA
enable")
Reported-by: Naresh Kamboju
Signed-off-by: Vignesh Raghavendra
Link: https://lore.kernel.org/r/2020112653.2710-1-vigne...@ti.com
Signed-off-by: Greg Kroah-Hartman
Signed-off-by: Kevin Hao
---
The beaglebone black can't boot since v5.10.50. This is caused by a bug
in commit e0e3e0b7dabf ("serial: 8250: 8250_omap: Disable RX interrupt
after DMA enable"). The fix of it has been merged into mainline half
years ago and it also had the proper fixes tag, so in theory the fix
should propagate to linux-yocto via the stable kernel update. But it
has not been merged into stable kernel yet, the time when it can
propagate to linux-yocto is unpredictable and since it block the boot of
bbb board, I would like to merge it into linux-yocto ASAP.
drivers/tty/serial/8250/8250_omap.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/tty/serial/8250/8250_omap.c
b/drivers/tty/serial/8250/8250_omap.c
index 95e2d6de4f21..ad0549dac7d7 100644
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -1211,6 +1211,7 @@ static int omap8250_no_handle_irq(struct uart_port *port)
static const struct soc_device_attribute k3_soc_devices[] = {
{ .family = "AM65X", },
{ .family = "J721E", .revision = "SR1.0" },
+ { /* sentinel */ }
};
static struct omap8250_dma_params am654_dma = {
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10223):
https://lists.yoctoproject.org/g/linux-yocto/message/10223
Mute This Topic: https://lists.yoctoproject.org/mt/84634665/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-5.13 1/2] beaglebone: Drop the deprecated GPIO_SYSFS
From: Kevin Hao In order to fix the following configcheck warning: [NOTE]: 'CONFIG_GPIO_SYSFS' last val (y) and .config val (n) do not match [INFO]: CONFIG_GPIO_SYSFS : n [INFO]: raw config text: config GPIO_SYSFS bool "/sys/class/gpio/... (sysfs interface)" if EXPERT select GPIO_CDEV depends on SYSFS && GPIOLIB help Say Y here to add the legacy sysfs interface for GPIOs. This ABI is deprecated. If you want to use GPIO from userspace, use the character device /dev/gpiochipN with the appropriate ioctl() operations instead. Config 'GPIO_SYSFS' has the following Direct dependencies (GPIO_SYSFS=y): SYSFS(=y) && GPIOLIB(=y) Parent dependencies are: GPIOLIB [y] EXPERT [n] SYSFS [y] [INFO]: config 'CONFIG_GPIO_SYSFS' was set, but it wasn't assignable, check (parent) dependencies Signed-off-by: Kevin Hao --- bsp/beaglebone/beaglebone.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg index 7841dddb70ae..ae40f9cf384a 100644 --- a/bsp/beaglebone/beaglebone.cfg +++ b/bsp/beaglebone/beaglebone.cfg @@ -148,7 +148,6 @@ CONFIG_PINMUX=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_SINGLE=y -CONFIG_GPIO_SYSFS=y # # I2C GPIO expanders: -- 2.31.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10226): https://lists.yoctoproject.org/g/linux-yocto/message/10226 Mute This Topic: https://lists.yoctoproject.org/mt/84653021/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-5.13 2/2] beaglebone: Drop the obsolete OMAP2_DSS
From: Kevin Hao
This kernel option has been dropped by kernel commit 55b68fb856b5
("drm/omap: squash omapdrm sub-modules into one").
Signed-off-by: Kevin Hao
---
bsp/beaglebone/beaglebone.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg
index ae40f9cf384a..c389b26245f3 100644
--- a/bsp/beaglebone/beaglebone.cfg
+++ b/bsp/beaglebone/beaglebone.cfg
@@ -201,7 +201,6 @@ CONFIG_FB_TILEBLITTING=y
#
# Frame buffer hardware drivers
-CONFIG_OMAP2_DSS=y
CONFIG_OMAP2_DSS_DPI=y
CONFIG_OMAP2_DSS_VENC=y
CONFIG_OMAP2_DSS_DSI=y
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10227):
https://lists.yoctoproject.org/g/linux-yocto/message/10227
Mute This Topic: https://lists.yoctoproject.org/mt/84653022/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [v5.10] serial: 8250: 8250_omap: Fix possible array out of bounds access
On Tue, Aug 03, 2021 at 10:40:24PM -0400, Bruce Ashfield wrote:
>
>
> In message: [v5.10] serial: 8250: 8250_omap: Fix possible array out of bounds
> access
> on 03/08/2021 Kevin Hao wrote:
>
> > From: Vignesh Raghavendra
> >
> > commit d4548b14dd7e5c698f81ce23ce7b69a896373b45 upstream
> >
> > k3_soc_devices array is missing a sentinel entry which may result in out
> > of bounds access as reported by kernel KASAN.
> >
> > Fix this by adding a sentinel entry.
> >
> > Fixes: 439c7183e5b9 ("serial: 8250: 8250_omap: Disable RX interrupt after
> > DMA enable")
> > Reported-by: Naresh Kamboju
> > Signed-off-by: Vignesh Raghavendra
> > Link: https://lore.kernel.org/r/2020112653.2710-1-vigne...@ti.com
> > Signed-off-by: Greg Kroah-Hartman
> > Signed-off-by: Kevin Hao
> > ---
> > The beaglebone black can't boot since v5.10.50. This is caused by a bug
> > in commit e0e3e0b7dabf ("serial: 8250: 8250_omap: Disable RX interrupt
> > after DMA enable"). The fix of it has been merged into mainline half
> > years ago and it also had the proper fixes tag, so in theory the fix
> > should propagate to linux-yocto via the stable kernel update. But it
> > has not been merged into stable kernel yet, the time when it can
> > propagate to linux-yocto is unpredictable and since it block the boot of
> > bbb board, I would like to merge it into linux-yocto ASAP.
> >
>
> Agreed.
>
> This is now merged.
>
> Will you send bumps to the meta-yocto-bsp for the new SRCREV ?
I will.
Thanks,
Kevin
> or did you want me to ? (even though we are looking to bump to
> 5.13).
>
> Bruce
>
>
> > drivers/tty/serial/8250/8250_omap.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/tty/serial/8250/8250_omap.c
> > b/drivers/tty/serial/8250/8250_omap.c
> > index 95e2d6de4f21..ad0549dac7d7 100644
> > --- a/drivers/tty/serial/8250/8250_omap.c
> > +++ b/drivers/tty/serial/8250/8250_omap.c
> > @@ -1211,6 +1211,7 @@ static int omap8250_no_handle_irq(struct uart_port
> > *port)
> > static const struct soc_device_attribute k3_soc_devices[] = {
> > { .family = "AM65X", },
> > { .family = "J721E", .revision = "SR1.0" },
> > + { /* sentinel */ }
> > };
> >
> > static struct omap8250_dma_params am654_dma = {
> > --
> > 2.31.1
> >
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10232):
https://lists.yoctoproject.org/g/linux-yocto/message/10232
Mute This Topic: https://lists.yoctoproject.org/mt/84634665/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-5.15] beaglebone: Enable the new cpsw switch drv
The kernel commit c477358e66a3 ("ARM: dts: am335x-bone: switch to new
cpsw switch drv") has switched to the new cpsw switch driver in the
dts, so we need to enable the corresponding driver by default. We also
keep the old switch driver to be compatible with the old version kernel.
Signed-off-by: Kevin Hao
---
bsp/beaglebone/beaglebone.cfg | 2 ++
1 file changed, 2 insertions(+)
diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg
index c389b26245f3..c593f53d50b2 100644
--- a/bsp/beaglebone/beaglebone.cfg
+++ b/bsp/beaglebone/beaglebone.cfg
@@ -93,6 +93,8 @@ CONFIG_SMSC911X=y
CONFIG_TI_CPSW_PHY_SEL=y
CONFIG_TI_CPSW=y
CONFIG_TI_DAVINCI_MDIO=y
+CONFIG_NET_SWITCHDEV=y
+CONFIG_TI_CPSW_SWITCHDEV=y
#
# MII PHY device drivers
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10647):
https://lists.yoctoproject.org/g/linux-yocto/message/10647
Mute This Topic: https://lists.yoctoproject.org/mt/87046814/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH] arm64: Restore the init of srcin for __arch_copy_{from,to}_user()
From: Kevin Hao
When we were trying to merge the v5.10.77 stable kernel, the commit
d4d9c065988c ("arm64: Avoid premature usercopy failure") conflicts with
the changes in the Marvell specific workaround commit 8b8b3bc1497a
("arm64: Use nops between LDs and STs"). In the fixup of these
conflicts, the init of srcin was missed in the function
__arch_copy_{from,to}_user(). Restore these codes back to fix the kernel
hang when running the fio testcase.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this to the following two branches:
v5.10/standard/cn-sdkv5.4/octeon
v5.10/standard/preempt-rt/cn-sdkv5.4/octeon
arch/arm64/lib/copy_from_user.S | 1 +
arch/arm64/lib/copy_to_user.S | 1 +
2 files changed, 2 insertions(+)
diff --git a/arch/arm64/lib/copy_from_user.S b/arch/arm64/lib/copy_from_user.S
index 3c77d1762e0e..942996e82603 100644
--- a/arch/arm64/lib/copy_from_user.S
+++ b/arch/arm64/lib/copy_from_user.S
@@ -59,6 +59,7 @@ end .reqx5
srcin .reqx15
SYM_FUNC_START(__arch_copy_from_user)
add end, x0, x2
+ mov srcin, x1
alternative_if_not ARM64_WORKAROUND_MRVL_38500
nop
alternative_else
diff --git a/arch/arm64/lib/copy_to_user.S b/arch/arm64/lib/copy_to_user.S
index 62574a3afd0c..d141c6c71fa3 100644
--- a/arch/arm64/lib/copy_to_user.S
+++ b/arch/arm64/lib/copy_to_user.S
@@ -59,6 +59,7 @@ end .reqx5
srcin .reqx15
SYM_FUNC_START(__arch_copy_to_user)
add end, x0, x2
+ mov srcin, x1
alternative_if_not ARM64_WORKAROUND_MRVL_38500
nop
alternative_else
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10694):
https://lists.yoctoproject.org/g/linux-yocto/message/10694
Mute This Topic: https://lists.yoctoproject.org/mt/87302601/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH] linux-yocto-dev: Make -dev kernel work for a fixed revision
By default the -dev kernel uses the "AUTOREV" to pull in the branch
head as the revision. Some of our BSPs are based on the -dev kernel and
we choose to nail down the kernel to a specific revision when releasing
our product by using some setting like below:
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
SRCREV_machine:pn-linux-yocto-dev = "6fb48ae18a10770702266dd1f1aa500149e361ec"
KBRANCH:pn-linux-yocto-dev = "standard/x86"
LINUX_VERSION = "5.15"
Since all the standard/* branches will be rebased after each kernel
version bump, we would get bitbake fetch failure due to that specific
commit is not reachable in the new version branch. This kind of issue
can be fixed by setting the "nobranch" parameter in the SRC_URI because
it will cause the fetcher to skip the SHA validation for the branch.
And this also won't cause other side effect because all the branches
will be created in the do_kernel_checkout() and the current branch will
be reset to the reversion we want in do_validate_branches().
Signed-off-by: Kevin Hao
---
meta/recipes-kernel/linux/linux-yocto-dev.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb
b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index 6b6ea9a7e864..7204c3eddc11 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -19,7 +19,8 @@ include recipes-kernel/linux/linux-yocto-dev-revisions.inc
KBRANCH = "standard/base"
KMETA = "kernel-meta"
-SRC_URI =
"git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine \
+# Set nobranch to skip the SHA validation for branch if a fixed revesion is
used
+SRC_URI =
"git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;nobranch=1
\
git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA}"
# Set default SRCREVs. Both the machine and meta SRCREVs are statically set
--
2.31.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#10695):
https://lists.yoctoproject.org/g/linux-yocto/message/10695
Mute This Topic: https://lists.yoctoproject.org/mt/87421081/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [PATCH] linux-yocto-dev: Make -dev kernel work for a fixed revision
On Wed, Dec 01, 2021 at 04:27:44PM -0500, Bruce Ashfield wrote:
> [Please note: This e-mail is from an EXTERNAL e-mail address]
>
> On Wed, Dec 1, 2021 at 6:28 AM Richard Purdie
> wrote:
> >
> > On Wed, 2021-12-01 at 12:39 +0800, Kevin Hao wrote:
> > > By default the -dev kernel uses the "AUTOREV" to pull in the branch
> > > head as the revision. Some of our BSPs are based on the -dev kernel and
> > > we choose to nail down the kernel to a specific revision when releasing
> > > our product by using some setting like below:
> > > PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
> > > SRCREV_machine:pn-linux-yocto-dev =
> > > "6fb48ae18a10770702266dd1f1aa500149e361ec"
> > > KBRANCH:pn-linux-yocto-dev = "standard/x86"
> > > LINUX_VERSION = "5.15"
> > >
> > > Since all the standard/* branches will be rebased after each kernel
> > > version bump, we would get bitbake fetch failure due to that specific
> > > commit is not reachable in the new version branch. This kind of issue
> > > can be fixed by setting the "nobranch" parameter in the SRC_URI because
> > > it will cause the fetcher to skip the SHA validation for the branch.
> > > And this also won't cause other side effect because all the branches
> > > will be created in the do_kernel_checkout() and the current branch will
> > > be reset to the reversion we want in do_validate_branches().
> > >
> > > Signed-off-by: Kevin Hao
> > > ---
> > > meta/recipes-kernel/linux/linux-yocto-dev.bb | 3 ++-
> > > 1 file changed, 2 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb
> > > b/meta/recipes-kernel/linux/linux-yocto-dev.bb
> > > index 6b6ea9a7e864..7204c3eddc11 100644
> > > --- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
> > > +++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
> > > @@ -19,7 +19,8 @@ include
> > > recipes-kernel/linux/linux-yocto-dev-revisions.inc
> > > KBRANCH = "standard/base"
> > > KMETA = "kernel-meta"
> > >
> > > -SRC_URI =
> > > "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine
> > > \
> > > +# Set nobranch to skip the SHA validation for branch if a fixed revesion
> > > is used
> > > +SRC_URI =
> > > "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name=machine;nobranch=1
> > > \
> > >
> > > git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=master;destsuffix=${KMETA}"
> > >
> > > # Set default SRCREVs. Both the machine and meta SRCREVs are statically
> > > set
> >
> > I'm afraid this looks to be a bit of a horrible workaround/hack. It happens
> > that
> > if you specify a branch and set nobranch it might do what you want but that
> > certainly isn't by design.
> >
> > Either the revision is in the branch or it isn't. The error is telling you
> > the
> > configuration you set isn't valid and you really need to set a valid
> > configuration, i.e. a revision and a branch or a revision and set nobranch
> > but
> > not both.
> >
> > I'm not sure I understand why the kernel would be rebasing after each kernel
> > release? Is this because it is one of the unversioned branches?
>
> Yah, it is exactly that. The -dev kernel has always been a rebase
> tree, like linux-next upstream.
>
> Since the BSP work started against it (the -dev tree), when I move on
> from a -dev version, I've been saving all work into versioned branches
> ... versus removing them (and storing the history in the
> kernel-cache).
>
> That being said, we merged some code some time ago that allows the
> -dev kernel to automatically switch to the versioned branches, versus
> the rebased "standard/*" branches. (that supports existing releases
> with the -dev kernel as I move the one in master to new versions).
> Have a look at do_validate_branches(), but unfortunately the fetcher
> error will have already been thrown and we can't adjust to the fixed
> SRCREV.
>
> The issue here is the attempt to pin the revision (like Richard is
> saying), since if you use AUTOREV the code I just mentioned code kicks
> in to make sure a versioned branch is used. Nothing should be released
> against -dev, so any issues with pinned SRCREVs and branches should be
> transient.
>
> I've floa
Re: [linux-yocto] [PATCH] linux-yocto-dev: Make -dev kernel work for a fixed revision
On Thu, Dec 02, 2021 at 07:31:52AM -0500, Bruce Ashfield wrote: > > That would be great if you can do so. > > ok. Let's solve this with an explicit KBRANCH with your pinned SRCREVs > for now, and I'll update -dev to use versioned branches for the current > 5.16 cycle and all new versions that follow. Thanks Bruce. Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10704): https://lists.yoctoproject.org/g/linux-yocto/message/10704 Mute This Topic: https://lists.yoctoproject.org/mt/87421081/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache yocto-5.10] marvell-cn106xx: Enable the A32 application support
From: Kevin Hao We need to enable these kernel options for the multilib support. Signed-off-by: Kevin Hao --- bsp/marvell-cn106xx/marvell-cn106xx.cfg | 3 +++ bsp/marvell-cn106xx/marvell-cn106xx.scc | 1 + 2 files changed, 4 insertions(+) diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg b/bsp/marvell-cn106xx/marvell-cn106xx.cfg index b5982d460354..f2431bd641aa 100644 --- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg +++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg @@ -20,6 +20,9 @@ CONFIG_NR_CPUS=24 CONFIG_ARCH_THUNDER=y CONFIG_JUMP_LABEL=y +# Since we use the 64K pages, so we have to enable this for the multilib support +CONFIG_EXPERT=y + # PCIe CONFIG_PCI=y CONFIG_PCIEPORTBUS=y diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.scc b/bsp/marvell-cn106xx/marvell-cn106xx.scc index 5598878386ed..a809af52993c 100644 --- a/bsp/marvell-cn106xx/marvell-cn106xx.scc +++ b/bsp/marvell-cn106xx/marvell-cn106xx.scc @@ -6,3 +6,4 @@ include cfg/usb-mass-storage.scc include features/hugetlb/hugetlb.scc include features/profiling/profiling.scc +include arch/arm/32bit-compat.scc -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11025): https://lists.yoctoproject.org/g/linux-yocto/message/11025 Mute This Topic: https://lists.yoctoproject.org/mt/89661113/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache yocto-5.10 1/2] marvell-cn96xx: Factor out the specific options for cn-sdkv5.4/octeon branches
From: Kevin Hao In the linux-yocto there are two similar branches. v5.10/standard/cn-sdkv4.18/cn96xx v5.10/standard/cn-sdkv5.4/octeon They supports the same SoC but are based on the different SDK version. All these branches share with the same BSP definition (scc & cfg), but some kernel options only exist in one of kernel branch. So factor out these specific options to a separate cfg and the corresponding machine can include these cfg files respectively. Signed-off-by: Kevin Hao --- bsp/marvell-cn96xx/marvell-cn96xx.cfg | 3 --- bsp/marvell-cn96xx/sdkv5.4.cfg| 19 +++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 bsp/marvell-cn96xx/sdkv5.4.cfg diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg index a4abd19bf37e..fcb9d5f8a2c0 100644 --- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg +++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg @@ -138,6 +138,3 @@ CONFIG_CORESIGHT_SOURCE_ETM4X=y CONFIG_CORESIGHT_CPU_DEBUG=y CONFIG_CORESIGHT_CTI=y CONFIG_CORESIGHT_CTI_INTEGRATION_REGS=y - -# OCTEONTX2_CCU -CONFIG_OCTEONTX2_CCU=y diff --git a/bsp/marvell-cn96xx/sdkv5.4.cfg b/bsp/marvell-cn96xx/sdkv5.4.cfg new file mode 100644 index ..5f0361caf2ed --- /dev/null +++ b/bsp/marvell-cn96xx/sdkv5.4.cfg @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: MIT +.. +.WARNING +. +. This file is a kernel configuration fragment, and not a full kernel +. configuration file. The final kernel configuration is made up of +. an assembly of processed fragments, each of which is designed to +. capture a specific part of the final configuration (e.g. platform +. configuration, feature configuration, and board specific hardware +. configuration). For more information on kernel configuration, please +. consult the product documentation. +. +.. + +# This file includes the kernel options which are specific to +# the cn-sdkv5.4/octeon branches. + +# OCTEONTX2_CCU +CONFIG_OCTEONTX2_CCU=y -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11051): https://lists.yoctoproject.org/g/linux-yocto/message/11051 Mute This Topic: https://lists.yoctoproject.org/mt/89868280/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache yocto-5.10 2/2] marvell-cn96xx: Introduce marvell-cn96xx-sdkv5.4 machine
From: Kevin Hao So far the BSPs based on the cn-sdkv4.18/cn96xx and cn-sdkv5.4/octeon branches use the same BSP machine definition (scc & cfg), but some new drivers are introduced in the cn-sdkv5.4/octeon branch recently, then we can't just put these new kernel driver options into the marvell-cn96xx.cfg since it will cause the config check warning for the BSP based on cn-sdkv4.18/cn96xx branch. So introduce a new machine for the BSP based on the cn-sdkv5.4/octeon branch to include these new kernel drivers. Signed-off-by: Kevin Hao --- .../marvell-cn96xx-sdkv5.4-preempt-rt.scc | 10 ++ bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc | 9 + 2 files changed, 19 insertions(+) create mode 100644 bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc create mode 100644 bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc diff --git a/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc new file mode 100644 index ..ab4d380f2526 --- /dev/null +++ b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-preempt-rt.scc @@ -0,0 +1,10 @@ +define KMACHINE marvell-cn96xx-sdkv5.4 +define KTYPE preempt-rt +define KARCH arm64 + +include ktypes/preempt-rt + +include marvell-cn96xx.scc + +kconf hardware marvell-cn96xx-preempt-rt.cfg +kconf hardware sdkv5.4.cfg diff --git a/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc new file mode 100644 index ..23f0d340ae45 --- /dev/null +++ b/bsp/marvell-cn96xx/marvell-cn96xx-sdkv5.4-standard.scc @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: MIT +define KMACHINE marvell-cn96xx-sdkv5.4 +define KTYPE standard +define KARCH arm64 + +include ktypes/standard + +include marvell-cn96xx.scc +kconf hardware sdkv5.4.cfg -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11052): https://lists.yoctoproject.org/g/linux-yocto/message/11052 Mute This Topic: https://lists.yoctoproject.org/mt/89868281/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][yocto-kernel-cache yocto-5.15][PATCH] nxp-imx8: Enable CONFIG_EXPERT to meet dependency
On Wed, Jun 22, 2022 at 02:02:35PM +0800, He Zhe wrote: > [NOTE]: 'CONFIG_GPIO_SYSFS' last val (y) and .config val (n) do not match Hmm, The GPIO sysfs ABI has been marked as obsolete 6 years ago and has been scheduled to be removed in 2020. commit fe95046e960b Author: Linus Walleij Date: Thu Oct 22 09:58:34 2015 +0200 gpio: ABI: mark the sysfs ABI as obsolete This marks the (optional) sysfs GPIO ABI as obsolete and schedules it for removal in 2020. Cc: Johan Hovold Cc: Michael Welling Cc: Markus Pargmann Signed-off-by: Linus Walleij Maybe we should drop CONFIG_GPIO_SYSFS from our BSPs now. Thanks, Kevin > ...snip... > Parent dependencies are: > SYSFS [y] EXPERT [n] GPIOLIB [y] > > Signed-off-by: He Zhe > --- > bsp/nxp-imx8/nxp-imx8.cfg | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg > index 2b31fc15..00530a64 100644 > --- a/bsp/nxp-imx8/nxp-imx8.cfg > +++ b/bsp/nxp-imx8/nxp-imx8.cfg > @@ -4,6 +4,7 @@ CONFIG_SCHED_MC=y > CONFIG_CLK_IMX8QXP=y > CONFIG_CLK_IMX8MQ=y > CONFIG_MXC_CLK=y > +CONFIG_EXPERT=y > > # > ## Kernel Features > -- > 2.17.1 > > > > signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11409): https://lists.yoctoproject.org/g/linux-yocto/message/11409 Mute This Topic: https://lists.yoctoproject.org/mt/91916496/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-cache yocto-5.15] treewide: Drop the obsolete GPIO sysfs ABI
From: Kevin Hao The GPIO sysfs ABI has been marked as obsolete 6 years ago [1] and has been scheduled to be removed in 2020. And then it is restricted to be only available to expert users by commit [2]. This restriction triggers config warning on several BSPs due to the CONFIG_EXPERT is not enabled. Of course we can fix these warning by enabling the CONFIG_EXPERT, but maybe it is the time to drop this obsolete option. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fe95046e960b [2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3b4feb21158f8 Signed-off-by: Kevin Hao --- bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg | 1 - bsp/hsdk/hsdk.cfg | 1 - bsp/intel-socfpga/intel-socfpga-64.cfg | 1 - bsp/intel-x86/intel-x86.cfg| 1 - bsp/minnow/minnow.cfg | 1 - bsp/nxp-imx6/nxp-imx6.cfg | 2 -- bsp/nxp-imx8/nxp-imx8.cfg | 1 - bsp/renesas-rcar/renesas-rcar.cfg | 1 - bsp/ti-am335x/ti-am335x.cfg| 1 - bsp/ti-j72xx/ti-j72xx.cfg | 1 - bsp/xilinx/soc/drivers-softip.cfg | 1 - bsp/xilinx/soc/drivers-zynq.cfg| 1 - features/minnow-io/minnow-io.cfg | 1 - features/soc/baytrail/baytrail.cfg | 1 - features/soc/broxton/broxton.cfg | 1 - 15 files changed, 16 deletions(-) diff --git a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg index 82a28a4e8fe2..1bd56a058399 100644 --- a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg +++ b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg @@ -255,7 +255,6 @@ CONFIG_SND_SOC_WM8960=m # GPIO Support CONFIG_MFD_CORE=y CONFIG_MFD_STMPE=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_BCM_VIRT=y CONFIG_MFD_ARIZONA_I2C=m CONFIG_GPIO_ARIZONA=m diff --git a/bsp/hsdk/hsdk.cfg b/bsp/hsdk/hsdk.cfg index 1d75fb929456..38e97fd978fd 100644 --- a/bsp/hsdk/hsdk.cfg +++ b/bsp/hsdk/hsdk.cfg @@ -42,7 +42,6 @@ CONFIG_MICREL_PHY=y # GPIO CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y # Video diff --git a/bsp/intel-socfpga/intel-socfpga-64.cfg b/bsp/intel-socfpga/intel-socfpga-64.cfg index 4cfd894fcf95..2fa2405544f6 100644 --- a/bsp/intel-socfpga/intel-socfpga-64.cfg +++ b/bsp/intel-socfpga/intel-socfpga-64.cfg @@ -84,7 +84,6 @@ CONFIG_SERIAL_8250_DW=y CONFIG_SERIAL_OF_PLATFORM=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y CONFIG_GPIO_ALTERA=y diff --git a/bsp/intel-x86/intel-x86.cfg b/bsp/intel-x86/intel-x86.cfg index 6b5d10463e4e..af528c39a8b4 100644 --- a/bsp/intel-x86/intel-x86.cfg +++ b/bsp/intel-x86/intel-x86.cfg @@ -72,7 +72,6 @@ CONFIG_LPC_SCH=m # GPIO drivers # CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m CONFIG_GPIO_GENERIC_PLATFORM=m diff --git a/bsp/minnow/minnow.cfg b/bsp/minnow/minnow.cfg index 89a86e6df679..06d715f9cfa8 100644 --- a/bsp/minnow/minnow.cfg +++ b/bsp/minnow/minnow.cfg @@ -48,7 +48,6 @@ CONFIG_SERIAL_PCH_UART_CONSOLE=y ### Non-essential on-board features ### # GPIO Support -CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y diff --git a/bsp/nxp-imx6/nxp-imx6.cfg b/bsp/nxp-imx6/nxp-imx6.cfg index 3820031652c0..4a6382a6c17b 100644 --- a/bsp/nxp-imx6/nxp-imx6.cfg +++ b/bsp/nxp-imx6/nxp-imx6.cfg @@ -84,8 +84,6 @@ CONFIG_SPI=y CONFIG_SPI_IMX=y CONFIG_SPI_GPIO=y -CONFIG_GPIO_SYSFS=y - CONFIG_POWER_SUPPLY=y CONFIG_WATCHDOG=y CONFIG_IMX2_WDT=y diff --git a/bsp/nxp-imx8/nxp-imx8.cfg b/bsp/nxp-imx8/nxp-imx8.cfg index 2b31fc1567ba..775f7ed211ae 100644 --- a/bsp/nxp-imx8/nxp-imx8.cfg +++ b/bsp/nxp-imx8/nxp-imx8.cfg @@ -129,7 +129,6 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8MQ=y CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_MAX732X=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y diff --git a/bsp/renesas-rcar/renesas-rcar.cfg b/bsp/renesas-rcar/renesas-rcar.cfg index 9d5461a22940..9da5849c86cb 100644 --- a/bsp/renesas-rcar/renesas-rcar.cfg +++ b/bsp/renesas-rcar/renesas-rcar.cfg @@ -155,7 +155,6 @@ CONFIG_VIDEO_ADV7604_CEC=y # GPIO configuration CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y diff --git a/bsp/ti-am335x/ti-am335x.cfg b/bsp/ti-am335x/ti-am335x.cfg index d5b9ee632185..bdf54c5d171e 100644 --- a/bsp/ti-am335x/ti-am335x.cfg +++ b/bsp/ti-am335x/ti-am335x.cfg @@ -135,7 +135,6 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_OMAP=y CONFIG_GPIO_PCA953X=m diff --git a/bsp/ti-j72xx/ti-j72xx.cfg b/bsp/ti-j72xx/ti-j72xx.cfg index 8a84e0c70c95..f2761ade7d7a 100755 --- a/bsp/ti-j72xx/ti-j72xx.cfg +++ b/bsp/ti-j72xx/ti-j72xx.cfg @@ -179,7 +179,6 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y # # I2C support diff --git a/bsp/xilinx/soc/drivers-softip.cfg b/bsp/xilinx/soc/drivers-softip.cfg index 3d3e067c3b69..01c29ba11221 100644 --- a/bsp/xilinx/soc
Re: [linux-yocto][yocto-kernel-cache][yocto-5.15][PATCH] bsp/amd-x86: add initial support
On Tue, Jul 19, 2022 at 12:06:06PM +0800, Yongxin Liu wrote: > diff --git a/bsp/amd-x86/amd-x86-hugepage.cfg > b/bsp/amd-x86/amd-x86-hugepage.cfg > new file mode 100644 > index ..5079bf3f > --- /dev/null > +++ b/bsp/amd-x86/amd-x86-hugepage.cfg > @@ -0,0 +1,6 @@ > +# SPDX-License-Identifier: MIT > +# > +# Memory Management options > +# > +CONFIG_TRANSPARENT_HUGEPAGE=y > +CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y Could you create a thp feature and let both intel-x86 and amd-x86 include that? Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11489): https://lists.yoctoproject.org/g/linux-yocto/message/11489 Mute This Topic: https://lists.yoctoproject.org/mt/92476351/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-5.19&master] beaglebone: Drop the useless kernel options
From: Kevin Hao
Due to the following kernel commits:
04e8d9d139c9 ("ARM: omap: split up arch/arm/plat-omap/Kconfig")
d379e8899a8d ("ARM: omap1: move 32k counter from plat-omap to mach-omap1")
The OMAP_32K_TIMER and OMAP_RESET_CLOCKS are protected by ARCH_OMAP1 now.
Since we don't enable the ARCH_OMAP1 for the beaglebone, we would get
two kernel config mismatch warnings. Given these two options have
nothing to do with the beaglebone board, drop them to suppress the
warnings.
Signed-off-by: Kevin Hao
---
bsp/beaglebone/beaglebone.cfg | 2 --
1 file changed, 2 deletions(-)
diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg
index c593f53d50b2..0e818062b29b 100644
--- a/bsp/beaglebone/beaglebone.cfg
+++ b/bsp/beaglebone/beaglebone.cfg
@@ -7,9 +7,7 @@
CONFIG_ARCH_OMAP3=y
CONFIG_SOC_AM33XX=y
CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_OMAP_32K_TIMER=y
CONFIG_OMAP_DM_TIMER=y
-CONFIG_OMAP_RESET_CLOCKS=y
#
# Processor Features
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11576):
https://lists.yoctoproject.org/g/linux-yocto/message/11576
Mute This Topic: https://lists.yoctoproject.org/mt/93121431/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH] Revert "ACPI: APEI: explicit init of HEST and GHES in apci_init()"
From: Kevin Hao
This logically reverts 335852f7a976 ("ACPI: APEI: explicit init of HEST
and GHES in apci_init()"). The diff stat is slightly different with
the commit 335852f7a976 since there are some conflicts when that commit
was merged into linux-yocto.
On the Marvell cn96xx/cn106k SoCs, there is no presence of ACPI at all.
But it leverage some functions of ACPI for the GHES support. After the
change of 335852f7a976, the ghes_init() is invoked in the acpi_init()
instead of the initcall. Since the acpi_disabled is true for the
Marvell SoCs, the acpi_init() just bail out without running any codes
and it is also not possible to patch acpi_init() to do the ACPI
initialization on a platform with acpi_disabled. So revert this commit
and it is pretty safe to do so since the issue that commit tries to fix
doesn't exist on a acpi_disabled platform.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please merge this into the following branches:
v5.15/standard/cn-sdkv5.4/octeon
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
drivers/acpi/apei/ghes.c| 11 ++-
drivers/acpi/bus.c | 2 --
drivers/acpi/pci_root.c | 3 +++
drivers/firmware/Kconfig| 1 -
drivers/firmware/arm_sdei.c | 13 +++--
include/acpi/apei.h | 2 --
include/linux/arm_sdei.h| 2 --
7 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index d59a53365940..8fa0fe36f050 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -1498,7 +1498,7 @@ static struct platform_driver ghes_platform_driver = {
.remove = ghes_remove,
};
-void __init ghes_init(void)
+static int __init ghes_init(void)
{
int rc;
@@ -1508,24 +1508,24 @@ void __init ghes_init(void)
switch (hest_disable) {
case HEST_NOT_FOUND:
- return;
+ return -ENODEV;
case HEST_DISABLED:
pr_info(GHES_PFX "HEST is not enabled!\n");
- return;
+ return -EINVAL;
default:
break;
}
if (ghes_disable) {
pr_info(GHES_PFX "GHES is not enabled!\n");
- return;
+ return -EINVAL;
}
ghes_nmi_init_cxt();
rc = platform_driver_register(&ghes_platform_driver);
if (rc)
- return;
+ goto err;
if (!acpi_disabled) {
rc = apei_osc_setup();
@@ -1543,3 +1543,4 @@ void __init ghes_init(void)
err:
return rc;
}
+device_initcall(ghes_init);
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 7774b603a796..654fbbb6d320 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1341,8 +1341,6 @@ static int __init acpi_init(void)
pci_mmcfg_late_init();
acpi_iort_init();
acpi_viot_early_init();
- acpi_hest_init();
- ghes_init();
acpi_scan_init();
acpi_ec_init();
acpi_debugfs_init();
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 223aa010dd8d..d7deedf3548e 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -22,6 +22,8 @@
#include
#include
#include
+#include /* for acpi_hest_init() */
+
#include "internal.h"
#define ACPI_PCI_ROOT_CLASS"pci_bridge"
@@ -936,6 +938,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root
*root,
void __init acpi_pci_root_init(void)
{
+ acpi_hest_init();
if (acpi_pci_disabled)
return;
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index b06d994fbcb6..2dd2b8309455 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -40,7 +40,6 @@ config ARM_SCPI_POWER_DOMAIN
config ARM_SDE_INTERFACE
bool "ARM Software Delegated Exception Interface (SDEI)"
depends on ARM64
- depends on ACPI_APEI_GHES
help
The Software Delegated Exception Interface (SDEI) is an ARM
standard for registering callbacks from the platform firmware
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index d2d596166f03..9234e92f6eb9 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -1059,14 +1059,14 @@ static bool __init sdei_present_acpi(void)
return true;
}
-void __init sdei_init(void)
+static int __init sdei_init(void)
{
struct platform_device *pdev;
int ret;
ret = platform_driver_register(&sdei_driver);
if (ret || !sdei_present_acpi())
- return;
+ return ret;
pdev = platform_device_register_simple(sdei_driver.driver.name,
0, NULL, 0);
@@ -1076,8 +1076,17 @@ void __init sdei_init(void)
pr_info("Failed to register ACPI:SDEI platform device %d\n",
ret);
[linux-yocto] [PATCH v5.15] octeontx2-pcicons: Compute the padding size adaptively
From: Kevin Hao
For the SMP, the size of the arch_spinlock_t is always 4 bytes on
all architectures. So the change in the linux-yocto commit
5c8eed9bc9c1 ("octeontx2-pcicons: Adjust padding size for RT") makes
no sense, and would break the RT build due to the BUILD_BUG_ON()
sanity check in the pci_console_nexus_probe(). So we choose a more
adaptive way to compute the padding size so that it could work
even for UP.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help merge this patch into following two branches.
v5.15/standard/cn-sdkv5.4/octeon
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
drivers/soc/marvell/octeontx2-pcicons/otx2-pci-console.h | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/soc/marvell/octeontx2-pcicons/otx2-pci-console.h
b/drivers/soc/marvell/octeontx2-pcicons/otx2-pci-console.h
index 1de31eb2b4f5..be97164c5406 100644
--- a/drivers/soc/marvell/octeontx2-pcicons/otx2-pci-console.h
+++ b/drivers/soc/marvell/octeontx2-pcicons/otx2-pci-console.h
@@ -57,11 +57,7 @@ struct octeontx_pcie_console_nexus {
arch_spinlock_texcl_lock;
__le32 /* volatile */ in_use;
__le32 /* volatile */ exclusive;
-#ifdef CONFIG_PREEMPT_RT
- u32 pad[15];
-#else
- u32 pad[13 * 2];
-#endif
+ u8pad[108 - sizeof(arch_spinlock_t)];
/* Starts at offset 128 */
__le64console_addr[OCTEONTX_PCIE_MAX_CONSOLES];
} __packed;
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11653):
https://lists.yoctoproject.org/g/linux-yocto/message/11653
Mute This Topic: https://lists.yoctoproject.org/mt/93608182/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][yocto-kernel-cache][yocto-5.15][PATCH] nxp-lx2xxx: add kernel-cache configuration files for v5.15 kernel
On Wed, Sep 28, 2022 at 09:12:44AM +0800, Xulin Sun wrote: > +CONFIG_ARM64=y > +CONFIG_ARM64_VA_BITS_48=y > +CONFIG_ARCH_LAYERSCAPE=y > +CONFIG_SCHED_MC=y > +CONFIG_ARM_SMMU=y > +CONFIG_ARM_SMMU_V3=y > +# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set What kind of issue does this try to workaround? Is it still needed in the new kernel? Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11726): https://lists.yoctoproject.org/g/linux-yocto/message/11726 Mute This Topic: https://lists.yoctoproject.org/mt/93963907/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][yocto-kernel-cache][yocto-5.15][PATCH] nxp-lx2xxx: add kernel-cache configuration files for v5.15 kernel
On Wed, Sep 28, 2022 at 10:22:28AM +0800, Xulin Sun wrote: > On 2022/9/28 09:49, Xulin Sun wrote: > > On 2022/9/28 09:29, Kevin Hao wrote: > > > On Wed, Sep 28, 2022 at 09:12:44AM +0800, Xulin Sun wrote: > > > > +CONFIG_ARM64=y > > > > +CONFIG_ARM64_VA_BITS_48=y > > > > +CONFIG_ARCH_LAYERSCAPE=y > > > > +CONFIG_SCHED_MC=y > > > > +CONFIG_ARM_SMMU=y > > > > +CONFIG_ARM_SMMU_V3=y > > > > +# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set > > > What kind of issue does this try to workaround? Is it still needed > > > in the new kernel? > > > > This is to resolve the kernel booting failure due to arm-smmu error like > > below. In the new kernel, this issue still exited including other > > several NXP SOCs, so kept it here. > > There is a typo. It should be that the issue still exists, the workaround is > continued to be needed. OK, thanks for the clarification. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11729): https://lists.yoctoproject.org/g/linux-yocto/message/11729 Mute This Topic: https://lists.yoctoproject.org/mt/93963907/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto 0/4] Fix the build errors for intel-ehl-gpio driver
From: Kevin Hao Hi Bruce, This patch series fixes serveal build errors when intel-ehl-gpio driver is enabled. Please help merge them into the following two branches: v5.15/standard/preempt-rt/x86 v5.15/standard/x86 Kevin Hao (4): gpio: intel-ehl-gpio: Fix the declaration after statement error gpio: intel-ehl-gpio: Fix the wrong return type in ehl_pse_gpio_probe() mfd: intel-ehl-gpio: Drop the unused variables mfd: intel-ehl-gpio: Fix the int conversion error drivers/gpio/gpio-ehl-pse-plat.c | 8 drivers/mfd/intel-ehl-gpio.c | 6 ++ 2 files changed, 6 insertions(+), 8 deletions(-) -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11927): https://lists.yoctoproject.org/g/linux-yocto/message/11927 Mute This Topic: https://lists.yoctoproject.org/mt/95171186/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 1/4] gpio: intel-ehl-gpio: Fix the declaration after statement error
From: Kevin Hao
The commit f6c5e7b6e801 ("mfd: intel-ehl-gpio: Introduce MFD framework
to PSE GPIO/TGPIO") introduced the following build error:
driverr/gpio/gpio-ehl-pse-plat.c: In function ‘ehl_pse_gpio_get_direction’:
drivers/gpio/gpio-ehl-pse-plat.c:175:9: error: ISO C90 forbids mixed
declarations and code [-Werror=declaration-after-statement]
175 | u32 reg_gpdr = intel_gpio_readl(priv->reg_base, GPDR);
| ^~~
Move up the declaration to fix it.
Signed-off-by: Kevin Hao
---
drivers/gpio/gpio-ehl-pse-plat.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpio/gpio-ehl-pse-plat.c b/drivers/gpio/gpio-ehl-pse-plat.c
index 514a726a8cef..c3d640a06c36 100644
--- a/drivers/gpio/gpio-ehl-pse-plat.c
+++ b/drivers/gpio/gpio-ehl-pse-plat.c
@@ -169,10 +169,11 @@ static int ehl_pse_gpio_get_direction(struct gpio_chip
*chip,
{
struct ehl_pse_gpio *priv = gpiochip_get_data(chip);
int direction = 0;
+ u32 reg_gpdr;
pm_runtime_get_sync(priv->dev->parent);
- u32 reg_gpdr = intel_gpio_readl(priv->reg_base, GPDR);
+ reg_gpdr = intel_gpio_readl(priv->reg_base, GPDR);
direction = !(reg_gpdr & BIT(offset));
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11928):
https://lists.yoctoproject.org/g/linux-yocto/message/11928
Mute This Topic: https://lists.yoctoproject.org/mt/95171187/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 2/4] gpio: intel-ehl-gpio: Fix the wrong return type in ehl_pse_gpio_probe()
From: Kevin Hao
The commit f6c5e7b6e801 ("mfd: intel-ehl-gpio: Introduce MFD framework
to PSE GPIO/TGPIO") introduced the following wrong return type errors:
drivers/gpio/gpio-ehl-pse-plat.c: In function ‘ehl_pse_gpio_probe’:
include/linux/stddef.h:8:14: error: returning ‘void *’ from a function with
return type ‘int’ makes integer from pointer without a cast
[-Werror=int-conversion]
8 | #define NULL ((void *)0)
| ^
drivers/gpio/gpio-ehl-pse-plat.c:378:24: note: in expansion of macro ‘NULL’
378 | return NULL;
|^~~~
include/linux/stddef.h:8:14: error: returning ‘void *’ from a function with
return type ‘int’ makes integer from pointer without a cast
[-Werror=int-conversion]
8 | #define NULL ((void *)0)
| ^
drivers/gpio/gpio-ehl-pse-plat.c:382:24: note: in expansion of macro ‘NULL’
382 | return NULL;
|^~~~
Fix them by returning the -EINVAL for the platform_get_{resource,irt}()
failure.
Signed-off-by: Kevin Hao
---
drivers/gpio/gpio-ehl-pse-plat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-ehl-pse-plat.c b/drivers/gpio/gpio-ehl-pse-plat.c
index c3d640a06c36..1b24dcd60dfe 100644
--- a/drivers/gpio/gpio-ehl-pse-plat.c
+++ b/drivers/gpio/gpio-ehl-pse-plat.c
@@ -376,11 +376,11 @@ static int ehl_pse_gpio_probe(struct platform_device
*pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
- return NULL;
+ return -EINVAL;
irq = platform_get_irq(pdev, 0);
if (irq < 0)
- return NULL;
+ return -EINVAL;
priv->dev = &pdev->dev;
priv->reg_base = devm_ioremap_resource(&pdev->dev, res);
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11929):
https://lists.yoctoproject.org/g/linux-yocto/message/11929
Mute This Topic: https://lists.yoctoproject.org/mt/95171190/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 3/4] mfd: intel-ehl-gpio: Drop the unused variables
From: Kevin Hao
Fix the unused variable errors introduced by commit f6c5e7b6e801 ("mfd:
intel-ehl-gpio: Introduce MFD framework to PSE GPIO/TGPIO").
drivers/gpio/gpio-ehl-pse-plat.c: In function ‘ehl_pse_gpio_probe’:
drivers/gpio/gpio-ehl-pse-plat.c:366:23: error: unused variable ‘base’
[-Werror=unused-variable]
366 | void __iomem *base;
| ^~~~
drivers/mfd/intel-ehl-gpio.c: In function ‘intel_ehl_pse_gpio_mfd_suspend’:
drivers/mfd/intel-ehl-gpio.c:135:13: error: unused variable ‘i’
[-Werror=unused-variable]
135 | int i = 0;
| ^
drivers/mfd/intel-ehl-gpio.c: In function
‘intel_ehl_pse_gpio_mfd_runtime_suspend’:
drivers/mfd/intel-ehl-gpio.c:184:13: error: unused variable ‘i’
[-Werror=unused-variable]
184 | int i = 0;
| ^
Signed-off-by: Kevin Hao
---
drivers/gpio/gpio-ehl-pse-plat.c | 1 -
drivers/mfd/intel-ehl-gpio.c | 2 --
2 files changed, 3 deletions(-)
diff --git a/drivers/gpio/gpio-ehl-pse-plat.c b/drivers/gpio/gpio-ehl-pse-plat.c
index 1b24dcd60dfe..23a2deed6fa5 100644
--- a/drivers/gpio/gpio-ehl-pse-plat.c
+++ b/drivers/gpio/gpio-ehl-pse-plat.c
@@ -363,7 +363,6 @@ static int ehl_pse_gpio_probe(struct platform_device *pdev)
struct ehl_pse_gpio *priv;
struct resource *res;
u32 irq;
- void __iomem *base;
int ret;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
diff --git a/drivers/mfd/intel-ehl-gpio.c b/drivers/mfd/intel-ehl-gpio.c
index 6aa5a6cfc9ad..4c1c808ce190 100644
--- a/drivers/mfd/intel-ehl-gpio.c
+++ b/drivers/mfd/intel-ehl-gpio.c
@@ -132,7 +132,6 @@ static int intel_ehl_pse_gpio_mfd_suspend(struct device
*dev)
{
struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
struct intel_ehl_pse_gpio_data *pdata = pci_get_drvdata(pdev);
- int i = 0;
u32 d0i3c_reg, cgsr_reg = 0;
d0i3c_reg = readl(pdata->priv + PSE_GPIO_D0I3C);
@@ -181,7 +180,6 @@ static int intel_ehl_pse_gpio_mfd_runtime_suspend(struct
device *dev)
{
struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
struct intel_ehl_pse_gpio_data *pdata = pci_get_drvdata(pdev);
- int i = 0;
u32 d0i3c_reg, cgsr_reg = 0;
d0i3c_reg = readl(pdata->priv + PSE_GPIO_D0I3C);
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11930):
https://lists.yoctoproject.org/g/linux-yocto/message/11930
Mute This Topic: https://lists.yoctoproject.org/mt/95171191/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 4/4] mfd: intel-ehl-gpio: Fix the int conversion error
From: Kevin Hao
Fix the following int conversion errors introduced by commit
f6c5e7b6e801 ("mfd: intel-ehl-gpio: Introduce MFD framework to
PSE GPIO/TGPIO").
include/linux/stddef.h:8:14: error: initialization of ‘long unsigned int’
from ‘void *’ makes integer from pointer without a cast [-Werror=int-conversion]
8 | #define NULL ((void *)0)
| ^
drivers/mfd/intel-ehl-gpio.c:234:39: note: in expansion of macro ‘NULL’
234 | { PCI_VDEVICE(INTEL, 0x4b88), NULL},
| ^~~~
Signed-off-by: Kevin Hao
---
drivers/mfd/intel-ehl-gpio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mfd/intel-ehl-gpio.c b/drivers/mfd/intel-ehl-gpio.c
index 4c1c808ce190..e0c248337635 100644
--- a/drivers/mfd/intel-ehl-gpio.c
+++ b/drivers/mfd/intel-ehl-gpio.c
@@ -231,8 +231,8 @@ static const struct dev_pm_ops
intel_ehl_pse_gpio_mfd_pm_ops = {
};
static const struct pci_device_id intel_ehl_pse_gpio_mfd_ids[] = {
- { PCI_VDEVICE(INTEL, 0x4b88), NULL},
- { PCI_VDEVICE(INTEL, 0x4b89), NULL},
+ { PCI_VDEVICE(INTEL, 0x4b88), },
+ { PCI_VDEVICE(INTEL, 0x4b89), },
{ },
};
MODULE_DEVICE_TABLE(pci, intel_ehl_pse_gpio_mfd_ids);
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11931):
https://lists.yoctoproject.org/g/linux-yocto/message/11931
Mute This Topic: https://lists.yoctoproject.org/mt/95171193/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [linux-yocto 0/4] Fix the build errors for intel-ehl-gpio driver
On Mon, Nov 21, 2022 at 11:05:36AM -0500, Bruce Ashfield wrote: > On Mon, Nov 21, 2022 at 8:09 AM Kevin Hao wrote: > > > > From: Kevin Hao > > > > Hi Bruce, > > > > This patch series fixes serveal build errors when intel-ehl-gpio driver > > is enabled. Please help merge them into the following two branches: > > v5.15/standard/preempt-rt/x86 > > v5.15/standard/x86 > > Thanks Kevin. > > Quick question. I recall that the drivers in question came from an > intel SDK (correct me if I'm wrong). Yes. > > Did we introduce the breakage in a -stable merge ? No. > or is this > something that can also be sent to the upstream SDK for fixing there > as well ? I managed to forget to check the SDK git tree for a fix. It seems there already have been a patch for these build issues. So please ignore this patch series and I will send a v2 to backport that fix. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11933): https://lists.yoctoproject.org/g/linux-yocto/message/11933 Mute This Topic: https://lists.yoctoproject.org/mt/95171186/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v5.15 v2] tgpio: Fix compilation errors for PSE TGPIO
From: Hao Li
commit f02a736e8a95690894cac88cda7dc3d8f22babb6 from
https://github.com/intel/linux-intel-lts.git
Signed-off-by: Hao Li
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/preempt-rt/x86
v5.15/standard/x86
v2: Cherry-pick the fix patch from SDK kernel.
drivers/gpio/gpio-ehl-pse-plat.c | 8
drivers/mfd/intel-ehl-gpio.c | 6 ++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/gpio/gpio-ehl-pse-plat.c b/drivers/gpio/gpio-ehl-pse-plat.c
index 514a726a8cef..dd47f9efe369 100644
--- a/drivers/gpio/gpio-ehl-pse-plat.c
+++ b/drivers/gpio/gpio-ehl-pse-plat.c
@@ -169,10 +169,11 @@ static int ehl_pse_gpio_get_direction(struct gpio_chip
*chip,
{
struct ehl_pse_gpio *priv = gpiochip_get_data(chip);
int direction = 0;
+ u32 reg_gpdr;
pm_runtime_get_sync(priv->dev->parent);
- u32 reg_gpdr = intel_gpio_readl(priv->reg_base, GPDR);
+ reg_gpdr = intel_gpio_readl(priv->reg_base, GPDR);
direction = !(reg_gpdr & BIT(offset));
@@ -362,7 +363,6 @@ static int ehl_pse_gpio_probe(struct platform_device *pdev)
struct ehl_pse_gpio *priv;
struct resource *res;
u32 irq;
- void __iomem *base;
int ret;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
@@ -375,11 +375,11 @@ static int ehl_pse_gpio_probe(struct platform_device
*pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
- return NULL;
+ return -EINVAL;
irq = platform_get_irq(pdev, 0);
if (irq < 0)
- return NULL;
+ return irq ? irq : -EINVAL;
priv->dev = &pdev->dev;
priv->reg_base = devm_ioremap_resource(&pdev->dev, res);
diff --git a/drivers/mfd/intel-ehl-gpio.c b/drivers/mfd/intel-ehl-gpio.c
index 6aa5a6cfc9ad..e0c248337635 100644
--- a/drivers/mfd/intel-ehl-gpio.c
+++ b/drivers/mfd/intel-ehl-gpio.c
@@ -132,7 +132,6 @@ static int intel_ehl_pse_gpio_mfd_suspend(struct device
*dev)
{
struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
struct intel_ehl_pse_gpio_data *pdata = pci_get_drvdata(pdev);
- int i = 0;
u32 d0i3c_reg, cgsr_reg = 0;
d0i3c_reg = readl(pdata->priv + PSE_GPIO_D0I3C);
@@ -181,7 +180,6 @@ static int intel_ehl_pse_gpio_mfd_runtime_suspend(struct
device *dev)
{
struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
struct intel_ehl_pse_gpio_data *pdata = pci_get_drvdata(pdev);
- int i = 0;
u32 d0i3c_reg, cgsr_reg = 0;
d0i3c_reg = readl(pdata->priv + PSE_GPIO_D0I3C);
@@ -233,8 +231,8 @@ static const struct dev_pm_ops
intel_ehl_pse_gpio_mfd_pm_ops = {
};
static const struct pci_device_id intel_ehl_pse_gpio_mfd_ids[] = {
- { PCI_VDEVICE(INTEL, 0x4b88), NULL},
- { PCI_VDEVICE(INTEL, 0x4b89), NULL},
+ { PCI_VDEVICE(INTEL, 0x4b88), },
+ { PCI_VDEVICE(INTEL, 0x4b89), },
{ },
};
MODULE_DEVICE_TABLE(pci, intel_ehl_pse_gpio_mfd_ids);
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11934):
https://lists.yoctoproject.org/g/linux-yocto/message/11934
Mute This Topic: https://lists.yoctoproject.org/mt/95189605/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v5.15/standard/sdkv5.10/axxia & v5.15/standard/preempt-rt/sdkv5.10/axxia][PATCH 1/1] irq_work: use kasan_record_aux_stack_noalloc to avoid sleeping function issue
On Mon, Nov 28, 2022 at 04:42:50PM +0800, LiweiSong wrote: > Fix the following bug produced on AXM55xx board: > We had better to backport the fix which has already been merged into mainline. commit 25934fcfb93c Author: Zqiang Date: Thu Apr 14 19:13:34 2022 -0700 irq_work: use kasan_record_aux_stack_noalloc() record callstack On PREEMPT_RT kernel and KASAN is enabled. the kasan_record_aux_stack() may call alloc_pages(), and the rt-spinlock will be acquired, if currently in atomic context, will trigger warning: This also seem not board specific, so we should merge it to the v5.15/standard/base branch. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#11959): https://lists.yoctoproject.org/g/linux-yocto/message/11959 Mute This Topic: https://lists.yoctoproject.org/mt/95306317/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-6.1&master] edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD
The OCTEON_USB has been converted into USB_OCTEON_HCD by mainline
commit 9dbdac024d4d ("staging: octeon-usb: move driver out of staging").
So adjust the BSP cfg according to that change.
Signed-off-by: Kevin Hao
---
bsp/edgerouter/edgerouter.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/edgerouter/edgerouter.cfg b/bsp/edgerouter/edgerouter.cfg
index c8a11962176c..1fc7604b6bee 100644
--- a/bsp/edgerouter/edgerouter.cfg
+++ b/bsp/edgerouter/edgerouter.cfg
@@ -48,7 +48,7 @@ CONFIG_BCM87XX_PHY=y
#USB
CONFIG_USB=y
-CONFIG_OCTEON_USB=y
+CONFIG_USB_OCTEON_HCD=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_OCTEON_EHCI=y
CONFIG_USB_OHCI_HCD=y
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12069):
https://lists.yoctoproject.org/g/linux-yocto/message/12069
Mute This Topic: https://lists.yoctoproject.org/mt/96200089/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH v5.15] octeontx2-pf: Drop the redundant preempt disable in __cn10k_aura_freeptr()
From: Kevin Hao
In order to fix a sleeping in atomic context bug, we have replaced the
per_cpu_ptr() with get_cpu_ptr() in commit 97b853120a3e ("octeontx2:
nic: Replace get_cpu()/put_cpu() with get_cpu_ptr()/put_cpu_ptr()")
to disable the preempt in __cn10k_aura_freeptr(). But
__cn10k_aura_freeptr() may be used in NAPI, the preempt disable seems
redundant. The commit 29e9c67bf327 ("octeontx2-pf: Fix the use of
GFP_KERNEL in atomic context on rt") chose to add the get/put_cpu() in
cn10k_aura_freeptr(). With this change, the preempt disable in
__cn10k_aura_freeptr() becomes unnecessary. So restore the
per_cpu_ptr().
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this patch into the following two branches:
v5.15/standard/cn-sdkv5.4/octeon
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
index 132a9e5bb540..a8b004af781c 100644
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h
@@ -690,7 +690,7 @@ static inline void __cn10k_aura_freeptr(struct otx2_nic
*pfvf, u64 aura,
u64 size = 0, count_eot = 0;
u64 tar_addr, val = 0;
- lmt_info = get_cpu_ptr(pfvf->hw.lmt_info);
+ lmt_info = per_cpu_ptr(pfvf->hw.lmt_info, smp_processor_id());
tar_addr = (__force u64)otx2_get_regaddr(pfvf, NPA_LF_AURA_BATCH_FREE0);
/* LMTID is same as AURA Id */
val = (lmt_info->lmt_id & 0x7FF) | BIT_ULL(63);
@@ -711,7 +711,6 @@ static inline void __cn10k_aura_freeptr(struct otx2_nic
*pfvf, u64 aura,
}
dma_wmb();
memcpy((u64 *)lmt_info->lmt_addr, ptrs, sizeof(u64) * num_ptrs);
- put_cpu_ptr(pfvf->hw.lmt_info);
/* Perform LMTST flush */
cn10k_lmt_flush(val, tar_addr);
}
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12132):
https://lists.yoctoproject.org/g/linux-yocto/message/12132
Mute This Topic: https://lists.yoctoproject.org/mt/96695025/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH v5.15] arm: Fix the "invalid constant" error when assembling entry-common.S
From: Kevin Hao
The commit 82f18d6a09c0 ("arm: merge fixup for duplicate
TIF_NOTIFY_SIGNAL and other TIF_*") tried to fix the duplicate macro
warning on rt kernel. But after that change, the new values of the TIF_*
would cause the following assembler errors:
arch/arm/kernel/entry-common.S: Assembler messages:
arch/arm/kernel/entry-common.S:103: Error: invalid constant (1000e0) after
fixup
arch/arm/kernel/entry-common.S:286: Error: invalid constant (1000e0) after
fixup
So adjust the value of TIF_* to make the assembler happy. After this
change, the TIF_* macros are the same as the ones in linux-6.2.y-rt.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the v5.15/standard/preempt-rt/base
branch.
arch/arm/include/asm/thread_info.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/thread_info.h
b/arch/arm/include/asm/thread_info.h
index dc192d3bb4f8..d0ad47b598ee 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -135,15 +135,15 @@ extern int vfp_restore_user_hwstate(struct user_vfp *,
#define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
#define TIF_UPROBE 3 /* breakpointed or singlestepping */
#define TIF_NOTIFY_SIGNAL 4 /* signal notifications exist */
-#define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */
-#define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
-#define TIF_SECCOMP7 /* seccomp syscall filtering active */
-#define TIF_NEED_RESCHED_LAZY 8
+#define TIF_NEED_RESCHED_LAZY 5
#define TIF_USING_IWMMXT 17
#define TIF_MEMDIE 18 /* is terminating due to OOM killer */
#define TIF_RESTORE_SIGMASK19
#define TIF_SYSCALL_TRACE 20 /* syscall trace active */
+#define TIF_SYSCALL_AUDIT 21 /* syscall auditing active */
+#define TIF_SYSCALL_TRACEPOINT 22 /* syscall tracepoint instrumentation */
+#define TIF_SECCOMP23 /* seccomp syscall filtering active */
#define _TIF_SIGPENDING(1 << TIF_SIGPENDING)
--
2.38.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12137):
https://lists.yoctoproject.org/g/linux-yocto/message/12137
Mute This Topic: https://lists.yoctoproject.org/mt/96737798/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v5.10/standard/nxp-sdk-5.10/nxp-soc & v5.10/standard/preempt-rt/nxp-sdk-5.10/nxp-soc][PATCH] tty: serial: fsl_lpuart: Fix a build error duplicate label 'failed_get_rs485'
On Thu, Feb 02, 2023 at 09:14:29PM +0800, Xiaolei Wang wrote:
> Since commit 169332680aaa ("Merge branch 'v5.15/standard/base'
> into v5.15/standard/nxp-sdk-5.15/nxp-soc") merge conflicts,
> so remove duplicate failed_get_rs485, since commit 7ef67d38b294
> ("fsl_lpuart: Don't enable interrupts too early") has failed_irq_request
> moved the location, so delete the redundant goto failed_irq_request.
Hi Xiaolei,
I assume you mean that this should apply to the v5.15 kernel instead of v5.10,
right?
If so, the correct branches should be:
v5.15/standard/nxp-sdk-5.15/nxp-soc
v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
Thanks,
Kevin
>
> Signed-off-by: Xiaolei Wang
> ---
> drivers/tty/serial/fsl_lpuart.c | 7 +--
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index 68a51e524f0f..3f8fe874905d 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -2938,9 +2938,6 @@ static int lpuart_probe(struct platform_device *pdev)
> handler = lpuart_int;
> }
>
> - if (ret)
> - goto failed_irq_request;
> -
> pm_runtime_use_autosuspend(&pdev->dev);
> pm_runtime_set_autosuspend_delay(&pdev->dev, UART_AUTOSUSPEND_TIMEOUT);
> pm_runtime_set_active(&pdev->dev);
> @@ -2972,14 +2969,12 @@ static int lpuart_probe(struct platform_device *pdev)
>
> return 0;
>
> -failed_get_rs485:
> +failed_irq_request:
> uart_remove_one_port(&lpuart_reg, &sport->port);
> failed_attach_port:
> pm_runtime_disable(&pdev->dev);
> pm_runtime_set_suspended(&pdev->dev);
> pm_runtime_dont_use_autosuspend(&pdev->dev);
> -failed_irq_request:
> - uart_remove_one_port(&lpuart_reg, &sport->port);
> failed_get_rs485:
> failed_reset:
> lpuart_disable_clks(sport);
> --
> 2.25.1
>
>
>
>
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12138):
https://lists.yoctoproject.org/g/linux-yocto/message/12138
Mute This Topic: https://lists.yoctoproject.org/mt/96699206/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [PATCH v5.15 nxp-soc] fsl_lpuart: remove another duplicate label
On Fri, Feb 03, 2023 at 12:55:36PM -0500, Paul Gortmaker wrote:
> The v5.15 has a linux-stable specific fixup in
> commit 068b51219362 ("serial: fixup backport of "serial: Deassert
> Transmit Enable on probe in driver-specific way")
>
> Unfortunately that fixup left us with a duplicate label on this
> branch (and -rt branch), causing:
>
> drivers/tty/serial/fsl_lpuart.c:2983:1: error: duplicate label
> 'failed_get_rs485'
> | 2983 | failed_get_rs485:
> | | ^~~~
> |
> drivers/tty/serial/fsl_lpuart.c:2975:1:
> note: previous definition of 'failed_get_rs485' with type 'void'
> | 2975 | failed_get_rs485:
> | | ^~~~
Hi Paul,
Xiaolei has sent a similar patch [1] to fix this issue. Even he had indicated
that it target to the v5.10 kernel, but I believe that is typo and it should
be for the v5.15 kernel.
[1] https://lists.yoctoproject.org/g/linux-yocto/message/12134
Thanks,
Kevin
>
> Reading of the linux-stable fixup makes it reasonably clear that the
> 2nd instance of the label is the one that was meant to remain.
>
> Signed-off-by: Paul Gortmaker
>
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index 68a51e524f0f..aa52b3ff9279 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -2972,7 +2972,6 @@ static int lpuart_probe(struct platform_device *pdev)
>
> return 0;
>
> -failed_get_rs485:
> uart_remove_one_port(&lpuart_reg, &sport->port);
> failed_attach_port:
> pm_runtime_disable(&pdev->dev);
> --
> 2.33.0
>
>
>
>
signature.asc
Description: PGP signature
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12139):
https://lists.yoctoproject.org/g/linux-yocto/message/12139
Mute This Topic: https://lists.yoctoproject.org/mt/96728644/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto/v5.15/standard/cn-sdkv5.4/octeon] Porting the Marvell SDK11.23.01 kernel patches
Hi Bruce, This patch series porting the Marvell SDK11.23.01 kernel patches to the standard kernel. The following changes since commit 8005cae92a102843bbccdcc37660b04cfbf84701: Merge branch 'v5.15/standard/base' into v5.15/standard/cn-sdkv5.4/octeon (2023-02-27 09:53:21 -0500) are available in the Git repository at: https://github.com/haokexin/linux v5.15/standard/cn-sdkv5.4/octeon for you to fetch changes up to 115d53a97f672971edcf299dea1c9391acde9e95: net: mvpp2: Add ENOMEM error check in mvpp2 to avoid kernel panic (2023-03-03 22:06:39 +0800) Aaro Koskinen (1): fwlog: fix invalid pointers and copy size in wraparound case Ankur Dwivedi (1): soc: marvell: hw_access: add mapping for mcs registers Baha Mesleh (2): octeontx2-bphy-netdev: fix link carrier state update for cnf10k octeontx2-bphy-netdev: Fix rfoe ptp clock cleanup Bharat Bhushan (1): octeontx2-pf: Detach LF resources on probe cleanup Chandrakala Chavva (1): driver: mmc: sdhci: Fix parameter passed for reading phy register Christophe JAILLET (1): octeontx2-af: cn10k: mcs: Fix a resource leak in the probe and remove functions Dan Carpenter (2): crypto: octeontx2 - out of bounds access in otx2_cpt_dl_custom_egrp_delete() octeontx2-af: cn10k: mcs: Fix copy and paste bug in mcs_bbe_intr_handler() Geetha sowjanya (7): octeontx2-pf: Recalculate UDP checksum for 1-step ptp packets octeontx2-pf: ptp: Skip checksum calculation for IEEE 802.3 packets octeontx2-af: mcs: Backport cosmetic changes octeontx2-af: mcs: Config parser to skip 8B header octeontx2-af: Dynamically allocate bpids for CPT and LBK octeontx2-af: Add mbox to alloc/free BPIDs octeontx2-pf: Don't allocate BPIDs to LBK interface Hariom Dixit (1): net: mvpp2: Add ENOMEM error check in mvpp2 to avoid kernel panic Hariprasad Kelam (4): octeontx2-pf: Qos resource management octeontx2-af: Reset transmit scheduler queue config octeontx2-pf: qos: update TL1 dwrr prio in interface down octeontx2-pf: tc flower offload mutually exclusive with ntuple Jayanthi Annadurai (2): drivers: sdhci: Remove sdhci cadence workaround drivers: sdhci: Add option to configure sdhci timeout Jiapeng Chong (2): octeontx2-af: Remove duplicate include crypto: octeontx2 - Use swap() instead of swap_engines() Kees Cook (1): crypto: octeontx2 - Avoid stack variable overflow Kiran Kumar K (4): octeontx2-af: Move EOH pointer on unknown ethertype octeontx2-af: Move ICMP ltype to end of enum octeontx2-af: Add support for SPI to SA index translation octeontx2-af: Fix issue with IPv6 ext match for RSS Konstantin Porotchkin (1): arch/arm64/boot/dts/marvell: add optee FW definitions Manank Patel (1): ethernet: marvell: octeontx2 Fix resource not freed after malloc Minghao Chi (1): crypto: octeontx2 - simplify the return expression of otx2_cpt_aead_cbc_aes_sha_setkey() Narendra Hadke (1): driver: soc: marvell: phy7121p MACsec Naveen Mamindlapalli (9): octeontx2-bphy-netdev: Fix updating rx byte stats octeontx2-bphy-netdev: cnf10k: Use atomic update feature to update PTP clock octeontx2-bphy-netdev: cnf10k: check psm queue space for ptp queue octeontx2-bphy-netdev: cnf10k: update drop stats when psw errors are set octeontx2-bphy-netdev: cnf10k: Avoid ptp skb list processing in 1-step mode octeontx2-bphy-netdev: cnf10k: update ethtool drop stats octeontx2-bphy-netdev: update ethtool drop stats when mbt erros are set octeontx2-af: Add devlink option to adjust mcam high prio zone entries octeontx2-bphy-netdev: Fix issue of using incorrect netdev priv Nithin Dabilpuram (1): octeontx2-af: SMQ flush needs scheduling config present Piyush Malgujar (5): drivers: spi: octeontx2: ACPI support for SPI driver drivers: spi: octeontx2: Add support to read bus width from ACPI table for T9x Platforms drivers: i2c: octeon: Avoid potential infinite loop drivers: firmware: octeontx2: Add additional length variable drivers: firmware: octeontx2: 9X platform support for memtest Pragnesh Patel (1): drivers: soc: fwlog: fix mapped size Radha Mohan Chintakuntla (4): octeontx2-af: remove TL2 and TL3 queues for SDP interface PCI: rename octeontx2-pem-ep driver PCI: fix typo in Makefile for Marvell CNXK EP driver PCI: marvell-cnxk-ep: Change BAR4 memory allocation Rakesh Babu Saladi (11): octeontx2-bphy-netdev: debugfs: Add new debugfs root entry octeontx2-bphy-netdev: debugfs: new entry to dump jdt ring octeontx2-bphy-netdev: debugfs: new entry to dump timestamp ring octeontx2-bphy-netdev: debugfs: new entry to dump RPM stats octeontx2-bphy-netdev: cnf10k: Recalculate UDP checksum. octeontx2-bphy-netd
[linux-yocto] [linux-yocto/v5.15/standard/preempt-rt/cn-sdkv5.4/octeon] Porting the Marvell SDK11.23.01 kernel patches
Hi Bruce, This patch series porting the Marvell SDK11.23.01 kernel patches to the rt kernel. The following changes since commit ade7f3de8ef00d9ca9cbe6c6aaa1d25e0797a198: Merge branch 'v5.15/standard/preempt-rt/base' into v5.15/standard/preempt-rt/cn-sdkv5.4/octeon (2023-02-27 14:19:39 -0500) are available in the Git repository at: https://github.com/haokexin/linux v5.15/standard/preempt-rt/cn-sdkv5.4/octeon for you to fetch changes up to abc5e223bc2cce10dff31f3127c58894f5143534: net: mvpp2: Add ENOMEM error check in mvpp2 to avoid kernel panic (2023-03-03 22:18:14 +0800) Aaro Koskinen (1): fwlog: fix invalid pointers and copy size in wraparound case Ankur Dwivedi (1): soc: marvell: hw_access: add mapping for mcs registers Baha Mesleh (2): octeontx2-bphy-netdev: fix link carrier state update for cnf10k octeontx2-bphy-netdev: Fix rfoe ptp clock cleanup Bharat Bhushan (1): octeontx2-pf: Detach LF resources on probe cleanup Chandrakala Chavva (1): driver: mmc: sdhci: Fix parameter passed for reading phy register Christophe JAILLET (1): octeontx2-af: cn10k: mcs: Fix a resource leak in the probe and remove functions Dan Carpenter (2): crypto: octeontx2 - out of bounds access in otx2_cpt_dl_custom_egrp_delete() octeontx2-af: cn10k: mcs: Fix copy and paste bug in mcs_bbe_intr_handler() Geetha sowjanya (7): octeontx2-pf: Recalculate UDP checksum for 1-step ptp packets octeontx2-pf: ptp: Skip checksum calculation for IEEE 802.3 packets octeontx2-af: mcs: Backport cosmetic changes octeontx2-af: mcs: Config parser to skip 8B header octeontx2-af: Dynamically allocate bpids for CPT and LBK octeontx2-af: Add mbox to alloc/free BPIDs octeontx2-pf: Don't allocate BPIDs to LBK interface Hariom Dixit (1): net: mvpp2: Add ENOMEM error check in mvpp2 to avoid kernel panic Hariprasad Kelam (4): octeontx2-pf: Qos resource management octeontx2-af: Reset transmit scheduler queue config octeontx2-pf: qos: update TL1 dwrr prio in interface down octeontx2-pf: tc flower offload mutually exclusive with ntuple Jayanthi Annadurai (2): drivers: sdhci: Remove sdhci cadence workaround drivers: sdhci: Add option to configure sdhci timeout Jiapeng Chong (2): octeontx2-af: Remove duplicate include crypto: octeontx2 - Use swap() instead of swap_engines() Kees Cook (1): crypto: octeontx2 - Avoid stack variable overflow Kiran Kumar K (4): octeontx2-af: Move EOH pointer on unknown ethertype octeontx2-af: Move ICMP ltype to end of enum octeontx2-af: Add support for SPI to SA index translation octeontx2-af: Fix issue with IPv6 ext match for RSS Konstantin Porotchkin (1): arch/arm64/boot/dts/marvell: add optee FW definitions Manank Patel (1): ethernet: marvell: octeontx2 Fix resource not freed after malloc Minghao Chi (1): crypto: octeontx2 - simplify the return expression of otx2_cpt_aead_cbc_aes_sha_setkey() Narendra Hadke (1): driver: soc: marvell: phy7121p MACsec Naveen Mamindlapalli (9): octeontx2-bphy-netdev: Fix updating rx byte stats octeontx2-bphy-netdev: cnf10k: Use atomic update feature to update PTP clock octeontx2-bphy-netdev: cnf10k: check psm queue space for ptp queue octeontx2-bphy-netdev: cnf10k: update drop stats when psw errors are set octeontx2-bphy-netdev: cnf10k: Avoid ptp skb list processing in 1-step mode octeontx2-bphy-netdev: cnf10k: update ethtool drop stats octeontx2-bphy-netdev: update ethtool drop stats when mbt erros are set octeontx2-af: Add devlink option to adjust mcam high prio zone entries octeontx2-bphy-netdev: Fix issue of using incorrect netdev priv Nithin Dabilpuram (1): octeontx2-af: SMQ flush needs scheduling config present Piyush Malgujar (5): drivers: spi: octeontx2: ACPI support for SPI driver drivers: spi: octeontx2: Add support to read bus width from ACPI table for T9x Platforms drivers: i2c: octeon: Avoid potential infinite loop drivers: firmware: octeontx2: Add additional length variable drivers: firmware: octeontx2: 9X platform support for memtest Pragnesh Patel (1): drivers: soc: fwlog: fix mapped size Radha Mohan Chintakuntla (4): octeontx2-af: remove TL2 and TL3 queues for SDP interface PCI: rename octeontx2-pem-ep driver PCI: fix typo in Makefile for Marvell CNXK EP driver PCI: marvell-cnxk-ep: Change BAR4 memory allocation Rakesh Babu Saladi (11): octeontx2-bphy-netdev: debugfs: Add new debugfs root entry octeontx2-bphy-netdev: debugfs: new entry to dump jdt ring octeontx2-bphy-netdev: debugfs: new entry to dump timestamp ring octeontx2-bphy-netdev: debugfs: new entry to dump RPM stats octeontx2-bphy-netdev: cnf10k: Recalculate UDP checksum
[linux-yocto] [linux-yocto v5.15][PATCH] drivers: soc: fwlog: Use max_t() to fix the comparison warning
From: Kevin Hao We definitely need a cast for this comparison, so use max_t() to fix the following build warning. include/linux/minmax.h:20:35: warning: comparison of distinct pointer types lacks a cast 20 | (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) | ^~ drivers/soc/marvell/fwlog.c:61:33: note: in expansion of macro 'max' 61 | max(rdbuf - fwlog_buf, *ppos); | ^~~ Signed-off-by: Kevin Hao --- Hi Bruce, Please help me merge this patch to the following two branches: v5.15/standard/cn-sdkv5.4/octeon v5.15/standard/preempt-rt/cn-sdkv5.4/octeon drivers/soc/marvell/fwlog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/marvell/fwlog.c b/drivers/soc/marvell/fwlog.c index c61983c4eade..3b0fa9dd5ed9 100644 --- a/drivers/soc/marvell/fwlog.c +++ b/drivers/soc/marvell/fwlog.c @@ -58,7 +58,7 @@ static ssize_t fwlogs_read(struct file *file, char __user *buf, size_t count, lo *ppos); rdlen = fwlog_hdr->fwlog_end - fwlog_hdr->fwlog_base - - max(rdbuf - fwlog_buf, *ppos); + max_t(uint64_t, rdbuf - fwlog_buf, *ppos); } count = min_t(size_t, count, rdlen); -- 2.38.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12260): https://lists.yoctoproject.org/g/linux-yocto/message/12260 Mute This Topic: https://lists.yoctoproject.org/mt/97621442/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-5.15][PATCH 1/2] marvell-cn106xx: Adjust the memtest kernel option name
From: Kevin Hao
Due to the kernel commit 24fe41c84866 ("drivers: firmware: octeontx2: 9X
platform support for memtest"), the kernel option for this driver has
been changed to MARVELL_MEMTEST. So adjust it for our BSP cfg.
Signed-off-by: Kevin Hao
---
bsp/marvell-cn106xx/marvell-cn106xx.cfg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
index 5a81ff9ec8f6..61dccb3699c1 100644
--- a/bsp/marvell-cn106xx/marvell-cn106xx.cfg
+++ b/bsp/marvell-cn106xx/marvell-cn106xx.cfg
@@ -155,7 +155,7 @@ CONFIG_MARVELL_AVS_RESET=y
CONFIG_MARVELL_CN10K_MAC_MGMT=y
CONFIG_MARVELL_SFP_INFO=y
CONFIG_MARVELL_CN10K_RPRAM=y
-CONFIG_MARVELL_CN10K_MEMTEST=y
+CONFIG_MARVELL_MEMTEST=y
# GHES
CONFIG_ACPI=y
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12261):
https://lists.yoctoproject.org/g/linux-yocto/message/12261
Mute This Topic: https://lists.yoctoproject.org/mt/97670118/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [kernel-meta yocto-5.15][PATCH 2/2] marvell-cn96xx: Enable memtest driver
From: Kevin Hao
The memtest support for cn96xx has been enabled by kernel commit
24fe41c84866 ("drivers: firmware: octeontx2: 9X platform support for
memtest"), so enable it for our cn96xx BSP.
Signed-off-by: Kevin Hao
---
bsp/marvell-cn96xx/marvell-cn96xx.cfg | 1 +
1 file changed, 1 insertion(+)
diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
index 9f079719986f..335f9686c852 100644
--- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg
+++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg
@@ -105,6 +105,7 @@ CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_CAVIUM=y
CONFIG_OCTEONTX2_RM=y
CONFIG_OCTEONTX2_RM_DOM_SYSFS=y
+CONFIG_MARVELL_MEMTEST=y
# BPHY
CONFIG_MARVELL_OTX_BPHY_CTR=y
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12262):
https://lists.yoctoproject.org/g/linux-yocto/message/12262
Mute This Topic: https://lists.yoctoproject.org/mt/97670119/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] Revert "octeontx2-af: Unlock contexts in the queue context cache in case of fault detection"
From: Kevin Hao
Revert the changes introduced by the stable commit 64d4eb412761
("octeontx2-af: Unlock contexts in the queue context cache in case of
fault detection") since there was already a SDK commit 23752817e9eb
("octeontx2-af: Unlock NDCX_AF_BANKX_LINEX_METADATA during NDC
fault/lockerror/poison.") to fix the same issue.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this patch into the following two branches:
v5.15/standard/cn-sdkv5.4/octeon
v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
.../net/ethernet/marvell/octeontx2/af/rvu.h | 5 --
.../marvell/octeontx2/af/rvu_debugfs.c| 4 +-
.../ethernet/marvell/octeontx2/af/rvu_npa.c | 47 +--
3 files changed, 2 insertions(+), 54 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index 93e22a2ef647..3e5d618bea38 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -1091,9 +1091,6 @@ u32 rvu_get_cpt_chan_mask(struct rvu *rvu);
#define NDC_MAX_LINE_PER_BANK(rvu, blk_addr) ((rvu_read64(rvu, \
blk_addr, NDC_AF_CONST) & 0x)
>> 16)
-#define NDC_AF_BANK_MASK GENMASK_ULL(7, 0)
-#define NDC_AF_BANK_LINE_MASK GENMASK_ULL(31, 16)
-
/* CN10K RVU */
int rvu_set_channels_base(struct rvu *rvu);
void rvu_program_channels(struct rvu *rvu);
@@ -1129,8 +1126,6 @@ static inline void rvu_dbg_init(struct rvu *rvu) {}
static inline void rvu_dbg_exit(struct rvu *rvu) {}
#endif
-int rvu_ndc_fix_locked_cacheline(struct rvu *rvu, int blkaddr);
-
/* RVU Switch */
void rvu_switch_enable(struct rvu *rvu);
void rvu_switch_disable(struct rvu *rvu);
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
index 0ef62d35d81e..58f9bb055c53 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c
@@ -1446,7 +1446,6 @@ static int ndc_blk_hits_miss_stats(struct seq_file *s,
int idx, int blk_addr)
struct nix_hw *nix_hw;
struct rvu *rvu;
int bank, max_bank;
- u64 ndc_af_const;
if (blk_addr == BLKADDR_NDC_NPA0) {
rvu = s->private;
@@ -1455,8 +1454,7 @@ static int ndc_blk_hits_miss_stats(struct seq_file *s,
int idx, int blk_addr)
rvu = nix_hw->rvu;
}
- ndc_af_const = rvu_read64(rvu, blk_addr, NDC_AF_CONST);
- max_bank = FIELD_GET(NDC_AF_BANK_MASK, ndc_af_const);
+ max_bank = NDC_MAX_BANK(rvu, blk_addr);
for (bank = 0; bank < max_bank; bank++) {
seq_printf(s, "BANK:%d\n", bank);
seq_printf(s, "\tHits:\t%lld\n",
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c
b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c
index 3256a928ee36..339130a91cc2 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npa.c
@@ -4,7 +4,7 @@
* Copyright (C) 2018 Marvell.
*
*/
-#include
+
#include
#include
@@ -555,48 +555,3 @@ void rvu_npa_lf_teardown(struct rvu *rvu, u16 pcifunc, int
npalf)
npa_ctx_free(rvu, pfvf);
}
-
-/* Due to an Hardware errata, in some corner cases, AQ context lock
- * operations can result in a NDC way getting into an illegal state
- * of not valid but locked.
- *
- * This API solves the problem by clearing the lock bit of the NDC block.
- * The operation needs to be done for each line of all the NDC banks.
- */
-int rvu_ndc_fix_locked_cacheline(struct rvu *rvu, int blkaddr)
-{
- int bank, max_bank, line, max_line, err;
- u64 reg, ndc_af_const;
-
- /* Set the ENABLE bit(63) to '0' */
- reg = rvu_read64(rvu, blkaddr, NDC_AF_CAMS_RD_INTERVAL);
- rvu_write64(rvu, blkaddr, NDC_AF_CAMS_RD_INTERVAL, reg &
GENMASK_ULL(62, 0));
-
- /* Poll until the BUSY bits(47:32) are set to '0' */
- err = rvu_poll_reg(rvu, blkaddr, NDC_AF_CAMS_RD_INTERVAL,
GENMASK_ULL(47, 32), true);
- if (err) {
- dev_err(rvu->dev, "Timed out while polling for NDC CAM busy
bits.\n");
- return err;
- }
-
- ndc_af_const = rvu_read64(rvu, blkaddr, NDC_AF_CONST);
- max_bank = FIELD_GET(NDC_AF_BANK_MASK, ndc_af_const);
- max_line = FIELD_GET(NDC_AF_BANK_LINE_MASK, ndc_af_const);
- for (bank = 0; bank < max_bank; bank++) {
- for (line = 0; line < max_line; line++) {
- /* Check if 'cache line valid bit(63)' is not set
-* but 'cache line lock bit(60)' is set and on
-* success, reset the lock bit(60).
-*/
- reg = rvu_read64(rvu, blkaddr,
-
[linux-yocto] [linux-yocto v6.1/standard/base] fat: Replace prandom_u32() with get_random_u32()
From: Kevin Hao
The prandom_u32() is just wrapper of get_random_u32() and has been
removed by commit de492c83cae0 ("prandom: remove unused functions").
So use get_random_u32() directly.
Signed-off-by: Kevin Hao
---
fs/fat/namei_vfat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c
index ef5cf74789ca..ef79a242751d 100644
--- a/fs/fat/namei_vfat.c
+++ b/fs/fat/namei_vfat.c
@@ -616,7 +616,7 @@ static void vfat_build_dummy_83_buffer(struct inode *dir,
char *msdos_name,
0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x22, 0x2a,
0x3a, 0x3c, 0x3e, 0x3f, 0x5b, 0x5d, 0x7c };
int i, tilde_pos, slash_pos;
- u32 rand_num = prandom_u32();
+ u32 rand_num = get_random_u32();
/* We need a '~' in the prefix to make Win98 happy. */
tilde_pos = rand_num % 8;
@@ -651,7 +651,7 @@ static void vfat_build_dummy_83_buffer(struct inode *dir,
char *msdos_name,
invalidchar[rand_num % sizeof(invalidchar)];
rand_num /= sizeof(invalidchar);
if (rand_num < sizeof(invalidchar))
- rand_num = prandom_u32();
+ rand_num = get_random_u32();
}
}
}
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12354):
https://lists.yoctoproject.org/g/linux-yocto/message/12354
Mute This Topic: https://lists.yoctoproject.org/mt/98123873/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.107 v6.1.24 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.107 v6.1.24 for the following branches in the linux-yocto. 006cb0818243 v5.15/standard/sdkv5.10/axxia 3ae0d174d1fe v5.15/standard/preempt-rt/sdkv5.10/axxia 23e09fdef7b3 v5.15/standard/base 233f9b47855c v5.15/standard/cn-sdkv5.4/octeon dec53aaddbad v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 30184119ae7e v5.15/standard/ti-sdk-5.10/ti-j72xx 93f88b4c2146 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx e87728d20e53 v5.15/standard/nxp-sdk-5.15/nxp-soc 7fc3a0437947 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc fa8808678e0a v5.15/standard/bcm-2xxx-rpi b1327ce851c7 v5.15/standard/preempt-rt/bcm-2xxx-rpi 8ceed19a4f04 v5.15/standard/nxp-sdk-5.15/nxp-s32g 6bdee1283650 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 739826eaa9ee v5.15/standard/intel-sdk-5.15/intel-socfpga fdb416e75857 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga ca25592f3e10 v5.15/standard/x86 c2b6a7298470 v5.15/standard/preempt-rt/x86 76d946960fe6 v5.15/standard/sdkv5.15/xlnx-soc 0ae440ea2ca1 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc ea444536b477 v6.1/standard/base 7f89f69d9129 v6.1/standard/bcm-2xxx-rpi 3d7bb6f01bc1 v6.1/standard/preempt-rt/bcm-2xxx-rpi No merge conflict for all the branches, but there is a build failure for the following two branches: v5.15/standard/cn-sdkv5.4/octeon v5.15/standard/preempt-rt/cn-sdkv5.4/octeon I have staged a fix for these two branches and pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12374): https://lists.yoctoproject.org/g/linux-yocto/message/12374 Mute This Topic: https://lists.yoctoproject.org/mt/98258289/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] imx8m: vpu: Fix the wrong positions of #endif in hantroenc_ioctl32()
From: Kevin Hao
The commit e0585ce25814c ("MA-20005-12 hantro_vc8000e: Fix build error
exposed by -Wunused-variable") was supposed to wrapper the
hantroenc_ioctl32() with #ifdef and #endif. But it improperly put
the #endif in the middle of hantroenc_ioctl32(), and then cause weird
build errors. Fix them by moving the #endif out of the
hantroenc_ioctl32().
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/nxp-sdk-6.1/nxp-soc
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc (if exist)
drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
index 25adb41457fb..37a955978c58 100644
--- a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
+++ b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
@@ -703,7 +703,6 @@ static long hantroenc_ioctl32(struct file *filp, unsigned
int cmd, unsigned long
if (err) \
return err; \
}
-#endif
union {
unsigned long kux;
@@ -793,6 +792,7 @@ union {
}
return 0;
}
+#endif
/* VFS methods */
static struct file_operations hantroenc_fops = {
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12406):
https://lists.yoctoproject.org/g/linux-yocto/message/12406
Mute This Topic: https://lists.yoctoproject.org/mt/98402510/21656
Mute #endif:https://lists.yoctoproject.org/g/linux-yocto/mutehashtag/endif
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.108 v6.1.25 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.108 v6.1.25 for the following branches in the linux-yocto. c46db5959381 v5.15/standard/sdkv5.10/axxia 503f06417b29 v5.15/standard/preempt-rt/sdkv5.10/axxia 193ce23a90ee v5.15/standard/base b11485187754 v5.15/standard/cn-sdkv5.4/octeon 60fe2f8abb2a v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 0989d2e2ebe8 v5.15/standard/ti-sdk-5.10/ti-j72xx 72c2bbec3079 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 21468f36c82b v5.15/standard/nxp-sdk-5.15/nxp-soc #Have conflicts 047e511a80d9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have conflicts 61c86d2c518a v5.15/standard/bcm-2xxx-rpi 30d2fc83ba58 v5.15/standard/preempt-rt/bcm-2xxx-rpi 64f4956c2b1d v5.15/standard/nxp-sdk-5.15/nxp-s32g 0b273787392c v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 995864443cca v5.15/standard/intel-sdk-5.15/intel-socfpga 4ddc5ce17f5a v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 8db1b0031b32 v5.15/standard/x86 26fb6b51e59a v5.15/standard/preempt-rt/x86 2fa224bb8417 v5.15/standard/sdkv5.15/xlnx-soc 722dae937194 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 44d21e579533 v6.1/standard/base 026270bf8e4f v6.1/standard/nxp-sdk-6.1/nxp-soc #Have conflicts 1a6f6f65f887 v6.1/standard/bcm-2xxx-rpi 99e55720e290 v6.1/standard/preempt-rt/bcm-2xxx-rpi There is a merge conflict on the nxp-soc branches(both v5.15 and v6.1), but it is pretty simple and straightforward to fix. There is also a build failure on the v6.1/standard/nxp-sdk-6.1/nxp-soc branch, it is unrelated to this stable merge. I have sent a fix for review [1]. I have done some build test for these branches and all seem fine. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12406 Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12407): https://lists.yoctoproject.org/g/linux-yocto/message/12407 Mute This Topic: https://lists.yoctoproject.org/mt/98402845/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.109 v6.1.26 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.109 v6.1.26 for the following branches in the linux-yocto. 72402fae873d v5.15/standard/sdkv5.10/axxia d52d67d2b19b v5.15/standard/preempt-rt/sdkv5.10/axxia #Have build failures 93226d45ff89 v5.15/standard/base 00117525c08a v5.15/standard/preempt-rt/base #Have build failures 006cb070ebda v5.15/standard/cn-sdkv5.4/octeon a7384996221a v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have build failures 95b0e7100603 v5.15/standard/cn-sdkv5.15/octeon d7706c14b7ad v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have build failures d4468624fb05 v5.15/standard/ti-sdk-5.10/ti-j72xx 856d37401e92 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx #Have build failures d1becf2c8e35 v5.15/standard/nxp-sdk-5.15/nxp-soc #Have conflicts bd326a0924a1 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have conflicts and build failures ad969d69aafe v5.15/standard/bcm-2xxx-rpi e3fa08777465 v5.15/standard/preempt-rt/bcm-2xxx-rpi #Have build failures 15e9473f5dcc v5.15/standard/nxp-sdk-5.15/nxp-s32g dbd21cd5188f v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have build failures d5de8de0c90a v5.15/standard/intel-sdk-5.15/intel-socfpga 3cc2547030e8 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga #Have build failures 173d59a1b670 v5.15/standard/x86 d9e7f58a28de v5.15/standard/preempt-rt/x86 #Have build failures be50887cbac2 v5.15/standard/sdkv5.15/xlnx-soc 7c5f7dd72a15 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have build failures 87689ef324fe v6.1/standard/base a4a22bc4f759 v6.1/standard/preempt-rt/base 3a353f8138fe v6.1/standard/nxp-sdk-6.1/nxp-soc #Have conflicts 11eec2b414ed v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have conflicts fac6ae407093 v6.1/standard/bcm-2xxx-rpi 5ae3d763f95f v6.1/standard/preempt-rt/bcm-2xxx-rpi 87689ef324fe v6.1/standard/x86 f52a7ecf7dd9 v6.1/standard/preempt-rt/x86 There is a merge conflict for dts file on nxp-soc branches (both v5.15 and v6.1) and it is pretty simple and straightforward to fix. There is also a build failure for the v5.15 rt kernel after the stable merge. I have staged a fix on v5.15/standard/preempt-rt/base branch and also merge it into all the v5.15 rt branches. I have done some build test for these branches and all seem fine. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12429): https://lists.yoctoproject.org/g/linux-yocto/message/12429 Mute This Topic: https://lists.yoctoproject.org/mt/98532204/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.110 v6.1.27 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.110 v6.1.27 for the following branches in the linux-yocto. a4c49aa54b61 v5.15/standard/sdkv5.10/axxia 5d2b15db64d6 v5.15/standard/preempt-rt/sdkv5.10/axxia 04550f907bad v5.15/standard/base 4b08dc286444 v5.15/standard/preempt-rt/base 2084e3cab1b9 v5.15/standard/cn-sdkv5.4/octeon 4fe0ea98968b v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 6f6a5373bc10 v5.15/standard/cn-sdkv5.15/octeon 7babe05a963e v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 6865b500b211 v5.15/standard/ti-sdk-5.10/ti-j72xx d376de481b7d v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx b074fa273af8 v5.15/standard/nxp-sdk-5.15/nxp-soc 7642f207a3d9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 6107a5d107b2 v5.15/standard/bcm-2xxx-rpi 62f5492abff9 v5.15/standard/preempt-rt/bcm-2xxx-rpi 7098cd35d450 v5.15/standard/nxp-sdk-5.15/nxp-s32g e56f15ef84c0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 22e8c76017c9 v5.15/standard/intel-sdk-5.15/intel-socfpga 43719b82ea03 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga dd05d4fd8202 v5.15/standard/x86 93cf30db7401 v5.15/standard/preempt-rt/x86 7e271921b739 v5.15/standard/sdkv5.15/xlnx-soc de098b6fc0bf v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc d939b19bbb23 v6.1/standard/base 4bf070e67977 v6.1/standard/preempt-rt/base 11b9a1b4bb87 v6.1/standard/nxp-sdk-6.1/nxp-soc e888fc3d3303 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 49c194fc802f v6.1/standard/bcm-2xxx-rpi 2189c90460f0 v6.1/standard/preempt-rt/bcm-2xxx-rpi d939b19bbb23 v6.1/standard/x86 219805809924 v6.1/standard/preempt-rt/x86 No merge conflict for all the branches. I have done some build test for these branches and all seem fine. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12447): https://lists.yoctoproject.org/g/linux-yocto/message/12447 Mute This Topic: https://lists.yoctoproject.org/mt/98606849/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.111 v6.1.28 for the following branches in the linux-yocto. 443f96dec14c v5.15/standard/sdkv5.10/axxia 541ee58e54e0 v5.15/standard/preempt-rt/sdkv5.10/axxia #Have conflicts 508a4e703a79 v5.15/standard/base 168834cde529 v5.15/standard/preempt-rt/base #Have conflicts 7f137c507774 v5.15/standard/cn-sdkv5.4/octeon b491324b85ba v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have conflicts 2dd232ba6ce7 v5.15/standard/cn-sdkv5.15/octeon fd6c28f7b390 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have conflicts 76ae3a0f2a73 v5.15/standard/ti-sdk-5.10/ti-j72xx #Have conflicts 9119f3f87a61 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx #Have conflicts 26cdaccd602c v5.15/standard/nxp-sdk-5.15/nxp-soc f127c78e0cf0 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have conflicts 7eee2cb35e49 v5.15/standard/bcm-2xxx-rpi a842cf4e4675 v5.15/standard/preempt-rt/bcm-2xxx-rpi #Have conflicts 51149dacd7c4 v5.15/standard/nxp-sdk-5.15/nxp-s32g f36ddc08df68 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have conflicts fbb655cba3b2 v5.15/standard/intel-sdk-5.15/intel-socfpga c421ea83b1ba v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga #Have conflicts 8f23e04e29ba v5.15/standard/x86 95d135df2110 v5.15/standard/preempt-rt/x86 #Have conflicts 5492ac82859e v5.15/standard/sdkv5.15/xlnx-soc #Have conflicts 4dd6efc6a43b v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have conflicts 3caa8770fbc2 v6.1/standard/base 8886ff2350fe v6.1/standard/preempt-rt/base fe915ec2426e v6.1/standard/nxp-sdk-6.1/nxp-soc #Have conflicts 79624711ef7d v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have conflicts f9964998b8ea v6.1/standard/bcm-2xxx-rpi #Have conflicts f6916595380e v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have conflicts a536e2acc87b v6.1/standard/nxp-sdk-5.15/nxp-s32g b0c530beaf73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 3caa8770fbc2 v6.1/standard/x86 4e11d1d2ffce v6.1/standard/preempt-rt/x86 8fbef12438f5 v6.1/standard/sdkv6.1/xlnx-soc #Have conflicts 7f80b171fa27 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have conflicts This is a much bigger stable cycle. There are 372 patches in v5.15.111 and 611 patches in v6.1.28. So we got more merge conflicts than usual. There is one merge conflict in kernel/workqueue.c on v5.15 rt kernel, all the others are for various drivers. I believe I have fixed all the mess and all the merges have passed my build test. I have pushed these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12497): https://lists.yoctoproject.org/g/linux-yocto/message/12497 Mute This Topic: https://lists.yoctoproject.org/mt/98841823/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.111 v6.1.28 for linux-yocto
On Mon, May 15, 2023 at 10:50:11PM -0400, Bruce Ashfield wrote: > The BSP resolutions are definitely helpful. I'm still perfecting > the workflow (and my scripts) to reference the changes more easily, Please feel free to let me know if you want me to adjust my workflow or the content of my email. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12557): https://lists.yoctoproject.org/g/linux-yocto/message/12557 Mute This Topic: https://lists.yoctoproject.org/mt/98841823/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v6.1/standard/ti-sdk-5.10/ti-j7xxx] ti-j7xxx kernel part for upgrading BSP to kernel v6.1
On Wed, May 17, 2023 at 08:55:19AM +0800, Xulin Sun via lists.yoctoproject.org wrote: > Xulin Sun (11): > media: platform: vxe-vxd: align with ti-linux-5.10.y branch Aren't all the patches based on the ti-linux-5.10.y now? > Revert "net: ethernet: ti: am65-cpsw-switchdev: adjust to 5.10" > net: update the AF_MAX value to the latest We should fold this fix into the SDK patch which introduce this issue. > PCI: j721e: disable retrain Link for Gen2 training > net: ethernet: ti: j721e-cpsw-virt-mac: add the check whether it's own > device > Revert "media: ti-vpe: cal: add multiplexed streams support" > Revert "v4l: subdev: add routing & stream config to v4l2_subdev_state" > Revert "v4l: subdev: Add [GS]_ROUTING subdev ioctls and operations" > i2c: core: correct the wrong exit path in function > 'i2c_new_client_device' > arm64: dts: ti: k3-j784s4-evm: enable RNG feature > drm/bridge: ti-sn65dsi86: correct wrong macro and undeclared variable We should fold this fix into the SDK patch which introduce this issue. For the revert patches, could we just delete them directly? > net/Kconfig | 1 + > net/Makefile | 1 + > net/core/dev_ioctl.c | 7 + > net/core/skbuff.c | 8 + > net/core/sock.c | 16 +- > net/ethtool/common.c | 1 + > net/ethtool/ioctl.c | 3 +- The changes for these net core files seem suspicious, some of the patches are even marked as HACK. Do we really need them? > net/hsr/Makefile | 1 + > net/hsr/hsr_debugfs.c | 107 +- > net/hsr/hsr_device.c | 459 +- > net/hsr/hsr_device.h | 5 +- > net/hsr/hsr_forward.c | 331 +- > net/hsr/hsr_framereg.h | 4 + > net/hsr/hsr_main.h | 100 +- > net/hsr/hsr_netlink.c | 39 +- > net/hsr/hsr_proc.c | 673 ++ > net/hsr/hsr_slave.c | 23 +- Which component will depend on these changes? > net/rpmsg/Kconfig | 19 + > net/rpmsg/Makefile | 2 + > net/rpmsg/rpmsg_proto.c | 745 ++ > net/socket.c | 28 + Are there userspace applications to use this new protocol? Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12617): https://lists.yoctoproject.org/g/linux-yocto/message/12617 Mute This Topic: https://lists.yoctoproject.org/mt/98939750/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH] media: subdev: Fix the wrong reference of v4l2_subdev_state::lock
From: Kevin Hao
The v4l2_subdev_state::lock is a lock pointer, so the additional
dereferencing operator is not needed. These issues were introduced by
the following two commits:
b3ec78e409e0 ("media: subdev: add v4l2_subdev_set_routing helper()")
04b09e1e259f ("media: subdev: add stream based configuration")
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx
v6.1/standard/ti-sdk-5.10/ti-j7xxx
drivers/media/v4l2-core/v4l2-subdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c
b/drivers/media/v4l2-core/v4l2-subdev.c
index 19c5cfc05bc0..01b44b996891 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1488,7 +1488,7 @@ int v4l2_subdev_set_routing(struct v4l2_subdev *sd,
struct v4l2_subdev_krouting *dst = &state->routing;
const struct v4l2_subdev_krouting *src = routing;
- lockdep_assert_held(&state->lock);
+ lockdep_assert_held(state->lock);
kvfree(dst->routes);
dst->routes = NULL;
@@ -1538,7 +1538,7 @@ v4l2_state_get_stream_format(struct v4l2_subdev_state
*state, unsigned int pad,
struct v4l2_subdev_stream_configs *stream_configs;
unsigned int i;
- lockdep_assert_held(&state->lock);
+ lockdep_assert_held(state->lock);
stream_configs = &state->stream_configs;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12626):
https://lists.yoctoproject.org/g/linux-yocto/message/12626
Mute This Topic: https://lists.yoctoproject.org/mt/99002748/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.112 v6.1.29 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.112 v6.1.29 for the following branches in the linux-yocto. 4f69e62a898e v5.15/standard/sdkv5.10/axxia 5e9f5f2c4644 v5.15/standard/preempt-rt/sdkv5.10/axxia 71fbcf542eb0 v5.15/standard/base 8cc51cef6e43 v5.15/standard/preempt-rt/base 7fb9db009bab v5.15/standard/cn-sdkv5.4/octeon #Have conflicts 6e8af66a5288 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have conflicts d51906e23096 v5.15/standard/cn-sdkv5.15/octeon #Have conflicts 94f80c91824d v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have conflicts 86dd0aa1ec93 v5.15/standard/ti-sdk-5.10/ti-j72xx 933a97c39de5 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 35a6b8339fda v5.15/standard/nxp-sdk-5.15/nxp-soc #Have build failures 79b8dab0213e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have build failures 6cb6a1855bf0 v5.15/standard/bcm-2xxx-rpi e8360b4682fa v5.15/standard/preempt-rt/bcm-2xxx-rpi 9e22e6dec2c5 v5.15/standard/nxp-sdk-5.15/nxp-s32g 1e0524a9af85 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 072e2eb2f121 v5.15/standard/intel-sdk-5.15/intel-socfpga a13bdea5a83b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga eab5d9d1ed28 v5.15/standard/x86 bab100cd18c5 v5.15/standard/preempt-rt/x86 d0a39f7d545f v5.15/standard/sdkv5.15/xlnx-soc 633b3d197247 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 7f828d7462d0 v6.1/standard/base 566c13db6587 v6.1/standard/preempt-rt/base 114fd6056886 v6.1/standard/ti-sdk-5.10/ti-j7xxx #Have build failures 724c950a302b v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx #Have build failures 84716ffc22da v6.1/standard/nxp-sdk-6.1/nxp-soc d67776245fb5 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 28ccefe2813a v6.1/standard/bcm-2xxx-rpi 490bee698190 v6.1/standard/preempt-rt/bcm-2xxx-rpi b12458371f8f v6.1/standard/nxp-sdk-5.15/nxp-s32g f1d552417a73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 7f828d7462d0 v6.1/standard/x86 c9faca3acc07 v6.1/standard/preempt-rt/x86 f36e9c7d39b8 v6.1/standard/sdkv6.1/xlnx-soc #Have conflicts and build failures a7a4865e7e7d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have conflicts and build failures According to the quantity of patches (134 in v5.15.112 and 239 in v6.1.29), this seems a regular release. But the merge conflicts and build failures are more than I have expected. I have folded the fix into the corresponding merge commit. There is also a fix [1] for the ti-j7xxx on the v6.1 kernel, it has nothing to do with this stable update and is just bug exposed by my build script. All these branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12626 Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12627): https://lists.yoctoproject.org/g/linux-yocto/message/12627 Mute This Topic: https://lists.yoctoproject.org/mt/99003148/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH] ASoC: fsl_esai: Replace the dpcm_lock with FE stream lock
From: Kevin Hao
In commit 703ebcf64aac ("ASoC: soc-pcm: Fix and cleanup DPCM locking"),
the dpcm_lock was dropped. So we need to use the FE stream lock here.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Could you help me merge this into the following two branches?
v5.15/standard/nxp-sdk-5.15/nxp-soc
v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
sound/soc/fsl/fsl_esai_mix.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/fsl/fsl_esai_mix.c b/sound/soc/fsl/fsl_esai_mix.c
index e5c2c053f9d3..b7aec051e05f 100644
--- a/sound/soc/fsl/fsl_esai_mix.c
+++ b/sound/soc/fsl/fsl_esai_mix.c
@@ -148,7 +148,7 @@ static void fsl_esai_mix_buffer_from_fe_tx(struct
snd_pcm_substream *substream,
}
/* Get the active client */
- spin_lock_irqsave(&rtd->card->dpcm_lock, flags);
+ snd_pcm_stream_lock_irq(snd_soc_dpcm_get_substream(rtd,
substream->stream));
for_each_dpcm_fe(rtd, substream->stream, dpcm) {
if (dpcm->be != rtd)
continue;
@@ -160,7 +160,7 @@ static void fsl_esai_mix_buffer_from_fe_tx(struct
snd_pcm_substream *substream,
if (i >= MAX_CLIENT_NUM)
break;
}
- spin_unlock_irqrestore(&rtd->card->dpcm_lock, flags);
+ snd_pcm_stream_unlock_irq(snd_soc_dpcm_get_substream(rtd,
substream->stream));
avail = fsl_esai_tx_avail(mix);
if (avail >= mix->buffer_bytes && elapse)
@@ -249,7 +249,7 @@ static void fsl_esai_split_buffer_from_be_rx(struct
snd_pcm_substream *substream
mix->client[j] = NULL;
}
/* Get the active client */
- spin_lock_irqsave(&rtd->card->dpcm_lock, flags);
+ snd_pcm_stream_lock_irq(snd_soc_dpcm_get_substream(rtd,
substream->stream));
for_each_dpcm_fe(rtd, substream->stream, dpcm) {
if (dpcm->be != rtd)
continue;
@@ -261,7 +261,7 @@ static void fsl_esai_split_buffer_from_be_rx(struct
snd_pcm_substream *substream
if (i >= MAX_CLIENT_NUM)
break;
}
- spin_unlock_irqrestore(&rtd->card->dpcm_lock, flags);
+ snd_pcm_stream_unlock_irq(snd_soc_dpcm_get_substream(rtd,
substream->stream));
avail = fsl_esai_rx_avail(mix);
if (avail >= mix->buffer_bytes && elapse)
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12632):
https://lists.yoctoproject.org/g/linux-yocto/message/12632
Mute This Topic: https://lists.yoctoproject.org/mt/99022855/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH] usb: dwc3: Drop the suspend argument for dwc3_gadget_run_stop()
From: Kevin Hao
Due to the change in stable commit 065c3d4319c5 ("USB: dwc3: gadget: drop
dead hibernation code"), the suspend argument is dropped for
dwc3_gadget_run_stop(). So adjust the SDK codes for this change.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Could you help me merge this into the following two branches?
v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
v6.1/standard/sdkv6.1/xlnx-soc
drivers/usb/dwc3/gadget.h | 2 +-
drivers/usb/dwc3/gadget_hibernation.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h
index ef29e0a183be..9c25d59f0c27 100644
--- a/drivers/usb/dwc3/gadget.h
+++ b/drivers/usb/dwc3/gadget.h
@@ -133,7 +133,7 @@ int __dwc3_gadget_ep_disable(struct dwc3_ep *dep);
int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep);
void dwc3_stop_active_transfer(struct dwc3_ep *dep, bool force,
bool interrupt);
-int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend);
+int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on);
dma_addr_t dwc3_trb_dma_offset(struct dwc3_ep *dep, struct dwc3_trb *trb);
void dwc3_gadget_enter_hibernation(struct dwc3 *dwc);
void dwc3_gadget_exit_hibernation(void *_dwc);
diff --git a/drivers/usb/dwc3/gadget_hibernation.c
b/drivers/usb/dwc3/gadget_hibernation.c
index fa086dd6535c..f54c39dcccd9 100644
--- a/drivers/usb/dwc3/gadget_hibernation.c
+++ b/drivers/usb/dwc3/gadget_hibernation.c
@@ -327,7 +327,7 @@ void dwc3_gadget_enter_hibernation(struct dwc3 *dwc)
}
/* stop the controller */
- dwc3_gadget_run_stop(dwc, false, true);
+ dwc3_gadget_run_stop(dwc, false);
/* set the flag */
dwc->is_hibernated = true;
@@ -457,7 +457,7 @@ void dwc3_gadget_exit_hibernation(void *_dwc)
}
/* start the controller */
- ret = dwc3_gadget_run_stop(dwc, true, false);
+ ret = dwc3_gadget_run_stop(dwc, true);
if (ret < 0) {
dev_err(dwc->dev, "USB core failed to start on wakeup\n");
goto err;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12633):
https://lists.yoctoproject.org/g/linux-yocto/message/12633
Mute This Topic: https://lists.yoctoproject.org/mt/99022860/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.112 v6.1.29 for linux-yocto
On Fri, May 19, 2023 at 02:06:11PM -0400, Bruce Ashfield wrote: > In message: Trial merge of v5.15.112 v6.1.29 for linux-yocto > on 19/05/2023 Kevin Hao wrote: > > > Hi Bruce, > > > > This is a trial merge of the stable kernel v5.15.112 v6.1.29 for the > > following branches in the linux-yocto. > > 4f69e62a898e v5.15/standard/sdkv5.10/axxia > > 5e9f5f2c4644 v5.15/standard/preempt-rt/sdkv5.10/axxia > > 71fbcf542eb0 v5.15/standard/base > > 8cc51cef6e43 v5.15/standard/preempt-rt/base > > 7fb9db009bab v5.15/standard/cn-sdkv5.4/octeon > > #Have conflicts > > 6e8af66a5288 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > #Have conflicts > > d51906e23096 v5.15/standard/cn-sdkv5.15/octeon > > #Have conflicts > > 94f80c91824d v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > #Have conflicts > > 86dd0aa1ec93 v5.15/standard/ti-sdk-5.10/ti-j72xx > > 933a97c39de5 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > 35a6b8339fda v5.15/standard/nxp-sdk-5.15/nxp-soc > > #Have build failures > > 79b8dab0213e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > #Have build failures > > 6cb6a1855bf0 v5.15/standard/bcm-2xxx-rpi > > e8360b4682fa v5.15/standard/preempt-rt/bcm-2xxx-rpi > > 9e22e6dec2c5 v5.15/standard/nxp-sdk-5.15/nxp-s32g > > 1e0524a9af85 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > 072e2eb2f121 v5.15/standard/intel-sdk-5.15/intel-socfpga > > a13bdea5a83b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > eab5d9d1ed28 v5.15/standard/x86 > > bab100cd18c5 v5.15/standard/preempt-rt/x86 > > d0a39f7d545f v5.15/standard/sdkv5.15/xlnx-soc > > 633b3d197247 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > 7f828d7462d0 v6.1/standard/base > > 566c13db6587 v6.1/standard/preempt-rt/base > > 114fd6056886 v6.1/standard/ti-sdk-5.10/ti-j7xxx > > #Have build failures > > 724c950a302b v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx > > #Have build failures > > 84716ffc22da v6.1/standard/nxp-sdk-6.1/nxp-soc > > d67776245fb5 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > 28ccefe2813a v6.1/standard/bcm-2xxx-rpi > > 490bee698190 v6.1/standard/preempt-rt/bcm-2xxx-rpi > > b12458371f8f v6.1/standard/nxp-sdk-5.15/nxp-s32g > > f1d552417a73 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > 7f828d7462d0 v6.1/standard/x86 > > c9faca3acc07 v6.1/standard/preempt-rt/x86 > > f36e9c7d39b8 v6.1/standard/sdkv6.1/xlnx-soc > > #Have conflicts and build failures > > a7a4865e7e7d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > #Have conflicts and build failures > > > > According to the quantity of patches (134 in v5.15.112 and 239 in v6.1.29), > > this seems a regular release. > > But the merge conflicts and build failures are more than I have expected. I > > have folded the fix into > > the corresponding merge commit. There is also a fix [1] for the ti-j7xxx on > > the v6.1 kernel, it has nothing > > to do with this stable update and is just bug exposed by my build script. > > All these branches have passed my > > build test. I have pushed all these branches to: > > https://github.com/haokexin/linux > > > > You can use this as a reference for the linux-yocto stable kernel bump. > > Thanks Kevin, > > I used some of the build failures fixes while completing the merges > here. > > Everything is now pushed to linux-yocto. It seems that two fixes for the semantic merge conflicts are missed in the final branches, I have sent two addon patches [1] [2] for them. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12632 [2] https://lists.yoctoproject.org/g/linux-yocto/message/12633 Thanks, Kevin > > Bruce > > > > > [1] https://lists.yoctoproject.org/g/linux-yocto/message/12626 > > > > Thanks, > > Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12634): https://lists.yoctoproject.org/g/linux-yocto/message/12634 Mute This Topic: https://lists.yoctoproject.org/mt/99003148/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.114 v6.1.31 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.114 v6.1.31 for the following branches in the linux-yocto. d547e7f5bc0a v5.15/standard/sdkv5.10/axxia 59a34b26f323 v5.15/standard/preempt-rt/sdkv5.10/axxia 9fd769562dae v5.15/standard/base 6af1dfdecdf3 v5.15/standard/preempt-rt/base dcd5eafbfe83 v5.15/standard/cn-sdkv5.4/octeon 9a9c3c876923 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 2d735a4173c8 v5.15/standard/cn-sdkv5.15/octeon 9d0f475b5800 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 2f11ec7e600a v5.15/standard/ti-sdk-5.10/ti-j72xx 7c1279b896b7 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 7b0a923885de v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual conflicts 96bac0c6e644 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual conflicts 6fbe57dbd48b v5.15/standard/bcm-2xxx-rpi 13904374823f v5.15/standard/preempt-rt/bcm-2xxx-rpi 3fae05dc70d5 v5.15/standard/nxp-sdk-5.15/nxp-s32g 5fec5bd47a75 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 67d5ebb0aea3 v5.15/standard/intel-sdk-5.15/intel-socfpga c5204957cee3 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 12d56638dcd9 v5.15/standard/x86 ed06ff93a699 v5.15/standard/preempt-rt/x86 e1bb3e6d56ac v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts 71df8f645502 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts 3a87532fe22d v6.1/standard/base 6f8ae7bf93be v6.1/standard/preempt-rt/base 62b4711e14f6 v6.1/standard/ti-sdk-5.10/ti-j7xxx 0de1fa8ce944 v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx b55eebaff7ba v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts a1328b32578d v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts fb623b6f0077 v6.1/standard/bcm-2xxx-rpi 7e5a05433afc v6.1/standard/preempt-rt/bcm-2xxx-rpi 027c65b58322 v6.1/standard/nxp-sdk-5.15/nxp-s32g 91878a08890f v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 3a87532fe22d v6.1/standard/x86 752cafeaa8e5 v6.1/standard/preempt-rt/x86 30e338889d7c v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 638a62e0f723 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts This is a relatively small stable release and only has several trivial merge conflicts. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12667): https://lists.yoctoproject.org/g/linux-yocto/message/12667 Mute This Topic: https://lists.yoctoproject.org/mt/99231926/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.115 v6.1.32 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.115 v6.1.32 for the following branches in the linux-yocto. 3f02107476a2 v5.15/standard/sdkv5.10/axxia 41fceb476385 v5.15/standard/preempt-rt/sdkv5.10/axxia 53741a09dcbd v5.15/standard/base 98cba64b4f1d v5.15/standard/preempt-rt/base 7e9822fb32f5 v5.15/standard/cn-sdkv5.4/octeon fb2919d7b815 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 71ffd99e3a8c v5.15/standard/cn-sdkv5.15/octeon e8427b210cf8 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 514b78c6284a v5.15/standard/ti-sdk-5.10/ti-j72xx 4ba44e533676 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx b6dcefa885de v5.15/standard/nxp-sdk-5.15/nxp-soc 76a66bb282f9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 0b55338ba72f v5.15/standard/bcm-2xxx-rpi 396ccb2a8150 v5.15/standard/preempt-rt/bcm-2xxx-rpi 37e7afc3511e v5.15/standard/nxp-sdk-5.15/nxp-s32g 970662f744a2 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g e805b15e054b v5.15/standard/intel-sdk-5.15/intel-socfpga 7e90565c9938 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 67b9b39444dd v5.15/standard/x86 51b8dbfc66a3 v5.15/standard/preempt-rt/x86 7fcd19fcd65a v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts 039ae6674a14 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts 64c0e1aead3a v6.1/standard/base c72c9cd61636 v6.1/standard/preempt-rt/base 5e81a008eb5c v6.1/standard/ti-sdk-5.10/ti-j7xxx 58862d7786e8 v6.1/standard/preempt-rt/ti-sdk-5.10/ti-j7xxx 605b818f3e36 v6.1/standard/nxp-sdk-6.1/nxp-soc d4c989f94d4b v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc f93704aa07b6 v6.1/standard/bcm-2xxx-rpi c7ece8f60ed9 v6.1/standard/preempt-rt/bcm-2xxx-rpi 045daac35ae4 v6.1/standard/nxp-sdk-5.15/nxp-s32g 7c74b276c133 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 64c0e1aead3a v6.1/standard/x86 b88390f7a4c4 v6.1/standard/preempt-rt/x86 bf3836c1b6ce v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 6d17afc7b0a3 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts This stable release seems almost perfect and there is only a very trivial conflict. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12687): https://lists.yoctoproject.org/g/linux-yocto/message/12687 Mute This Topic: https://lists.yoctoproject.org/mt/99339363/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v6.1/standard/intel-sdk-6.1/intel-socfpga & v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga][PATCH 1/2] kbuild: Enable DT symbols when CONFIG_OF_OVERLAY is used
On Tue, Jun 06, 2023 at 04:58:38PM +0800, LiweiSong via lists.yoctoproject.org wrote: > From: Geert Uytterhoeven > > commit 99b4b29326e336aab314dac79854e8642e74ba5a from > https://github.com/altera-opensource/linux-socfpga.git > > Signed-off-by: Geert Uytterhoeven > Signed-off-by: Liwei Song > --- > Hi Bruce, > > These two patches are bug fixes for stratix 10 rsu feature, > without them rsu feature in uboot will run in error. > Could you help merge them to below branches: > > v6.1/standard/intel-sdk-6.1/intel-socfpga > v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > > Thanks, > Liwei. > > --- > scripts/Makefile.lib | 4 > 1 file changed, 4 insertions(+) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 3aa384cec76b..7f3801cbf344 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -375,6 +375,10 @@ cmd_dt_S_dtb= > \ > $(obj)/%.dtb.S: $(obj)/%.dtb FORCE > $(call if_changed,dt_S_dtb) > > +ifeq ($(CONFIG_OF_OVERLAY),y) > +DTC_FLAGS += -@ > +endif Since we have merged the overlay support into the v6.1/standard/base branch, I think this patch should also be merged into v6.1/standard/base branch. Thanks, Kevin > + > quiet_cmd_dtc = DTC $@ > cmd_dtc = $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) > $< ; \ > $(DTC) -o $@ -b 0 \ > -- > 2.35.5 > > > > signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12704): https://lists.yoctoproject.org/g/linux-yocto/message/12704 Mute This Topic: https://lists.yoctoproject.org/mt/99359476/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v6.1/standard/intel-sdk-6.1/intel-socfpga & v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga][PATCH 1/2] kbuild: Enable DT symbols when CONFIG_OF_OVERLAY is used
On Wed, Jun 07, 2023 at 10:11:20AM +0800, Liwei Song wrote: > > Since we have merged the overlay support into the v6.1/standard/base branch, > > I think this patch should also be merged into v6.1/standard/base branch. > > Hi Kexin, > > The patch we merged to standard/base is about CONFIG_OF_CONFIGFS, this patch > is not a fix > for that one, with this patch "__symbols__" node will be created in dtb which > is needed by > intel-rsu tool, it's a little specific to Stratix bsp, Oh, I see. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12706): https://lists.yoctoproject.org/g/linux-yocto/message/12706 Mute This Topic: https://lists.yoctoproject.org/mt/99359476/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v6.1 0/2] Fix two build errors in octeon branches
From: Kevin Hao Hi Bruce, This patch series fixes two build errors for the octeon branches. Please help me merge them into following two branches: v6.1/standard/cn-sdkv5.15/octeon v6.1/standard/preempt-rt/cn-sdkv5.15/octeon Kevin Hao (2): crypto: octeontx2: Drop the dangling exported symbol crypto: ecc: Add the declaration of ecc_point_mult() and vli_mod_add() crypto/ecc.c | 4 ++-- drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 3 --- include/crypto/internal/ecc.h | 7 +++ 3 files changed, 9 insertions(+), 5 deletions(-) -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12726): https://lists.yoctoproject.org/g/linux-yocto/message/12726 Mute This Topic: https://lists.yoctoproject.org/mt/99427514/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v6.1 1/2] crypto: octeontx2: Drop the dangling exported symbol
From: Kevin Hao
The definition of these two functions have already been deleted by
commit acf526d32b02 ("crypto/octeontx2: register error interrupts for
inline cptlf"), but the exported symbol for them were forgotten to be
removed.
Signed-off-by: Kevin Hao
---
drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/crypto/marvell/octeontx2/otx2_cptlf.c
b/drivers/crypto/marvell/octeontx2/otx2_cptlf.c
index 67d084cc7561..fad3662f8798 100644
--- a/drivers/crypto/marvell/octeontx2/otx2_cptlf.c
+++ b/drivers/crypto/marvell/octeontx2/otx2_cptlf.c
@@ -279,8 +279,6 @@ void otx2_cptlf_unregister_done_interrupts(struct
otx2_cptlfs_info *lfs)
cptlf_set_done_intrs(lfs, false);
}
-EXPORT_SYMBOL_NS_GPL(otx2_cptlf_unregister_interrupts,
-CRYPTO_DEV_OCTEONTX2_CPT);
static int cptlf_do_register_interrrupts(struct otx2_cptlfs_info *lfs,
int lf_num, int irq_offset,
@@ -344,7 +342,6 @@ int otx2_cptlf_register_done_interrupts(struct
otx2_cptlfs_info *lfs)
otx2_cptlf_unregister_done_interrupts(lfs);
return ret;
}
-EXPORT_SYMBOL_NS_GPL(otx2_cptlf_register_interrupts, CRYPTO_DEV_OCTEONTX2_CPT);
void otx2_cptlf_free_irqs_affinity(struct otx2_cptlfs_info *lfs)
{
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12727):
https://lists.yoctoproject.org/g/linux-yocto/message/12727
Mute This Topic: https://lists.yoctoproject.org/mt/99427515/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v6.1 2/2] crypto: ecc: Add the declaration of ecc_point_mult() and vli_mod_add()
From: Kevin Hao
Actually these are part of the changes in SDK commit 85bb620085bc
("crypto: ecc - Move ecc.h to include/crypto/internal"), but they were
omitted due to the conflict with the upstream commit a745d3ace3fd
("crypto: ecc - Move ecc.h to include/crypto/internal"). Restore them
back to fix the build error.
Signed-off-by: Kevin Hao
---
crypto/ecc.c | 4 ++--
include/crypto/internal/ecc.h | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 259c02c85f0f..b4d6ded664fa 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -488,7 +488,7 @@ static void vli_square(u64 *result, const u64 *left,
unsigned int ndigits)
/* Computes result = (left + right) % mod.
* Assumes that left < mod and right < mod, result != mod.
*/
-static void vli_mod_add(u64 *result, const u64 *left, const u64 *right,
+void vli_mod_add(u64 *result, const u64 *left, const u64 *right,
const u64 *mod, unsigned int ndigits)
{
u64 carry;
@@ -1278,7 +1278,7 @@ static void xycz_add_c(u64 *x1, u64 *y1, u64 *x2, u64 *y2,
vli_set(x1, t7, ndigits);
}
-static void ecc_point_mult(struct ecc_point *result,
+void ecc_point_mult(struct ecc_point *result,
const struct ecc_point *point, const u64 *scalar,
u64 *initial_z, const struct ecc_curve *curve,
unsigned int ndigits)
diff --git a/include/crypto/internal/ecc.h b/include/crypto/internal/ecc.h
index 4f6c1a68882f..48ff9f09bcd7 100644
--- a/include/crypto/internal/ecc.h
+++ b/include/crypto/internal/ecc.h
@@ -182,6 +182,9 @@ int vli_cmp(const u64 *left, const u64 *right, unsigned int
ndigits);
u64 vli_sub(u64 *result, const u64 *left, const u64 *right,
unsigned int ndigits);
+void vli_mod_add(u64 *result, const u64 *left, const u64 *right,
+const u64 *mod, unsigned int ndigits);
+
/**
* vli_from_be64() - Load vli from big-endian u64 array
*
@@ -260,6 +263,10 @@ void ecc_free_point(struct ecc_point *p);
*/
bool ecc_point_is_zero(const struct ecc_point *point);
+void ecc_point_mult(struct ecc_point *result, const struct ecc_point *point,
+ const u64 *scalar, u64 *initial_z,
+ const struct ecc_curve *curve, unsigned int ndigits);
+
/**
* ecc_point_mult_shamir() - Add two points multiplied by scalars
*
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12728):
https://lists.yoctoproject.org/g/linux-yocto/message/12728
Mute This Topic: https://lists.yoctoproject.org/mt/99427518/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.116 v6.1.33 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.116 v6.1.33 for the following branches in the linux-yocto. b0e9a39058ad v5.15/standard/sdkv5.10/axxia 3cf221b9e147 v5.15/standard/preempt-rt/sdkv5.10/axxia 6297cf31f2d4 v5.15/standard/base a0128f43ee89 v5.15/standard/preempt-rt/base f238650795f0 v5.15/standard/cn-sdkv5.4/octeon 880376765107 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 19b81b959b97 v5.15/standard/cn-sdkv5.15/octeon 1d399987502f v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 733961a9e14c v5.15/standard/ti-sdk-5.10/ti-j72xx f5a87e4cd3b1 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx f609b097d46f v5.15/standard/nxp-sdk-5.15/nxp-soc 7a5690f55876 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc d93147dedb3f v5.15/standard/bcm-2xxx-rpi 25e3c5c7c1e7 v5.15/standard/preempt-rt/bcm-2xxx-rpi ed2eb07bf630 v5.15/standard/nxp-sdk-5.15/nxp-s32g e740512652f7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 722854cbd7d0 v5.15/standard/intel-sdk-5.15/intel-socfpga 9f700e5e143c v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 22966cd59668 v5.15/standard/x86 a245c0f608bc v5.15/standard/preempt-rt/x86 b06e2009d807 v5.15/standard/sdkv5.15/xlnx-soc 62f47b591681 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc c8c5579cb846 v6.1/standard/base b7766b32efae v6.1/standard/preempt-rt/base 670a5fbad429 v6.1/standard/ti-sdk-6.1/ti-j7xxx bdbae08cf02d v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 8f3fea71f103 v6.1/standard/nxp-sdk-6.1/nxp-soc e39c95984cc8 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 0e3df600facd v6.1/standard/cn-sdkv5.15/octeon a2dc26d89057 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 34bfb07787f2 v6.1/standard/bcm-2xxx-rpi f3460a9443ec v6.1/standard/preempt-rt/bcm-2xxx-rpi 0bc567b4dab9 v6.1/standard/nxp-sdk-5.15/nxp-s32g d2ea28c7c1b2 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 158d5c11091d v6.1/standard/intel-sdk-6.1/intel-socfpga f44f96cfbc02 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga c8c5579cb846 v6.1/standard/x86 f678bb7f7b3b v6.1/standard/preempt-rt/x86 aac97db53af9 v6.1/standard/sdkv6.1/xlnx-soc 4e14a5e778ff v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc A perfect stable release and there is no any merge conflict. My build script exposes two build errors on the new created octeon branches. I have sent out the fixes [1] for them. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12726 Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12729): https://lists.yoctoproject.org/g/linux-yocto/message/12729 Mute This Topic: https://lists.yoctoproject.org/mt/99429725/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH v5.15 0/4] Fix several build warnings on nxp-soc branches
From: Kevin Hao
Hi Bruce,
This patch series fixes several build warnings on nxp-soc branches.
Please help me merge these into the following two branches:
v5.15/standard/nxp-sdk-5.15/nxp-soc
v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
Kevin Hao (4):
ASoC: fsl_esai: Drop the unused variable in
fsl_esai_mix_buffer_from_fe_{tx,rx}()
net: tsn: Drop the senseless codes
arm64: imx8: vpc: Wrap the hantroenc_ioctl32() with #ifdef
video: fb: mxc: Drop the senseless check
drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c | 2 ++
drivers/video/fbdev/mxc/mxc_ipuv3_fb.c| 6 ++
net/tsn/genl_tsn.c| 14 --
sound/soc/fsl/fsl_esai_mix.c | 2 --
4 files changed, 4 insertions(+), 20 deletions(-)
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12757):
https://lists.yoctoproject.org/g/linux-yocto/message/12757
Mute This Topic: https://lists.yoctoproject.org/mt/99523721/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 1/4] ASoC: fsl_esai: Drop the unused variable in fsl_esai_mix_buffer_from_fe_{tx,rx}()
From: Kevin Hao
Due to the change in commit f7a712001db6 ("ASoC: fsl_esai: Replace the
dpcm_lock with FE stream lock"), the variable 'flags' is not needed
anymore. So drop it.
Signed-off-by: Kevin Hao
---
sound/soc/fsl/fsl_esai_mix.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/sound/soc/fsl/fsl_esai_mix.c b/sound/soc/fsl/fsl_esai_mix.c
index b7aec051e05f..6da898ac0883 100644
--- a/sound/soc/fsl/fsl_esai_mix.c
+++ b/sound/soc/fsl/fsl_esai_mix.c
@@ -128,7 +128,6 @@ static void fsl_esai_mix_buffer_from_fe_tx(struct
snd_pcm_substream *substream,
struct fsl_esai_client *client;
struct fsl_esai_client_dma *client_dma;
struct snd_soc_dpcm *dpcm;
- unsigned long flags;
int sample_offset = 0;
int client_chn = 0;
int mix_chn = 0;
@@ -230,7 +229,6 @@ static void fsl_esai_split_buffer_from_be_rx(struct
snd_pcm_substream *substream
struct fsl_esai_client *client;
struct fsl_esai_client_dma *client_dma;
struct snd_soc_dpcm *dpcm;
- unsigned long flags;
int sample_offset = 0;
int client_chn = 0;
int mix_chn = 0;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12758):
https://lists.yoctoproject.org/g/linux-yocto/message/12758
Mute This Topic: https://lists.yoctoproject.org/mt/99523722/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 2/4] net: tsn: Drop the senseless codes
From: Kevin Hao
The 'gcl' is a pointer, so 'gcl + i' always evaluate as 'true'. And the
memory pointed by 'gcl' is allocated based on the
sgiadmin.admin.control_list_length, so it makes no sense to recheck the
out of bounds access. Drop these codes to fix the following build
warning:
net/tsn/genl_tsn.c:1684:21: warning: the comparison will always evaluate as
‘true’ for the pointer operand in ‘gcl + (sizetype)((long unsigned int)i * 12)’
must not be NULL [-Waddress]
1684 | if (!(gcl + i)) {
| ^
Signed-off-by: Kevin Hao
---
net/tsn/genl_tsn.c | 14 --
1 file changed, 14 deletions(-)
diff --git a/net/tsn/genl_tsn.c b/net/tsn/genl_tsn.c
index a1aec189f846..1bdb4a01ce8f 100644
--- a/net/tsn/genl_tsn.c
+++ b/net/tsn/genl_tsn.c
@@ -1681,13 +1681,6 @@ static int cmd_qci_sgi_get(struct genl_info *info)
s8 ipv;
u32 ti, omax;
- if (!(gcl + i)) {
- pr_err("error: list count too big\n");
- ret = -EINVAL;
- kfree(sgiadmin.admin.gcl);
- goto err;
- }
-
/* Adminastration entry */
sglattr = nla_nest_start_noflag(rep_skb,
TSN_SGI_ATTR_CTRL_GCLENTRY);
@@ -1877,13 +1870,6 @@ static int cmd_qci_sgi_status_get(struct genl_info *info)
s8 ipv;
u32 ti, omax;
- if (!(gcl + i)) {
- pr_err("error: list count too big\n");
- ret = -EINVAL;
- kfree(sgistat.oper.gcl);
- goto err;
- }
-
/* Operation entry */
sglattr = nla_nest_start_noflag(rep_skb,
TSN_SGI_ATTR_CTRL_GCLENTRY);
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12759):
https://lists.yoctoproject.org/g/linux-yocto/message/12759
Mute This Topic: https://lists.yoctoproject.org/mt/99523723/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 3/4] arm64: imx8: vpc: Wrap the hantroenc_ioctl32() with #ifdef
From: Kevin Hao
This function is only used when CONFIG_COMPAT is enabled. So wrap it
with #ifdef to fix the below build warning.
drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c:702:13: warning:
‘hantroenc_ioctl32’ defined but not used [-Wunused-function]
702 | static long hantroenc_ioctl32(struct file *filp, unsigned int cmd,
unsigned long arg)
| ^
Signed-off-by: Kevin Hao
---
drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
index dfb8d37664c6..9ab42bd66933 100755
--- a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
+++ b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c
@@ -699,6 +699,7 @@ static int hantroenc_release(struct inode *inode, struct
file *filp)
return 0;
}
+#ifdef CONFIG_COMPAT
static long hantroenc_ioctl32(struct file *filp, unsigned int cmd, unsigned
long arg)
{
long err = 0;
@@ -799,6 +800,7 @@ union {
}
return 0;
}
+#endif
/* VFS methods */
static struct file_operations hantroenc_fops = {
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12760):
https://lists.yoctoproject.org/g/linux-yocto/message/12760
Mute This Topic: https://lists.yoctoproject.org/mt/99523724/21656
Mute #ifdef:https://lists.yoctoproject.org/g/linux-yocto/mutehashtag/ifdef
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [PATCH 4/4] video: fb: mxc: Drop the senseless check
From: Kevin Hao The fb_info::cmap is a struct instead of pointer, so it makes no sense to check it before the color map deallocation. Signed-off-by: Kevin Hao --- drivers/video/fbdev/mxc/mxc_ipuv3_fb.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c b/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c index 7e067e2bbd39..0742a81b1dce 100644 --- a/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/fbdev/mxc/mxc_ipuv3_fb.c @@ -3343,8 +3343,7 @@ static void mxcfb_unsetup_overlay(struct fb_info *fbi_bg) mxcfb_unregister(ovfbi); - if (&ovfbi->cmap) - fb_dealloc_cmap(&ovfbi->cmap); + fb_dealloc_cmap(&ovfbi->cmap); framebuffer_release(ovfbi); } @@ -3629,8 +3628,7 @@ static int mxcfb_remove(struct platform_device *pdev) } ipu_clear_usage(mxc_fbi->ipu_id, mxc_fbi->ipu_di); - if (&fbi->cmap) - fb_dealloc_cmap(&fbi->cmap); + fb_dealloc_cmap(&fbi->cmap); framebuffer_release(fbi); return 0; } -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12761): https://lists.yoctoproject.org/g/linux-yocto/message/12761 Mute This Topic: https://lists.yoctoproject.org/mt/99523725/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [v6.1 PATCH] irqchip: gpcv2: Wrap the res variable with #ifdef
From: Kevin Hao
This variable is only used on arm64, but this driver is also available
to arm. So wrap it with #ifdef to fix the build warning on arm.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
linux-yocto/v6.1/standard/nxp-sdk-6.1/nxp-soc
linux-yocto/v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
drivers/irqchip/irq-imx-gpcv2.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c
index 9f21511c7357..afad6405de41 100644
--- a/drivers/irqchip/irq-imx-gpcv2.c
+++ b/drivers/irqchip/irq-imx-gpcv2.c
@@ -123,7 +123,9 @@ static void imx_gpcv2_wake_request_fixup(void)
static int imx_gpcv2_irq_set_wake(struct irq_data *d, unsigned int on)
{
struct gpcv2_irqchip_data *cd = d->chip_data;
+#ifdef CONFIG_ARM64
struct arm_smccc_res res;
+#endif
unsigned int idx = d->hwirq / 32;
unsigned long flags;
u32 mask, val;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12762):
https://lists.yoctoproject.org/g/linux-yocto/message/12762
Mute This Topic: https://lists.yoctoproject.org/mt/99523755/21656
Mute #ifdef:https://lists.yoctoproject.org/g/linux-yocto/mutehashtag/ifdef
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [v6.1 PATCH] mmc: sdhci-esdhc-imx: Drop the unused usdhc_s32g2_data
From: Kevin Hao
This is not used by anyone since it was introduced in commit
7062449f7189 ("mmc: sdhci-esdhc-imx: Add S32CC support"), so drop it.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/nxp-sdk-5.15/nxp-s32g
v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
drivers/mmc/host/sdhci-esdhc-imx.c | 7 ---
1 file changed, 7 deletions(-)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c
b/drivers/mmc/host/sdhci-esdhc-imx.c
index bfbc7b5b0af5..12b20b2e1790 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -302,13 +302,6 @@ static const struct esdhc_soc_data usdhc_imx7d_data = {
| ESDHC_FLAG_BROKEN_AUTO_CMD23,
};
-static struct esdhc_soc_data usdhc_s32g2_data = {
- .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_MAN_TUNING
- | ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200
- | ESDHC_FLAG_HS400 | ESDHC_FLAG_HS400_ES
- | ESDHC_FLAG_SKIP_ERR004536,
-};
-
static struct esdhc_soc_data usdhc_imx7ulp_data = {
.flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING
| ESDHC_FLAG_HAVE_CAP1 | ESDHC_FLAG_HS200
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12764):
https://lists.yoctoproject.org/g/linux-yocto/message/12764
Mute This Topic: https://lists.yoctoproject.org/mt/99541376/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.117 v6.1.34 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.117 v6.1.34 for the following branches in the linux-yocto. 05cffcf3f2df v5.15/standard/sdkv5.10/axxia 4f5873a6bf1d v5.15/standard/preempt-rt/sdkv5.10/axxia e16d2d7c6031 v5.15/standard/base #Have textual conflicts 777a5f6a3351 v5.15/standard/preempt-rt/base 1eef497957a4 v5.15/standard/cn-sdkv5.4/octeon b98db88bf80e v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 022f5c43c553 v5.15/standard/cn-sdkv5.15/octeon 628d5e8dd371 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 5fb27e88c14a v5.15/standard/ti-sdk-5.10/ti-j72xx 6d359a593201 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 28b3ba45bb82 v5.15/standard/nxp-sdk-5.15/nxp-soc 10d319a6b201 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 3ab2de578756 v5.15/standard/bcm-2xxx-rpi 787728acec8a v5.15/standard/preempt-rt/bcm-2xxx-rpi 492eec133ae0 v5.15/standard/nxp-sdk-5.15/nxp-s32g e92b164b23e6 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g a00f2b18b010 v5.15/standard/intel-sdk-5.15/intel-socfpga 75ca7cb1b918 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga bf7577862e50 v5.15/standard/x86 a8469f48bae3 v5.15/standard/preempt-rt/x86 dc3ed8e0f0a4 v5.15/standard/sdkv5.15/xlnx-soc cce57d8b7f9a v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 532abffac645 v6.1/standard/base 3857bd86ac28 v6.1/standard/preempt-rt/base 9ed0ab86a3ba v6.1/standard/ti-sdk-6.1/ti-j7xxx 39bcedf79e3f v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx bd0158681af6 v6.1/standard/nxp-sdk-6.1/nxp-soc 0ede0c514aa9 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc e65611adf611 v6.1/standard/cn-sdkv5.15/octeon b5afbe849b6f v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 2d4f801c53db v6.1/standard/bcm-2xxx-rpi 270346ad94ad v6.1/standard/preempt-rt/bcm-2xxx-rpi 52791ce212c0 v6.1/standard/nxp-sdk-5.15/nxp-s32g 7af6096b11c2 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 1dbd46bf13ec v6.1/standard/intel-sdk-6.1/intel-socfpga 1606783b8ed5 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 532abffac645 v6.1/standard/x86 35b0ee0e5fa7 v6.1/standard/preempt-rt/x86 0c99c681ffc8 v6.1/standard/sdkv6.1/xlnx-soc 50394cb9556b v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc There is only one merge conflict on the v5.15/standard/base branch due to the same patch applied to both linux-yocto and stable. The changes in the 8d00b4e329b7 seems correct. 24615a3b932a ata: ahci: fix enum constants for gcc-13 8d00b4e329b7 ata: ahci: fix enum constants for gcc-13 All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12772): https://lists.yoctoproject.org/g/linux-yocto/message/12772 Mute This Topic: https://lists.yoctoproject.org/mt/99543322/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.118 v6.1.35 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.118 v6.1.35 for the following branches in the linux-yocto. 44291613df39 v5.15/standard/sdkv5.10/axxia 92d24e0c v5.15/standard/preempt-rt/sdkv5.10/axxia eee9186b951b v5.15/standard/base 0a56534ef10f v5.15/standard/preempt-rt/base ad8238bf23e4 v5.15/standard/cn-sdkv5.4/octeon ae0e45d47b8c v5.15/standard/preempt-rt/cn-sdkv5.4/octeon c9f7bcffad9b v5.15/standard/cn-sdkv5.15/octeon fa68d715b4c0 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon f2a817ae09ba v5.15/standard/ti-sdk-5.10/ti-j72xx 6c3c7f6a6ff8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 5c70c1828bc8 v5.15/standard/nxp-sdk-5.15/nxp-soc 7870ff843da9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 93fc903bf3b2 v5.15/standard/bcm-2xxx-rpi 67cc6b5860a8 v5.15/standard/preempt-rt/bcm-2xxx-rpi 4946059cd722 v5.15/standard/nxp-sdk-5.15/nxp-s32g 443c74d30bdc v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g f5aaf57cfc36 v5.15/standard/intel-sdk-5.15/intel-socfpga 25f2d619ab9d v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 50c176083e31 v5.15/standard/x86 37658a804e93 v5.15/standard/preempt-rt/x86 869872f0c312 v5.15/standard/sdkv5.15/xlnx-soc ed56ec271aad v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 1a6bfea9a36b v6.1/standard/base e6509db19fb3 v6.1/standard/preempt-rt/base 51c7b330dd8c v6.1/standard/ti-sdk-6.1/ti-j7xxx f8c93e3014c3 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 777cd1c5e959 v6.1/standard/nxp-sdk-6.1/nxp-soc 5c671cc77d3a v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 49df57c938fb v6.1/standard/cn-sdkv5.15/octeon 031d124bf078 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon a82523a38e3f v6.1/standard/bcm-2xxx-rpi cb5c94d4111c v6.1/standard/preempt-rt/bcm-2xxx-rpi 0b093c0248d5 v6.1/standard/nxp-sdk-5.15/nxp-s32g 10d3002fa67d v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 947d06fe506e v6.1/standard/intel-sdk-6.1/intel-socfpga 8c6b64e15d46 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 62d290096206 v6.1/standard/x86 5cd07f81418f v6.1/standard/preempt-rt/x86 fee4d840f3e9 v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 5eeba80c3635 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts This seems a very clean stable release and there is only one trivial merge conflict in the xlnx-soc branches on v6.1 kernel. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12785): https://lists.yoctoproject.org/g/linux-yocto/message/12785 Mute This Topic: https://lists.yoctoproject.org/mt/99689438/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto v6.1 PATCH] spi: cadence-quadspi: Add missing check for dma_set_mask
From: Jiasheng Jiang
[ Upstream commit 947c70a213769f60e9d5aca2bc88b50a1cfaf5a6 ]
Add check for dma_set_mask() and return the error if it fails.
Fixes: 1a6f854f7daa ("spi: cadence-quadspi: Add Xilinx Versal external DMA
support")
Signed-off-by: Jiasheng Jiang
Link: https://lore.kernel.org/r/20230606093859.27818-1-jiash...@iscas.ac.cn
Signed-off-by: Mark Brown
Signed-off-by: Sasha Levin
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this patch onto the following two branches:
v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
v6.1/standard/sdkv6.1/xlnx-soc
The commit 485792480660 was introduced in the v6.1.35 stable kernel,
but the changes of that were overrode due to the merge conflict in the
above two branches. This tries to reapply that commit on these two
branches.
drivers/spi/spi-cadence-quadspi.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/spi-cadence-quadspi.c
b/drivers/spi/spi-cadence-quadspi.c
index 82a253eb6e6e..7eb6a0899d13 100644
--- a/drivers/spi/spi-cadence-quadspi.c
+++ b/drivers/spi/spi-cadence-quadspi.c
@@ -2170,7 +2170,9 @@ static int cqspi_probe(struct platform_device *pdev)
if (of_device_is_compatible(pdev->dev.of_node,
"xlnx,versal-ospi-1.0")) {
- dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+ ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+ if (ret)
+ goto probe_reset_failed;
if (cqspi->master_ref_clk_hz >= TAP_GRAN_SEL_MIN_FREQ)
writel(0x1, cqspi->iobase +
CQSPI_REG_VERSAL_ECO);
}
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12798):
https://lists.yoctoproject.org/g/linux-yocto/message/12798
Mute This Topic: https://lists.yoctoproject.org/mt/99779190/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.118 v6.1.35 for linux-yocto
On Thu, Jun 22, 2023 at 02:39:08PM -0400, Bruce Ashfield wrote: > In message: Trial merge of v5.15.118 v6.1.35 for linux-yocto > on 22/06/2023 Kevin Hao wrote: > > > Hi Bruce, > > > > This is a trial merge of the stable kernel v5.15.118 v6.1.35 for the > > following branches in the linux-yocto. > > 44291613df39 v5.15/standard/sdkv5.10/axxia > > 92d24e0c v5.15/standard/preempt-rt/sdkv5.10/axxia > > eee9186b951b v5.15/standard/base > > 0a56534ef10f v5.15/standard/preempt-rt/base > > ad8238bf23e4 v5.15/standard/cn-sdkv5.4/octeon > > ae0e45d47b8c v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > c9f7bcffad9b v5.15/standard/cn-sdkv5.15/octeon > > fa68d715b4c0 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > f2a817ae09ba v5.15/standard/ti-sdk-5.10/ti-j72xx > > 6c3c7f6a6ff8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > 5c70c1828bc8 v5.15/standard/nxp-sdk-5.15/nxp-soc > > 7870ff843da9 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > 93fc903bf3b2 v5.15/standard/bcm-2xxx-rpi > > 67cc6b5860a8 v5.15/standard/preempt-rt/bcm-2xxx-rpi > > 4946059cd722 v5.15/standard/nxp-sdk-5.15/nxp-s32g > > 443c74d30bdc v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > f5aaf57cfc36 v5.15/standard/intel-sdk-5.15/intel-socfpga > > 25f2d619ab9d v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > 50c176083e31 v5.15/standard/x86 > > 37658a804e93 v5.15/standard/preempt-rt/x86 > > 869872f0c312 v5.15/standard/sdkv5.15/xlnx-soc > > ed56ec271aad v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > 1a6bfea9a36b v6.1/standard/base > > e6509db19fb3 v6.1/standard/preempt-rt/base > > 51c7b330dd8c v6.1/standard/ti-sdk-6.1/ti-j7xxx > > f8c93e3014c3 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > > 777cd1c5e959 v6.1/standard/nxp-sdk-6.1/nxp-soc > > 5c671cc77d3a v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > 49df57c938fb v6.1/standard/cn-sdkv5.15/octeon > > 031d124bf078 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > a82523a38e3f v6.1/standard/bcm-2xxx-rpi > > cb5c94d4111c v6.1/standard/preempt-rt/bcm-2xxx-rpi > > 0b093c0248d5 v6.1/standard/nxp-sdk-5.15/nxp-s32g > > 10d3002fa67d v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > 947d06fe506e v6.1/standard/intel-sdk-6.1/intel-socfpga > > 8c6b64e15d46 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > > 62d290096206 v6.1/standard/x86 > > 5cd07f81418f v6.1/standard/preempt-rt/x86 > > fee4d840f3e9 v6.1/standard/sdkv6.1/xlnx-soc > > #Have textual conflicts > > 5eeba80c3635 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > #Have textual conflicts It seems that the final merge of these two branches are different from mine. I have sent a patch [1] to fix this. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12798 Thanks, Kevin > > > > This seems a very clean stable release and there is only one trivial merge > > conflict > > in the xlnx-soc branches on v6.1 kernel. All the branches have passed my > > build test. > > I have pushed all these branches to: > > https://github.com/haokexin/linux > > > > Thanks Kevin. > > I had the same results here, the updates are now pushed. > > Bruce > > > You can use this as a reference for the linux-yocto stable kernel bump. > > > > Thanks, > > Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12799): https://lists.yoctoproject.org/g/linux-yocto/message/12799 Mute This Topic: https://lists.yoctoproject.org/mt/99689438/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.119 v6.1.36 for linux-yocto
Hi Bruce,
This is a trial merge of the stable kernel v5.15.119 v6.1.36 for the following
branches in the linux-yocto.
be40fc41bd6e v5.15/standard/sdkv5.10/axxia
e75835741a61 v5.15/standard/preempt-rt/sdkv5.10/axxia
5286aba085f3 v5.15/standard/base
2ecfdafb698d v5.15/standard/preempt-rt/base
8fa9560c4dd4 v5.15/standard/cn-sdkv5.4/octeon
63def203e4e4 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon
c6a6f3f7ccb0 v5.15/standard/cn-sdkv5.15/octeon
c85fe0177765 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
3a984e518a65 v5.15/standard/ti-sdk-5.10/ti-j72xx
6e6d68f31692 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx
ef85dc984077 v5.15/standard/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
d442c239e922 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
#Have textual conflicts
ca6190648f39 v5.15/standard/bcm-2xxx-rpi
fe77be715143 v5.15/standard/preempt-rt/bcm-2xxx-rpi
a0e68ed68874 v5.15/standard/nxp-sdk-5.15/nxp-s32g
731e0747cfc8 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
33587f804c1f v5.15/standard/intel-sdk-5.15/intel-socfpga
737a52381316 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga
93636851643a v5.15/standard/x86
13e6b9070532 v5.15/standard/preempt-rt/x86
06e2203ca6b4 v5.15/standard/sdkv5.15/xlnx-soc
fae6ce5c0f62 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
6ddeb74e2aed v6.1/standard/base
#Have textual conflicts
5b1265e16f7c v6.1/standard/preempt-rt/base
b6138f7d213f v6.1/standard/ti-sdk-6.1/ti-j7xxx
411bdd3dfd02 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx
32bbd6f8e4a5 v6.1/standard/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
b290cbd38c6f v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
#Have textual conflicts
9ed6c482ead6 v6.1/standard/cn-sdkv5.15/octeon
ad8cdb51154a v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
1178a4b79ab9 v6.1/standard/bcm-2xxx-rpi
e7efd0895134 v6.1/standard/preempt-rt/bcm-2xxx-rpi
3bf26017b1d0 v6.1/standard/nxp-sdk-5.15/nxp-s32g
60acc0e89194 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
363ec7b1b160 v6.1/standard/intel-sdk-6.1/intel-socfpga
88d337e2b686 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga
8ae2964866b5 v6.1/standard/x86
4bd09df854bd v6.1/standard/preempt-rt/x86
1233d3e4f7e3 v6.1/standard/sdkv6.1/xlnx-soc
e9c4e041e2f0 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
This seems a normal stable release. There is a conflict on v6.1/standard/base
due to
the merge of commit 0c6552f83725 ("tick/common: Align tick period during
sched_timer setup")
and several trivial conflicts on the nxp branches. All the branches have passed
my
build test. I have pushed all these branches to:
https://github.com/haokexin/linux
You can use this as a reference for the linux-yocto stable kernel bump.
Thanks,
Kevin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12820):
https://lists.yoctoproject.org/g/linux-yocto/message/12820
Mute This Topic: https://lists.yoctoproject.org/mt/99843837/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v6.1.37 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v6.1.37 for the following branches in the linux-yocto. 8d892de64eae v6.1/standard/base 1731741189db v6.1/standard/preempt-rt/base 09afcc1faa8c v6.1/standard/ti-sdk-6.1/ti-j7xxx e25ad2b96628 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 13e8396d88e9 v6.1/standard/nxp-sdk-6.1/nxp-soc d968f81135a3 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc ac268c74ddaf v6.1/standard/cn-sdkv5.15/octeon 3262893ecf96 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon fafdaa74481e v6.1/standard/bcm-2xxx-rpi 057bfcb3634c v6.1/standard/preempt-rt/bcm-2xxx-rpi ead5553409d5 v6.1/standard/nxp-sdk-5.15/nxp-s32g d34833412df0 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 5045330626d9 v6.1/standard/intel-sdk-6.1/intel-socfpga 7f0c89d64d28 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga c8d32a06fe05 v6.1/standard/x86 34877dbed805 v6.1/standard/preempt-rt/x86 85403683e574 v6.1/standard/sdkv6.1/xlnx-soc 90c49403a6d5 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc This is based on previous trial merge of v6.1.36 and there is no any merge conflict. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12841): https://lists.yoctoproject.org/g/linux-yocto/message/12841 Mute This Topic: https://lists.yoctoproject.org/mt/99918487/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v6.1.39 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v6.1.39 for the following branches in the linux-yocto. c15aedac6560 v6.1/standard/base 05252966a8da v6.1/standard/preempt-rt/base #Have textual conflicts 203bcd45f90c v6.1/standard/ti-sdk-6.1/ti-j7xxx 0040816c8c4b v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx #Have textual conflicts 1ba4f7be v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts 27db06c3eb69 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts b8e1985498e0 v6.1/standard/cn-sdkv5.15/octeon #Have textual conflicts 0a48762a7eaf v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts 4e9ca7028c63 v6.1/standard/bcm-2xxx-rpi #Have textual and semantic conflicts cf277331fd11 v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual and semantic conflicts b5a8248a926c v6.1/standard/nxp-sdk-5.15/nxp-s32g c7a73778d2f1 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have textual conflicts 03a9ebef451a v6.1/standard/intel-sdk-6.1/intel-socfpga #Have textual conflicts 7bab4820cbe3 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga #Have textual conflicts bcc2fb463237 v6.1/standard/x86 b5b938edc4f1 v6.1/standard/preempt-rt/x86 #Have textual conflicts ca5e4cce220f v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 13f75d49c376 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts The v6.1.39 is a rather significant release, consisting of 588 patches. As expected, it also brings along a substantial number of nasty merge conflicts. I hope I have correctly resolved every merge conflict. I also observed a build failure on the octeon branches, but it has nothing to do with the stable release and Ruiqiang is working on it. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12879): https://lists.yoctoproject.org/g/linux-yocto/message/12879 Mute This Topic: https://lists.yoctoproject.org/mt/100271615/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.121 v6.1.40 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.121, v6.1.40 for the following branches in the linux-yocto. d217e2a854d4 v5.15/standard/sdkv5.10/axxia 87668f21cf3e v5.15/standard/preempt-rt/sdkv5.10/axxia 741b4b2f75d6 v5.15/standard/base 0671c2b097f9 v5.15/standard/preempt-rt/base 72c068afdef2 v5.15/standard/cn-sdkv5.4/octeon #Have textual conflicts e3a5409014fb v5.15/standard/preempt-rt/cn-sdkv5.4/octeon #Have textual conflicts 6cc0329067f5 v5.15/standard/cn-sdkv5.15/octeon #Have textual conflicts c9aa67382434 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts f5c196cb149b v5.15/standard/ti-sdk-5.10/ti-j72xx 61b8153246cc v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 081ba450a5a2 v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual conflicts 00f727cbeb8a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual conflicts 6067ef73583d v5.15/standard/bcm-2xxx-rpi #Have textual conflicts c5ca3432b058 v5.15/standard/preempt-rt/bcm-2xxx-rpi 3f236de14502 v5.15/standard/nxp-sdk-5.15/nxp-s32g #Have textual conflicts 01da3ce9a9fb v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have textual conflicts 03cfbfd82626 v5.15/standard/intel-sdk-5.15/intel-socfpga b5d7406d5892 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga a6ecf7bf4884 v5.15/standard/x86 7b7760412f79 v5.15/standard/preempt-rt/x86 1c0fa8eb75b0 v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts 484ec5d4b1c1 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts 9733c76a8307 v6.1/standard/base d97848ab180d v6.1/standard/preempt-rt/base e59d16ddff6b v6.1/standard/ti-sdk-6.1/ti-j7xxx 0d1f76818198 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx bc6b53464601 v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts 712a6a169928 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts a7d3b18a0d38 v6.1/standard/cn-sdkv5.15/octeon #Have textual conflicts 827e3f24f17d v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts bc11dde7a1fe v6.1/standard/bcm-2xxx-rpi #Have textual conflicts 462713ae74c6 v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts b4a1da61cd40 v6.1/standard/nxp-sdk-5.15/nxp-s32g ae88d9a5dcdb v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g f669476e795a v6.1/standard/intel-sdk-6.1/intel-socfpga 0ed4e1ad0eb9 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga af0f4c06ac02 v6.1/standard/x86 3121b4220b87 v6.1/standard/preempt-rt/x86 3682b3ab6a66 v6.1/standard/sdkv6.1/xlnx-soc bfb26786826e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc The v5.15.121 is another significant release, comprising 532 patches. While it does introduce a substantial number of merge conflicts, most of them appear to be quite trivial. The merge of v6.1.40 is built upon the merge of v6.1.39, which I previously sent out. In comparison to the v6.1.39, the merge of v6.1.40 is much simpler. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12885): https://lists.yoctoproject.org/g/linux-yocto/message/12885 Mute This Topic: https://lists.yoctoproject.org/mt/100324448/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.122 v6.1.41 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.122, v6.1.41 for the following branches in the linux-yocto. d38427e0013a v5.15/standard/sdkv5.10/axxia a3db6ee10415 v5.15/standard/preempt-rt/sdkv5.10/axxia b3e8ac8b7f02 v5.15/standard/base 5caf0816c30c v5.15/standard/preempt-rt/base 44863ef29a71 v5.15/standard/cn-sdkv5.4/octeon cc9e4d71ada9 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 45f03ac08fc4 v5.15/standard/cn-sdkv5.15/octeon b266a5a507ff v5.15/standard/preempt-rt/cn-sdkv5.15/octeon bb06010d5b53 v5.15/standard/ti-sdk-5.10/ti-j72xx 8b36f8a3442a v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx e984077ce475 v5.15/standard/nxp-sdk-5.15/nxp-soc 1cb7a5aa3782 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 4ed2aa2329fc v5.15/standard/bcm-2xxx-rpi 0c9abb54cf43 v5.15/standard/preempt-rt/bcm-2xxx-rpi 246f68e45f1a v5.15/standard/nxp-sdk-5.15/nxp-s32g 658b0e1fe1f5 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 8b739d12c141 v5.15/standard/intel-sdk-5.15/intel-socfpga 4dd3a43b8a0f v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga ad43c09945d2 v5.15/standard/x86 abd88d256647 v5.15/standard/preempt-rt/x86 563cee47571f v5.15/standard/sdkv5.15/xlnx-soc 22f4b58dccb2 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 0e00824c2ddd v6.1/standard/base 855520766c1e v6.1/standard/preempt-rt/base 43eaaf66e7e7 v6.1/standard/ti-sdk-6.1/ti-j7xxx 92b2b64f3133 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx 24798686310e v6.1/standard/nxp-sdk-6.1/nxp-soc 2723672e9423 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc e04929a38d46 v6.1/standard/cn-sdkv5.15/octeon 5fbd011a88ac v6.1/standard/preempt-rt/cn-sdkv5.15/octeon dedf621fee71 v6.1/standard/bcm-2xxx-rpi a1ef3635128a v6.1/standard/preempt-rt/bcm-2xxx-rpi 72e6d1fc8fa7 v6.1/standard/nxp-sdk-5.15/nxp-s32g 3c8a32a2c1e3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g f2ad20ab6fc1 v6.1/standard/intel-sdk-6.1/intel-socfpga 1ed53e59a652 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga cb7525e76e51 v6.1/standard/x86 2cd9ce573d97 v6.1/standard/preempt-rt/x86 b8623acf7d24 v6.1/standard/sdkv6.1/xlnx-soc e58bd2b9f577 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc This is a pretty minor stable release, only two patches for the AMD cpu. No merge conflict. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12886): https://lists.yoctoproject.org/g/linux-yocto/message/12886 Mute This Topic: https://lists.yoctoproject.org/mt/100341996/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] i2c: xiic: Drop the duplicate codes introduced by stable merge
From: Kevin Hao
After the merge of stable v5.15.122 stable kernel (commit 4900bde55da2),
two blocks to handle the BNB (bus not busy) interrupt were introduced.
One was added by SDK commit 622176d24add ("i2c: xiic: Fix Tx Interrupt
path for grouped messages"), and the other was added by stable commit
9eaef43fef90 ("i2c: xiic: Defer xiic_wakeup() and __xiic_start_xfer() in
xiic_process()"). So drop the codes introduced by the SDK commit and
also restore a bug fix in the original code introduced by SDK commit
19d54cfd5ccb ("i2c: xiic: Add smbus_block_read functionality").
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/sdkv5.15/xlnx-soc
v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
drivers/i2c/busses/i2c-xiic.c | 29 ++---
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index c63cd2e50e13..c490f0ee250e 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -700,6 +700,12 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
/* The bus is not busy, disable BusNotBusy interrupt */
xiic_irq_dis(i2c, XIIC_INTR_BNB_MASK);
+ if (i2c->tx_msg && i2c->smbus_block_read) {
+ i2c->smbus_block_read = false;
+ /* Set requested message len=1 to indicate STATE_DONE */
+ i2c->tx_msg->len = 1;
+ }
+
if (!i2c->tx_msg)
goto out;
@@ -751,29 +757,6 @@ static irqreturn_t xiic_process(int irq, void *dev_id)
xiic_irq_dis(i2c, XIIC_INTR_TX_HALF_MASK);
}
- if (pend & XIIC_INTR_BNB_MASK) {
- /* IIC bus has transitioned to not busy */
- clr |= XIIC_INTR_BNB_MASK;
-
- /* The bus is not busy, disable BusNotBusy interrupt */
- xiic_irq_dis(i2c, XIIC_INTR_BNB_MASK);
-
- if (i2c->tx_msg && i2c->smbus_block_read) {
- i2c->smbus_block_read = false;
- /* Set requested message len=1 to indicate STATE_DONE */
- i2c->tx_msg->len = 1;
- }
-
- if (!i2c->tx_msg)
- goto out;
-
- if (i2c->nmsgs == 1 && !i2c->rx_msg &&
- xiic_tx_space(i2c) == 0)
- xiic_wakeup(i2c, STATE_DONE);
- else
- xiic_wakeup(i2c, STATE_ERROR);
- }
-
out:
dev_dbg(i2c->adap.dev.parent, "%s clr: 0x%x\n", __func__, clr);
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12896):
https://lists.yoctoproject.org/g/linux-yocto/message/12896
Mute This Topic: https://lists.yoctoproject.org/mt/100385712/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] resctrl: Drop the duplicate codes introduced by stable merge
From: Kevin Hao
For the octeon branches, most of the codes for resctrl were moved to
fs/resctrl. After the merge of stable v6.1.39 (commit 6f694c30dc0d),
some duplicate codes slipped into arch/x86/kernel/cpu/resctrl/rdtgroup.c.
So drop all of them. Also reapply the changes in stable commit
c0df91653586 ("x86/resctrl: Only show tasks' pid in current pid
namespace") to fs/resctrl/rdtgroup.c.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/cn-sdkv5.15/octeon
v6.1/standard/preempt-rt/cn-sdkv5.15/octeon
arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1506
fs/resctrl/rdtgroup.c |8 +-
2 files changed, 6 insertions(+), 1508 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 1313ebbf2cb3..3cf1ff745619 100644
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -70,1512 +70,6 @@ void resctrl_arch_sync_cpu_defaults(void *info)
resctrl_sched_in(current);
}
-/*
- * Update the PGR_ASSOC MSR on all cpus in @cpu_mask,
- *
- * Per task closids/rmids must have been set up before calling this function.
- */
-static void
-update_closid_rmid(const struct cpumask *cpu_mask, struct rdtgroup *r)
-{
- int cpu = get_cpu();
-
- if (cpumask_test_cpu(cpu, cpu_mask))
- update_cpu_closid_rmid(r);
- smp_call_function_many(cpu_mask, update_cpu_closid_rmid, r, 1);
- put_cpu();
-}
-
-static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,
- cpumask_var_t tmpmask)
-{
- struct rdtgroup *prgrp = rdtgrp->mon.parent, *crgrp;
- struct list_head *head;
-
- /* Check whether cpus belong to parent ctrl group */
- cpumask_andnot(tmpmask, newmask, &prgrp->cpu_mask);
- if (!cpumask_empty(tmpmask)) {
- rdt_last_cmd_puts("Can only add CPUs to mongroup that belong to
parent\n");
- return -EINVAL;
- }
-
- /* Check whether cpus are dropped from this group */
- cpumask_andnot(tmpmask, &rdtgrp->cpu_mask, newmask);
- if (!cpumask_empty(tmpmask)) {
- /* Give any dropped cpus to parent rdtgroup */
- cpumask_or(&prgrp->cpu_mask, &prgrp->cpu_mask, tmpmask);
- update_closid_rmid(tmpmask, prgrp);
- }
-
- /*
-* If we added cpus, remove them from previous group that owned them
-* and update per-cpu rmid
-*/
- cpumask_andnot(tmpmask, newmask, &rdtgrp->cpu_mask);
- if (!cpumask_empty(tmpmask)) {
- head = &prgrp->mon.crdtgrp_list;
- list_for_each_entry(crgrp, head, mon.crdtgrp_list) {
- if (crgrp == rdtgrp)
- continue;
- cpumask_andnot(&crgrp->cpu_mask, &crgrp->cpu_mask,
- tmpmask);
- }
- update_closid_rmid(tmpmask, rdtgrp);
- }
-
- /* Done pushing/pulling - update this group with new mask */
- cpumask_copy(&rdtgrp->cpu_mask, newmask);
-
- return 0;
-}
-
-static void cpumask_rdtgrp_clear(struct rdtgroup *r, struct cpumask *m)
-{
- struct rdtgroup *crgrp;
-
- cpumask_andnot(&r->cpu_mask, &r->cpu_mask, m);
- /* update the child mon group masks as well*/
- list_for_each_entry(crgrp, &r->mon.crdtgrp_list, mon.crdtgrp_list)
- cpumask_and(&crgrp->cpu_mask, &r->cpu_mask, &crgrp->cpu_mask);
-}
-
-static int cpus_ctrl_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,
- cpumask_var_t tmpmask, cpumask_var_t tmpmask1)
-{
- struct rdtgroup *r, *crgrp;
- struct list_head *head;
-
- /* Check whether cpus are dropped from this group */
- cpumask_andnot(tmpmask, &rdtgrp->cpu_mask, newmask);
- if (!cpumask_empty(tmpmask)) {
- /* Can't drop from default group */
- if (rdtgrp == &rdtgroup_default) {
- rdt_last_cmd_puts("Can't drop CPUs from default
group\n");
- return -EINVAL;
- }
-
- /* Give any dropped cpus to rdtgroup_default */
- cpumask_or(&rdtgroup_default.cpu_mask,
- &rdtgroup_default.cpu_mask, tmpmask);
- update_closid_rmid(tmpmask, &rdtgroup_default);
- }
-
- /*
-* If we added cpus, remove them from previous group and
-* the prev group's child groups that owned them
-* and update per-cpu closid/rmid.
-*/
- cpumask_andnot(tmpmask, newmask, &rdtgrp->cpu_mask);
- if (!cpumask_empty(tmpmask)) {
- list_for_each_entry
[linux-yocto] [linux-yocto PATCH] drm/panel: Replace pre_enable_upstream_first with pre_enable_prev_first
From: Kevin Hao
Two similar commit ea4c35c84386 ("drm/bridge: Introduce
pre_enable_upstream_first to alter bridge init order") and commit
5044e5f2511c ("drm/bridge: Introduce pre_enable_prev_first to alter
bridge init order") were from SDK and stable respectively and provide
almost the same function except the difference in the variable name.
During the merge of stable kernel, we have chosen the implementation of
the stable kernel. Beside that, we also need to change all the usage of
panel_bridge::pre_enable_upstream_first to
panel_bridge::pre_enable_prev_first.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/bcm-2xxx-rpi
v6.1/standard/preempt-rt/bcm-2xxx-rpi
drivers/gpu/drm/bridge/panel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
index 0c1dcf85ed13..ea2b3ba307bb 100644
--- a/drivers/gpu/drm/bridge/panel.c
+++ b/drivers/gpu/drm/bridge/panel.c
@@ -258,7 +258,7 @@ struct drm_bridge *drm_panel_bridge_add_typed(struct
drm_panel *panel,
panel_bridge->bridge.ops = DRM_BRIDGE_OP_MODES;
panel_bridge->bridge.type = connector_type;
- panel_bridge->bridge.pre_enable_upstream_first =
+ panel_bridge->bridge.pre_enable_prev_first =
panel->prepare_upstream_first;
drm_bridge_add(&panel_bridge->bridge);
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12898):
https://lists.yoctoproject.org/g/linux-yocto/message/12898
Mute This Topic: https://lists.yoctoproject.org/mt/100385770/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.121 v6.1.40 for linux-yocto
On Mon, Jul 24, 2023 at 02:40:14PM +0800, Kevin Hao wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.121, v6.1.40 for the > following branches in the linux-yocto. > d217e2a854d4 v5.15/standard/sdkv5.10/axxia > 87668f21cf3e v5.15/standard/preempt-rt/sdkv5.10/axxia > 741b4b2f75d6 v5.15/standard/base > 0671c2b097f9 v5.15/standard/preempt-rt/base > 72c068afdef2 v5.15/standard/cn-sdkv5.4/octeon >#Have textual conflicts > e3a5409014fb v5.15/standard/preempt-rt/cn-sdkv5.4/octeon >#Have textual conflicts > 6cc0329067f5 v5.15/standard/cn-sdkv5.15/octeon >#Have textual conflicts > c9aa67382434 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon >#Have textual conflicts > f5c196cb149b v5.15/standard/ti-sdk-5.10/ti-j72xx > 61b8153246cc v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > 081ba450a5a2 v5.15/standard/nxp-sdk-5.15/nxp-soc >#Have textual conflicts > 00f727cbeb8a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc >#Have textual conflicts > 6067ef73583d v5.15/standard/bcm-2xxx-rpi >#Have textual conflicts > c5ca3432b058 v5.15/standard/preempt-rt/bcm-2xxx-rpi > 3f236de14502 v5.15/standard/nxp-sdk-5.15/nxp-s32g >#Have textual conflicts > 01da3ce9a9fb v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g >#Have textual conflicts > 03cfbfd82626 v5.15/standard/intel-sdk-5.15/intel-socfpga > b5d7406d5892 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > a6ecf7bf4884 v5.15/standard/x86 > 7b7760412f79 v5.15/standard/preempt-rt/x86 > 1c0fa8eb75b0 v5.15/standard/sdkv5.15/xlnx-soc >#Have textual conflicts > 484ec5d4b1c1 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc >#Have textual conflicts > 9733c76a8307 v6.1/standard/base > d97848ab180d v6.1/standard/preempt-rt/base > e59d16ddff6b v6.1/standard/ti-sdk-6.1/ti-j7xxx > 0d1f76818198 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > bc6b53464601 v6.1/standard/nxp-sdk-6.1/nxp-soc >#Have textual conflicts > 712a6a169928 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc >#Have textual conflicts > a7d3b18a0d38 v6.1/standard/cn-sdkv5.15/octeon >#Have textual conflicts > 827e3f24f17d v6.1/standard/preempt-rt/cn-sdkv5.15/octeon >#Have textual conflicts > bc11dde7a1fe v6.1/standard/bcm-2xxx-rpi >#Have textual conflicts > 462713ae74c6 v6.1/standard/preempt-rt/bcm-2xxx-rpi >#Have textual conflicts > b4a1da61cd40 v6.1/standard/nxp-sdk-5.15/nxp-s32g > ae88d9a5dcdb v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > f669476e795a v6.1/standard/intel-sdk-6.1/intel-socfpga > 0ed4e1ad0eb9 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > af0f4c06ac02 v6.1/standard/x86 > 3121b4220b87 v6.1/standard/preempt-rt/x86 > 3682b3ab6a66 v6.1/standard/sdkv6.1/xlnx-soc > bfb26786826e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc It seems that several my resolution for the merge conflicts didn't propagate to your final merge. I have sent 3 addon patches [1] [2] [3] to fix them. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12896 [2] https://lists.yoctoproject.org/g/linux-yocto/message/12897 [3] https://lists.yoctoproject.org/g/linux-yocto/message/12898 Thanks, Kevin > > The v5.15.121 is another significant release, comprising 532 patches. While > it does > introduce a substantial number of merge conflicts, most of them appear to be > quite > trivial. The merge of v6.1.40 is built upon the merge of v6.1.39, which I > previously > sent out. In comparison to the v6.1.39, the merge of v6.1.40 is much simpler. > All the branches have passed my build test. I have pushed all these branches > to: > https://github.com/haokexin/linux > > You can use this as a reference for the linux-yocto stable kernel bump. > > Thanks, > Kevin signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12899): https://lists.yoctoproject.org/g/linux-yocto/message/12899 Mute This Topic: https://lists.yoctoproject.org/mt/100324448/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] Trial merge of v5.15.123 v6.1.42 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.123 v6.1.42 for the following branches in the linux-yocto. 0333c30a756c v5.15/standard/sdkv5.10/axxia 2607b7ad4254 v5.15/standard/preempt-rt/sdkv5.10/axxia e381e588ec6a v5.15/standard/base 4aaeace61a86 v5.15/standard/preempt-rt/base a1ef3f0a58a6 v5.15/standard/cn-sdkv5.4/octeon e334912b2c3c v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 75af4b742183 v5.15/standard/cn-sdkv5.15/octeon 6746fad155be v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 6a0f35462b12 v5.15/standard/ti-sdk-5.10/ti-j72xx ff425fd246a6 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx a668d30d173e v5.15/standard/nxp-sdk-5.15/nxp-soc a9e2ccfd999e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc 60041279642c v5.15/standard/bcm-2xxx-rpi 03e5da92a1c1 v5.15/standard/preempt-rt/bcm-2xxx-rpi fee7c783d20f v5.15/standard/nxp-sdk-5.15/nxp-s32g 77d6fd343a85 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g 431c277ac6e1 v5.15/standard/intel-sdk-5.15/intel-socfpga ea1e52fac175 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 3018600339fe v5.15/standard/x86 81e6e569c834 v5.15/standard/preempt-rt/x86 3cfee5fa614c v5.15/standard/sdkv5.15/xlnx-soc 7872c123a4f2 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc 6dd549204df6 v6.1/standard/base 19ffac6a609a v6.1/standard/preempt-rt/base fc4f6cc937a9 v6.1/standard/ti-sdk-6.1/ti-j7xxx 5ee0c53bfba6 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx d796b2cb25ad v6.1/standard/nxp-sdk-6.1/nxp-soc fbc2a2a26b5a v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 665edc554a6f v6.1/standard/cn-sdkv5.15/octeon 7ba1c9b913a7 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon 805bef2b9eb1 v6.1/standard/bcm-2xxx-rpi b22b191c09fa v6.1/standard/preempt-rt/bcm-2xxx-rpi 3d39cf48f866 v6.1/standard/nxp-sdk-5.15/nxp-s32g 4c9ff60cc8ba v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g f87d5b9dff98 v6.1/standard/intel-sdk-6.1/intel-socfpga cd241e516b92 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 1c297f2298df v6.1/standard/x86 3e9a7adc9b30 v6.1/standard/preempt-rt/x86 74c93054df29 v6.1/standard/sdkv6.1/xlnx-soc 22e48a7bdd90 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc This is a perfect stable release without any merge conflict or build failure. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12901): https://lists.yoctoproject.org/g/linux-yocto/message/12901 Mute This Topic: https://lists.yoctoproject.org/mt/100386674/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.121 v6.1.40 for linux-yocto
On Thu, Jul 27, 2023 at 09:18:19AM -0400, Bruce Ashfield wrote: > On Thu, Jul 27, 2023 at 9:15 AM Bruce Ashfield via > lists.yoctoproject.org > wrote: > > > > On Thu, Jul 27, 2023 at 2:20 AM Kevin Hao wrote: > > > > > > On Mon, Jul 24, 2023 at 02:40:14PM +0800, Kevin Hao wrote: > > > > Hi Bruce, > > > > > > > > This is a trial merge of the stable kernel v5.15.121, v6.1.40 for the > > > > following branches in the linux-yocto. > > > > d217e2a854d4 v5.15/standard/sdkv5.10/axxia > > > > 87668f21cf3e v5.15/standard/preempt-rt/sdkv5.10/axxia > > > > 741b4b2f75d6 v5.15/standard/base > > > > 0671c2b097f9 v5.15/standard/preempt-rt/base > > > > 72c068afdef2 v5.15/standard/cn-sdkv5.4/octeon > > > > #Have textual conflicts > > > > e3a5409014fb v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > > > #Have textual conflicts > > > > 6cc0329067f5 v5.15/standard/cn-sdkv5.15/octeon > > > > #Have textual conflicts > > > > c9aa67382434 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > > > #Have textual conflicts > > > > f5c196cb149b v5.15/standard/ti-sdk-5.10/ti-j72xx > > > > 61b8153246cc v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > > > 081ba450a5a2 v5.15/standard/nxp-sdk-5.15/nxp-soc > > > > #Have textual conflicts > > > > 00f727cbeb8a v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > > > #Have textual conflicts > > > > 6067ef73583d v5.15/standard/bcm-2xxx-rpi > > > > #Have textual conflicts > > > > c5ca3432b058 v5.15/standard/preempt-rt/bcm-2xxx-rpi > > > > 3f236de14502 v5.15/standard/nxp-sdk-5.15/nxp-s32g > > > > #Have textual conflicts > > > > 01da3ce9a9fb v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > > > #Have textual conflicts > > > > 03cfbfd82626 v5.15/standard/intel-sdk-5.15/intel-socfpga > > > > b5d7406d5892 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > > > a6ecf7bf4884 v5.15/standard/x86 > > > > 7b7760412f79 v5.15/standard/preempt-rt/x86 > > > > 1c0fa8eb75b0 v5.15/standard/sdkv5.15/xlnx-soc > > > > #Have textual conflicts > > > > 484ec5d4b1c1 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > > > #Have textual conflicts > > > > 9733c76a8307 v6.1/standard/base > > > > d97848ab180d v6.1/standard/preempt-rt/base > > > > e59d16ddff6b v6.1/standard/ti-sdk-6.1/ti-j7xxx > > > > 0d1f76818198 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > > > > bc6b53464601 v6.1/standard/nxp-sdk-6.1/nxp-soc > > > > #Have textual conflicts > > > > 712a6a169928 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > > > #Have textual conflicts > > > > a7d3b18a0d38 v6.1/standard/cn-sdkv5.15/octeon > > > > #Have textual conflicts > > > > 827e3f24f17d v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > > > #Have textual conflicts > > > > bc11dde7a1fe v6.1/standard/bcm-2xxx-rpi > > > > #Have textual conflicts > > > > 462713ae74c6 v6.1/standard/preempt-rt/bcm-2xxx-rpi > > > > #Have textual conflicts > > > > b4a1da61cd40 v6.1/standard/nxp-sdk-5.15/nxp-s32g > > > > ae88d9a5dcdb v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > > > f669476e795a v6.1/standard/intel-sdk-6.1/intel-socfpga > > > > 0ed4e1ad0eb9 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > > > > af0f4c06ac02 v6.1/standard/x86 > > > > 3121b4220b87 v6.1/standard/preempt-rt/x86 > > > > 3682b3ab6a66 v6.1/standard/sdkv6.1/xlnx-soc > > > > bfb26786826e v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > > > > > It seems that several my resolution for the merge conflicts didn't > > > propagate to your > > > final merge. I have sent 3 addon patches [1] [2] [3] to fix them. > > > > > > > I can't actually use your merge resolutions, so all of the merges are > > just done o
[linux-yocto] Trial merge of v5.15.124 v6.1.43 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.124 v6.1.43 for the following branches in the linux-yocto. 2c2ea4b6dc52 v5.15/standard/sdkv5.10/axxia fdaa6dbceddc v5.15/standard/preempt-rt/sdkv5.10/axxia 821af899511f v5.15/standard/base b6ee805bd511 v5.15/standard/preempt-rt/base 962ade79d73c v5.15/standard/cn-sdkv5.4/octeon b64354196762 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon a1a37982704e v5.15/standard/cn-sdkv5.15/octeon 9c4226add92a v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 05c5b6733011 v5.15/standard/ti-sdk-5.10/ti-j72xx 3b9d2b7635a8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx 3ecd60e382a0 v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual conflicts 9d06de49b7a7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual conflicts f37d75f635c1 v5.15/standard/bcm-2xxx-rpi #Have textual conflicts 3a7a78ebc394 v5.15/standard/preempt-rt/bcm-2xxx-rpi 37b7dbf186f5 v5.15/standard/nxp-sdk-5.15/nxp-s32g 21354ed99b4e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g ca7153ffb57d v5.15/standard/intel-sdk-5.15/intel-socfpga 1cb259f7b300 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga 13fcf728a848 v5.15/standard/x86 2021d510763b v5.15/standard/preempt-rt/x86 e07ecdfb95d5 v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts cb1c0389b8ae v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts 9ce3102d374e v6.1/standard/base 32577835e6cc v6.1/standard/preempt-rt/base c56fe4f54ee9 v6.1/standard/ti-sdk-6.1/ti-j7xxx 9cfc5bce4ec4 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx d2829f0717cf v6.1/standard/nxp-sdk-6.1/nxp-soc d381f891de33 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc 3d78c3498338 v6.1/standard/cn-sdkv5.15/octeon #Have textual conflicts 6ae6a3fb0ec0 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon #Have textual conflicts 82688a4beb53 v6.1/standard/bcm-2xxx-rpi #Have textual conflicts 82726569e63b v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts 5f1eeeb0964a v6.1/standard/nxp-sdk-5.15/nxp-s32g #Have textual conflicts dd288b2732d3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g #Have textual conflicts d6782e78fa9c v6.1/standard/intel-sdk-6.1/intel-socfpga 0043b66f81f3 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga 2f3bf45beefc v6.1/standard/x86 4fd513c22742 v6.1/standard/preempt-rt/x86 719f4a7b31c1 v6.1/standard/sdkv6.1/xlnx-soc #Have textual conflicts 4583b2be504d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual conflicts This seems a normal stable release. There are several merge conflicts, but none of them seems too nasty. All the branches have passed my build test. I have pushed all these branches to: https://github.com/haokexin/linux You can use this as a reference for the linux-yocto stable kernel bump. Thanks, Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12918): https://lists.yoctoproject.org/g/linux-yocto/message/12918 Mute This Topic: https://lists.yoctoproject.org/mt/100526999/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] usb: dwc3: Drop the dangling DWC3_GUCTL_HSTINAUTORETRY
From: Kevin Hao
The DWC3_GUCTL_HSTINAUTORETRY has been deleted by stable commit
a2d2fa661293 ("Revert "usb: dwc3: core: Enable AutoRetry feature in the
controller""), but due to the merge conflict, we didn't delete all of
them in the final code.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/nxp-sdk-5.15/nxp-soc
v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc
drivers/usb/dwc3/core.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index d5ec930db5c7..0e5d348269cd 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -271,7 +271,6 @@
#define DWC3_GCTL_DSBLCLKGTNG BIT(0)
/* Global User Control Register */
-#define DWC3_GUCTL_HSTINAUTORETRY BIT(14)
#define DWC3_GUCTL_REFCLKPER_MASK GENMASK(31, 22)
#define DWC3_GUCTL_REFCLKPER_SHIFT 22
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12920):
https://lists.yoctoproject.org/g/linux-yocto/message/12920
Mute This Topic: https://lists.yoctoproject.org/mt/100537799/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] xhci: Fix the merge errors in xhci_pci_quirks()
From: Kevin Hao
When merging the stable commit dd125fcd580a ("Revert "xhci: add quirk
for host controllers that don't update endpoint DCS""), the changes in
it conflict with the SDK patches. The final merge resolution is
incorrect. So fix the build errors caused by the merge:
- Add the missing '{' for the if statement
- Drop the code deleted by commit dd125fcd580a
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following three branches:
v5.15/standard/bcm-2xxx-rpi
v6.1/standard/bcm-2xxx-rpi
v6.1/standard/preempt-rt/bcm-2xxx-rpi
drivers/usb/host/xhci-pci.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 3106ea34dc6e..efcfd7a2a1ba 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -294,9 +294,8 @@ static void xhci_pci_quirks(struct device *dev, struct
xhci_hcd *xhci)
pdev->device == 0x3432)
xhci->quirks |= XHCI_BROKEN_STREAMS;
- if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483)
+ if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) {
xhci->quirks |= XHCI_LPM_SUPPORT;
- xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK;
xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG;
xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12921):
https://lists.yoctoproject.org/g/linux-yocto/message/12921
Mute This Topic: https://lists.yoctoproject.org/mt/100537901/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] usb: dwc3: Restore the SDK changes in dwc3_core_soft_reset()
From: Kevin Hao
When merging the stable commit c1fad1695bef ("usb: dwc3: don't reset
device side if dwc3 was configured as host-only"), part changes of the
SDK commit c2b324f9c878 ("usb: dwc3: don't setup event buffers when
operating in host mode") has been accidentally deleted. Restore them.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following four branches:
v5.15/standard/sdkv5.15/xlnx-soc
v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
v6.1/standard/sdkv6.1/xlnx-soc
v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc
drivers/usb/dwc3/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 7dc88ac9d686..0d5a54f3b148 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -266,8 +266,10 @@ int dwc3_core_soft_reset(struct dwc3 *dwc)
* We're resetting only the device side because, if we're in host mode,
* XHCI driver will reset the host block. If dwc3 was configured for
* host-only mode or current role is host, then we can return early.
+* When hibernated don't perform core soft reset.
*/
- if (dwc->dr_mode == USB_DR_MODE_HOST || dwc->current_dr_role ==
DWC3_GCTL_PRTCAP_HOST)
+ if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST ||
+ dwc->is_hibernated == true || dwc->dr_mode == USB_DR_MODE_HOST)
return 0;
reg = dwc3_readl(dwc->regs, DWC3_DCTL);
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12922):
https://lists.yoctoproject.org/g/linux-yocto/message/12922
Mute This Topic: https://lists.yoctoproject.org/mt/100537957/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] arm64: errata: Fix the designator error for NXP erratum ERR050481
From: Kevin Hao
When fixing the merge conflict of stable commit cde7f2fd6323 ("arm64:
errata: Mitigate Ampere1 erratum AC03_CPU_38 at stage-2"), a '.' was
accidentally deleted for NXP erratum ERR050481. Restore it to fix the
build error.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v6.1/standard/nxp-sdk-5.15/nxp-s32g
v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
arch/arm64/kernel/cpu_errata.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 208eef97f69e..1122131e840e 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -752,7 +752,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
#endif
#ifdef CONFIG_NXP_S32CC_ERRATUM_ERR050481
{
- desc = "NXP erratum ERR050481 (TLBI handled incorrectly)",
+ .desc = "NXP erratum ERR050481 (TLBI handled incorrectly)",
.capability = ARM64_WORKAROUND_NXP_ERR050481,
.type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
.matches = has_nxp_s32cc_erratum_err050481,
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12923):
https://lists.yoctoproject.org/g/linux-yocto/message/12923
Mute This Topic: https://lists.yoctoproject.org/mt/100538003/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] Trial merge of v5.15.124 v6.1.43 for linux-yocto
On Thu, Aug 03, 2023 at 01:48:10PM -0400, Bruce Ashfield wrote: > On Thu, Aug 3, 2023 at 10:26 AM Kevin Hao wrote: > > > > Hi Bruce, > > > > This is a trial merge of the stable kernel v5.15.124 v6.1.43 for the > > following branches in the linux-yocto. > > 2c2ea4b6dc52 v5.15/standard/sdkv5.10/axxia > > fdaa6dbceddc v5.15/standard/preempt-rt/sdkv5.10/axxia > > 821af899511f v5.15/standard/base > > b6ee805bd511 v5.15/standard/preempt-rt/base > > 962ade79d73c v5.15/standard/cn-sdkv5.4/octeon > > b64354196762 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > > a1a37982704e v5.15/standard/cn-sdkv5.15/octeon > > 9c4226add92a v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > > 05c5b6733011 v5.15/standard/ti-sdk-5.10/ti-j72xx > > 3b9d2b7635a8 v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > > 3ecd60e382a0 v5.15/standard/nxp-sdk-5.15/nxp-soc > > #Have textual conflicts > > 9d06de49b7a7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > > #Have textual conflicts > > f37d75f635c1 v5.15/standard/bcm-2xxx-rpi > > #Have textual conflicts > > 3a7a78ebc394 v5.15/standard/preempt-rt/bcm-2xxx-rpi > > 37b7dbf186f5 v5.15/standard/nxp-sdk-5.15/nxp-s32g > > 21354ed99b4e v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > ca7153ffb57d v5.15/standard/intel-sdk-5.15/intel-socfpga > > 1cb259f7b300 v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > > 13fcf728a848 v5.15/standard/x86 > > 2021d510763b v5.15/standard/preempt-rt/x86 > > e07ecdfb95d5 v5.15/standard/sdkv5.15/xlnx-soc > > #Have textual conflicts > > cb1c0389b8ae v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > > #Have textual conflicts > > 9ce3102d374e v6.1/standard/base > > 32577835e6cc v6.1/standard/preempt-rt/base > > c56fe4f54ee9 v6.1/standard/ti-sdk-6.1/ti-j7xxx > > 9cfc5bce4ec4 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx > > d2829f0717cf v6.1/standard/nxp-sdk-6.1/nxp-soc > > d381f891de33 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > > 3d78c3498338 v6.1/standard/cn-sdkv5.15/octeon > > #Have textual conflicts > > 6ae6a3fb0ec0 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > #Have textual conflicts > > 82688a4beb53 v6.1/standard/bcm-2xxx-rpi > > #Have textual conflicts > > 82726569e63b v6.1/standard/preempt-rt/bcm-2xxx-rpi > > #Have textual conflicts > > 5f1eeeb0964a v6.1/standard/nxp-sdk-5.15/nxp-s32g > > #Have textual conflicts > > dd288b2732d3 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > > #Have textual conflicts > > d6782e78fa9c v6.1/standard/intel-sdk-6.1/intel-socfpga > > 0043b66f81f3 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > > 2f3bf45beefc v6.1/standard/x86 > > 4fd513c22742 v6.1/standard/preempt-rt/x86 > > 719f4a7b31c1 v6.1/standard/sdkv6.1/xlnx-soc > > #Have textual conflicts > > 4583b2be504d v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > #Have textual conflicts > > > > This seems a normal stable release. There are several merge conflicts, but > > none > > of them seems too nasty. All the branches have passed my build test. I have > > pushed all these branches to: > > https://github.com/haokexin/linux > > Thanks Kevin, > > I was working through it as well. I did a quick check, and most of the > resolutions looked ok. > > There may be some differences, if i broke a branch you are watching, > let me know. I diffed the final merge between yours and mine and found some issues. I have sent out addon patches to fix them [1] [2] [3] [4]. Please help me merge them. [1] https://lists.yoctoproject.org/g/linux-yocto/message/12920 [2] https://lists.yoctoproject.org/g/linux-yocto/message/12921 [3] https://lists.yoctoproject.org/g/linux-yocto/message/12922 [4] https://lists.yoctoproject.org/g/linux-yocto/message/12923 Thanks, Kevin > > Bruce > > > > > You can use this as a reference for the linux-yocto stable kernel bump. > > > > Thanks, > > Kevin > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await > thee at its end > - "Use the force Harry" - Gandalf, Star Trek II signature.asc Description: PGP signature -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12924): https://lists.yoctoproject.org/g/linux-yocto/message/12924 Mute This Topic: https://lists.yoctoproject.org/mt/100526999/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [linux-yocto PATCH] drivers: mpam: Drop the improper assertions
From: Kevin Hao
The mpam_reprogram_ris_partid() and mpam_reset_ris() may be invoked on a
specific CPU by smp_call_on_cpu(). According to the implementation of
smp_call_on_cpu(), that also means these functions would be executed
in the worker kthread context. Both the
lockdep_assert_preemption_disabled() and lockdep_assert_held()
assertions are not suitable in this context because:
- the lockdep_assert_preemption_disabled() will trigger false positive
since the preempt is enabled in the worker kthread, but it will not
migrate to other CPU since the worker kthread is bound to one CPU.
- the implementation of lockdep_assert_held() is to check the lock
acquired by the current process. So in a worker kthread, it
definitely not acquire the &msc->lock.
Signed-off-by: Kevin Hao
---
Hi Bruce,
Please help me merge this into the following two branches:
v5.15/standard/cn-sdkv5.15/octeon
v5.15/standard/preempt-rt/cn-sdkv5.15/octeon
drivers/platform/mpam/mpam_devices.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/drivers/platform/mpam/mpam_devices.c
b/drivers/platform/mpam/mpam_devices.c
index 6fd355048d99..bd705dfe2498 100644
--- a/drivers/platform/mpam/mpam_devices.c
+++ b/drivers/platform/mpam/mpam_devices.c
@@ -1040,8 +1040,6 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris
*ris, u16 partid,
u16 bwa_fract = GENMASK(15, rprops->bwa_wd);
u16 minval;
- lockdep_assert_held(&msc->lock);
-
spin_lock(&msc->part_sel_lock);
__mpam_part_sel(ris->ris_idx, partid, msc);
@@ -1206,13 +1204,9 @@ static int mpam_save_mbwu_state(void *arg)
static int mpam_reset_ris(void *arg)
{
struct mpam_msc_ris *ris = arg;
- struct mpam_msc *msc = ris->msc;
struct reprogram_ris reprogram_arg;
struct mpam_config empty_cfg = { 0 };
- lockdep_assert_preemption_disabled(); /* don't migrate to another CPU */
- lockdep_assert_held(&msc->lock);
-
if (ris->in_reset_state)
return 0;
--
2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#12962):
https://lists.yoctoproject.org/g/linux-yocto/message/12962
Mute This Topic: https://lists.yoctoproject.org/mt/100679186/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
