Hi Bruce, Could you please assist with merging code into our linux-yocto repository? The details are as follows:
Repository: linux-yocto Branch: v6.1/standard/preempt-rt/cn-sdkv6.1/octeon Thank you for your help. Best regards, Bo The following changes since commit 959e25b0411ada0ff79b9c3bf53a4119d18e430d: Merge branch 'v6.1/standard/preempt-rt/cn-sdkv6.1/octeon-merge' into v6.1/standard/preempt-rt/cn-sdkv6.1/octeon (2024-08-26 22:23:49 -0400) are available in the Git repository at: https://git.sr.ht/~bsun/linux-yocto v6.1/standard/preempt-rt/cn-sdkv6.1/octeon for you to fetch changes up to 4695d7af450a1e1b2f2e6267491eef09ff246971: octeontx2-af: RPM: Read proper counters for RS-FEC (2024-09-02 04:05:37 +0000) ---------------------------------------------------------------- Amit Singh Tomar (3): fs/resctrl: check for monitoring capability arm_mpam: Fix lock related warnings arm_mpam: extend SRCU critical section to debugfs Geetha sowjanya (4): Marvell: cn20k: Add cn20k silicon check octeontx2-af: Fix APR entry in debugfs octeontx2-af: cn20k: Add block discovery register octeontx2-pf: Fix representor interface name Hariprasad Kelam (4): octeontx2-af: Quiesce traffic before NIX block reset octeontx2-af: Fix kernel crash in CGX block init octeontx2-af: RPM: fix fifo_len corruption octeontx2-af: RPM: Read proper counters for RS-FEC Kiran Kumar K (1): octeontx2-af: Adding changes to parse stacked VLANs Linu Cherian (5): octeontx2-af: Add cn20k NPA context support octeontx2-af: Extend debugfs support for cn20k NPA octeontx2-pf: Add cn20k aura/pool context support octeontx2-af: Skip NDC operations for cn20k octeontx2-af: Minor updates to cn20k npa struct Prince John (2): dt-bindings: thermal: Added marvell armada-ap807-thermal drivers: thermal: fix sequence and add ap807 Prince Takkar (1): octeontx2-af: add skeleton code for ML EB driver Sai Krishna (5): octeontx2-af: Basic mbox operations to support CN20k, OcteonTX2 octeontx2-af: CN20k mbox to support AF REQ/ACK functionality octeontx2-pf: CN20K mbox REQ/ACK implementation for NIC PF octeontx2-vf: CN20K mbox REQ/ACK implementation for AF's VF octeontx2-pf: CN20K mbox REQ/ACK implementation between PF-VF Sebastien Dubois (1): mrvl_swup: support compatibility with previous structures Subbaraya Sundeep (10): octeontx2: Do not scatter pcifunc macros across modules octeontx2: Set correct PF, VF masks and shifts based on silicon octeontx2-af: Simplify context writing and reading to hardware octeontx2-af: Add cn20k NIX contexts support octeontx2-af: Extend debugfs support for cn20k NIX octeontx2-pf: Use new nix SQ context for cn20k octeontx2-af: Accommodate more bandwidth profiles for cn20k octeontx2-af: Display new bandwidth profiles too in debugfs octeontx2-pf: Use new bandwidth profiles in receive queue octeontx2-af: Display missing info in cn20k CQ context .../devicetree/bindings/thermal/armada-thermal.txt | 1 + arch/arm64/boot/dts/marvell/armada-ap807.dtsi | 3 + drivers/net/ethernet/marvell/octeontx2/af/Makefile | 6 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 23 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + .../net/ethernet/marvell/octeontx2/af/cn20k/api.h | 35 ++ .../ethernet/marvell/octeontx2/af/cn20k/debugfs.c | 216 ++++++++++ .../ethernet/marvell/octeontx2/af/cn20k/debugfs.h | 28 ++ .../marvell/octeontx2/af/cn20k/mbox_init.c | 391 +++++++++++++++++ .../net/ethernet/marvell/octeontx2/af/cn20k/nix.c | 20 + .../net/ethernet/marvell/octeontx2/af/cn20k/npa.c | 21 + .../net/ethernet/marvell/octeontx2/af/cn20k/reg.h | 76 ++++ .../net/ethernet/marvell/octeontx2/af/cn20k/rvum.c | 93 ++++ .../net/ethernet/marvell/octeontx2/af/cn20k/rvum.h | 20 + .../ethernet/marvell/octeontx2/af/cn20k/rvum_reg.h | 17 + .../ethernet/marvell/octeontx2/af/cn20k/struct.h | 357 ++++++++++++++++ .../ethernet/marvell/octeontx2/af/lmac_common.h | 7 +- drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 115 +++++ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 84 ++++ .../ethernet/marvell/octeontx2/af/npc_profile.h | 36 +- drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 58 ++- drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 5 + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 241 ++++++++--- drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 43 +- .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 45 +- .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 19 +- .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 46 +- .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 69 +-- .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 29 +- .../net/ethernet/marvell/octeontx2/af/rvu_struct.h | 12 +- .../net/ethernet/marvell/octeontx2/nic/Makefile | 2 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 28 +- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 1 + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c | 466 +++++++++++++++++++++ drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h | 17 + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 24 +- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 44 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 148 +++++-- .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h | 49 +-- .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 2 +- .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 44 +- drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 7 +- drivers/platform/mpam/mpam_devices.c | 26 +- drivers/soc/marvell/mrvl-swup/mrvl_swup.c | 5 + drivers/soc/marvell/mrvl-swup/mrvl_swup.h | 26 +- drivers/soc/marvell/octeontx2-sdp/sdp.h | 5 +- drivers/soc/marvell/rvu_af_extn/rvu_eb_ml.c | 98 +++++ drivers/soc/marvell/rvu_af_extn/rvu_eblock.c | 2 + drivers/soc/marvell/rvu_af_extn/rvu_eblock.h | 2 + drivers/thermal/armada_thermal.c | 105 ++++- fs/resctrl/monitor.c | 3 + include/linux/soc/marvell/silicons.h | 28 ++ 52 files changed, 2975 insertions(+), 274 deletions(-) create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/api.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/debugfs.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/mbox_init.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/nix.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/npa.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/reg.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/rvum.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/rvum.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/rvum_reg.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/struct.h create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h create mode 100644 drivers/soc/marvell/rvu_af_extn/rvu_eb_ml.c create mode 100644 include/linux/soc/marvell/silicons.h
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14347): https://lists.yoctoproject.org/g/linux-yocto/message/14347 Mute This Topic: https://lists.yoctoproject.org/mt/108223483/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-