both branches are merged. Bruce
In message: [linux-yocto][linux-yocto v6.1] kernel code for marvell octeon on 19/03/2024 Ruiqiang Hao wrote: > Hi Bruce, > > Please help to merge code into our linux-yocto repo. > > repo: > linux-yocto > branch: > v6.1/standard/cn-sdkv5.15/octeon > > Thanks, > Ruiqiang > > The following changes since commit 34d48a6c6406fbb97861ff8b55c50cecabadb8c0: > > Merge branch 'v6.1/standard/base' into v6.1/standard/cn-sdkv5.15/octeon > (2024-03-10 23:16:49 -0400) > > are available in the Git repository at: > > g...@github.com:cythe/linux.git linux-yocto/v6.1/standard/cn-sdkv5.15/octeon > > for you to fetch changes up to 755d0e9afe53c6c4a99790263350128a352a9769: > > arm_mpam: replace acpi_table_mpam_msc with acpi_mpam_msc_node (2024-03-19 > 09:26:44 +0800) > > ---------------------------------------------------------------- > Ankur Dwivedi (1): > octeontx2-af: fix mcam hit counter > > Baha Mesleh (3): > octeontx2-bphy-netdev: ignore MCS bypass errors > octeontx2-bphy-netdev: release psm queues on exit > octeontx2-bphy-netdev: disable rx on RFOEs on exit > > Bharat Bhushan (2): > crypto/octeontx2: By default allocate one CPT LF per CPT VF > crypto: octeontx2: Honor irqaffinity passed via bootargs > > Damian Eppel (2): > firmware: octeontx2: sysfs interface for PORTM boot cfg > firmware: octeontx2: minor fixes for PORTM boot cfg > > George Cherian (1): > octeontx2-af: Fix Support of FDSA tag > > Hariprasad Kelam (3): > octeontx2-af: configure 802.3 pause frames in SGMII/QSGMII mode > octeontx2-af: map management port always to first PF > octeontx2-af: Fix default entries mcam entry action > > James Morse (1): > ACPI/MPAM: update MPAM ACPI headers > > Kiran Kumar K (2): > octeontx2-af: Fix capture PPPOE ltype > octeontx2-af: Add KPU parsing support for GRE ERSPAN > > Mikko Suni (1): > FWLOG: Correct read length with ppos > > Naveen Mamindlapalli (1): > octeontx2-bphy-netdev: Add cpri busrt packet limiter > > Nithin Dabilpuram (1): > octeontx2-af: fix CN10KB FIFO length for RPM2 > > Paul Way (1): > MMC: Fix for SD card support in cadence driver > > Piyush Malgujar (1): > soc: marvell: otx2: Add dependency in Kconfig for GHES BERT > > Ratheesh Kannoth (2): > Revert "octeontx2-pf: Set maximum queue size to 16K" > octeontx2-af: Initialize bitmap arrays. > > Ruiqiang Hao (1): > arm_mpam: replace acpi_table_mpam_msc with acpi_mpam_msc_node > > Sai Krishna (2): > octeontx2-pf: Reorder tearing down of PTP RX info work queue, mailbox > octeontx2-pf: Add ucast filter count configurability via devlink. > > Scott Rowberry (1): > firmware: octeontx2: sysfs interface for led blink rate > > Shijith Thotton (1): > octeontx2-af: reveal only TIM params that are available > > Subbaraya Sundeep (4): > octeontx2-pf: Send UP messages to VF only when VF is up. > octeontx2-pf: Reschedule up message if message data is non zero > octeontx2-af: Use separate handlers for interrupts > octeontx2-cpt: Wake up waiting process as last step > > Suman Ghosh (1): > octeontx2-af: Fix multicast/mirror group lock/unlock issue > > Sunil Goutham (1): > octeontx2-pf: Fix module compilation failure > > Witold Sadowski (1): > swup: Remove smc_update_obj_info > > drivers/acpi/arm64/mpam.c | 45 +- > drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 14 +- > drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 1 + > drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 3 +- > drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 3 +- > drivers/firmware/octeontx2/Kconfig | 22 + > drivers/firmware/octeontx2/Makefile | 2 + > drivers/firmware/octeontx2/led-blink-rate.c | 113 +++++ > drivers/firmware/octeontx2/portm-boot-cfg.c | 511 > +++++++++++++++++++++ > drivers/mmc/host/sdhci-cadence.c | 3 +- > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 5 + > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 13 +- > .../ethernet/marvell/octeontx2/af/npc_profile.h | 141 +++++- > drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 7 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 17 +- > .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 60 ++- > .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 41 +- > .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 125 +++-- > .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 95 ++-- > .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 10 +- > .../ethernet/marvell/octeontx2/bphy/bphy_common.h | 31 ++ > .../marvell/octeontx2/bphy/bphy_netdev_comm_if.h | 5 + > .../marvell/octeontx2/bphy/cnf10k_bphy_hw.h | 16 + > .../ethernet/marvell/octeontx2/bphy/cnf10k_rfoe.c | 29 +- > .../ethernet/marvell/octeontx2/bphy/otx2_bphy.h | 5 + > .../ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 14 + > .../marvell/octeontx2/bphy/otx2_bphy_main.c | 78 ++++ > .../ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 30 ++ > .../ethernet/marvell/octeontx2/bphy/otx2_cpri.h | 2 + > .../ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 25 + > .../ethernet/marvell/octeontx2/nic/otx2_common.h | 7 +- > .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 68 +++ > .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +- > .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 20 +- > .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 21 +- > drivers/soc/marvell/Kconfig | 1 + > drivers/soc/marvell/cn10ka-swup/mrvl_swup.h | 1 - > drivers/soc/marvell/fwlog.c | 1 + > include/acpi/actbl2.h | 115 +++++ > include/acpi/actbl3.h | 65 --- > include/linux/arm_mpam.h | 4 +- > 41 files changed, 1527 insertions(+), 244 deletions(-) > create mode 100644 drivers/firmware/octeontx2/led-blink-rate.c > create mode 100644 drivers/firmware/octeontx2/portm-boot-cfg.c In message: [linux-yocto][linux-yocto v6.1] kernel code for marvell octeon[RT] on 19/03/2024 Ruiqiang Hao wrote: > Hi Bruce, > > Please help to merge code into our linux-yocto repo. > > repo: > linux-yocto > branch: > v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > Thanks, > Ruiqiang > > The following changes since commit 57c649eb668991093bfa90ded01f9e6c412c8cce: > > Merge branch 'v6.1/standard/base' into > v6.1/standard/preempt-rt/cn-sdkv5.15/octeon (2024-03-10 23:19:42 -0400) > > are available in the Git repository at: > > g...@github.com:cythe/linux.git > linux-yocto/v6.1/standard/preempt-rt/cn-sdkv5.15/octeon > > for you to fetch changes up to f961e1d65633aeba6191f5622b2ac1e8515d9320: > > arm_mpam: replace acpi_table_mpam_msc with acpi_mpam_msc_node (2024-03-19 > 21:37:24 +0800) > > ---------------------------------------------------------------- > Ankur Dwivedi (1): > octeontx2-af: fix mcam hit counter > > Baha Mesleh (3): > octeontx2-bphy-netdev: ignore MCS bypass errors > octeontx2-bphy-netdev: release psm queues on exit > octeontx2-bphy-netdev: disable rx on RFOEs on exit > > Bharat Bhushan (2): > crypto/octeontx2: By default allocate one CPT LF per CPT VF > crypto: octeontx2: Honor irqaffinity passed via bootargs > > Damian Eppel (2): > firmware: octeontx2: sysfs interface for PORTM boot cfg > firmware: octeontx2: minor fixes for PORTM boot cfg > > George Cherian (1): > octeontx2-af: Fix Support of FDSA tag > > Hariprasad Kelam (3): > octeontx2-af: configure 802.3 pause frames in SGMII/QSGMII mode > octeontx2-af: map management port always to first PF > octeontx2-af: Fix default entries mcam entry action > > James Morse (1): > ACPI/MPAM: update MPAM ACPI headers > > Kiran Kumar K (2): > octeontx2-af: Fix capture PPPOE ltype > octeontx2-af: Add KPU parsing support for GRE ERSPAN > > Mikko Suni (1): > FWLOG: Correct read length with ppos > > Naveen Mamindlapalli (1): > octeontx2-bphy-netdev: Add cpri busrt packet limiter > > Nithin Dabilpuram (1): > octeontx2-af: fix CN10KB FIFO length for RPM2 > > Paul Way (1): > MMC: Fix for SD card support in cadence driver > > Piyush Malgujar (1): > soc: marvell: otx2: Add dependency in Kconfig for GHES BERT > > Ratheesh Kannoth (2): > Revert "octeontx2-pf: Set maximum queue size to 16K" > octeontx2-af: Initialize bitmap arrays. > > Ruiqiang Hao (1): > arm_mpam: replace acpi_table_mpam_msc with acpi_mpam_msc_node > > Sai Krishna (2): > octeontx2-pf: Reorder tearing down of PTP RX info work queue, mailbox > octeontx2-pf: Add ucast filter count configurability via devlink. > > Scott Rowberry (1): > firmware: octeontx2: sysfs interface for led blink rate > > Shijith Thotton (1): > octeontx2-af: reveal only TIM params that are available > > Subbaraya Sundeep (4): > octeontx2-pf: Send UP messages to VF only when VF is up. > octeontx2-pf: Reschedule up message if message data is non zero > octeontx2-af: Use separate handlers for interrupts > octeontx2-cpt: Wake up waiting process as last step > > Suman Ghosh (1): > octeontx2-af: Fix multicast/mirror group lock/unlock issue > > Sunil Goutham (1): > octeontx2-pf: Fix module compilation failure > > Witold Sadowski (1): > swup: Remove smc_update_obj_info > > drivers/acpi/arm64/mpam.c | 45 +- > drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 14 +- > drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 1 + > drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 3 +- > drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 3 +- > drivers/firmware/octeontx2/Kconfig | 22 + > drivers/firmware/octeontx2/Makefile | 2 + > drivers/firmware/octeontx2/led-blink-rate.c | 113 +++++ > drivers/firmware/octeontx2/portm-boot-cfg.c | 511 > +++++++++++++++++++++ > drivers/mmc/host/sdhci-cadence.c | 3 +- > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 5 + > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 13 +- > .../ethernet/marvell/octeontx2/af/npc_profile.h | 141 +++++- > drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 7 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 17 +- > .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 60 ++- > .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 41 +- > .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 125 +++-- > .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 95 ++-- > .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 10 +- > .../ethernet/marvell/octeontx2/bphy/bphy_common.h | 31 ++ > .../marvell/octeontx2/bphy/bphy_netdev_comm_if.h | 5 + > .../marvell/octeontx2/bphy/cnf10k_bphy_hw.h | 16 + > .../ethernet/marvell/octeontx2/bphy/cnf10k_rfoe.c | 29 +- > .../ethernet/marvell/octeontx2/bphy/otx2_bphy.h | 5 + > .../ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 14 + > .../marvell/octeontx2/bphy/otx2_bphy_main.c | 78 ++++ > .../ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 30 ++ > .../ethernet/marvell/octeontx2/bphy/otx2_cpri.h | 2 + > .../ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 25 + > .../ethernet/marvell/octeontx2/nic/otx2_common.h | 7 +- > .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 68 +++ > .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 +- > .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 20 +- > .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 21 +- > drivers/soc/marvell/Kconfig | 1 + > drivers/soc/marvell/cn10ka-swup/mrvl_swup.h | 1 - > drivers/soc/marvell/fwlog.c | 1 + > include/acpi/actbl2.h | 115 +++++ > include/acpi/actbl3.h | 65 --- > include/linux/arm_mpam.h | 4 +- > 41 files changed, 1527 insertions(+), 244 deletions(-) > create mode 100644 drivers/firmware/octeontx2/led-blink-rate.c > create mode 100644 drivers/firmware/octeontx2/portm-boot-cfg.c
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13702): https://lists.yoctoproject.org/g/linux-yocto/message/13702 Mute This Topic: https://lists.yoctoproject.org/mt/105032896/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-