In message: [linux-yocto-dev v5.4] Another patch series for the Marvell cn96xx SoC support on 16/01/2020 Kevin Hao wrote:
> Hi Bruce, > > Here is another patch series for the Marvell cn96xx SoC support. The main > parts > of this series are for the gpio and Ethernet driver update. Others are the > misc > driver bug fixes. Please help me merge these patches into the following two > branches: > standard/cn96xx > v5.4/standard/cn96xx standard/base is now v5.5, and I checked, this won't merge without lots of conflicts there. So I've merged it to v5.4 and pushed to the servers. Bruce > > Besides the patch from the Marvell SDK, there is a commit f5651ef64694 > (Revert "gpio: thunderx: Switch to GPIOLIB_IRQCHIP") from me to revert a gpio > patch in mainline. This patch has been merged into the linux-gpio git repo, > and finally > should be merged into mainline and then populate into linux-yocto via stable > update. > But we can't tolerate the delay for waiting it merged via stable update > because > it broke the gpio function on cn96xx board and two SDK patches also have a > dependency > on it. So I cherry pick it in this patch series. That is to say, in the future > you may get merge conflict in the gpio driver when merging the stable update > which > also include this patch. But the fix should be easy, you just need to keep the > content as what we have now. > > The following changes since commit d3b05e4f8172296d0925bfd97fc6e28b8cdf6fac: > > Merge branch 'standard/base' into standard/cn96xx (2020-01-06 23:05:14 > -0500) > > are available in the Git repository at: > > git://github.com/haokexin/linux standard/cn96xx > > for you to fetch changes up to 2ddf2489924d04c7ff9d24ab2c2034179d7a4b38: > > octeontx2-pf: Use likely and unlikely (2020-01-16 10:58:21 +0800) > > ---------------------------------------------------------------- > Bharat Bhushan (1): > perf/smmuv3: Fix programming event type with global filtering > > Felix Manlunas (1): > octeontx2-af: Add new CGX_CMD to get PHY FEC statistics > > Geetha sowjanya (3): > octeontx2-af: Fix return value in npc_set_pkind > octeontx2-pf: Remove ARM64 and LSE_ATOMICS dependency > octeontx2-pf: Remove warning messages in fast path > > Harman Kalra (1): > octeontx2-af: Undo PTP NPC config in FLR > > Kevin Hao (1): > Revert "gpio: thunderx: Switch to GPIOLIB_IRQCHIP" > > Maciej Czekaj (1): > arm64: Fix workaround for Marvell erratum 37119 > > Peter Swain (1): > gpio: thunderx: avoid potential deadlock > > Radha Mohan Chintakuntla (2): > gpio: thunderx: Fix interrupt support for kernel driver > drivers: cleanup el3 handler only if parent process exits > > Subbaraya Sundeep (3): > PCI: Assign bus numbers present in EA capability for bridges > PCI: Do not use bus number zero from EA capability > octeontx2-pf: Discover NIX block address from RVUM > > Suneel Garapati (3): > drivers: spi: octeontx2: set tritx in config register > drivers: mtd: spi-nor: update 4B_OPCODES flag for n25q00 and mx66l1g45g > drivers: spi: octeontx2: use read after write for MPI_CFG > > Sunil Goutham (2): > octeontx2-pf: Process CQE_TX first and then CQE_RX > octeontx2-pf: Use likely and unlikely > > arch/arm64/kernel/entry.S | 2 +- > drivers/gpio/Kconfig | 2 +- > drivers/gpio/gpio-thunderx.c | 342 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- > drivers/misc/otx_bphy_ctr.c | 3 +- > drivers/mtd/spi-nor/spi-nor.c | 4 +- > drivers/net/ethernet/marvell/octeontx2/Kconfig | 3 +- > drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 12 ++++ > drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + > drivers/net/ethernet/marvell/octeontx2/af/cgx_fw_if.h | 3 + > drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 16 ++++- > drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 4 ++ > drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 10 +++ > drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 5 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c | 2 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_sso.c | 5 +- > drivers/net/ethernet/marvell/octeontx2/af/rvu_tim.c | 4 ++ > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c | 32 +++++---- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h | 49 > +++++++++++--- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 60 > ++++++++++++++-- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 11 +-- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_smqvf.c | 6 -- > drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 42 +++++------- > drivers/pci/probe.c | 60 > ++++++++++++++-- > drivers/perf/arm_smmuv3_pmu.c | 5 +- > drivers/spi/spi-octeontx2.c | 9 ++- > include/uapi/linux/pci_regs.h | 6 ++ > 26 files changed, 549 insertions(+), 149 deletions(-) > > Thanks, > Kevin >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8325): https://lists.yoctoproject.org/g/linux-yocto/message/8325 Mute This Topic: https://lists.yoctoproject.org/mt/69742458/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
