4e0c54bc5b
The following patches were removed because they are integrated in the upstream kernel 5.4: * backport-5.4/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch * backport-5.4/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch * backport-5.4/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch * backport-5.4/080-v5.1-0002-bcma-use-dev_-printing-functions.patch * backport-5.4/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch * backport-5.4/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch * backport-5.4/200-v5.2-usb-dwc2-Set-lpm-mode-parameters-depend-on-HW-configuration.patch * backport-5.4/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch * backport-5.4/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch * backport-5.4/450-v5.0-mtd-spinand-winbond-Add-support-for-W25N01GV.patch * backport-5.4/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch * backport-5.4/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch * backport-5.4/455-v5.1-mtd-spinand-Add-support-for-all-Toshiba-Memory-produ.patch * backport-5.4/456-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch * backport-5.4/460-v5.0-mtd-spi-nor-Add-support-for-mx25u12835f.patch * backport-5.4/460-v5.3-mtd-spinand-Define-macros-for-page-read-ops-with-thr.patch * backport-5.4/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch * backport-5.4/462-v5.3-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UFxxG.patch * backport-5.4/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch * backport-5.4/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch * backport-5.4/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch * backport-5.4/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch * backport-5.4/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch * backport-5.4/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch * backport-5.4/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch * backport-5.4/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch * backport-5.4/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch * backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch * backport-5.4/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch * backport-5.4/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch * backport-5.4/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch * backport-5.4/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch * backport-5.4/713-v5.2-net-phylink-avoid-reducing-support-mask.patch * backport-5.4/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch * backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch * backport-5.4/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch * backport-5.4/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch * pending-5.4/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch * pending-5.4/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch * pending-5.4/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch * pending-5.4/220-optimize_inlining.patch * pending-5.4/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch * pending-5.4/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch * pending-5.4/477-mtd-add-spi-nor-add-mx25u3235f.patch * pending-5.4/479-mtd-spi-nor-add-eon-en25qh64.patch Some bigger changes were done to this feature and we did not port this patch yet: * hack-5.4/207-disable-modorder.patch This depends on BOOTMEM which was removed from the kernel, this needs some bigger changes: * hack-5.4/930-crashlog.patch A different version of the FPU disable patch was merged upstream, OpenWrt needs some adaptations. * pending-5.4/304-mips_disable_fpu.patch - no crashlog support yet as a required file got deleted upstream - Removed patch below, which is now seen as a recursive dependency [1] - Removed patch below due to build error [2] - fix still required to avoid identical function def [3] - Fixes included from Blocktrron - Fixes included from Chunkeey - Fix included from nbd regarding "dst leak in Flow Offload" [1] target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch [2] target/linux/generic/hack-5.4/207-disable-modorder.patch [3] target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: David Bauer <mail@david-bauer.net> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
316 lines
8.1 KiB
Diff
316 lines
8.1 KiB
Diff
From 75f4d8d10e016f7428c268424483a927ee7a78bb Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 11 Dec 2019 10:56:56 +0000
|
|
Subject: [PATCH] net: phy: add Broadcom BCM84881 PHY driver
|
|
|
|
Add a rudimentary Clause 45 driver for the BCM84881 PHY, found on
|
|
Methode DM7052 SFPs.
|
|
|
|
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/Kconfig | 6 +
|
|
drivers/net/phy/Makefile | 1 +
|
|
drivers/net/phy/bcm84881.c | 269 +++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 276 insertions(+)
|
|
create mode 100644 drivers/net/phy/bcm84881.c
|
|
|
|
--- a/drivers/net/phy/Kconfig
|
|
+++ b/drivers/net/phy/Kconfig
|
|
@@ -329,6 +329,12 @@ config BROADCOM_PHY
|
|
Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,
|
|
BCM5481, BCM54810 and BCM5482 PHYs.
|
|
|
|
+config BCM84881_PHY
|
|
+ tristate "Broadcom BCM84881 PHY"
|
|
+ depends on PHYLIB
|
|
+ ---help---
|
|
+ Support the Broadcom BCM84881 PHY.
|
|
+
|
|
config CICADA_PHY
|
|
tristate "Cicada PHYs"
|
|
---help---
|
|
--- a/drivers/net/phy/Makefile
|
|
+++ b/drivers/net/phy/Makefile
|
|
@@ -62,6 +62,7 @@ obj-$(CONFIG_BCM87XX_PHY) += bcm87xx.o
|
|
obj-$(CONFIG_BCM_CYGNUS_PHY) += bcm-cygnus.o
|
|
obj-$(CONFIG_BCM_NET_PHYLIB) += bcm-phy-lib.o
|
|
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
|
|
+obj-$(CONFIG_BCM84881_PHY) += bcm84881.o
|
|
obj-$(CONFIG_CICADA_PHY) += cicada.o
|
|
obj-$(CONFIG_CORTINA_PHY) += cortina.o
|
|
obj-$(CONFIG_DAVICOM_PHY) += davicom.o
|
|
--- /dev/null
|
|
+++ b/drivers/net/phy/bcm84881.c
|
|
@@ -0,0 +1,269 @@
|
|
+// SPDX-License-Identifier: GPL-2.0
|
|
+// Broadcom BCM84881 NBASE-T PHY driver, as found on a SFP+ module.
|
|
+// Copyright (C) 2019 Russell King, Deep Blue Solutions Ltd.
|
|
+//
|
|
+// Like the Marvell 88x3310, the Broadcom 84881 changes its host-side
|
|
+// interface according to the operating speed between 10GBASE-R,
|
|
+// 2500BASE-X and SGMII (but unlike the 88x3310, without the control
|
|
+// word).
|
|
+//
|
|
+// This driver only supports those aspects of the PHY that I'm able to
|
|
+// observe and test with the SFP+ module, which is an incomplete subset
|
|
+// of what this PHY is able to support. For example, I only assume it
|
|
+// supports a single lane Serdes connection, but it may be that the PHY
|
|
+// is able to support more than that.
|
|
+#include <linux/delay.h>
|
|
+#include <linux/module.h>
|
|
+#include <linux/phy.h>
|
|
+
|
|
+enum {
|
|
+ MDIO_AN_C22 = 0xffe0,
|
|
+};
|
|
+
|
|
+static int bcm84881_wait_init(struct phy_device *phydev)
|
|
+{
|
|
+ unsigned int tries = 20;
|
|
+ int ret, val;
|
|
+
|
|
+ do {
|
|
+ val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1);
|
|
+ if (val < 0) {
|
|
+ ret = val;
|
|
+ break;
|
|
+ }
|
|
+ if (!(val & MDIO_CTRL1_RESET)) {
|
|
+ ret = 0;
|
|
+ break;
|
|
+ }
|
|
+ if (!--tries) {
|
|
+ ret = -ETIMEDOUT;
|
|
+ break;
|
|
+ }
|
|
+ msleep(100);
|
|
+ } while (1);
|
|
+
|
|
+ if (ret)
|
|
+ phydev_err(phydev, "%s failed: %d\n", __func__, ret);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
+static int bcm84881_config_init(struct phy_device *phydev)
|
|
+{
|
|
+ switch (phydev->interface) {
|
|
+ case PHY_INTERFACE_MODE_SGMII:
|
|
+ case PHY_INTERFACE_MODE_2500BASEX:
|
|
+ case PHY_INTERFACE_MODE_10GKR:
|
|
+ break;
|
|
+ default:
|
|
+ return -ENODEV;
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int bcm84881_probe(struct phy_device *phydev)
|
|
+{
|
|
+ /* This driver requires PMAPMD and AN blocks */
|
|
+ const u32 mmd_mask = MDIO_DEVS_PMAPMD | MDIO_DEVS_AN;
|
|
+
|
|
+ if (!phydev->is_c45 ||
|
|
+ (phydev->c45_ids.devices_in_package & mmd_mask) != mmd_mask)
|
|
+ return -ENODEV;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int bcm84881_get_features(struct phy_device *phydev)
|
|
+{
|
|
+ int ret;
|
|
+
|
|
+ ret = genphy_c45_pma_read_abilities(phydev);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /* Although the PHY sets bit 1.11.8, it does not support 10M modes */
|
|
+ linkmode_clear_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,
|
|
+ phydev->supported);
|
|
+ linkmode_clear_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,
|
|
+ phydev->supported);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int bcm84881_config_aneg(struct phy_device *phydev)
|
|
+{
|
|
+ bool changed = false;
|
|
+ u32 adv;
|
|
+ int ret;
|
|
+
|
|
+ /* Wait for the PHY to finish initialising, otherwise our
|
|
+ * advertisement may be overwritten.
|
|
+ */
|
|
+ ret = bcm84881_wait_init(phydev);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+
|
|
+ /* We don't support manual MDI control */
|
|
+ phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
|
|
+
|
|
+ /* disabled autoneg doesn't seem to work with this PHY */
|
|
+ if (phydev->autoneg == AUTONEG_DISABLE)
|
|
+ return -EINVAL;
|
|
+
|
|
+ ret = genphy_c45_an_config_aneg(phydev);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ if (ret > 0)
|
|
+ changed = true;
|
|
+
|
|
+ adv = linkmode_adv_to_mii_ctrl1000_t(phydev->advertising);
|
|
+ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN,
|
|
+ MDIO_AN_C22 + MII_CTRL1000,
|
|
+ ADVERTISE_1000FULL | ADVERTISE_1000HALF,
|
|
+ adv);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ if (ret > 0)
|
|
+ changed = true;
|
|
+
|
|
+ return genphy_c45_check_and_restart_aneg(phydev, changed);
|
|
+}
|
|
+
|
|
+static int bcm84881_aneg_done(struct phy_device *phydev)
|
|
+{
|
|
+ int bmsr, val;
|
|
+
|
|
+ val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);
|
|
+ if (val < 0)
|
|
+ return val;
|
|
+
|
|
+ bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);
|
|
+ if (bmsr < 0)
|
|
+ return val;
|
|
+
|
|
+ return !!(val & MDIO_AN_STAT1_COMPLETE) &&
|
|
+ !!(bmsr & BMSR_ANEGCOMPLETE);
|
|
+}
|
|
+
|
|
+static int bcm84881_read_status(struct phy_device *phydev)
|
|
+{
|
|
+ unsigned int mode;
|
|
+ int bmsr, val;
|
|
+
|
|
+ val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);
|
|
+ if (val < 0)
|
|
+ return val;
|
|
+
|
|
+ if (val & MDIO_AN_CTRL1_RESTART) {
|
|
+ phydev->link = 0;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);
|
|
+ if (val < 0)
|
|
+ return val;
|
|
+
|
|
+ bmsr = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_C22 + MII_BMSR);
|
|
+ if (bmsr < 0)
|
|
+ return val;
|
|
+
|
|
+ phydev->autoneg_complete = !!(val & MDIO_AN_STAT1_COMPLETE) &&
|
|
+ !!(bmsr & BMSR_ANEGCOMPLETE);
|
|
+ phydev->link = !!(val & MDIO_STAT1_LSTATUS) &&
|
|
+ !!(bmsr & BMSR_LSTATUS);
|
|
+ if (phydev->autoneg == AUTONEG_ENABLE && !phydev->autoneg_complete)
|
|
+ phydev->link = false;
|
|
+
|
|
+ if (!phydev->link)
|
|
+ return 0;
|
|
+
|
|
+ linkmode_zero(phydev->lp_advertising);
|
|
+ phydev->speed = SPEED_UNKNOWN;
|
|
+ phydev->duplex = DUPLEX_UNKNOWN;
|
|
+ phydev->pause = 0;
|
|
+ phydev->asym_pause = 0;
|
|
+ phydev->mdix = 0;
|
|
+
|
|
+ if (phydev->autoneg_complete) {
|
|
+ val = genphy_c45_read_lpa(phydev);
|
|
+ if (val < 0)
|
|
+ return val;
|
|
+
|
|
+ val = phy_read_mmd(phydev, MDIO_MMD_AN,
|
|
+ MDIO_AN_C22 + MII_STAT1000);
|
|
+ if (val < 0)
|
|
+ return val;
|
|
+
|
|
+ mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
|
|
+
|
|
+ if (phydev->autoneg == AUTONEG_ENABLE)
|
|
+ phy_resolve_aneg_linkmode(phydev);
|
|
+ }
|
|
+
|
|
+ if (phydev->autoneg == AUTONEG_DISABLE) {
|
|
+ /* disabled autoneg doesn't seem to work, so force the link
|
|
+ * down.
|
|
+ */
|
|
+ phydev->link = 0;
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ /* Set the host link mode - we set the phy interface mode and
|
|
+ * the speed according to this register so that downshift works.
|
|
+ * We leave the duplex setting as per the resolution from the
|
|
+ * above.
|
|
+ */
|
|
+ val = phy_read_mmd(phydev, MDIO_MMD_VEND1, 0x4011);
|
|
+ mode = (val & 0x1e) >> 1;
|
|
+ if (mode == 1 || mode == 2)
|
|
+ phydev->interface = PHY_INTERFACE_MODE_SGMII;
|
|
+ else if (mode == 3)
|
|
+ phydev->interface = PHY_INTERFACE_MODE_10GKR;
|
|
+ else if (mode == 4)
|
|
+ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
|
|
+ switch (mode & 7) {
|
|
+ case 1:
|
|
+ phydev->speed = SPEED_100;
|
|
+ break;
|
|
+ case 2:
|
|
+ phydev->speed = SPEED_1000;
|
|
+ break;
|
|
+ case 3:
|
|
+ phydev->speed = SPEED_10000;
|
|
+ break;
|
|
+ case 4:
|
|
+ phydev->speed = SPEED_2500;
|
|
+ break;
|
|
+ case 5:
|
|
+ phydev->speed = SPEED_5000;
|
|
+ break;
|
|
+ }
|
|
+
|
|
+ return genphy_c45_read_mdix(phydev);
|
|
+}
|
|
+
|
|
+static struct phy_driver bcm84881_drivers[] = {
|
|
+ {
|
|
+ .phy_id = 0xae025150,
|
|
+ .phy_id_mask = 0xfffffff0,
|
|
+ .name = "Broadcom BCM84881",
|
|
+ .config_init = bcm84881_config_init,
|
|
+ .probe = bcm84881_probe,
|
|
+ .get_features = bcm84881_get_features,
|
|
+ .config_aneg = bcm84881_config_aneg,
|
|
+ .aneg_done = bcm84881_aneg_done,
|
|
+ .read_status = bcm84881_read_status,
|
|
+ },
|
|
+};
|
|
+
|
|
+module_phy_driver(bcm84881_drivers);
|
|
+
|
|
+/* FIXME: module auto-loading for Clause 45 PHYs seems non-functional */
|
|
+static struct mdio_device_id __maybe_unused bcm84881_tbl[] = {
|
|
+ { 0xae025150, 0xfffffff0 },
|
|
+ { },
|
|
+};
|
|
+MODULE_AUTHOR("Russell King");
|
|
+MODULE_DESCRIPTION("Broadcom BCM84881 PHY driver");
|
|
+MODULE_DEVICE_TABLE(mdio, bcm84881_tbl);
|
|
+MODULE_LICENSE("GPL");
|