[linux-yocto][v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc][PATCH] fpga: region: Drop unneeded part due to merge issue
From: Quanyang Wang
This part is removed in upstream commit 8886a579744fb ("fpga: region:
Use standard dev_release for class driver), but introduced when merging.
So we should drop it.
Signed-off-by: Quanyang Wang
---
Hi Bruce,
Would you please help merge this patch to the branches:
v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc
v5.15/standard/sdkv5.15/xlnx-soc
Thanks,
Quanyang
---
drivers/fpga/of-fpga-region.c | 4
1 file changed, 4 deletions(-)
diff --git a/drivers/fpga/of-fpga-region.c b/drivers/fpga/of-fpga-region.c
index f3c66e8fe6014..e997a58e0e21b 100644
--- a/drivers/fpga/of-fpga-region.c
+++ b/drivers/fpga/of-fpga-region.c
@@ -433,10 +433,6 @@ static int of_fpga_region_probe(struct platform_device
*pdev)
if (ret < 0)
goto err_pm;
- ret = fpga_region_register(region);
- if (ret)
- goto err_pm;
-
of_platform_populate(np, fpga_region_of_match, NULL, >dev);
platform_set_drvdata(pdev, region);
--
2.36.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14054):
https://lists.yoctoproject.org/g/linux-yocto/message/14054
Mute This Topic: https://lists.yoctoproject.org/mt/106736047/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto] [v2 PATCH] usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
When config CONFIG_USB_DWC3_DUAL_ROLE is selected, and trigger system
to enter suspend status with below command:
echo mem > /sys/power/state
There will be a deadlock issue occurring. Detailed invoking path as
below:
dwc3_suspend_common()
spin_lock_irqsave(>lock, flags); <-- 1st
dwc3_gadget_suspend(dwc);
dwc3_gadget_soft_disconnect(dwc);
spin_lock_irqsave(>lock, flags); <-- 2nd
This issue is exposed by commit c7ebd8149ee5 ("usb: dwc3: gadget: Fix
NULL pointer dereference in dwc3_gadget_suspend") that removes the code
of checking whether dwc->gadget_driver is NULL or not. It causes the
following code is executed and deadlock occurs when trying to get the
spinlock. In fact, the root cause is the commit 5265397f9442("usb: dwc3:
Remove DWC3 locking during gadget suspend/resume") that forgot to remove
the lock of otg mode. So, remove the redundant lock of otg mode during
gadget suspend/resume.
Fixes: 5265397f9442 ("usb: dwc3: Remove DWC3 locking during gadget
suspend/resume")
Cc: Xu Yang
Cc: sta...@vger.kernel.org
Signed-off-by: Meng Li
---
drivers/usb/dwc3/core.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index a8fb10cc65bc..9bb4ab409bbb 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -2112,7 +2112,6 @@ static int dwc3_core_init_for_resume(struct dwc3 *dwc)
static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg)
{
- unsigned long flags;
u32 reg;
switch (dwc->current_dr_role) {
@@ -2150,9 +2149,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc,
pm_message_t msg)
break;
if (dwc->current_otg_role == DWC3_OTG_ROLE_DEVICE) {
- spin_lock_irqsave(>lock, flags);
dwc3_gadget_suspend(dwc);
- spin_unlock_irqrestore(>lock, flags);
synchronize_irq(dwc->irq_gadget);
}
@@ -2169,7 +2166,6 @@ static int dwc3_suspend_common(struct dwc3 *dwc,
pm_message_t msg)
static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg)
{
- unsigned long flags;
int ret;
u32 reg;
@@ -2227,9 +2223,7 @@ static int dwc3_resume_common(struct dwc3 *dwc,
pm_message_t msg)
if (dwc->current_otg_role == DWC3_OTG_ROLE_HOST) {
dwc3_otg_host_init(dwc);
} else if (dwc->current_otg_role == DWC3_OTG_ROLE_DEVICE) {
- spin_lock_irqsave(>lock, flags);
dwc3_gadget_resume(dwc);
- spin_unlock_irqrestore(>lock, flags);
}
break;
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14053):
https://lists.yoctoproject.org/g/linux-yocto/message/14053
Mute This Topic: https://lists.yoctoproject.org/mt/106735260/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/kernel-rt]: usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
From: Limeng Hi Bruce, This patch is used to fix deadlock issues when testing suspend/resume. I have sent v2to mainline upstream. So, could you please help merge these patches into linux-ycoto kernel in advance, both below 2 branchs? v6.6/standard/nxp-sdk-6.6/nxp-soc v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc diffstat info as below: core.c |6 -- 1 file changed, 6 deletions(-) thanks, Limeng -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14052): https://lists.yoctoproject.org/g/linux-yocto/message/14052 Mute This Topic: https://lists.yoctoproject.org/mt/106647367/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/kernel-rt]: usb: dwc3: core: remove lock of otg mode during gadget suspend/resume to avoid deadlock
> -Original Message- > From: Bruce Ashfield > Sent: Friday, June 14, 2024 8:53 PM > To: Li, Meng > Cc: linux-yocto@lists.yoctoproject.org > Subject: Re: [linux-yocto]: [kernel/kernel-rt]: usb: dwc3: core: remove lock > of > otg mode during gadget suspend/resume to avoid deadlock > > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender and > know the content is safe. > > On Thu, Jun 13, 2024 at 8:16 PM Li, Meng wrote: > > > > > > > > > -Original Message- > > > From: Bruce Ashfield > > > Sent: Friday, June 14, 2024 3:24 AM > > > To: Li, Meng > > > Cc: linux-yocto@lists.yoctoproject.org > > > Subject: Re: [linux-yocto]: [kernel/kernel-rt]: usb: dwc3: core: > > > remove lock of otg mode during gadget suspend/resume to avoid > > > deadlock > > > > > > CAUTION: This email comes from a non Wind River email account! > > > Do not click links or open attachments unless you recognize the > > > sender and know the content is safe. > > > > > > In message: [linux-yocto]: [kernel/kernel-rt]: usb: dwc3: core: > > > remove lock of otg mode during gadget suspend/resume to avoid > > > deadlock on 13/06/2024 Meng Li wrote: > > > > > > > From: Limeng > > > > > > > > Hi Bruce, > > > > > > > > This patch is used to fix deadlock issues when testing > > > > suspend/resume. I will > > > send it to mainline upstream in later. > > > > So, could you please help merge these patches into linux-ycoto > > > > kernel in > > > advance, both below 2 branchs? > > > > v6.6/standard/nxp-sdk-6.6/nxp-soc > > > > v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc > > > > > > Given the response of upstream, I'll wait until you've replied and > > > an agreed upon solution is acheived. > > > > > > > Ok! I agree your advice, wait for the upstream response from USB > maintainer, and then improve my patch. > > I can reproduce this issue on NXP platforms using usb dwc3 driver, for > > example, ls1028. And I also verify this patch, suspend/resume feature works > fine with it. > > I think maybe it needs a long period to review this patch in upstream > community, and then accept it finally. Maybe it is not accepted by upstream in > worse case. > > So, is it possible to merge this patch into NXP branch, not standard/base > branch in advance? In this way, it will not affect other BSP. > > > > I haven't checked yet today for any more follow ups on the patch upstream, > but let's give it a few more days. > > I definitely don't need the patch accepted upstream to merge it, but if we can > at least hear that the approach is generally correct from the maintainers, I'm > happy to merge the work in progress patch to the nxp branches. > I got response from usb maintainer. He ACK Xu Yang's patch that is similar with mine, but miss to remove the lock in dwc3_resume_common(). So, maintainer let me send patch again. I will improve the commit log, and then sent patch to you and mainline at the same time. https://lore.kernel.org/lkml/2024061313-october-sniff-5b0c@gregkh/t/ thanks, Limeng > Bruce > > > Thanks, > > LImeng > > > > > Bruce > > > > > > > > > > > diffstat info as below: > > > > > > > > core.c |6 -- > > > > 1 file changed, 6 deletions(-) > > > > > > > > > > > > thanks, > > > > Limeng > > > > -- > - Thou shalt not follow the NULL pointer, for chaos and madness await thee at > its end > - "Use the force Harry" - Gandalf, Star Trek II -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14051): https://lists.yoctoproject.org/g/linux-yocto/message/14051 Mute This Topic: https://lists.yoctoproject.org/mt/106647367/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 v6.1.93 v6.6.33 for linux-yocto
In message: Trial merge of v6.1.93 v6.6.33 for linux-yocto on 13/06/2024 Kevin Hao wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v6.1.93 v6.6.33 for the following > branches in the linux-yocto. > beff341412bb v6.1/standard/sdkv5.10/axxia > adf6a319a08c v6.1/standard/preempt-rt/sdkv5.10/axxia > 3803209e1cd9 v6.1/standard/base > 2dad312fdbf5 v6.1/standard/preempt-rt/base > 6d88b8874bf0 v6.1/standard/ti-sdk-6.1/ti-j7xxx >#Have textual conflicts > f29a19aab881 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx >#Have textual conflicts > ba9de1b7d853 v6.1/standard/nxp-sdk-6.1/nxp-soc >#Have textual and semantic conflicts > 95431f33c190 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc >#Have textual and semantic conflicts > 63086a984030 v6.1/standard/cn-sdkv5.15/octeon > d53e77347afe v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > 10fca30ab00b v6.1/standard/cn-sdkv6.1/octeon > f3a012b2fd20 v6.1/standard/preempt-rt/cn-sdkv6.1/octeon > 3a73b0697321 v6.1/standard/microchip-polarfire-soc > cb461ec12dba v6.1/standard/preempt-rt/microchip-polarfire-soc > 1861207088da v6.1/standard/bcm-2xxx-rpi >#Have textual conflicts > fee777513ed0 v6.1/standard/preempt-rt/bcm-2xxx-rpi >#Have textual conflicts > 0d8c1ab921c2 v6.1/standard/nxp-sdk-5.15/nxp-s32g > 6248cbcc3128 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > 12f3fbda3298 v6.1/standard/intel-sdk-6.1/intel-socfpga > 43444c513551 v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > 4ad615f21983 v6.1/standard/x86 > 57384fc3eeaf v6.1/standard/preempt-rt/x86 > f9790d19d1df v6.1/standard/sdkv6.1/xlnx-soc > 0b10ca9fb92c v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > 12c0e283ba82 v6.6/standard/sdkv5.15/axxia > e6b68de08010 v6.6/standard/preempt-rt/sdkv5.15/axxia > 6b6c0c35c7d7 v6.6/standard/base > 4608bc9beeb6 v6.6/standard/preempt-rt/base > 794d9facb23c v6.6/standard/nxp-sdk-6.6/nxp-soc >#Have textual conflicts > 6b47593fac99 v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc >#Have textual conflicts > d5f1ea0cf46b v6.6/standard/sdkv6.6/xlnx-soc >#Have textual conflicts > f78a3bb34ec6 v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc >#Have textual conflicts > > Please note there are some semantic merge conflicts when merging the v6.1 > stable > into 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. My next round of -stable updates are out and under test, send fixups as required. Bruce > > Thanks, > Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14050): https://lists.yoctoproject.org/g/linux-yocto/message/14050 Mute This Topic: https://lists.yoctoproject.org/mt/106653061/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-6.6][PATCH] ti-j7xxx: add kernel-cache configuration files for v6.6 kernel
merged. Bruce In message: [linux-yocto][yocto-kernel-cache][yocto-6.6][PATCH] ti-j7xxx: add kernel-cache configuration files for v6.6 kernel on 14/06/2024 Xulin Sun wrote: > This adds the cfg & scc files to support TI J784S4 soc. > This refers to scc and cfg files on previous branch yocto-6.1. > > Signed-off-by: Xulin Sun > --- > bsp/ti-j7xxx/ti-j78xx-preempt-rt.scc | 9 + > bsp/ti-j7xxx/ti-j78xx-standard.scc | 8 + > bsp/ti-j7xxx/ti-j7xxx-preempt-rt.cfg | 15 ++ > bsp/ti-j7xxx/ti-j7xxx-remoteproc.cfg | 18 ++ > bsp/ti-j7xxx/ti-j7xxx-remoteproc.scc | 1 + > bsp/ti-j7xxx/ti-j7xxx.cfg| 381 +++ > bsp/ti-j7xxx/ti-j7xxx.scc| 8 + > 7 files changed, 440 insertions(+) > create mode 100755 bsp/ti-j7xxx/ti-j78xx-preempt-rt.scc > create mode 100644 bsp/ti-j7xxx/ti-j78xx-standard.scc > create mode 100644 bsp/ti-j7xxx/ti-j7xxx-preempt-rt.cfg > create mode 100644 bsp/ti-j7xxx/ti-j7xxx-remoteproc.cfg > create mode 100644 bsp/ti-j7xxx/ti-j7xxx-remoteproc.scc > create mode 100755 bsp/ti-j7xxx/ti-j7xxx.cfg > create mode 100644 bsp/ti-j7xxx/ti-j7xxx.scc > > diff --git a/bsp/ti-j7xxx/ti-j78xx-preempt-rt.scc > b/bsp/ti-j7xxx/ti-j78xx-preempt-rt.scc > new file mode 100755 > index ..e8084bc1 > --- /dev/null > +++ b/bsp/ti-j7xxx/ti-j78xx-preempt-rt.scc > @@ -0,0 +1,9 @@ > +# SPDX-License-Identifier: MIT > +define KMACHINE ti-j78xx > +define KTYPE preempt-rt > +define KARCH arm64 > + > +include ktypes/preempt-rt > + > +include ti-j7xxx.scc > +kconf hardware ti-j7xxx-preempt-rt.cfg > diff --git a/bsp/ti-j7xxx/ti-j78xx-standard.scc > b/bsp/ti-j7xxx/ti-j78xx-standard.scc > new file mode 100644 > index ..2c945b1d > --- /dev/null > +++ b/bsp/ti-j7xxx/ti-j78xx-standard.scc > @@ -0,0 +1,8 @@ > +# SPDX-License-Identifier: MIT > +define KMACHINE ti-j78xx > +define KTYPE standard > +define KARCH arm64 > + > +include ktypes/standard/standard.scc > + > +include ti-j7xxx.scc > diff --git a/bsp/ti-j7xxx/ti-j7xxx-preempt-rt.cfg > b/bsp/ti-j7xxx/ti-j7xxx-preempt-rt.cfg > new file mode 100644 > index ..5e391571 > --- /dev/null > +++ b/bsp/ti-j7xxx/ti-j7xxx-preempt-rt.cfg > @@ -0,0 +1,15 @@ > +.. > +.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. > +. > +.. > + > +# CONFIG_TRANSPARENT_HUGEPAGE is not set > +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set > diff --git a/bsp/ti-j7xxx/ti-j7xxx-remoteproc.cfg > b/bsp/ti-j7xxx/ti-j7xxx-remoteproc.cfg > new file mode 100644 > index ..d00bbe16 > --- /dev/null > +++ b/bsp/ti-j7xxx/ti-j7xxx-remoteproc.cfg > @@ -0,0 +1,18 @@ > +# > +# Remoteproc drivers > +# > +CONFIG_REMOTEPROC=y > +CONFIG_PRU_REMOTEPROC=m > +CONFIG_TI_K3_R5_REMOTEPROC=m > +CONFIG_TI_K3_DSP_REMOTEPROC=m > +CONFIG_TI_K3_M4_REMOTEPROC=m > +CONFIG_REMOTEPROC_CDEV=y > + > +# > +# Rpmsg virtual device drivers > +# > +CONFIG_RPMSG_VIRTIO=m > +CONFIG_RPMSG_CHAR=m > +CONFIG_SAMPLES=y > +CONFIG_SAMPLE_RPMSG_CLIENT=m > +CONFIG_RPMSG_CTRL=m > diff --git a/bsp/ti-j7xxx/ti-j7xxx-remoteproc.scc > b/bsp/ti-j7xxx/ti-j7xxx-remoteproc.scc > new file mode 100644 > index ..a1bc372d > --- /dev/null > +++ b/bsp/ti-j7xxx/ti-j7xxx-remoteproc.scc > @@ -0,0 +1 @@ > +kconf hardware ti-j7xxx-remoteproc.cfg > diff --git a/bsp/ti-j7xxx/ti-j7xxx.cfg b/bsp/ti-j7xxx/ti-j7xxx.cfg > new file mode 100755 > index ..2de3e6cc > --- /dev/null > +++ b/bsp/ti-j7xxx/ti-j7xxx.cfg > @@ -0,0 +1,381 @@ > +# > +#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. > +# > +#. > + > +# > +# > +# Platform selection > +# > +CONFIG_ARM64=y > +CONFIG_ARCH_K3=y > + > +CONFIG_ARM_SMMU=y > +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y > +CONFIG_ARM_SMMU_V3=y > +CONFIG_TI_PRUSS=m > +CONFIG_CMA=y > +CONFIG_DMA_CMA=y > + > +CONFIG_EXPERT=y > +CONFIG_ARM64_64K_PAGES=y >
Re: [linux-yocto] [PATCH linux-yocto] of: overlay: Delete the unused overlay_lock
In message: [PATCH linux-yocto] of: overlay: Delete the unused overlay_lock
on 14/06/2024 Kevin Hao wrote:
> From: Kevin Hao
>
> This unused lock was introduced by commit 4066b40be0b7 ("OF: DT-Overlay
> configfs interface (v8)"). Delete it to fix the build warning.
>
> Signed-off-by: Kevin Hao
> ---
> Hi Bruce,
>
> Please help me merge this into the following two branches:
> v6.6/standard/sdkv6.6/xlnx-soc
> v6.6/standard/preempt-rt/sdkv6.6/xlnx-soc
merged.
Bruce
> ---
> drivers/of/configfs.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c
> index 3839f14dc893..cbaf0bf04381 100644
> --- a/drivers/of/configfs.c
> +++ b/drivers/of/configfs.c
> @@ -43,8 +43,6 @@ struct cfs_overlay_item {
> void*mem;
> };
>
> -static DEFINE_MUTEX(overlay_lock);
> -
> static int create_overlay(struct cfs_overlay_item *overlay, void *blob)
> {
> int err;
>
> ---
> base-commit: f78a3bb34ec6b49d99b0db87a3a868d6f52c59f0
> change-id: 20240614-dt-overlay-75c9bd8e9e91
>
> Best regards,
> --
> Kevin Hao
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14048):
https://lists.yoctoproject.org/g/linux-yocto/message/14048
Mute This Topic: https://lists.yoctoproject.org/mt/106662654/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
