Re: [linux-yocto] [yocto-kernel-cache]: nxp-ls104x: add configs of i2c slave devices for NXP ls1043/ls1046 platform
merged. Bruce In message: [yocto-kernel-cache]: nxp-ls104x: add configs of i2c slave devices for NXP ls1043/ls1046 platform on 26/01/2024 Meng Li wrote: > From: Limeng > > Hi Bruce, > > This patch is used to add configs of i2c slave devices for NXP ls1043/ls1046 > platform. > > Could you please help to merge this patch into yocto-kernel-cache, branch is > only yocto-6.1? > > diffstat info as below: > > nxp-ls1043/nxp-ls1043.cfg |5 + > nxp-ls1046/nxp-ls1046.cfg |5 + > 2 files changed, 10 insertions(+) > > > thanks, > Limeng -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13525): https://lists.yoctoproject.org/g/linux-yocto/message/13525 Mute This Topic: https://lists.yoctoproject.org/mt/103968313/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [yocto-6.6][yocto-6.5][master][PATCH] can: drop obsolete CONFIG_PCH_CAN
merged. Bruce In message: [linux-yocto] [yocto-6.6][yocto-6.5][master][PATCH] can: drop obsolete CONFIG_PCH_CAN on 26/01/2024 Anuj Mittal wrote: > The driver was removed in v6.2. > > https://github.com/torvalds/linux/commit/1dd1b521be85417ec409062319520ca26c1c589e > > Signed-off-by: Anuj Mittal > --- > features/can/can.cfg | 2 -- > features/eg20t/eg20t.cfg | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/features/can/can.cfg b/features/can/can.cfg > index a15e6061..d50e8109 100644 > --- a/features/can/can.cfg > +++ b/features/can/can.cfg > @@ -19,8 +19,6 @@ CONFIG_CAN_GS_USB=m > CONFIG_CAN_KVASER_USB=m > CONFIG_CAN_PEAK_USB=m > CONFIG_CAN_8DEV_USB=m > -# x86 PCH > -#CONFIG_PCH_CAN=m > # drivers for ISA/PCI cards > CONFIG_CAN_C_CAN_PCI=m > # Philips/NXP SJA1000 based PCI(e) > diff --git a/features/eg20t/eg20t.cfg b/features/eg20t/eg20t.cfg > index 8bfff936..9c411acf 100644 > --- a/features/eg20t/eg20t.cfg > +++ b/features/eg20t/eg20t.cfg > @@ -30,4 +30,3 @@ CONFIG_GPIO_PCH=y > > CONFIG_CAN=y > CONFIG_CAN_DEV=y > -CONFIG_PCH_CAN=y > -- > 2.43.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13524): https://lists.yoctoproject.org/g/linux-yocto/message/13524 Mute This Topic: https://lists.yoctoproject.org/mt/103968281/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g][PATCH] gpio: fix pinctrl_gpio_get_mux_owner
In message: Re:
[linux-yocto][v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g][PATCH] gpio: fix
pinctrl_gpio_get_mux_owner
on 26/01/2024 Quanyang Wang wrote:
> Hi Bruce,
>
> On 1/24/24 14:38, quanyang.wang via lists.yoctoproject.org wrote:
>
> From: Quanyang Wang
>
> The commit 4ce1995313ecb ("gpio: use pinctrl_gpio_get_mux_owner")
> intends to call pinctrl_gpio_get_mux_owner to mark the muxed pin as
> "used" and copy "mux_owner" or "gpio_owner" to "info->consumer". So that
> when calling gpioinfo at userspace, the "mux_owner" is printed as
> "label" in the output of console:
>
> root@nxp-s32g:~# gpioinfo gpiochip0
> gpiochip0 - 191 lines:
> ...
> line 5: "PA_05" unused input active-high
> line 6: "PA_06" "401d8000.spi" input active-high [used]
> line 7: "PA_07" "401d8000.spi" input active-high [used]
> ...
>
> But there are 3 problems with the current implementation:
> 1. The parameter "gpio" of the function pinctrl_gpio_get_mux_owner
> should be "gc->base + info->offset" rather than "info->offset".
> 2. The member "strict" of s32cc_pmx_ops can be used to mark the flag
> GPIO_V2_LINE_FLAG_USED, so there is no need to use the funciton
> pinctrl_gpio_get_mux_owner to do that.
> 3. The function pinctrl_gpio_get_mux_owner takes mutex so it must be
> called before taking the spinlock, or else it triggers the following
> calltrace:
>
> [ 4640.017246] BUG: sleeping function called from invalid context at
> kernel/locking/rtmutex_api.c:510
> [ 4640.017264] in_atomic(): 0, irqs_disabled(): 0, non_block: 0, pid:
> 11395, name: gpioinfo
> [ 4640.017271] preempt_count: 0, expected: 0
> [ 4640.017276] RCU nest depth: 1, expected: 0
> [ 4640.017281] INFO: lockdep is turned off.
> [ 4640.017290] CPU: 3 PID: 11395 Comm: gpioinfo Tainted: GW O
> 5.15.147-rt72-yocto-preempt-rt #1
> [ 4640.017297] Hardware name: Freescale S32G399A (DT)
> [ 4640.017302] Call trace:
> [ 4640.017304] dump_backtrace+0x0/0x1c0
> [ 4640.017319] show_stack+0x20/0x30
> [ 4640.017325] dump_stack_lvl+0xb0/0xf4
> [ 4640.017335] dump_stack+0x18/0x34
> [ 4640.017342] __might_resched+0x15c/0x1e0
> [ 4640.017351] __might_sleep+0x50/0xa0
> [ 4640.017357] mutex_lock_nested+0x58/0xe0
> [ 4640.017367] pinctrl_get_device_gpio_range+0x48/0x11c
> [ 4640.017378] pinctrl_gpio_get_mux_owner+0x48/0x110
> [ 4640.017386] gpio_desc_to_lineinfo+0x2a8/0x2dc
> [ 4640.017396] lineinfo_get_v1+0x144/0x260
> [ 4640.017405] gpio_ioctl_unlocked+0xf4/0x3d0
> [ 4640.017410] gpio_ioctl+0x4c/0x74
> [ 4640.017415] __arm64_sys_ioctl+0xb0/0xf4
> [ 4640.017424] invoke_syscall+0x5c/0x130
> [ 4640.017437] el0_svc_common.constprop.0+0x68/0x124
> [ 4640.017445] do_el0_svc+0x4c/0xb0
> [ 4640.017452] el0_svc+0x54/0x110
> [ 4640.017458] el0t_64_sync_handler+0xa4/0x12c
> [ 4640.017464] el0t_64_sync+0x1a0/0x1a4
>
> Signed-off-by: Quanyang Wang
> ---
> Hi Bruce,
> Would you please help merge this patch to the branches:
> v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g
> v5.15/standard/nxp-sdk-5.15/nxp-s32g
>
> I can't find this patch in v5.15/standard/nxp-sdk-5.15/nxp-s32g, would you
> please help check it?
I'm not sure what happened, but indeed, I missed that
branch.
It should be fixed now
Bruce
>
> Thanks,
>
> Quanyang
>
> Thanks,
> Quanyang
> ---
> drivers/gpio/gpiolib-cdev.c| 10 +++---
> drivers/pinctrl/freescale/pinctrl-s32cc-core.c | 1 +
> 2 files changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
> index e3b0d1fbd728a..80e8c32d65e12 100644
> --- a/drivers/gpio/gpiolib-cdev.c
> +++ b/drivers/gpio/gpiolib-cdev.c
> @@ -2021,7 +2021,6 @@ static void gpio_desc_to_lineinfo(struct gpio_desc
> *desc,
> unsigned long flags;
> u32 debounce_period_us;
> unsigned int num_attrs = 0;
> - int ret;
>
> memset(info, 0, sizeof(*info));
> info->offset = gpio_chip_hwgpio(desc);
> @@ -2036,6 +2035,9 @@ static void gpio_desc_to_lineinfo(struct gpio_desc
> *desc,
> ok_for_pinctrl =
> pinctrl_gpio_can_use_line(gc->base + info->offset);
>
> + pinctrl_gpio_get_mux_owner(gc->base + info->offset,
> info->consumer,
> +sizeof(info->consumer));
> +
> spin_lock_irqsave(_lock, flags);
>
> if (desc->name)
> @@ -2049,12 +2051,6 @@ static void gpio_desc_to_lineinfo(struct gpio_desc
> *desc,
>
> if (desc->label)
> strscpy(info->consumer, desc->label,
> sizeof(info->consumer));
> -
[linux-yocto] Trial merge of v5.15.148 v6.1.75 for linux-yocto
Hi Bruce, This is a trial merge of the stable kernel v5.15.148 v6.1.75 for the following branches in the linux-yocto. a512a15e82c8 v5.15/standard/sdkv5.10/axxia ce5659a6d6ff v5.15/standard/preempt-rt/sdkv5.10/axxia a9918c33416b v5.15/standard/base be927f5f96e8 v5.15/standard/preempt-rt/base 5622ab199b18 v5.15/standard/cn-sdkv5.4/octeon 85d04875771b v5.15/standard/preempt-rt/cn-sdkv5.4/octeon 5bf05691226a v5.15/standard/cn-sdkv5.15/octeon 557b9885b3d4 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon 399f939e4c6f v5.15/standard/ti-sdk-5.10/ti-j72xx #Have textual conflicts 3ea4f8500c2e v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx #Have textual conflicts 62892325f146 v5.15/standard/nxp-sdk-5.15/nxp-soc #Have textual conflicts 0dbacfa4b0f7 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc #Have textual conflicts b1c45d93b534 v5.15/standard/bcm-2xxx-rpi 304b01b020bb v5.15/standard/preempt-rt/bcm-2xxx-rpi ffe16d8ed8e2 v5.15/standard/nxp-sdk-5.15/nxp-s32g 56ece818f870 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g f287caa5c5c1 v5.15/standard/intel-sdk-5.15/intel-socfpga 117e2d5e5d6b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga b691813b83a3 v5.15/standard/x86 3076bd04e17b v5.15/standard/preempt-rt/x86 d9b3bb620355 v5.15/standard/sdkv5.15/xlnx-soc #Have textual conflicts 9c803ee65fdf v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc #Have textual conflicts 9f65534dcfac v6.1/standard/sdkv5.10/axxia 2e7b6e82b068 v6.1/standard/preempt-rt/sdkv5.10/axxia 08150b51121b v6.1/standard/base 3fe89e2a8a6f v6.1/standard/preempt-rt/base 58bb23e82cd2 v6.1/standard/ti-sdk-6.1/ti-j7xxx #Have textual conflicts befde229cbf4 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx #Have textual conflicts 583711bfe7d9 v6.1/standard/nxp-sdk-6.1/nxp-soc #Have textual conflicts 975dd4c6d6f6 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc #Have textual conflicts 212fe11856c6 v6.1/standard/cn-sdkv5.15/octeon b1b353f23d1e v6.1/standard/preempt-rt/cn-sdkv5.15/octeon c26d15400e78 v6.1/standard/microchip-polarfire-soc 54361b08907f v6.1/standard/preempt-rt/microchip-polarfire-soc d7f07878758d v6.1/standard/bcm-2xxx-rpi #Have textual conflicts c0bd5f99e7fb v6.1/standard/preempt-rt/bcm-2xxx-rpi #Have textual conflicts a2866d0b20c8 v6.1/standard/nxp-sdk-5.15/nxp-s32g 74744404ba57 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g fe6062df2d12 v6.1/standard/intel-sdk-6.1/intel-socfpga 6406a07b611c v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga cd5d6cbdbd58 v6.1/standard/x86 086dbebab64f v6.1/standard/preempt-rt/x86 f42ecb6ab40a v6.1/standard/sdkv6.1/xlnx-soc #Have textual and semantic conflicts d71cc2863355 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc #Have textual and semantic conflicts There are many annoying merge conflicts scattered across different branches, but they are not too hard to resolve. 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 (#13522): https://lists.yoctoproject.org/g/linux-yocto/message/13522 Mute This Topic: https://lists.yoctoproject.org/mt/103972757/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
