Skip to content

release 38071cb - #125

Closed
evgeny-boger wants to merge 14 commits into
dev/v5.10.yfrom
feature/wb7min
Closed

release 38071cb#125
evgeny-boger wants to merge 14 commits into
dev/v5.10.yfrom
feature/wb7min

Conversation

@evgeny-boger

@evgeny-boger evgeny-boger commented Feb 5, 2023

Copy link
Copy Markdown
Member

No description provided.

@evgeny-boger
add wb7min defconfig
600efd4 
minimum configuration w/o Wi-Fi and with everything compiled in kernel.
@evgeny-boger
add scripts to make bootpart image
e23306c 
with zImage, dtbs and version
@evgeny-boger
evgeny-boger requested a review from webconn February 5, 2023 18:32
@webconn

webconn commented Feb 8, 2023

Copy link
Copy Markdown
Contributor

А можешь дать описание того, что ты делаешь? (у нас так по процессам положено)

webconn
webconn suggested changes Feb 8, 2023
View reviewed changes
Comment thread arch/arm/configs/wirenboard7_defconfig
Comment thread scripts/package/wb/do_build_bootpart.sh Outdated
Comment thread scripts/package/wb/do_build_bootpart.sh Outdated
Comment thread scripts/package/wb/do_build_bootpart.sh Outdated
@evgeny-boger @webconn
Apply suggestions from code review
c26bec9 
Co-authored-by: Maslov Nikita <webconn@users.noreply.github.com>
@evgeny-boger
evgeny-boger requested a review from webconn February 8, 2023 19:53
evgeny-boger
evgeny-boger commented Mar 7, 2023
View reviewed changes
Comment thread arch/arm/boot/dts/sun8i-r40-wirenboard7xx-min.dtsi
@@ -0,0 +1,45 @@
/* disable eth1 */

@evgeny-boger evgeny-boger Mar 7, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

может переименуем из -min в -nb? А то с отключением первого эзернета оно уже не так нужно кому-то, кроме одного клиента.

@webconn webconn Mar 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

А что означает -nb? Мне не принципиально, как это назвать

Comment thread arch/arm/boot/dts/sun8i-r40-wirenboard734-wb7min.dts Outdated
@@ -0,0 +1,29 @@
/dts-v1/;

@evgeny-boger evgeny-boger Mar 7, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тут получилась копипаста коэффициентов из -733.dts.
Предлагаю вместо этого унаследоваться от 734.dts напрямую, вроде с этим не должно быть никаких проблем.

@webconn webconn Mar 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Готово

Comment thread arch/arm/boot/dts/sun8i-r40-wirenboard7xx-min.dtsi Outdated
status = "disabled";
};

/* disable 1-Wire on both pins */

@evgeny-boger evgeny-boger Mar 7, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

надо бы написать коммент, что это делается для того, чтобы W1 и W2 использовать как дискретные входы обычные

@webconn webconn Mar 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Готово

Comment thread arch/arm/boot/dts/sun8i-r40-wirenboard7xx-min.dtsi
};

/ {
regulators {

@evgeny-boger evgeny-boger Mar 7, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

и здесь - что это отключает транзисторы подтяжки, чтобы их случайно не включил кто-то

@webconn webconn Mar 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

готово

Comment thread arch/arm/boot/dts/sun8i-r40-wirenboard7xx-min.dtsi Outdated
};
};

/* enable RS-485 */

@evgeny-boger evgeny-boger Mar 7, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

и здесь коммент, про то что обычно это hwconf включает, а здесь включаем сами, чтобы без hwconf рабоатло

@evgeny-boger evgeny-boger Mar 7, 2023

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

по-моему один из них кстати включен по-умолчанию

@webconn webconn Mar 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Да, uart2 включен, могу повторно не включать

@webconn webconn Mar 9, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Готово

@webconn webconn changed the title Feature/wb7min release 38071cb Mar 9, 2023
Nikita Maslov and others added 4 commits March 9, 2023 15:17
@webconn

webconn commented Mar 13, 2023

Copy link
Copy Markdown
Contributor

@evgeny-boger если всё устраивает, давай вливать

@evgeny-boger evgeny-boger mentioned this pull request Jul 4, 2023
Merged
@evgeny-boger
evgeny-boger deleted the feature/wb7min branch July 4, 2023 23:40
taraant pushed a commit that referenced this pull request Apr 14, 2026
@haokexin @gregkh
net: macb: Move devm_{free,request}_irq() out of spin lock area
9940513 
commit 317e49358ebbf6390fa439ef3c142f9239dd25fb upstream.

The devm_free_irq() and devm_request_irq() functions should not be
executed in an atomic context.

During device suspend, all userspace processes and most kernel threads
are frozen. Additionally, we flush all tx/rx status, disable all macb
interrupts, and halt rx operations. Therefore, it is safe to split the
region protected by bp->lock into two independent sections, allowing
devm_free_irq() and devm_request_irq() to run in a non-atomic context.
This modification resolves the following lockdep warning:
  BUG: sleeping function called from invalid context at kernel/locking/mutex.c:591
  in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 501, name: rtcwake
  preempt_count: 1, expected: 0
  RCU nest depth: 1, expected: 0
  7 locks held by rtcwake/501:
   #0: ffff0008038c3408 (sb_writers#5){.+.+}-{0:0}, at: vfs_write+0xf8/0x368
   #1: ffff0008049a5e88 (&of->mutex#2){+.+.}-{4:4}, at: kernfs_fop_write_iter+0xbc/0x1c8
   #2: ffff00080098d588 (kn->active#70){.+.+}-{0:0}, at: kernfs_fop_write_iter+0xcc/0x1c8
   #3: ffff800081c84888 (system_transition_mutex){+.+.}-{4:4}, at: pm_suspend+0x1ec/0x290
   #4: ffff0008009ba0f8 (&dev->mutex){....}-{4:4}, at: device_suspend+0x118/0x4f0
   #5: ffff800081d00458 (rcu_read_lock){....}-{1:3}, at: rcu_lock_acquire+0x4/0x48
   #6: ffff0008031fb9e0 (&bp->lock){-.-.}-{3:3}, at: macb_suspend+0x144/0x558
  irq event stamp: 8682
  hardirqs last  enabled at (8681): [<ffff8000813c7d7c>] _raw_spin_unlock_irqrestore+0x44/0x88
  hardirqs last disabled at (8682): [<ffff8000813c7b58>] _raw_spin_lock_irqsave+0x38/0x98
  softirqs last  enabled at (7322): [<ffff8000800f1b4c>] handle_softirqs+0x52c/0x588
  softirqs last disabled at (7317): [<ffff800080010310>] __do_softirq+0x20/0x2c
  CPU: 1 UID: 0 PID: 501 Comm: rtcwake Not tainted 7.0.0-rc3-next-20260310-yocto-standard+ #125 PREEMPT
  Hardware name: ZynqMP ZCU102 Rev1.1 (DT)
  Call trace:
   show_stack+0x24/0x38 (C)
   __dump_stack+0x28/0x38
   dump_stack_lvl+0x64/0x88
   dump_stack+0x18/0x24
   __might_resched+0x200/0x218
   __might_sleep+0x38/0x98
   __mutex_lock_common+0x7c/0x1378
   mutex_lock_nested+0x38/0x50
   free_irq+0x68/0x2b0
   devm_irq_release+0x24/0x38
   devres_release+0x40/0x80
   devm_free_irq+0x48/0x88
   macb_suspend+0x298/0x558
   device_suspend+0x218/0x4f0
   dpm_suspend+0x244/0x3a0
   dpm_suspend_start+0x50/0x78
   suspend_devices_and_enter+0xec/0x560
   pm_suspend+0x194/0x290
   state_store+0x110/0x158
   kobj_attr_store+0x1c/0x30
   sysfs_kf_write+0xa8/0xd0
   kernfs_fop_write_iter+0x11c/0x1c8
   vfs_write+0x248/0x368
   ksys_write+0x7c/0xf8
   __arm64_sys_write+0x28/0x40
   invoke_syscall+0x4c/0xe8
   el0_svc_common+0x98/0xf0
   do_el0_svc+0x28/0x40
   el0_svc+0x54/0x1e0
   el0t_64_sync_handler+0x84/0x130
   el0t_64_sync+0x198/0x1a0

Fixes: 558e35c ("net: macb: WoL support for GEM type of Ethernet controller")
Cc: stable@vger.kernel.org
Reviewed-by: Théo Lebrun <theo.lebrun@bootlin.com>
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Link: https://patch.msgid.link/20260318-macb-irq-v2-1-f1179768ab24@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@webconn webconn webconn approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@evgeny-boger @webconn