> -----Original Message----- > From: Bruce Ashfield <bruce.ashfi...@gmail.com> > Sent: Thursday, July 8, 2021 3:37 AM > To: Li, Meng <meng...@windriver.com> > Cc: linux-yocto@lists.yoctoproject.org > Subject: Re: [linux-yocto]: [kernel v5.10/standard/cn-sdkv5.4/octeon]: > marvell-octeon: kernel patches update > > [Please note: This e-mail is from an EXTERNAL e-mail address] > > In message: [linux-yocto]: [kernel v5.10/standard/cn-sdkv5.4/octeon]: > marvell-octeon: kernel patches update on 06/07/2021 > meng...@windriver.com wrote: > > > From: Limeng <meng...@windriver.com> > > > > Hi Bruce, > > > > I am working on BSP marvell-cn106xx based on SDK simulator, and intend > to upgrade BSP branch to latest SDK release version. > > > > I got latest sdk patches from sdk kernel repo, and want to merge them into > linux-yocto-v5.10. > > There are 45 patches. > > > > So, could you please help to merge these patches into linux-ycoto kernel > repo, standard and preempt-rt branches? > > v5.10/standard/cn-sdkv5.4/octeon > > v5.10/standard/preempt-rt/cn-sdkv5.4/octeon > > > > The 45 patches are in my public repo > > https://github.com/limeng-linux/linux-yocto-5.10.git, branch > > v5.10/standard/cn-sdkv5.4/octeon > > I'm getting a conflict during the merge. Can you double check that branch > against the latest linux-yocto ? > > branch: v5.10/standard/cn-sdkv5.4/octeon > > Auto-merging drivers/soc/marvell/octeontx_info.c > Removing drivers/mmc/core/mmc_oops.c > Removing drivers/crypto/marvell/octeontx2/otx2_cptlf_main.c > Auto-merging drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h > CONFLICT (content): Merge conflict in > drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h > Removing drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.h > Auto-merging drivers/crypto/marvell/octeontx2/Makefile > CONFLICT (content): Merge conflict in > drivers/crypto/marvell/octeontx2/Makefile > Automatic merge failed; fix conflicts and then commit the result. >
Hi Bruce, Sorry for causing conflict. Because Marvell cn96xx and cn106xx BSP share the same branch, maybe my patches conflict with the ones submitted by Ruiqiang, Hao. We will pay attention to this case in the future. I apply the 45 patches to latest kernel tree. Could you please help to merge these patches into linux-ycoto kernel repo, standard and preempt-rt branches? v5.10/standard/cn-sdkv5.4/octeon v5.10/standard/preempt-rt/cn-sdkv5.4/octeon pull request info as below: The following changes since commit 35f3757f1280732bee31a6cbd1e68182f90a1e72: crypto: octeontx2: Fix compile error about kzfree() (2021-07-05 23:06:37 -0400) are available in the Git repository at: https://github.com/limeng-linux/linux-yocto-5.10.git v5.10/standard/cn-sdkv5.4/octeon for you to fetch changes up to 9dc448520bbc03d8f95c4798434ca17c62d2148a: octeontx2-af: cn10k: Fix APR LMT cache flush (2021-07-07 22:15:12 -0400) ---------------------------------------------------------------- Alex Leibovich (1): net: mvpp2: Add NETIF_F_HW_VLAN_CTAG_FILTER to dev->features Baowen Zheng (1): net/sched: act_police: add support for packet-per-second policing Ben Peled (1): dts: cp110: eip197: add cell index property Bhaskara Budiredla (4): drivers: mmc: cleanup mmc_oops driver drivers: mmc: Support kmsg dumper based on pstore/blk mmc: cavium: Add MMC polling method to support kmsg panic/oops write mmc: sdhci: Add sdhci polling method to support kmsg panic/oops write Damian Eppel (1): drivers: soc: marvell: phy diagnostics page access support Geetha sowjanya (3): octeontx2-af: Fix PKIND overlap between LBK and LMAC interfaces octeontx2-af: Fix max pkinds supported by hardware octeontx2-af: cn10k: Fix APR LMT cache flush Hariprasad Kelam (3): octeontx2-pf: Dont enable backpressure on lbk links octeontx2-af: Read mac address from correct offset octeontx2-pf: Dont mask out supported link modes Jayanthi Annadurai (5): drivers: soc: marvell: Add driver for managing rpram drivers: sdhci-cadence: Fix timing update drivers: marvell: rpram: Add rpram debugfs interface drivers: marvell: rpram: Change rpram driver name drivers: marvell: rpram: Check for cn10k platform Naveen Mamindlapalli (3): octeontx2-bphy-netdev: Add rfoe rx vlan forwarding configuration octeontx2-bphy-netdev: cpri: fix compilation warnings octeontx2-pf: send correct vlan priority mask to npc_install_flow_req Pavan Nikhilesh (1): octeontx2-af: invalidate GWC before accessing workslot Radha Mohan Chintakuntla (1): octeontx2-af: Fix ending channel number calculation for SDP VF Srujana Challa (5): crypto: octeontx2: sync with upstream driver crypto: cn10k: enable random number request. octeontx2-af: update inline ipsec mbox to support 98xx crypto: octeontx2: update inline ipsec mbox to support 98xx crypto: octeontx2: fix CPT block address for getting engine capabilities Stefan Chulski (1): marvell: phy-mvebu-cp110-comphy: Add power ON support for 2500BASET mode Subbaraya Sundeep (6): octeontx2-pf: Use NL_SET_ERR_MSG_MOD for TC octeontx2-pf: Implement TC police action with PPS octeontx2-pf: Change exponent and mantissa calculation octeontx2-af: Modify install flow error codes octeontx2-af: Fix TX scheduler queue config read check octeontx2-af: Fix writing to incorrect register offset Sunil Kumar Kori (1): octeontx2-af: add multicast filter support Witold Sadowski (2): sw_update: Add driver for firmware management drivers: spi: Fix mutex issue Wojciech Bartczak (5): driver: MHU: Driver adjustment for 10x based octeontx platforms driver: Add MAC management driver for OcteonTX platform driver: soc: Fix OcteonTX info driver driver: Fixes unnecessary logging from octeontx info driver driver: Fixes conversion for BOARD-MAC-ADDRESS-ID-NUM in octeontx_info Xingfeng Hu (1): flow_offload: add support for packet-per-second policing arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 + drivers/crypto/marvell/cn10k/cn10k_cptpf_ucode.c | 5 +- drivers/crypto/marvell/octeontx2/Makefile | 16 +- drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 125 +++++++++-- drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h | 405 ++++++++++++---------------------- drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c | 301 ++++++++----------------- drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.h | 106 --------- drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h | 86 +++----- drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 429 ++++++++++++++++++++++++++++++++++++ drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 198 +++++++++-------- drivers/crypto/marvell/octeontx2/otx2_cptlf_main.c | 967 -------------------------------------------------------------------------------- drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 48 +--- drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 633 ++++++++++++++++++++++++++-------------------------- drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 787 +++++++++++++++++++++++++---------------------------------------- drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 1682 ++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------- drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 46 +--- drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 14 +- drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 500 ++++++++++++++++++++++-------------------- drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h | 55 +++-- drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 382 +++++++++++++++++++++----------- drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 222 ++++++++----------- drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 231 +++++++++---------- drivers/mailbox/mvl_mhu.c | 215 +++++++++--------- drivers/mmc/core/Kconfig | 22 +- drivers/mmc/core/Makefile | 2 +- drivers/mmc/core/block.c | 18 +- drivers/mmc/core/block.h | 11 +- drivers/mmc/core/core.c | 35 ++- drivers/mmc/core/mmc_oops.c | 398 --------------------------------- drivers/mmc/core/mmcpstore.c | 232 ++++++++++++++++++++ drivers/mmc/host/cavium-thunderx.c | 8 +- drivers/mmc/host/cavium.c | 6 +- drivers/mmc/host/cavium.h | 6 +- drivers/mmc/host/sdhci-cadence.c | 21 +- drivers/mmc/host/sdhci.c | 57 +++++ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +- drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 38 +++- drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h | 3 +- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 9 + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 3 + drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 5 + drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 13 ++ drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 90 +++++--- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 11 +- drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 16 +- drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c | 18 ++ drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 10 + drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 7 +- drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 73 ++++++ drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h | 2 + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 106 +++++---- drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 2 +- drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 24 +- drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 5 - drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 74 ++++--- drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 3 +- drivers/soc/marvell/Kconfig | 32 +++ drivers/soc/marvell/Makefile | 3 + drivers/soc/marvell/cn10k-rpram.c | 243 ++++++++++++++++++++ drivers/soc/marvell/cn10ka-swup/Makefile | 7 + drivers/soc/marvell/cn10ka-swup/mrvl_swup.c | 200 +++++++++++++++++ drivers/soc/marvell/cn10ka-swup/mrvl_swup.h | 126 +++++++++++ drivers/soc/marvell/marvell_mac_mgmt.c | 281 ++++++++++++++++++++++++ drivers/soc/marvell/octeontx_info.c | 9 +- drivers/soc/marvell/phy_diag.c | 59 +++-- drivers/spi/spi-cadence-xspi.c | 2 + include/linux/mmc/card.h | 4 - include/linux/mmc/core.h | 7 +- include/linux/mmc/host.h | 11 +- include/net/flow_offload.h | 2 + include/net/sch_generic.h | 14 ++ include/net/tc_act/tc_police.h | 50 +++++ include/uapi/linux/pkt_cls.h | 2 + net/sched/act_police.c | 59 ++++- net/sched/cls_api.c | 2 + net/sched/sch_generic.c | 75 ++++--- 77 files changed, 4763 insertions(+), 5214 deletions(-) delete mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.h create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.c delete mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf_main.c delete mode 100644 drivers/mmc/core/mmc_oops.c create mode 100644 drivers/mmc/core/mmcpstore.c create mode 100644 drivers/soc/marvell/cn10k-rpram.c create mode 100644 drivers/soc/marvell/cn10ka-swup/Makefile create mode 100644 drivers/soc/marvell/cn10ka-swup/mrvl_swup.c create mode 100644 drivers/soc/marvell/cn10ka-swup/mrvl_swup.h create mode 100644 drivers/soc/marvell/marvell_mac_mgmt.c thanks, Limeng > Bruce > > > > > > > diffstat info as below: > > > > b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 > > b/drivers/crypto/marvell/cn10k/cn10k_cptpf_ucode.c | 5 > > b/drivers/crypto/marvell/octeontx2/Makefile | 18 > > b/drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 125 > > b/drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h | 405 -- > > b/drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c | 301 - > > b/drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h | 86 > > b/drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 429 ++ > > b/drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 198 - > > b/drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 48 > > b/drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 633 ++-- > > b/drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 809 ++--- > > b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 1694 +++--- > ----- > > b/drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 46 > > b/drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 14 > > b/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 500 +-- > > b/drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h | 55 > > b/drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 392 +- > > b/drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 222 - > > b/drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 231 - > > b/drivers/mailbox/mvl_mhu.c | 215 - > > b/drivers/mmc/core/Kconfig | 22 > > b/drivers/mmc/core/Makefile | 2 > > b/drivers/mmc/core/block.c | 44 > > b/drivers/mmc/core/block.h | 13 > > b/drivers/mmc/core/core.c | 67 > > b/drivers/mmc/core/mmcpstore.c | 232 + > > b/drivers/mmc/host/cavium-thunderx.c | 24 > > b/drivers/mmc/host/cavium.c | 150 > > b/drivers/mmc/host/cavium.h | 6 > > b/drivers/mmc/host/sdhci-cadence.c | 21 > > b/drivers/mmc/host/sdhci.c | 57 > > b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 > > b/drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 42 > > b/drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 > > b/drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h | 3 > > b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 9 > > b/drivers/net/ethernet/marvell/octeontx2/af/npc.h | 3 > > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 5 > > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 13 > > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 90 > > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 11 > > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 16 > > b/drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c | 18 > > b/drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 10 > > b/drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 7 > > b/drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 73 > > b/drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h | 2 > > b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 106 > > b/drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 2 > > b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 24 > > b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 5 > > b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 76 > > b/drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 3 > > b/drivers/soc/marvell/Kconfig | 32 > > b/drivers/soc/marvell/Makefile | 5 > > b/drivers/soc/marvell/cn10k-rpram.c | 32 > > b/drivers/soc/marvell/cn10ka-swup/Makefile | 7 > > b/drivers/soc/marvell/cn10ka-swup/mrvl_swup.c | 200 + > > b/drivers/soc/marvell/cn10ka-swup/mrvl_swup.h | 126 > > b/drivers/soc/marvell/marvell_mac_mgmt.c | 281 + > > b/drivers/soc/marvell/octeontx-rpram.c | 264 + > > b/drivers/soc/marvell/octeontx_info.c | 9 > > b/drivers/soc/marvell/phy_diag.c | 59 > > b/drivers/spi/spi-cadence-xspi.c | 2 > > b/include/linux/mmc/card.h | 4 > > b/include/linux/mmc/core.h | 9 > > b/include/linux/mmc/host.h | 17 > > b/include/net/flow_offload.h | 2 > > b/include/net/sch_generic.h | 14 > > b/include/net/tc_act/tc_police.h | 58 > > b/include/uapi/linux/pkt_cls.h | 2 > > b/net/sched/act_police.c | 59 > > b/net/sched/cls_api.c | 2 > > b/net/sched/sch_generic.c | 75 > > drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.h | 106 > > drivers/crypto/marvell/octeontx2/otx2_cptlf_main.c | 967 ------ > > drivers/mmc/core/mmc_oops.c | 398 -- > > 78 files changed, 4934 insertions(+), 5386 deletions(-) > > > > > > Pull request info as below: > > > > The following changes since commit > cc13c88dfed58aaab264ba49768d15c291d8a253: > > > > Merge branch 'v5.10/standard/base' into > > v5.10/standard/cn-sdkv5.4/octeon (2021-07-03 23:28:49 -0400) > > > > are available in the Git repository at: > > > > https://github.com/limeng-linux/linux-yocto-5.10.git > > v5.10/standard/cn-sdkv5.4/octeon > > > > for you to fetch changes up to > b9602129cedd754dbdc521a2bcaf7d3428f97577: > > > > octeontx2-af: cn10k: Fix APR LMT cache flush (2021-07-05 04:49:34 > > -0400) > > > > ---------------------------------------------------------------- > > Alex Leibovich (1): > > net: mvpp2: Add NETIF_F_HW_VLAN_CTAG_FILTER to dev->features > > > > Baowen Zheng (1): > > net/sched: act_police: add support for packet-per-second > > policing > > > > Ben Peled (1): > > dts: cp110: eip197: add cell index property > > > > Bhaskara Budiredla (4): > > drivers: mmc: cleanup mmc_oops driver > > drivers: mmc: Support kmsg dumper based on pstore/blk > > mmc: cavium: Add MMC polling method to support kmsg panic/oops > write > > mmc: sdhci: Add sdhci polling method to support kmsg panic/oops > > write > > > > Damian Eppel (1): > > drivers: soc: marvell: phy diagnostics page access support > > > > Geetha sowjanya (3): > > octeontx2-af: Fix PKIND overlap between LBK and LMAC interfaces > > octeontx2-af: Fix max pkinds supported by hardware > > octeontx2-af: cn10k: Fix APR LMT cache flush > > > > Hariprasad Kelam (3): > > octeontx2-pf: Dont enable backpressure on lbk links > > octeontx2-af: Read mac address from correct offset > > octeontx2-pf: Dont mask out supported link modes > > > > Jayanthi Annadurai (5): > > drivers: soc: marvell: Add driver for managing rpram > > drivers: sdhci-cadence: Fix timing update > > drivers: marvell: rpram: Add rpram debugfs interface > > drivers: marvell: rpram: Change rpram driver name > > drivers: marvell: rpram: Check for cn10k platform > > > > Naveen Mamindlapalli (3): > > octeontx2-bphy-netdev: Add rfoe rx vlan forwarding configuration > > octeontx2-bphy-netdev: cpri: fix compilation warnings > > octeontx2-pf: send correct vlan priority mask to > > npc_install_flow_req > > > > Pavan Nikhilesh (1): > > octeontx2-af: invalidate GWC before accessing workslot > > > > Radha Mohan Chintakuntla (1): > > octeontx2-af: Fix ending channel number calculation for SDP VF > > > > Srujana Challa (5): > > crypto: octeontx2: sync with upstream driver > > crypto: cn10k: enable random number request. > > octeontx2-af: update inline ipsec mbox to support 98xx > > crypto: octeontx2: update inline ipsec mbox to support 98xx > > crypto: octeontx2: fix CPT block address for getting engine > > capabilities > > > > Stefan Chulski (1): > > marvell: phy-mvebu-cp110-comphy: Add power ON support for > > 2500BASET mode > > > > Subbaraya Sundeep (6): > > octeontx2-pf: Use NL_SET_ERR_MSG_MOD for TC > > octeontx2-pf: Implement TC police action with PPS > > octeontx2-pf: Change exponent and mantissa calculation > > octeontx2-af: Modify install flow error codes > > octeontx2-af: Fix TX scheduler queue config read check > > octeontx2-af: Fix writing to incorrect register offset > > > > Sunil Kumar Kori (1): > > octeontx2-af: add multicast filter support > > > > Witold Sadowski (2): > > sw_update: Add driver for firmware management > > drivers: spi: Fix mutex issue > > > > Wojciech Bartczak (5): > > driver: MHU: Driver adjustment for 10x based octeontx platforms > > driver: Add MAC management driver for OcteonTX platform > > driver: soc: Fix OcteonTX info driver > > driver: Fixes unnecessary logging from octeontx info driver > > driver: Fixes conversion for BOARD-MAC-ADDRESS-ID-NUM in > > octeontx_info > > > > Xingfeng Hu (1): > > flow_offload: add support for packet-per-second policing > > > > arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 2 + > > drivers/crypto/marvell/cn10k/cn10k_cptpf_ucode.c | 5 +- > > drivers/crypto/marvell/octeontx2/Makefile | 18 +- > > drivers/crypto/marvell/octeontx2/otx2_cpt_common.h | 125 > +++++++++-- > > drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h | 405 > +++++++++++++---------------------- > > drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c | 301 > +++++++++----------------- > > drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.h | 106 ---- > ----- > > drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h | 86 +++----- > > drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 429 > +++++++++++++++++++++++++++++++++++++ > > drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 198 > > +++++++++--- > ----- > > drivers/crypto/marvell/octeontx2/otx2_cptlf_main.c | 967 > > -------------- > -------------------------------------------------------------------- > > drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 48 +---- > > drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 633 > +++++++++++++++++++++++++++--------------------------- > > drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c | 787 > ++++++++++++++++++++++++++----------------------------------------- > > drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 1682 > +++++++++++++++++++++++++++++++++++++++------------------------------- > ------------------------------------------------------------------------- > > drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h | 46 +--- > > drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 14 +- > > drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 500 > +++++++++++++++++++++++-------------------- > > drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h | 55 +++-- > > drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 382 > ++++++++++++++++++++++----------- > > drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 222 > +++++++++---------- > > drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 231 > ++++++++++---------- > > drivers/mailbox/mvl_mhu.c | 215 > > ++++++++++--------- > > drivers/mmc/core/Kconfig | 22 +- > > drivers/mmc/core/Makefile | 2 +- > > drivers/mmc/core/block.c | 18 +- > > drivers/mmc/core/block.h | 11 +- > > drivers/mmc/core/core.c | 35 ++- > > drivers/mmc/core/mmc_oops.c | 398 > > ------------------------- > --------- > > drivers/mmc/core/mmcpstore.c | 232 > ++++++++++++++++++++ > > drivers/mmc/host/cavium-thunderx.c | 8 +- > > drivers/mmc/host/cavium.c | 6 +- > > drivers/mmc/host/cavium.h | 6 +- > > drivers/mmc/host/sdhci-cadence.c | 21 +- > > drivers/mmc/host/sdhci.c | 57 +++++ > > drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 +- > > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 38 +++- > > drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + > > drivers/net/ethernet/marvell/octeontx2/af/lmac_common.h | 3 +- > > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 9 + > > drivers/net/ethernet/marvell/octeontx2/af/npc.h | 3 + > > drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 5 + > > drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 13 ++ > > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 90 +++++--- > > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 11 +- > > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 16 +- > > drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c | 18 ++ > > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | 10 + > > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_cpri.c | 7 +- > > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | 73 > +++++++ > > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h | 2 + > > drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 106 +++++---- > > drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 2 +- > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 24 +-- > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 5 - > > drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 74 ++++--- > > drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 3 +- > > drivers/soc/marvell/Kconfig | 32 +++ > > drivers/soc/marvell/Makefile | 3 + > > drivers/soc/marvell/cn10k-rpram.c | 243 > +++++++++++++++++++++ > > drivers/soc/marvell/cn10ka-swup/Makefile | 7 + > > drivers/soc/marvell/cn10ka-swup/mrvl_swup.c | 200 > +++++++++++++++++ > > drivers/soc/marvell/cn10ka-swup/mrvl_swup.h | 126 > +++++++++++ > > drivers/soc/marvell/marvell_mac_mgmt.c | 281 > ++++++++++++++++++++++++ > > drivers/soc/marvell/octeontx_info.c | 9 +- > > drivers/soc/marvell/phy_diag.c | 59 ++--- > > drivers/spi/spi-cadence-xspi.c | 2 + > > include/linux/mmc/card.h | 4 - > > include/linux/mmc/core.h | 7 +- > > include/linux/mmc/host.h | 11 +- > > include/net/flow_offload.h | 2 + > > include/net/sch_generic.h | 14 ++ > > include/net/tc_act/tc_police.h | 50 +++++ > > include/uapi/linux/pkt_cls.h | 2 + > > net/sched/act_police.c | 59 ++++- > > net/sched/cls_api.c | 2 + > > net/sched/sch_generic.c | 75 ++++--- > > 77 files changed, 4764 insertions(+), 5215 deletions(-) delete mode > > 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.h > > create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.c > > delete mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf_main.c > > delete mode 100644 drivers/mmc/core/mmc_oops.c create mode 100644 > > drivers/mmc/core/mmcpstore.c create mode 100644 > > drivers/soc/marvell/cn10k-rpram.c create mode 100644 > > drivers/soc/marvell/cn10ka-swup/Makefile > > create mode 100644 drivers/soc/marvell/cn10ka-swup/mrvl_swup.c > > create mode 100644 drivers/soc/marvell/cn10ka-swup/mrvl_swup.h > > create mode 100644 drivers/soc/marvell/marvell_mac_mgmt.c > > > > > > > > thanks, > > Limeng
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#10079): https://lists.yoctoproject.org/g/linux-yocto/message/10079 Mute This Topic: https://lists.yoctoproject.org/mt/84014534/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
