Skip to content

Phytium: Merge some basic information of Phytium SOCs. #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
May 5, 2024
Merged

Phytium: Merge some basic information of Phytium SOCs. #107

merged 6 commits into from
May 5, 2024

Conversation

@JiakunShuai
Copy link
Contributor

@JiakunShuai JiakunShuai commented Apr 30, 2024

This pull request contains several basic information of Phytium SOCs, including:

MAINTAINERS information,
Phytium SOC family Kconfig section,
Phytium vendor prefix and vendor ID,
arm64 Pe220x SOCs devicetrees.

Wang Yinfeng and others added 6 commits April 30, 2024 15:49
@JiakunShuai
MAINTAINERS: Add entry for Phytium SoC family
d82883a 
Add MAINTAINERS entry for Phytium SoC family with myself as the
maintainer.

Signed-off-by: Wang Yinfeng <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Change-Id: I6482fe67fc189aa5b89ad93f16be9dd39332ac02
@chenbaozi-ft @JiakunShuai
arm64: phytium: Add support for Phytium SoC family
fd24792 
This patch adds supoort for the Phytium SoC family.

Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Change-Id: Ibe06dc2e54a413a8c1257fef3aade99e6ca6480f
@chenbaozi-ft @JiakunShuai
of: add vendor prefix for Phytium Technology Co. Ltd.
39fff72 
Add phytium to the list of DT vendor prefixes.

Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Change-Id: I3a7339f97405ebaaa4472704c7310ac7a37a79d1
@chenbaozi-ft @JiakunShuai
PCI: Add Phytium vendor ID
2e641f2 
Update pci_ids.h with the vendor ID for Phytium.

Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Change-Id: Ie0ea6afa71a8ba2f66f8426c1db063cd734d985c
@chenbaozi-ft @JiakunShuai
arm64: dts: phytium: Add dts for Phytium Pe220x SoCs
8a9cb85 
Add initial device tree for Phytium Pe220x SoCs. Phytium Pe220x
series has three specs (Pe2201/Pe2202/Pe2204), distinguished by
the number of CPU core. Besides CPU cores, on-chip peripherals
also vary. Thus, we split them into three separate DTBs.

Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Song Wenting <[email protected]>
Signed-off-by: Chen Zhenhua <[email protected]>
Signed-off-by: Yang Liu <[email protected]>
Signed-off-by: Zhu Mingshuai <[email protected]>
Signed-off-by: Cheng Quan <[email protected]>
Signed-off-by: Wang Xu <[email protected]>
Signed-off-by: Zhang Yiqun <[email protected]>
Signed-off-by: Zhou Yulin <[email protected]>
Signed-off-by: Zhang Jian <[email protected]>
Signed-off-by: Wang Min <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Change-Id: I0e56b24c45675a05b248653255429c17498adb5f
@JiakunShuai
arm64: dts: phytium: Add dts for Phytium Pe220x demo boards
425ecb6 
Add support for Phytium Pe220x demo boards which covers all
three variants of Pe220x SoC series.

Signed-off-by: Chen Zhenhua <[email protected]>
Signed-off-by: Feng Jun <[email protected]>
Signed-off-by: Lai Xueyu <[email protected]>
Signed-off-by: Chen Baozi <[email protected]>
Signed-off-by: Wang Yinfeng <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Change-Id: I2cb696deeed73e8471491cad1baaa7abf334c711
@deepin-ci-robot
Copy link

deepin-ci-robot commented Apr 30, 2024

Hi @JiakunShuai. Thanks for your PR. 😃

@deepin-ci-robot
Copy link

deepin-ci-robot commented Apr 30, 2024

Hi @JiakunShuai. Thanks for your PR.

I'm waiting for a deepin-community member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Avenger-285714
Copy link
Member

Avenger-285714 commented May 5, 2024

It looks no problem.

@Avenger-285714
Copy link
Member

Avenger-285714 commented May 5, 2024

/approve

@Avenger-285714 Avenger-285714 merged commit e99de85 into deepin-community:linux-6.6.y May 5, 2024
Avenger-285714 pushed a commit that referenced this pull request May 5, 2024
Merge "Phytium: Merge some basic information of Phytium SOCs. #107"
79cc7a2 
This pull request contains several basic information of Phytium SOCs, including:

MAINTAINERS information,
Phytium SOC family Kconfig section,
Phytium vendor prefix and vendor ID,
arm64 Pe220x SOCs devicetrees.

Include follow 6 commits:
* e99de85 arm64: dts: phytium: Add dts for Phytium Pe220x demo boards
  5f412ae arm64: dts: phytium: Add dts for Phytium Pe220x SoCs
  1dd5e56 PCI: Add Phytium vendor ID
  de2f5dd of: add vendor prefix for Phytium Technology Co. Ltd.
  f92090b arm64: phytium: Add support for Phytium SoC family
  cb12dad MAINTAINERS: Add entry for Phytium SoC family

Signed-off-by: Wang Yinfeng <[email protected]>
Signed-off-by: Jiakun Shuai <[email protected]>
Signed-off-by: WangYuli <[email protected]>
@deepin-ci-robot
Copy link

deepin-ci-robot commented May 5, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Avenger-285714
Once this PR has been reviewed and has the lgtm label, please assign yukarichiba for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@MingcongBai MingcongBai mentioned this pull request May 22, 2024
Merged
@MingcongBai MingcongBai mentioned this pull request Jun 26, 2024
Closed
@MingcongBai MingcongBai mentioned this pull request Aug 20, 2024
Closed
@MingcongBai MingcongBai mentioned this pull request Nov 12, 2024
Open
opsiff pushed a commit to opsiff/UOS-kernel that referenced this pull request Nov 11, 2025
@opsiff
bonding: check xdp prog when set bond mode
4daa57c 
[ Upstream commit 094ee60 ]

Following operations can trigger a warning[1]:

    ip netns add ns1
    ip netns exec ns1 ip link add bond0 type bond mode balance-rr
    ip netns exec ns1 ip link set dev bond0 xdp obj af_xdp_kern.o sec xdp
    ip netns exec ns1 ip link set bond0 type bond mode broadcast
    ip netns del ns1

When delete the namespace, dev_xdp_uninstall() is called to remove xdp
program on bond dev, and bond_xdp_set() will check the bond mode. If bond
mode is changed after attaching xdp program, the warning may occur.

Some bond modes (broadcast, etc.) do not support native xdp. Set bond mode
with xdp program attached is not good. Add check for xdp program when set
bond mode.

    [1]
    ------------[ cut here ]------------
    WARNING: CPU: 0 PID: 11 at net/core/dev.c:9912 unregister_netdevice_many_notify+0x8d9/0x930
    Modules linked in:
    CPU: 0 UID: 0 PID: 11 Comm: kworker/u4:0 Not tainted 6.14.0-rc4 deepin-community#107
    Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.15.0-0-g2dd4b9b3f840-prebuilt.qemu.org 04/01/2014
    Workqueue: netns cleanup_net
    RIP: 0010:unregister_netdevice_many_notify+0x8d9/0x930
    Code: 00 00 48 c7 c6 6f e3 a2 82 48 c7 c7 d0 b3 96 82 e8 9c 10 3e ...
    RSP: 0018:ffffc90000063d80 EFLAGS: 00000282
    RAX: 00000000ffffffa1 RBX: ffff888004959000 RCX: 00000000ffffdfff
    RDX: 0000000000000000 RSI: 00000000ffffffea RDI: ffffc90000063b48
    RBP: ffffc90000063e28 R08: ffffffff82d39b28 R09: 0000000000009ffb
    R10: 0000000000000175 R11: ffffffff82d09b40 R12: ffff8880049598e8
    R13: 0000000000000001 R14: dead000000000100 R15: ffffc90000045000
    FS:  0000000000000000(0000) GS:ffff888007a00000(0000) knlGS:0000000000000000
    CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 000000000d406b60 CR3: 000000000483e000 CR4: 00000000000006f0
    Call Trace:
     <TASK>
     ? __warn+0x83/0x130
     ? unregister_netdevice_many_notify+0x8d9/0x930
     ? report_bug+0x18e/0x1a0
     ? handle_bug+0x54/0x90
     ? exc_invalid_op+0x18/0x70
     ? asm_exc_invalid_op+0x1a/0x20
     ? unregister_netdevice_many_notify+0x8d9/0x930
     ? bond_net_exit_batch_rtnl+0x5c/0x90
     cleanup_net+0x237/0x3d0
     process_one_work+0x163/0x390
     worker_thread+0x293/0x3b0
     ? __pfx_worker_thread+0x10/0x10
     kthread+0xec/0x1e0
     ? __pfx_kthread+0x10/0x10
     ? __pfx_kthread+0x10/0x10
     ret_from_fork+0x2f/0x50
     ? __pfx_kthread+0x10/0x10
     ret_from_fork_asm+0x1a/0x30
     </TASK>
    ---[ end trace 0000000000000000 ]---

Fixes: 9e2ee5c ("net, bonding: Add XDP support to the bonding driver")
Signed-off-by: Wang Liang <[email protected]>
Acked-by: Jussi Maki <[email protected]>
Reviewed-by: Nikolay Aleksandrov <[email protected]>
Reviewed-by: Toke Høiland-Jørgensen <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Signed-off-by: Rajani Kantha <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
(cherry picked from commit 6f3af8055ee7ab69d1451f056fcd890df99c167e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

needs-ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@JiakunShuai @deepin-ci-robot @Avenger-285714 @chenbaozi-ft