From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A348C433F5 for ; Wed, 4 May 2022 09:27:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1B02983EA9; Wed, 4 May 2022 11:26:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1651656419; bh=WFtkzICwq2DbjFyiWsTuZQ+SDpR3+XzVFSOdPWSKGzU=; h=Date:To:From:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=kNmsQwtwASwgFHXcUdmRxAUWBcMIBjCjSzG9vqs+hONlaaR4fbfn9tmpI5z/PQbVU +nU++LeDLf9+2haKYdf93IqeYhkbj+rYqM0wg25bLwtonG5mUQlFPuq6UwIkCrt6AK 0t7p2xXrD2+cbOl6prRIJ4SWHe2e9709nWyJfcfOVI01ppHiC62I2vCxhw7CggPhD3 GUid/GrORQBXgz33cFhw0zP+oCay5Lv3YiVBW0HxVR7oduktRMqjK1x1MURXx/fNYW xnb7nP7M6NKynIth65jGUkuV88rOc1g+x8ok1HPAqw8ggzggmItRSMP+0VxQGwPf0w 3lLzm/38fdDSQ== Received: by phobos.denx.de (Postfix, from userid 109) id E829283EA9; Wed, 4 May 2022 11:26:55 +0200 (CEST) Received: from mout-u-107.mailbox.org (mout-u-107.mailbox.org [91.198.250.252]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1F8DE83FD3 for ; Wed, 4 May 2022 11:26:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=sr@denx.de Received: from smtp102.mailbox.org (unknown [91.198.250.119]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-u-107.mailbox.org (Postfix) with ESMTPS id 4KtWg95q8tz9sTD; Wed, 4 May 2022 11:26:45 +0200 (CEST) Message-ID: Date: Wed, 4 May 2022 11:26:40 +0200 MIME-Version: 1.0 Content-Language: en-US To: Tom Rini , U-Boot Mailing List From: Stefan Roese Subject: Please pull u-boot-marvell/master Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Hi Tom, please pull this next batch of Marvell related patches. Some of them are network driver related and are reviewed by Ramon. I also have the ack from Daniel to push the MIPS related patches via this tree: ---------------------------------------------------------------- - mips: octeon: Add ethernet support (Aaron & Stefan) - Misc mvneta changes, cleanups, fixes (Marek) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=190&view=results Thanks, Stefan The following changes since commit 46eb29201c17e1273d1cabeafde378b0759c0d7d: Merge branch '2022-05-03-virtio-pci-add-and-fix-consistency-checks' (2022-05-03 18:33:46 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 95a3a6ee086d47a8e0cd573e327fd48a97d87439: net: mvneta: Drop unneeded macro (2022-05-04 07:05:51 +0200) ---------------------------------------------------------------- Aaron Williams (40): mips: octeon: Add misc cvmx-* header files mips: octeon: Add cvmx-ilk-defs.h header file mips: octeon: Add cvmx-iob-defs.h header file mips: octeon: Add cvmx-lbk-defs.h header file mips: octeon: Add cvmx-npei-defs.h header file mips: octeon: Add cvmx-pcsxx-defs.h header file mips: octeon: Add cvmx-xcv-defs.h header file mips: octeon: Add cvmx-helper-agl.c mips: octeon: Add cvmx-helper-bgx.c mips: octeon: Add cvmx-helper-board.c mips: octeon: Add cvmx-helper-fpa.c mips: octeon: Add cvmx-helper-ilk.c mips: octeon: Add cvmx-helper-ipd.c mips: octeon: Add cvmx-helper-loop.c mips: octeon: Add cvmx-helper-npi.c mips: octeon: Add cvmx-helper-pki.c mips: octeon: Add cvmx-helper-pko.c mips: octeon: Add cvmx-helper-pko3.c mips: octeon: Add cvmx-helper-rgmii.c mips: octeon: Add cvmx-helper-sgmii.c mips: octeon: Add cvmx-helper-sfp.c mips: octeon: Add cvmx-helper-xaui.c mips: octeon: Add cvmx-agl.c mips: octeon: Add cvmx-cmd-queue.c mips: octeon: Add cvmx-fau-compat.c mips: octeon: Add cvmx-fpa.c mips: octeon: Add cvmx-fpa-resource.c mips: octeon: Add cvmx-global-resource.c mips: octeon: Add cvmx-ilk.c mips: octeon: Add cvmx-ipd.c mips: octeon: Add cvmx-pki.c mips: octeon: Add cvmx-pki-resources.c mips: octeon: Add cvmx-pko.c mips: octeon: Add cvmx-pko3.c mips: octeon: Add cvmx-pko3-queue.c mips: octeon: Add cvmx-pko3-compat.c mips: octeon: Add cvmx-pko3-resources.c mips: octeon: Add cvmx-pko-internal-ports-range.c mips: octeon: Add cvmx-qlm-tables.c mips: octeon: Add cvmx-range.c Marek Behún (19): net: mvneta: Get rid of platdata net: mvneta: Fix 10Mbps speed net: mvneta: Use DM MDIO API for connecting PHY net: mvneta: Remember fixed link instead of PHY address in priv data arm: mvebu: Espressobin: Use DM registered MDIO to configure switch net: mdio-uclass: add dm_phy_find_by_ofnode() helper arm: mvebu: turris_mox: Use DM registered MDIO net: mvneta: Don't register MDIO bus net: mvneta: Fix unused variable warning if DM_GPIO is disabled net: mvneta: Drop one indentation level in mvneta_adjust_link() net: mvneta: Use bool instead of int for boolean variable net: mvneta: Drop unnecessary space net: mvneta: Don't check for CONFIG_PHYLIB net: mvneta: Rename CONFIG_NR_CPUS to MVNETA_NR_CPUS net: mvneta: Convert to use PHY_FIXED for fixed-link net: mvneta: Write PHY address just before enabling HW polling net: mvneta: Drop fixed_link member from private struct net: mvneta: Disable fixed PHY code if PHY_FIXED is not compiled in net: mvneta: Drop unneeded macro Stefan Roese (12): mips: octeon: Misc changes to existing headers for upcoming eth support mips: octeon: Misc changes to existing C files for upcoming eth support mips: octeon: Makefile: Enable building of the newly added C files mips: octeon: cpu.c: Move bootmem init to arch_early_init_r() mips: octeon: cpu.c: Implement configure_lmtdma_window() mips: octeon: octeon_common.h: Move init SP because of increased image size mips: octeon: mrvl, cn73xx.dtsi: Add ethernet (BGX) and SMI DT nodes mips: octeon: mrvl, octeon-ebb7304.dts: Add ethernet DT support mips: octeon: mrvl, octeon-nic23.dts: Add ethernet DT support net: Add ethernet support for MIPS Octeon mips: octeon: ebb7304: Enable ethernet support mips: octeon: nic23: Enable ethernet support arch/arm/dts/armada-3720-turris-mox-u-boot.dtsi | 19 - arch/mips/Kconfig | 1 + arch/mips/dts/mrvl,cn73xx.dtsi | 35 + arch/mips/dts/mrvl,octeon-ebb7304.dts | 45 + arch/mips/dts/mrvl,octeon-nic23.dts | 238 ++ arch/mips/mach-octeon/Makefile | 35 +- arch/mips/mach-octeon/cpu.c | 47 +- arch/mips/mach-octeon/cvmx-agl.c | 216 ++ arch/mips/mach-octeon/cvmx-bootmem.c | 3 +- arch/mips/mach-octeon/cvmx-cmd-queue.c | 355 ++ arch/mips/mach-octeon/cvmx-fau-compat.c | 53 + arch/mips/mach-octeon/cvmx-fpa-resource.c | 219 ++ arch/mips/mach-octeon/cvmx-fpa.c | 1127 +++++++ arch/mips/mach-octeon/cvmx-global-resources.c | 517 +++ arch/mips/mach-octeon/cvmx-helper-agl.c | 231 ++ arch/mips/mach-octeon/cvmx-helper-bgx.c | 2737 +++++++++++++++ arch/mips/mach-octeon/cvmx-helper-board.c | 1824 ++++++++++ arch/mips/mach-octeon/cvmx-helper-cfg.c | 655 +--- arch/mips/mach-octeon/cvmx-helper-fdt.c | 898 ++--- arch/mips/mach-octeon/cvmx-helper-fpa.c | 76 + arch/mips/mach-octeon/cvmx-helper-ilk.c | 902 +++++ arch/mips/mach-octeon/cvmx-helper-ipd.c | 286 ++ arch/mips/mach-octeon/cvmx-helper-loop.c | 178 + arch/mips/mach-octeon/cvmx-helper-npi.c | 137 + arch/mips/mach-octeon/cvmx-helper-pki.c | 549 +++ arch/mips/mach-octeon/cvmx-helper-pko.c | 203 ++ arch/mips/mach-octeon/cvmx-helper-pko3.c | 1088 ++++++ arch/mips/mach-octeon/cvmx-helper-rgmii.c | 398 +++ arch/mips/mach-octeon/cvmx-helper-sfp.c | 1309 ++++++++ arch/mips/mach-octeon/cvmx-helper-sgmii.c | 781 +++++ arch/mips/mach-octeon/cvmx-helper-util.c | 248 -- arch/mips/mach-octeon/cvmx-helper-xaui.c | 518 +++ arch/mips/mach-octeon/cvmx-helper.c | 845 +---- arch/mips/mach-octeon/cvmx-ilk.c | 1199 +++++++ arch/mips/mach-octeon/cvmx-ipd.c | 149 + arch/mips/mach-octeon/cvmx-pki-resources.c | 285 ++ arch/mips/mach-octeon/cvmx-pki.c | 910 +++++ .../mach-octeon/cvmx-pko-internal-ports-range.c | 99 + arch/mips/mach-octeon/cvmx-pko.c | 788 +++++ arch/mips/mach-octeon/cvmx-pko3-compat.c | 656 ++++ arch/mips/mach-octeon/cvmx-pko3-queue.c | 879 +++++ arch/mips/mach-octeon/cvmx-pko3-resources.c | 213 ++ arch/mips/mach-octeon/cvmx-pko3.c | 786 +++++ arch/mips/mach-octeon/cvmx-qlm-tables.c | 292 ++ arch/mips/mach-octeon/cvmx-range.c | 259 ++ arch/mips/mach-octeon/include/mach/cvmx-agl.h | 45 + arch/mips/mach-octeon/include/mach/cvmx-bootmem.h | 3 +- arch/mips/mach-octeon/include/mach/cvmx-config.h | 128 + arch/mips/mach-octeon/include/mach/cvmx-fau.h | 581 ++++ arch/mips/mach-octeon/include/mach/cvmx-fpa.h | 3 +- arch/mips/mach-octeon/include/mach/cvmx-fpa3.h | 37 - .../mach-octeon/include/mach/cvmx-helper-board.h | 6 +- .../mach-octeon/include/mach/cvmx-helper-fdt.h | 40 +- .../mach-octeon/include/mach/cvmx-helper-pko.h | 2 +- arch/mips/mach-octeon/include/mach/cvmx-helper.h | 20 + arch/mips/mach-octeon/include/mach/cvmx-ilk-defs.h | 2269 +++++++++++++ arch/mips/mach-octeon/include/mach/cvmx-iob-defs.h | 1328 ++++++++ arch/mips/mach-octeon/include/mach/cvmx-lbk-defs.h | 157 + arch/mips/mach-octeon/include/mach/cvmx-mdio.h | 516 +++ .../mips/mach-octeon/include/mach/cvmx-npei-defs.h | 3550 ++++++++++++++++++++ .../mach-octeon/include/mach/cvmx-pcsxx-defs.h | 787 +++++ .../mach-octeon/include/mach/cvmx-pki-cluster.h | 343 ++ arch/mips/mach-octeon/include/mach/cvmx-pko.h | 213 ++ .../mach-octeon/include/mach/cvmx-pko3-resources.h | 36 + arch/mips/mach-octeon/include/mach/cvmx-pko3.h | 1052 ++++++ arch/mips/mach-octeon/include/mach/cvmx-range.h | 23 + arch/mips/mach-octeon/include/mach/cvmx-regs.h | 100 +- arch/mips/mach-octeon/include/mach/cvmx-xcv-defs.h | 226 ++ arch/mips/mach-octeon/include/mach/octeon_eth.h | 54 +- board/CZ.NIC/turris_mox/turris_mox.c | 88 +- board/Marvell/mvebu_armada-37xx/board.c | 26 +- board/Marvell/octeon_nic23/board.c | 87 +- configs/clearfog_defconfig | 1 + configs/controlcenterdc_defconfig | 1 + configs/db-88f6820-amc_defconfig | 1 + configs/db-88f6820-gp_defconfig | 1 + configs/db-mv784mp-gp_defconfig | 1 + configs/ds414_defconfig | 1 + configs/helios4_defconfig | 1 + configs/maxbcm_defconfig | 1 + configs/mvebu_espressobin-88f3720_defconfig | 3 + configs/octeon_ebb7304_defconfig | 7 + configs/octeon_nic23_defconfig | 10 +- configs/theadorable_debug_defconfig | 1 + configs/turris_mox_defconfig | 1 + configs/turris_omnia_defconfig | 2 + configs/uDPU_defconfig | 1 + drivers/net/Kconfig | 8 + drivers/net/Makefile | 1 + drivers/net/mvneta.c | 343 +- drivers/net/octeon/Makefile | 6 + drivers/net/octeon/octeon_eth.c | 1060 ++++++ drivers/net/octeon/octeon_mdio.c | 226 ++ include/configs/octeon_common.h | 2 +- include/configs/octeon_ebb7304.h | 2 + include/miiphy.h | 9 + net/mdio-uclass.c | 22 + 97 files changed, 33853 insertions(+), 2867 deletions(-) create mode 100644 arch/mips/mach-octeon/cvmx-agl.c create mode 100644 arch/mips/mach-octeon/cvmx-cmd-queue.c create mode 100644 arch/mips/mach-octeon/cvmx-fau-compat.c create mode 100644 arch/mips/mach-octeon/cvmx-fpa-resource.c create mode 100644 arch/mips/mach-octeon/cvmx-fpa.c create mode 100644 arch/mips/mach-octeon/cvmx-global-resources.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-agl.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-bgx.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-board.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-fpa.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-ilk.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-ipd.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-loop.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-npi.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-pki.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-pko.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-pko3.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-rgmii.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-sfp.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-sgmii.c create mode 100644 arch/mips/mach-octeon/cvmx-helper-xaui.c create mode 100644 arch/mips/mach-octeon/cvmx-ilk.c create mode 100644 arch/mips/mach-octeon/cvmx-ipd.c create mode 100644 arch/mips/mach-octeon/cvmx-pki-resources.c create mode 100644 arch/mips/mach-octeon/cvmx-pki.c create mode 100644 arch/mips/mach-octeon/cvmx-pko-internal-ports-range.c create mode 100644 arch/mips/mach-octeon/cvmx-pko.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3-compat.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3-queue.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3-resources.c create mode 100644 arch/mips/mach-octeon/cvmx-pko3.c create mode 100644 arch/mips/mach-octeon/cvmx-qlm-tables.c create mode 100644 arch/mips/mach-octeon/cvmx-range.c create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-agl.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-config.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-fau.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-ilk-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-iob-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-lbk-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-mdio.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-npei-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pcsxx-defs.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pki-cluster.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko3-resources.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-pko3.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-range.h create mode 100644 arch/mips/mach-octeon/include/mach/cvmx-xcv-defs.h create mode 100644 drivers/net/octeon/Makefile create mode 100644 drivers/net/octeon/octeon_eth.c create mode 100644 drivers/net/octeon/octeon_mdio.c