On Wed, Jun 17, 2020 at 3:30 AM Kevin Hao <[email protected]> wrote: > > Hi Bruce, > > Here is another patch series for the Marvell cn96xx SoC support. The main > changes are for the crypto and Ethernet bug fixes. Could you help me merge > this into the following two branches: > v5.4/standard/cn96xx > v5.4/standard/preempt-rt/cn96xx >
merged. I had a conflict in arch/arm64/include/asm/cpucaps.h on the preempt-rt branch, but it was trivial. Tht being said, double check my resolution and send any patches as necessary. Cheers, Bruce > > The following changes since commit efbe182605d1c50715ae0eea55b96465c8435441: > > Merge branch 'v5.4/standard/base' into v5.4/standard/cn96xx (2020-06-11 > 09:26:02 -0400) > > are available in the Git repository at: > > git://github.com/haokexin/linux v5.4/standard/cn96xx > > for you to fetch changes up to d7c7bc1e39c4d85ec095842df640e4198f6d0f98: > > octeontx2-bphy-netdev: Added ioctl to access RFOE_RX_IND registers > (2020-06-16 13:37:31 +0800) > > ---------------------------------------------------------------- > Chandrakala Chavva (2): > octeontx2-serdes: Update PRBS APIs to start/stop per QLM lane > octeontx2-serdes: Fix parameter passed to start_prbs(). > > Geetha sowjanya (1): > octeontx2-pf: Fix TCP/UDP checksum offload for IPv6 pkts > > Hariprasad Kelam (5): > octeontx2-af: add parser support for Forward DSA > octeontx2-af: Add flow steering support for FDSA tag > octeontx2-pf: Add ntuple filter support for FDSA > octeontx2-af: Increase mbox response timeout to 3 seconds > octeontx2-pf: Stop tx queues in case of subsequent calls failure > > Kiran Kumar K (1): > octeontx2-af: Add CUSTOM0 to flow keyx algo > > Linu Cherian (6): > coresight: Cover newer Octeontx2 chip revs/variants for relevant quirks > coresight: Correct OcteonTx2 QUIRK_BUFFSIZE_8BX applicability > coresight: Increase register poll timeout > octeontx2-af: Add new silicon variant Loki > octeontx2-af: Reduce dependency on firmware command interface version > coresight: etr: Fix CSETR_QUIRK_BUFFSIZE_8BXA quirk check > > Naveen Mamindlapalli (6): > OcteonTX2 BPHY RFOE netdev driver initial version > octeontx2-bphy-netdev: added full packet dump of mbt buffer > octeontx2-bphy-netdev: fix napi scheduling issue when interface is down > octeontx2-bphy-netdev: netdev cleanup in char dev close > octeontx2-bphy-netdev: Added support for configurable packet types > octeontx2-bphy-netdev: Added ioctl to access RFOE_RX_IND registers > > Nithin Dabilpuram (3): > octeontx2-af: enable tx shaping feature for 96xx C0 > octeontx2-af: clear sw xoff before flush > octeontx2-af: wait for tx link idle for credits change > > Radha Mohan Chintakuntla (5): > misc: mrvl-loki: Setup callback function from interrupt handler > misc: mrvl-loki: Use msix_cap instead of msi_cap > misc: mrvl-loki: Add function to unregister the irq callback > octeontx2-af: Make SSO/SSOW LF teardown less CPU intensive > octeontx2-af: Fix reading SSOW_LF_GWS_TAG after rvu_poll_reg() > > Rakesh Babu (3): > octeontx2-af: Add support for NIX1, CPT1 and NDC_NIX1 > octeontx2-af: Initialize NIX1 block > octeontx2-af: Display NIX1 also in debugfs > > Rick Farrington (2): > drivers: marvell: otx2-sdei-ghes: Add misc documentation. > drivers: marvell: otx2-sdei-ghes: Set GHES block_status correctly. > > Satheesh Paul A (1): > octeontx2-af: support for custom L2 header > > Smadar Fuks (2): > octeontx2-af: Introducing REE block for 98xx > octeontx2-af: Add new Mbox messages and handlers for new REE blocks > > SrujanaChalla (4): > drivers: crypto: add support for OCTEON TX CPT engine > drivers: crypto: add the Virtual Function driver for CPT > crypto: create common Kconfig and Makefile for Marvell > crypto: marvell: enable OcteonTX cpt options for build > > Subbaraya Sundeep (17): > octeontx2-af: Disable default NPC entries properly > octeontx2-af: Synchronize mcam rule list ops > octeontx2-af: Update get_rsrc_map for new blocks > octeontx2-af: Return assigned NIX/CPT block address > octeontx2-af: Map NIX block from CGX connection > octeontx2-af: Setup MCE context for assigned NIX > octeontx2-af: Fix MSIX handler mailbox > octeontx2-af: Fix cpt_rd_wr_register mailbox > octeontx2-af: Add new REE blocks to AF > octeontx2-af: Assign NIX block addresses > octeontx2-af: Mbox changes for 98xx > octeontx2-af: Get block address from slot number > octeontx2-af: Add NIX1 interfaces to NPC > octeontx2-pf: Calculate LBK link correctly > octeontx2-af: Do not change maximum NPC interfaces > octeontx2-af: Fix nix_inline_ipsec_cfg mailbox > octeontx2-af: Enable PF BCAST entry for packet replication > > Suneel Garapati (4): > drivers: spi: Use rcvd_present instead of MIDR check > drivers: mtd: spi-nor-ids: Rename mx25l12805d to mx25l12845g > drivers: mtd: spi-nor: Fix missing rename of mx25l12805d > drivers: mtd: spi-nor-ids: Rename mx25l6405d to mx25l6433f > > Sunil Kumar Kori (1): > octeontx2-af: fix DMAC filter table corruption > > MAINTAINERS | > 2 + > drivers/crypto/Kconfig | > 15 +- > drivers/crypto/Makefile | > 2 +- > drivers/crypto/marvell/Kconfig | > 37 +++ > drivers/crypto/marvell/Makefile | > 4 + > drivers/crypto/marvell/octeontx/Makefile | > 6 + > drivers/crypto/marvell/octeontx/otx_cpt_common.h | > 51 ++++ > drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h | > 824 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptpf.h | > 34 +++ > drivers/crypto/marvell/octeontx/otx_cptpf_main.c | > 307 ++++++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c | > 253 +++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | > 1686 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h | > 180 ++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptvf.h | > 104 +++++++ > drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | > 1682 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptvf_algs.h | > 188 +++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptvf_main.c | > 985 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c | > 247 ++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c | > 643 ++++++++++++++++++++++++++++++++++++++++++ > drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h | > 194 +++++++++++++ > drivers/hwtracing/coresight/coresight-priv.h | > 5 +- > drivers/hwtracing/coresight/coresight-quirks.c | > 31 ++- > drivers/hwtracing/coresight/coresight-tmc-etr.c | > 2 +- > drivers/misc/Kconfig | > 2 +- > drivers/misc/mrvl-loki.c | > 95 ++++++- > drivers/mtd/spi-nor/spi-nor.c | > 6 +- > drivers/net/ethernet/marvell/octeontx2/Kconfig | > 8 + > drivers/net/ethernet/marvell/octeontx2/Makefile | > 1 + > drivers/net/ethernet/marvell/octeontx2/af/Makefile | > 2 +- > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | > 58 +++- > drivers/net/ethernet/marvell/octeontx2/af/cgx.h | > 6 + > drivers/net/ethernet/marvell/octeontx2/af/cgx_fw_if.h | > 4 + > drivers/net/ethernet/marvell/octeontx2/af/common.h | > 10 +- > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | > 143 +++++++++- > drivers/net/ethernet/marvell/octeontx2/af/npc.h | > 12 +- > drivers/net/ethernet/marvell/octeontx2/af/npc_profile.h | > 421 +++++++++++++++++++++++++++- > drivers/net/ethernet/marvell/octeontx2/af/rvu.c | > 573 ++++++++++++++++++++++++++++++++------ > drivers/net/ethernet/marvell/octeontx2/af/rvu.h | > 59 +++- > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | > 15 + > drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c | > 21 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c | > 235 +++++++++++----- > drivers/net/ethernet/marvell/octeontx2/af/rvu_fixes.c | > 23 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | > 648 +++++++++++++++++++++++++++++++++--------- > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | > 364 +++++++++++++++++------- > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | > 147 +++++----- > drivers/net/ethernet/marvell/octeontx2/af/rvu_ree.c | > 1210 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.c | > 6 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h | > 164 +++++++++-- > drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c | > 30 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_struct.h | > 89 ++++-- > drivers/net/ethernet/marvell/octeontx2/af/rvu_validation.c | > 92 ++++-- > drivers/net/ethernet/marvell/octeontx2/bphy/Makefile | > 8 + > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h | > 264 ++++++++++++++++++ > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c | > 1679 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h | > 227 +++++++++++++++ > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe_ethtool.c | > 123 ++++++++ > drivers/net/ethernet/marvell/octeontx2/bphy/rfoe_bphy_netdev_comm_if.h | > 173 ++++++++++++ > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | > 8 +- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | > 19 +- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | > 107 ++++++- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_flows.c | > 6 +- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | > 20 +- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | > 1 + > drivers/soc/marvell/octeontx2-ghes/otx2-sdei-ghes.c | > 47 ++-- > drivers/soc/marvell/octeontx2-ghes/otx2-sdei-ghes.h | > 17 +- > drivers/soc/marvell/octeontx2-serdes/serdes_debugfs.c | > 48 +++- > drivers/spi/spi-octeontx2.c | > 13 +- > drivers/spi/spi-octeontx2.h | > 1 + > 68 files changed, 14015 insertions(+), 672 deletions(-) > create mode 100644 drivers/crypto/marvell/Kconfig > create mode 100644 drivers/crypto/marvell/Makefile > create mode 100644 drivers/crypto/marvell/octeontx/Makefile > create mode 100644 drivers/crypto/marvell/octeontx/otx_cpt_common.h > create mode 100644 drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf.h > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_main.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_mbox.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptpf_ucode.h > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf.h > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_algs.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_algs.h > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_main.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.c > create mode 100644 drivers/crypto/marvell/octeontx/otx_cptvf_reqmgr.h > create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_ree.c > create mode 100644 drivers/net/ethernet/marvell/octeontx2/bphy/Makefile > create mode 100644 drivers/net/ethernet/marvell/octeontx2/bphy/otx2_bphy_hw.h > create mode 100644 drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.c > create mode 100644 drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe.h > create mode 100644 > drivers/net/ethernet/marvell/octeontx2/bphy/otx2_rfoe_ethtool.c > create mode 100644 > drivers/net/ethernet/marvell/octeontx2/bphy/rfoe_bphy_netdev_comm_if.h > > Thanks, > Kevin > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8767): https://lists.yoctoproject.org/g/linux-yocto/message/8767 Mute This Topic: https://lists.yoctoproject.org/mt/74933140/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
