W dniu 09.06.2019 o 09:29, Hauke Mehrtens pisze: > On 6/5/19 4:31 PM, Tomasz Maciej Nowak wrote: >> From: Marko Ratkaj <[email protected]> >> >> Cc: Vladimir Vid <[email protected]> >> Signed-off-by: Marko Ratkaj <[email protected]> >> [added sfp related patches from Russell King] >> Signed-off-by: Marek Behún <[email protected]> >> [rebase; rework patches; separate and cleanup kernel configs; >> add espessobin dts; adjust venom dts] >> Signed-off-by: Tomasz Maciej Nowak <[email protected]> >> --- >> target/linux/mvebu/Makefile | 1 + >> target/linux/mvebu/config-4.19 | 501 ++++++++++++ >> .../cortexa53/{config-default => config-4.14} | 0 >> target/linux/mvebu/cortexa53/config-4.19 | 114 +++ >> .../cortexa72/{config-default => config-4.14} | 0 >> target/linux/mvebu/cortexa72/config-4.19 | 122 +++ >> .../arm/boot/dts/armada-385-linksys-venom.dts | 213 +++++ >> .../marvell/armada-3720-espressobin-emmc.dts | 28 + >> .../armada-3720-espressobin-v7-emmc.dts | 43 + >> .../marvell/armada-3720-espressobin-v7.dts | 31 + >> .../patches-4.19/002-add_powertables.patch | 770 ++++++++++++++++++ >> .../patches-4.19/003-add_switch_nodes.patch | 40 + >> .../004-add_sata_disk_activity_trigger.patch | 39 + >> ...5-linksys_hardcode_nand_ecc_settings.patch | 17 + >> ...Mangle-bootloader-s-kernel-arguments.patch | 201 +++++ >> .../patches-4.19/100-find_active_root.patch | 60 ++ >> .../patches-4.19/102-revert_i2c_delay.patch | 15 + >> .../205-armada-385-rd-mtd-partitions.patch | 19 + >> .../206-ARM-mvebu-385-ap-Add-partitions.patch | 35 + >> .../210-clearfog_switch_node.patch | 21 + >> .../220-disable-untested-dsa-boards.patch | 30 + >> ...-armada-xp-linksys-mamba-broken-idle.patch | 10 + >> .../300-mvneta-tx-queue-workaround.patch | 35 + >> ...dicate-failure-to-enter-deeper-sleep.patch | 40 + >> ...-pci-mvebu-time-out-reset-on-link-up.patch | 60 ++ >> ...-call-mac_config-during-resolve-when.patch | 44 + >> ...ink-ensure-inband-AN-works-correctly.patch | 59 ++ >> ...etdev-sfp_bus-and-use-for-start-stop.patch | 39 + >> ...5-net-phy-marvell10g-add-SFP-support.patch | 155 ++++ >> .../406-sfp-add-sfp-compatible.patch | 24 + >> ...7-sfp-display-SFP-module-information.patch | 297 +++++++ >> .../408-sfp-more-cotsworks-fixes.patch | 44 + >> ...da388-clearfog-emmc-on-clearfog-base.patch | 87 ++ >> ...rmada388-clearfog-document-MPP-usage.patch | 124 +++ >> .../patches-4.19/450-reprobe_sfp_phy.patch | 94 +++ >> ...l-armada37xx-Add-emmc-sdio-pinctrl-d.patch | 40 + >> ...l-armada-37xx-Enable-emmc-on-espress.patch | 49 ++ >> ...ts-marvell-armada37xx-Add-eth0-alias.patch | 20 + >> ...da-3720-espressobin-correct-spi-node.patch | 58 ++ >> ...l-armada-3720-espressobin-add-ports-.patch | 26 + >> ...rdvark-Convert-to-use-pci_host_probe.patch | 44 + >> ...-device-to-the-same-MAX-payload-size.patch | 138 ++++ >> ...ardvark-disable-LOS-state-by-default.patch | 55 ++ >> ...ark-allow-to-specify-link-capability.patch | 43 + >> ...-3720-espressobin-set-max-link-to-ge.patch | 73 ++ >> 45 files changed, 3958 insertions(+) >> create mode 100644 target/linux/mvebu/config-4.19 >> rename target/linux/mvebu/cortexa53/{config-default => config-4.14} (100%) >> create mode 100644 target/linux/mvebu/cortexa53/config-4.19 >> rename target/linux/mvebu/cortexa72/{config-default => config-4.14} (100%) >> create mode 100644 target/linux/mvebu/cortexa72/config-4.19 >> create mode 100644 >> target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-385-linksys-venom.dts >> create mode 100644 >> target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-espressobin-emmc.dts >> create mode 100644 >> target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7-emmc.dts >> create mode 100644 >> target/linux/mvebu/files-4.19/arch/arm64/boot/dts/marvell/armada-3720-espressobin-v7.dts >> create mode 100644 target/linux/mvebu/patches-4.19/002-add_powertables.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/003-add_switch_nodes.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/004-add_sata_disk_activity_trigger.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/005-linksys_hardcode_nand_ecc_settings.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/100-find_active_root.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/102-revert_i2c_delay.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/205-armada-385-rd-mtd-partitions.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/206-ARM-mvebu-385-ap-Add-partitions.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/210-clearfog_switch_node.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/220-disable-untested-dsa-boards.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/230-armada-xp-linksys-mamba-broken-idle.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/400-cpuidle-mvebu-indicate-failure-to-enter-deeper-sleep.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/401-pci-mvebu-time-out-reset-on-link-up.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/402-net-phylink-only-call-mac_config-during-resolve-when.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/403-net-phylink-ensure-inband-AN-works-correctly.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/405-net-phy-marvell10g-add-SFP-support.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/406-sfp-add-sfp-compatible.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/407-sfp-display-SFP-module-information.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/408-sfp-more-cotsworks-fixes.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/412-ARM-dts-armada388-clearfog-emmc-on-clearfog-base.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch >> create mode 100644 target/linux/mvebu/patches-4.19/450-reprobe_sfp_phy.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/514-arm64-dts-marvell-armada-37xx-Enable-emmc-on-espress.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/520-arm64-dts-marvell-armada37xx-Add-eth0-alias.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/521-arm64-dts-armada-3720-espressobin-correct-spi-node.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/522-arm64-dts-marvell-armada-3720-espressobin-add-ports-.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/523-Revert-PCI-aardvark-Convert-to-use-pci_host_probe.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/526-PCI-aardvark-disable-LOS-state-by-default.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/527-PCI-aardvark-allow-to-specify-link-capability.patch >> create mode 100644 >> target/linux/mvebu/patches-4.19/528-arm64-dts-armada-3720-espressobin-set-max-link-to-ge.patch >> >> diff --git a/target/linux/mvebu/Makefile b/target/linux/mvebu/Makefile >> index a920f6db7d..f39573c002 100644 >> --- a/target/linux/mvebu/Makefile >> +++ b/target/linux/mvebu/Makefile >> @@ -13,6 +13,7 @@ SUBTARGETS:=cortexa9 cortexa53 cortexa72 >> MAINTAINER:=Imre Kaloz <[email protected]> >> >> KERNEL_PATCHVER:=4.14 >> +KERNEL_TESTING_PATCHVER:=4.19 >> >> include $(INCLUDE_DIR)/target.mk >> >> diff --git a/target/linux/mvebu/config-4.19 b/target/linux/mvebu/config-4.19 >> new file mode 100644 >> index 0000000000..2c996d4dcb >> --- /dev/null >> +++ b/target/linux/mvebu/config-4.19 > > Please run "make target/linux/{clean,refresh} V=99" again to refresh > this configuration some options are now in the generic configuration > like CONFIG_MSCC_OCELOT_SWITCH.
Will do. > > ...... > > >> diff --git >> a/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch >> >> b/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch >> new file mode 100644 >> index 0000000000..bd8f64dcbe >> --- /dev/null >> +++ >> b/target/linux/mvebu/patches-4.19/404-sfp-provide-netdev-sfp_bus-and-use-for-start-stop.patch >> @@ -0,0 +1,39 @@ >> +From 0068a89747e7c1d9a0bbb7282a34382a4274638a Mon Sep 17 00:00:00 2001 >> +From: Russell King <[email protected]> >> +Date: Fri, 14 Apr 2017 16:41:55 +0100 >> +Subject: [PATCH] sfp: provide netdev sfp_bus and use for start/stop >> + >> +Add a netdev sfp_bus pointer for propagating the phylink start/stop >> +actions to the SFP cage: the SFP cage may not be directly connected to >> +phylink, but may be the other side of a fixed PHY, and SFP needs to >> +know when the netdev is brought up or taken down. >> + >> +Signed-off-by: Russell King <[email protected]> >> +--- >> + drivers/net/phy/phylink.c | 8 ++++---- >> + 1 file changed, 4 insertions(+), 4 deletions(-) >> + >> +--- a/drivers/net/phy/phylink.c >> ++++ b/drivers/net/phy/phylink.c >> +@@ -943,8 +943,8 @@ void phylink_start(struct phylink *pl) >> + >> + if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) >> + mod_timer(&pl->link_poll, jiffies + HZ); >> +- if (pl->sfp_bus) >> +- sfp_upstream_start(pl->sfp_bus); >> ++ if (pl->netdev->sfp_bus) >> ++ sfp_upstream_start(pl->netdev->sfp_bus); >> + if (pl->phydev) >> + phy_start(pl->phydev); >> + } >> +@@ -965,8 +965,8 @@ void phylink_stop(struct phylink *pl) >> + >> + if (pl->phydev) >> + phy_stop(pl->phydev); >> +- if (pl->sfp_bus) >> +- sfp_upstream_stop(pl->sfp_bus); >> ++ if (pl->netdev->sfp_bus) >> ++ sfp_upstream_stop(pl->netdev->sfp_bus); >> + if (pl->link_an_mode == MLO_AN_FIXED && !IS_ERR(pl->link_gpio)) >> + del_timer_sync(&pl->link_poll); >> + > > Is this patch still needed? > > Shouldn't the SFP supported be integaretd into upstream now? I think the > SFP related patches should be mostly backports or older versions of the > upstream SFP support patches which wnet upstream. > > Preferably, yes, it should be only backports. Patches with index number of 402-406 and 408 were added by Marek, maybe they are necessary to support some SFP modules. That's something he would need to answer, because I don't have any hardware with SFP port. Regards -- TMN _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
