--- /dev/null
+From 9e56ff53b4115875667760445b028357848b4748 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Mon, 29 Jan 2024 15:15:19 +0100
+Subject: [PATCH 1/5] net: phy: move at803x PHY driver to dedicated directory
+
+In preparation for addition of other Qcom PHY and to tidy things up,
+move the at803x PHY driver to dedicated directory.
+
+The same order in the Kconfig selection is saved.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Link: https://lore.kernel.org/r/20240129141600.2592-2-ansuelsmth@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/phy/Kconfig | 7 +------
+ drivers/net/phy/Makefile | 2 +-
+ drivers/net/phy/qcom/Kconfig | 7 +++++++
+ drivers/net/phy/qcom/Makefile | 2 ++
+ drivers/net/phy/{ => qcom}/at803x.c | 0
+ 5 files changed, 11 insertions(+), 7 deletions(-)
+ create mode 100644 drivers/net/phy/qcom/Kconfig
+ create mode 100644 drivers/net/phy/qcom/Makefile
+ rename drivers/net/phy/{ => qcom}/at803x.c (100%)
+
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -277,12 +277,7 @@ config NXP_TJA11XX_PHY
+ help
+ Currently supports the NXP TJA1100 and TJA1101 PHY.
+
+-config AT803X_PHY
+- tristate "Qualcomm Atheros AR803X PHYs and QCA833x PHYs"
+- depends on REGULATOR
+- help
+- Currently supports the AR8030, AR8031, AR8033, AR8035 and internal
+- QCA8337(Internal qca8k PHY) model
++source "drivers/net/phy/qcom/Kconfig"
+
+ config QSEMI_PHY
+ tristate "Quality Semiconductor PHYs"
+--- a/drivers/net/phy/Makefile
++++ b/drivers/net/phy/Makefile
+@@ -34,7 +34,6 @@ obj-$(CONFIG_ADIN_PHY) += adin.o
+ obj-$(CONFIG_ADIN1100_PHY) += adin1100.o
+ obj-$(CONFIG_AMD_PHY) += amd.o
+ obj-$(CONFIG_AQUANTIA_PHY) += aquantia/
+-obj-$(CONFIG_AT803X_PHY) += at803x.o
+ obj-$(CONFIG_AX88796B_PHY) += ax88796b.o
+ obj-$(CONFIG_BCM54140_PHY) += bcm54140.o
+ obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o
+@@ -75,6 +74,7 @@ obj-$(CONFIG_MOTORCOMM_PHY) += motorcomm
+ obj-$(CONFIG_NATIONAL_PHY) += national.o
+ obj-$(CONFIG_NXP_C45_TJA11XX_PHY) += nxp-c45-tja11xx.o
+ obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
++obj-y += qcom/
+ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
+ obj-$(CONFIG_REALTEK_PHY) += realtek.o
+ obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
+--- /dev/null
++++ b/drivers/net/phy/qcom/Kconfig
+@@ -0,0 +1,7 @@
++# SPDX-License-Identifier: GPL-2.0-only
++config AT803X_PHY
++ tristate "Qualcomm Atheros AR803X PHYs and QCA833x PHYs"
++ depends on REGULATOR
++ help
++ Currently supports the AR8030, AR8031, AR8033, AR8035 and internal
++ QCA8337(Internal qca8k PHY) model
+--- /dev/null
++++ b/drivers/net/phy/qcom/Makefile
+@@ -0,0 +1,2 @@
++# SPDX-License-Identifier: GPL-2.0
++obj-$(CONFIG_AT803X_PHY) += at803x.o
+--- a/drivers/net/phy/at803x.c
++++ /dev/null
+@@ -1,2759 +0,0 @@
+-// SPDX-License-Identifier: GPL-2.0+
+-/*
+- * drivers/net/phy/at803x.c
+- *
+- * Driver for Qualcomm Atheros AR803x PHY
+- *
+- * Author: Matus Ujhelyi <ujhelyi.m@gmail.com>
+- */
+-
+-#include <linux/phy.h>
+-#include <linux/module.h>
+-#include <linux/string.h>
+-#include <linux/netdevice.h>
+-#include <linux/etherdevice.h>
+-#include <linux/ethtool_netlink.h>
+-#include <linux/bitfield.h>
+-#include <linux/regulator/of_regulator.h>
+-#include <linux/regulator/driver.h>
+-#include <linux/regulator/consumer.h>
+-#include <linux/of.h>
+-#include <linux/phylink.h>
+-#include <linux/sfp.h>
+-#include <dt-bindings/net/qca-ar803x.h>
+-
+-#define AT803X_SPECIFIC_FUNCTION_CONTROL 0x10
+-#define AT803X_SFC_ASSERT_CRS BIT(11)
+-#define AT803X_SFC_FORCE_LINK BIT(10)
+-#define AT803X_SFC_MDI_CROSSOVER_MODE_M GENMASK(6, 5)
+-#define AT803X_SFC_AUTOMATIC_CROSSOVER 0x3
+-#define AT803X_SFC_MANUAL_MDIX 0x1
+-#define AT803X_SFC_MANUAL_MDI 0x0
+-#define AT803X_SFC_SQE_TEST BIT(2)
+-#define AT803X_SFC_POLARITY_REVERSAL BIT(1)
+-#define AT803X_SFC_DISABLE_JABBER BIT(0)
+-
+-#define AT803X_SPECIFIC_STATUS 0x11
+-#define AT803X_SS_SPEED_MASK GENMASK(15, 14)
+-#define AT803X_SS_SPEED_1000 2
+-#define AT803X_SS_SPEED_100 1
+-#define AT803X_SS_SPEED_10 0
+-#define AT803X_SS_DUPLEX BIT(13)
+-#define AT803X_SS_SPEED_DUPLEX_RESOLVED BIT(11)
+-#define AT803X_SS_MDIX BIT(6)
+-
+-#define QCA808X_SS_SPEED_MASK GENMASK(9, 7)
+-#define QCA808X_SS_SPEED_2500 4
+-
+-#define AT803X_INTR_ENABLE 0x12
+-#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
+-#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)
+-#define AT803X_INTR_ENABLE_DUPLEX_CHANGED BIT(13)
+-#define AT803X_INTR_ENABLE_PAGE_RECEIVED BIT(12)
+-#define AT803X_INTR_ENABLE_LINK_FAIL BIT(11)
+-#define AT803X_INTR_ENABLE_LINK_SUCCESS BIT(10)
+-#define AT803X_INTR_ENABLE_LINK_FAIL_BX BIT(8)
+-#define AT803X_INTR_ENABLE_LINK_SUCCESS_BX BIT(7)
+-#define AT803X_INTR_ENABLE_WIRESPEED_DOWNGRADE BIT(5)
+-#define AT803X_INTR_ENABLE_POLARITY_CHANGED BIT(1)
+-#define AT803X_INTR_ENABLE_WOL BIT(0)
+-
+-#define AT803X_INTR_STATUS 0x13
+-
+-#define AT803X_SMART_SPEED 0x14
+-#define AT803X_SMART_SPEED_ENABLE BIT(5)
+-#define AT803X_SMART_SPEED_RETRY_LIMIT_MASK GENMASK(4, 2)
+-#define AT803X_SMART_SPEED_BYPASS_TIMER BIT(1)
+-#define AT803X_CDT 0x16
+-#define AT803X_CDT_MDI_PAIR_MASK GENMASK(9, 8)
+-#define AT803X_CDT_ENABLE_TEST BIT(0)
+-#define AT803X_CDT_STATUS 0x1c
+-#define AT803X_CDT_STATUS_STAT_NORMAL 0
+-#define AT803X_CDT_STATUS_STAT_SHORT 1
+-#define AT803X_CDT_STATUS_STAT_OPEN 2
+-#define AT803X_CDT_STATUS_STAT_FAIL 3
+-#define AT803X_CDT_STATUS_STAT_MASK GENMASK(9, 8)
+-#define AT803X_CDT_STATUS_DELTA_TIME_MASK GENMASK(7, 0)
+-#define AT803X_LED_CONTROL 0x18
+-
+-#define AT803X_PHY_MMD3_WOL_CTRL 0x8012
+-#define AT803X_WOL_EN BIT(5)
+-#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
+-#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
+-#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
+-#define AT803X_REG_CHIP_CONFIG 0x1f
+-#define AT803X_BT_BX_REG_SEL 0x8000
+-
+-#define AT803X_DEBUG_ADDR 0x1D
+-#define AT803X_DEBUG_DATA 0x1E
+-
+-#define AT803X_MODE_CFG_MASK 0x0F
+-#define AT803X_MODE_CFG_BASET_RGMII 0x00
+-#define AT803X_MODE_CFG_BASET_SGMII 0x01
+-#define AT803X_MODE_CFG_BX1000_RGMII_50OHM 0x02
+-#define AT803X_MODE_CFG_BX1000_RGMII_75OHM 0x03
+-#define AT803X_MODE_CFG_BX1000_CONV_50OHM 0x04
+-#define AT803X_MODE_CFG_BX1000_CONV_75OHM 0x05
+-#define AT803X_MODE_CFG_FX100_RGMII_50OHM 0x06
+-#define AT803X_MODE_CFG_FX100_CONV_50OHM 0x07
+-#define AT803X_MODE_CFG_RGMII_AUTO_MDET 0x0B
+-#define AT803X_MODE_CFG_FX100_RGMII_75OHM 0x0E
+-#define AT803X_MODE_CFG_FX100_CONV_75OHM 0x0F
+-
+-#define AT803X_PSSR 0x11 /*PHY-Specific Status Register*/
+-#define AT803X_PSSR_MR_AN_COMPLETE 0x0200
+-
+-#define AT803X_DEBUG_ANALOG_TEST_CTRL 0x00
+-#define QCA8327_DEBUG_MANU_CTRL_EN BIT(2)
+-#define QCA8337_DEBUG_MANU_CTRL_EN GENMASK(3, 2)
+-#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
+-
+-#define AT803X_DEBUG_SYSTEM_CTRL_MODE 0x05
+-#define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8)
+-
+-#define AT803X_DEBUG_REG_HIB_CTRL 0x0b
+-#define AT803X_DEBUG_HIB_CTRL_SEL_RST_80U BIT(10)
+-#define AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE BIT(13)
+-#define AT803X_DEBUG_HIB_CTRL_PS_HIB_EN BIT(15)
+-
+-#define AT803X_DEBUG_REG_3C 0x3C
+-
+-#define AT803X_DEBUG_REG_GREEN 0x3D
+-#define AT803X_DEBUG_GATE_CLK_IN1000 BIT(6)
+-
+-#define AT803X_DEBUG_REG_1F 0x1F
+-#define AT803X_DEBUG_PLL_ON BIT(2)
+-#define AT803X_DEBUG_RGMII_1V8 BIT(3)
+-
+-#define MDIO_AZ_DEBUG 0x800D
+-
+-/* AT803x supports either the XTAL input pad, an internal PLL or the
+- * DSP as clock reference for the clock output pad. The XTAL reference
+- * is only used for 25 MHz output, all other frequencies need the PLL.
+- * The DSP as a clock reference is used in synchronous ethernet
+- * applications.
+- *
+- * By default the PLL is only enabled if there is a link. Otherwise
+- * the PHY will go into low power state and disabled the PLL. You can
+- * set the PLL_ON bit (see debug register 0x1f) to keep the PLL always
+- * enabled.
+- */
+-#define AT803X_MMD7_CLK25M 0x8016
+-#define AT803X_CLK_OUT_MASK GENMASK(4, 2)
+-#define AT803X_CLK_OUT_25MHZ_XTAL 0
+-#define AT803X_CLK_OUT_25MHZ_DSP 1
+-#define AT803X_CLK_OUT_50MHZ_PLL 2
+-#define AT803X_CLK_OUT_50MHZ_DSP 3
+-#define AT803X_CLK_OUT_62_5MHZ_PLL 4
+-#define AT803X_CLK_OUT_62_5MHZ_DSP 5
+-#define AT803X_CLK_OUT_125MHZ_PLL 6
+-#define AT803X_CLK_OUT_125MHZ_DSP 7
+-
+-/* The AR8035 has another mask which is compatible with the AR8031/AR8033 mask
+- * but doesn't support choosing between XTAL/PLL and DSP.
+- */
+-#define AT8035_CLK_OUT_MASK GENMASK(4, 3)
+-
+-#define AT803X_CLK_OUT_STRENGTH_MASK GENMASK(8, 7)
+-#define AT803X_CLK_OUT_STRENGTH_FULL 0
+-#define AT803X_CLK_OUT_STRENGTH_HALF 1
+-#define AT803X_CLK_OUT_STRENGTH_QUARTER 2
+-
+-#define AT803X_DEFAULT_DOWNSHIFT 5
+-#define AT803X_MIN_DOWNSHIFT 2
+-#define AT803X_MAX_DOWNSHIFT 9
+-
+-#define AT803X_MMD3_SMARTEEE_CTL1 0x805b
+-#define AT803X_MMD3_SMARTEEE_CTL2 0x805c
+-#define AT803X_MMD3_SMARTEEE_CTL3 0x805d
+-#define AT803X_MMD3_SMARTEEE_CTL3_LPI_EN BIT(8)
+-
+-#define ATH9331_PHY_ID 0x004dd041
+-#define ATH8030_PHY_ID 0x004dd076
+-#define ATH8031_PHY_ID 0x004dd074
+-#define ATH8032_PHY_ID 0x004dd023
+-#define ATH8035_PHY_ID 0x004dd072
+-#define AT8030_PHY_ID_MASK 0xffffffef
+-
+-#define QCA8081_PHY_ID 0x004dd101
+-
+-#define QCA8327_A_PHY_ID 0x004dd033
+-#define QCA8327_B_PHY_ID 0x004dd034
+-#define QCA8337_PHY_ID 0x004dd036
+-#define QCA9561_PHY_ID 0x004dd042
+-#define QCA8K_PHY_ID_MASK 0xffffffff
+-
+-#define QCA8K_DEVFLAGS_REVISION_MASK GENMASK(2, 0)
+-
+-#define AT803X_PAGE_FIBER 0
+-#define AT803X_PAGE_COPPER 1
+-
+-/* don't turn off internal PLL */
+-#define AT803X_KEEP_PLL_ENABLED BIT(0)
+-#define AT803X_DISABLE_SMARTEEE BIT(1)
+-
+-/* disable hibernation mode */
+-#define AT803X_DISABLE_HIBERNATION_MODE BIT(2)
+-
+-/* ADC threshold */
+-#define QCA808X_PHY_DEBUG_ADC_THRESHOLD 0x2c80
+-#define QCA808X_ADC_THRESHOLD_MASK GENMASK(7, 0)
+-#define QCA808X_ADC_THRESHOLD_80MV 0
+-#define QCA808X_ADC_THRESHOLD_100MV 0xf0
+-#define QCA808X_ADC_THRESHOLD_200MV 0x0f
+-#define QCA808X_ADC_THRESHOLD_300MV 0xff
+-
+-/* CLD control */
+-#define QCA808X_PHY_MMD3_ADDR_CLD_CTRL7 0x8007
+-#define QCA808X_8023AZ_AFE_CTRL_MASK GENMASK(8, 4)
+-#define QCA808X_8023AZ_AFE_EN 0x90
+-
+-/* AZ control */
+-#define QCA808X_PHY_MMD3_AZ_TRAINING_CTRL 0x8008
+-#define QCA808X_MMD3_AZ_TRAINING_VAL 0x1c32
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB 0x8014
+-#define QCA808X_MSE_THRESHOLD_20DB_VALUE 0x529
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB 0x800E
+-#define QCA808X_MSE_THRESHOLD_17DB_VALUE 0x341
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB 0x801E
+-#define QCA808X_MSE_THRESHOLD_27DB_VALUE 0x419
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB 0x8020
+-#define QCA808X_MSE_THRESHOLD_28DB_VALUE 0x341
+-
+-#define QCA808X_PHY_MMD7_TOP_OPTION1 0x901c
+-#define QCA808X_TOP_OPTION1_DATA 0x0
+-
+-#define QCA808X_PHY_MMD3_DEBUG_1 0xa100
+-#define QCA808X_MMD3_DEBUG_1_VALUE 0x9203
+-#define QCA808X_PHY_MMD3_DEBUG_2 0xa101
+-#define QCA808X_MMD3_DEBUG_2_VALUE 0x48ad
+-#define QCA808X_PHY_MMD3_DEBUG_3 0xa103
+-#define QCA808X_MMD3_DEBUG_3_VALUE 0x1698
+-#define QCA808X_PHY_MMD3_DEBUG_4 0xa105
+-#define QCA808X_MMD3_DEBUG_4_VALUE 0x8001
+-#define QCA808X_PHY_MMD3_DEBUG_5 0xa106
+-#define QCA808X_MMD3_DEBUG_5_VALUE 0x1111
+-#define QCA808X_PHY_MMD3_DEBUG_6 0xa011
+-#define QCA808X_MMD3_DEBUG_6_VALUE 0x5f85
+-
+-/* master/slave seed config */
+-#define QCA808X_PHY_DEBUG_LOCAL_SEED 9
+-#define QCA808X_MASTER_SLAVE_SEED_ENABLE BIT(1)
+-#define QCA808X_MASTER_SLAVE_SEED_CFG GENMASK(12, 2)
+-#define QCA808X_MASTER_SLAVE_SEED_RANGE 0x32
+-
+-/* Hibernation yields lower power consumpiton in contrast with normal operation mode.
+- * when the copper cable is unplugged, the PHY enters into hibernation mode in about 10s.
+- */
+-#define QCA808X_DBG_AN_TEST 0xb
+-#define QCA808X_HIBERNATION_EN BIT(15)
+-
+-#define QCA808X_CDT_ENABLE_TEST BIT(15)
+-#define QCA808X_CDT_INTER_CHECK_DIS BIT(13)
+-#define QCA808X_CDT_STATUS BIT(11)
+-#define QCA808X_CDT_LENGTH_UNIT BIT(10)
+-
+-#define QCA808X_MMD3_CDT_STATUS 0x8064
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_A 0x8065
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_B 0x8066
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_C 0x8067
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_D 0x8068
+-#define QCA808X_CDT_DIAG_LENGTH_SAME_SHORT GENMASK(15, 8)
+-#define QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT GENMASK(7, 0)
+-
+-#define QCA808X_CDT_CODE_PAIR_A GENMASK(15, 12)
+-#define QCA808X_CDT_CODE_PAIR_B GENMASK(11, 8)
+-#define QCA808X_CDT_CODE_PAIR_C GENMASK(7, 4)
+-#define QCA808X_CDT_CODE_PAIR_D GENMASK(3, 0)
+-
+-#define QCA808X_CDT_STATUS_STAT_TYPE GENMASK(1, 0)
+-#define QCA808X_CDT_STATUS_STAT_FAIL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 0)
+-#define QCA808X_CDT_STATUS_STAT_NORMAL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 1)
+-#define QCA808X_CDT_STATUS_STAT_SAME_OPEN FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 2)
+-#define QCA808X_CDT_STATUS_STAT_SAME_SHORT FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 3)
+-
+-#define QCA808X_CDT_STATUS_STAT_MDI GENMASK(3, 2)
+-#define QCA808X_CDT_STATUS_STAT_MDI1 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 1)
+-#define QCA808X_CDT_STATUS_STAT_MDI2 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 2)
+-#define QCA808X_CDT_STATUS_STAT_MDI3 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 3)
+-
+-/* NORMAL are MDI with type set to 0 */
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI1
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+- QCA808X_CDT_STATUS_STAT_MDI1)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+- QCA808X_CDT_STATUS_STAT_MDI1)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI2
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+- QCA808X_CDT_STATUS_STAT_MDI2)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+- QCA808X_CDT_STATUS_STAT_MDI2)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI3
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+- QCA808X_CDT_STATUS_STAT_MDI3)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+- QCA808X_CDT_STATUS_STAT_MDI3)
+-
+-/* Added for reference of existence but should be handled by wait_for_completion already */
+-#define QCA808X_CDT_STATUS_STAT_BUSY (BIT(1) | BIT(3))
+-
+-#define QCA808X_MMD7_LED_GLOBAL 0x8073
+-#define QCA808X_LED_BLINK_1 GENMASK(11, 6)
+-#define QCA808X_LED_BLINK_2 GENMASK(5, 0)
+-/* Values are the same for both BLINK_1 and BLINK_2 */
+-#define QCA808X_LED_BLINK_FREQ_MASK GENMASK(5, 3)
+-#define QCA808X_LED_BLINK_FREQ_2HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x0)
+-#define QCA808X_LED_BLINK_FREQ_4HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x1)
+-#define QCA808X_LED_BLINK_FREQ_8HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x2)
+-#define QCA808X_LED_BLINK_FREQ_16HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x3)
+-#define QCA808X_LED_BLINK_FREQ_32HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x4)
+-#define QCA808X_LED_BLINK_FREQ_64HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x5)
+-#define QCA808X_LED_BLINK_FREQ_128HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x6)
+-#define QCA808X_LED_BLINK_FREQ_256HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x7)
+-#define QCA808X_LED_BLINK_DUTY_MASK GENMASK(2, 0)
+-#define QCA808X_LED_BLINK_DUTY_50_50 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x0)
+-#define QCA808X_LED_BLINK_DUTY_75_25 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x1)
+-#define QCA808X_LED_BLINK_DUTY_25_75 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x2)
+-#define QCA808X_LED_BLINK_DUTY_33_67 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x3)
+-#define QCA808X_LED_BLINK_DUTY_67_33 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x4)
+-#define QCA808X_LED_BLINK_DUTY_17_83 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x5)
+-#define QCA808X_LED_BLINK_DUTY_83_17 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x6)
+-#define QCA808X_LED_BLINK_DUTY_8_92 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x7)
+-
+-#define QCA808X_MMD7_LED2_CTRL 0x8074
+-#define QCA808X_MMD7_LED2_FORCE_CTRL 0x8075
+-#define QCA808X_MMD7_LED1_CTRL 0x8076
+-#define QCA808X_MMD7_LED1_FORCE_CTRL 0x8077
+-#define QCA808X_MMD7_LED0_CTRL 0x8078
+-#define QCA808X_MMD7_LED_CTRL(x) (0x8078 - ((x) * 2))
+-
+-/* LED hw control pattern is the same for every LED */
+-#define QCA808X_LED_PATTERN_MASK GENMASK(15, 0)
+-#define QCA808X_LED_SPEED2500_ON BIT(15)
+-#define QCA808X_LED_SPEED2500_BLINK BIT(14)
+-/* Follow blink trigger even if duplex or speed condition doesn't match */
+-#define QCA808X_LED_BLINK_CHECK_BYPASS BIT(13)
+-#define QCA808X_LED_FULL_DUPLEX_ON BIT(12)
+-#define QCA808X_LED_HALF_DUPLEX_ON BIT(11)
+-#define QCA808X_LED_TX_BLINK BIT(10)
+-#define QCA808X_LED_RX_BLINK BIT(9)
+-#define QCA808X_LED_TX_ON_10MS BIT(8)
+-#define QCA808X_LED_RX_ON_10MS BIT(7)
+-#define QCA808X_LED_SPEED1000_ON BIT(6)
+-#define QCA808X_LED_SPEED100_ON BIT(5)
+-#define QCA808X_LED_SPEED10_ON BIT(4)
+-#define QCA808X_LED_COLLISION_BLINK BIT(3)
+-#define QCA808X_LED_SPEED1000_BLINK BIT(2)
+-#define QCA808X_LED_SPEED100_BLINK BIT(1)
+-#define QCA808X_LED_SPEED10_BLINK BIT(0)
+-
+-#define QCA808X_MMD7_LED0_FORCE_CTRL 0x8079
+-#define QCA808X_MMD7_LED_FORCE_CTRL(x) (0x8079 - ((x) * 2))
+-
+-/* LED force ctrl is the same for every LED
+- * No documentation exist for this, not even internal one
+- * with NDA as QCOM gives only info about configuring
+- * hw control pattern rules and doesn't indicate any way
+- * to force the LED to specific mode.
+- * These define comes from reverse and testing and maybe
+- * lack of some info or some info are not entirely correct.
+- * For the basic LED control and hw control these finding
+- * are enough to support LED control in all the required APIs.
+- *
+- * On doing some comparison with implementation with qca807x,
+- * it was found that it's 1:1 equal to it and confirms all the
+- * reverse done. It was also found further specification with the
+- * force mode and the blink modes.
+- */
+-#define QCA808X_LED_FORCE_EN BIT(15)
+-#define QCA808X_LED_FORCE_MODE_MASK GENMASK(14, 13)
+-#define QCA808X_LED_FORCE_BLINK_1 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x3)
+-#define QCA808X_LED_FORCE_BLINK_2 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x2)
+-#define QCA808X_LED_FORCE_ON FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x1)
+-#define QCA808X_LED_FORCE_OFF FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x0)
+-
+-#define QCA808X_MMD7_LED_POLARITY_CTRL 0x901a
+-/* QSDK sets by default 0x46 to this reg that sets BIT 6 for
+- * LED to active high. It's not clear what BIT 3 and BIT 4 does.
+- */
+-#define QCA808X_LED_ACTIVE_HIGH BIT(6)
+-
+-/* QCA808X 1G chip type */
+-#define QCA808X_PHY_MMD7_CHIP_TYPE 0x901d
+-#define QCA808X_PHY_CHIP_TYPE_1G BIT(0)
+-
+-#define QCA8081_PHY_SERDES_MMD1_FIFO_CTRL 0x9072
+-#define QCA8081_PHY_FIFO_RSTN BIT(11)
+-
+-MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
+-MODULE_AUTHOR("Matus Ujhelyi");
+-MODULE_LICENSE("GPL");
+-
+-enum stat_access_type {
+- PHY,
+- MMD
+-};
+-
+-struct at803x_hw_stat {
+- const char *string;
+- u8 reg;
+- u32 mask;
+- enum stat_access_type access_type;
+-};
+-
+-static struct at803x_hw_stat qca83xx_hw_stats[] = {
+- { "phy_idle_errors", 0xa, GENMASK(7, 0), PHY},
+- { "phy_receive_errors", 0x15, GENMASK(15, 0), PHY},
+- { "eee_wake_errors", 0x16, GENMASK(15, 0), MMD},
+-};
+-
+-struct at803x_ss_mask {
+- u16 speed_mask;
+- u8 speed_shift;
+-};
+-
+-struct at803x_priv {
+- int flags;
+- u16 clk_25m_reg;
+- u16 clk_25m_mask;
+- u8 smarteee_lpi_tw_1g;
+- u8 smarteee_lpi_tw_100m;
+- bool is_fiber;
+- bool is_1000basex;
+- struct regulator_dev *vddio_rdev;
+- struct regulator_dev *vddh_rdev;
+- u64 stats[ARRAY_SIZE(qca83xx_hw_stats)];
+- int led_polarity_mode;
+-};
+-
+-struct at803x_context {
+- u16 bmcr;
+- u16 advertise;
+- u16 control1000;
+- u16 int_enable;
+- u16 smart_speed;
+- u16 led_control;
+-};
+-
+-static int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data)
+-{
+- int ret;
+-
+- ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
+- if (ret < 0)
+- return ret;
+-
+- return phy_write(phydev, AT803X_DEBUG_DATA, data);
+-}
+-
+-static int at803x_debug_reg_read(struct phy_device *phydev, u16 reg)
+-{
+- int ret;
+-
+- ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
+- if (ret < 0)
+- return ret;
+-
+- return phy_read(phydev, AT803X_DEBUG_DATA);
+-}
+-
+-static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
+- u16 clear, u16 set)
+-{
+- u16 val;
+- int ret;
+-
+- ret = at803x_debug_reg_read(phydev, reg);
+- if (ret < 0)
+- return ret;
+-
+- val = ret & 0xffff;
+- val &= ~clear;
+- val |= set;
+-
+- return phy_write(phydev, AT803X_DEBUG_DATA, val);
+-}
+-
+-static int at803x_write_page(struct phy_device *phydev, int page)
+-{
+- int mask;
+- int set;
+-
+- if (page == AT803X_PAGE_COPPER) {
+- set = AT803X_BT_BX_REG_SEL;
+- mask = 0;
+- } else {
+- set = 0;
+- mask = AT803X_BT_BX_REG_SEL;
+- }
+-
+- return __phy_modify(phydev, AT803X_REG_CHIP_CONFIG, mask, set);
+-}
+-
+-static int at803x_read_page(struct phy_device *phydev)
+-{
+- int ccr = __phy_read(phydev, AT803X_REG_CHIP_CONFIG);
+-
+- if (ccr < 0)
+- return ccr;
+-
+- if (ccr & AT803X_BT_BX_REG_SEL)
+- return AT803X_PAGE_COPPER;
+-
+- return AT803X_PAGE_FIBER;
+-}
+-
+-static int at803x_enable_rx_delay(struct phy_device *phydev)
+-{
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL, 0,
+- AT803X_DEBUG_RX_CLK_DLY_EN);
+-}
+-
+-static int at803x_enable_tx_delay(struct phy_device *phydev)
+-{
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0,
+- AT803X_DEBUG_TX_CLK_DLY_EN);
+-}
+-
+-static int at803x_disable_rx_delay(struct phy_device *phydev)
+-{
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- AT803X_DEBUG_RX_CLK_DLY_EN, 0);
+-}
+-
+-static int at803x_disable_tx_delay(struct phy_device *phydev)
+-{
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE,
+- AT803X_DEBUG_TX_CLK_DLY_EN, 0);
+-}
+-
+-/* save relevant PHY registers to private copy */
+-static void at803x_context_save(struct phy_device *phydev,
+- struct at803x_context *context)
+-{
+- context->bmcr = phy_read(phydev, MII_BMCR);
+- context->advertise = phy_read(phydev, MII_ADVERTISE);
+- context->control1000 = phy_read(phydev, MII_CTRL1000);
+- context->int_enable = phy_read(phydev, AT803X_INTR_ENABLE);
+- context->smart_speed = phy_read(phydev, AT803X_SMART_SPEED);
+- context->led_control = phy_read(phydev, AT803X_LED_CONTROL);
+-}
+-
+-/* restore relevant PHY registers from private copy */
+-static void at803x_context_restore(struct phy_device *phydev,
+- const struct at803x_context *context)
+-{
+- phy_write(phydev, MII_BMCR, context->bmcr);
+- phy_write(phydev, MII_ADVERTISE, context->advertise);
+- phy_write(phydev, MII_CTRL1000, context->control1000);
+- phy_write(phydev, AT803X_INTR_ENABLE, context->int_enable);
+- phy_write(phydev, AT803X_SMART_SPEED, context->smart_speed);
+- phy_write(phydev, AT803X_LED_CONTROL, context->led_control);
+-}
+-
+-static int at803x_set_wol(struct phy_device *phydev,
+- struct ethtool_wolinfo *wol)
+-{
+- int ret, irq_enabled;
+-
+- if (wol->wolopts & WAKE_MAGIC) {
+- struct net_device *ndev = phydev->attached_dev;
+- const u8 *mac;
+- unsigned int i;
+- static const unsigned int offsets[] = {
+- AT803X_LOC_MAC_ADDR_32_47_OFFSET,
+- AT803X_LOC_MAC_ADDR_16_31_OFFSET,
+- AT803X_LOC_MAC_ADDR_0_15_OFFSET,
+- };
+-
+- if (!ndev)
+- return -ENODEV;
+-
+- mac = (const u8 *)ndev->dev_addr;
+-
+- if (!is_valid_ether_addr(mac))
+- return -EINVAL;
+-
+- for (i = 0; i < 3; i++)
+- phy_write_mmd(phydev, MDIO_MMD_PCS, offsets[i],
+- mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
+-
+- /* Enable WOL interrupt */
+- ret = phy_modify(phydev, AT803X_INTR_ENABLE, 0, AT803X_INTR_ENABLE_WOL);
+- if (ret)
+- return ret;
+- } else {
+- /* Disable WOL interrupt */
+- ret = phy_modify(phydev, AT803X_INTR_ENABLE, AT803X_INTR_ENABLE_WOL, 0);
+- if (ret)
+- return ret;
+- }
+-
+- /* Clear WOL status */
+- ret = phy_read(phydev, AT803X_INTR_STATUS);
+- if (ret < 0)
+- return ret;
+-
+- /* Check if there are other interrupts except for WOL triggered when PHY is
+- * in interrupt mode, only the interrupts enabled by AT803X_INTR_ENABLE can
+- * be passed up to the interrupt PIN.
+- */
+- irq_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
+- if (irq_enabled < 0)
+- return irq_enabled;
+-
+- irq_enabled &= ~AT803X_INTR_ENABLE_WOL;
+- if (ret & irq_enabled && !phy_polling_mode(phydev))
+- phy_trigger_machine(phydev);
+-
+- return 0;
+-}
+-
+-static void at803x_get_wol(struct phy_device *phydev,
+- struct ethtool_wolinfo *wol)
+-{
+- int value;
+-
+- wol->supported = WAKE_MAGIC;
+- wol->wolopts = 0;
+-
+- value = phy_read(phydev, AT803X_INTR_ENABLE);
+- if (value < 0)
+- return;
+-
+- if (value & AT803X_INTR_ENABLE_WOL)
+- wol->wolopts |= WAKE_MAGIC;
+-}
+-
+-static int qca83xx_get_sset_count(struct phy_device *phydev)
+-{
+- return ARRAY_SIZE(qca83xx_hw_stats);
+-}
+-
+-static void qca83xx_get_strings(struct phy_device *phydev, u8 *data)
+-{
+- int i;
+-
+- for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) {
+- strscpy(data + i * ETH_GSTRING_LEN,
+- qca83xx_hw_stats[i].string, ETH_GSTRING_LEN);
+- }
+-}
+-
+-static u64 qca83xx_get_stat(struct phy_device *phydev, int i)
+-{
+- struct at803x_hw_stat stat = qca83xx_hw_stats[i];
+- struct at803x_priv *priv = phydev->priv;
+- int val;
+- u64 ret;
+-
+- if (stat.access_type == MMD)
+- val = phy_read_mmd(phydev, MDIO_MMD_PCS, stat.reg);
+- else
+- val = phy_read(phydev, stat.reg);
+-
+- if (val < 0) {
+- ret = U64_MAX;
+- } else {
+- val = val & stat.mask;
+- priv->stats[i] += val;
+- ret = priv->stats[i];
+- }
+-
+- return ret;
+-}
+-
+-static void qca83xx_get_stats(struct phy_device *phydev,
+- struct ethtool_stats *stats, u64 *data)
+-{
+- int i;
+-
+- for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++)
+- data[i] = qca83xx_get_stat(phydev, i);
+-}
+-
+-static int at803x_suspend(struct phy_device *phydev)
+-{
+- int value;
+- int wol_enabled;
+-
+- value = phy_read(phydev, AT803X_INTR_ENABLE);
+- wol_enabled = value & AT803X_INTR_ENABLE_WOL;
+-
+- if (wol_enabled)
+- value = BMCR_ISOLATE;
+- else
+- value = BMCR_PDOWN;
+-
+- phy_modify(phydev, MII_BMCR, 0, value);
+-
+- return 0;
+-}
+-
+-static int at803x_resume(struct phy_device *phydev)
+-{
+- return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0);
+-}
+-
+-static int at803x_parse_dt(struct phy_device *phydev)
+-{
+- struct device_node *node = phydev->mdio.dev.of_node;
+- struct at803x_priv *priv = phydev->priv;
+- u32 freq, strength, tw;
+- unsigned int sel;
+- int ret;
+-
+- if (!IS_ENABLED(CONFIG_OF_MDIO))
+- return 0;
+-
+- if (of_property_read_bool(node, "qca,disable-smarteee"))
+- priv->flags |= AT803X_DISABLE_SMARTEEE;
+-
+- if (of_property_read_bool(node, "qca,disable-hibernation-mode"))
+- priv->flags |= AT803X_DISABLE_HIBERNATION_MODE;
+-
+- if (!of_property_read_u32(node, "qca,smarteee-tw-us-1g", &tw)) {
+- if (!tw || tw > 255) {
+- phydev_err(phydev, "invalid qca,smarteee-tw-us-1g\n");
+- return -EINVAL;
+- }
+- priv->smarteee_lpi_tw_1g = tw;
+- }
+-
+- if (!of_property_read_u32(node, "qca,smarteee-tw-us-100m", &tw)) {
+- if (!tw || tw > 255) {
+- phydev_err(phydev, "invalid qca,smarteee-tw-us-100m\n");
+- return -EINVAL;
+- }
+- priv->smarteee_lpi_tw_100m = tw;
+- }
+-
+- ret = of_property_read_u32(node, "qca,clk-out-frequency", &freq);
+- if (!ret) {
+- switch (freq) {
+- case 25000000:
+- sel = AT803X_CLK_OUT_25MHZ_XTAL;
+- break;
+- case 50000000:
+- sel = AT803X_CLK_OUT_50MHZ_PLL;
+- break;
+- case 62500000:
+- sel = AT803X_CLK_OUT_62_5MHZ_PLL;
+- break;
+- case 125000000:
+- sel = AT803X_CLK_OUT_125MHZ_PLL;
+- break;
+- default:
+- phydev_err(phydev, "invalid qca,clk-out-frequency\n");
+- return -EINVAL;
+- }
+-
+- priv->clk_25m_reg |= FIELD_PREP(AT803X_CLK_OUT_MASK, sel);
+- priv->clk_25m_mask |= AT803X_CLK_OUT_MASK;
+- }
+-
+- ret = of_property_read_u32(node, "qca,clk-out-strength", &strength);
+- if (!ret) {
+- priv->clk_25m_mask |= AT803X_CLK_OUT_STRENGTH_MASK;
+- switch (strength) {
+- case AR803X_STRENGTH_FULL:
+- priv->clk_25m_reg |= AT803X_CLK_OUT_STRENGTH_FULL;
+- break;
+- case AR803X_STRENGTH_HALF:
+- priv->clk_25m_reg |= AT803X_CLK_OUT_STRENGTH_HALF;
+- break;
+- case AR803X_STRENGTH_QUARTER:
+- priv->clk_25m_reg |= AT803X_CLK_OUT_STRENGTH_QUARTER;
+- break;
+- default:
+- phydev_err(phydev, "invalid qca,clk-out-strength\n");
+- return -EINVAL;
+- }
+- }
+-
+- return 0;
+-}
+-
+-static int at803x_probe(struct phy_device *phydev)
+-{
+- struct device *dev = &phydev->mdio.dev;
+- struct at803x_priv *priv;
+- int ret;
+-
+- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+- if (!priv)
+- return -ENOMEM;
+-
+- /* Init LED polarity mode to -1 */
+- priv->led_polarity_mode = -1;
+-
+- phydev->priv = priv;
+-
+- ret = at803x_parse_dt(phydev);
+- if (ret)
+- return ret;
+-
+- return 0;
+-}
+-
+-static int at803x_get_features(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- int err;
+-
+- err = genphy_read_abilities(phydev);
+- if (err)
+- return err;
+-
+- if (phydev->drv->phy_id != ATH8031_PHY_ID)
+- return 0;
+-
+- /* AR8031/AR8033 have different status registers
+- * for copper and fiber operation. However, the
+- * extended status register is the same for both
+- * operation modes.
+- *
+- * As a result of that, ESTATUS_1000_XFULL is set
+- * to 1 even when operating in copper TP mode.
+- *
+- * Remove this mode from the supported link modes
+- * when not operating in 1000BaseX mode.
+- */
+- if (!priv->is_1000basex)
+- linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+- phydev->supported);
+-
+- return 0;
+-}
+-
+-static int at803x_smarteee_config(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- u16 mask = 0, val = 0;
+- int ret;
+-
+- if (priv->flags & AT803X_DISABLE_SMARTEEE)
+- return phy_modify_mmd(phydev, MDIO_MMD_PCS,
+- AT803X_MMD3_SMARTEEE_CTL3,
+- AT803X_MMD3_SMARTEEE_CTL3_LPI_EN, 0);
+-
+- if (priv->smarteee_lpi_tw_1g) {
+- mask |= 0xff00;
+- val |= priv->smarteee_lpi_tw_1g << 8;
+- }
+- if (priv->smarteee_lpi_tw_100m) {
+- mask |= 0x00ff;
+- val |= priv->smarteee_lpi_tw_100m;
+- }
+- if (!mask)
+- return 0;
+-
+- ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, AT803X_MMD3_SMARTEEE_CTL1,
+- mask, val);
+- if (ret)
+- return ret;
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_PCS, AT803X_MMD3_SMARTEEE_CTL3,
+- AT803X_MMD3_SMARTEEE_CTL3_LPI_EN,
+- AT803X_MMD3_SMARTEEE_CTL3_LPI_EN);
+-}
+-
+-static int at803x_clk_out_config(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+-
+- if (!priv->clk_25m_mask)
+- return 0;
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN, AT803X_MMD7_CLK25M,
+- priv->clk_25m_mask, priv->clk_25m_reg);
+-}
+-
+-static int at8031_pll_config(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+-
+- /* The default after hardware reset is PLL OFF. After a soft reset, the
+- * values are retained.
+- */
+- if (priv->flags & AT803X_KEEP_PLL_ENABLED)
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
+- 0, AT803X_DEBUG_PLL_ON);
+- else
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
+- AT803X_DEBUG_PLL_ON, 0);
+-}
+-
+-static int at803x_hibernation_mode_config(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+-
+- /* The default after hardware reset is hibernation mode enabled. After
+- * software reset, the value is retained.
+- */
+- if (!(priv->flags & AT803X_DISABLE_HIBERNATION_MODE))
+- return 0;
+-
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_HIB_CTRL,
+- AT803X_DEBUG_HIB_CTRL_PS_HIB_EN, 0);
+-}
+-
+-static int at803x_config_init(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* The RX and TX delay default is:
+- * after HW reset: RX delay enabled and TX delay disabled
+- * after SW reset: RX delay enabled, while TX delay retains the
+- * value before reset.
+- */
+- if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+- phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+- ret = at803x_enable_rx_delay(phydev);
+- else
+- ret = at803x_disable_rx_delay(phydev);
+- if (ret < 0)
+- return ret;
+-
+- if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+- phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+- ret = at803x_enable_tx_delay(phydev);
+- else
+- ret = at803x_disable_tx_delay(phydev);
+- if (ret < 0)
+- return ret;
+-
+- ret = at803x_smarteee_config(phydev);
+- if (ret < 0)
+- return ret;
+-
+- ret = at803x_clk_out_config(phydev);
+- if (ret < 0)
+- return ret;
+-
+- ret = at803x_hibernation_mode_config(phydev);
+- if (ret < 0)
+- return ret;
+-
+- /* Ar803x extended next page bit is enabled by default. Cisco
+- * multigig switches read this bit and attempt to negotiate 10Gbps
+- * rates even if the next page bit is disabled. This is incorrect
+- * behaviour but we still need to accommodate it. XNP is only needed
+- * for 10Gbps support, so disable XNP.
+- */
+- return phy_modify(phydev, MII_ADVERTISE, MDIO_AN_CTRL1_XNP, 0);
+-}
+-
+-static int at803x_ack_interrupt(struct phy_device *phydev)
+-{
+- int err;
+-
+- err = phy_read(phydev, AT803X_INTR_STATUS);
+-
+- return (err < 0) ? err : 0;
+-}
+-
+-static int at803x_config_intr(struct phy_device *phydev)
+-{
+- int err;
+- int value;
+-
+- value = phy_read(phydev, AT803X_INTR_ENABLE);
+-
+- if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+- /* Clear any pending interrupts */
+- err = at803x_ack_interrupt(phydev);
+- if (err)
+- return err;
+-
+- value |= AT803X_INTR_ENABLE_AUTONEG_ERR;
+- value |= AT803X_INTR_ENABLE_SPEED_CHANGED;
+- value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
+- value |= AT803X_INTR_ENABLE_LINK_FAIL;
+- value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
+-
+- err = phy_write(phydev, AT803X_INTR_ENABLE, value);
+- } else {
+- err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
+- if (err)
+- return err;
+-
+- /* Clear any pending interrupts */
+- err = at803x_ack_interrupt(phydev);
+- }
+-
+- return err;
+-}
+-
+-static irqreturn_t at803x_handle_interrupt(struct phy_device *phydev)
+-{
+- int irq_status, int_enabled;
+-
+- irq_status = phy_read(phydev, AT803X_INTR_STATUS);
+- if (irq_status < 0) {
+- phy_error(phydev);
+- return IRQ_NONE;
+- }
+-
+- /* Read the current enabled interrupts */
+- int_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
+- if (int_enabled < 0) {
+- phy_error(phydev);
+- return IRQ_NONE;
+- }
+-
+- /* See if this was one of our enabled interrupts */
+- if (!(irq_status & int_enabled))
+- return IRQ_NONE;
+-
+- phy_trigger_machine(phydev);
+-
+- return IRQ_HANDLED;
+-}
+-
+-static void at803x_link_change_notify(struct phy_device *phydev)
+-{
+- /*
+- * Conduct a hardware reset for AT8030 every time a link loss is
+- * signalled. This is necessary to circumvent a hardware bug that
+- * occurs when the cable is unplugged while TX packets are pending
+- * in the FIFO. In such cases, the FIFO enters an error mode it
+- * cannot recover from by software.
+- */
+- if (phydev->state == PHY_NOLINK && phydev->mdio.reset_gpio) {
+- struct at803x_context context;
+-
+- at803x_context_save(phydev, &context);
+-
+- phy_device_reset(phydev, 1);
+- usleep_range(1000, 2000);
+- phy_device_reset(phydev, 0);
+- usleep_range(1000, 2000);
+-
+- at803x_context_restore(phydev, &context);
+-
+- phydev_dbg(phydev, "%s(): phy was reset\n", __func__);
+- }
+-}
+-
+-static int at803x_read_specific_status(struct phy_device *phydev,
+- struct at803x_ss_mask ss_mask)
+-{
+- int ss;
+-
+- /* Read the AT8035 PHY-Specific Status register, which indicates the
+- * speed and duplex that the PHY is actually using, irrespective of
+- * whether we are in autoneg mode or not.
+- */
+- ss = phy_read(phydev, AT803X_SPECIFIC_STATUS);
+- if (ss < 0)
+- return ss;
+-
+- if (ss & AT803X_SS_SPEED_DUPLEX_RESOLVED) {
+- int sfc, speed;
+-
+- sfc = phy_read(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL);
+- if (sfc < 0)
+- return sfc;
+-
+- speed = ss & ss_mask.speed_mask;
+- speed >>= ss_mask.speed_shift;
+-
+- switch (speed) {
+- case AT803X_SS_SPEED_10:
+- phydev->speed = SPEED_10;
+- break;
+- case AT803X_SS_SPEED_100:
+- phydev->speed = SPEED_100;
+- break;
+- case AT803X_SS_SPEED_1000:
+- phydev->speed = SPEED_1000;
+- break;
+- case QCA808X_SS_SPEED_2500:
+- phydev->speed = SPEED_2500;
+- break;
+- }
+- if (ss & AT803X_SS_DUPLEX)
+- phydev->duplex = DUPLEX_FULL;
+- else
+- phydev->duplex = DUPLEX_HALF;
+-
+- if (ss & AT803X_SS_MDIX)
+- phydev->mdix = ETH_TP_MDI_X;
+- else
+- phydev->mdix = ETH_TP_MDI;
+-
+- switch (FIELD_GET(AT803X_SFC_MDI_CROSSOVER_MODE_M, sfc)) {
+- case AT803X_SFC_MANUAL_MDI:
+- phydev->mdix_ctrl = ETH_TP_MDI;
+- break;
+- case AT803X_SFC_MANUAL_MDIX:
+- phydev->mdix_ctrl = ETH_TP_MDI_X;
+- break;
+- case AT803X_SFC_AUTOMATIC_CROSSOVER:
+- phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+- break;
+- }
+- }
+-
+- return 0;
+-}
+-
+-static int at803x_read_status(struct phy_device *phydev)
+-{
+- struct at803x_ss_mask ss_mask = { 0 };
+- int err, old_link = phydev->link;
+-
+- /* Update the link, but return if there was an error */
+- err = genphy_update_link(phydev);
+- if (err)
+- return err;
+-
+- /* why bother the PHY if nothing can have changed */
+- if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+- return 0;
+-
+- phydev->speed = SPEED_UNKNOWN;
+- phydev->duplex = DUPLEX_UNKNOWN;
+- phydev->pause = 0;
+- phydev->asym_pause = 0;
+-
+- err = genphy_read_lpa(phydev);
+- if (err < 0)
+- return err;
+-
+- ss_mask.speed_mask = AT803X_SS_SPEED_MASK;
+- ss_mask.speed_shift = __bf_shf(AT803X_SS_SPEED_MASK);
+- err = at803x_read_specific_status(phydev, ss_mask);
+- if (err < 0)
+- return err;
+-
+- if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
+- phy_resolve_aneg_pause(phydev);
+-
+- return 0;
+-}
+-
+-static int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
+-{
+- u16 val;
+-
+- switch (ctrl) {
+- case ETH_TP_MDI:
+- val = AT803X_SFC_MANUAL_MDI;
+- break;
+- case ETH_TP_MDI_X:
+- val = AT803X_SFC_MANUAL_MDIX;
+- break;
+- case ETH_TP_MDI_AUTO:
+- val = AT803X_SFC_AUTOMATIC_CROSSOVER;
+- break;
+- default:
+- return 0;
+- }
+-
+- return phy_modify_changed(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL,
+- AT803X_SFC_MDI_CROSSOVER_MODE_M,
+- FIELD_PREP(AT803X_SFC_MDI_CROSSOVER_MODE_M, val));
+-}
+-
+-static int at803x_prepare_config_aneg(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
+- if (ret < 0)
+- return ret;
+-
+- /* Changes of the midx bits are disruptive to the normal operation;
+- * therefore any changes to these registers must be followed by a
+- * software reset to take effect.
+- */
+- if (ret == 1) {
+- ret = genphy_soft_reset(phydev);
+- if (ret < 0)
+- return ret;
+- }
+-
+- return 0;
+-}
+-
+-static int at803x_config_aneg(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- int ret;
+-
+- ret = at803x_prepare_config_aneg(phydev);
+- if (ret)
+- return ret;
+-
+- if (priv->is_1000basex)
+- return genphy_c37_config_aneg(phydev);
+-
+- return genphy_config_aneg(phydev);
+-}
+-
+-static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
+-{
+- int val;
+-
+- val = phy_read(phydev, AT803X_SMART_SPEED);
+- if (val < 0)
+- return val;
+-
+- if (val & AT803X_SMART_SPEED_ENABLE)
+- *d = FIELD_GET(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, val) + 2;
+- else
+- *d = DOWNSHIFT_DEV_DISABLE;
+-
+- return 0;
+-}
+-
+-static int at803x_set_downshift(struct phy_device *phydev, u8 cnt)
+-{
+- u16 mask, set;
+- int ret;
+-
+- switch (cnt) {
+- case DOWNSHIFT_DEV_DEFAULT_COUNT:
+- cnt = AT803X_DEFAULT_DOWNSHIFT;
+- fallthrough;
+- case AT803X_MIN_DOWNSHIFT ... AT803X_MAX_DOWNSHIFT:
+- set = AT803X_SMART_SPEED_ENABLE |
+- AT803X_SMART_SPEED_BYPASS_TIMER |
+- FIELD_PREP(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, cnt - 2);
+- mask = AT803X_SMART_SPEED_RETRY_LIMIT_MASK;
+- break;
+- case DOWNSHIFT_DEV_DISABLE:
+- set = 0;
+- mask = AT803X_SMART_SPEED_ENABLE |
+- AT803X_SMART_SPEED_BYPASS_TIMER;
+- break;
+- default:
+- return -EINVAL;
+- }
+-
+- ret = phy_modify_changed(phydev, AT803X_SMART_SPEED, mask, set);
+-
+- /* After changing the smart speed settings, we need to perform a
+- * software reset, use phy_init_hw() to make sure we set the
+- * reapply any values which might got lost during software reset.
+- */
+- if (ret == 1)
+- ret = phy_init_hw(phydev);
+-
+- return ret;
+-}
+-
+-static int at803x_get_tunable(struct phy_device *phydev,
+- struct ethtool_tunable *tuna, void *data)
+-{
+- switch (tuna->id) {
+- case ETHTOOL_PHY_DOWNSHIFT:
+- return at803x_get_downshift(phydev, data);
+- default:
+- return -EOPNOTSUPP;
+- }
+-}
+-
+-static int at803x_set_tunable(struct phy_device *phydev,
+- struct ethtool_tunable *tuna, const void *data)
+-{
+- switch (tuna->id) {
+- case ETHTOOL_PHY_DOWNSHIFT:
+- return at803x_set_downshift(phydev, *(const u8 *)data);
+- default:
+- return -EOPNOTSUPP;
+- }
+-}
+-
+-static int at803x_cable_test_result_trans(u16 status)
+-{
+- switch (FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status)) {
+- case AT803X_CDT_STATUS_STAT_NORMAL:
+- return ETHTOOL_A_CABLE_RESULT_CODE_OK;
+- case AT803X_CDT_STATUS_STAT_SHORT:
+- return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
+- case AT803X_CDT_STATUS_STAT_OPEN:
+- return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
+- case AT803X_CDT_STATUS_STAT_FAIL:
+- default:
+- return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
+- }
+-}
+-
+-static bool at803x_cdt_test_failed(u16 status)
+-{
+- return FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status) ==
+- AT803X_CDT_STATUS_STAT_FAIL;
+-}
+-
+-static bool at803x_cdt_fault_length_valid(u16 status)
+-{
+- switch (FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status)) {
+- case AT803X_CDT_STATUS_STAT_OPEN:
+- case AT803X_CDT_STATUS_STAT_SHORT:
+- return true;
+- }
+- return false;
+-}
+-
+-static int at803x_cdt_fault_length(int dt)
+-{
+- /* According to the datasheet the distance to the fault is
+- * DELTA_TIME * 0.824 meters.
+- *
+- * The author suspect the correct formula is:
+- *
+- * fault_distance = DELTA_TIME * (c * VF) / 125MHz / 2
+- *
+- * where c is the speed of light, VF is the velocity factor of
+- * the twisted pair cable, 125MHz the counter frequency and
+- * we need to divide by 2 because the hardware will measure the
+- * round trip time to the fault and back to the PHY.
+- *
+- * With a VF of 0.69 we get the factor 0.824 mentioned in the
+- * datasheet.
+- */
+- return (dt * 824) / 10;
+-}
+-
+-static int at803x_cdt_start(struct phy_device *phydev,
+- u32 cdt_start)
+-{
+- return phy_write(phydev, AT803X_CDT, cdt_start);
+-}
+-
+-static int at803x_cdt_wait_for_completion(struct phy_device *phydev,
+- u32 cdt_en)
+-{
+- int val, ret;
+-
+- /* One test run takes about 25ms */
+- ret = phy_read_poll_timeout(phydev, AT803X_CDT, val,
+- !(val & cdt_en),
+- 30000, 100000, true);
+-
+- return ret < 0 ? ret : 0;
+-}
+-
+-static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair)
+-{
+- static const int ethtool_pair[] = {
+- ETHTOOL_A_CABLE_PAIR_A,
+- ETHTOOL_A_CABLE_PAIR_B,
+- ETHTOOL_A_CABLE_PAIR_C,
+- ETHTOOL_A_CABLE_PAIR_D,
+- };
+- int ret, val;
+-
+- val = FIELD_PREP(AT803X_CDT_MDI_PAIR_MASK, pair) |
+- AT803X_CDT_ENABLE_TEST;
+- ret = at803x_cdt_start(phydev, val);
+- if (ret)
+- return ret;
+-
+- ret = at803x_cdt_wait_for_completion(phydev, AT803X_CDT_ENABLE_TEST);
+- if (ret)
+- return ret;
+-
+- val = phy_read(phydev, AT803X_CDT_STATUS);
+- if (val < 0)
+- return val;
+-
+- if (at803x_cdt_test_failed(val))
+- return 0;
+-
+- ethnl_cable_test_result(phydev, ethtool_pair[pair],
+- at803x_cable_test_result_trans(val));
+-
+- if (at803x_cdt_fault_length_valid(val)) {
+- val = FIELD_GET(AT803X_CDT_STATUS_DELTA_TIME_MASK, val);
+- ethnl_cable_test_fault_length(phydev, ethtool_pair[pair],
+- at803x_cdt_fault_length(val));
+- }
+-
+- return 1;
+-}
+-
+-static int at803x_cable_test_get_status(struct phy_device *phydev,
+- bool *finished, unsigned long pair_mask)
+-{
+- int retries = 20;
+- int pair, ret;
+-
+- *finished = false;
+-
+- /* According to the datasheet the CDT can be performed when
+- * there is no link partner or when the link partner is
+- * auto-negotiating. Starting the test will restart the AN
+- * automatically. It seems that doing this repeatedly we will
+- * get a slot where our link partner won't disturb our
+- * measurement.
+- */
+- while (pair_mask && retries--) {
+- for_each_set_bit(pair, &pair_mask, 4) {
+- ret = at803x_cable_test_one_pair(phydev, pair);
+- if (ret < 0)
+- return ret;
+- if (ret)
+- clear_bit(pair, &pair_mask);
+- }
+- if (pair_mask)
+- msleep(250);
+- }
+-
+- *finished = true;
+-
+- return 0;
+-}
+-
+-static void at803x_cable_test_autoneg(struct phy_device *phydev)
+-{
+- /* Enable auto-negotiation, but advertise no capabilities, no link
+- * will be established. A restart of the auto-negotiation is not
+- * required, because the cable test will automatically break the link.
+- */
+- phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
+- phy_write(phydev, MII_ADVERTISE, ADVERTISE_CSMA);
+-}
+-
+-static int at803x_cable_test_start(struct phy_device *phydev)
+-{
+- at803x_cable_test_autoneg(phydev);
+- /* we do all the (time consuming) work later */
+- return 0;
+-}
+-
+-static int at8031_rgmii_reg_set_voltage_sel(struct regulator_dev *rdev,
+- unsigned int selector)
+-{
+- struct phy_device *phydev = rdev_get_drvdata(rdev);
+-
+- if (selector)
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
+- 0, AT803X_DEBUG_RGMII_1V8);
+- else
+- return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
+- AT803X_DEBUG_RGMII_1V8, 0);
+-}
+-
+-static int at8031_rgmii_reg_get_voltage_sel(struct regulator_dev *rdev)
+-{
+- struct phy_device *phydev = rdev_get_drvdata(rdev);
+- int val;
+-
+- val = at803x_debug_reg_read(phydev, AT803X_DEBUG_REG_1F);
+- if (val < 0)
+- return val;
+-
+- return (val & AT803X_DEBUG_RGMII_1V8) ? 1 : 0;
+-}
+-
+-static const struct regulator_ops vddio_regulator_ops = {
+- .list_voltage = regulator_list_voltage_table,
+- .set_voltage_sel = at8031_rgmii_reg_set_voltage_sel,
+- .get_voltage_sel = at8031_rgmii_reg_get_voltage_sel,
+-};
+-
+-static const unsigned int vddio_voltage_table[] = {
+- 1500000,
+- 1800000,
+-};
+-
+-static const struct regulator_desc vddio_desc = {
+- .name = "vddio",
+- .of_match = of_match_ptr("vddio-regulator"),
+- .n_voltages = ARRAY_SIZE(vddio_voltage_table),
+- .volt_table = vddio_voltage_table,
+- .ops = &vddio_regulator_ops,
+- .type = REGULATOR_VOLTAGE,
+- .owner = THIS_MODULE,
+-};
+-
+-static const struct regulator_ops vddh_regulator_ops = {
+-};
+-
+-static const struct regulator_desc vddh_desc = {
+- .name = "vddh",
+- .of_match = of_match_ptr("vddh-regulator"),
+- .n_voltages = 1,
+- .fixed_uV = 2500000,
+- .ops = &vddh_regulator_ops,
+- .type = REGULATOR_VOLTAGE,
+- .owner = THIS_MODULE,
+-};
+-
+-static int at8031_register_regulators(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- struct device *dev = &phydev->mdio.dev;
+- struct regulator_config config = { };
+-
+- config.dev = dev;
+- config.driver_data = phydev;
+-
+- priv->vddio_rdev = devm_regulator_register(dev, &vddio_desc, &config);
+- if (IS_ERR(priv->vddio_rdev)) {
+- phydev_err(phydev, "failed to register VDDIO regulator\n");
+- return PTR_ERR(priv->vddio_rdev);
+- }
+-
+- priv->vddh_rdev = devm_regulator_register(dev, &vddh_desc, &config);
+- if (IS_ERR(priv->vddh_rdev)) {
+- phydev_err(phydev, "failed to register VDDH regulator\n");
+- return PTR_ERR(priv->vddh_rdev);
+- }
+-
+- return 0;
+-}
+-
+-static int at8031_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
+-{
+- struct phy_device *phydev = upstream;
+- __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_support);
+- __ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support);
+- DECLARE_PHY_INTERFACE_MASK(interfaces);
+- phy_interface_t iface;
+-
+- linkmode_zero(phy_support);
+- phylink_set(phy_support, 1000baseX_Full);
+- phylink_set(phy_support, 1000baseT_Full);
+- phylink_set(phy_support, Autoneg);
+- phylink_set(phy_support, Pause);
+- phylink_set(phy_support, Asym_Pause);
+-
+- linkmode_zero(sfp_support);
+- sfp_parse_support(phydev->sfp_bus, id, sfp_support, interfaces);
+- /* Some modules support 10G modes as well as others we support.
+- * Mask out non-supported modes so the correct interface is picked.
+- */
+- linkmode_and(sfp_support, phy_support, sfp_support);
+-
+- if (linkmode_empty(sfp_support)) {
+- dev_err(&phydev->mdio.dev, "incompatible SFP module inserted\n");
+- return -EINVAL;
+- }
+-
+- iface = sfp_select_interface(phydev->sfp_bus, sfp_support);
+-
+- /* Only 1000Base-X is supported by AR8031/8033 as the downstream SerDes
+- * interface for use with SFP modules.
+- * However, some copper modules detected as having a preferred SGMII
+- * interface do default to and function in 1000Base-X mode, so just
+- * print a warning and allow such modules, as they may have some chance
+- * of working.
+- */
+- if (iface == PHY_INTERFACE_MODE_SGMII)
+- dev_warn(&phydev->mdio.dev, "module may not function if 1000Base-X not supported\n");
+- else if (iface != PHY_INTERFACE_MODE_1000BASEX)
+- return -EINVAL;
+-
+- return 0;
+-}
+-
+-static const struct sfp_upstream_ops at8031_sfp_ops = {
+- .attach = phy_sfp_attach,
+- .detach = phy_sfp_detach,
+- .module_insert = at8031_sfp_insert,
+-};
+-
+-static int at8031_parse_dt(struct phy_device *phydev)
+-{
+- struct device_node *node = phydev->mdio.dev.of_node;
+- struct at803x_priv *priv = phydev->priv;
+- int ret;
+-
+- if (of_property_read_bool(node, "qca,keep-pll-enabled"))
+- priv->flags |= AT803X_KEEP_PLL_ENABLED;
+-
+- ret = at8031_register_regulators(phydev);
+- if (ret < 0)
+- return ret;
+-
+- ret = devm_regulator_get_enable_optional(&phydev->mdio.dev,
+- "vddio");
+- if (ret) {
+- phydev_err(phydev, "failed to get VDDIO regulator\n");
+- return ret;
+- }
+-
+- /* Only AR8031/8033 support 1000Base-X for SFP modules */
+- return phy_sfp_probe(phydev, &at8031_sfp_ops);
+-}
+-
+-static int at8031_probe(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- int mode_cfg;
+- int ccr;
+- int ret;
+-
+- ret = at803x_probe(phydev);
+- if (ret)
+- return ret;
+-
+- /* Only supported on AR8031/AR8033, the AR8030/AR8035 use strapping
+- * options.
+- */
+- ret = at8031_parse_dt(phydev);
+- if (ret)
+- return ret;
+-
+- ccr = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
+- if (ccr < 0)
+- return ccr;
+- mode_cfg = ccr & AT803X_MODE_CFG_MASK;
+-
+- switch (mode_cfg) {
+- case AT803X_MODE_CFG_BX1000_RGMII_50OHM:
+- case AT803X_MODE_CFG_BX1000_RGMII_75OHM:
+- priv->is_1000basex = true;
+- fallthrough;
+- case AT803X_MODE_CFG_FX100_RGMII_50OHM:
+- case AT803X_MODE_CFG_FX100_RGMII_75OHM:
+- priv->is_fiber = true;
+- break;
+- }
+-
+- /* Disable WoL in 1588 register which is enabled
+- * by default
+- */
+- return phy_modify_mmd(phydev, MDIO_MMD_PCS,
+- AT803X_PHY_MMD3_WOL_CTRL,
+- AT803X_WOL_EN, 0);
+-}
+-
+-static int at8031_config_init(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- int ret;
+-
+- /* Some bootloaders leave the fiber page selected.
+- * Switch to the appropriate page (fiber or copper), as otherwise we
+- * read the PHY capabilities from the wrong page.
+- */
+- phy_lock_mdio_bus(phydev);
+- ret = at803x_write_page(phydev,
+- priv->is_fiber ? AT803X_PAGE_FIBER :
+- AT803X_PAGE_COPPER);
+- phy_unlock_mdio_bus(phydev);
+- if (ret)
+- return ret;
+-
+- ret = at8031_pll_config(phydev);
+- if (ret < 0)
+- return ret;
+-
+- return at803x_config_init(phydev);
+-}
+-
+-static int at8031_set_wol(struct phy_device *phydev,
+- struct ethtool_wolinfo *wol)
+-{
+- int ret;
+-
+- /* First setup MAC address and enable WOL interrupt */
+- ret = at803x_set_wol(phydev, wol);
+- if (ret)
+- return ret;
+-
+- if (wol->wolopts & WAKE_MAGIC)
+- /* Enable WOL function for 1588 */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,
+- AT803X_PHY_MMD3_WOL_CTRL,
+- 0, AT803X_WOL_EN);
+- else
+- /* Disable WoL function for 1588 */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,
+- AT803X_PHY_MMD3_WOL_CTRL,
+- AT803X_WOL_EN, 0);
+-
+- return ret;
+-}
+-
+-static int at8031_config_intr(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- int err, value = 0;
+-
+- if (phydev->interrupts == PHY_INTERRUPT_ENABLED &&
+- priv->is_fiber) {
+- /* Clear any pending interrupts */
+- err = at803x_ack_interrupt(phydev);
+- if (err)
+- return err;
+-
+- value |= AT803X_INTR_ENABLE_LINK_FAIL_BX;
+- value |= AT803X_INTR_ENABLE_LINK_SUCCESS_BX;
+-
+- err = phy_set_bits(phydev, AT803X_INTR_ENABLE, value);
+- if (err)
+- return err;
+- }
+-
+- return at803x_config_intr(phydev);
+-}
+-
+-/* AR8031 and AR8033 share the same read status logic */
+-static int at8031_read_status(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+-
+- if (priv->is_1000basex)
+- return genphy_c37_read_status(phydev);
+-
+- return at803x_read_status(phydev);
+-}
+-
+-/* AR8031 and AR8035 share the same cable test get status reg */
+-static int at8031_cable_test_get_status(struct phy_device *phydev,
+- bool *finished)
+-{
+- return at803x_cable_test_get_status(phydev, finished, 0xf);
+-}
+-
+-/* AR8031 and AR8035 share the same cable test start logic */
+-static int at8031_cable_test_start(struct phy_device *phydev)
+-{
+- at803x_cable_test_autoneg(phydev);
+- phy_write(phydev, MII_CTRL1000, 0);
+- /* we do all the (time consuming) work later */
+- return 0;
+-}
+-
+-/* AR8032, AR9331 and QCA9561 share the same cable test get status reg */
+-static int at8032_cable_test_get_status(struct phy_device *phydev,
+- bool *finished)
+-{
+- return at803x_cable_test_get_status(phydev, finished, 0x3);
+-}
+-
+-static int at8035_parse_dt(struct phy_device *phydev)
+-{
+- struct at803x_priv *priv = phydev->priv;
+-
+- /* Mask is set by the generic at803x_parse_dt
+- * if property is set. Assume property is set
+- * with the mask not zero.
+- */
+- if (priv->clk_25m_mask) {
+- /* Fixup for the AR8030/AR8035. This chip has another mask and
+- * doesn't support the DSP reference. Eg. the lowest bit of the
+- * mask. The upper two bits select the same frequencies. Mask
+- * the lowest bit here.
+- *
+- * Warning:
+- * There was no datasheet for the AR8030 available so this is
+- * just a guess. But the AR8035 is listed as pin compatible
+- * to the AR8030 so there might be a good chance it works on
+- * the AR8030 too.
+- */
+- priv->clk_25m_reg &= AT8035_CLK_OUT_MASK;
+- priv->clk_25m_mask &= AT8035_CLK_OUT_MASK;
+- }
+-
+- return 0;
+-}
+-
+-/* AR8030 and AR8035 shared the same special mask for clk_25m */
+-static int at8035_probe(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = at803x_probe(phydev);
+- if (ret)
+- return ret;
+-
+- return at8035_parse_dt(phydev);
+-}
+-
+-static int qca83xx_config_init(struct phy_device *phydev)
+-{
+- u8 switch_revision;
+-
+- switch_revision = phydev->dev_flags & QCA8K_DEVFLAGS_REVISION_MASK;
+-
+- switch (switch_revision) {
+- case 1:
+- /* For 100M waveform */
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL, 0x02ea);
+- /* Turn on Gigabit clock */
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x68a0);
+- break;
+-
+- case 2:
+- phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0x0);
+- fallthrough;
+- case 4:
+- phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_AZ_DEBUG, 0x803f);
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x6860);
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0x2c46);
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3C, 0x6000);
+- break;
+- }
+-
+- /* Following original QCA sourcecode set port to prefer master */
+- phy_set_bits(phydev, MII_CTRL1000, CTL1000_PREFER_MASTER);
+-
+- return 0;
+-}
+-
+-static int qca8327_config_init(struct phy_device *phydev)
+-{
+- /* QCA8327 require DAC amplitude adjustment for 100m set to +6%.
+- * Disable on init and enable only with 100m speed following
+- * qca original source code.
+- */
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- QCA8327_DEBUG_MANU_CTRL_EN, 0);
+-
+- return qca83xx_config_init(phydev);
+-}
+-
+-static void qca83xx_link_change_notify(struct phy_device *phydev)
+-{
+- /* Set DAC Amplitude adjustment to +6% for 100m on link running */
+- if (phydev->state == PHY_RUNNING) {
+- if (phydev->speed == SPEED_100)
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- QCA8327_DEBUG_MANU_CTRL_EN,
+- QCA8327_DEBUG_MANU_CTRL_EN);
+- } else {
+- /* Reset DAC Amplitude adjustment */
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- QCA8327_DEBUG_MANU_CTRL_EN, 0);
+- }
+-}
+-
+-static int qca83xx_resume(struct phy_device *phydev)
+-{
+- int ret, val;
+-
+- /* Skip reset if not suspended */
+- if (!phydev->suspended)
+- return 0;
+-
+- /* Reinit the port, reset values set by suspend */
+- qca83xx_config_init(phydev);
+-
+- /* Reset the port on port resume */
+- phy_set_bits(phydev, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
+-
+- /* On resume from suspend the switch execute a reset and
+- * restart auto-negotiation. Wait for reset to complete.
+- */
+- ret = phy_read_poll_timeout(phydev, MII_BMCR, val, !(val & BMCR_RESET),
+- 50000, 600000, true);
+- if (ret)
+- return ret;
+-
+- usleep_range(1000, 2000);
+-
+- return 0;
+-}
+-
+-static int qca83xx_suspend(struct phy_device *phydev)
+-{
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_GREEN,
+- AT803X_DEBUG_GATE_CLK_IN1000, 0);
+-
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_HIB_CTRL,
+- AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE |
+- AT803X_DEBUG_HIB_CTRL_SEL_RST_80U, 0);
+-
+- return 0;
+-}
+-
+-static int qca8337_suspend(struct phy_device *phydev)
+-{
+- /* Only QCA8337 support actual suspend. */
+- genphy_suspend(phydev);
+-
+- return qca83xx_suspend(phydev);
+-}
+-
+-static int qca8327_suspend(struct phy_device *phydev)
+-{
+- u16 mask = 0;
+-
+- /* QCA8327 cause port unreliability when phy suspend
+- * is set.
+- */
+- mask |= ~(BMCR_SPEED1000 | BMCR_FULLDPLX);
+- phy_modify(phydev, MII_BMCR, mask, 0);
+-
+- return qca83xx_suspend(phydev);
+-}
+-
+-static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* Enable fast retrain */
+- ret = genphy_c45_fast_retrain(phydev, true);
+- if (ret)
+- return ret;
+-
+- phy_write_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_TOP_OPTION1,
+- QCA808X_TOP_OPTION1_DATA);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB,
+- QCA808X_MSE_THRESHOLD_20DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB,
+- QCA808X_MSE_THRESHOLD_17DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB,
+- QCA808X_MSE_THRESHOLD_27DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB,
+- QCA808X_MSE_THRESHOLD_28DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_1,
+- QCA808X_MMD3_DEBUG_1_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_4,
+- QCA808X_MMD3_DEBUG_4_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_5,
+- QCA808X_MMD3_DEBUG_5_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_3,
+- QCA808X_MMD3_DEBUG_3_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_6,
+- QCA808X_MMD3_DEBUG_6_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_2,
+- QCA808X_MMD3_DEBUG_2_VALUE);
+-
+- return 0;
+-}
+-
+-static int qca808x_phy_ms_seed_enable(struct phy_device *phydev, bool enable)
+-{
+- u16 seed_value;
+-
+- if (!enable)
+- return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
+- QCA808X_MASTER_SLAVE_SEED_ENABLE, 0);
+-
+- seed_value = prandom_u32_max(QCA808X_MASTER_SLAVE_SEED_RANGE);
+- return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
+- QCA808X_MASTER_SLAVE_SEED_CFG | QCA808X_MASTER_SLAVE_SEED_ENABLE,
+- FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value) |
+- QCA808X_MASTER_SLAVE_SEED_ENABLE);
+-}
+-
+-static bool qca808x_is_prefer_master(struct phy_device *phydev)
+-{
+- return (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_FORCE) ||
+- (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_PREFERRED);
+-}
+-
+-static bool qca808x_has_fast_retrain_or_slave_seed(struct phy_device *phydev)
+-{
+- return linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
+-}
+-
+-static int qca808x_config_init(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* Active adc&vga on 802.3az for the link 1000M and 100M */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_ADDR_CLD_CTRL7,
+- QCA808X_8023AZ_AFE_CTRL_MASK, QCA808X_8023AZ_AFE_EN);
+- if (ret)
+- return ret;
+-
+- /* Adjust the threshold on 802.3az for the link 1000M */
+- ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
+- QCA808X_PHY_MMD3_AZ_TRAINING_CTRL,
+- QCA808X_MMD3_AZ_TRAINING_VAL);
+- if (ret)
+- return ret;
+-
+- if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
+- /* Config the fast retrain for the link 2500M */
+- ret = qca808x_phy_fast_retrain_config(phydev);
+- if (ret)
+- return ret;
+-
+- ret = genphy_read_master_slave(phydev);
+- if (ret < 0)
+- return ret;
+-
+- if (!qca808x_is_prefer_master(phydev)) {
+- /* Enable seed and configure lower ramdom seed to make phy
+- * linked as slave mode.
+- */
+- ret = qca808x_phy_ms_seed_enable(phydev, true);
+- if (ret)
+- return ret;
+- }
+- }
+-
+- /* Configure adc threshold as 100mv for the link 10M */
+- return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_ADC_THRESHOLD,
+- QCA808X_ADC_THRESHOLD_MASK,
+- QCA808X_ADC_THRESHOLD_100MV);
+-}
+-
+-static int qca808x_read_status(struct phy_device *phydev)
+-{
+- struct at803x_ss_mask ss_mask = { 0 };
+- int ret;
+-
+- ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_STAT);
+- if (ret < 0)
+- return ret;
+-
+- linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->lp_advertising,
+- ret & MDIO_AN_10GBT_STAT_LP2_5G);
+-
+- ret = genphy_read_status(phydev);
+- if (ret)
+- return ret;
+-
+- /* qca8081 takes the different bits for speed value from at803x */
+- ss_mask.speed_mask = QCA808X_SS_SPEED_MASK;
+- ss_mask.speed_shift = __bf_shf(QCA808X_SS_SPEED_MASK);
+- ret = at803x_read_specific_status(phydev, ss_mask);
+- if (ret < 0)
+- return ret;
+-
+- if (phydev->link) {
+- if (phydev->speed == SPEED_2500)
+- phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
+- else
+- phydev->interface = PHY_INTERFACE_MODE_SGMII;
+- } else {
+- /* generate seed as a lower random value to make PHY linked as SLAVE easily,
+- * except for master/slave configuration fault detected or the master mode
+- * preferred.
+- *
+- * the reason for not putting this code into the function link_change_notify is
+- * the corner case where the link partner is also the qca8081 PHY and the seed
+- * value is configured as the same value, the link can't be up and no link change
+- * occurs.
+- */
+- if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
+- if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR ||
+- qca808x_is_prefer_master(phydev)) {
+- qca808x_phy_ms_seed_enable(phydev, false);
+- } else {
+- qca808x_phy_ms_seed_enable(phydev, true);
+- }
+- }
+- }
+-
+- return 0;
+-}
+-
+-static int qca808x_soft_reset(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = genphy_soft_reset(phydev);
+- if (ret < 0)
+- return ret;
+-
+- if (qca808x_has_fast_retrain_or_slave_seed(phydev))
+- ret = qca808x_phy_ms_seed_enable(phydev, true);
+-
+- return ret;
+-}
+-
+-static bool qca808x_cdt_fault_length_valid(int cdt_code)
+-{
+- switch (cdt_code) {
+- case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+- return true;
+- default:
+- return false;
+- }
+-}
+-
+-static int qca808x_cable_test_result_trans(int cdt_code)
+-{
+- switch (cdt_code) {
+- case QCA808X_CDT_STATUS_STAT_NORMAL:
+- return ETHTOOL_A_CABLE_RESULT_CODE_OK;
+- case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
+- return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
+- case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
+- return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+- return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
+- case QCA808X_CDT_STATUS_STAT_FAIL:
+- default:
+- return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
+- }
+-}
+-
+-static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair,
+- int result)
+-{
+- int val;
+- u32 cdt_length_reg = 0;
+-
+- switch (pair) {
+- case ETHTOOL_A_CABLE_PAIR_A:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_A;
+- break;
+- case ETHTOOL_A_CABLE_PAIR_B:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_B;
+- break;
+- case ETHTOOL_A_CABLE_PAIR_C:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_C;
+- break;
+- case ETHTOOL_A_CABLE_PAIR_D:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_D;
+- break;
+- default:
+- return -EINVAL;
+- }
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_PCS, cdt_length_reg);
+- if (val < 0)
+- return val;
+-
+- if (result == ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT)
+- val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_SAME_SHORT, val);
+- else
+- val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT, val);
+-
+- return at803x_cdt_fault_length(val);
+-}
+-
+-static int qca808x_cable_test_start(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* perform CDT with the following configs:
+- * 1. disable hibernation.
+- * 2. force PHY working in MDI mode.
+- * 3. for PHY working in 1000BaseT.
+- * 4. configure the threshold.
+- */
+-
+- ret = at803x_debug_reg_mask(phydev, QCA808X_DBG_AN_TEST, QCA808X_HIBERNATION_EN, 0);
+- if (ret < 0)
+- return ret;
+-
+- ret = at803x_config_mdix(phydev, ETH_TP_MDI);
+- if (ret < 0)
+- return ret;
+-
+- /* Force 1000base-T needs to configure PMA/PMD and MII_BMCR */
+- phydev->duplex = DUPLEX_FULL;
+- phydev->speed = SPEED_1000;
+- ret = genphy_c45_pma_setup_forced(phydev);
+- if (ret < 0)
+- return ret;
+-
+- ret = genphy_setup_forced(phydev);
+- if (ret < 0)
+- return ret;
+-
+- /* configure the thresholds for open, short, pair ok test */
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8074, 0xc040);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8076, 0xc040);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8077, 0xa060);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8078, 0xc050);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807a, 0xc060);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807e, 0xb060);
+-
+- return 0;
+-}
+-
+-static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
+- u16 status)
+-{
+- int length, result;
+- u16 pair_code;
+-
+- switch (pair) {
+- case ETHTOOL_A_CABLE_PAIR_A:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
+- break;
+- case ETHTOOL_A_CABLE_PAIR_B:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
+- break;
+- case ETHTOOL_A_CABLE_PAIR_C:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
+- break;
+- case ETHTOOL_A_CABLE_PAIR_D:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
+- break;
+- default:
+- return -EINVAL;
+- }
+-
+- result = qca808x_cable_test_result_trans(pair_code);
+- ethnl_cable_test_result(phydev, pair, result);
+-
+- if (qca808x_cdt_fault_length_valid(pair_code)) {
+- length = qca808x_cdt_fault_length(phydev, pair, result);
+- ethnl_cable_test_fault_length(phydev, pair, length);
+- }
+-
+- return 0;
+-}
+-
+-static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
+-{
+- int ret, val;
+-
+- *finished = false;
+-
+- val = QCA808X_CDT_ENABLE_TEST |
+- QCA808X_CDT_LENGTH_UNIT;
+- ret = at803x_cdt_start(phydev, val);
+- if (ret)
+- return ret;
+-
+- ret = at803x_cdt_wait_for_completion(phydev, QCA808X_CDT_ENABLE_TEST);
+- if (ret)
+- return ret;
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA808X_MMD3_CDT_STATUS);
+- if (val < 0)
+- return val;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
+- if (ret)
+- return ret;
+-
+- *finished = true;
+-
+- return 0;
+-}
+-
+-static int qca808x_get_features(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = genphy_c45_pma_read_abilities(phydev);
+- if (ret)
+- return ret;
+-
+- /* The autoneg ability is not existed in bit3 of MMD7.1,
+- * but it is supported by qca808x PHY, so we add it here
+- * manually.
+- */
+- linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported);
+-
+- /* As for the qca8081 1G version chip, the 2500baseT ability is also
+- * existed in the bit0 of MMD1.21, we need to remove it manually if
+- * it is the qca8081 1G chip according to the bit0 of MMD7.0x901d.
+- */
+- ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_CHIP_TYPE);
+- if (ret < 0)
+- return ret;
+-
+- if (QCA808X_PHY_CHIP_TYPE_1G & ret)
+- linkmode_clear_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
+-
+- return 0;
+-}
+-
+-static int qca808x_config_aneg(struct phy_device *phydev)
+-{
+- int phy_ctrl = 0;
+- int ret;
+-
+- ret = at803x_prepare_config_aneg(phydev);
+- if (ret)
+- return ret;
+-
+- /* The reg MII_BMCR also needs to be configured for force mode, the
+- * genphy_config_aneg is also needed.
+- */
+- if (phydev->autoneg == AUTONEG_DISABLE)
+- genphy_c45_pma_setup_forced(phydev);
+-
+- if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
+- phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
+-
+- ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
+- MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
+- if (ret < 0)
+- return ret;
+-
+- return __genphy_config_aneg(phydev, ret);
+-}
+-
+-static void qca808x_link_change_notify(struct phy_device *phydev)
+-{
+- /* Assert interface sgmii fifo on link down, deassert it on link up,
+- * the interface device address is always phy address added by 1.
+- */
+- mdiobus_c45_modify_changed(phydev->mdio.bus, phydev->mdio.addr + 1,
+- MDIO_MMD_PMAPMD, QCA8081_PHY_SERDES_MMD1_FIFO_CTRL,
+- QCA8081_PHY_FIFO_RSTN,
+- phydev->link ? QCA8081_PHY_FIFO_RSTN : 0);
+-}
+-
+-static int qca808x_led_parse_netdev(struct phy_device *phydev, unsigned long rules,
+- u16 *offload_trigger)
+-{
+- /* Parsing specific to netdev trigger */
+- if (test_bit(TRIGGER_NETDEV_TX, &rules))
+- *offload_trigger |= QCA808X_LED_TX_BLINK;
+- if (test_bit(TRIGGER_NETDEV_RX, &rules))
+- *offload_trigger |= QCA808X_LED_RX_BLINK;
+- if (test_bit(TRIGGER_NETDEV_LINK_10, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED10_ON;
+- if (test_bit(TRIGGER_NETDEV_LINK_100, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED100_ON;
+- if (test_bit(TRIGGER_NETDEV_LINK_1000, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED1000_ON;
+- if (test_bit(TRIGGER_NETDEV_LINK_2500, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED2500_ON;
+- if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &rules))
+- *offload_trigger |= QCA808X_LED_HALF_DUPLEX_ON;
+- if (test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &rules))
+- *offload_trigger |= QCA808X_LED_FULL_DUPLEX_ON;
+-
+- if (rules && !*offload_trigger)
+- return -EOPNOTSUPP;
+-
+- /* Enable BLINK_CHECK_BYPASS by default to make the LED
+- * blink even with duplex or speed mode not enabled.
+- */
+- *offload_trigger |= QCA808X_LED_BLINK_CHECK_BYPASS;
+-
+- return 0;
+-}
+-
+-static int qca808x_led_hw_control_enable(struct phy_device *phydev, u8 index)
+-{
+- u16 reg;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_FORCE_EN);
+-}
+-
+-static int qca808x_led_hw_is_supported(struct phy_device *phydev, u8 index,
+- unsigned long rules)
+-{
+- u16 offload_trigger = 0;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- return qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
+-}
+-
+-static int qca808x_led_hw_control_set(struct phy_device *phydev, u8 index,
+- unsigned long rules)
+-{
+- u16 reg, offload_trigger = 0;
+- int ret;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_CTRL(index);
+-
+- ret = qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_led_hw_control_enable(phydev, index);
+- if (ret)
+- return ret;
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_PATTERN_MASK,
+- offload_trigger);
+-}
+-
+-static bool qca808x_led_hw_control_status(struct phy_device *phydev, u8 index)
+-{
+- u16 reg;
+- int val;
+-
+- if (index > 2)
+- return false;
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
+-
+- return !(val & QCA808X_LED_FORCE_EN);
+-}
+-
+-static int qca808x_led_hw_control_get(struct phy_device *phydev, u8 index,
+- unsigned long *rules)
+-{
+- u16 reg;
+- int val;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- /* Check if we have hw control enabled */
+- if (qca808x_led_hw_control_status(phydev, index))
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_CTRL(index);
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
+- if (val & QCA808X_LED_TX_BLINK)
+- set_bit(TRIGGER_NETDEV_TX, rules);
+- if (val & QCA808X_LED_RX_BLINK)
+- set_bit(TRIGGER_NETDEV_RX, rules);
+- if (val & QCA808X_LED_SPEED10_ON)
+- set_bit(TRIGGER_NETDEV_LINK_10, rules);
+- if (val & QCA808X_LED_SPEED100_ON)
+- set_bit(TRIGGER_NETDEV_LINK_100, rules);
+- if (val & QCA808X_LED_SPEED1000_ON)
+- set_bit(TRIGGER_NETDEV_LINK_1000, rules);
+- if (val & QCA808X_LED_SPEED2500_ON)
+- set_bit(TRIGGER_NETDEV_LINK_2500, rules);
+- if (val & QCA808X_LED_HALF_DUPLEX_ON)
+- set_bit(TRIGGER_NETDEV_HALF_DUPLEX, rules);
+- if (val & QCA808X_LED_FULL_DUPLEX_ON)
+- set_bit(TRIGGER_NETDEV_FULL_DUPLEX, rules);
+-
+- return 0;
+-}
+-
+-static int qca808x_led_hw_control_reset(struct phy_device *phydev, u8 index)
+-{
+- u16 reg;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_CTRL(index);
+-
+- return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_PATTERN_MASK);
+-}
+-
+-static int qca808x_led_brightness_set(struct phy_device *phydev,
+- u8 index, enum led_brightness value)
+-{
+- u16 reg;
+- int ret;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- if (!value) {
+- ret = qca808x_led_hw_control_reset(phydev, index);
+- if (ret)
+- return ret;
+- }
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
+- QCA808X_LED_FORCE_EN | value ? QCA808X_LED_FORCE_ON :
+- QCA808X_LED_FORCE_OFF);
+-}
+-
+-static int qca808x_led_blink_set(struct phy_device *phydev, u8 index,
+- unsigned long *delay_on,
+- unsigned long *delay_off)
+-{
+- int ret;
+- u16 reg;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- /* Set blink to 50% off, 50% on at 4Hz by default */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_LED_GLOBAL,
+- QCA808X_LED_BLINK_FREQ_MASK | QCA808X_LED_BLINK_DUTY_MASK,
+- QCA808X_LED_BLINK_FREQ_4HZ | QCA808X_LED_BLINK_DUTY_50_50);
+- if (ret)
+- return ret;
+-
+- /* We use BLINK_1 for normal blinking */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
+- QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_BLINK_1);
+- if (ret)
+- return ret;
+-
+- /* We set blink to 4Hz, aka 250ms */
+- *delay_on = 250 / 2;
+- *delay_off = 250 / 2;
+-
+- return 0;
+-}
+-
+-static int qca808x_led_polarity_set(struct phy_device *phydev, int index,
+- unsigned long modes)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- bool active_low = false;
+- u32 mode;
+-
+- for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) {
+- switch (mode) {
+- case PHY_LED_ACTIVE_LOW:
+- active_low = true;
+- break;
+- default:
+- return -EINVAL;
+- }
+- }
+-
+- /* PHY polarity is global and can't be set per LED.
+- * To detect this, check if last requested polarity mode
+- * match the new one.
+- */
+- if (priv->led_polarity_mode >= 0 &&
+- priv->led_polarity_mode != active_low) {
+- phydev_err(phydev, "PHY polarity is global. Mismatched polarity on different LED\n");
+- return -EINVAL;
+- }
+-
+- /* Save the last PHY polarity mode */
+- priv->led_polarity_mode = active_low;
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN,
+- QCA808X_MMD7_LED_POLARITY_CTRL,
+- QCA808X_LED_ACTIVE_HIGH,
+- active_low ? 0 : QCA808X_LED_ACTIVE_HIGH);
+-}
+-
+-static struct phy_driver at803x_driver[] = {
+-{
+- /* Qualcomm Atheros AR8035 */
+- PHY_ID_MATCH_EXACT(ATH8035_PHY_ID),
+- .name = "Qualcomm Atheros AR8035",
+- .flags = PHY_POLL_CABLE_TEST,
+- .probe = at8035_probe,
+- .config_aneg = at803x_config_aneg,
+- .config_init = at803x_config_init,
+- .soft_reset = genphy_soft_reset,
+- .set_wol = at803x_set_wol,
+- .get_wol = at803x_get_wol,
+- .suspend = at803x_suspend,
+- .resume = at803x_resume,
+- /* PHY_GBIT_FEATURES */
+- .read_status = at803x_read_status,
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .get_tunable = at803x_get_tunable,
+- .set_tunable = at803x_set_tunable,
+- .cable_test_start = at8031_cable_test_start,
+- .cable_test_get_status = at8031_cable_test_get_status,
+-}, {
+- /* Qualcomm Atheros AR8030 */
+- .phy_id = ATH8030_PHY_ID,
+- .name = "Qualcomm Atheros AR8030",
+- .phy_id_mask = AT8030_PHY_ID_MASK,
+- .probe = at8035_probe,
+- .config_init = at803x_config_init,
+- .link_change_notify = at803x_link_change_notify,
+- .set_wol = at803x_set_wol,
+- .get_wol = at803x_get_wol,
+- .suspend = at803x_suspend,
+- .resume = at803x_resume,
+- /* PHY_BASIC_FEATURES */
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+-}, {
+- /* Qualcomm Atheros AR8031/AR8033 */
+- PHY_ID_MATCH_EXACT(ATH8031_PHY_ID),
+- .name = "Qualcomm Atheros AR8031/AR8033",
+- .flags = PHY_POLL_CABLE_TEST,
+- .probe = at8031_probe,
+- .config_init = at8031_config_init,
+- .config_aneg = at803x_config_aneg,
+- .soft_reset = genphy_soft_reset,
+- .set_wol = at8031_set_wol,
+- .get_wol = at803x_get_wol,
+- .suspend = at803x_suspend,
+- .resume = at803x_resume,
+- .read_page = at803x_read_page,
+- .write_page = at803x_write_page,
+- .get_features = at803x_get_features,
+- .read_status = at8031_read_status,
+- .config_intr = at8031_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .get_tunable = at803x_get_tunable,
+- .set_tunable = at803x_set_tunable,
+- .cable_test_start = at8031_cable_test_start,
+- .cable_test_get_status = at8031_cable_test_get_status,
+-}, {
+- /* Qualcomm Atheros AR8032 */
+- PHY_ID_MATCH_EXACT(ATH8032_PHY_ID),
+- .name = "Qualcomm Atheros AR8032",
+- .probe = at803x_probe,
+- .flags = PHY_POLL_CABLE_TEST,
+- .config_init = at803x_config_init,
+- .link_change_notify = at803x_link_change_notify,
+- .suspend = at803x_suspend,
+- .resume = at803x_resume,
+- /* PHY_BASIC_FEATURES */
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .cable_test_start = at803x_cable_test_start,
+- .cable_test_get_status = at8032_cable_test_get_status,
+-}, {
+- /* ATHEROS AR9331 */
+- PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
+- .name = "Qualcomm Atheros AR9331 built-in PHY",
+- .probe = at803x_probe,
+- .suspend = at803x_suspend,
+- .resume = at803x_resume,
+- .flags = PHY_POLL_CABLE_TEST,
+- /* PHY_BASIC_FEATURES */
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .cable_test_start = at803x_cable_test_start,
+- .cable_test_get_status = at8032_cable_test_get_status,
+- .read_status = at803x_read_status,
+- .soft_reset = genphy_soft_reset,
+- .config_aneg = at803x_config_aneg,
+-}, {
+- /* Qualcomm Atheros QCA9561 */
+- PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
+- .name = "Qualcomm Atheros QCA9561 built-in PHY",
+- .probe = at803x_probe,
+- .suspend = at803x_suspend,
+- .resume = at803x_resume,
+- .flags = PHY_POLL_CABLE_TEST,
+- /* PHY_BASIC_FEATURES */
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .cable_test_start = at803x_cable_test_start,
+- .cable_test_get_status = at8032_cable_test_get_status,
+- .read_status = at803x_read_status,
+- .soft_reset = genphy_soft_reset,
+- .config_aneg = at803x_config_aneg,
+-}, {
+- /* QCA8337 */
+- .phy_id = QCA8337_PHY_ID,
+- .phy_id_mask = QCA8K_PHY_ID_MASK,
+- .name = "Qualcomm Atheros 8337 internal PHY",
+- /* PHY_GBIT_FEATURES */
+- .probe = at803x_probe,
+- .flags = PHY_IS_INTERNAL,
+- .config_init = qca83xx_config_init,
+- .soft_reset = genphy_soft_reset,
+- .get_sset_count = qca83xx_get_sset_count,
+- .get_strings = qca83xx_get_strings,
+- .get_stats = qca83xx_get_stats,
+- .suspend = qca8337_suspend,
+- .resume = qca83xx_resume,
+-}, {
+- /* QCA8327-A from switch QCA8327-AL1A */
+- .phy_id = QCA8327_A_PHY_ID,
+- .phy_id_mask = QCA8K_PHY_ID_MASK,
+- .name = "Qualcomm Atheros 8327-A internal PHY",
+- /* PHY_GBIT_FEATURES */
+- .link_change_notify = qca83xx_link_change_notify,
+- .probe = at803x_probe,
+- .flags = PHY_IS_INTERNAL,
+- .config_init = qca8327_config_init,
+- .soft_reset = genphy_soft_reset,
+- .get_sset_count = qca83xx_get_sset_count,
+- .get_strings = qca83xx_get_strings,
+- .get_stats = qca83xx_get_stats,
+- .suspend = qca8327_suspend,
+- .resume = qca83xx_resume,
+-}, {
+- /* QCA8327-B from switch QCA8327-BL1A */
+- .phy_id = QCA8327_B_PHY_ID,
+- .phy_id_mask = QCA8K_PHY_ID_MASK,
+- .name = "Qualcomm Atheros 8327-B internal PHY",
+- /* PHY_GBIT_FEATURES */
+- .link_change_notify = qca83xx_link_change_notify,
+- .probe = at803x_probe,
+- .flags = PHY_IS_INTERNAL,
+- .config_init = qca8327_config_init,
+- .soft_reset = genphy_soft_reset,
+- .get_sset_count = qca83xx_get_sset_count,
+- .get_strings = qca83xx_get_strings,
+- .get_stats = qca83xx_get_stats,
+- .suspend = qca8327_suspend,
+- .resume = qca83xx_resume,
+-}, {
+- /* Qualcomm QCA8081 */
+- PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
+- .name = "Qualcomm QCA8081",
+- .flags = PHY_POLL_CABLE_TEST,
+- .probe = at803x_probe,
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .get_tunable = at803x_get_tunable,
+- .set_tunable = at803x_set_tunable,
+- .set_wol = at803x_set_wol,
+- .get_wol = at803x_get_wol,
+- .get_features = qca808x_get_features,
+- .config_aneg = qca808x_config_aneg,
+- .suspend = genphy_suspend,
+- .resume = genphy_resume,
+- .read_status = qca808x_read_status,
+- .config_init = qca808x_config_init,
+- .soft_reset = qca808x_soft_reset,
+- .cable_test_start = qca808x_cable_test_start,
+- .cable_test_get_status = qca808x_cable_test_get_status,
+- .link_change_notify = qca808x_link_change_notify,
+- .led_brightness_set = qca808x_led_brightness_set,
+- .led_blink_set = qca808x_led_blink_set,
+- .led_hw_is_supported = qca808x_led_hw_is_supported,
+- .led_hw_control_set = qca808x_led_hw_control_set,
+- .led_hw_control_get = qca808x_led_hw_control_get,
+- .led_polarity_set = qca808x_led_polarity_set,
+-}, };
+-
+-module_phy_driver(at803x_driver);
+-
+-static struct mdio_device_id __maybe_unused atheros_tbl[] = {
+- { ATH8030_PHY_ID, AT8030_PHY_ID_MASK },
+- { PHY_ID_MATCH_EXACT(ATH8031_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(ATH8032_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA9561_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8081_PHY_ID) },
+- { }
+-};
+-
+-MODULE_DEVICE_TABLE(mdio, atheros_tbl);
+--- /dev/null
++++ b/drivers/net/phy/qcom/at803x.c
+@@ -0,0 +1,2759 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * drivers/net/phy/at803x.c
++ *
++ * Driver for Qualcomm Atheros AR803x PHY
++ *
++ * Author: Matus Ujhelyi <ujhelyi.m@gmail.com>
++ */
++
++#include <linux/phy.h>
++#include <linux/module.h>
++#include <linux/string.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/ethtool_netlink.h>
++#include <linux/bitfield.h>
++#include <linux/regulator/of_regulator.h>
++#include <linux/regulator/driver.h>
++#include <linux/regulator/consumer.h>
++#include <linux/of.h>
++#include <linux/phylink.h>
++#include <linux/sfp.h>
++#include <dt-bindings/net/qca-ar803x.h>
++
++#define AT803X_SPECIFIC_FUNCTION_CONTROL 0x10
++#define AT803X_SFC_ASSERT_CRS BIT(11)
++#define AT803X_SFC_FORCE_LINK BIT(10)
++#define AT803X_SFC_MDI_CROSSOVER_MODE_M GENMASK(6, 5)
++#define AT803X_SFC_AUTOMATIC_CROSSOVER 0x3
++#define AT803X_SFC_MANUAL_MDIX 0x1
++#define AT803X_SFC_MANUAL_MDI 0x0
++#define AT803X_SFC_SQE_TEST BIT(2)
++#define AT803X_SFC_POLARITY_REVERSAL BIT(1)
++#define AT803X_SFC_DISABLE_JABBER BIT(0)
++
++#define AT803X_SPECIFIC_STATUS 0x11
++#define AT803X_SS_SPEED_MASK GENMASK(15, 14)
++#define AT803X_SS_SPEED_1000 2
++#define AT803X_SS_SPEED_100 1
++#define AT803X_SS_SPEED_10 0
++#define AT803X_SS_DUPLEX BIT(13)
++#define AT803X_SS_SPEED_DUPLEX_RESOLVED BIT(11)
++#define AT803X_SS_MDIX BIT(6)
++
++#define QCA808X_SS_SPEED_MASK GENMASK(9, 7)
++#define QCA808X_SS_SPEED_2500 4
++
++#define AT803X_INTR_ENABLE 0x12
++#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
++#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)
++#define AT803X_INTR_ENABLE_DUPLEX_CHANGED BIT(13)
++#define AT803X_INTR_ENABLE_PAGE_RECEIVED BIT(12)
++#define AT803X_INTR_ENABLE_LINK_FAIL BIT(11)
++#define AT803X_INTR_ENABLE_LINK_SUCCESS BIT(10)
++#define AT803X_INTR_ENABLE_LINK_FAIL_BX BIT(8)
++#define AT803X_INTR_ENABLE_LINK_SUCCESS_BX BIT(7)
++#define AT803X_INTR_ENABLE_WIRESPEED_DOWNGRADE BIT(5)
++#define AT803X_INTR_ENABLE_POLARITY_CHANGED BIT(1)
++#define AT803X_INTR_ENABLE_WOL BIT(0)
++
++#define AT803X_INTR_STATUS 0x13
++
++#define AT803X_SMART_SPEED 0x14
++#define AT803X_SMART_SPEED_ENABLE BIT(5)
++#define AT803X_SMART_SPEED_RETRY_LIMIT_MASK GENMASK(4, 2)
++#define AT803X_SMART_SPEED_BYPASS_TIMER BIT(1)
++#define AT803X_CDT 0x16
++#define AT803X_CDT_MDI_PAIR_MASK GENMASK(9, 8)
++#define AT803X_CDT_ENABLE_TEST BIT(0)
++#define AT803X_CDT_STATUS 0x1c
++#define AT803X_CDT_STATUS_STAT_NORMAL 0
++#define AT803X_CDT_STATUS_STAT_SHORT 1
++#define AT803X_CDT_STATUS_STAT_OPEN 2
++#define AT803X_CDT_STATUS_STAT_FAIL 3
++#define AT803X_CDT_STATUS_STAT_MASK GENMASK(9, 8)
++#define AT803X_CDT_STATUS_DELTA_TIME_MASK GENMASK(7, 0)
++#define AT803X_LED_CONTROL 0x18
++
++#define AT803X_PHY_MMD3_WOL_CTRL 0x8012
++#define AT803X_WOL_EN BIT(5)
++#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
++#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
++#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
++#define AT803X_REG_CHIP_CONFIG 0x1f
++#define AT803X_BT_BX_REG_SEL 0x8000
++
++#define AT803X_DEBUG_ADDR 0x1D
++#define AT803X_DEBUG_DATA 0x1E
++
++#define AT803X_MODE_CFG_MASK 0x0F
++#define AT803X_MODE_CFG_BASET_RGMII 0x00
++#define AT803X_MODE_CFG_BASET_SGMII 0x01
++#define AT803X_MODE_CFG_BX1000_RGMII_50OHM 0x02
++#define AT803X_MODE_CFG_BX1000_RGMII_75OHM 0x03
++#define AT803X_MODE_CFG_BX1000_CONV_50OHM 0x04
++#define AT803X_MODE_CFG_BX1000_CONV_75OHM 0x05
++#define AT803X_MODE_CFG_FX100_RGMII_50OHM 0x06
++#define AT803X_MODE_CFG_FX100_CONV_50OHM 0x07
++#define AT803X_MODE_CFG_RGMII_AUTO_MDET 0x0B
++#define AT803X_MODE_CFG_FX100_RGMII_75OHM 0x0E
++#define AT803X_MODE_CFG_FX100_CONV_75OHM 0x0F
++
++#define AT803X_PSSR 0x11 /*PHY-Specific Status Register*/
++#define AT803X_PSSR_MR_AN_COMPLETE 0x0200
++
++#define AT803X_DEBUG_ANALOG_TEST_CTRL 0x00
++#define QCA8327_DEBUG_MANU_CTRL_EN BIT(2)
++#define QCA8337_DEBUG_MANU_CTRL_EN GENMASK(3, 2)
++#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
++
++#define AT803X_DEBUG_SYSTEM_CTRL_MODE 0x05
++#define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8)
++
++#define AT803X_DEBUG_REG_HIB_CTRL 0x0b
++#define AT803X_DEBUG_HIB_CTRL_SEL_RST_80U BIT(10)
++#define AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE BIT(13)
++#define AT803X_DEBUG_HIB_CTRL_PS_HIB_EN BIT(15)
++
++#define AT803X_DEBUG_REG_3C 0x3C
++
++#define AT803X_DEBUG_REG_GREEN 0x3D
++#define AT803X_DEBUG_GATE_CLK_IN1000 BIT(6)
++
++#define AT803X_DEBUG_REG_1F 0x1F
++#define AT803X_DEBUG_PLL_ON BIT(2)
++#define AT803X_DEBUG_RGMII_1V8 BIT(3)
++
++#define MDIO_AZ_DEBUG 0x800D
++
++/* AT803x supports either the XTAL input pad, an internal PLL or the
++ * DSP as clock reference for the clock output pad. The XTAL reference
++ * is only used for 25 MHz output, all other frequencies need the PLL.
++ * The DSP as a clock reference is used in synchronous ethernet
++ * applications.
++ *
++ * By default the PLL is only enabled if there is a link. Otherwise
++ * the PHY will go into low power state and disabled the PLL. You can
++ * set the PLL_ON bit (see debug register 0x1f) to keep the PLL always
++ * enabled.
++ */
++#define AT803X_MMD7_CLK25M 0x8016
++#define AT803X_CLK_OUT_MASK GENMASK(4, 2)
++#define AT803X_CLK_OUT_25MHZ_XTAL 0
++#define AT803X_CLK_OUT_25MHZ_DSP 1
++#define AT803X_CLK_OUT_50MHZ_PLL 2
++#define AT803X_CLK_OUT_50MHZ_DSP 3
++#define AT803X_CLK_OUT_62_5MHZ_PLL 4
++#define AT803X_CLK_OUT_62_5MHZ_DSP 5
++#define AT803X_CLK_OUT_125MHZ_PLL 6
++#define AT803X_CLK_OUT_125MHZ_DSP 7
++
++/* The AR8035 has another mask which is compatible with the AR8031/AR8033 mask
++ * but doesn't support choosing between XTAL/PLL and DSP.
++ */
++#define AT8035_CLK_OUT_MASK GENMASK(4, 3)
++
++#define AT803X_CLK_OUT_STRENGTH_MASK GENMASK(8, 7)
++#define AT803X_CLK_OUT_STRENGTH_FULL 0
++#define AT803X_CLK_OUT_STRENGTH_HALF 1
++#define AT803X_CLK_OUT_STRENGTH_QUARTER 2
++
++#define AT803X_DEFAULT_DOWNSHIFT 5
++#define AT803X_MIN_DOWNSHIFT 2
++#define AT803X_MAX_DOWNSHIFT 9
++
++#define AT803X_MMD3_SMARTEEE_CTL1 0x805b
++#define AT803X_MMD3_SMARTEEE_CTL2 0x805c
++#define AT803X_MMD3_SMARTEEE_CTL3 0x805d
++#define AT803X_MMD3_SMARTEEE_CTL3_LPI_EN BIT(8)
++
++#define ATH9331_PHY_ID 0x004dd041
++#define ATH8030_PHY_ID 0x004dd076
++#define ATH8031_PHY_ID 0x004dd074
++#define ATH8032_PHY_ID 0x004dd023
++#define ATH8035_PHY_ID 0x004dd072
++#define AT8030_PHY_ID_MASK 0xffffffef
++
++#define QCA8081_PHY_ID 0x004dd101
++
++#define QCA8327_A_PHY_ID 0x004dd033
++#define QCA8327_B_PHY_ID 0x004dd034
++#define QCA8337_PHY_ID 0x004dd036
++#define QCA9561_PHY_ID 0x004dd042
++#define QCA8K_PHY_ID_MASK 0xffffffff
++
++#define QCA8K_DEVFLAGS_REVISION_MASK GENMASK(2, 0)
++
++#define AT803X_PAGE_FIBER 0
++#define AT803X_PAGE_COPPER 1
++
++/* don't turn off internal PLL */
++#define AT803X_KEEP_PLL_ENABLED BIT(0)
++#define AT803X_DISABLE_SMARTEEE BIT(1)
++
++/* disable hibernation mode */
++#define AT803X_DISABLE_HIBERNATION_MODE BIT(2)
++
++/* ADC threshold */
++#define QCA808X_PHY_DEBUG_ADC_THRESHOLD 0x2c80
++#define QCA808X_ADC_THRESHOLD_MASK GENMASK(7, 0)
++#define QCA808X_ADC_THRESHOLD_80MV 0
++#define QCA808X_ADC_THRESHOLD_100MV 0xf0
++#define QCA808X_ADC_THRESHOLD_200MV 0x0f
++#define QCA808X_ADC_THRESHOLD_300MV 0xff
++
++/* CLD control */
++#define QCA808X_PHY_MMD3_ADDR_CLD_CTRL7 0x8007
++#define QCA808X_8023AZ_AFE_CTRL_MASK GENMASK(8, 4)
++#define QCA808X_8023AZ_AFE_EN 0x90
++
++/* AZ control */
++#define QCA808X_PHY_MMD3_AZ_TRAINING_CTRL 0x8008
++#define QCA808X_MMD3_AZ_TRAINING_VAL 0x1c32
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB 0x8014
++#define QCA808X_MSE_THRESHOLD_20DB_VALUE 0x529
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB 0x800E
++#define QCA808X_MSE_THRESHOLD_17DB_VALUE 0x341
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB 0x801E
++#define QCA808X_MSE_THRESHOLD_27DB_VALUE 0x419
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB 0x8020
++#define QCA808X_MSE_THRESHOLD_28DB_VALUE 0x341
++
++#define QCA808X_PHY_MMD7_TOP_OPTION1 0x901c
++#define QCA808X_TOP_OPTION1_DATA 0x0
++
++#define QCA808X_PHY_MMD3_DEBUG_1 0xa100
++#define QCA808X_MMD3_DEBUG_1_VALUE 0x9203
++#define QCA808X_PHY_MMD3_DEBUG_2 0xa101
++#define QCA808X_MMD3_DEBUG_2_VALUE 0x48ad
++#define QCA808X_PHY_MMD3_DEBUG_3 0xa103
++#define QCA808X_MMD3_DEBUG_3_VALUE 0x1698
++#define QCA808X_PHY_MMD3_DEBUG_4 0xa105
++#define QCA808X_MMD3_DEBUG_4_VALUE 0x8001
++#define QCA808X_PHY_MMD3_DEBUG_5 0xa106
++#define QCA808X_MMD3_DEBUG_5_VALUE 0x1111
++#define QCA808X_PHY_MMD3_DEBUG_6 0xa011
++#define QCA808X_MMD3_DEBUG_6_VALUE 0x5f85
++
++/* master/slave seed config */
++#define QCA808X_PHY_DEBUG_LOCAL_SEED 9
++#define QCA808X_MASTER_SLAVE_SEED_ENABLE BIT(1)
++#define QCA808X_MASTER_SLAVE_SEED_CFG GENMASK(12, 2)
++#define QCA808X_MASTER_SLAVE_SEED_RANGE 0x32
++
++/* Hibernation yields lower power consumpiton in contrast with normal operation mode.
++ * when the copper cable is unplugged, the PHY enters into hibernation mode in about 10s.
++ */
++#define QCA808X_DBG_AN_TEST 0xb
++#define QCA808X_HIBERNATION_EN BIT(15)
++
++#define QCA808X_CDT_ENABLE_TEST BIT(15)
++#define QCA808X_CDT_INTER_CHECK_DIS BIT(13)
++#define QCA808X_CDT_STATUS BIT(11)
++#define QCA808X_CDT_LENGTH_UNIT BIT(10)
++
++#define QCA808X_MMD3_CDT_STATUS 0x8064
++#define QCA808X_MMD3_CDT_DIAG_PAIR_A 0x8065
++#define QCA808X_MMD3_CDT_DIAG_PAIR_B 0x8066
++#define QCA808X_MMD3_CDT_DIAG_PAIR_C 0x8067
++#define QCA808X_MMD3_CDT_DIAG_PAIR_D 0x8068
++#define QCA808X_CDT_DIAG_LENGTH_SAME_SHORT GENMASK(15, 8)
++#define QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT GENMASK(7, 0)
++
++#define QCA808X_CDT_CODE_PAIR_A GENMASK(15, 12)
++#define QCA808X_CDT_CODE_PAIR_B GENMASK(11, 8)
++#define QCA808X_CDT_CODE_PAIR_C GENMASK(7, 4)
++#define QCA808X_CDT_CODE_PAIR_D GENMASK(3, 0)
++
++#define QCA808X_CDT_STATUS_STAT_TYPE GENMASK(1, 0)
++#define QCA808X_CDT_STATUS_STAT_FAIL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 0)
++#define QCA808X_CDT_STATUS_STAT_NORMAL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 1)
++#define QCA808X_CDT_STATUS_STAT_SAME_OPEN FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 2)
++#define QCA808X_CDT_STATUS_STAT_SAME_SHORT FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 3)
++
++#define QCA808X_CDT_STATUS_STAT_MDI GENMASK(3, 2)
++#define QCA808X_CDT_STATUS_STAT_MDI1 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 1)
++#define QCA808X_CDT_STATUS_STAT_MDI2 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 2)
++#define QCA808X_CDT_STATUS_STAT_MDI3 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 3)
++
++/* NORMAL are MDI with type set to 0 */
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI1
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
++ QCA808X_CDT_STATUS_STAT_MDI1)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
++ QCA808X_CDT_STATUS_STAT_MDI1)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI2
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
++ QCA808X_CDT_STATUS_STAT_MDI2)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
++ QCA808X_CDT_STATUS_STAT_MDI2)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI3
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
++ QCA808X_CDT_STATUS_STAT_MDI3)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
++ QCA808X_CDT_STATUS_STAT_MDI3)
++
++/* Added for reference of existence but should be handled by wait_for_completion already */
++#define QCA808X_CDT_STATUS_STAT_BUSY (BIT(1) | BIT(3))
++
++#define QCA808X_MMD7_LED_GLOBAL 0x8073
++#define QCA808X_LED_BLINK_1 GENMASK(11, 6)
++#define QCA808X_LED_BLINK_2 GENMASK(5, 0)
++/* Values are the same for both BLINK_1 and BLINK_2 */
++#define QCA808X_LED_BLINK_FREQ_MASK GENMASK(5, 3)
++#define QCA808X_LED_BLINK_FREQ_2HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x0)
++#define QCA808X_LED_BLINK_FREQ_4HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x1)
++#define QCA808X_LED_BLINK_FREQ_8HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x2)
++#define QCA808X_LED_BLINK_FREQ_16HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x3)
++#define QCA808X_LED_BLINK_FREQ_32HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x4)
++#define QCA808X_LED_BLINK_FREQ_64HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x5)
++#define QCA808X_LED_BLINK_FREQ_128HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x6)
++#define QCA808X_LED_BLINK_FREQ_256HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x7)
++#define QCA808X_LED_BLINK_DUTY_MASK GENMASK(2, 0)
++#define QCA808X_LED_BLINK_DUTY_50_50 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x0)
++#define QCA808X_LED_BLINK_DUTY_75_25 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x1)
++#define QCA808X_LED_BLINK_DUTY_25_75 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x2)
++#define QCA808X_LED_BLINK_DUTY_33_67 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x3)
++#define QCA808X_LED_BLINK_DUTY_67_33 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x4)
++#define QCA808X_LED_BLINK_DUTY_17_83 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x5)
++#define QCA808X_LED_BLINK_DUTY_83_17 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x6)
++#define QCA808X_LED_BLINK_DUTY_8_92 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x7)
++
++#define QCA808X_MMD7_LED2_CTRL 0x8074
++#define QCA808X_MMD7_LED2_FORCE_CTRL 0x8075
++#define QCA808X_MMD7_LED1_CTRL 0x8076
++#define QCA808X_MMD7_LED1_FORCE_CTRL 0x8077
++#define QCA808X_MMD7_LED0_CTRL 0x8078
++#define QCA808X_MMD7_LED_CTRL(x) (0x8078 - ((x) * 2))
++
++/* LED hw control pattern is the same for every LED */
++#define QCA808X_LED_PATTERN_MASK GENMASK(15, 0)
++#define QCA808X_LED_SPEED2500_ON BIT(15)
++#define QCA808X_LED_SPEED2500_BLINK BIT(14)
++/* Follow blink trigger even if duplex or speed condition doesn't match */
++#define QCA808X_LED_BLINK_CHECK_BYPASS BIT(13)
++#define QCA808X_LED_FULL_DUPLEX_ON BIT(12)
++#define QCA808X_LED_HALF_DUPLEX_ON BIT(11)
++#define QCA808X_LED_TX_BLINK BIT(10)
++#define QCA808X_LED_RX_BLINK BIT(9)
++#define QCA808X_LED_TX_ON_10MS BIT(8)
++#define QCA808X_LED_RX_ON_10MS BIT(7)
++#define QCA808X_LED_SPEED1000_ON BIT(6)
++#define QCA808X_LED_SPEED100_ON BIT(5)
++#define QCA808X_LED_SPEED10_ON BIT(4)
++#define QCA808X_LED_COLLISION_BLINK BIT(3)
++#define QCA808X_LED_SPEED1000_BLINK BIT(2)
++#define QCA808X_LED_SPEED100_BLINK BIT(1)
++#define QCA808X_LED_SPEED10_BLINK BIT(0)
++
++#define QCA808X_MMD7_LED0_FORCE_CTRL 0x8079
++#define QCA808X_MMD7_LED_FORCE_CTRL(x) (0x8079 - ((x) * 2))
++
++/* LED force ctrl is the same for every LED
++ * No documentation exist for this, not even internal one
++ * with NDA as QCOM gives only info about configuring
++ * hw control pattern rules and doesn't indicate any way
++ * to force the LED to specific mode.
++ * These define comes from reverse and testing and maybe
++ * lack of some info or some info are not entirely correct.
++ * For the basic LED control and hw control these finding
++ * are enough to support LED control in all the required APIs.
++ *
++ * On doing some comparison with implementation with qca807x,
++ * it was found that it's 1:1 equal to it and confirms all the
++ * reverse done. It was also found further specification with the
++ * force mode and the blink modes.
++ */
++#define QCA808X_LED_FORCE_EN BIT(15)
++#define QCA808X_LED_FORCE_MODE_MASK GENMASK(14, 13)
++#define QCA808X_LED_FORCE_BLINK_1 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x3)
++#define QCA808X_LED_FORCE_BLINK_2 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x2)
++#define QCA808X_LED_FORCE_ON FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x1)
++#define QCA808X_LED_FORCE_OFF FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x0)
++
++#define QCA808X_MMD7_LED_POLARITY_CTRL 0x901a
++/* QSDK sets by default 0x46 to this reg that sets BIT 6 for
++ * LED to active high. It's not clear what BIT 3 and BIT 4 does.
++ */
++#define QCA808X_LED_ACTIVE_HIGH BIT(6)
++
++/* QCA808X 1G chip type */
++#define QCA808X_PHY_MMD7_CHIP_TYPE 0x901d
++#define QCA808X_PHY_CHIP_TYPE_1G BIT(0)
++
++#define QCA8081_PHY_SERDES_MMD1_FIFO_CTRL 0x9072
++#define QCA8081_PHY_FIFO_RSTN BIT(11)
++
++MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
++MODULE_AUTHOR("Matus Ujhelyi");
++MODULE_LICENSE("GPL");
++
++enum stat_access_type {
++ PHY,
++ MMD
++};
++
++struct at803x_hw_stat {
++ const char *string;
++ u8 reg;
++ u32 mask;
++ enum stat_access_type access_type;
++};
++
++static struct at803x_hw_stat qca83xx_hw_stats[] = {
++ { "phy_idle_errors", 0xa, GENMASK(7, 0), PHY},
++ { "phy_receive_errors", 0x15, GENMASK(15, 0), PHY},
++ { "eee_wake_errors", 0x16, GENMASK(15, 0), MMD},
++};
++
++struct at803x_ss_mask {
++ u16 speed_mask;
++ u8 speed_shift;
++};
++
++struct at803x_priv {
++ int flags;
++ u16 clk_25m_reg;
++ u16 clk_25m_mask;
++ u8 smarteee_lpi_tw_1g;
++ u8 smarteee_lpi_tw_100m;
++ bool is_fiber;
++ bool is_1000basex;
++ struct regulator_dev *vddio_rdev;
++ struct regulator_dev *vddh_rdev;
++ u64 stats[ARRAY_SIZE(qca83xx_hw_stats)];
++ int led_polarity_mode;
++};
++
++struct at803x_context {
++ u16 bmcr;
++ u16 advertise;
++ u16 control1000;
++ u16 int_enable;
++ u16 smart_speed;
++ u16 led_control;
++};
++
++static int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data)
++{
++ int ret;
++
++ ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
++ if (ret < 0)
++ return ret;
++
++ return phy_write(phydev, AT803X_DEBUG_DATA, data);
++}
++
++static int at803x_debug_reg_read(struct phy_device *phydev, u16 reg)
++{
++ int ret;
++
++ ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
++ if (ret < 0)
++ return ret;
++
++ return phy_read(phydev, AT803X_DEBUG_DATA);
++}
++
++static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
++ u16 clear, u16 set)
++{
++ u16 val;
++ int ret;
++
++ ret = at803x_debug_reg_read(phydev, reg);
++ if (ret < 0)
++ return ret;
++
++ val = ret & 0xffff;
++ val &= ~clear;
++ val |= set;
++
++ return phy_write(phydev, AT803X_DEBUG_DATA, val);
++}
++
++static int at803x_write_page(struct phy_device *phydev, int page)
++{
++ int mask;
++ int set;
++
++ if (page == AT803X_PAGE_COPPER) {
++ set = AT803X_BT_BX_REG_SEL;
++ mask = 0;
++ } else {
++ set = 0;
++ mask = AT803X_BT_BX_REG_SEL;
++ }
++
++ return __phy_modify(phydev, AT803X_REG_CHIP_CONFIG, mask, set);
++}
++
++static int at803x_read_page(struct phy_device *phydev)
++{
++ int ccr = __phy_read(phydev, AT803X_REG_CHIP_CONFIG);
++
++ if (ccr < 0)
++ return ccr;
++
++ if (ccr & AT803X_BT_BX_REG_SEL)
++ return AT803X_PAGE_COPPER;
++
++ return AT803X_PAGE_FIBER;
++}
++
++static int at803x_enable_rx_delay(struct phy_device *phydev)
++{
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL, 0,
++ AT803X_DEBUG_RX_CLK_DLY_EN);
++}
++
++static int at803x_enable_tx_delay(struct phy_device *phydev)
++{
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0,
++ AT803X_DEBUG_TX_CLK_DLY_EN);
++}
++
++static int at803x_disable_rx_delay(struct phy_device *phydev)
++{
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ AT803X_DEBUG_RX_CLK_DLY_EN, 0);
++}
++
++static int at803x_disable_tx_delay(struct phy_device *phydev)
++{
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE,
++ AT803X_DEBUG_TX_CLK_DLY_EN, 0);
++}
++
++/* save relevant PHY registers to private copy */
++static void at803x_context_save(struct phy_device *phydev,
++ struct at803x_context *context)
++{
++ context->bmcr = phy_read(phydev, MII_BMCR);
++ context->advertise = phy_read(phydev, MII_ADVERTISE);
++ context->control1000 = phy_read(phydev, MII_CTRL1000);
++ context->int_enable = phy_read(phydev, AT803X_INTR_ENABLE);
++ context->smart_speed = phy_read(phydev, AT803X_SMART_SPEED);
++ context->led_control = phy_read(phydev, AT803X_LED_CONTROL);
++}
++
++/* restore relevant PHY registers from private copy */
++static void at803x_context_restore(struct phy_device *phydev,
++ const struct at803x_context *context)
++{
++ phy_write(phydev, MII_BMCR, context->bmcr);
++ phy_write(phydev, MII_ADVERTISE, context->advertise);
++ phy_write(phydev, MII_CTRL1000, context->control1000);
++ phy_write(phydev, AT803X_INTR_ENABLE, context->int_enable);
++ phy_write(phydev, AT803X_SMART_SPEED, context->smart_speed);
++ phy_write(phydev, AT803X_LED_CONTROL, context->led_control);
++}
++
++static int at803x_set_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol)
++{
++ int ret, irq_enabled;
++
++ if (wol->wolopts & WAKE_MAGIC) {
++ struct net_device *ndev = phydev->attached_dev;
++ const u8 *mac;
++ unsigned int i;
++ static const unsigned int offsets[] = {
++ AT803X_LOC_MAC_ADDR_32_47_OFFSET,
++ AT803X_LOC_MAC_ADDR_16_31_OFFSET,
++ AT803X_LOC_MAC_ADDR_0_15_OFFSET,
++ };
++
++ if (!ndev)
++ return -ENODEV;
++
++ mac = (const u8 *)ndev->dev_addr;
++
++ if (!is_valid_ether_addr(mac))
++ return -EINVAL;
++
++ for (i = 0; i < 3; i++)
++ phy_write_mmd(phydev, MDIO_MMD_PCS, offsets[i],
++ mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
++
++ /* Enable WOL interrupt */
++ ret = phy_modify(phydev, AT803X_INTR_ENABLE, 0, AT803X_INTR_ENABLE_WOL);
++ if (ret)
++ return ret;
++ } else {
++ /* Disable WOL interrupt */
++ ret = phy_modify(phydev, AT803X_INTR_ENABLE, AT803X_INTR_ENABLE_WOL, 0);
++ if (ret)
++ return ret;
++ }
++
++ /* Clear WOL status */
++ ret = phy_read(phydev, AT803X_INTR_STATUS);
++ if (ret < 0)
++ return ret;
++
++ /* Check if there are other interrupts except for WOL triggered when PHY is
++ * in interrupt mode, only the interrupts enabled by AT803X_INTR_ENABLE can
++ * be passed up to the interrupt PIN.
++ */
++ irq_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
++ if (irq_enabled < 0)
++ return irq_enabled;
++
++ irq_enabled &= ~AT803X_INTR_ENABLE_WOL;
++ if (ret & irq_enabled && !phy_polling_mode(phydev))
++ phy_trigger_machine(phydev);
++
++ return 0;
++}
++
++static void at803x_get_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol)
++{
++ int value;
++
++ wol->supported = WAKE_MAGIC;
++ wol->wolopts = 0;
++
++ value = phy_read(phydev, AT803X_INTR_ENABLE);
++ if (value < 0)
++ return;
++
++ if (value & AT803X_INTR_ENABLE_WOL)
++ wol->wolopts |= WAKE_MAGIC;
++}
++
++static int qca83xx_get_sset_count(struct phy_device *phydev)
++{
++ return ARRAY_SIZE(qca83xx_hw_stats);
++}
++
++static void qca83xx_get_strings(struct phy_device *phydev, u8 *data)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) {
++ strscpy(data + i * ETH_GSTRING_LEN,
++ qca83xx_hw_stats[i].string, ETH_GSTRING_LEN);
++ }
++}
++
++static u64 qca83xx_get_stat(struct phy_device *phydev, int i)
++{
++ struct at803x_hw_stat stat = qca83xx_hw_stats[i];
++ struct at803x_priv *priv = phydev->priv;
++ int val;
++ u64 ret;
++
++ if (stat.access_type == MMD)
++ val = phy_read_mmd(phydev, MDIO_MMD_PCS, stat.reg);
++ else
++ val = phy_read(phydev, stat.reg);
++
++ if (val < 0) {
++ ret = U64_MAX;
++ } else {
++ val = val & stat.mask;
++ priv->stats[i] += val;
++ ret = priv->stats[i];
++ }
++
++ return ret;
++}
++
++static void qca83xx_get_stats(struct phy_device *phydev,
++ struct ethtool_stats *stats, u64 *data)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++)
++ data[i] = qca83xx_get_stat(phydev, i);
++}
++
++static int at803x_suspend(struct phy_device *phydev)
++{
++ int value;
++ int wol_enabled;
++
++ value = phy_read(phydev, AT803X_INTR_ENABLE);
++ wol_enabled = value & AT803X_INTR_ENABLE_WOL;
++
++ if (wol_enabled)
++ value = BMCR_ISOLATE;
++ else
++ value = BMCR_PDOWN;
++
++ phy_modify(phydev, MII_BMCR, 0, value);
++
++ return 0;
++}
++
++static int at803x_resume(struct phy_device *phydev)
++{
++ return phy_modify(phydev, MII_BMCR, BMCR_PDOWN | BMCR_ISOLATE, 0);
++}
++
++static int at803x_parse_dt(struct phy_device *phydev)
++{
++ struct device_node *node = phydev->mdio.dev.of_node;
++ struct at803x_priv *priv = phydev->priv;
++ u32 freq, strength, tw;
++ unsigned int sel;
++ int ret;
++
++ if (!IS_ENABLED(CONFIG_OF_MDIO))
++ return 0;
++
++ if (of_property_read_bool(node, "qca,disable-smarteee"))
++ priv->flags |= AT803X_DISABLE_SMARTEEE;
++
++ if (of_property_read_bool(node, "qca,disable-hibernation-mode"))
++ priv->flags |= AT803X_DISABLE_HIBERNATION_MODE;
++
++ if (!of_property_read_u32(node, "qca,smarteee-tw-us-1g", &tw)) {
++ if (!tw || tw > 255) {
++ phydev_err(phydev, "invalid qca,smarteee-tw-us-1g\n");
++ return -EINVAL;
++ }
++ priv->smarteee_lpi_tw_1g = tw;
++ }
++
++ if (!of_property_read_u32(node, "qca,smarteee-tw-us-100m", &tw)) {
++ if (!tw || tw > 255) {
++ phydev_err(phydev, "invalid qca,smarteee-tw-us-100m\n");
++ return -EINVAL;
++ }
++ priv->smarteee_lpi_tw_100m = tw;
++ }
++
++ ret = of_property_read_u32(node, "qca,clk-out-frequency", &freq);
++ if (!ret) {
++ switch (freq) {
++ case 25000000:
++ sel = AT803X_CLK_OUT_25MHZ_XTAL;
++ break;
++ case 50000000:
++ sel = AT803X_CLK_OUT_50MHZ_PLL;
++ break;
++ case 62500000:
++ sel = AT803X_CLK_OUT_62_5MHZ_PLL;
++ break;
++ case 125000000:
++ sel = AT803X_CLK_OUT_125MHZ_PLL;
++ break;
++ default:
++ phydev_err(phydev, "invalid qca,clk-out-frequency\n");
++ return -EINVAL;
++ }
++
++ priv->clk_25m_reg |= FIELD_PREP(AT803X_CLK_OUT_MASK, sel);
++ priv->clk_25m_mask |= AT803X_CLK_OUT_MASK;
++ }
++
++ ret = of_property_read_u32(node, "qca,clk-out-strength", &strength);
++ if (!ret) {
++ priv->clk_25m_mask |= AT803X_CLK_OUT_STRENGTH_MASK;
++ switch (strength) {
++ case AR803X_STRENGTH_FULL:
++ priv->clk_25m_reg |= AT803X_CLK_OUT_STRENGTH_FULL;
++ break;
++ case AR803X_STRENGTH_HALF:
++ priv->clk_25m_reg |= AT803X_CLK_OUT_STRENGTH_HALF;
++ break;
++ case AR803X_STRENGTH_QUARTER:
++ priv->clk_25m_reg |= AT803X_CLK_OUT_STRENGTH_QUARTER;
++ break;
++ default:
++ phydev_err(phydev, "invalid qca,clk-out-strength\n");
++ return -EINVAL;
++ }
++ }
++
++ return 0;
++}
++
++static int at803x_probe(struct phy_device *phydev)
++{
++ struct device *dev = &phydev->mdio.dev;
++ struct at803x_priv *priv;
++ int ret;
++
++ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++ if (!priv)
++ return -ENOMEM;
++
++ /* Init LED polarity mode to -1 */
++ priv->led_polarity_mode = -1;
++
++ phydev->priv = priv;
++
++ ret = at803x_parse_dt(phydev);
++ if (ret)
++ return ret;
++
++ return 0;
++}
++
++static int at803x_get_features(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ int err;
++
++ err = genphy_read_abilities(phydev);
++ if (err)
++ return err;
++
++ if (phydev->drv->phy_id != ATH8031_PHY_ID)
++ return 0;
++
++ /* AR8031/AR8033 have different status registers
++ * for copper and fiber operation. However, the
++ * extended status register is the same for both
++ * operation modes.
++ *
++ * As a result of that, ESTATUS_1000_XFULL is set
++ * to 1 even when operating in copper TP mode.
++ *
++ * Remove this mode from the supported link modes
++ * when not operating in 1000BaseX mode.
++ */
++ if (!priv->is_1000basex)
++ linkmode_clear_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
++ phydev->supported);
++
++ return 0;
++}
++
++static int at803x_smarteee_config(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ u16 mask = 0, val = 0;
++ int ret;
++
++ if (priv->flags & AT803X_DISABLE_SMARTEEE)
++ return phy_modify_mmd(phydev, MDIO_MMD_PCS,
++ AT803X_MMD3_SMARTEEE_CTL3,
++ AT803X_MMD3_SMARTEEE_CTL3_LPI_EN, 0);
++
++ if (priv->smarteee_lpi_tw_1g) {
++ mask |= 0xff00;
++ val |= priv->smarteee_lpi_tw_1g << 8;
++ }
++ if (priv->smarteee_lpi_tw_100m) {
++ mask |= 0x00ff;
++ val |= priv->smarteee_lpi_tw_100m;
++ }
++ if (!mask)
++ return 0;
++
++ ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, AT803X_MMD3_SMARTEEE_CTL1,
++ mask, val);
++ if (ret)
++ return ret;
++
++ return phy_modify_mmd(phydev, MDIO_MMD_PCS, AT803X_MMD3_SMARTEEE_CTL3,
++ AT803X_MMD3_SMARTEEE_CTL3_LPI_EN,
++ AT803X_MMD3_SMARTEEE_CTL3_LPI_EN);
++}
++
++static int at803x_clk_out_config(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++
++ if (!priv->clk_25m_mask)
++ return 0;
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN, AT803X_MMD7_CLK25M,
++ priv->clk_25m_mask, priv->clk_25m_reg);
++}
++
++static int at8031_pll_config(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++
++ /* The default after hardware reset is PLL OFF. After a soft reset, the
++ * values are retained.
++ */
++ if (priv->flags & AT803X_KEEP_PLL_ENABLED)
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
++ 0, AT803X_DEBUG_PLL_ON);
++ else
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
++ AT803X_DEBUG_PLL_ON, 0);
++}
++
++static int at803x_hibernation_mode_config(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++
++ /* The default after hardware reset is hibernation mode enabled. After
++ * software reset, the value is retained.
++ */
++ if (!(priv->flags & AT803X_DISABLE_HIBERNATION_MODE))
++ return 0;
++
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_HIB_CTRL,
++ AT803X_DEBUG_HIB_CTRL_PS_HIB_EN, 0);
++}
++
++static int at803x_config_init(struct phy_device *phydev)
++{
++ int ret;
++
++ /* The RX and TX delay default is:
++ * after HW reset: RX delay enabled and TX delay disabled
++ * after SW reset: RX delay enabled, while TX delay retains the
++ * value before reset.
++ */
++ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
++ phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
++ ret = at803x_enable_rx_delay(phydev);
++ else
++ ret = at803x_disable_rx_delay(phydev);
++ if (ret < 0)
++ return ret;
++
++ if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
++ phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
++ ret = at803x_enable_tx_delay(phydev);
++ else
++ ret = at803x_disable_tx_delay(phydev);
++ if (ret < 0)
++ return ret;
++
++ ret = at803x_smarteee_config(phydev);
++ if (ret < 0)
++ return ret;
++
++ ret = at803x_clk_out_config(phydev);
++ if (ret < 0)
++ return ret;
++
++ ret = at803x_hibernation_mode_config(phydev);
++ if (ret < 0)
++ return ret;
++
++ /* Ar803x extended next page bit is enabled by default. Cisco
++ * multigig switches read this bit and attempt to negotiate 10Gbps
++ * rates even if the next page bit is disabled. This is incorrect
++ * behaviour but we still need to accommodate it. XNP is only needed
++ * for 10Gbps support, so disable XNP.
++ */
++ return phy_modify(phydev, MII_ADVERTISE, MDIO_AN_CTRL1_XNP, 0);
++}
++
++static int at803x_ack_interrupt(struct phy_device *phydev)
++{
++ int err;
++
++ err = phy_read(phydev, AT803X_INTR_STATUS);
++
++ return (err < 0) ? err : 0;
++}
++
++static int at803x_config_intr(struct phy_device *phydev)
++{
++ int err;
++ int value;
++
++ value = phy_read(phydev, AT803X_INTR_ENABLE);
++
++ if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
++ /* Clear any pending interrupts */
++ err = at803x_ack_interrupt(phydev);
++ if (err)
++ return err;
++
++ value |= AT803X_INTR_ENABLE_AUTONEG_ERR;
++ value |= AT803X_INTR_ENABLE_SPEED_CHANGED;
++ value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
++ value |= AT803X_INTR_ENABLE_LINK_FAIL;
++ value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
++
++ err = phy_write(phydev, AT803X_INTR_ENABLE, value);
++ } else {
++ err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
++ if (err)
++ return err;
++
++ /* Clear any pending interrupts */
++ err = at803x_ack_interrupt(phydev);
++ }
++
++ return err;
++}
++
++static irqreturn_t at803x_handle_interrupt(struct phy_device *phydev)
++{
++ int irq_status, int_enabled;
++
++ irq_status = phy_read(phydev, AT803X_INTR_STATUS);
++ if (irq_status < 0) {
++ phy_error(phydev);
++ return IRQ_NONE;
++ }
++
++ /* Read the current enabled interrupts */
++ int_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
++ if (int_enabled < 0) {
++ phy_error(phydev);
++ return IRQ_NONE;
++ }
++
++ /* See if this was one of our enabled interrupts */
++ if (!(irq_status & int_enabled))
++ return IRQ_NONE;
++
++ phy_trigger_machine(phydev);
++
++ return IRQ_HANDLED;
++}
++
++static void at803x_link_change_notify(struct phy_device *phydev)
++{
++ /*
++ * Conduct a hardware reset for AT8030 every time a link loss is
++ * signalled. This is necessary to circumvent a hardware bug that
++ * occurs when the cable is unplugged while TX packets are pending
++ * in the FIFO. In such cases, the FIFO enters an error mode it
++ * cannot recover from by software.
++ */
++ if (phydev->state == PHY_NOLINK && phydev->mdio.reset_gpio) {
++ struct at803x_context context;
++
++ at803x_context_save(phydev, &context);
++
++ phy_device_reset(phydev, 1);
++ usleep_range(1000, 2000);
++ phy_device_reset(phydev, 0);
++ usleep_range(1000, 2000);
++
++ at803x_context_restore(phydev, &context);
++
++ phydev_dbg(phydev, "%s(): phy was reset\n", __func__);
++ }
++}
++
++static int at803x_read_specific_status(struct phy_device *phydev,
++ struct at803x_ss_mask ss_mask)
++{
++ int ss;
++
++ /* Read the AT8035 PHY-Specific Status register, which indicates the
++ * speed and duplex that the PHY is actually using, irrespective of
++ * whether we are in autoneg mode or not.
++ */
++ ss = phy_read(phydev, AT803X_SPECIFIC_STATUS);
++ if (ss < 0)
++ return ss;
++
++ if (ss & AT803X_SS_SPEED_DUPLEX_RESOLVED) {
++ int sfc, speed;
++
++ sfc = phy_read(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL);
++ if (sfc < 0)
++ return sfc;
++
++ speed = ss & ss_mask.speed_mask;
++ speed >>= ss_mask.speed_shift;
++
++ switch (speed) {
++ case AT803X_SS_SPEED_10:
++ phydev->speed = SPEED_10;
++ break;
++ case AT803X_SS_SPEED_100:
++ phydev->speed = SPEED_100;
++ break;
++ case AT803X_SS_SPEED_1000:
++ phydev->speed = SPEED_1000;
++ break;
++ case QCA808X_SS_SPEED_2500:
++ phydev->speed = SPEED_2500;
++ break;
++ }
++ if (ss & AT803X_SS_DUPLEX)
++ phydev->duplex = DUPLEX_FULL;
++ else
++ phydev->duplex = DUPLEX_HALF;
++
++ if (ss & AT803X_SS_MDIX)
++ phydev->mdix = ETH_TP_MDI_X;
++ else
++ phydev->mdix = ETH_TP_MDI;
++
++ switch (FIELD_GET(AT803X_SFC_MDI_CROSSOVER_MODE_M, sfc)) {
++ case AT803X_SFC_MANUAL_MDI:
++ phydev->mdix_ctrl = ETH_TP_MDI;
++ break;
++ case AT803X_SFC_MANUAL_MDIX:
++ phydev->mdix_ctrl = ETH_TP_MDI_X;
++ break;
++ case AT803X_SFC_AUTOMATIC_CROSSOVER:
++ phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
++ break;
++ }
++ }
++
++ return 0;
++}
++
++static int at803x_read_status(struct phy_device *phydev)
++{
++ struct at803x_ss_mask ss_mask = { 0 };
++ int err, old_link = phydev->link;
++
++ /* Update the link, but return if there was an error */
++ err = genphy_update_link(phydev);
++ if (err)
++ return err;
++
++ /* why bother the PHY if nothing can have changed */
++ if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
++ return 0;
++
++ phydev->speed = SPEED_UNKNOWN;
++ phydev->duplex = DUPLEX_UNKNOWN;
++ phydev->pause = 0;
++ phydev->asym_pause = 0;
++
++ err = genphy_read_lpa(phydev);
++ if (err < 0)
++ return err;
++
++ ss_mask.speed_mask = AT803X_SS_SPEED_MASK;
++ ss_mask.speed_shift = __bf_shf(AT803X_SS_SPEED_MASK);
++ err = at803x_read_specific_status(phydev, ss_mask);
++ if (err < 0)
++ return err;
++
++ if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
++ phy_resolve_aneg_pause(phydev);
++
++ return 0;
++}
++
++static int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
++{
++ u16 val;
++
++ switch (ctrl) {
++ case ETH_TP_MDI:
++ val = AT803X_SFC_MANUAL_MDI;
++ break;
++ case ETH_TP_MDI_X:
++ val = AT803X_SFC_MANUAL_MDIX;
++ break;
++ case ETH_TP_MDI_AUTO:
++ val = AT803X_SFC_AUTOMATIC_CROSSOVER;
++ break;
++ default:
++ return 0;
++ }
++
++ return phy_modify_changed(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL,
++ AT803X_SFC_MDI_CROSSOVER_MODE_M,
++ FIELD_PREP(AT803X_SFC_MDI_CROSSOVER_MODE_M, val));
++}
++
++static int at803x_prepare_config_aneg(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
++ if (ret < 0)
++ return ret;
++
++ /* Changes of the midx bits are disruptive to the normal operation;
++ * therefore any changes to these registers must be followed by a
++ * software reset to take effect.
++ */
++ if (ret == 1) {
++ ret = genphy_soft_reset(phydev);
++ if (ret < 0)
++ return ret;
++ }
++
++ return 0;
++}
++
++static int at803x_config_aneg(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ int ret;
++
++ ret = at803x_prepare_config_aneg(phydev);
++ if (ret)
++ return ret;
++
++ if (priv->is_1000basex)
++ return genphy_c37_config_aneg(phydev);
++
++ return genphy_config_aneg(phydev);
++}
++
++static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
++{
++ int val;
++
++ val = phy_read(phydev, AT803X_SMART_SPEED);
++ if (val < 0)
++ return val;
++
++ if (val & AT803X_SMART_SPEED_ENABLE)
++ *d = FIELD_GET(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, val) + 2;
++ else
++ *d = DOWNSHIFT_DEV_DISABLE;
++
++ return 0;
++}
++
++static int at803x_set_downshift(struct phy_device *phydev, u8 cnt)
++{
++ u16 mask, set;
++ int ret;
++
++ switch (cnt) {
++ case DOWNSHIFT_DEV_DEFAULT_COUNT:
++ cnt = AT803X_DEFAULT_DOWNSHIFT;
++ fallthrough;
++ case AT803X_MIN_DOWNSHIFT ... AT803X_MAX_DOWNSHIFT:
++ set = AT803X_SMART_SPEED_ENABLE |
++ AT803X_SMART_SPEED_BYPASS_TIMER |
++ FIELD_PREP(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, cnt - 2);
++ mask = AT803X_SMART_SPEED_RETRY_LIMIT_MASK;
++ break;
++ case DOWNSHIFT_DEV_DISABLE:
++ set = 0;
++ mask = AT803X_SMART_SPEED_ENABLE |
++ AT803X_SMART_SPEED_BYPASS_TIMER;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ ret = phy_modify_changed(phydev, AT803X_SMART_SPEED, mask, set);
++
++ /* After changing the smart speed settings, we need to perform a
++ * software reset, use phy_init_hw() to make sure we set the
++ * reapply any values which might got lost during software reset.
++ */
++ if (ret == 1)
++ ret = phy_init_hw(phydev);
++
++ return ret;
++}
++
++static int at803x_get_tunable(struct phy_device *phydev,
++ struct ethtool_tunable *tuna, void *data)
++{
++ switch (tuna->id) {
++ case ETHTOOL_PHY_DOWNSHIFT:
++ return at803x_get_downshift(phydev, data);
++ default:
++ return -EOPNOTSUPP;
++ }
++}
++
++static int at803x_set_tunable(struct phy_device *phydev,
++ struct ethtool_tunable *tuna, const void *data)
++{
++ switch (tuna->id) {
++ case ETHTOOL_PHY_DOWNSHIFT:
++ return at803x_set_downshift(phydev, *(const u8 *)data);
++ default:
++ return -EOPNOTSUPP;
++ }
++}
++
++static int at803x_cable_test_result_trans(u16 status)
++{
++ switch (FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status)) {
++ case AT803X_CDT_STATUS_STAT_NORMAL:
++ return ETHTOOL_A_CABLE_RESULT_CODE_OK;
++ case AT803X_CDT_STATUS_STAT_SHORT:
++ return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
++ case AT803X_CDT_STATUS_STAT_OPEN:
++ return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
++ case AT803X_CDT_STATUS_STAT_FAIL:
++ default:
++ return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
++ }
++}
++
++static bool at803x_cdt_test_failed(u16 status)
++{
++ return FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status) ==
++ AT803X_CDT_STATUS_STAT_FAIL;
++}
++
++static bool at803x_cdt_fault_length_valid(u16 status)
++{
++ switch (FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status)) {
++ case AT803X_CDT_STATUS_STAT_OPEN:
++ case AT803X_CDT_STATUS_STAT_SHORT:
++ return true;
++ }
++ return false;
++}
++
++static int at803x_cdt_fault_length(int dt)
++{
++ /* According to the datasheet the distance to the fault is
++ * DELTA_TIME * 0.824 meters.
++ *
++ * The author suspect the correct formula is:
++ *
++ * fault_distance = DELTA_TIME * (c * VF) / 125MHz / 2
++ *
++ * where c is the speed of light, VF is the velocity factor of
++ * the twisted pair cable, 125MHz the counter frequency and
++ * we need to divide by 2 because the hardware will measure the
++ * round trip time to the fault and back to the PHY.
++ *
++ * With a VF of 0.69 we get the factor 0.824 mentioned in the
++ * datasheet.
++ */
++ return (dt * 824) / 10;
++}
++
++static int at803x_cdt_start(struct phy_device *phydev,
++ u32 cdt_start)
++{
++ return phy_write(phydev, AT803X_CDT, cdt_start);
++}
++
++static int at803x_cdt_wait_for_completion(struct phy_device *phydev,
++ u32 cdt_en)
++{
++ int val, ret;
++
++ /* One test run takes about 25ms */
++ ret = phy_read_poll_timeout(phydev, AT803X_CDT, val,
++ !(val & cdt_en),
++ 30000, 100000, true);
++
++ return ret < 0 ? ret : 0;
++}
++
++static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair)
++{
++ static const int ethtool_pair[] = {
++ ETHTOOL_A_CABLE_PAIR_A,
++ ETHTOOL_A_CABLE_PAIR_B,
++ ETHTOOL_A_CABLE_PAIR_C,
++ ETHTOOL_A_CABLE_PAIR_D,
++ };
++ int ret, val;
++
++ val = FIELD_PREP(AT803X_CDT_MDI_PAIR_MASK, pair) |
++ AT803X_CDT_ENABLE_TEST;
++ ret = at803x_cdt_start(phydev, val);
++ if (ret)
++ return ret;
++
++ ret = at803x_cdt_wait_for_completion(phydev, AT803X_CDT_ENABLE_TEST);
++ if (ret)
++ return ret;
++
++ val = phy_read(phydev, AT803X_CDT_STATUS);
++ if (val < 0)
++ return val;
++
++ if (at803x_cdt_test_failed(val))
++ return 0;
++
++ ethnl_cable_test_result(phydev, ethtool_pair[pair],
++ at803x_cable_test_result_trans(val));
++
++ if (at803x_cdt_fault_length_valid(val)) {
++ val = FIELD_GET(AT803X_CDT_STATUS_DELTA_TIME_MASK, val);
++ ethnl_cable_test_fault_length(phydev, ethtool_pair[pair],
++ at803x_cdt_fault_length(val));
++ }
++
++ return 1;
++}
++
++static int at803x_cable_test_get_status(struct phy_device *phydev,
++ bool *finished, unsigned long pair_mask)
++{
++ int retries = 20;
++ int pair, ret;
++
++ *finished = false;
++
++ /* According to the datasheet the CDT can be performed when
++ * there is no link partner or when the link partner is
++ * auto-negotiating. Starting the test will restart the AN
++ * automatically. It seems that doing this repeatedly we will
++ * get a slot where our link partner won't disturb our
++ * measurement.
++ */
++ while (pair_mask && retries--) {
++ for_each_set_bit(pair, &pair_mask, 4) {
++ ret = at803x_cable_test_one_pair(phydev, pair);
++ if (ret < 0)
++ return ret;
++ if (ret)
++ clear_bit(pair, &pair_mask);
++ }
++ if (pair_mask)
++ msleep(250);
++ }
++
++ *finished = true;
++
++ return 0;
++}
++
++static void at803x_cable_test_autoneg(struct phy_device *phydev)
++{
++ /* Enable auto-negotiation, but advertise no capabilities, no link
++ * will be established. A restart of the auto-negotiation is not
++ * required, because the cable test will automatically break the link.
++ */
++ phy_write(phydev, MII_BMCR, BMCR_ANENABLE);
++ phy_write(phydev, MII_ADVERTISE, ADVERTISE_CSMA);
++}
++
++static int at803x_cable_test_start(struct phy_device *phydev)
++{
++ at803x_cable_test_autoneg(phydev);
++ /* we do all the (time consuming) work later */
++ return 0;
++}
++
++static int at8031_rgmii_reg_set_voltage_sel(struct regulator_dev *rdev,
++ unsigned int selector)
++{
++ struct phy_device *phydev = rdev_get_drvdata(rdev);
++
++ if (selector)
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
++ 0, AT803X_DEBUG_RGMII_1V8);
++ else
++ return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_1F,
++ AT803X_DEBUG_RGMII_1V8, 0);
++}
++
++static int at8031_rgmii_reg_get_voltage_sel(struct regulator_dev *rdev)
++{
++ struct phy_device *phydev = rdev_get_drvdata(rdev);
++ int val;
++
++ val = at803x_debug_reg_read(phydev, AT803X_DEBUG_REG_1F);
++ if (val < 0)
++ return val;
++
++ return (val & AT803X_DEBUG_RGMII_1V8) ? 1 : 0;
++}
++
++static const struct regulator_ops vddio_regulator_ops = {
++ .list_voltage = regulator_list_voltage_table,
++ .set_voltage_sel = at8031_rgmii_reg_set_voltage_sel,
++ .get_voltage_sel = at8031_rgmii_reg_get_voltage_sel,
++};
++
++static const unsigned int vddio_voltage_table[] = {
++ 1500000,
++ 1800000,
++};
++
++static const struct regulator_desc vddio_desc = {
++ .name = "vddio",
++ .of_match = of_match_ptr("vddio-regulator"),
++ .n_voltages = ARRAY_SIZE(vddio_voltage_table),
++ .volt_table = vddio_voltage_table,
++ .ops = &vddio_regulator_ops,
++ .type = REGULATOR_VOLTAGE,
++ .owner = THIS_MODULE,
++};
++
++static const struct regulator_ops vddh_regulator_ops = {
++};
++
++static const struct regulator_desc vddh_desc = {
++ .name = "vddh",
++ .of_match = of_match_ptr("vddh-regulator"),
++ .n_voltages = 1,
++ .fixed_uV = 2500000,
++ .ops = &vddh_regulator_ops,
++ .type = REGULATOR_VOLTAGE,
++ .owner = THIS_MODULE,
++};
++
++static int at8031_register_regulators(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ struct device *dev = &phydev->mdio.dev;
++ struct regulator_config config = { };
++
++ config.dev = dev;
++ config.driver_data = phydev;
++
++ priv->vddio_rdev = devm_regulator_register(dev, &vddio_desc, &config);
++ if (IS_ERR(priv->vddio_rdev)) {
++ phydev_err(phydev, "failed to register VDDIO regulator\n");
++ return PTR_ERR(priv->vddio_rdev);
++ }
++
++ priv->vddh_rdev = devm_regulator_register(dev, &vddh_desc, &config);
++ if (IS_ERR(priv->vddh_rdev)) {
++ phydev_err(phydev, "failed to register VDDH regulator\n");
++ return PTR_ERR(priv->vddh_rdev);
++ }
++
++ return 0;
++}
++
++static int at8031_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
++{
++ struct phy_device *phydev = upstream;
++ __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_support);
++ __ETHTOOL_DECLARE_LINK_MODE_MASK(sfp_support);
++ DECLARE_PHY_INTERFACE_MASK(interfaces);
++ phy_interface_t iface;
++
++ linkmode_zero(phy_support);
++ phylink_set(phy_support, 1000baseX_Full);
++ phylink_set(phy_support, 1000baseT_Full);
++ phylink_set(phy_support, Autoneg);
++ phylink_set(phy_support, Pause);
++ phylink_set(phy_support, Asym_Pause);
++
++ linkmode_zero(sfp_support);
++ sfp_parse_support(phydev->sfp_bus, id, sfp_support, interfaces);
++ /* Some modules support 10G modes as well as others we support.
++ * Mask out non-supported modes so the correct interface is picked.
++ */
++ linkmode_and(sfp_support, phy_support, sfp_support);
++
++ if (linkmode_empty(sfp_support)) {
++ dev_err(&phydev->mdio.dev, "incompatible SFP module inserted\n");
++ return -EINVAL;
++ }
++
++ iface = sfp_select_interface(phydev->sfp_bus, sfp_support);
++
++ /* Only 1000Base-X is supported by AR8031/8033 as the downstream SerDes
++ * interface for use with SFP modules.
++ * However, some copper modules detected as having a preferred SGMII
++ * interface do default to and function in 1000Base-X mode, so just
++ * print a warning and allow such modules, as they may have some chance
++ * of working.
++ */
++ if (iface == PHY_INTERFACE_MODE_SGMII)
++ dev_warn(&phydev->mdio.dev, "module may not function if 1000Base-X not supported\n");
++ else if (iface != PHY_INTERFACE_MODE_1000BASEX)
++ return -EINVAL;
++
++ return 0;
++}
++
++static const struct sfp_upstream_ops at8031_sfp_ops = {
++ .attach = phy_sfp_attach,
++ .detach = phy_sfp_detach,
++ .module_insert = at8031_sfp_insert,
++};
++
++static int at8031_parse_dt(struct phy_device *phydev)
++{
++ struct device_node *node = phydev->mdio.dev.of_node;
++ struct at803x_priv *priv = phydev->priv;
++ int ret;
++
++ if (of_property_read_bool(node, "qca,keep-pll-enabled"))
++ priv->flags |= AT803X_KEEP_PLL_ENABLED;
++
++ ret = at8031_register_regulators(phydev);
++ if (ret < 0)
++ return ret;
++
++ ret = devm_regulator_get_enable_optional(&phydev->mdio.dev,
++ "vddio");
++ if (ret) {
++ phydev_err(phydev, "failed to get VDDIO regulator\n");
++ return ret;
++ }
++
++ /* Only AR8031/8033 support 1000Base-X for SFP modules */
++ return phy_sfp_probe(phydev, &at8031_sfp_ops);
++}
++
++static int at8031_probe(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ int mode_cfg;
++ int ccr;
++ int ret;
++
++ ret = at803x_probe(phydev);
++ if (ret)
++ return ret;
++
++ /* Only supported on AR8031/AR8033, the AR8030/AR8035 use strapping
++ * options.
++ */
++ ret = at8031_parse_dt(phydev);
++ if (ret)
++ return ret;
++
++ ccr = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
++ if (ccr < 0)
++ return ccr;
++ mode_cfg = ccr & AT803X_MODE_CFG_MASK;
++
++ switch (mode_cfg) {
++ case AT803X_MODE_CFG_BX1000_RGMII_50OHM:
++ case AT803X_MODE_CFG_BX1000_RGMII_75OHM:
++ priv->is_1000basex = true;
++ fallthrough;
++ case AT803X_MODE_CFG_FX100_RGMII_50OHM:
++ case AT803X_MODE_CFG_FX100_RGMII_75OHM:
++ priv->is_fiber = true;
++ break;
++ }
++
++ /* Disable WoL in 1588 register which is enabled
++ * by default
++ */
++ return phy_modify_mmd(phydev, MDIO_MMD_PCS,
++ AT803X_PHY_MMD3_WOL_CTRL,
++ AT803X_WOL_EN, 0);
++}
++
++static int at8031_config_init(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ int ret;
++
++ /* Some bootloaders leave the fiber page selected.
++ * Switch to the appropriate page (fiber or copper), as otherwise we
++ * read the PHY capabilities from the wrong page.
++ */
++ phy_lock_mdio_bus(phydev);
++ ret = at803x_write_page(phydev,
++ priv->is_fiber ? AT803X_PAGE_FIBER :
++ AT803X_PAGE_COPPER);
++ phy_unlock_mdio_bus(phydev);
++ if (ret)
++ return ret;
++
++ ret = at8031_pll_config(phydev);
++ if (ret < 0)
++ return ret;
++
++ return at803x_config_init(phydev);
++}
++
++static int at8031_set_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol)
++{
++ int ret;
++
++ /* First setup MAC address and enable WOL interrupt */
++ ret = at803x_set_wol(phydev, wol);
++ if (ret)
++ return ret;
++
++ if (wol->wolopts & WAKE_MAGIC)
++ /* Enable WOL function for 1588 */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,
++ AT803X_PHY_MMD3_WOL_CTRL,
++ 0, AT803X_WOL_EN);
++ else
++ /* Disable WoL function for 1588 */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_PCS,
++ AT803X_PHY_MMD3_WOL_CTRL,
++ AT803X_WOL_EN, 0);
++
++ return ret;
++}
++
++static int at8031_config_intr(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++ int err, value = 0;
++
++ if (phydev->interrupts == PHY_INTERRUPT_ENABLED &&
++ priv->is_fiber) {
++ /* Clear any pending interrupts */
++ err = at803x_ack_interrupt(phydev);
++ if (err)
++ return err;
++
++ value |= AT803X_INTR_ENABLE_LINK_FAIL_BX;
++ value |= AT803X_INTR_ENABLE_LINK_SUCCESS_BX;
++
++ err = phy_set_bits(phydev, AT803X_INTR_ENABLE, value);
++ if (err)
++ return err;
++ }
++
++ return at803x_config_intr(phydev);
++}
++
++/* AR8031 and AR8033 share the same read status logic */
++static int at8031_read_status(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++
++ if (priv->is_1000basex)
++ return genphy_c37_read_status(phydev);
++
++ return at803x_read_status(phydev);
++}
++
++/* AR8031 and AR8035 share the same cable test get status reg */
++static int at8031_cable_test_get_status(struct phy_device *phydev,
++ bool *finished)
++{
++ return at803x_cable_test_get_status(phydev, finished, 0xf);
++}
++
++/* AR8031 and AR8035 share the same cable test start logic */
++static int at8031_cable_test_start(struct phy_device *phydev)
++{
++ at803x_cable_test_autoneg(phydev);
++ phy_write(phydev, MII_CTRL1000, 0);
++ /* we do all the (time consuming) work later */
++ return 0;
++}
++
++/* AR8032, AR9331 and QCA9561 share the same cable test get status reg */
++static int at8032_cable_test_get_status(struct phy_device *phydev,
++ bool *finished)
++{
++ return at803x_cable_test_get_status(phydev, finished, 0x3);
++}
++
++static int at8035_parse_dt(struct phy_device *phydev)
++{
++ struct at803x_priv *priv = phydev->priv;
++
++ /* Mask is set by the generic at803x_parse_dt
++ * if property is set. Assume property is set
++ * with the mask not zero.
++ */
++ if (priv->clk_25m_mask) {
++ /* Fixup for the AR8030/AR8035. This chip has another mask and
++ * doesn't support the DSP reference. Eg. the lowest bit of the
++ * mask. The upper two bits select the same frequencies. Mask
++ * the lowest bit here.
++ *
++ * Warning:
++ * There was no datasheet for the AR8030 available so this is
++ * just a guess. But the AR8035 is listed as pin compatible
++ * to the AR8030 so there might be a good chance it works on
++ * the AR8030 too.
++ */
++ priv->clk_25m_reg &= AT8035_CLK_OUT_MASK;
++ priv->clk_25m_mask &= AT8035_CLK_OUT_MASK;
++ }
++
++ return 0;
++}
++
++/* AR8030 and AR8035 shared the same special mask for clk_25m */
++static int at8035_probe(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = at803x_probe(phydev);
++ if (ret)
++ return ret;
++
++ return at8035_parse_dt(phydev);
++}
++
++static int qca83xx_config_init(struct phy_device *phydev)
++{
++ u8 switch_revision;
++
++ switch_revision = phydev->dev_flags & QCA8K_DEVFLAGS_REVISION_MASK;
++
++ switch (switch_revision) {
++ case 1:
++ /* For 100M waveform */
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL, 0x02ea);
++ /* Turn on Gigabit clock */
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x68a0);
++ break;
++
++ case 2:
++ phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0x0);
++ fallthrough;
++ case 4:
++ phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_AZ_DEBUG, 0x803f);
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x6860);
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0x2c46);
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3C, 0x6000);
++ break;
++ }
++
++ /* Following original QCA sourcecode set port to prefer master */
++ phy_set_bits(phydev, MII_CTRL1000, CTL1000_PREFER_MASTER);
++
++ return 0;
++}
++
++static int qca8327_config_init(struct phy_device *phydev)
++{
++ /* QCA8327 require DAC amplitude adjustment for 100m set to +6%.
++ * Disable on init and enable only with 100m speed following
++ * qca original source code.
++ */
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ QCA8327_DEBUG_MANU_CTRL_EN, 0);
++
++ return qca83xx_config_init(phydev);
++}
++
++static void qca83xx_link_change_notify(struct phy_device *phydev)
++{
++ /* Set DAC Amplitude adjustment to +6% for 100m on link running */
++ if (phydev->state == PHY_RUNNING) {
++ if (phydev->speed == SPEED_100)
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ QCA8327_DEBUG_MANU_CTRL_EN,
++ QCA8327_DEBUG_MANU_CTRL_EN);
++ } else {
++ /* Reset DAC Amplitude adjustment */
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ QCA8327_DEBUG_MANU_CTRL_EN, 0);
++ }
++}
++
++static int qca83xx_resume(struct phy_device *phydev)
++{
++ int ret, val;
++
++ /* Skip reset if not suspended */
++ if (!phydev->suspended)
++ return 0;
++
++ /* Reinit the port, reset values set by suspend */
++ qca83xx_config_init(phydev);
++
++ /* Reset the port on port resume */
++ phy_set_bits(phydev, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
++
++ /* On resume from suspend the switch execute a reset and
++ * restart auto-negotiation. Wait for reset to complete.
++ */
++ ret = phy_read_poll_timeout(phydev, MII_BMCR, val, !(val & BMCR_RESET),
++ 50000, 600000, true);
++ if (ret)
++ return ret;
++
++ usleep_range(1000, 2000);
++
++ return 0;
++}
++
++static int qca83xx_suspend(struct phy_device *phydev)
++{
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_GREEN,
++ AT803X_DEBUG_GATE_CLK_IN1000, 0);
++
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_HIB_CTRL,
++ AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE |
++ AT803X_DEBUG_HIB_CTRL_SEL_RST_80U, 0);
++
++ return 0;
++}
++
++static int qca8337_suspend(struct phy_device *phydev)
++{
++ /* Only QCA8337 support actual suspend. */
++ genphy_suspend(phydev);
++
++ return qca83xx_suspend(phydev);
++}
++
++static int qca8327_suspend(struct phy_device *phydev)
++{
++ u16 mask = 0;
++
++ /* QCA8327 cause port unreliability when phy suspend
++ * is set.
++ */
++ mask |= ~(BMCR_SPEED1000 | BMCR_FULLDPLX);
++ phy_modify(phydev, MII_BMCR, mask, 0);
++
++ return qca83xx_suspend(phydev);
++}
++
++static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
++{
++ int ret;
++
++ /* Enable fast retrain */
++ ret = genphy_c45_fast_retrain(phydev, true);
++ if (ret)
++ return ret;
++
++ phy_write_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_TOP_OPTION1,
++ QCA808X_TOP_OPTION1_DATA);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB,
++ QCA808X_MSE_THRESHOLD_20DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB,
++ QCA808X_MSE_THRESHOLD_17DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB,
++ QCA808X_MSE_THRESHOLD_27DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB,
++ QCA808X_MSE_THRESHOLD_28DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_1,
++ QCA808X_MMD3_DEBUG_1_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_4,
++ QCA808X_MMD3_DEBUG_4_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_5,
++ QCA808X_MMD3_DEBUG_5_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_3,
++ QCA808X_MMD3_DEBUG_3_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_6,
++ QCA808X_MMD3_DEBUG_6_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_2,
++ QCA808X_MMD3_DEBUG_2_VALUE);
++
++ return 0;
++}
++
++static int qca808x_phy_ms_seed_enable(struct phy_device *phydev, bool enable)
++{
++ u16 seed_value;
++
++ if (!enable)
++ return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
++ QCA808X_MASTER_SLAVE_SEED_ENABLE, 0);
++
++ seed_value = prandom_u32_max(QCA808X_MASTER_SLAVE_SEED_RANGE);
++ return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
++ QCA808X_MASTER_SLAVE_SEED_CFG | QCA808X_MASTER_SLAVE_SEED_ENABLE,
++ FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value) |
++ QCA808X_MASTER_SLAVE_SEED_ENABLE);
++}
++
++static bool qca808x_is_prefer_master(struct phy_device *phydev)
++{
++ return (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_FORCE) ||
++ (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_PREFERRED);
++}
++
++static bool qca808x_has_fast_retrain_or_slave_seed(struct phy_device *phydev)
++{
++ return linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
++}
++
++static int qca808x_config_init(struct phy_device *phydev)
++{
++ int ret;
++
++ /* Active adc&vga on 802.3az for the link 1000M and 100M */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_ADDR_CLD_CTRL7,
++ QCA808X_8023AZ_AFE_CTRL_MASK, QCA808X_8023AZ_AFE_EN);
++ if (ret)
++ return ret;
++
++ /* Adjust the threshold on 802.3az for the link 1000M */
++ ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
++ QCA808X_PHY_MMD3_AZ_TRAINING_CTRL,
++ QCA808X_MMD3_AZ_TRAINING_VAL);
++ if (ret)
++ return ret;
++
++ if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
++ /* Config the fast retrain for the link 2500M */
++ ret = qca808x_phy_fast_retrain_config(phydev);
++ if (ret)
++ return ret;
++
++ ret = genphy_read_master_slave(phydev);
++ if (ret < 0)
++ return ret;
++
++ if (!qca808x_is_prefer_master(phydev)) {
++ /* Enable seed and configure lower ramdom seed to make phy
++ * linked as slave mode.
++ */
++ ret = qca808x_phy_ms_seed_enable(phydev, true);
++ if (ret)
++ return ret;
++ }
++ }
++
++ /* Configure adc threshold as 100mv for the link 10M */
++ return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_ADC_THRESHOLD,
++ QCA808X_ADC_THRESHOLD_MASK,
++ QCA808X_ADC_THRESHOLD_100MV);
++}
++
++static int qca808x_read_status(struct phy_device *phydev)
++{
++ struct at803x_ss_mask ss_mask = { 0 };
++ int ret;
++
++ ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_STAT);
++ if (ret < 0)
++ return ret;
++
++ linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->lp_advertising,
++ ret & MDIO_AN_10GBT_STAT_LP2_5G);
++
++ ret = genphy_read_status(phydev);
++ if (ret)
++ return ret;
++
++ /* qca8081 takes the different bits for speed value from at803x */
++ ss_mask.speed_mask = QCA808X_SS_SPEED_MASK;
++ ss_mask.speed_shift = __bf_shf(QCA808X_SS_SPEED_MASK);
++ ret = at803x_read_specific_status(phydev, ss_mask);
++ if (ret < 0)
++ return ret;
++
++ if (phydev->link) {
++ if (phydev->speed == SPEED_2500)
++ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
++ else
++ phydev->interface = PHY_INTERFACE_MODE_SGMII;
++ } else {
++ /* generate seed as a lower random value to make PHY linked as SLAVE easily,
++ * except for master/slave configuration fault detected or the master mode
++ * preferred.
++ *
++ * the reason for not putting this code into the function link_change_notify is
++ * the corner case where the link partner is also the qca8081 PHY and the seed
++ * value is configured as the same value, the link can't be up and no link change
++ * occurs.
++ */
++ if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
++ if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR ||
++ qca808x_is_prefer_master(phydev)) {
++ qca808x_phy_ms_seed_enable(phydev, false);
++ } else {
++ qca808x_phy_ms_seed_enable(phydev, true);
++ }
++ }
++ }
++
++ return 0;
++}
++
++static int qca808x_soft_reset(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = genphy_soft_reset(phydev);
++ if (ret < 0)
++ return ret;
++
++ if (qca808x_has_fast_retrain_or_slave_seed(phydev))
++ ret = qca808x_phy_ms_seed_enable(phydev, true);
++
++ return ret;
++}
++
++static bool qca808x_cdt_fault_length_valid(int cdt_code)
++{
++ switch (cdt_code) {
++ case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
++ return true;
++ default:
++ return false;
++ }
++}
++
++static int qca808x_cable_test_result_trans(int cdt_code)
++{
++ switch (cdt_code) {
++ case QCA808X_CDT_STATUS_STAT_NORMAL:
++ return ETHTOOL_A_CABLE_RESULT_CODE_OK;
++ case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
++ return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
++ case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
++ return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
++ return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
++ case QCA808X_CDT_STATUS_STAT_FAIL:
++ default:
++ return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
++ }
++}
++
++static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair,
++ int result)
++{
++ int val;
++ u32 cdt_length_reg = 0;
++
++ switch (pair) {
++ case ETHTOOL_A_CABLE_PAIR_A:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_A;
++ break;
++ case ETHTOOL_A_CABLE_PAIR_B:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_B;
++ break;
++ case ETHTOOL_A_CABLE_PAIR_C:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_C;
++ break;
++ case ETHTOOL_A_CABLE_PAIR_D:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_D;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ val = phy_read_mmd(phydev, MDIO_MMD_PCS, cdt_length_reg);
++ if (val < 0)
++ return val;
++
++ if (result == ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT)
++ val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_SAME_SHORT, val);
++ else
++ val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT, val);
++
++ return at803x_cdt_fault_length(val);
++}
++
++static int qca808x_cable_test_start(struct phy_device *phydev)
++{
++ int ret;
++
++ /* perform CDT with the following configs:
++ * 1. disable hibernation.
++ * 2. force PHY working in MDI mode.
++ * 3. for PHY working in 1000BaseT.
++ * 4. configure the threshold.
++ */
++
++ ret = at803x_debug_reg_mask(phydev, QCA808X_DBG_AN_TEST, QCA808X_HIBERNATION_EN, 0);
++ if (ret < 0)
++ return ret;
++
++ ret = at803x_config_mdix(phydev, ETH_TP_MDI);
++ if (ret < 0)
++ return ret;
++
++ /* Force 1000base-T needs to configure PMA/PMD and MII_BMCR */
++ phydev->duplex = DUPLEX_FULL;
++ phydev->speed = SPEED_1000;
++ ret = genphy_c45_pma_setup_forced(phydev);
++ if (ret < 0)
++ return ret;
++
++ ret = genphy_setup_forced(phydev);
++ if (ret < 0)
++ return ret;
++
++ /* configure the thresholds for open, short, pair ok test */
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8074, 0xc040);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8076, 0xc040);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8077, 0xa060);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8078, 0xc050);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807a, 0xc060);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807e, 0xb060);
++
++ return 0;
++}
++
++static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
++ u16 status)
++{
++ int length, result;
++ u16 pair_code;
++
++ switch (pair) {
++ case ETHTOOL_A_CABLE_PAIR_A:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
++ break;
++ case ETHTOOL_A_CABLE_PAIR_B:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
++ break;
++ case ETHTOOL_A_CABLE_PAIR_C:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
++ break;
++ case ETHTOOL_A_CABLE_PAIR_D:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ result = qca808x_cable_test_result_trans(pair_code);
++ ethnl_cable_test_result(phydev, pair, result);
++
++ if (qca808x_cdt_fault_length_valid(pair_code)) {
++ length = qca808x_cdt_fault_length(phydev, pair, result);
++ ethnl_cable_test_fault_length(phydev, pair, length);
++ }
++
++ return 0;
++}
++
++static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
++{
++ int ret, val;
++
++ *finished = false;
++
++ val = QCA808X_CDT_ENABLE_TEST |
++ QCA808X_CDT_LENGTH_UNIT;
++ ret = at803x_cdt_start(phydev, val);
++ if (ret)
++ return ret;
++
++ ret = at803x_cdt_wait_for_completion(phydev, QCA808X_CDT_ENABLE_TEST);
++ if (ret)
++ return ret;
++
++ val = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA808X_MMD3_CDT_STATUS);
++ if (val < 0)
++ return val;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
++ if (ret)
++ return ret;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
++ if (ret)
++ return ret;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
++ if (ret)
++ return ret;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
++ if (ret)
++ return ret;
++
++ *finished = true;
++
++ return 0;
++}
++
++static int qca808x_get_features(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = genphy_c45_pma_read_abilities(phydev);
++ if (ret)
++ return ret;
++
++ /* The autoneg ability is not existed in bit3 of MMD7.1,
++ * but it is supported by qca808x PHY, so we add it here
++ * manually.
++ */
++ linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported);
++
++ /* As for the qca8081 1G version chip, the 2500baseT ability is also
++ * existed in the bit0 of MMD1.21, we need to remove it manually if
++ * it is the qca8081 1G chip according to the bit0 of MMD7.0x901d.
++ */
++ ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_CHIP_TYPE);
++ if (ret < 0)
++ return ret;
++
++ if (QCA808X_PHY_CHIP_TYPE_1G & ret)
++ linkmode_clear_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
++
++ return 0;
++}
++
++static int qca808x_config_aneg(struct phy_device *phydev)
++{
++ int phy_ctrl = 0;
++ int ret;
++
++ ret = at803x_prepare_config_aneg(phydev);
++ if (ret)
++ return ret;
++
++ /* The reg MII_BMCR also needs to be configured for force mode, the
++ * genphy_config_aneg is also needed.
++ */
++ if (phydev->autoneg == AUTONEG_DISABLE)
++ genphy_c45_pma_setup_forced(phydev);
++
++ if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
++ phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
++
++ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
++ MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
++ if (ret < 0)
++ return ret;
++
++ return __genphy_config_aneg(phydev, ret);
++}
++
++static void qca808x_link_change_notify(struct phy_device *phydev)
++{
++ /* Assert interface sgmii fifo on link down, deassert it on link up,
++ * the interface device address is always phy address added by 1.
++ */
++ mdiobus_c45_modify_changed(phydev->mdio.bus, phydev->mdio.addr + 1,
++ MDIO_MMD_PMAPMD, QCA8081_PHY_SERDES_MMD1_FIFO_CTRL,
++ QCA8081_PHY_FIFO_RSTN,
++ phydev->link ? QCA8081_PHY_FIFO_RSTN : 0);
++}
++
++static int qca808x_led_parse_netdev(struct phy_device *phydev, unsigned long rules,
++ u16 *offload_trigger)
++{
++ /* Parsing specific to netdev trigger */
++ if (test_bit(TRIGGER_NETDEV_TX, &rules))
++ *offload_trigger |= QCA808X_LED_TX_BLINK;
++ if (test_bit(TRIGGER_NETDEV_RX, &rules))
++ *offload_trigger |= QCA808X_LED_RX_BLINK;
++ if (test_bit(TRIGGER_NETDEV_LINK_10, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED10_ON;
++ if (test_bit(TRIGGER_NETDEV_LINK_100, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED100_ON;
++ if (test_bit(TRIGGER_NETDEV_LINK_1000, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED1000_ON;
++ if (test_bit(TRIGGER_NETDEV_LINK_2500, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED2500_ON;
++ if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &rules))
++ *offload_trigger |= QCA808X_LED_HALF_DUPLEX_ON;
++ if (test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &rules))
++ *offload_trigger |= QCA808X_LED_FULL_DUPLEX_ON;
++
++ if (rules && !*offload_trigger)
++ return -EOPNOTSUPP;
++
++ /* Enable BLINK_CHECK_BYPASS by default to make the LED
++ * blink even with duplex or speed mode not enabled.
++ */
++ *offload_trigger |= QCA808X_LED_BLINK_CHECK_BYPASS;
++
++ return 0;
++}
++
++static int qca808x_led_hw_control_enable(struct phy_device *phydev, u8 index)
++{
++ u16 reg;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_FORCE_EN);
++}
++
++static int qca808x_led_hw_is_supported(struct phy_device *phydev, u8 index,
++ unsigned long rules)
++{
++ u16 offload_trigger = 0;
++
++ if (index > 2)
++ return -EINVAL;
++
++ return qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
++}
++
++static int qca808x_led_hw_control_set(struct phy_device *phydev, u8 index,
++ unsigned long rules)
++{
++ u16 reg, offload_trigger = 0;
++ int ret;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_CTRL(index);
++
++ ret = qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
++ if (ret)
++ return ret;
++
++ ret = qca808x_led_hw_control_enable(phydev, index);
++ if (ret)
++ return ret;
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_PATTERN_MASK,
++ offload_trigger);
++}
++
++static bool qca808x_led_hw_control_status(struct phy_device *phydev, u8 index)
++{
++ u16 reg;
++ int val;
++
++ if (index > 2)
++ return false;
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
++
++ return !(val & QCA808X_LED_FORCE_EN);
++}
++
++static int qca808x_led_hw_control_get(struct phy_device *phydev, u8 index,
++ unsigned long *rules)
++{
++ u16 reg;
++ int val;
++
++ if (index > 2)
++ return -EINVAL;
++
++ /* Check if we have hw control enabled */
++ if (qca808x_led_hw_control_status(phydev, index))
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_CTRL(index);
++
++ val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
++ if (val & QCA808X_LED_TX_BLINK)
++ set_bit(TRIGGER_NETDEV_TX, rules);
++ if (val & QCA808X_LED_RX_BLINK)
++ set_bit(TRIGGER_NETDEV_RX, rules);
++ if (val & QCA808X_LED_SPEED10_ON)
++ set_bit(TRIGGER_NETDEV_LINK_10, rules);
++ if (val & QCA808X_LED_SPEED100_ON)
++ set_bit(TRIGGER_NETDEV_LINK_100, rules);
++ if (val & QCA808X_LED_SPEED1000_ON)
++ set_bit(TRIGGER_NETDEV_LINK_1000, rules);
++ if (val & QCA808X_LED_SPEED2500_ON)
++ set_bit(TRIGGER_NETDEV_LINK_2500, rules);
++ if (val & QCA808X_LED_HALF_DUPLEX_ON)
++ set_bit(TRIGGER_NETDEV_HALF_DUPLEX, rules);
++ if (val & QCA808X_LED_FULL_DUPLEX_ON)
++ set_bit(TRIGGER_NETDEV_FULL_DUPLEX, rules);
++
++ return 0;
++}
++
++static int qca808x_led_hw_control_reset(struct phy_device *phydev, u8 index)
++{
++ u16 reg;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_CTRL(index);
++
++ return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_PATTERN_MASK);
++}
++
++static int qca808x_led_brightness_set(struct phy_device *phydev,
++ u8 index, enum led_brightness value)
++{
++ u16 reg;
++ int ret;
++
++ if (index > 2)
++ return -EINVAL;
++
++ if (!value) {
++ ret = qca808x_led_hw_control_reset(phydev, index);
++ if (ret)
++ return ret;
++ }
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
++ QCA808X_LED_FORCE_EN | value ? QCA808X_LED_FORCE_ON :
++ QCA808X_LED_FORCE_OFF);
++}
++
++static int qca808x_led_blink_set(struct phy_device *phydev, u8 index,
++ unsigned long *delay_on,
++ unsigned long *delay_off)
++{
++ int ret;
++ u16 reg;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ /* Set blink to 50% off, 50% on at 4Hz by default */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_LED_GLOBAL,
++ QCA808X_LED_BLINK_FREQ_MASK | QCA808X_LED_BLINK_DUTY_MASK,
++ QCA808X_LED_BLINK_FREQ_4HZ | QCA808X_LED_BLINK_DUTY_50_50);
++ if (ret)
++ return ret;
++
++ /* We use BLINK_1 for normal blinking */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
++ QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_BLINK_1);
++ if (ret)
++ return ret;
++
++ /* We set blink to 4Hz, aka 250ms */
++ *delay_on = 250 / 2;
++ *delay_off = 250 / 2;
++
++ return 0;
++}
++
++static int qca808x_led_polarity_set(struct phy_device *phydev, int index,
++ unsigned long modes)
++{
++ struct at803x_priv *priv = phydev->priv;
++ bool active_low = false;
++ u32 mode;
++
++ for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) {
++ switch (mode) {
++ case PHY_LED_ACTIVE_LOW:
++ active_low = true;
++ break;
++ default:
++ return -EINVAL;
++ }
++ }
++
++ /* PHY polarity is global and can't be set per LED.
++ * To detect this, check if last requested polarity mode
++ * match the new one.
++ */
++ if (priv->led_polarity_mode >= 0 &&
++ priv->led_polarity_mode != active_low) {
++ phydev_err(phydev, "PHY polarity is global. Mismatched polarity on different LED\n");
++ return -EINVAL;
++ }
++
++ /* Save the last PHY polarity mode */
++ priv->led_polarity_mode = active_low;
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN,
++ QCA808X_MMD7_LED_POLARITY_CTRL,
++ QCA808X_LED_ACTIVE_HIGH,
++ active_low ? 0 : QCA808X_LED_ACTIVE_HIGH);
++}
++
++static struct phy_driver at803x_driver[] = {
++{
++ /* Qualcomm Atheros AR8035 */
++ PHY_ID_MATCH_EXACT(ATH8035_PHY_ID),
++ .name = "Qualcomm Atheros AR8035",
++ .flags = PHY_POLL_CABLE_TEST,
++ .probe = at8035_probe,
++ .config_aneg = at803x_config_aneg,
++ .config_init = at803x_config_init,
++ .soft_reset = genphy_soft_reset,
++ .set_wol = at803x_set_wol,
++ .get_wol = at803x_get_wol,
++ .suspend = at803x_suspend,
++ .resume = at803x_resume,
++ /* PHY_GBIT_FEATURES */
++ .read_status = at803x_read_status,
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .get_tunable = at803x_get_tunable,
++ .set_tunable = at803x_set_tunable,
++ .cable_test_start = at8031_cable_test_start,
++ .cable_test_get_status = at8031_cable_test_get_status,
++}, {
++ /* Qualcomm Atheros AR8030 */
++ .phy_id = ATH8030_PHY_ID,
++ .name = "Qualcomm Atheros AR8030",
++ .phy_id_mask = AT8030_PHY_ID_MASK,
++ .probe = at8035_probe,
++ .config_init = at803x_config_init,
++ .link_change_notify = at803x_link_change_notify,
++ .set_wol = at803x_set_wol,
++ .get_wol = at803x_get_wol,
++ .suspend = at803x_suspend,
++ .resume = at803x_resume,
++ /* PHY_BASIC_FEATURES */
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++}, {
++ /* Qualcomm Atheros AR8031/AR8033 */
++ PHY_ID_MATCH_EXACT(ATH8031_PHY_ID),
++ .name = "Qualcomm Atheros AR8031/AR8033",
++ .flags = PHY_POLL_CABLE_TEST,
++ .probe = at8031_probe,
++ .config_init = at8031_config_init,
++ .config_aneg = at803x_config_aneg,
++ .soft_reset = genphy_soft_reset,
++ .set_wol = at8031_set_wol,
++ .get_wol = at803x_get_wol,
++ .suspend = at803x_suspend,
++ .resume = at803x_resume,
++ .read_page = at803x_read_page,
++ .write_page = at803x_write_page,
++ .get_features = at803x_get_features,
++ .read_status = at8031_read_status,
++ .config_intr = at8031_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .get_tunable = at803x_get_tunable,
++ .set_tunable = at803x_set_tunable,
++ .cable_test_start = at8031_cable_test_start,
++ .cable_test_get_status = at8031_cable_test_get_status,
++}, {
++ /* Qualcomm Atheros AR8032 */
++ PHY_ID_MATCH_EXACT(ATH8032_PHY_ID),
++ .name = "Qualcomm Atheros AR8032",
++ .probe = at803x_probe,
++ .flags = PHY_POLL_CABLE_TEST,
++ .config_init = at803x_config_init,
++ .link_change_notify = at803x_link_change_notify,
++ .suspend = at803x_suspend,
++ .resume = at803x_resume,
++ /* PHY_BASIC_FEATURES */
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .cable_test_start = at803x_cable_test_start,
++ .cable_test_get_status = at8032_cable_test_get_status,
++}, {
++ /* ATHEROS AR9331 */
++ PHY_ID_MATCH_EXACT(ATH9331_PHY_ID),
++ .name = "Qualcomm Atheros AR9331 built-in PHY",
++ .probe = at803x_probe,
++ .suspend = at803x_suspend,
++ .resume = at803x_resume,
++ .flags = PHY_POLL_CABLE_TEST,
++ /* PHY_BASIC_FEATURES */
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .cable_test_start = at803x_cable_test_start,
++ .cable_test_get_status = at8032_cable_test_get_status,
++ .read_status = at803x_read_status,
++ .soft_reset = genphy_soft_reset,
++ .config_aneg = at803x_config_aneg,
++}, {
++ /* Qualcomm Atheros QCA9561 */
++ PHY_ID_MATCH_EXACT(QCA9561_PHY_ID),
++ .name = "Qualcomm Atheros QCA9561 built-in PHY",
++ .probe = at803x_probe,
++ .suspend = at803x_suspend,
++ .resume = at803x_resume,
++ .flags = PHY_POLL_CABLE_TEST,
++ /* PHY_BASIC_FEATURES */
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .cable_test_start = at803x_cable_test_start,
++ .cable_test_get_status = at8032_cable_test_get_status,
++ .read_status = at803x_read_status,
++ .soft_reset = genphy_soft_reset,
++ .config_aneg = at803x_config_aneg,
++}, {
++ /* QCA8337 */
++ .phy_id = QCA8337_PHY_ID,
++ .phy_id_mask = QCA8K_PHY_ID_MASK,
++ .name = "Qualcomm Atheros 8337 internal PHY",
++ /* PHY_GBIT_FEATURES */
++ .probe = at803x_probe,
++ .flags = PHY_IS_INTERNAL,
++ .config_init = qca83xx_config_init,
++ .soft_reset = genphy_soft_reset,
++ .get_sset_count = qca83xx_get_sset_count,
++ .get_strings = qca83xx_get_strings,
++ .get_stats = qca83xx_get_stats,
++ .suspend = qca8337_suspend,
++ .resume = qca83xx_resume,
++}, {
++ /* QCA8327-A from switch QCA8327-AL1A */
++ .phy_id = QCA8327_A_PHY_ID,
++ .phy_id_mask = QCA8K_PHY_ID_MASK,
++ .name = "Qualcomm Atheros 8327-A internal PHY",
++ /* PHY_GBIT_FEATURES */
++ .link_change_notify = qca83xx_link_change_notify,
++ .probe = at803x_probe,
++ .flags = PHY_IS_INTERNAL,
++ .config_init = qca8327_config_init,
++ .soft_reset = genphy_soft_reset,
++ .get_sset_count = qca83xx_get_sset_count,
++ .get_strings = qca83xx_get_strings,
++ .get_stats = qca83xx_get_stats,
++ .suspend = qca8327_suspend,
++ .resume = qca83xx_resume,
++}, {
++ /* QCA8327-B from switch QCA8327-BL1A */
++ .phy_id = QCA8327_B_PHY_ID,
++ .phy_id_mask = QCA8K_PHY_ID_MASK,
++ .name = "Qualcomm Atheros 8327-B internal PHY",
++ /* PHY_GBIT_FEATURES */
++ .link_change_notify = qca83xx_link_change_notify,
++ .probe = at803x_probe,
++ .flags = PHY_IS_INTERNAL,
++ .config_init = qca8327_config_init,
++ .soft_reset = genphy_soft_reset,
++ .get_sset_count = qca83xx_get_sset_count,
++ .get_strings = qca83xx_get_strings,
++ .get_stats = qca83xx_get_stats,
++ .suspend = qca8327_suspend,
++ .resume = qca83xx_resume,
++}, {
++ /* Qualcomm QCA8081 */
++ PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
++ .name = "Qualcomm QCA8081",
++ .flags = PHY_POLL_CABLE_TEST,
++ .probe = at803x_probe,
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .get_tunable = at803x_get_tunable,
++ .set_tunable = at803x_set_tunable,
++ .set_wol = at803x_set_wol,
++ .get_wol = at803x_get_wol,
++ .get_features = qca808x_get_features,
++ .config_aneg = qca808x_config_aneg,
++ .suspend = genphy_suspend,
++ .resume = genphy_resume,
++ .read_status = qca808x_read_status,
++ .config_init = qca808x_config_init,
++ .soft_reset = qca808x_soft_reset,
++ .cable_test_start = qca808x_cable_test_start,
++ .cable_test_get_status = qca808x_cable_test_get_status,
++ .link_change_notify = qca808x_link_change_notify,
++ .led_brightness_set = qca808x_led_brightness_set,
++ .led_blink_set = qca808x_led_blink_set,
++ .led_hw_is_supported = qca808x_led_hw_is_supported,
++ .led_hw_control_set = qca808x_led_hw_control_set,
++ .led_hw_control_get = qca808x_led_hw_control_get,
++ .led_polarity_set = qca808x_led_polarity_set,
++}, };
++
++module_phy_driver(at803x_driver);
++
++static struct mdio_device_id __maybe_unused atheros_tbl[] = {
++ { ATH8030_PHY_ID, AT8030_PHY_ID_MASK },
++ { PHY_ID_MATCH_EXACT(ATH8031_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(ATH8032_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA9561_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA8081_PHY_ID) },
++ { }
++};
++
++MODULE_DEVICE_TABLE(mdio, atheros_tbl);
--- /dev/null
+From 6fb760972c49490b03f3db2ad64cf30bdd28c54a Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Mon, 29 Jan 2024 15:15:20 +0100
+Subject: [PATCH 2/5] net: phy: qcom: create and move functions to shared
+ library
+
+Create and move functions to shared library in preparation for qca83xx
+PHY Family to be detached from at803x driver.
+
+Only the shared defines are moved to the shared qcom.h header.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Link: https://lore.kernel.org/r/20240129141600.2592-3-ansuelsmth@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/phy/qcom/Kconfig | 4 ++
+ drivers/net/phy/qcom/Makefile | 1 +
+ drivers/net/phy/qcom/at803x.c | 69 +----------------------------
+ drivers/net/phy/qcom/qcom-phy-lib.c | 53 ++++++++++++++++++++++
+ drivers/net/phy/qcom/qcom.h | 34 ++++++++++++++
+ 5 files changed, 94 insertions(+), 67 deletions(-)
+ create mode 100644 drivers/net/phy/qcom/qcom-phy-lib.c
+ create mode 100644 drivers/net/phy/qcom/qcom.h
+
+--- a/drivers/net/phy/qcom/Kconfig
++++ b/drivers/net/phy/qcom/Kconfig
+@@ -1,6 +1,10 @@
+ # SPDX-License-Identifier: GPL-2.0-only
++config QCOM_NET_PHYLIB
++ tristate
++
+ config AT803X_PHY
+ tristate "Qualcomm Atheros AR803X PHYs and QCA833x PHYs"
++ select QCOM_NET_PHYLIB
+ depends on REGULATOR
+ help
+ Currently supports the AR8030, AR8031, AR8033, AR8035 and internal
+--- a/drivers/net/phy/qcom/Makefile
++++ b/drivers/net/phy/qcom/Makefile
+@@ -1,2 +1,3 @@
+ # SPDX-License-Identifier: GPL-2.0
++obj-$(CONFIG_QCOM_NET_PHYLIB) += qcom-phy-lib.o
+ obj-$(CONFIG_AT803X_PHY) += at803x.o
+--- a/drivers/net/phy/qcom/at803x.c
++++ b/drivers/net/phy/qcom/at803x.c
+@@ -22,6 +22,8 @@
+ #include <linux/sfp.h>
+ #include <dt-bindings/net/qca-ar803x.h>
+
++#include "qcom.h"
++
+ #define AT803X_SPECIFIC_FUNCTION_CONTROL 0x10
+ #define AT803X_SFC_ASSERT_CRS BIT(11)
+ #define AT803X_SFC_FORCE_LINK BIT(10)
+@@ -84,9 +86,6 @@
+ #define AT803X_REG_CHIP_CONFIG 0x1f
+ #define AT803X_BT_BX_REG_SEL 0x8000
+
+-#define AT803X_DEBUG_ADDR 0x1D
+-#define AT803X_DEBUG_DATA 0x1E
+-
+ #define AT803X_MODE_CFG_MASK 0x0F
+ #define AT803X_MODE_CFG_BASET_RGMII 0x00
+ #define AT803X_MODE_CFG_BASET_SGMII 0x01
+@@ -103,19 +102,6 @@
+ #define AT803X_PSSR 0x11 /*PHY-Specific Status Register*/
+ #define AT803X_PSSR_MR_AN_COMPLETE 0x0200
+
+-#define AT803X_DEBUG_ANALOG_TEST_CTRL 0x00
+-#define QCA8327_DEBUG_MANU_CTRL_EN BIT(2)
+-#define QCA8337_DEBUG_MANU_CTRL_EN GENMASK(3, 2)
+-#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
+-
+-#define AT803X_DEBUG_SYSTEM_CTRL_MODE 0x05
+-#define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8)
+-
+-#define AT803X_DEBUG_REG_HIB_CTRL 0x0b
+-#define AT803X_DEBUG_HIB_CTRL_SEL_RST_80U BIT(10)
+-#define AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE BIT(13)
+-#define AT803X_DEBUG_HIB_CTRL_PS_HIB_EN BIT(15)
+-
+ #define AT803X_DEBUG_REG_3C 0x3C
+
+ #define AT803X_DEBUG_REG_GREEN 0x3D
+@@ -393,18 +379,6 @@ MODULE_DESCRIPTION("Qualcomm Atheros AR8
+ MODULE_AUTHOR("Matus Ujhelyi");
+ MODULE_LICENSE("GPL");
+
+-enum stat_access_type {
+- PHY,
+- MMD
+-};
+-
+-struct at803x_hw_stat {
+- const char *string;
+- u8 reg;
+- u32 mask;
+- enum stat_access_type access_type;
+-};
+-
+ static struct at803x_hw_stat qca83xx_hw_stats[] = {
+ { "phy_idle_errors", 0xa, GENMASK(7, 0), PHY},
+ { "phy_receive_errors", 0x15, GENMASK(15, 0), PHY},
+@@ -439,45 +413,6 @@ struct at803x_context {
+ u16 led_control;
+ };
+
+-static int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data)
+-{
+- int ret;
+-
+- ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
+- if (ret < 0)
+- return ret;
+-
+- return phy_write(phydev, AT803X_DEBUG_DATA, data);
+-}
+-
+-static int at803x_debug_reg_read(struct phy_device *phydev, u16 reg)
+-{
+- int ret;
+-
+- ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
+- if (ret < 0)
+- return ret;
+-
+- return phy_read(phydev, AT803X_DEBUG_DATA);
+-}
+-
+-static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
+- u16 clear, u16 set)
+-{
+- u16 val;
+- int ret;
+-
+- ret = at803x_debug_reg_read(phydev, reg);
+- if (ret < 0)
+- return ret;
+-
+- val = ret & 0xffff;
+- val &= ~clear;
+- val |= set;
+-
+- return phy_write(phydev, AT803X_DEBUG_DATA, val);
+-}
+-
+ static int at803x_write_page(struct phy_device *phydev, int page)
+ {
+ int mask;
+--- /dev/null
++++ b/drivers/net/phy/qcom/qcom-phy-lib.c
+@@ -0,0 +1,53 @@
++// SPDX-License-Identifier: GPL-2.0
++
++#include <linux/phy.h>
++#include <linux/module.h>
++
++#include "qcom.h"
++
++MODULE_DESCRIPTION("Qualcomm PHY driver Common Functions");
++MODULE_AUTHOR("Matus Ujhelyi");
++MODULE_AUTHOR("Christian Marangi <ansuelsmth@gmail.com>");
++MODULE_LICENSE("GPL");
++
++int at803x_debug_reg_read(struct phy_device *phydev, u16 reg)
++{
++ int ret;
++
++ ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
++ if (ret < 0)
++ return ret;
++
++ return phy_read(phydev, AT803X_DEBUG_DATA);
++}
++EXPORT_SYMBOL_GPL(at803x_debug_reg_read);
++
++int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
++ u16 clear, u16 set)
++{
++ u16 val;
++ int ret;
++
++ ret = at803x_debug_reg_read(phydev, reg);
++ if (ret < 0)
++ return ret;
++
++ val = ret & 0xffff;
++ val &= ~clear;
++ val |= set;
++
++ return phy_write(phydev, AT803X_DEBUG_DATA, val);
++}
++EXPORT_SYMBOL_GPL(at803x_debug_reg_mask);
++
++int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data)
++{
++ int ret;
++
++ ret = phy_write(phydev, AT803X_DEBUG_ADDR, reg);
++ if (ret < 0)
++ return ret;
++
++ return phy_write(phydev, AT803X_DEBUG_DATA, data);
++}
++EXPORT_SYMBOL_GPL(at803x_debug_reg_write);
+--- /dev/null
++++ b/drivers/net/phy/qcom/qcom.h
+@@ -0,0 +1,34 @@
++/* SPDX-License-Identifier: GPL-2.0 */
++
++#define AT803X_DEBUG_ADDR 0x1D
++#define AT803X_DEBUG_DATA 0x1E
++
++#define AT803X_DEBUG_ANALOG_TEST_CTRL 0x00
++#define QCA8327_DEBUG_MANU_CTRL_EN BIT(2)
++#define QCA8337_DEBUG_MANU_CTRL_EN GENMASK(3, 2)
++#define AT803X_DEBUG_RX_CLK_DLY_EN BIT(15)
++
++#define AT803X_DEBUG_SYSTEM_CTRL_MODE 0x05
++#define AT803X_DEBUG_TX_CLK_DLY_EN BIT(8)
++
++#define AT803X_DEBUG_REG_HIB_CTRL 0x0b
++#define AT803X_DEBUG_HIB_CTRL_SEL_RST_80U BIT(10)
++#define AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE BIT(13)
++#define AT803X_DEBUG_HIB_CTRL_PS_HIB_EN BIT(15)
++
++enum stat_access_type {
++ PHY,
++ MMD
++};
++
++struct at803x_hw_stat {
++ const char *string;
++ u8 reg;
++ u32 mask;
++ enum stat_access_type access_type;
++};
++
++int at803x_debug_reg_read(struct phy_device *phydev, u16 reg);
++int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
++ u16 clear, u16 set);
++int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data);
--- /dev/null
+From 2e45d404d99d43bb7127b74b5dea8818df64996c Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Mon, 29 Jan 2024 15:15:21 +0100
+Subject: [PATCH 3/5] net: phy: qcom: deatch qca83xx PHY driver from at803x
+
+Deatch qca83xx PHY driver from at803x.
+
+The QCA83xx PHYs implement specific function and doesn't use generic
+at803x so it can be detached from the driver and moved to a dedicated
+one.
+
+Probe function and priv struct is reimplemented to allocate and use
+only the qca83xx specific data. Unused data from at803x PHY driver
+are dropped from at803x priv struct.
+
+This is to make slimmer PHY drivers instead of including lots of bloat
+that would never be used in specific SoC.
+
+A new Kconfig flag QCA83XX_PHY is introduced to compile the new
+introduced PHY driver.
+
+As the Kconfig name starts with Qualcomm the same order is kept.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Link: https://lore.kernel.org/r/20240129141600.2592-4-ansuelsmth@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/phy/qcom/Kconfig | 11 +-
+ drivers/net/phy/qcom/Makefile | 1 +
+ drivers/net/phy/qcom/at803x.c | 235 ----------------------------
+ drivers/net/phy/qcom/qca83xx.c | 275 +++++++++++++++++++++++++++++++++
+ 4 files changed, 284 insertions(+), 238 deletions(-)
+ create mode 100644 drivers/net/phy/qcom/qca83xx.c
+
+--- a/drivers/net/phy/qcom/Kconfig
++++ b/drivers/net/phy/qcom/Kconfig
+@@ -3,9 +3,14 @@ config QCOM_NET_PHYLIB
+ tristate
+
+ config AT803X_PHY
+- tristate "Qualcomm Atheros AR803X PHYs and QCA833x PHYs"
++ tristate "Qualcomm Atheros AR803X PHYs"
+ select QCOM_NET_PHYLIB
+ depends on REGULATOR
+ help
+- Currently supports the AR8030, AR8031, AR8033, AR8035 and internal
+- QCA8337(Internal qca8k PHY) model
++ Currently supports the AR8030, AR8031, AR8033, AR8035 model
++
++config QCA83XX_PHY
++ tristate "Qualcomm Atheros QCA833x PHYs"
++ select QCOM_NET_PHYLIB
++ help
++ Currently supports the internal QCA8337(Internal qca8k PHY) model
+--- a/drivers/net/phy/qcom/Makefile
++++ b/drivers/net/phy/qcom/Makefile
+@@ -1,3 +1,4 @@
+ # SPDX-License-Identifier: GPL-2.0
+ obj-$(CONFIG_QCOM_NET_PHYLIB) += qcom-phy-lib.o
+ obj-$(CONFIG_AT803X_PHY) += at803x.o
++obj-$(CONFIG_QCA83XX_PHY) += qca83xx.o
+--- a/drivers/net/phy/qcom/at803x.c
++++ b/drivers/net/phy/qcom/at803x.c
+@@ -102,17 +102,10 @@
+ #define AT803X_PSSR 0x11 /*PHY-Specific Status Register*/
+ #define AT803X_PSSR_MR_AN_COMPLETE 0x0200
+
+-#define AT803X_DEBUG_REG_3C 0x3C
+-
+-#define AT803X_DEBUG_REG_GREEN 0x3D
+-#define AT803X_DEBUG_GATE_CLK_IN1000 BIT(6)
+-
+ #define AT803X_DEBUG_REG_1F 0x1F
+ #define AT803X_DEBUG_PLL_ON BIT(2)
+ #define AT803X_DEBUG_RGMII_1V8 BIT(3)
+
+-#define MDIO_AZ_DEBUG 0x800D
+-
+ /* AT803x supports either the XTAL input pad, an internal PLL or the
+ * DSP as clock reference for the clock output pad. The XTAL reference
+ * is only used for 25 MHz output, all other frequencies need the PLL.
+@@ -163,13 +156,7 @@
+
+ #define QCA8081_PHY_ID 0x004dd101
+
+-#define QCA8327_A_PHY_ID 0x004dd033
+-#define QCA8327_B_PHY_ID 0x004dd034
+-#define QCA8337_PHY_ID 0x004dd036
+ #define QCA9561_PHY_ID 0x004dd042
+-#define QCA8K_PHY_ID_MASK 0xffffffff
+-
+-#define QCA8K_DEVFLAGS_REVISION_MASK GENMASK(2, 0)
+
+ #define AT803X_PAGE_FIBER 0
+ #define AT803X_PAGE_COPPER 1
+@@ -379,12 +366,6 @@ MODULE_DESCRIPTION("Qualcomm Atheros AR8
+ MODULE_AUTHOR("Matus Ujhelyi");
+ MODULE_LICENSE("GPL");
+
+-static struct at803x_hw_stat qca83xx_hw_stats[] = {
+- { "phy_idle_errors", 0xa, GENMASK(7, 0), PHY},
+- { "phy_receive_errors", 0x15, GENMASK(15, 0), PHY},
+- { "eee_wake_errors", 0x16, GENMASK(15, 0), MMD},
+-};
+-
+ struct at803x_ss_mask {
+ u16 speed_mask;
+ u8 speed_shift;
+@@ -400,7 +381,6 @@ struct at803x_priv {
+ bool is_1000basex;
+ struct regulator_dev *vddio_rdev;
+ struct regulator_dev *vddh_rdev;
+- u64 stats[ARRAY_SIZE(qca83xx_hw_stats)];
+ int led_polarity_mode;
+ };
+
+@@ -564,53 +544,6 @@ static void at803x_get_wol(struct phy_de
+ wol->wolopts |= WAKE_MAGIC;
+ }
+
+-static int qca83xx_get_sset_count(struct phy_device *phydev)
+-{
+- return ARRAY_SIZE(qca83xx_hw_stats);
+-}
+-
+-static void qca83xx_get_strings(struct phy_device *phydev, u8 *data)
+-{
+- int i;
+-
+- for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) {
+- strscpy(data + i * ETH_GSTRING_LEN,
+- qca83xx_hw_stats[i].string, ETH_GSTRING_LEN);
+- }
+-}
+-
+-static u64 qca83xx_get_stat(struct phy_device *phydev, int i)
+-{
+- struct at803x_hw_stat stat = qca83xx_hw_stats[i];
+- struct at803x_priv *priv = phydev->priv;
+- int val;
+- u64 ret;
+-
+- if (stat.access_type == MMD)
+- val = phy_read_mmd(phydev, MDIO_MMD_PCS, stat.reg);
+- else
+- val = phy_read(phydev, stat.reg);
+-
+- if (val < 0) {
+- ret = U64_MAX;
+- } else {
+- val = val & stat.mask;
+- priv->stats[i] += val;
+- ret = priv->stats[i];
+- }
+-
+- return ret;
+-}
+-
+-static void qca83xx_get_stats(struct phy_device *phydev,
+- struct ethtool_stats *stats, u64 *data)
+-{
+- int i;
+-
+- for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++)
+- data[i] = qca83xx_get_stat(phydev, i);
+-}
+-
+ static int at803x_suspend(struct phy_device *phydev)
+ {
+ int value;
+@@ -1707,124 +1640,6 @@ static int at8035_probe(struct phy_devic
+ return at8035_parse_dt(phydev);
+ }
+
+-static int qca83xx_config_init(struct phy_device *phydev)
+-{
+- u8 switch_revision;
+-
+- switch_revision = phydev->dev_flags & QCA8K_DEVFLAGS_REVISION_MASK;
+-
+- switch (switch_revision) {
+- case 1:
+- /* For 100M waveform */
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL, 0x02ea);
+- /* Turn on Gigabit clock */
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x68a0);
+- break;
+-
+- case 2:
+- phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0x0);
+- fallthrough;
+- case 4:
+- phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_AZ_DEBUG, 0x803f);
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x6860);
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0x2c46);
+- at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3C, 0x6000);
+- break;
+- }
+-
+- /* Following original QCA sourcecode set port to prefer master */
+- phy_set_bits(phydev, MII_CTRL1000, CTL1000_PREFER_MASTER);
+-
+- return 0;
+-}
+-
+-static int qca8327_config_init(struct phy_device *phydev)
+-{
+- /* QCA8327 require DAC amplitude adjustment for 100m set to +6%.
+- * Disable on init and enable only with 100m speed following
+- * qca original source code.
+- */
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- QCA8327_DEBUG_MANU_CTRL_EN, 0);
+-
+- return qca83xx_config_init(phydev);
+-}
+-
+-static void qca83xx_link_change_notify(struct phy_device *phydev)
+-{
+- /* Set DAC Amplitude adjustment to +6% for 100m on link running */
+- if (phydev->state == PHY_RUNNING) {
+- if (phydev->speed == SPEED_100)
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- QCA8327_DEBUG_MANU_CTRL_EN,
+- QCA8327_DEBUG_MANU_CTRL_EN);
+- } else {
+- /* Reset DAC Amplitude adjustment */
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
+- QCA8327_DEBUG_MANU_CTRL_EN, 0);
+- }
+-}
+-
+-static int qca83xx_resume(struct phy_device *phydev)
+-{
+- int ret, val;
+-
+- /* Skip reset if not suspended */
+- if (!phydev->suspended)
+- return 0;
+-
+- /* Reinit the port, reset values set by suspend */
+- qca83xx_config_init(phydev);
+-
+- /* Reset the port on port resume */
+- phy_set_bits(phydev, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
+-
+- /* On resume from suspend the switch execute a reset and
+- * restart auto-negotiation. Wait for reset to complete.
+- */
+- ret = phy_read_poll_timeout(phydev, MII_BMCR, val, !(val & BMCR_RESET),
+- 50000, 600000, true);
+- if (ret)
+- return ret;
+-
+- usleep_range(1000, 2000);
+-
+- return 0;
+-}
+-
+-static int qca83xx_suspend(struct phy_device *phydev)
+-{
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_GREEN,
+- AT803X_DEBUG_GATE_CLK_IN1000, 0);
+-
+- at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_HIB_CTRL,
+- AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE |
+- AT803X_DEBUG_HIB_CTRL_SEL_RST_80U, 0);
+-
+- return 0;
+-}
+-
+-static int qca8337_suspend(struct phy_device *phydev)
+-{
+- /* Only QCA8337 support actual suspend. */
+- genphy_suspend(phydev);
+-
+- return qca83xx_suspend(phydev);
+-}
+-
+-static int qca8327_suspend(struct phy_device *phydev)
+-{
+- u16 mask = 0;
+-
+- /* QCA8327 cause port unreliability when phy suspend
+- * is set.
+- */
+- mask |= ~(BMCR_SPEED1000 | BMCR_FULLDPLX);
+- phy_modify(phydev, MII_BMCR, mask, 0);
+-
+- return qca83xx_suspend(phydev);
+-}
+-
+ static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
+ {
+ int ret;
+@@ -2599,53 +2414,6 @@ static struct phy_driver at803x_driver[]
+ .soft_reset = genphy_soft_reset,
+ .config_aneg = at803x_config_aneg,
+ }, {
+- /* QCA8337 */
+- .phy_id = QCA8337_PHY_ID,
+- .phy_id_mask = QCA8K_PHY_ID_MASK,
+- .name = "Qualcomm Atheros 8337 internal PHY",
+- /* PHY_GBIT_FEATURES */
+- .probe = at803x_probe,
+- .flags = PHY_IS_INTERNAL,
+- .config_init = qca83xx_config_init,
+- .soft_reset = genphy_soft_reset,
+- .get_sset_count = qca83xx_get_sset_count,
+- .get_strings = qca83xx_get_strings,
+- .get_stats = qca83xx_get_stats,
+- .suspend = qca8337_suspend,
+- .resume = qca83xx_resume,
+-}, {
+- /* QCA8327-A from switch QCA8327-AL1A */
+- .phy_id = QCA8327_A_PHY_ID,
+- .phy_id_mask = QCA8K_PHY_ID_MASK,
+- .name = "Qualcomm Atheros 8327-A internal PHY",
+- /* PHY_GBIT_FEATURES */
+- .link_change_notify = qca83xx_link_change_notify,
+- .probe = at803x_probe,
+- .flags = PHY_IS_INTERNAL,
+- .config_init = qca8327_config_init,
+- .soft_reset = genphy_soft_reset,
+- .get_sset_count = qca83xx_get_sset_count,
+- .get_strings = qca83xx_get_strings,
+- .get_stats = qca83xx_get_stats,
+- .suspend = qca8327_suspend,
+- .resume = qca83xx_resume,
+-}, {
+- /* QCA8327-B from switch QCA8327-BL1A */
+- .phy_id = QCA8327_B_PHY_ID,
+- .phy_id_mask = QCA8K_PHY_ID_MASK,
+- .name = "Qualcomm Atheros 8327-B internal PHY",
+- /* PHY_GBIT_FEATURES */
+- .link_change_notify = qca83xx_link_change_notify,
+- .probe = at803x_probe,
+- .flags = PHY_IS_INTERNAL,
+- .config_init = qca8327_config_init,
+- .soft_reset = genphy_soft_reset,
+- .get_sset_count = qca83xx_get_sset_count,
+- .get_strings = qca83xx_get_strings,
+- .get_stats = qca83xx_get_stats,
+- .suspend = qca8327_suspend,
+- .resume = qca83xx_resume,
+-}, {
+ /* Qualcomm QCA8081 */
+ PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
+ .name = "Qualcomm QCA8081",
+@@ -2683,9 +2451,6 @@ static struct mdio_device_id __maybe_unu
+ { PHY_ID_MATCH_EXACT(ATH8032_PHY_ID) },
+ { PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
+ { PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
+ { PHY_ID_MATCH_EXACT(QCA9561_PHY_ID) },
+ { PHY_ID_MATCH_EXACT(QCA8081_PHY_ID) },
+ { }
+--- /dev/null
++++ b/drivers/net/phy/qcom/qca83xx.c
+@@ -0,0 +1,275 @@
++// SPDX-License-Identifier: GPL-2.0+
++
++#include <linux/phy.h>
++#include <linux/module.h>
++
++#include "qcom.h"
++
++#define AT803X_DEBUG_REG_3C 0x3C
++
++#define AT803X_DEBUG_REG_GREEN 0x3D
++#define AT803X_DEBUG_GATE_CLK_IN1000 BIT(6)
++
++#define MDIO_AZ_DEBUG 0x800D
++
++#define QCA8327_A_PHY_ID 0x004dd033
++#define QCA8327_B_PHY_ID 0x004dd034
++#define QCA8337_PHY_ID 0x004dd036
++#define QCA8K_PHY_ID_MASK 0xffffffff
++
++#define QCA8K_DEVFLAGS_REVISION_MASK GENMASK(2, 0)
++
++static struct at803x_hw_stat qca83xx_hw_stats[] = {
++ { "phy_idle_errors", 0xa, GENMASK(7, 0), PHY},
++ { "phy_receive_errors", 0x15, GENMASK(15, 0), PHY},
++ { "eee_wake_errors", 0x16, GENMASK(15, 0), MMD},
++};
++
++struct qca83xx_priv {
++ u64 stats[ARRAY_SIZE(qca83xx_hw_stats)];
++};
++
++MODULE_DESCRIPTION("Qualcomm Atheros QCA83XX PHY driver");
++MODULE_AUTHOR("Matus Ujhelyi");
++MODULE_AUTHOR("Christian Marangi <ansuelsmth@gmail.com>");
++MODULE_LICENSE("GPL");
++
++static int qca83xx_get_sset_count(struct phy_device *phydev)
++{
++ return ARRAY_SIZE(qca83xx_hw_stats);
++}
++
++static void qca83xx_get_strings(struct phy_device *phydev, u8 *data)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++) {
++ strscpy(data + i * ETH_GSTRING_LEN,
++ qca83xx_hw_stats[i].string, ETH_GSTRING_LEN);
++ }
++}
++
++static u64 qca83xx_get_stat(struct phy_device *phydev, int i)
++{
++ struct at803x_hw_stat stat = qca83xx_hw_stats[i];
++ struct qca83xx_priv *priv = phydev->priv;
++ int val;
++ u64 ret;
++
++ if (stat.access_type == MMD)
++ val = phy_read_mmd(phydev, MDIO_MMD_PCS, stat.reg);
++ else
++ val = phy_read(phydev, stat.reg);
++
++ if (val < 0) {
++ ret = U64_MAX;
++ } else {
++ val = val & stat.mask;
++ priv->stats[i] += val;
++ ret = priv->stats[i];
++ }
++
++ return ret;
++}
++
++static void qca83xx_get_stats(struct phy_device *phydev,
++ struct ethtool_stats *stats, u64 *data)
++{
++ int i;
++
++ for (i = 0; i < ARRAY_SIZE(qca83xx_hw_stats); i++)
++ data[i] = qca83xx_get_stat(phydev, i);
++}
++
++static int qca83xx_probe(struct phy_device *phydev)
++{
++ struct device *dev = &phydev->mdio.dev;
++ struct qca83xx_priv *priv;
++
++ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++ if (!priv)
++ return -ENOMEM;
++
++ phydev->priv = priv;
++
++ return 0;
++}
++
++static int qca83xx_config_init(struct phy_device *phydev)
++{
++ u8 switch_revision;
++
++ switch_revision = phydev->dev_flags & QCA8K_DEVFLAGS_REVISION_MASK;
++
++ switch (switch_revision) {
++ case 1:
++ /* For 100M waveform */
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL, 0x02ea);
++ /* Turn on Gigabit clock */
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x68a0);
++ break;
++
++ case 2:
++ phy_write_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0x0);
++ fallthrough;
++ case 4:
++ phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_AZ_DEBUG, 0x803f);
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_GREEN, 0x6860);
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_SYSTEM_CTRL_MODE, 0x2c46);
++ at803x_debug_reg_write(phydev, AT803X_DEBUG_REG_3C, 0x6000);
++ break;
++ }
++
++ /* Following original QCA sourcecode set port to prefer master */
++ phy_set_bits(phydev, MII_CTRL1000, CTL1000_PREFER_MASTER);
++
++ return 0;
++}
++
++static int qca8327_config_init(struct phy_device *phydev)
++{
++ /* QCA8327 require DAC amplitude adjustment for 100m set to +6%.
++ * Disable on init and enable only with 100m speed following
++ * qca original source code.
++ */
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ QCA8327_DEBUG_MANU_CTRL_EN, 0);
++
++ return qca83xx_config_init(phydev);
++}
++
++static void qca83xx_link_change_notify(struct phy_device *phydev)
++{
++ /* Set DAC Amplitude adjustment to +6% for 100m on link running */
++ if (phydev->state == PHY_RUNNING) {
++ if (phydev->speed == SPEED_100)
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ QCA8327_DEBUG_MANU_CTRL_EN,
++ QCA8327_DEBUG_MANU_CTRL_EN);
++ } else {
++ /* Reset DAC Amplitude adjustment */
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_ANALOG_TEST_CTRL,
++ QCA8327_DEBUG_MANU_CTRL_EN, 0);
++ }
++}
++
++static int qca83xx_resume(struct phy_device *phydev)
++{
++ int ret, val;
++
++ /* Skip reset if not suspended */
++ if (!phydev->suspended)
++ return 0;
++
++ /* Reinit the port, reset values set by suspend */
++ qca83xx_config_init(phydev);
++
++ /* Reset the port on port resume */
++ phy_set_bits(phydev, MII_BMCR, BMCR_RESET | BMCR_ANENABLE);
++
++ /* On resume from suspend the switch execute a reset and
++ * restart auto-negotiation. Wait for reset to complete.
++ */
++ ret = phy_read_poll_timeout(phydev, MII_BMCR, val, !(val & BMCR_RESET),
++ 50000, 600000, true);
++ if (ret)
++ return ret;
++
++ usleep_range(1000, 2000);
++
++ return 0;
++}
++
++static int qca83xx_suspend(struct phy_device *phydev)
++{
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_GREEN,
++ AT803X_DEBUG_GATE_CLK_IN1000, 0);
++
++ at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_HIB_CTRL,
++ AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE |
++ AT803X_DEBUG_HIB_CTRL_SEL_RST_80U, 0);
++
++ return 0;
++}
++
++static int qca8337_suspend(struct phy_device *phydev)
++{
++ /* Only QCA8337 support actual suspend. */
++ genphy_suspend(phydev);
++
++ return qca83xx_suspend(phydev);
++}
++
++static int qca8327_suspend(struct phy_device *phydev)
++{
++ u16 mask = 0;
++
++ /* QCA8327 cause port unreliability when phy suspend
++ * is set.
++ */
++ mask |= ~(BMCR_SPEED1000 | BMCR_FULLDPLX);
++ phy_modify(phydev, MII_BMCR, mask, 0);
++
++ return qca83xx_suspend(phydev);
++}
++
++static struct phy_driver qca83xx_driver[] = {
++{
++ /* QCA8337 */
++ .phy_id = QCA8337_PHY_ID,
++ .phy_id_mask = QCA8K_PHY_ID_MASK,
++ .name = "Qualcomm Atheros 8337 internal PHY",
++ /* PHY_GBIT_FEATURES */
++ .probe = qca83xx_probe,
++ .flags = PHY_IS_INTERNAL,
++ .config_init = qca83xx_config_init,
++ .soft_reset = genphy_soft_reset,
++ .get_sset_count = qca83xx_get_sset_count,
++ .get_strings = qca83xx_get_strings,
++ .get_stats = qca83xx_get_stats,
++ .suspend = qca8337_suspend,
++ .resume = qca83xx_resume,
++}, {
++ /* QCA8327-A from switch QCA8327-AL1A */
++ .phy_id = QCA8327_A_PHY_ID,
++ .phy_id_mask = QCA8K_PHY_ID_MASK,
++ .name = "Qualcomm Atheros 8327-A internal PHY",
++ /* PHY_GBIT_FEATURES */
++ .link_change_notify = qca83xx_link_change_notify,
++ .probe = qca83xx_probe,
++ .flags = PHY_IS_INTERNAL,
++ .config_init = qca8327_config_init,
++ .soft_reset = genphy_soft_reset,
++ .get_sset_count = qca83xx_get_sset_count,
++ .get_strings = qca83xx_get_strings,
++ .get_stats = qca83xx_get_stats,
++ .suspend = qca8327_suspend,
++ .resume = qca83xx_resume,
++}, {
++ /* QCA8327-B from switch QCA8327-BL1A */
++ .phy_id = QCA8327_B_PHY_ID,
++ .phy_id_mask = QCA8K_PHY_ID_MASK,
++ .name = "Qualcomm Atheros 8327-B internal PHY",
++ /* PHY_GBIT_FEATURES */
++ .link_change_notify = qca83xx_link_change_notify,
++ .probe = qca83xx_probe,
++ .flags = PHY_IS_INTERNAL,
++ .config_init = qca8327_config_init,
++ .soft_reset = genphy_soft_reset,
++ .get_sset_count = qca83xx_get_sset_count,
++ .get_strings = qca83xx_get_strings,
++ .get_stats = qca83xx_get_stats,
++ .suspend = qca8327_suspend,
++ .resume = qca83xx_resume,
++}, };
++
++module_phy_driver(qca83xx_driver);
++
++static struct mdio_device_id __maybe_unused qca83xx_tbl[] = {
++ { PHY_ID_MATCH_EXACT(QCA8337_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA8327_A_PHY_ID) },
++ { PHY_ID_MATCH_EXACT(QCA8327_B_PHY_ID) },
++ { }
++};
++
++MODULE_DEVICE_TABLE(mdio, qca83xx_tbl);
--- /dev/null
+From 249d2b80e4db0e38503ed0ec2af6c7401bc099b9 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Mon, 29 Jan 2024 15:15:22 +0100
+Subject: [PATCH 4/5] net: phy: qcom: move additional functions to shared
+ library
+
+Move additional functions to shared library in preparation for qca808x
+PHY Family to be detached from at803x driver.
+
+Only the shared defines are moved to the shared qcom.h header.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Link: https://lore.kernel.org/r/20240129141600.2592-5-ansuelsmth@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/phy/qcom/at803x.c | 426 +---------------------------
+ drivers/net/phy/qcom/qcom-phy-lib.c | 376 ++++++++++++++++++++++++
+ drivers/net/phy/qcom/qcom.h | 86 ++++++
+ 3 files changed, 463 insertions(+), 425 deletions(-)
+
+--- a/drivers/net/phy/qcom/at803x.c
++++ b/drivers/net/phy/qcom/at803x.c
+@@ -24,65 +24,11 @@
+
+ #include "qcom.h"
+
+-#define AT803X_SPECIFIC_FUNCTION_CONTROL 0x10
+-#define AT803X_SFC_ASSERT_CRS BIT(11)
+-#define AT803X_SFC_FORCE_LINK BIT(10)
+-#define AT803X_SFC_MDI_CROSSOVER_MODE_M GENMASK(6, 5)
+-#define AT803X_SFC_AUTOMATIC_CROSSOVER 0x3
+-#define AT803X_SFC_MANUAL_MDIX 0x1
+-#define AT803X_SFC_MANUAL_MDI 0x0
+-#define AT803X_SFC_SQE_TEST BIT(2)
+-#define AT803X_SFC_POLARITY_REVERSAL BIT(1)
+-#define AT803X_SFC_DISABLE_JABBER BIT(0)
+-
+-#define AT803X_SPECIFIC_STATUS 0x11
+-#define AT803X_SS_SPEED_MASK GENMASK(15, 14)
+-#define AT803X_SS_SPEED_1000 2
+-#define AT803X_SS_SPEED_100 1
+-#define AT803X_SS_SPEED_10 0
+-#define AT803X_SS_DUPLEX BIT(13)
+-#define AT803X_SS_SPEED_DUPLEX_RESOLVED BIT(11)
+-#define AT803X_SS_MDIX BIT(6)
+-
+-#define QCA808X_SS_SPEED_MASK GENMASK(9, 7)
+-#define QCA808X_SS_SPEED_2500 4
+-
+-#define AT803X_INTR_ENABLE 0x12
+-#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
+-#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)
+-#define AT803X_INTR_ENABLE_DUPLEX_CHANGED BIT(13)
+-#define AT803X_INTR_ENABLE_PAGE_RECEIVED BIT(12)
+-#define AT803X_INTR_ENABLE_LINK_FAIL BIT(11)
+-#define AT803X_INTR_ENABLE_LINK_SUCCESS BIT(10)
+-#define AT803X_INTR_ENABLE_LINK_FAIL_BX BIT(8)
+-#define AT803X_INTR_ENABLE_LINK_SUCCESS_BX BIT(7)
+-#define AT803X_INTR_ENABLE_WIRESPEED_DOWNGRADE BIT(5)
+-#define AT803X_INTR_ENABLE_POLARITY_CHANGED BIT(1)
+-#define AT803X_INTR_ENABLE_WOL BIT(0)
+-
+-#define AT803X_INTR_STATUS 0x13
+-
+-#define AT803X_SMART_SPEED 0x14
+-#define AT803X_SMART_SPEED_ENABLE BIT(5)
+-#define AT803X_SMART_SPEED_RETRY_LIMIT_MASK GENMASK(4, 2)
+-#define AT803X_SMART_SPEED_BYPASS_TIMER BIT(1)
+-#define AT803X_CDT 0x16
+-#define AT803X_CDT_MDI_PAIR_MASK GENMASK(9, 8)
+-#define AT803X_CDT_ENABLE_TEST BIT(0)
+-#define AT803X_CDT_STATUS 0x1c
+-#define AT803X_CDT_STATUS_STAT_NORMAL 0
+-#define AT803X_CDT_STATUS_STAT_SHORT 1
+-#define AT803X_CDT_STATUS_STAT_OPEN 2
+-#define AT803X_CDT_STATUS_STAT_FAIL 3
+-#define AT803X_CDT_STATUS_STAT_MASK GENMASK(9, 8)
+-#define AT803X_CDT_STATUS_DELTA_TIME_MASK GENMASK(7, 0)
+ #define AT803X_LED_CONTROL 0x18
+
+ #define AT803X_PHY_MMD3_WOL_CTRL 0x8012
+ #define AT803X_WOL_EN BIT(5)
+-#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
+-#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
+-#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
++
+ #define AT803X_REG_CHIP_CONFIG 0x1f
+ #define AT803X_BT_BX_REG_SEL 0x8000
+
+@@ -138,10 +84,6 @@
+ #define AT803X_CLK_OUT_STRENGTH_HALF 1
+ #define AT803X_CLK_OUT_STRENGTH_QUARTER 2
+
+-#define AT803X_DEFAULT_DOWNSHIFT 5
+-#define AT803X_MIN_DOWNSHIFT 2
+-#define AT803X_MAX_DOWNSHIFT 9
+-
+ #define AT803X_MMD3_SMARTEEE_CTL1 0x805b
+ #define AT803X_MMD3_SMARTEEE_CTL2 0x805c
+ #define AT803X_MMD3_SMARTEEE_CTL3 0x805d
+@@ -366,11 +308,6 @@ MODULE_DESCRIPTION("Qualcomm Atheros AR8
+ MODULE_AUTHOR("Matus Ujhelyi");
+ MODULE_LICENSE("GPL");
+
+-struct at803x_ss_mask {
+- u16 speed_mask;
+- u8 speed_shift;
+-};
+-
+ struct at803x_priv {
+ int flags;
+ u16 clk_25m_reg;
+@@ -470,80 +407,6 @@ static void at803x_context_restore(struc
+ phy_write(phydev, AT803X_LED_CONTROL, context->led_control);
+ }
+
+-static int at803x_set_wol(struct phy_device *phydev,
+- struct ethtool_wolinfo *wol)
+-{
+- int ret, irq_enabled;
+-
+- if (wol->wolopts & WAKE_MAGIC) {
+- struct net_device *ndev = phydev->attached_dev;
+- const u8 *mac;
+- unsigned int i;
+- static const unsigned int offsets[] = {
+- AT803X_LOC_MAC_ADDR_32_47_OFFSET,
+- AT803X_LOC_MAC_ADDR_16_31_OFFSET,
+- AT803X_LOC_MAC_ADDR_0_15_OFFSET,
+- };
+-
+- if (!ndev)
+- return -ENODEV;
+-
+- mac = (const u8 *)ndev->dev_addr;
+-
+- if (!is_valid_ether_addr(mac))
+- return -EINVAL;
+-
+- for (i = 0; i < 3; i++)
+- phy_write_mmd(phydev, MDIO_MMD_PCS, offsets[i],
+- mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
+-
+- /* Enable WOL interrupt */
+- ret = phy_modify(phydev, AT803X_INTR_ENABLE, 0, AT803X_INTR_ENABLE_WOL);
+- if (ret)
+- return ret;
+- } else {
+- /* Disable WOL interrupt */
+- ret = phy_modify(phydev, AT803X_INTR_ENABLE, AT803X_INTR_ENABLE_WOL, 0);
+- if (ret)
+- return ret;
+- }
+-
+- /* Clear WOL status */
+- ret = phy_read(phydev, AT803X_INTR_STATUS);
+- if (ret < 0)
+- return ret;
+-
+- /* Check if there are other interrupts except for WOL triggered when PHY is
+- * in interrupt mode, only the interrupts enabled by AT803X_INTR_ENABLE can
+- * be passed up to the interrupt PIN.
+- */
+- irq_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
+- if (irq_enabled < 0)
+- return irq_enabled;
+-
+- irq_enabled &= ~AT803X_INTR_ENABLE_WOL;
+- if (ret & irq_enabled && !phy_polling_mode(phydev))
+- phy_trigger_machine(phydev);
+-
+- return 0;
+-}
+-
+-static void at803x_get_wol(struct phy_device *phydev,
+- struct ethtool_wolinfo *wol)
+-{
+- int value;
+-
+- wol->supported = WAKE_MAGIC;
+- wol->wolopts = 0;
+-
+- value = phy_read(phydev, AT803X_INTR_ENABLE);
+- if (value < 0)
+- return;
+-
+- if (value & AT803X_INTR_ENABLE_WOL)
+- wol->wolopts |= WAKE_MAGIC;
+-}
+-
+ static int at803x_suspend(struct phy_device *phydev)
+ {
+ int value;
+@@ -816,73 +679,6 @@ static int at803x_config_init(struct phy
+ return phy_modify(phydev, MII_ADVERTISE, MDIO_AN_CTRL1_XNP, 0);
+ }
+
+-static int at803x_ack_interrupt(struct phy_device *phydev)
+-{
+- int err;
+-
+- err = phy_read(phydev, AT803X_INTR_STATUS);
+-
+- return (err < 0) ? err : 0;
+-}
+-
+-static int at803x_config_intr(struct phy_device *phydev)
+-{
+- int err;
+- int value;
+-
+- value = phy_read(phydev, AT803X_INTR_ENABLE);
+-
+- if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+- /* Clear any pending interrupts */
+- err = at803x_ack_interrupt(phydev);
+- if (err)
+- return err;
+-
+- value |= AT803X_INTR_ENABLE_AUTONEG_ERR;
+- value |= AT803X_INTR_ENABLE_SPEED_CHANGED;
+- value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
+- value |= AT803X_INTR_ENABLE_LINK_FAIL;
+- value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
+-
+- err = phy_write(phydev, AT803X_INTR_ENABLE, value);
+- } else {
+- err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
+- if (err)
+- return err;
+-
+- /* Clear any pending interrupts */
+- err = at803x_ack_interrupt(phydev);
+- }
+-
+- return err;
+-}
+-
+-static irqreturn_t at803x_handle_interrupt(struct phy_device *phydev)
+-{
+- int irq_status, int_enabled;
+-
+- irq_status = phy_read(phydev, AT803X_INTR_STATUS);
+- if (irq_status < 0) {
+- phy_error(phydev);
+- return IRQ_NONE;
+- }
+-
+- /* Read the current enabled interrupts */
+- int_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
+- if (int_enabled < 0) {
+- phy_error(phydev);
+- return IRQ_NONE;
+- }
+-
+- /* See if this was one of our enabled interrupts */
+- if (!(irq_status & int_enabled))
+- return IRQ_NONE;
+-
+- phy_trigger_machine(phydev);
+-
+- return IRQ_HANDLED;
+-}
+-
+ static void at803x_link_change_notify(struct phy_device *phydev)
+ {
+ /*
+@@ -908,69 +704,6 @@ static void at803x_link_change_notify(st
+ }
+ }
+
+-static int at803x_read_specific_status(struct phy_device *phydev,
+- struct at803x_ss_mask ss_mask)
+-{
+- int ss;
+-
+- /* Read the AT8035 PHY-Specific Status register, which indicates the
+- * speed and duplex that the PHY is actually using, irrespective of
+- * whether we are in autoneg mode or not.
+- */
+- ss = phy_read(phydev, AT803X_SPECIFIC_STATUS);
+- if (ss < 0)
+- return ss;
+-
+- if (ss & AT803X_SS_SPEED_DUPLEX_RESOLVED) {
+- int sfc, speed;
+-
+- sfc = phy_read(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL);
+- if (sfc < 0)
+- return sfc;
+-
+- speed = ss & ss_mask.speed_mask;
+- speed >>= ss_mask.speed_shift;
+-
+- switch (speed) {
+- case AT803X_SS_SPEED_10:
+- phydev->speed = SPEED_10;
+- break;
+- case AT803X_SS_SPEED_100:
+- phydev->speed = SPEED_100;
+- break;
+- case AT803X_SS_SPEED_1000:
+- phydev->speed = SPEED_1000;
+- break;
+- case QCA808X_SS_SPEED_2500:
+- phydev->speed = SPEED_2500;
+- break;
+- }
+- if (ss & AT803X_SS_DUPLEX)
+- phydev->duplex = DUPLEX_FULL;
+- else
+- phydev->duplex = DUPLEX_HALF;
+-
+- if (ss & AT803X_SS_MDIX)
+- phydev->mdix = ETH_TP_MDI_X;
+- else
+- phydev->mdix = ETH_TP_MDI;
+-
+- switch (FIELD_GET(AT803X_SFC_MDI_CROSSOVER_MODE_M, sfc)) {
+- case AT803X_SFC_MANUAL_MDI:
+- phydev->mdix_ctrl = ETH_TP_MDI;
+- break;
+- case AT803X_SFC_MANUAL_MDIX:
+- phydev->mdix_ctrl = ETH_TP_MDI_X;
+- break;
+- case AT803X_SFC_AUTOMATIC_CROSSOVER:
+- phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+- break;
+- }
+- }
+-
+- return 0;
+-}
+-
+ static int at803x_read_status(struct phy_device *phydev)
+ {
+ struct at803x_ss_mask ss_mask = { 0 };
+@@ -1006,50 +739,6 @@ static int at803x_read_status(struct phy
+ return 0;
+ }
+
+-static int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
+-{
+- u16 val;
+-
+- switch (ctrl) {
+- case ETH_TP_MDI:
+- val = AT803X_SFC_MANUAL_MDI;
+- break;
+- case ETH_TP_MDI_X:
+- val = AT803X_SFC_MANUAL_MDIX;
+- break;
+- case ETH_TP_MDI_AUTO:
+- val = AT803X_SFC_AUTOMATIC_CROSSOVER;
+- break;
+- default:
+- return 0;
+- }
+-
+- return phy_modify_changed(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL,
+- AT803X_SFC_MDI_CROSSOVER_MODE_M,
+- FIELD_PREP(AT803X_SFC_MDI_CROSSOVER_MODE_M, val));
+-}
+-
+-static int at803x_prepare_config_aneg(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
+- if (ret < 0)
+- return ret;
+-
+- /* Changes of the midx bits are disruptive to the normal operation;
+- * therefore any changes to these registers must be followed by a
+- * software reset to take effect.
+- */
+- if (ret == 1) {
+- ret = genphy_soft_reset(phydev);
+- if (ret < 0)
+- return ret;
+- }
+-
+- return 0;
+-}
+-
+ static int at803x_config_aneg(struct phy_device *phydev)
+ {
+ struct at803x_priv *priv = phydev->priv;
+@@ -1065,80 +754,6 @@ static int at803x_config_aneg(struct phy
+ return genphy_config_aneg(phydev);
+ }
+
+-static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
+-{
+- int val;
+-
+- val = phy_read(phydev, AT803X_SMART_SPEED);
+- if (val < 0)
+- return val;
+-
+- if (val & AT803X_SMART_SPEED_ENABLE)
+- *d = FIELD_GET(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, val) + 2;
+- else
+- *d = DOWNSHIFT_DEV_DISABLE;
+-
+- return 0;
+-}
+-
+-static int at803x_set_downshift(struct phy_device *phydev, u8 cnt)
+-{
+- u16 mask, set;
+- int ret;
+-
+- switch (cnt) {
+- case DOWNSHIFT_DEV_DEFAULT_COUNT:
+- cnt = AT803X_DEFAULT_DOWNSHIFT;
+- fallthrough;
+- case AT803X_MIN_DOWNSHIFT ... AT803X_MAX_DOWNSHIFT:
+- set = AT803X_SMART_SPEED_ENABLE |
+- AT803X_SMART_SPEED_BYPASS_TIMER |
+- FIELD_PREP(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, cnt - 2);
+- mask = AT803X_SMART_SPEED_RETRY_LIMIT_MASK;
+- break;
+- case DOWNSHIFT_DEV_DISABLE:
+- set = 0;
+- mask = AT803X_SMART_SPEED_ENABLE |
+- AT803X_SMART_SPEED_BYPASS_TIMER;
+- break;
+- default:
+- return -EINVAL;
+- }
+-
+- ret = phy_modify_changed(phydev, AT803X_SMART_SPEED, mask, set);
+-
+- /* After changing the smart speed settings, we need to perform a
+- * software reset, use phy_init_hw() to make sure we set the
+- * reapply any values which might got lost during software reset.
+- */
+- if (ret == 1)
+- ret = phy_init_hw(phydev);
+-
+- return ret;
+-}
+-
+-static int at803x_get_tunable(struct phy_device *phydev,
+- struct ethtool_tunable *tuna, void *data)
+-{
+- switch (tuna->id) {
+- case ETHTOOL_PHY_DOWNSHIFT:
+- return at803x_get_downshift(phydev, data);
+- default:
+- return -EOPNOTSUPP;
+- }
+-}
+-
+-static int at803x_set_tunable(struct phy_device *phydev,
+- struct ethtool_tunable *tuna, const void *data)
+-{
+- switch (tuna->id) {
+- case ETHTOOL_PHY_DOWNSHIFT:
+- return at803x_set_downshift(phydev, *(const u8 *)data);
+- default:
+- return -EOPNOTSUPP;
+- }
+-}
+-
+ static int at803x_cable_test_result_trans(u16 status)
+ {
+ switch (FIELD_GET(AT803X_CDT_STATUS_STAT_MASK, status)) {
+@@ -1170,45 +785,6 @@ static bool at803x_cdt_fault_length_vali
+ return false;
+ }
+
+-static int at803x_cdt_fault_length(int dt)
+-{
+- /* According to the datasheet the distance to the fault is
+- * DELTA_TIME * 0.824 meters.
+- *
+- * The author suspect the correct formula is:
+- *
+- * fault_distance = DELTA_TIME * (c * VF) / 125MHz / 2
+- *
+- * where c is the speed of light, VF is the velocity factor of
+- * the twisted pair cable, 125MHz the counter frequency and
+- * we need to divide by 2 because the hardware will measure the
+- * round trip time to the fault and back to the PHY.
+- *
+- * With a VF of 0.69 we get the factor 0.824 mentioned in the
+- * datasheet.
+- */
+- return (dt * 824) / 10;
+-}
+-
+-static int at803x_cdt_start(struct phy_device *phydev,
+- u32 cdt_start)
+-{
+- return phy_write(phydev, AT803X_CDT, cdt_start);
+-}
+-
+-static int at803x_cdt_wait_for_completion(struct phy_device *phydev,
+- u32 cdt_en)
+-{
+- int val, ret;
+-
+- /* One test run takes about 25ms */
+- ret = phy_read_poll_timeout(phydev, AT803X_CDT, val,
+- !(val & cdt_en),
+- 30000, 100000, true);
+-
+- return ret < 0 ? ret : 0;
+-}
+-
+ static int at803x_cable_test_one_pair(struct phy_device *phydev, int pair)
+ {
+ static const int ethtool_pair[] = {
+--- a/drivers/net/phy/qcom/qcom-phy-lib.c
++++ b/drivers/net/phy/qcom/qcom-phy-lib.c
+@@ -3,6 +3,9 @@
+ #include <linux/phy.h>
+ #include <linux/module.h>
+
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++
+ #include "qcom.h"
+
+ MODULE_DESCRIPTION("Qualcomm PHY driver Common Functions");
+@@ -51,3 +54,376 @@ int at803x_debug_reg_write(struct phy_de
+ return phy_write(phydev, AT803X_DEBUG_DATA, data);
+ }
+ EXPORT_SYMBOL_GPL(at803x_debug_reg_write);
++
++int at803x_set_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol)
++{
++ int ret, irq_enabled;
++
++ if (wol->wolopts & WAKE_MAGIC) {
++ struct net_device *ndev = phydev->attached_dev;
++ const u8 *mac;
++ unsigned int i;
++ static const unsigned int offsets[] = {
++ AT803X_LOC_MAC_ADDR_32_47_OFFSET,
++ AT803X_LOC_MAC_ADDR_16_31_OFFSET,
++ AT803X_LOC_MAC_ADDR_0_15_OFFSET,
++ };
++
++ if (!ndev)
++ return -ENODEV;
++
++ mac = (const u8 *)ndev->dev_addr;
++
++ if (!is_valid_ether_addr(mac))
++ return -EINVAL;
++
++ for (i = 0; i < 3; i++)
++ phy_write_mmd(phydev, MDIO_MMD_PCS, offsets[i],
++ mac[(i * 2) + 1] | (mac[(i * 2)] << 8));
++
++ /* Enable WOL interrupt */
++ ret = phy_modify(phydev, AT803X_INTR_ENABLE, 0, AT803X_INTR_ENABLE_WOL);
++ if (ret)
++ return ret;
++ } else {
++ /* Disable WOL interrupt */
++ ret = phy_modify(phydev, AT803X_INTR_ENABLE, AT803X_INTR_ENABLE_WOL, 0);
++ if (ret)
++ return ret;
++ }
++
++ /* Clear WOL status */
++ ret = phy_read(phydev, AT803X_INTR_STATUS);
++ if (ret < 0)
++ return ret;
++
++ /* Check if there are other interrupts except for WOL triggered when PHY is
++ * in interrupt mode, only the interrupts enabled by AT803X_INTR_ENABLE can
++ * be passed up to the interrupt PIN.
++ */
++ irq_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
++ if (irq_enabled < 0)
++ return irq_enabled;
++
++ irq_enabled &= ~AT803X_INTR_ENABLE_WOL;
++ if (ret & irq_enabled && !phy_polling_mode(phydev))
++ phy_trigger_machine(phydev);
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(at803x_set_wol);
++
++void at803x_get_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol)
++{
++ int value;
++
++ wol->supported = WAKE_MAGIC;
++ wol->wolopts = 0;
++
++ value = phy_read(phydev, AT803X_INTR_ENABLE);
++ if (value < 0)
++ return;
++
++ if (value & AT803X_INTR_ENABLE_WOL)
++ wol->wolopts |= WAKE_MAGIC;
++}
++EXPORT_SYMBOL_GPL(at803x_get_wol);
++
++int at803x_ack_interrupt(struct phy_device *phydev)
++{
++ int err;
++
++ err = phy_read(phydev, AT803X_INTR_STATUS);
++
++ return (err < 0) ? err : 0;
++}
++EXPORT_SYMBOL_GPL(at803x_ack_interrupt);
++
++int at803x_config_intr(struct phy_device *phydev)
++{
++ int err;
++ int value;
++
++ value = phy_read(phydev, AT803X_INTR_ENABLE);
++
++ if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
++ /* Clear any pending interrupts */
++ err = at803x_ack_interrupt(phydev);
++ if (err)
++ return err;
++
++ value |= AT803X_INTR_ENABLE_AUTONEG_ERR;
++ value |= AT803X_INTR_ENABLE_SPEED_CHANGED;
++ value |= AT803X_INTR_ENABLE_DUPLEX_CHANGED;
++ value |= AT803X_INTR_ENABLE_LINK_FAIL;
++ value |= AT803X_INTR_ENABLE_LINK_SUCCESS;
++
++ err = phy_write(phydev, AT803X_INTR_ENABLE, value);
++ } else {
++ err = phy_write(phydev, AT803X_INTR_ENABLE, 0);
++ if (err)
++ return err;
++
++ /* Clear any pending interrupts */
++ err = at803x_ack_interrupt(phydev);
++ }
++
++ return err;
++}
++EXPORT_SYMBOL_GPL(at803x_config_intr);
++
++irqreturn_t at803x_handle_interrupt(struct phy_device *phydev)
++{
++ int irq_status, int_enabled;
++
++ irq_status = phy_read(phydev, AT803X_INTR_STATUS);
++ if (irq_status < 0) {
++ phy_error(phydev);
++ return IRQ_NONE;
++ }
++
++ /* Read the current enabled interrupts */
++ int_enabled = phy_read(phydev, AT803X_INTR_ENABLE);
++ if (int_enabled < 0) {
++ phy_error(phydev);
++ return IRQ_NONE;
++ }
++
++ /* See if this was one of our enabled interrupts */
++ if (!(irq_status & int_enabled))
++ return IRQ_NONE;
++
++ phy_trigger_machine(phydev);
++
++ return IRQ_HANDLED;
++}
++EXPORT_SYMBOL_GPL(at803x_handle_interrupt);
++
++int at803x_read_specific_status(struct phy_device *phydev,
++ struct at803x_ss_mask ss_mask)
++{
++ int ss;
++
++ /* Read the AT8035 PHY-Specific Status register, which indicates the
++ * speed and duplex that the PHY is actually using, irrespective of
++ * whether we are in autoneg mode or not.
++ */
++ ss = phy_read(phydev, AT803X_SPECIFIC_STATUS);
++ if (ss < 0)
++ return ss;
++
++ if (ss & AT803X_SS_SPEED_DUPLEX_RESOLVED) {
++ int sfc, speed;
++
++ sfc = phy_read(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL);
++ if (sfc < 0)
++ return sfc;
++
++ speed = ss & ss_mask.speed_mask;
++ speed >>= ss_mask.speed_shift;
++
++ switch (speed) {
++ case AT803X_SS_SPEED_10:
++ phydev->speed = SPEED_10;
++ break;
++ case AT803X_SS_SPEED_100:
++ phydev->speed = SPEED_100;
++ break;
++ case AT803X_SS_SPEED_1000:
++ phydev->speed = SPEED_1000;
++ break;
++ case QCA808X_SS_SPEED_2500:
++ phydev->speed = SPEED_2500;
++ break;
++ }
++ if (ss & AT803X_SS_DUPLEX)
++ phydev->duplex = DUPLEX_FULL;
++ else
++ phydev->duplex = DUPLEX_HALF;
++
++ if (ss & AT803X_SS_MDIX)
++ phydev->mdix = ETH_TP_MDI_X;
++ else
++ phydev->mdix = ETH_TP_MDI;
++
++ switch (FIELD_GET(AT803X_SFC_MDI_CROSSOVER_MODE_M, sfc)) {
++ case AT803X_SFC_MANUAL_MDI:
++ phydev->mdix_ctrl = ETH_TP_MDI;
++ break;
++ case AT803X_SFC_MANUAL_MDIX:
++ phydev->mdix_ctrl = ETH_TP_MDI_X;
++ break;
++ case AT803X_SFC_AUTOMATIC_CROSSOVER:
++ phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
++ break;
++ }
++ }
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(at803x_read_specific_status);
++
++int at803x_config_mdix(struct phy_device *phydev, u8 ctrl)
++{
++ u16 val;
++
++ switch (ctrl) {
++ case ETH_TP_MDI:
++ val = AT803X_SFC_MANUAL_MDI;
++ break;
++ case ETH_TP_MDI_X:
++ val = AT803X_SFC_MANUAL_MDIX;
++ break;
++ case ETH_TP_MDI_AUTO:
++ val = AT803X_SFC_AUTOMATIC_CROSSOVER;
++ break;
++ default:
++ return 0;
++ }
++
++ return phy_modify_changed(phydev, AT803X_SPECIFIC_FUNCTION_CONTROL,
++ AT803X_SFC_MDI_CROSSOVER_MODE_M,
++ FIELD_PREP(AT803X_SFC_MDI_CROSSOVER_MODE_M, val));
++}
++EXPORT_SYMBOL_GPL(at803x_config_mdix);
++
++int at803x_prepare_config_aneg(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = at803x_config_mdix(phydev, phydev->mdix_ctrl);
++ if (ret < 0)
++ return ret;
++
++ /* Changes of the midx bits are disruptive to the normal operation;
++ * therefore any changes to these registers must be followed by a
++ * software reset to take effect.
++ */
++ if (ret == 1) {
++ ret = genphy_soft_reset(phydev);
++ if (ret < 0)
++ return ret;
++ }
++
++ return 0;
++}
++EXPORT_SYMBOL_GPL(at803x_prepare_config_aneg);
++
++static int at803x_get_downshift(struct phy_device *phydev, u8 *d)
++{
++ int val;
++
++ val = phy_read(phydev, AT803X_SMART_SPEED);
++ if (val < 0)
++ return val;
++
++ if (val & AT803X_SMART_SPEED_ENABLE)
++ *d = FIELD_GET(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, val) + 2;
++ else
++ *d = DOWNSHIFT_DEV_DISABLE;
++
++ return 0;
++}
++
++static int at803x_set_downshift(struct phy_device *phydev, u8 cnt)
++{
++ u16 mask, set;
++ int ret;
++
++ switch (cnt) {
++ case DOWNSHIFT_DEV_DEFAULT_COUNT:
++ cnt = AT803X_DEFAULT_DOWNSHIFT;
++ fallthrough;
++ case AT803X_MIN_DOWNSHIFT ... AT803X_MAX_DOWNSHIFT:
++ set = AT803X_SMART_SPEED_ENABLE |
++ AT803X_SMART_SPEED_BYPASS_TIMER |
++ FIELD_PREP(AT803X_SMART_SPEED_RETRY_LIMIT_MASK, cnt - 2);
++ mask = AT803X_SMART_SPEED_RETRY_LIMIT_MASK;
++ break;
++ case DOWNSHIFT_DEV_DISABLE:
++ set = 0;
++ mask = AT803X_SMART_SPEED_ENABLE |
++ AT803X_SMART_SPEED_BYPASS_TIMER;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ ret = phy_modify_changed(phydev, AT803X_SMART_SPEED, mask, set);
++
++ /* After changing the smart speed settings, we need to perform a
++ * software reset, use phy_init_hw() to make sure we set the
++ * reapply any values which might got lost during software reset.
++ */
++ if (ret == 1)
++ ret = phy_init_hw(phydev);
++
++ return ret;
++}
++
++int at803x_get_tunable(struct phy_device *phydev,
++ struct ethtool_tunable *tuna, void *data)
++{
++ switch (tuna->id) {
++ case ETHTOOL_PHY_DOWNSHIFT:
++ return at803x_get_downshift(phydev, data);
++ default:
++ return -EOPNOTSUPP;
++ }
++}
++EXPORT_SYMBOL_GPL(at803x_get_tunable);
++
++int at803x_set_tunable(struct phy_device *phydev,
++ struct ethtool_tunable *tuna, const void *data)
++{
++ switch (tuna->id) {
++ case ETHTOOL_PHY_DOWNSHIFT:
++ return at803x_set_downshift(phydev, *(const u8 *)data);
++ default:
++ return -EOPNOTSUPP;
++ }
++}
++EXPORT_SYMBOL_GPL(at803x_set_tunable);
++
++int at803x_cdt_fault_length(int dt)
++{
++ /* According to the datasheet the distance to the fault is
++ * DELTA_TIME * 0.824 meters.
++ *
++ * The author suspect the correct formula is:
++ *
++ * fault_distance = DELTA_TIME * (c * VF) / 125MHz / 2
++ *
++ * where c is the speed of light, VF is the velocity factor of
++ * the twisted pair cable, 125MHz the counter frequency and
++ * we need to divide by 2 because the hardware will measure the
++ * round trip time to the fault and back to the PHY.
++ *
++ * With a VF of 0.69 we get the factor 0.824 mentioned in the
++ * datasheet.
++ */
++ return (dt * 824) / 10;
++}
++EXPORT_SYMBOL_GPL(at803x_cdt_fault_length);
++
++int at803x_cdt_start(struct phy_device *phydev, u32 cdt_start)
++{
++ return phy_write(phydev, AT803X_CDT, cdt_start);
++}
++EXPORT_SYMBOL_GPL(at803x_cdt_start);
++
++int at803x_cdt_wait_for_completion(struct phy_device *phydev,
++ u32 cdt_en)
++{
++ int val, ret;
++
++ /* One test run takes about 25ms */
++ ret = phy_read_poll_timeout(phydev, AT803X_CDT, val,
++ !(val & cdt_en),
++ 30000, 100000, true);
++
++ return ret < 0 ? ret : 0;
++}
++EXPORT_SYMBOL_GPL(at803x_cdt_wait_for_completion);
+--- a/drivers/net/phy/qcom/qcom.h
++++ b/drivers/net/phy/qcom/qcom.h
+@@ -1,5 +1,63 @@
+ /* SPDX-License-Identifier: GPL-2.0 */
+
++#define AT803X_SPECIFIC_FUNCTION_CONTROL 0x10
++#define AT803X_SFC_ASSERT_CRS BIT(11)
++#define AT803X_SFC_FORCE_LINK BIT(10)
++#define AT803X_SFC_MDI_CROSSOVER_MODE_M GENMASK(6, 5)
++#define AT803X_SFC_AUTOMATIC_CROSSOVER 0x3
++#define AT803X_SFC_MANUAL_MDIX 0x1
++#define AT803X_SFC_MANUAL_MDI 0x0
++#define AT803X_SFC_SQE_TEST BIT(2)
++#define AT803X_SFC_POLARITY_REVERSAL BIT(1)
++#define AT803X_SFC_DISABLE_JABBER BIT(0)
++
++#define AT803X_SPECIFIC_STATUS 0x11
++#define AT803X_SS_SPEED_MASK GENMASK(15, 14)
++#define AT803X_SS_SPEED_1000 2
++#define AT803X_SS_SPEED_100 1
++#define AT803X_SS_SPEED_10 0
++#define AT803X_SS_DUPLEX BIT(13)
++#define AT803X_SS_SPEED_DUPLEX_RESOLVED BIT(11)
++#define AT803X_SS_MDIX BIT(6)
++
++#define QCA808X_SS_SPEED_MASK GENMASK(9, 7)
++#define QCA808X_SS_SPEED_2500 4
++
++#define AT803X_INTR_ENABLE 0x12
++#define AT803X_INTR_ENABLE_AUTONEG_ERR BIT(15)
++#define AT803X_INTR_ENABLE_SPEED_CHANGED BIT(14)
++#define AT803X_INTR_ENABLE_DUPLEX_CHANGED BIT(13)
++#define AT803X_INTR_ENABLE_PAGE_RECEIVED BIT(12)
++#define AT803X_INTR_ENABLE_LINK_FAIL BIT(11)
++#define AT803X_INTR_ENABLE_LINK_SUCCESS BIT(10)
++#define AT803X_INTR_ENABLE_LINK_FAIL_BX BIT(8)
++#define AT803X_INTR_ENABLE_LINK_SUCCESS_BX BIT(7)
++#define AT803X_INTR_ENABLE_WIRESPEED_DOWNGRADE BIT(5)
++#define AT803X_INTR_ENABLE_POLARITY_CHANGED BIT(1)
++#define AT803X_INTR_ENABLE_WOL BIT(0)
++
++#define AT803X_INTR_STATUS 0x13
++
++#define AT803X_SMART_SPEED 0x14
++#define AT803X_SMART_SPEED_ENABLE BIT(5)
++#define AT803X_SMART_SPEED_RETRY_LIMIT_MASK GENMASK(4, 2)
++#define AT803X_SMART_SPEED_BYPASS_TIMER BIT(1)
++
++#define AT803X_CDT 0x16
++#define AT803X_CDT_MDI_PAIR_MASK GENMASK(9, 8)
++#define AT803X_CDT_ENABLE_TEST BIT(0)
++#define AT803X_CDT_STATUS 0x1c
++#define AT803X_CDT_STATUS_STAT_NORMAL 0
++#define AT803X_CDT_STATUS_STAT_SHORT 1
++#define AT803X_CDT_STATUS_STAT_OPEN 2
++#define AT803X_CDT_STATUS_STAT_FAIL 3
++#define AT803X_CDT_STATUS_STAT_MASK GENMASK(9, 8)
++#define AT803X_CDT_STATUS_DELTA_TIME_MASK GENMASK(7, 0)
++
++#define AT803X_LOC_MAC_ADDR_0_15_OFFSET 0x804C
++#define AT803X_LOC_MAC_ADDR_16_31_OFFSET 0x804B
++#define AT803X_LOC_MAC_ADDR_32_47_OFFSET 0x804A
++
+ #define AT803X_DEBUG_ADDR 0x1D
+ #define AT803X_DEBUG_DATA 0x1E
+
+@@ -16,6 +74,10 @@
+ #define AT803X_DEBUG_HIB_CTRL_EN_ANY_CHANGE BIT(13)
+ #define AT803X_DEBUG_HIB_CTRL_PS_HIB_EN BIT(15)
+
++#define AT803X_DEFAULT_DOWNSHIFT 5
++#define AT803X_MIN_DOWNSHIFT 2
++#define AT803X_MAX_DOWNSHIFT 9
++
+ enum stat_access_type {
+ PHY,
+ MMD
+@@ -28,7 +90,31 @@ struct at803x_hw_stat {
+ enum stat_access_type access_type;
+ };
+
++struct at803x_ss_mask {
++ u16 speed_mask;
++ u8 speed_shift;
++};
++
+ int at803x_debug_reg_read(struct phy_device *phydev, u16 reg);
+ int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
+ u16 clear, u16 set);
+ int at803x_debug_reg_write(struct phy_device *phydev, u16 reg, u16 data);
++int at803x_set_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol);
++void at803x_get_wol(struct phy_device *phydev,
++ struct ethtool_wolinfo *wol);
++int at803x_ack_interrupt(struct phy_device *phydev);
++int at803x_config_intr(struct phy_device *phydev);
++irqreturn_t at803x_handle_interrupt(struct phy_device *phydev);
++int at803x_read_specific_status(struct phy_device *phydev,
++ struct at803x_ss_mask ss_mask);
++int at803x_config_mdix(struct phy_device *phydev, u8 ctrl);
++int at803x_prepare_config_aneg(struct phy_device *phydev);
++int at803x_get_tunable(struct phy_device *phydev,
++ struct ethtool_tunable *tuna, void *data);
++int at803x_set_tunable(struct phy_device *phydev,
++ struct ethtool_tunable *tuna, const void *data);
++int at803x_cdt_fault_length(int dt);
++int at803x_cdt_start(struct phy_device *phydev, u32 cdt_start);
++int at803x_cdt_wait_for_completion(struct phy_device *phydev,
++ u32 cdt_en);
--- /dev/null
+From c89414adf2ec7cd9e7080c419aa5847f1db1009c Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth@gmail.com>
+Date: Mon, 29 Jan 2024 15:15:23 +0100
+Subject: [PATCH 5/5] net: phy: qcom: detach qca808x PHY driver from at803x
+
+Almost all the QCA8081 PHY driver OPs are specific and only some of them
+use the generic at803x.
+
+To make the at803x code slimmer, move all the specific qca808x regs and
+functions to a dedicated PHY driver.
+
+Probe function and priv struct is reworked to allocate and use only the
+qca808x specific data. Unused data from at803x PHY driver are dropped
+from at803x priv struct.
+
+Also a new Kconfig is introduced QCA808X_PHY, to compile the newly
+introduced PHY driver for QCA8081 PHY.
+
+As the Kconfig name starts with Qualcomm the same order is kept.
+
+Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Link: https://lore.kernel.org/r/20240129141600.2592-6-ansuelsmth@gmail.com
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/phy/qcom/Kconfig | 6 +
+ drivers/net/phy/qcom/Makefile | 1 +
+ drivers/net/phy/qcom/at803x.c | 897 +------------------------------
+ drivers/net/phy/qcom/qca808x.c | 934 +++++++++++++++++++++++++++++++++
+ 4 files changed, 942 insertions(+), 896 deletions(-)
+ create mode 100644 drivers/net/phy/qcom/qca808x.c
+
+--- a/drivers/net/phy/qcom/Kconfig
++++ b/drivers/net/phy/qcom/Kconfig
+@@ -14,3 +14,9 @@ config QCA83XX_PHY
+ select QCOM_NET_PHYLIB
+ help
+ Currently supports the internal QCA8337(Internal qca8k PHY) model
++
++config QCA808X_PHY
++ tristate "Qualcomm QCA808x PHYs"
++ select QCOM_NET_PHYLIB
++ help
++ Currently supports the QCA8081 model
+--- a/drivers/net/phy/qcom/Makefile
++++ b/drivers/net/phy/qcom/Makefile
+@@ -2,3 +2,4 @@
+ obj-$(CONFIG_QCOM_NET_PHYLIB) += qcom-phy-lib.o
+ obj-$(CONFIG_AT803X_PHY) += at803x.o
+ obj-$(CONFIG_QCA83XX_PHY) += qca83xx.o
++obj-$(CONFIG_QCA808X_PHY) += qca808x.o
+--- a/drivers/net/phy/qcom/at803x.c
++++ b/drivers/net/phy/qcom/at803x.c
+@@ -96,8 +96,6 @@
+ #define ATH8035_PHY_ID 0x004dd072
+ #define AT8030_PHY_ID_MASK 0xffffffef
+
+-#define QCA8081_PHY_ID 0x004dd101
+-
+ #define QCA9561_PHY_ID 0x004dd042
+
+ #define AT803X_PAGE_FIBER 0
+@@ -110,201 +108,7 @@
+ /* disable hibernation mode */
+ #define AT803X_DISABLE_HIBERNATION_MODE BIT(2)
+
+-/* ADC threshold */
+-#define QCA808X_PHY_DEBUG_ADC_THRESHOLD 0x2c80
+-#define QCA808X_ADC_THRESHOLD_MASK GENMASK(7, 0)
+-#define QCA808X_ADC_THRESHOLD_80MV 0
+-#define QCA808X_ADC_THRESHOLD_100MV 0xf0
+-#define QCA808X_ADC_THRESHOLD_200MV 0x0f
+-#define QCA808X_ADC_THRESHOLD_300MV 0xff
+-
+-/* CLD control */
+-#define QCA808X_PHY_MMD3_ADDR_CLD_CTRL7 0x8007
+-#define QCA808X_8023AZ_AFE_CTRL_MASK GENMASK(8, 4)
+-#define QCA808X_8023AZ_AFE_EN 0x90
+-
+-/* AZ control */
+-#define QCA808X_PHY_MMD3_AZ_TRAINING_CTRL 0x8008
+-#define QCA808X_MMD3_AZ_TRAINING_VAL 0x1c32
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB 0x8014
+-#define QCA808X_MSE_THRESHOLD_20DB_VALUE 0x529
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB 0x800E
+-#define QCA808X_MSE_THRESHOLD_17DB_VALUE 0x341
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB 0x801E
+-#define QCA808X_MSE_THRESHOLD_27DB_VALUE 0x419
+-
+-#define QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB 0x8020
+-#define QCA808X_MSE_THRESHOLD_28DB_VALUE 0x341
+-
+-#define QCA808X_PHY_MMD7_TOP_OPTION1 0x901c
+-#define QCA808X_TOP_OPTION1_DATA 0x0
+-
+-#define QCA808X_PHY_MMD3_DEBUG_1 0xa100
+-#define QCA808X_MMD3_DEBUG_1_VALUE 0x9203
+-#define QCA808X_PHY_MMD3_DEBUG_2 0xa101
+-#define QCA808X_MMD3_DEBUG_2_VALUE 0x48ad
+-#define QCA808X_PHY_MMD3_DEBUG_3 0xa103
+-#define QCA808X_MMD3_DEBUG_3_VALUE 0x1698
+-#define QCA808X_PHY_MMD3_DEBUG_4 0xa105
+-#define QCA808X_MMD3_DEBUG_4_VALUE 0x8001
+-#define QCA808X_PHY_MMD3_DEBUG_5 0xa106
+-#define QCA808X_MMD3_DEBUG_5_VALUE 0x1111
+-#define QCA808X_PHY_MMD3_DEBUG_6 0xa011
+-#define QCA808X_MMD3_DEBUG_6_VALUE 0x5f85
+-
+-/* master/slave seed config */
+-#define QCA808X_PHY_DEBUG_LOCAL_SEED 9
+-#define QCA808X_MASTER_SLAVE_SEED_ENABLE BIT(1)
+-#define QCA808X_MASTER_SLAVE_SEED_CFG GENMASK(12, 2)
+-#define QCA808X_MASTER_SLAVE_SEED_RANGE 0x32
+-
+-/* Hibernation yields lower power consumpiton in contrast with normal operation mode.
+- * when the copper cable is unplugged, the PHY enters into hibernation mode in about 10s.
+- */
+-#define QCA808X_DBG_AN_TEST 0xb
+-#define QCA808X_HIBERNATION_EN BIT(15)
+-
+-#define QCA808X_CDT_ENABLE_TEST BIT(15)
+-#define QCA808X_CDT_INTER_CHECK_DIS BIT(13)
+-#define QCA808X_CDT_STATUS BIT(11)
+-#define QCA808X_CDT_LENGTH_UNIT BIT(10)
+-
+-#define QCA808X_MMD3_CDT_STATUS 0x8064
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_A 0x8065
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_B 0x8066
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_C 0x8067
+-#define QCA808X_MMD3_CDT_DIAG_PAIR_D 0x8068
+-#define QCA808X_CDT_DIAG_LENGTH_SAME_SHORT GENMASK(15, 8)
+-#define QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT GENMASK(7, 0)
+-
+-#define QCA808X_CDT_CODE_PAIR_A GENMASK(15, 12)
+-#define QCA808X_CDT_CODE_PAIR_B GENMASK(11, 8)
+-#define QCA808X_CDT_CODE_PAIR_C GENMASK(7, 4)
+-#define QCA808X_CDT_CODE_PAIR_D GENMASK(3, 0)
+-
+-#define QCA808X_CDT_STATUS_STAT_TYPE GENMASK(1, 0)
+-#define QCA808X_CDT_STATUS_STAT_FAIL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 0)
+-#define QCA808X_CDT_STATUS_STAT_NORMAL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 1)
+-#define QCA808X_CDT_STATUS_STAT_SAME_OPEN FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 2)
+-#define QCA808X_CDT_STATUS_STAT_SAME_SHORT FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 3)
+-
+-#define QCA808X_CDT_STATUS_STAT_MDI GENMASK(3, 2)
+-#define QCA808X_CDT_STATUS_STAT_MDI1 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 1)
+-#define QCA808X_CDT_STATUS_STAT_MDI2 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 2)
+-#define QCA808X_CDT_STATUS_STAT_MDI3 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 3)
+-
+-/* NORMAL are MDI with type set to 0 */
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI1
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+- QCA808X_CDT_STATUS_STAT_MDI1)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+- QCA808X_CDT_STATUS_STAT_MDI1)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI2
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+- QCA808X_CDT_STATUS_STAT_MDI2)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+- QCA808X_CDT_STATUS_STAT_MDI2)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI3
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
+- QCA808X_CDT_STATUS_STAT_MDI3)
+-#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
+- QCA808X_CDT_STATUS_STAT_MDI3)
+-
+-/* Added for reference of existence but should be handled by wait_for_completion already */
+-#define QCA808X_CDT_STATUS_STAT_BUSY (BIT(1) | BIT(3))
+-
+-#define QCA808X_MMD7_LED_GLOBAL 0x8073
+-#define QCA808X_LED_BLINK_1 GENMASK(11, 6)
+-#define QCA808X_LED_BLINK_2 GENMASK(5, 0)
+-/* Values are the same for both BLINK_1 and BLINK_2 */
+-#define QCA808X_LED_BLINK_FREQ_MASK GENMASK(5, 3)
+-#define QCA808X_LED_BLINK_FREQ_2HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x0)
+-#define QCA808X_LED_BLINK_FREQ_4HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x1)
+-#define QCA808X_LED_BLINK_FREQ_8HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x2)
+-#define QCA808X_LED_BLINK_FREQ_16HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x3)
+-#define QCA808X_LED_BLINK_FREQ_32HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x4)
+-#define QCA808X_LED_BLINK_FREQ_64HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x5)
+-#define QCA808X_LED_BLINK_FREQ_128HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x6)
+-#define QCA808X_LED_BLINK_FREQ_256HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x7)
+-#define QCA808X_LED_BLINK_DUTY_MASK GENMASK(2, 0)
+-#define QCA808X_LED_BLINK_DUTY_50_50 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x0)
+-#define QCA808X_LED_BLINK_DUTY_75_25 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x1)
+-#define QCA808X_LED_BLINK_DUTY_25_75 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x2)
+-#define QCA808X_LED_BLINK_DUTY_33_67 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x3)
+-#define QCA808X_LED_BLINK_DUTY_67_33 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x4)
+-#define QCA808X_LED_BLINK_DUTY_17_83 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x5)
+-#define QCA808X_LED_BLINK_DUTY_83_17 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x6)
+-#define QCA808X_LED_BLINK_DUTY_8_92 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x7)
+-
+-#define QCA808X_MMD7_LED2_CTRL 0x8074
+-#define QCA808X_MMD7_LED2_FORCE_CTRL 0x8075
+-#define QCA808X_MMD7_LED1_CTRL 0x8076
+-#define QCA808X_MMD7_LED1_FORCE_CTRL 0x8077
+-#define QCA808X_MMD7_LED0_CTRL 0x8078
+-#define QCA808X_MMD7_LED_CTRL(x) (0x8078 - ((x) * 2))
+-
+-/* LED hw control pattern is the same for every LED */
+-#define QCA808X_LED_PATTERN_MASK GENMASK(15, 0)
+-#define QCA808X_LED_SPEED2500_ON BIT(15)
+-#define QCA808X_LED_SPEED2500_BLINK BIT(14)
+-/* Follow blink trigger even if duplex or speed condition doesn't match */
+-#define QCA808X_LED_BLINK_CHECK_BYPASS BIT(13)
+-#define QCA808X_LED_FULL_DUPLEX_ON BIT(12)
+-#define QCA808X_LED_HALF_DUPLEX_ON BIT(11)
+-#define QCA808X_LED_TX_BLINK BIT(10)
+-#define QCA808X_LED_RX_BLINK BIT(9)
+-#define QCA808X_LED_TX_ON_10MS BIT(8)
+-#define QCA808X_LED_RX_ON_10MS BIT(7)
+-#define QCA808X_LED_SPEED1000_ON BIT(6)
+-#define QCA808X_LED_SPEED100_ON BIT(5)
+-#define QCA808X_LED_SPEED10_ON BIT(4)
+-#define QCA808X_LED_COLLISION_BLINK BIT(3)
+-#define QCA808X_LED_SPEED1000_BLINK BIT(2)
+-#define QCA808X_LED_SPEED100_BLINK BIT(1)
+-#define QCA808X_LED_SPEED10_BLINK BIT(0)
+-
+-#define QCA808X_MMD7_LED0_FORCE_CTRL 0x8079
+-#define QCA808X_MMD7_LED_FORCE_CTRL(x) (0x8079 - ((x) * 2))
+-
+-/* LED force ctrl is the same for every LED
+- * No documentation exist for this, not even internal one
+- * with NDA as QCOM gives only info about configuring
+- * hw control pattern rules and doesn't indicate any way
+- * to force the LED to specific mode.
+- * These define comes from reverse and testing and maybe
+- * lack of some info or some info are not entirely correct.
+- * For the basic LED control and hw control these finding
+- * are enough to support LED control in all the required APIs.
+- *
+- * On doing some comparison with implementation with qca807x,
+- * it was found that it's 1:1 equal to it and confirms all the
+- * reverse done. It was also found further specification with the
+- * force mode and the blink modes.
+- */
+-#define QCA808X_LED_FORCE_EN BIT(15)
+-#define QCA808X_LED_FORCE_MODE_MASK GENMASK(14, 13)
+-#define QCA808X_LED_FORCE_BLINK_1 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x3)
+-#define QCA808X_LED_FORCE_BLINK_2 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x2)
+-#define QCA808X_LED_FORCE_ON FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x1)
+-#define QCA808X_LED_FORCE_OFF FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x0)
+-
+-#define QCA808X_MMD7_LED_POLARITY_CTRL 0x901a
+-/* QSDK sets by default 0x46 to this reg that sets BIT 6 for
+- * LED to active high. It's not clear what BIT 3 and BIT 4 does.
+- */
+-#define QCA808X_LED_ACTIVE_HIGH BIT(6)
+-
+-/* QCA808X 1G chip type */
+-#define QCA808X_PHY_MMD7_CHIP_TYPE 0x901d
+-#define QCA808X_PHY_CHIP_TYPE_1G BIT(0)
+-
+-#define QCA8081_PHY_SERDES_MMD1_FIFO_CTRL 0x9072
+-#define QCA8081_PHY_FIFO_RSTN BIT(11)
+-
+-MODULE_DESCRIPTION("Qualcomm Atheros AR803x and QCA808X PHY driver");
++MODULE_DESCRIPTION("Qualcomm Atheros AR803x PHY driver");
+ MODULE_AUTHOR("Matus Ujhelyi");
+ MODULE_LICENSE("GPL");
+
+@@ -318,7 +122,6 @@ struct at803x_priv {
+ bool is_1000basex;
+ struct regulator_dev *vddio_rdev;
+ struct regulator_dev *vddh_rdev;
+- int led_polarity_mode;
+ };
+
+ struct at803x_context {
+@@ -519,9 +322,6 @@ static int at803x_probe(struct phy_devic
+ if (!priv)
+ return -ENOMEM;
+
+- /* Init LED polarity mode to -1 */
+- priv->led_polarity_mode = -1;
+-
+ phydev->priv = priv;
+
+ ret = at803x_parse_dt(phydev);
+@@ -1216,672 +1016,6 @@ static int at8035_probe(struct phy_devic
+ return at8035_parse_dt(phydev);
+ }
+
+-static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* Enable fast retrain */
+- ret = genphy_c45_fast_retrain(phydev, true);
+- if (ret)
+- return ret;
+-
+- phy_write_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_TOP_OPTION1,
+- QCA808X_TOP_OPTION1_DATA);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB,
+- QCA808X_MSE_THRESHOLD_20DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB,
+- QCA808X_MSE_THRESHOLD_17DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB,
+- QCA808X_MSE_THRESHOLD_27DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB,
+- QCA808X_MSE_THRESHOLD_28DB_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_1,
+- QCA808X_MMD3_DEBUG_1_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_4,
+- QCA808X_MMD3_DEBUG_4_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_5,
+- QCA808X_MMD3_DEBUG_5_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_3,
+- QCA808X_MMD3_DEBUG_3_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_6,
+- QCA808X_MMD3_DEBUG_6_VALUE);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_2,
+- QCA808X_MMD3_DEBUG_2_VALUE);
+-
+- return 0;
+-}
+-
+-static int qca808x_phy_ms_seed_enable(struct phy_device *phydev, bool enable)
+-{
+- u16 seed_value;
+-
+- if (!enable)
+- return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
+- QCA808X_MASTER_SLAVE_SEED_ENABLE, 0);
+-
+- seed_value = prandom_u32_max(QCA808X_MASTER_SLAVE_SEED_RANGE);
+- return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
+- QCA808X_MASTER_SLAVE_SEED_CFG | QCA808X_MASTER_SLAVE_SEED_ENABLE,
+- FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value) |
+- QCA808X_MASTER_SLAVE_SEED_ENABLE);
+-}
+-
+-static bool qca808x_is_prefer_master(struct phy_device *phydev)
+-{
+- return (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_FORCE) ||
+- (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_PREFERRED);
+-}
+-
+-static bool qca808x_has_fast_retrain_or_slave_seed(struct phy_device *phydev)
+-{
+- return linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
+-}
+-
+-static int qca808x_config_init(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* Active adc&vga on 802.3az for the link 1000M and 100M */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_ADDR_CLD_CTRL7,
+- QCA808X_8023AZ_AFE_CTRL_MASK, QCA808X_8023AZ_AFE_EN);
+- if (ret)
+- return ret;
+-
+- /* Adjust the threshold on 802.3az for the link 1000M */
+- ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
+- QCA808X_PHY_MMD3_AZ_TRAINING_CTRL,
+- QCA808X_MMD3_AZ_TRAINING_VAL);
+- if (ret)
+- return ret;
+-
+- if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
+- /* Config the fast retrain for the link 2500M */
+- ret = qca808x_phy_fast_retrain_config(phydev);
+- if (ret)
+- return ret;
+-
+- ret = genphy_read_master_slave(phydev);
+- if (ret < 0)
+- return ret;
+-
+- if (!qca808x_is_prefer_master(phydev)) {
+- /* Enable seed and configure lower ramdom seed to make phy
+- * linked as slave mode.
+- */
+- ret = qca808x_phy_ms_seed_enable(phydev, true);
+- if (ret)
+- return ret;
+- }
+- }
+-
+- /* Configure adc threshold as 100mv for the link 10M */
+- return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_ADC_THRESHOLD,
+- QCA808X_ADC_THRESHOLD_MASK,
+- QCA808X_ADC_THRESHOLD_100MV);
+-}
+-
+-static int qca808x_read_status(struct phy_device *phydev)
+-{
+- struct at803x_ss_mask ss_mask = { 0 };
+- int ret;
+-
+- ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_STAT);
+- if (ret < 0)
+- return ret;
+-
+- linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->lp_advertising,
+- ret & MDIO_AN_10GBT_STAT_LP2_5G);
+-
+- ret = genphy_read_status(phydev);
+- if (ret)
+- return ret;
+-
+- /* qca8081 takes the different bits for speed value from at803x */
+- ss_mask.speed_mask = QCA808X_SS_SPEED_MASK;
+- ss_mask.speed_shift = __bf_shf(QCA808X_SS_SPEED_MASK);
+- ret = at803x_read_specific_status(phydev, ss_mask);
+- if (ret < 0)
+- return ret;
+-
+- if (phydev->link) {
+- if (phydev->speed == SPEED_2500)
+- phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
+- else
+- phydev->interface = PHY_INTERFACE_MODE_SGMII;
+- } else {
+- /* generate seed as a lower random value to make PHY linked as SLAVE easily,
+- * except for master/slave configuration fault detected or the master mode
+- * preferred.
+- *
+- * the reason for not putting this code into the function link_change_notify is
+- * the corner case where the link partner is also the qca8081 PHY and the seed
+- * value is configured as the same value, the link can't be up and no link change
+- * occurs.
+- */
+- if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
+- if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR ||
+- qca808x_is_prefer_master(phydev)) {
+- qca808x_phy_ms_seed_enable(phydev, false);
+- } else {
+- qca808x_phy_ms_seed_enable(phydev, true);
+- }
+- }
+- }
+-
+- return 0;
+-}
+-
+-static int qca808x_soft_reset(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = genphy_soft_reset(phydev);
+- if (ret < 0)
+- return ret;
+-
+- if (qca808x_has_fast_retrain_or_slave_seed(phydev))
+- ret = qca808x_phy_ms_seed_enable(phydev, true);
+-
+- return ret;
+-}
+-
+-static bool qca808x_cdt_fault_length_valid(int cdt_code)
+-{
+- switch (cdt_code) {
+- case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+- return true;
+- default:
+- return false;
+- }
+-}
+-
+-static int qca808x_cable_test_result_trans(int cdt_code)
+-{
+- switch (cdt_code) {
+- case QCA808X_CDT_STATUS_STAT_NORMAL:
+- return ETHTOOL_A_CABLE_RESULT_CODE_OK;
+- case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
+- return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
+- case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
+- return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+- case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+- return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
+- case QCA808X_CDT_STATUS_STAT_FAIL:
+- default:
+- return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
+- }
+-}
+-
+-static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair,
+- int result)
+-{
+- int val;
+- u32 cdt_length_reg = 0;
+-
+- switch (pair) {
+- case ETHTOOL_A_CABLE_PAIR_A:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_A;
+- break;
+- case ETHTOOL_A_CABLE_PAIR_B:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_B;
+- break;
+- case ETHTOOL_A_CABLE_PAIR_C:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_C;
+- break;
+- case ETHTOOL_A_CABLE_PAIR_D:
+- cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_D;
+- break;
+- default:
+- return -EINVAL;
+- }
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_PCS, cdt_length_reg);
+- if (val < 0)
+- return val;
+-
+- if (result == ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT)
+- val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_SAME_SHORT, val);
+- else
+- val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT, val);
+-
+- return at803x_cdt_fault_length(val);
+-}
+-
+-static int qca808x_cable_test_start(struct phy_device *phydev)
+-{
+- int ret;
+-
+- /* perform CDT with the following configs:
+- * 1. disable hibernation.
+- * 2. force PHY working in MDI mode.
+- * 3. for PHY working in 1000BaseT.
+- * 4. configure the threshold.
+- */
+-
+- ret = at803x_debug_reg_mask(phydev, QCA808X_DBG_AN_TEST, QCA808X_HIBERNATION_EN, 0);
+- if (ret < 0)
+- return ret;
+-
+- ret = at803x_config_mdix(phydev, ETH_TP_MDI);
+- if (ret < 0)
+- return ret;
+-
+- /* Force 1000base-T needs to configure PMA/PMD and MII_BMCR */
+- phydev->duplex = DUPLEX_FULL;
+- phydev->speed = SPEED_1000;
+- ret = genphy_c45_pma_setup_forced(phydev);
+- if (ret < 0)
+- return ret;
+-
+- ret = genphy_setup_forced(phydev);
+- if (ret < 0)
+- return ret;
+-
+- /* configure the thresholds for open, short, pair ok test */
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8074, 0xc040);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8076, 0xc040);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8077, 0xa060);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8078, 0xc050);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807a, 0xc060);
+- phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807e, 0xb060);
+-
+- return 0;
+-}
+-
+-static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
+- u16 status)
+-{
+- int length, result;
+- u16 pair_code;
+-
+- switch (pair) {
+- case ETHTOOL_A_CABLE_PAIR_A:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
+- break;
+- case ETHTOOL_A_CABLE_PAIR_B:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
+- break;
+- case ETHTOOL_A_CABLE_PAIR_C:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
+- break;
+- case ETHTOOL_A_CABLE_PAIR_D:
+- pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
+- break;
+- default:
+- return -EINVAL;
+- }
+-
+- result = qca808x_cable_test_result_trans(pair_code);
+- ethnl_cable_test_result(phydev, pair, result);
+-
+- if (qca808x_cdt_fault_length_valid(pair_code)) {
+- length = qca808x_cdt_fault_length(phydev, pair, result);
+- ethnl_cable_test_fault_length(phydev, pair, length);
+- }
+-
+- return 0;
+-}
+-
+-static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
+-{
+- int ret, val;
+-
+- *finished = false;
+-
+- val = QCA808X_CDT_ENABLE_TEST |
+- QCA808X_CDT_LENGTH_UNIT;
+- ret = at803x_cdt_start(phydev, val);
+- if (ret)
+- return ret;
+-
+- ret = at803x_cdt_wait_for_completion(phydev, QCA808X_CDT_ENABLE_TEST);
+- if (ret)
+- return ret;
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA808X_MMD3_CDT_STATUS);
+- if (val < 0)
+- return val;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
+- if (ret)
+- return ret;
+-
+- *finished = true;
+-
+- return 0;
+-}
+-
+-static int qca808x_get_features(struct phy_device *phydev)
+-{
+- int ret;
+-
+- ret = genphy_c45_pma_read_abilities(phydev);
+- if (ret)
+- return ret;
+-
+- /* The autoneg ability is not existed in bit3 of MMD7.1,
+- * but it is supported by qca808x PHY, so we add it here
+- * manually.
+- */
+- linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported);
+-
+- /* As for the qca8081 1G version chip, the 2500baseT ability is also
+- * existed in the bit0 of MMD1.21, we need to remove it manually if
+- * it is the qca8081 1G chip according to the bit0 of MMD7.0x901d.
+- */
+- ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_CHIP_TYPE);
+- if (ret < 0)
+- return ret;
+-
+- if (QCA808X_PHY_CHIP_TYPE_1G & ret)
+- linkmode_clear_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
+-
+- return 0;
+-}
+-
+-static int qca808x_config_aneg(struct phy_device *phydev)
+-{
+- int phy_ctrl = 0;
+- int ret;
+-
+- ret = at803x_prepare_config_aneg(phydev);
+- if (ret)
+- return ret;
+-
+- /* The reg MII_BMCR also needs to be configured for force mode, the
+- * genphy_config_aneg is also needed.
+- */
+- if (phydev->autoneg == AUTONEG_DISABLE)
+- genphy_c45_pma_setup_forced(phydev);
+-
+- if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
+- phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
+-
+- ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
+- MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
+- if (ret < 0)
+- return ret;
+-
+- return __genphy_config_aneg(phydev, ret);
+-}
+-
+-static void qca808x_link_change_notify(struct phy_device *phydev)
+-{
+- /* Assert interface sgmii fifo on link down, deassert it on link up,
+- * the interface device address is always phy address added by 1.
+- */
+- mdiobus_c45_modify_changed(phydev->mdio.bus, phydev->mdio.addr + 1,
+- MDIO_MMD_PMAPMD, QCA8081_PHY_SERDES_MMD1_FIFO_CTRL,
+- QCA8081_PHY_FIFO_RSTN,
+- phydev->link ? QCA8081_PHY_FIFO_RSTN : 0);
+-}
+-
+-static int qca808x_led_parse_netdev(struct phy_device *phydev, unsigned long rules,
+- u16 *offload_trigger)
+-{
+- /* Parsing specific to netdev trigger */
+- if (test_bit(TRIGGER_NETDEV_TX, &rules))
+- *offload_trigger |= QCA808X_LED_TX_BLINK;
+- if (test_bit(TRIGGER_NETDEV_RX, &rules))
+- *offload_trigger |= QCA808X_LED_RX_BLINK;
+- if (test_bit(TRIGGER_NETDEV_LINK_10, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED10_ON;
+- if (test_bit(TRIGGER_NETDEV_LINK_100, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED100_ON;
+- if (test_bit(TRIGGER_NETDEV_LINK_1000, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED1000_ON;
+- if (test_bit(TRIGGER_NETDEV_LINK_2500, &rules))
+- *offload_trigger |= QCA808X_LED_SPEED2500_ON;
+- if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &rules))
+- *offload_trigger |= QCA808X_LED_HALF_DUPLEX_ON;
+- if (test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &rules))
+- *offload_trigger |= QCA808X_LED_FULL_DUPLEX_ON;
+-
+- if (rules && !*offload_trigger)
+- return -EOPNOTSUPP;
+-
+- /* Enable BLINK_CHECK_BYPASS by default to make the LED
+- * blink even with duplex or speed mode not enabled.
+- */
+- *offload_trigger |= QCA808X_LED_BLINK_CHECK_BYPASS;
+-
+- return 0;
+-}
+-
+-static int qca808x_led_hw_control_enable(struct phy_device *phydev, u8 index)
+-{
+- u16 reg;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_FORCE_EN);
+-}
+-
+-static int qca808x_led_hw_is_supported(struct phy_device *phydev, u8 index,
+- unsigned long rules)
+-{
+- u16 offload_trigger = 0;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- return qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
+-}
+-
+-static int qca808x_led_hw_control_set(struct phy_device *phydev, u8 index,
+- unsigned long rules)
+-{
+- u16 reg, offload_trigger = 0;
+- int ret;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_CTRL(index);
+-
+- ret = qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
+- if (ret)
+- return ret;
+-
+- ret = qca808x_led_hw_control_enable(phydev, index);
+- if (ret)
+- return ret;
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_PATTERN_MASK,
+- offload_trigger);
+-}
+-
+-static bool qca808x_led_hw_control_status(struct phy_device *phydev, u8 index)
+-{
+- u16 reg;
+- int val;
+-
+- if (index > 2)
+- return false;
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
+-
+- return !(val & QCA808X_LED_FORCE_EN);
+-}
+-
+-static int qca808x_led_hw_control_get(struct phy_device *phydev, u8 index,
+- unsigned long *rules)
+-{
+- u16 reg;
+- int val;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- /* Check if we have hw control enabled */
+- if (qca808x_led_hw_control_status(phydev, index))
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_CTRL(index);
+-
+- val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
+- if (val & QCA808X_LED_TX_BLINK)
+- set_bit(TRIGGER_NETDEV_TX, rules);
+- if (val & QCA808X_LED_RX_BLINK)
+- set_bit(TRIGGER_NETDEV_RX, rules);
+- if (val & QCA808X_LED_SPEED10_ON)
+- set_bit(TRIGGER_NETDEV_LINK_10, rules);
+- if (val & QCA808X_LED_SPEED100_ON)
+- set_bit(TRIGGER_NETDEV_LINK_100, rules);
+- if (val & QCA808X_LED_SPEED1000_ON)
+- set_bit(TRIGGER_NETDEV_LINK_1000, rules);
+- if (val & QCA808X_LED_SPEED2500_ON)
+- set_bit(TRIGGER_NETDEV_LINK_2500, rules);
+- if (val & QCA808X_LED_HALF_DUPLEX_ON)
+- set_bit(TRIGGER_NETDEV_HALF_DUPLEX, rules);
+- if (val & QCA808X_LED_FULL_DUPLEX_ON)
+- set_bit(TRIGGER_NETDEV_FULL_DUPLEX, rules);
+-
+- return 0;
+-}
+-
+-static int qca808x_led_hw_control_reset(struct phy_device *phydev, u8 index)
+-{
+- u16 reg;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_CTRL(index);
+-
+- return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_PATTERN_MASK);
+-}
+-
+-static int qca808x_led_brightness_set(struct phy_device *phydev,
+- u8 index, enum led_brightness value)
+-{
+- u16 reg;
+- int ret;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- if (!value) {
+- ret = qca808x_led_hw_control_reset(phydev, index);
+- if (ret)
+- return ret;
+- }
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
+- QCA808X_LED_FORCE_EN | value ? QCA808X_LED_FORCE_ON :
+- QCA808X_LED_FORCE_OFF);
+-}
+-
+-static int qca808x_led_blink_set(struct phy_device *phydev, u8 index,
+- unsigned long *delay_on,
+- unsigned long *delay_off)
+-{
+- int ret;
+- u16 reg;
+-
+- if (index > 2)
+- return -EINVAL;
+-
+- reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
+-
+- /* Set blink to 50% off, 50% on at 4Hz by default */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_LED_GLOBAL,
+- QCA808X_LED_BLINK_FREQ_MASK | QCA808X_LED_BLINK_DUTY_MASK,
+- QCA808X_LED_BLINK_FREQ_4HZ | QCA808X_LED_BLINK_DUTY_50_50);
+- if (ret)
+- return ret;
+-
+- /* We use BLINK_1 for normal blinking */
+- ret = phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
+- QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
+- QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_BLINK_1);
+- if (ret)
+- return ret;
+-
+- /* We set blink to 4Hz, aka 250ms */
+- *delay_on = 250 / 2;
+- *delay_off = 250 / 2;
+-
+- return 0;
+-}
+-
+-static int qca808x_led_polarity_set(struct phy_device *phydev, int index,
+- unsigned long modes)
+-{
+- struct at803x_priv *priv = phydev->priv;
+- bool active_low = false;
+- u32 mode;
+-
+- for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) {
+- switch (mode) {
+- case PHY_LED_ACTIVE_LOW:
+- active_low = true;
+- break;
+- default:
+- return -EINVAL;
+- }
+- }
+-
+- /* PHY polarity is global and can't be set per LED.
+- * To detect this, check if last requested polarity mode
+- * match the new one.
+- */
+- if (priv->led_polarity_mode >= 0 &&
+- priv->led_polarity_mode != active_low) {
+- phydev_err(phydev, "PHY polarity is global. Mismatched polarity on different LED\n");
+- return -EINVAL;
+- }
+-
+- /* Save the last PHY polarity mode */
+- priv->led_polarity_mode = active_low;
+-
+- return phy_modify_mmd(phydev, MDIO_MMD_AN,
+- QCA808X_MMD7_LED_POLARITY_CTRL,
+- QCA808X_LED_ACTIVE_HIGH,
+- active_low ? 0 : QCA808X_LED_ACTIVE_HIGH);
+-}
+-
+ static struct phy_driver at803x_driver[] = {
+ {
+ /* Qualcomm Atheros AR8035 */
+@@ -1989,34 +1123,6 @@ static struct phy_driver at803x_driver[]
+ .read_status = at803x_read_status,
+ .soft_reset = genphy_soft_reset,
+ .config_aneg = at803x_config_aneg,
+-}, {
+- /* Qualcomm QCA8081 */
+- PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
+- .name = "Qualcomm QCA8081",
+- .flags = PHY_POLL_CABLE_TEST,
+- .probe = at803x_probe,
+- .config_intr = at803x_config_intr,
+- .handle_interrupt = at803x_handle_interrupt,
+- .get_tunable = at803x_get_tunable,
+- .set_tunable = at803x_set_tunable,
+- .set_wol = at803x_set_wol,
+- .get_wol = at803x_get_wol,
+- .get_features = qca808x_get_features,
+- .config_aneg = qca808x_config_aneg,
+- .suspend = genphy_suspend,
+- .resume = genphy_resume,
+- .read_status = qca808x_read_status,
+- .config_init = qca808x_config_init,
+- .soft_reset = qca808x_soft_reset,
+- .cable_test_start = qca808x_cable_test_start,
+- .cable_test_get_status = qca808x_cable_test_get_status,
+- .link_change_notify = qca808x_link_change_notify,
+- .led_brightness_set = qca808x_led_brightness_set,
+- .led_blink_set = qca808x_led_blink_set,
+- .led_hw_is_supported = qca808x_led_hw_is_supported,
+- .led_hw_control_set = qca808x_led_hw_control_set,
+- .led_hw_control_get = qca808x_led_hw_control_get,
+- .led_polarity_set = qca808x_led_polarity_set,
+ }, };
+
+ module_phy_driver(at803x_driver);
+@@ -2028,7 +1134,6 @@ static struct mdio_device_id __maybe_unu
+ { PHY_ID_MATCH_EXACT(ATH8035_PHY_ID) },
+ { PHY_ID_MATCH_EXACT(ATH9331_PHY_ID) },
+ { PHY_ID_MATCH_EXACT(QCA9561_PHY_ID) },
+- { PHY_ID_MATCH_EXACT(QCA8081_PHY_ID) },
+ { }
+ };
+
+--- /dev/null
++++ b/drivers/net/phy/qcom/qca808x.c
+@@ -0,0 +1,934 @@
++// SPDX-License-Identifier: GPL-2.0+
++
++#include <linux/phy.h>
++#include <linux/module.h>
++#include <linux/ethtool_netlink.h>
++
++#include "qcom.h"
++
++/* ADC threshold */
++#define QCA808X_PHY_DEBUG_ADC_THRESHOLD 0x2c80
++#define QCA808X_ADC_THRESHOLD_MASK GENMASK(7, 0)
++#define QCA808X_ADC_THRESHOLD_80MV 0
++#define QCA808X_ADC_THRESHOLD_100MV 0xf0
++#define QCA808X_ADC_THRESHOLD_200MV 0x0f
++#define QCA808X_ADC_THRESHOLD_300MV 0xff
++
++/* CLD control */
++#define QCA808X_PHY_MMD3_ADDR_CLD_CTRL7 0x8007
++#define QCA808X_8023AZ_AFE_CTRL_MASK GENMASK(8, 4)
++#define QCA808X_8023AZ_AFE_EN 0x90
++
++/* AZ control */
++#define QCA808X_PHY_MMD3_AZ_TRAINING_CTRL 0x8008
++#define QCA808X_MMD3_AZ_TRAINING_VAL 0x1c32
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB 0x8014
++#define QCA808X_MSE_THRESHOLD_20DB_VALUE 0x529
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB 0x800E
++#define QCA808X_MSE_THRESHOLD_17DB_VALUE 0x341
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB 0x801E
++#define QCA808X_MSE_THRESHOLD_27DB_VALUE 0x419
++
++#define QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB 0x8020
++#define QCA808X_MSE_THRESHOLD_28DB_VALUE 0x341
++
++#define QCA808X_PHY_MMD7_TOP_OPTION1 0x901c
++#define QCA808X_TOP_OPTION1_DATA 0x0
++
++#define QCA808X_PHY_MMD3_DEBUG_1 0xa100
++#define QCA808X_MMD3_DEBUG_1_VALUE 0x9203
++#define QCA808X_PHY_MMD3_DEBUG_2 0xa101
++#define QCA808X_MMD3_DEBUG_2_VALUE 0x48ad
++#define QCA808X_PHY_MMD3_DEBUG_3 0xa103
++#define QCA808X_MMD3_DEBUG_3_VALUE 0x1698
++#define QCA808X_PHY_MMD3_DEBUG_4 0xa105
++#define QCA808X_MMD3_DEBUG_4_VALUE 0x8001
++#define QCA808X_PHY_MMD3_DEBUG_5 0xa106
++#define QCA808X_MMD3_DEBUG_5_VALUE 0x1111
++#define QCA808X_PHY_MMD3_DEBUG_6 0xa011
++#define QCA808X_MMD3_DEBUG_6_VALUE 0x5f85
++
++/* master/slave seed config */
++#define QCA808X_PHY_DEBUG_LOCAL_SEED 9
++#define QCA808X_MASTER_SLAVE_SEED_ENABLE BIT(1)
++#define QCA808X_MASTER_SLAVE_SEED_CFG GENMASK(12, 2)
++#define QCA808X_MASTER_SLAVE_SEED_RANGE 0x32
++
++/* Hibernation yields lower power consumpiton in contrast with normal operation mode.
++ * when the copper cable is unplugged, the PHY enters into hibernation mode in about 10s.
++ */
++#define QCA808X_DBG_AN_TEST 0xb
++#define QCA808X_HIBERNATION_EN BIT(15)
++
++#define QCA808X_CDT_ENABLE_TEST BIT(15)
++#define QCA808X_CDT_INTER_CHECK_DIS BIT(13)
++#define QCA808X_CDT_STATUS BIT(11)
++#define QCA808X_CDT_LENGTH_UNIT BIT(10)
++
++#define QCA808X_MMD3_CDT_STATUS 0x8064
++#define QCA808X_MMD3_CDT_DIAG_PAIR_A 0x8065
++#define QCA808X_MMD3_CDT_DIAG_PAIR_B 0x8066
++#define QCA808X_MMD3_CDT_DIAG_PAIR_C 0x8067
++#define QCA808X_MMD3_CDT_DIAG_PAIR_D 0x8068
++#define QCA808X_CDT_DIAG_LENGTH_SAME_SHORT GENMASK(15, 8)
++#define QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT GENMASK(7, 0)
++
++#define QCA808X_CDT_CODE_PAIR_A GENMASK(15, 12)
++#define QCA808X_CDT_CODE_PAIR_B GENMASK(11, 8)
++#define QCA808X_CDT_CODE_PAIR_C GENMASK(7, 4)
++#define QCA808X_CDT_CODE_PAIR_D GENMASK(3, 0)
++
++#define QCA808X_CDT_STATUS_STAT_TYPE GENMASK(1, 0)
++#define QCA808X_CDT_STATUS_STAT_FAIL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 0)
++#define QCA808X_CDT_STATUS_STAT_NORMAL FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 1)
++#define QCA808X_CDT_STATUS_STAT_SAME_OPEN FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 2)
++#define QCA808X_CDT_STATUS_STAT_SAME_SHORT FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_TYPE, 3)
++
++#define QCA808X_CDT_STATUS_STAT_MDI GENMASK(3, 2)
++#define QCA808X_CDT_STATUS_STAT_MDI1 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 1)
++#define QCA808X_CDT_STATUS_STAT_MDI2 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 2)
++#define QCA808X_CDT_STATUS_STAT_MDI3 FIELD_PREP_CONST(QCA808X_CDT_STATUS_STAT_MDI, 3)
++
++/* NORMAL are MDI with type set to 0 */
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI1
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
++ QCA808X_CDT_STATUS_STAT_MDI1)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
++ QCA808X_CDT_STATUS_STAT_MDI1)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI2
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
++ QCA808X_CDT_STATUS_STAT_MDI2)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
++ QCA808X_CDT_STATUS_STAT_MDI2)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL QCA808X_CDT_STATUS_STAT_MDI3
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN (QCA808X_CDT_STATUS_STAT_SAME_OPEN |\
++ QCA808X_CDT_STATUS_STAT_MDI3)
++#define QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT (QCA808X_CDT_STATUS_STAT_SAME_SHORT |\
++ QCA808X_CDT_STATUS_STAT_MDI3)
++
++/* Added for reference of existence but should be handled by wait_for_completion already */
++#define QCA808X_CDT_STATUS_STAT_BUSY (BIT(1) | BIT(3))
++
++#define QCA808X_MMD7_LED_GLOBAL 0x8073
++#define QCA808X_LED_BLINK_1 GENMASK(11, 6)
++#define QCA808X_LED_BLINK_2 GENMASK(5, 0)
++/* Values are the same for both BLINK_1 and BLINK_2 */
++#define QCA808X_LED_BLINK_FREQ_MASK GENMASK(5, 3)
++#define QCA808X_LED_BLINK_FREQ_2HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x0)
++#define QCA808X_LED_BLINK_FREQ_4HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x1)
++#define QCA808X_LED_BLINK_FREQ_8HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x2)
++#define QCA808X_LED_BLINK_FREQ_16HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x3)
++#define QCA808X_LED_BLINK_FREQ_32HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x4)
++#define QCA808X_LED_BLINK_FREQ_64HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x5)
++#define QCA808X_LED_BLINK_FREQ_128HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x6)
++#define QCA808X_LED_BLINK_FREQ_256HZ FIELD_PREP(QCA808X_LED_BLINK_FREQ_MASK, 0x7)
++#define QCA808X_LED_BLINK_DUTY_MASK GENMASK(2, 0)
++#define QCA808X_LED_BLINK_DUTY_50_50 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x0)
++#define QCA808X_LED_BLINK_DUTY_75_25 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x1)
++#define QCA808X_LED_BLINK_DUTY_25_75 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x2)
++#define QCA808X_LED_BLINK_DUTY_33_67 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x3)
++#define QCA808X_LED_BLINK_DUTY_67_33 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x4)
++#define QCA808X_LED_BLINK_DUTY_17_83 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x5)
++#define QCA808X_LED_BLINK_DUTY_83_17 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x6)
++#define QCA808X_LED_BLINK_DUTY_8_92 FIELD_PREP(QCA808X_LED_BLINK_DUTY_MASK, 0x7)
++
++#define QCA808X_MMD7_LED2_CTRL 0x8074
++#define QCA808X_MMD7_LED2_FORCE_CTRL 0x8075
++#define QCA808X_MMD7_LED1_CTRL 0x8076
++#define QCA808X_MMD7_LED1_FORCE_CTRL 0x8077
++#define QCA808X_MMD7_LED0_CTRL 0x8078
++#define QCA808X_MMD7_LED_CTRL(x) (0x8078 - ((x) * 2))
++
++/* LED hw control pattern is the same for every LED */
++#define QCA808X_LED_PATTERN_MASK GENMASK(15, 0)
++#define QCA808X_LED_SPEED2500_ON BIT(15)
++#define QCA808X_LED_SPEED2500_BLINK BIT(14)
++/* Follow blink trigger even if duplex or speed condition doesn't match */
++#define QCA808X_LED_BLINK_CHECK_BYPASS BIT(13)
++#define QCA808X_LED_FULL_DUPLEX_ON BIT(12)
++#define QCA808X_LED_HALF_DUPLEX_ON BIT(11)
++#define QCA808X_LED_TX_BLINK BIT(10)
++#define QCA808X_LED_RX_BLINK BIT(9)
++#define QCA808X_LED_TX_ON_10MS BIT(8)
++#define QCA808X_LED_RX_ON_10MS BIT(7)
++#define QCA808X_LED_SPEED1000_ON BIT(6)
++#define QCA808X_LED_SPEED100_ON BIT(5)
++#define QCA808X_LED_SPEED10_ON BIT(4)
++#define QCA808X_LED_COLLISION_BLINK BIT(3)
++#define QCA808X_LED_SPEED1000_BLINK BIT(2)
++#define QCA808X_LED_SPEED100_BLINK BIT(1)
++#define QCA808X_LED_SPEED10_BLINK BIT(0)
++
++#define QCA808X_MMD7_LED0_FORCE_CTRL 0x8079
++#define QCA808X_MMD7_LED_FORCE_CTRL(x) (0x8079 - ((x) * 2))
++
++/* LED force ctrl is the same for every LED
++ * No documentation exist for this, not even internal one
++ * with NDA as QCOM gives only info about configuring
++ * hw control pattern rules and doesn't indicate any way
++ * to force the LED to specific mode.
++ * These define comes from reverse and testing and maybe
++ * lack of some info or some info are not entirely correct.
++ * For the basic LED control and hw control these finding
++ * are enough to support LED control in all the required APIs.
++ *
++ * On doing some comparison with implementation with qca807x,
++ * it was found that it's 1:1 equal to it and confirms all the
++ * reverse done. It was also found further specification with the
++ * force mode and the blink modes.
++ */
++#define QCA808X_LED_FORCE_EN BIT(15)
++#define QCA808X_LED_FORCE_MODE_MASK GENMASK(14, 13)
++#define QCA808X_LED_FORCE_BLINK_1 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x3)
++#define QCA808X_LED_FORCE_BLINK_2 FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x2)
++#define QCA808X_LED_FORCE_ON FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x1)
++#define QCA808X_LED_FORCE_OFF FIELD_PREP(QCA808X_LED_FORCE_MODE_MASK, 0x0)
++
++#define QCA808X_MMD7_LED_POLARITY_CTRL 0x901a
++/* QSDK sets by default 0x46 to this reg that sets BIT 6 for
++ * LED to active high. It's not clear what BIT 3 and BIT 4 does.
++ */
++#define QCA808X_LED_ACTIVE_HIGH BIT(6)
++
++/* QCA808X 1G chip type */
++#define QCA808X_PHY_MMD7_CHIP_TYPE 0x901d
++#define QCA808X_PHY_CHIP_TYPE_1G BIT(0)
++
++#define QCA8081_PHY_SERDES_MMD1_FIFO_CTRL 0x9072
++#define QCA8081_PHY_FIFO_RSTN BIT(11)
++
++#define QCA8081_PHY_ID 0x004dd101
++
++MODULE_DESCRIPTION("Qualcomm Atheros QCA808X PHY driver");
++MODULE_AUTHOR("Matus Ujhelyi");
++MODULE_LICENSE("GPL");
++
++struct qca808x_priv {
++ int led_polarity_mode;
++};
++
++static int qca808x_phy_fast_retrain_config(struct phy_device *phydev)
++{
++ int ret;
++
++ /* Enable fast retrain */
++ ret = genphy_c45_fast_retrain(phydev, true);
++ if (ret)
++ return ret;
++
++ phy_write_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_TOP_OPTION1,
++ QCA808X_TOP_OPTION1_DATA);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_20DB,
++ QCA808X_MSE_THRESHOLD_20DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_17DB,
++ QCA808X_MSE_THRESHOLD_17DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_27DB,
++ QCA808X_MSE_THRESHOLD_27DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PMAPMD, QCA808X_PHY_MMD1_MSE_THRESHOLD_28DB,
++ QCA808X_MSE_THRESHOLD_28DB_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_1,
++ QCA808X_MMD3_DEBUG_1_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_4,
++ QCA808X_MMD3_DEBUG_4_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_5,
++ QCA808X_MMD3_DEBUG_5_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_3,
++ QCA808X_MMD3_DEBUG_3_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_6,
++ QCA808X_MMD3_DEBUG_6_VALUE);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_DEBUG_2,
++ QCA808X_MMD3_DEBUG_2_VALUE);
++
++ return 0;
++}
++
++static int qca808x_phy_ms_seed_enable(struct phy_device *phydev, bool enable)
++{
++ u16 seed_value;
++
++ if (!enable)
++ return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
++ QCA808X_MASTER_SLAVE_SEED_ENABLE, 0);
++
++ seed_value = prandom_u32_max(QCA808X_MASTER_SLAVE_SEED_RANGE);
++ return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_LOCAL_SEED,
++ QCA808X_MASTER_SLAVE_SEED_CFG | QCA808X_MASTER_SLAVE_SEED_ENABLE,
++ FIELD_PREP(QCA808X_MASTER_SLAVE_SEED_CFG, seed_value) |
++ QCA808X_MASTER_SLAVE_SEED_ENABLE);
++}
++
++static bool qca808x_is_prefer_master(struct phy_device *phydev)
++{
++ return (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_FORCE) ||
++ (phydev->master_slave_get == MASTER_SLAVE_CFG_MASTER_PREFERRED);
++}
++
++static bool qca808x_has_fast_retrain_or_slave_seed(struct phy_device *phydev)
++{
++ return linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
++}
++
++static int qca808x_probe(struct phy_device *phydev)
++{
++ struct device *dev = &phydev->mdio.dev;
++ struct qca808x_priv *priv;
++
++ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++ if (!priv)
++ return -ENOMEM;
++
++ /* Init LED polarity mode to -1 */
++ priv->led_polarity_mode = -1;
++
++ phydev->priv = priv;
++
++ return 0;
++}
++
++static int qca808x_config_init(struct phy_device *phydev)
++{
++ int ret;
++
++ /* Active adc&vga on 802.3az for the link 1000M and 100M */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_PCS, QCA808X_PHY_MMD3_ADDR_CLD_CTRL7,
++ QCA808X_8023AZ_AFE_CTRL_MASK, QCA808X_8023AZ_AFE_EN);
++ if (ret)
++ return ret;
++
++ /* Adjust the threshold on 802.3az for the link 1000M */
++ ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
++ QCA808X_PHY_MMD3_AZ_TRAINING_CTRL,
++ QCA808X_MMD3_AZ_TRAINING_VAL);
++ if (ret)
++ return ret;
++
++ if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
++ /* Config the fast retrain for the link 2500M */
++ ret = qca808x_phy_fast_retrain_config(phydev);
++ if (ret)
++ return ret;
++
++ ret = genphy_read_master_slave(phydev);
++ if (ret < 0)
++ return ret;
++
++ if (!qca808x_is_prefer_master(phydev)) {
++ /* Enable seed and configure lower ramdom seed to make phy
++ * linked as slave mode.
++ */
++ ret = qca808x_phy_ms_seed_enable(phydev, true);
++ if (ret)
++ return ret;
++ }
++ }
++
++ /* Configure adc threshold as 100mv for the link 10M */
++ return at803x_debug_reg_mask(phydev, QCA808X_PHY_DEBUG_ADC_THRESHOLD,
++ QCA808X_ADC_THRESHOLD_MASK,
++ QCA808X_ADC_THRESHOLD_100MV);
++}
++
++static int qca808x_read_status(struct phy_device *phydev)
++{
++ struct at803x_ss_mask ss_mask = { 0 };
++ int ret;
++
++ ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_STAT);
++ if (ret < 0)
++ return ret;
++
++ linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->lp_advertising,
++ ret & MDIO_AN_10GBT_STAT_LP2_5G);
++
++ ret = genphy_read_status(phydev);
++ if (ret)
++ return ret;
++
++ /* qca8081 takes the different bits for speed value from at803x */
++ ss_mask.speed_mask = QCA808X_SS_SPEED_MASK;
++ ss_mask.speed_shift = __bf_shf(QCA808X_SS_SPEED_MASK);
++ ret = at803x_read_specific_status(phydev, ss_mask);
++ if (ret < 0)
++ return ret;
++
++ if (phydev->link) {
++ if (phydev->speed == SPEED_2500)
++ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
++ else
++ phydev->interface = PHY_INTERFACE_MODE_SGMII;
++ } else {
++ /* generate seed as a lower random value to make PHY linked as SLAVE easily,
++ * except for master/slave configuration fault detected or the master mode
++ * preferred.
++ *
++ * the reason for not putting this code into the function link_change_notify is
++ * the corner case where the link partner is also the qca8081 PHY and the seed
++ * value is configured as the same value, the link can't be up and no link change
++ * occurs.
++ */
++ if (qca808x_has_fast_retrain_or_slave_seed(phydev)) {
++ if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR ||
++ qca808x_is_prefer_master(phydev)) {
++ qca808x_phy_ms_seed_enable(phydev, false);
++ } else {
++ qca808x_phy_ms_seed_enable(phydev, true);
++ }
++ }
++ }
++
++ return 0;
++}
++
++static int qca808x_soft_reset(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = genphy_soft_reset(phydev);
++ if (ret < 0)
++ return ret;
++
++ if (qca808x_has_fast_retrain_or_slave_seed(phydev))
++ ret = qca808x_phy_ms_seed_enable(phydev, true);
++
++ return ret;
++}
++
++static bool qca808x_cdt_fault_length_valid(int cdt_code)
++{
++ switch (cdt_code) {
++ case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
++ return true;
++ default:
++ return false;
++ }
++}
++
++static int qca808x_cable_test_result_trans(int cdt_code)
++{
++ switch (cdt_code) {
++ case QCA808X_CDT_STATUS_STAT_NORMAL:
++ return ETHTOOL_A_CABLE_RESULT_CODE_OK;
++ case QCA808X_CDT_STATUS_STAT_SAME_SHORT:
++ return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
++ case QCA808X_CDT_STATUS_STAT_SAME_OPEN:
++ return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_NORMAL:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
++ case QCA808X_CDT_STATUS_STAT_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
++ return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
++ case QCA808X_CDT_STATUS_STAT_FAIL:
++ default:
++ return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
++ }
++}
++
++static int qca808x_cdt_fault_length(struct phy_device *phydev, int pair,
++ int result)
++{
++ int val;
++ u32 cdt_length_reg = 0;
++
++ switch (pair) {
++ case ETHTOOL_A_CABLE_PAIR_A:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_A;
++ break;
++ case ETHTOOL_A_CABLE_PAIR_B:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_B;
++ break;
++ case ETHTOOL_A_CABLE_PAIR_C:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_C;
++ break;
++ case ETHTOOL_A_CABLE_PAIR_D:
++ cdt_length_reg = QCA808X_MMD3_CDT_DIAG_PAIR_D;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ val = phy_read_mmd(phydev, MDIO_MMD_PCS, cdt_length_reg);
++ if (val < 0)
++ return val;
++
++ if (result == ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT)
++ val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_SAME_SHORT, val);
++ else
++ val = FIELD_GET(QCA808X_CDT_DIAG_LENGTH_CROSS_SHORT, val);
++
++ return at803x_cdt_fault_length(val);
++}
++
++static int qca808x_cable_test_start(struct phy_device *phydev)
++{
++ int ret;
++
++ /* perform CDT with the following configs:
++ * 1. disable hibernation.
++ * 2. force PHY working in MDI mode.
++ * 3. for PHY working in 1000BaseT.
++ * 4. configure the threshold.
++ */
++
++ ret = at803x_debug_reg_mask(phydev, QCA808X_DBG_AN_TEST, QCA808X_HIBERNATION_EN, 0);
++ if (ret < 0)
++ return ret;
++
++ ret = at803x_config_mdix(phydev, ETH_TP_MDI);
++ if (ret < 0)
++ return ret;
++
++ /* Force 1000base-T needs to configure PMA/PMD and MII_BMCR */
++ phydev->duplex = DUPLEX_FULL;
++ phydev->speed = SPEED_1000;
++ ret = genphy_c45_pma_setup_forced(phydev);
++ if (ret < 0)
++ return ret;
++
++ ret = genphy_setup_forced(phydev);
++ if (ret < 0)
++ return ret;
++
++ /* configure the thresholds for open, short, pair ok test */
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8074, 0xc040);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8076, 0xc040);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8077, 0xa060);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8078, 0xc050);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807a, 0xc060);
++ phy_write_mmd(phydev, MDIO_MMD_PCS, 0x807e, 0xb060);
++
++ return 0;
++}
++
++static int qca808x_cable_test_get_pair_status(struct phy_device *phydev, u8 pair,
++ u16 status)
++{
++ int length, result;
++ u16 pair_code;
++
++ switch (pair) {
++ case ETHTOOL_A_CABLE_PAIR_A:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_A, status);
++ break;
++ case ETHTOOL_A_CABLE_PAIR_B:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_B, status);
++ break;
++ case ETHTOOL_A_CABLE_PAIR_C:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_C, status);
++ break;
++ case ETHTOOL_A_CABLE_PAIR_D:
++ pair_code = FIELD_GET(QCA808X_CDT_CODE_PAIR_D, status);
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ result = qca808x_cable_test_result_trans(pair_code);
++ ethnl_cable_test_result(phydev, pair, result);
++
++ if (qca808x_cdt_fault_length_valid(pair_code)) {
++ length = qca808x_cdt_fault_length(phydev, pair, result);
++ ethnl_cable_test_fault_length(phydev, pair, length);
++ }
++
++ return 0;
++}
++
++static int qca808x_cable_test_get_status(struct phy_device *phydev, bool *finished)
++{
++ int ret, val;
++
++ *finished = false;
++
++ val = QCA808X_CDT_ENABLE_TEST |
++ QCA808X_CDT_LENGTH_UNIT;
++ ret = at803x_cdt_start(phydev, val);
++ if (ret)
++ return ret;
++
++ ret = at803x_cdt_wait_for_completion(phydev, QCA808X_CDT_ENABLE_TEST);
++ if (ret)
++ return ret;
++
++ val = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA808X_MMD3_CDT_STATUS);
++ if (val < 0)
++ return val;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_A, val);
++ if (ret)
++ return ret;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_B, val);
++ if (ret)
++ return ret;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_C, val);
++ if (ret)
++ return ret;
++
++ ret = qca808x_cable_test_get_pair_status(phydev, ETHTOOL_A_CABLE_PAIR_D, val);
++ if (ret)
++ return ret;
++
++ *finished = true;
++
++ return 0;
++}
++
++static int qca808x_get_features(struct phy_device *phydev)
++{
++ int ret;
++
++ ret = genphy_c45_pma_read_abilities(phydev);
++ if (ret)
++ return ret;
++
++ /* The autoneg ability is not existed in bit3 of MMD7.1,
++ * but it is supported by qca808x PHY, so we add it here
++ * manually.
++ */
++ linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->supported);
++
++ /* As for the qca8081 1G version chip, the 2500baseT ability is also
++ * existed in the bit0 of MMD1.21, we need to remove it manually if
++ * it is the qca8081 1G chip according to the bit0 of MMD7.0x901d.
++ */
++ ret = phy_read_mmd(phydev, MDIO_MMD_AN, QCA808X_PHY_MMD7_CHIP_TYPE);
++ if (ret < 0)
++ return ret;
++
++ if (QCA808X_PHY_CHIP_TYPE_1G & ret)
++ linkmode_clear_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->supported);
++
++ return 0;
++}
++
++static int qca808x_config_aneg(struct phy_device *phydev)
++{
++ int phy_ctrl = 0;
++ int ret;
++
++ ret = at803x_prepare_config_aneg(phydev);
++ if (ret)
++ return ret;
++
++ /* The reg MII_BMCR also needs to be configured for force mode, the
++ * genphy_config_aneg is also needed.
++ */
++ if (phydev->autoneg == AUTONEG_DISABLE)
++ genphy_c45_pma_setup_forced(phydev);
++
++ if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, phydev->advertising))
++ phy_ctrl = MDIO_AN_10GBT_CTRL_ADV2_5G;
++
++ ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,
++ MDIO_AN_10GBT_CTRL_ADV2_5G, phy_ctrl);
++ if (ret < 0)
++ return ret;
++
++ return __genphy_config_aneg(phydev, ret);
++}
++
++static void qca808x_link_change_notify(struct phy_device *phydev)
++{
++ /* Assert interface sgmii fifo on link down, deassert it on link up,
++ * the interface device address is always phy address added by 1.
++ */
++ mdiobus_c45_modify_changed(phydev->mdio.bus, phydev->mdio.addr + 1,
++ MDIO_MMD_PMAPMD, QCA8081_PHY_SERDES_MMD1_FIFO_CTRL,
++ QCA8081_PHY_FIFO_RSTN,
++ phydev->link ? QCA8081_PHY_FIFO_RSTN : 0);
++}
++
++static int qca808x_led_parse_netdev(struct phy_device *phydev, unsigned long rules,
++ u16 *offload_trigger)
++{
++ /* Parsing specific to netdev trigger */
++ if (test_bit(TRIGGER_NETDEV_TX, &rules))
++ *offload_trigger |= QCA808X_LED_TX_BLINK;
++ if (test_bit(TRIGGER_NETDEV_RX, &rules))
++ *offload_trigger |= QCA808X_LED_RX_BLINK;
++ if (test_bit(TRIGGER_NETDEV_LINK_10, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED10_ON;
++ if (test_bit(TRIGGER_NETDEV_LINK_100, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED100_ON;
++ if (test_bit(TRIGGER_NETDEV_LINK_1000, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED1000_ON;
++ if (test_bit(TRIGGER_NETDEV_LINK_2500, &rules))
++ *offload_trigger |= QCA808X_LED_SPEED2500_ON;
++ if (test_bit(TRIGGER_NETDEV_HALF_DUPLEX, &rules))
++ *offload_trigger |= QCA808X_LED_HALF_DUPLEX_ON;
++ if (test_bit(TRIGGER_NETDEV_FULL_DUPLEX, &rules))
++ *offload_trigger |= QCA808X_LED_FULL_DUPLEX_ON;
++
++ if (rules && !*offload_trigger)
++ return -EOPNOTSUPP;
++
++ /* Enable BLINK_CHECK_BYPASS by default to make the LED
++ * blink even with duplex or speed mode not enabled.
++ */
++ *offload_trigger |= QCA808X_LED_BLINK_CHECK_BYPASS;
++
++ return 0;
++}
++
++static int qca808x_led_hw_control_enable(struct phy_device *phydev, u8 index)
++{
++ u16 reg;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_FORCE_EN);
++}
++
++static int qca808x_led_hw_is_supported(struct phy_device *phydev, u8 index,
++ unsigned long rules)
++{
++ u16 offload_trigger = 0;
++
++ if (index > 2)
++ return -EINVAL;
++
++ return qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
++}
++
++static int qca808x_led_hw_control_set(struct phy_device *phydev, u8 index,
++ unsigned long rules)
++{
++ u16 reg, offload_trigger = 0;
++ int ret;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_CTRL(index);
++
++ ret = qca808x_led_parse_netdev(phydev, rules, &offload_trigger);
++ if (ret)
++ return ret;
++
++ ret = qca808x_led_hw_control_enable(phydev, index);
++ if (ret)
++ return ret;
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_PATTERN_MASK,
++ offload_trigger);
++}
++
++static bool qca808x_led_hw_control_status(struct phy_device *phydev, u8 index)
++{
++ u16 reg;
++ int val;
++
++ if (index > 2)
++ return false;
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
++
++ return !(val & QCA808X_LED_FORCE_EN);
++}
++
++static int qca808x_led_hw_control_get(struct phy_device *phydev, u8 index,
++ unsigned long *rules)
++{
++ u16 reg;
++ int val;
++
++ if (index > 2)
++ return -EINVAL;
++
++ /* Check if we have hw control enabled */
++ if (qca808x_led_hw_control_status(phydev, index))
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_CTRL(index);
++
++ val = phy_read_mmd(phydev, MDIO_MMD_AN, reg);
++ if (val & QCA808X_LED_TX_BLINK)
++ set_bit(TRIGGER_NETDEV_TX, rules);
++ if (val & QCA808X_LED_RX_BLINK)
++ set_bit(TRIGGER_NETDEV_RX, rules);
++ if (val & QCA808X_LED_SPEED10_ON)
++ set_bit(TRIGGER_NETDEV_LINK_10, rules);
++ if (val & QCA808X_LED_SPEED100_ON)
++ set_bit(TRIGGER_NETDEV_LINK_100, rules);
++ if (val & QCA808X_LED_SPEED1000_ON)
++ set_bit(TRIGGER_NETDEV_LINK_1000, rules);
++ if (val & QCA808X_LED_SPEED2500_ON)
++ set_bit(TRIGGER_NETDEV_LINK_2500, rules);
++ if (val & QCA808X_LED_HALF_DUPLEX_ON)
++ set_bit(TRIGGER_NETDEV_HALF_DUPLEX, rules);
++ if (val & QCA808X_LED_FULL_DUPLEX_ON)
++ set_bit(TRIGGER_NETDEV_FULL_DUPLEX, rules);
++
++ return 0;
++}
++
++static int qca808x_led_hw_control_reset(struct phy_device *phydev, u8 index)
++{
++ u16 reg;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_CTRL(index);
++
++ return phy_clear_bits_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_PATTERN_MASK);
++}
++
++static int qca808x_led_brightness_set(struct phy_device *phydev,
++ u8 index, enum led_brightness value)
++{
++ u16 reg;
++ int ret;
++
++ if (index > 2)
++ return -EINVAL;
++
++ if (!value) {
++ ret = qca808x_led_hw_control_reset(phydev, index);
++ if (ret)
++ return ret;
++ }
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
++ QCA808X_LED_FORCE_EN | value ? QCA808X_LED_FORCE_ON :
++ QCA808X_LED_FORCE_OFF);
++}
++
++static int qca808x_led_blink_set(struct phy_device *phydev, u8 index,
++ unsigned long *delay_on,
++ unsigned long *delay_off)
++{
++ int ret;
++ u16 reg;
++
++ if (index > 2)
++ return -EINVAL;
++
++ reg = QCA808X_MMD7_LED_FORCE_CTRL(index);
++
++ /* Set blink to 50% off, 50% on at 4Hz by default */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_AN, QCA808X_MMD7_LED_GLOBAL,
++ QCA808X_LED_BLINK_FREQ_MASK | QCA808X_LED_BLINK_DUTY_MASK,
++ QCA808X_LED_BLINK_FREQ_4HZ | QCA808X_LED_BLINK_DUTY_50_50);
++ if (ret)
++ return ret;
++
++ /* We use BLINK_1 for normal blinking */
++ ret = phy_modify_mmd(phydev, MDIO_MMD_AN, reg,
++ QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_MODE_MASK,
++ QCA808X_LED_FORCE_EN | QCA808X_LED_FORCE_BLINK_1);
++ if (ret)
++ return ret;
++
++ /* We set blink to 4Hz, aka 250ms */
++ *delay_on = 250 / 2;
++ *delay_off = 250 / 2;
++
++ return 0;
++}
++
++static int qca808x_led_polarity_set(struct phy_device *phydev, int index,
++ unsigned long modes)
++{
++ struct qca808x_priv *priv = phydev->priv;
++ bool active_low = false;
++ u32 mode;
++
++ for_each_set_bit(mode, &modes, __PHY_LED_MODES_NUM) {
++ switch (mode) {
++ case PHY_LED_ACTIVE_LOW:
++ active_low = true;
++ break;
++ default:
++ return -EINVAL;
++ }
++ }
++
++ /* PHY polarity is global and can't be set per LED.
++ * To detect this, check if last requested polarity mode
++ * match the new one.
++ */
++ if (priv->led_polarity_mode >= 0 &&
++ priv->led_polarity_mode != active_low) {
++ phydev_err(phydev, "PHY polarity is global. Mismatched polarity on different LED\n");
++ return -EINVAL;
++ }
++
++ /* Save the last PHY polarity mode */
++ priv->led_polarity_mode = active_low;
++
++ return phy_modify_mmd(phydev, MDIO_MMD_AN,
++ QCA808X_MMD7_LED_POLARITY_CTRL,
++ QCA808X_LED_ACTIVE_HIGH,
++ active_low ? 0 : QCA808X_LED_ACTIVE_HIGH);
++}
++
++static struct phy_driver qca808x_driver[] = {
++{
++ /* Qualcomm QCA8081 */
++ PHY_ID_MATCH_EXACT(QCA8081_PHY_ID),
++ .name = "Qualcomm QCA8081",
++ .flags = PHY_POLL_CABLE_TEST,
++ .probe = qca808x_probe,
++ .config_intr = at803x_config_intr,
++ .handle_interrupt = at803x_handle_interrupt,
++ .get_tunable = at803x_get_tunable,
++ .set_tunable = at803x_set_tunable,
++ .set_wol = at803x_set_wol,
++ .get_wol = at803x_get_wol,
++ .get_features = qca808x_get_features,
++ .config_aneg = qca808x_config_aneg,
++ .suspend = genphy_suspend,
++ .resume = genphy_resume,
++ .read_status = qca808x_read_status,
++ .config_init = qca808x_config_init,
++ .soft_reset = qca808x_soft_reset,
++ .cable_test_start = qca808x_cable_test_start,
++ .cable_test_get_status = qca808x_cable_test_get_status,
++ .link_change_notify = qca808x_link_change_notify,
++ .led_brightness_set = qca808x_led_brightness_set,
++ .led_blink_set = qca808x_led_blink_set,
++ .led_hw_is_supported = qca808x_led_hw_is_supported,
++ .led_hw_control_set = qca808x_led_hw_control_set,
++ .led_hw_control_get = qca808x_led_hw_control_get,
++ .led_polarity_set = qca808x_led_polarity_set,
++}, };
++
++module_phy_driver(qca808x_driver);
++
++static struct mdio_device_id __maybe_unused qca808x_tbl[] = {
++ { PHY_ID_MATCH_EXACT(QCA8081_PHY_ID) },
++ { }
++};
++
++MODULE_DEVICE_TABLE(mdio, qca808x_tbl);
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
+# CONFIG_QCA83XX_PHY is not set
+# CONFIG_QCA808X_PHY is not set
# CONFIG_QCOM_A7PLL is not set
# CONFIG_QCOM_BAM_DMUX is not set
# CONFIG_QCOM_EMAC is not set
+++ /dev/null
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (c) 2020 Sartura Ltd.
- *
- * Author: Robert Marko <robert.marko@sartura.hr>
- *
- * Qualcomm QCA8072 and QCA8075 PHY driver
- */
-
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/phy.h>
-#include <linux/bitfield.h>
-#include <linux/ethtool_netlink.h>
-#include <linux/gpio.h>
-#include <linux/sfp.h>
-
-#include <dt-bindings/net/qcom-qca807x.h>
-
-#define PHY_ID_QCA8072 0x004dd0b2
-#define PHY_ID_QCA8075 0x004dd0b1
-#define PHY_ID_QCA807X_PSGMII 0x06820805
-
-/* Downshift */
-#define QCA807X_SMARTSPEED_EN BIT(5)
-#define QCA807X_SMARTSPEED_RETRY_LIMIT_MASK GENMASK(4, 2)
-#define QCA807X_SMARTSPEED_RETRY_LIMIT_DEFAULT 5
-#define QCA807X_SMARTSPEED_RETRY_LIMIT_MIN 2
-#define QCA807X_SMARTSPEED_RETRY_LIMIT_MAX 9
-
-/* Cable diagnostic test (CDT) */
-#define QCA807X_CDT 0x16
-#define QCA807X_CDT_ENABLE BIT(15)
-#define QCA807X_CDT_ENABLE_INTER_PAIR_SHORT BIT(13)
-#define QCA807X_CDT_STATUS BIT(11)
-#define QCA807X_CDT_MMD3_STATUS 0x8064
-#define QCA807X_CDT_MDI0_STATUS_MASK GENMASK(15, 12)
-#define QCA807X_CDT_MDI1_STATUS_MASK GENMASK(11, 8)
-#define QCA807X_CDT_MDI2_STATUS_MASK GENMASK(7, 4)
-#define QCA807X_CDT_MDI3_STATUS_MASK GENMASK(3, 0)
-#define QCA807X_CDT_RESULTS_INVALID 0x0
-#define QCA807X_CDT_RESULTS_OK 0x1
-#define QCA807X_CDT_RESULTS_OPEN 0x2
-#define QCA807X_CDT_RESULTS_SAME_SHORT 0x3
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK 0x4
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK 0x8
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK 0xc
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN 0x6
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN 0xa
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN 0xe
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT 0x7
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT 0xb
-#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT 0xf
-#define QCA807X_CDT_RESULTS_BUSY 0x9
-#define QCA807X_CDT_MMD3_MDI0_LENGTH 0x8065
-#define QCA807X_CDT_MMD3_MDI1_LENGTH 0x8066
-#define QCA807X_CDT_MMD3_MDI2_LENGTH 0x8067
-#define QCA807X_CDT_MMD3_MDI3_LENGTH 0x8068
-#define QCA807X_CDT_SAME_SHORT_LENGTH_MASK GENMASK(15, 8)
-#define QCA807X_CDT_CROSS_SHORT_LENGTH_MASK GENMASK(7, 0)
-
-#define QCA807X_CHIP_CONFIGURATION 0x1f
-#define QCA807X_BT_BX_REG_SEL BIT(15)
-#define QCA807X_BT_BX_REG_SEL_FIBER 0
-#define QCA807X_BT_BX_REG_SEL_COPPER 1
-#define QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK GENMASK(3, 0)
-#define QCA807X_CHIP_CONFIGURATION_MODE_QSGMII_SGMII 4
-#define QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_FIBER 3
-#define QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_ALL_COPPER 0
-
-#define QCA807X_MEDIA_SELECT_STATUS 0x1a
-#define QCA807X_MEDIA_DETECTED_COPPER BIT(5)
-#define QCA807X_MEDIA_DETECTED_1000_BASE_X BIT(4)
-#define QCA807X_MEDIA_DETECTED_100_BASE_FX BIT(3)
-
-#define QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION 0x807e
-#define QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION_EN BIT(0)
-
-#define QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH 0x801a
-#define QCA807X_CONTROL_DAC_MASK GENMASK(2, 0)
-
-#define QCA807X_MMD7_LED_100N_1 0x8074
-#define QCA807X_MMD7_LED_100N_2 0x8075
-#define QCA807X_MMD7_LED_1000N_1 0x8076
-#define QCA807X_MMD7_LED_1000N_2 0x8077
-#define QCA807X_LED_TXACT_BLK_EN_2 BIT(10)
-#define QCA807X_LED_RXACT_BLK_EN_2 BIT(9)
-#define QCA807X_LED_GT_ON_EN_2 BIT(6)
-#define QCA807X_LED_HT_ON_EN_2 BIT(5)
-#define QCA807X_LED_BT_ON_EN_2 BIT(4)
-#define QCA807X_GPIO_FORCE_EN BIT(15)
-#define QCA807X_GPIO_FORCE_MODE_MASK GENMASK(14, 13)
-
-#define QCA807X_INTR_ENABLE 0x12
-#define QCA807X_INTR_STATUS 0x13
-#define QCA807X_INTR_ENABLE_AUTONEG_ERR BIT(15)
-#define QCA807X_INTR_ENABLE_SPEED_CHANGED BIT(14)
-#define QCA807X_INTR_ENABLE_DUPLEX_CHANGED BIT(13)
-#define QCA807X_INTR_ENABLE_LINK_FAIL BIT(11)
-#define QCA807X_INTR_ENABLE_LINK_SUCCESS BIT(10)
-
-#define QCA807X_FUNCTION_CONTROL 0x10
-#define QCA807X_FC_MDI_CROSSOVER_MODE_MASK GENMASK(6, 5)
-#define QCA807X_FC_MDI_CROSSOVER_AUTO 3
-#define QCA807X_FC_MDI_CROSSOVER_MANUAL_MDIX 1
-#define QCA807X_FC_MDI_CROSSOVER_MANUAL_MDI 0
-
-#define QCA807X_PHY_SPECIFIC_STATUS 0x11
-#define QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED BIT(11)
-#define QCA807X_SS_SPEED_MASK GENMASK(15, 14)
-#define QCA807X_SS_SPEED_1000 2
-#define QCA807X_SS_SPEED_100 1
-#define QCA807X_SS_SPEED_10 0
-#define QCA807X_SS_DUPLEX BIT(13)
-#define QCA807X_SS_MDIX BIT(6)
-
-/* PSGMII PHY specific */
-#define PSGMII_QSGMII_DRIVE_CONTROL_1 0xb
-#define PSGMII_QSGMII_TX_DRIVER_MASK GENMASK(7, 4)
-#define PSGMII_MODE_CTRL 0x6d
-#define PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK BIT(0)
-#define PSGMII_MMD3_SERDES_CONTROL 0x805a
-
-struct qca807x_gpio_priv {
- struct phy_device *phy;
-};
-
-static int qca807x_get_downshift(struct phy_device *phydev, u8 *data)
-{
- int val, cnt, enable;
-
- val = phy_read(phydev, MII_NWAYTEST);
- if (val < 0)
- return val;
-
- enable = FIELD_GET(QCA807X_SMARTSPEED_EN, val);
- cnt = FIELD_GET(QCA807X_SMARTSPEED_RETRY_LIMIT_MASK, val) + 2;
-
- *data = enable ? cnt : DOWNSHIFT_DEV_DISABLE;
-
- return 0;
-}
-
-static int qca807x_set_downshift(struct phy_device *phydev, u8 cnt)
-{
- int ret, val;
-
- if (cnt > QCA807X_SMARTSPEED_RETRY_LIMIT_MAX ||
- (cnt < QCA807X_SMARTSPEED_RETRY_LIMIT_MIN && cnt != DOWNSHIFT_DEV_DISABLE))
- return -EINVAL;
-
- if (!cnt) {
- ret = phy_clear_bits(phydev, MII_NWAYTEST, QCA807X_SMARTSPEED_EN);
- } else {
- val = QCA807X_SMARTSPEED_EN;
- val |= FIELD_PREP(QCA807X_SMARTSPEED_RETRY_LIMIT_MASK, cnt - 2);
-
- phy_modify(phydev, MII_NWAYTEST,
- QCA807X_SMARTSPEED_EN |
- QCA807X_SMARTSPEED_RETRY_LIMIT_MASK,
- val);
- }
-
- ret = genphy_soft_reset(phydev);
-
- return ret;
-}
-
-static int qca807x_get_tunable(struct phy_device *phydev,
- struct ethtool_tunable *tuna, void *data)
-{
- switch (tuna->id) {
- case ETHTOOL_PHY_DOWNSHIFT:
- return qca807x_get_downshift(phydev, data);
- default:
- return -EOPNOTSUPP;
- }
-}
-
-static int qca807x_set_tunable(struct phy_device *phydev,
- struct ethtool_tunable *tuna, const void *data)
-{
- switch (tuna->id) {
- case ETHTOOL_PHY_DOWNSHIFT:
- return qca807x_set_downshift(phydev, *(const u8 *)data);
- default:
- return -EOPNOTSUPP;
- }
-}
-
-static bool qca807x_distance_valid(int result)
-{
- switch (result) {
- case QCA807X_CDT_RESULTS_OPEN:
- case QCA807X_CDT_RESULTS_SAME_SHORT:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
- return true;
- }
- return false;
-}
-
-static int qca807x_report_length(struct phy_device *phydev,
- int pair, int result)
-{
- int length;
- int ret;
-
- ret = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA807X_CDT_MMD3_MDI0_LENGTH + pair);
- if (ret < 0)
- return ret;
-
- switch (result) {
- case ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT:
- length = (FIELD_GET(QCA807X_CDT_SAME_SHORT_LENGTH_MASK, ret) * 800) / 10;
- break;
- case ETHTOOL_A_CABLE_RESULT_CODE_OPEN:
- case ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT:
- length = (FIELD_GET(QCA807X_CDT_CROSS_SHORT_LENGTH_MASK, ret) * 800) / 10;
- break;
- }
-
- ethnl_cable_test_fault_length(phydev, pair, length);
-
- return 0;
-}
-
-static int qca807x_cable_test_report_trans(int result)
-{
- switch (result) {
- case QCA807X_CDT_RESULTS_OK:
- return ETHTOOL_A_CABLE_RESULT_CODE_OK;
- case QCA807X_CDT_RESULTS_OPEN:
- return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
- case QCA807X_CDT_RESULTS_SAME_SHORT:
- return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
- case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
- return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
- default:
- return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
- }
-}
-
-static int qca807x_cable_test_report(struct phy_device *phydev)
-{
- int pair0, pair1, pair2, pair3;
- int ret;
-
- ret = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA807X_CDT_MMD3_STATUS);
- if (ret < 0)
- return ret;
-
- pair0 = FIELD_GET(QCA807X_CDT_MDI0_STATUS_MASK, ret);
- pair1 = FIELD_GET(QCA807X_CDT_MDI1_STATUS_MASK, ret);
- pair2 = FIELD_GET(QCA807X_CDT_MDI2_STATUS_MASK, ret);
- pair3 = FIELD_GET(QCA807X_CDT_MDI3_STATUS_MASK, ret);
-
- ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_A,
- qca807x_cable_test_report_trans(pair0));
- ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_B,
- qca807x_cable_test_report_trans(pair1));
- ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_C,
- qca807x_cable_test_report_trans(pair2));
- ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_D,
- qca807x_cable_test_report_trans(pair3));
-
- if (qca807x_distance_valid(pair0))
- qca807x_report_length(phydev, 0, qca807x_cable_test_report_trans(pair0));
- if (qca807x_distance_valid(pair1))
- qca807x_report_length(phydev, 1, qca807x_cable_test_report_trans(pair1));
- if (qca807x_distance_valid(pair2))
- qca807x_report_length(phydev, 2, qca807x_cable_test_report_trans(pair2));
- if (qca807x_distance_valid(pair3))
- qca807x_report_length(phydev, 3, qca807x_cable_test_report_trans(pair3));
-
- return 0;
-}
-
-static int qca807x_cable_test_get_status(struct phy_device *phydev,
- bool *finished)
-{
- int val;
-
- *finished = false;
-
- val = phy_read(phydev, QCA807X_CDT);
- if (!((val & QCA807X_CDT_ENABLE) && (val & QCA807X_CDT_STATUS))) {
- *finished = true;
-
- return qca807x_cable_test_report(phydev);
- }
-
- return 0;
-}
-
-static int qca807x_cable_test_start(struct phy_device *phydev)
-{
- int val, ret;
-
- val = phy_read(phydev, QCA807X_CDT);
- /* Enable inter-pair short check as well */
- val &= ~QCA807X_CDT_ENABLE_INTER_PAIR_SHORT;
- val |= QCA807X_CDT_ENABLE;
- ret = phy_write(phydev, QCA807X_CDT, val);
-
- return ret;
-}
-
-#ifdef CONFIG_GPIOLIB
-static int qca807x_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
-{
- return GPIO_LINE_DIRECTION_OUT;
-}
-
-static int qca807x_gpio_get_reg(unsigned int offset)
-{
- return QCA807X_MMD7_LED_100N_2 + (offset % 2) * 2;
-}
-
-static int qca807x_gpio_get(struct gpio_chip *gc, unsigned int offset)
-{
- struct qca807x_gpio_priv *priv = gpiochip_get_data(gc);
- int val;
-
- val = phy_read_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset));
-
- return FIELD_GET(QCA807X_GPIO_FORCE_MODE_MASK, val);
-}
-
-static void qca807x_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)
-{
- struct qca807x_gpio_priv *priv = gpiochip_get_data(gc);
- int val;
-
- val = phy_read_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset));
- val &= ~QCA807X_GPIO_FORCE_MODE_MASK;
- val |= QCA807X_GPIO_FORCE_EN;
- val |= FIELD_PREP(QCA807X_GPIO_FORCE_MODE_MASK, value);
-
- phy_write_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset), val);
-}
-
-static int qca807x_gpio_dir_out(struct gpio_chip *gc, unsigned int offset, int value)
-{
- qca807x_gpio_set(gc, offset, value);
-
- return 0;
-}
-
-static int qca807x_gpio(struct phy_device *phydev)
-{
- struct device *dev = &phydev->mdio.dev;
- struct qca807x_gpio_priv *priv;
- struct gpio_chip *gc;
-
- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
- if (!priv)
- return -ENOMEM;
-
- priv->phy = phydev;
-
- gc = devm_kzalloc(dev, sizeof(*gc), GFP_KERNEL);
- if (!gc)
- return -ENOMEM;
-
- gc->label = dev_name(dev);
- gc->base = -1;
- gc->ngpio = 2;
- gc->parent = dev;
- gc->owner = THIS_MODULE;
- gc->can_sleep = true;
- gc->get_direction = qca807x_gpio_get_direction;
- gc->direction_output = qca807x_gpio_dir_out;
- gc->get = qca807x_gpio_get;
- gc->set = qca807x_gpio_set;
-
- return devm_gpiochip_add_data(dev, gc, priv);
-}
-#endif
-
-static int qca807x_read_copper_status(struct phy_device *phydev)
-{
- int ss, err, old_link = phydev->link;
-
- /* Update the link, but return if there was an error */
- err = genphy_update_link(phydev);
- if (err)
- return err;
-
- /* why bother the PHY if nothing can have changed */
- if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
- return 0;
-
- phydev->speed = SPEED_UNKNOWN;
- phydev->duplex = DUPLEX_UNKNOWN;
- phydev->pause = 0;
- phydev->asym_pause = 0;
-
- err = genphy_read_lpa(phydev);
- if (err < 0)
- return err;
-
- /* Read the QCA807x PHY-Specific Status register copper page,
- * which indicates the speed and duplex that the PHY is actually
- * using, irrespective of whether we are in autoneg mode or not.
- */
- ss = phy_read(phydev, QCA807X_PHY_SPECIFIC_STATUS);
- if (ss < 0)
- return ss;
-
- if (ss & QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED) {
- int sfc;
-
- sfc = phy_read(phydev, QCA807X_FUNCTION_CONTROL);
- if (sfc < 0)
- return sfc;
-
- switch (FIELD_GET(QCA807X_SS_SPEED_MASK, ss)) {
- case QCA807X_SS_SPEED_10:
- phydev->speed = SPEED_10;
- break;
- case QCA807X_SS_SPEED_100:
- phydev->speed = SPEED_100;
- break;
- case QCA807X_SS_SPEED_1000:
- phydev->speed = SPEED_1000;
- break;
- }
- if (ss & QCA807X_SS_DUPLEX)
- phydev->duplex = DUPLEX_FULL;
- else
- phydev->duplex = DUPLEX_HALF;
-
- if (ss & QCA807X_SS_MDIX)
- phydev->mdix = ETH_TP_MDI_X;
- else
- phydev->mdix = ETH_TP_MDI;
-
- switch (FIELD_GET(QCA807X_FC_MDI_CROSSOVER_MODE_MASK, sfc)) {
- case QCA807X_FC_MDI_CROSSOVER_MANUAL_MDI:
- phydev->mdix_ctrl = ETH_TP_MDI;
- break;
- case QCA807X_FC_MDI_CROSSOVER_MANUAL_MDIX:
- phydev->mdix_ctrl = ETH_TP_MDI_X;
- break;
- case QCA807X_FC_MDI_CROSSOVER_AUTO:
- phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
- break;
- }
- }
-
- if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
- phy_resolve_aneg_pause(phydev);
-
- return 0;
-}
-
-static int qca807x_read_fiber_status(struct phy_device *phydev)
-{
- int ss, err, lpa, old_link = phydev->link;
-
- /* Update the link, but return if there was an error */
- err = genphy_update_link(phydev);
- if (err)
- return err;
-
- /* why bother the PHY if nothing can have changed */
- if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
- return 0;
-
- phydev->speed = SPEED_UNKNOWN;
- phydev->duplex = DUPLEX_UNKNOWN;
- phydev->pause = 0;
- phydev->asym_pause = 0;
-
- if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {
- lpa = phy_read(phydev, MII_LPA);
- if (lpa < 0)
- return lpa;
-
- linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
- phydev->lp_advertising, lpa & LPA_LPACK);
- linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
- phydev->lp_advertising, lpa & LPA_1000XFULL);
- linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT,
- phydev->lp_advertising, lpa & LPA_1000XPAUSE);
- linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
- phydev->lp_advertising,
- lpa & LPA_1000XPAUSE_ASYM);
-
- phy_resolve_aneg_linkmode(phydev);
- }
-
- /* Read the QCA807x PHY-Specific Status register fiber page,
- * which indicates the speed and duplex that the PHY is actually
- * using, irrespective of whether we are in autoneg mode or not.
- */
- ss = phy_read(phydev, QCA807X_PHY_SPECIFIC_STATUS);
- if (ss < 0)
- return ss;
-
- if (ss & QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED) {
- switch (FIELD_GET(QCA807X_SS_SPEED_MASK, ss)) {
- case QCA807X_SS_SPEED_100:
- phydev->speed = SPEED_100;
- break;
- case QCA807X_SS_SPEED_1000:
- phydev->speed = SPEED_1000;
- break;
- }
-
- if (ss & QCA807X_SS_DUPLEX)
- phydev->duplex = DUPLEX_FULL;
- else
- phydev->duplex = DUPLEX_HALF;
- }
-
- return 0;
-}
-
-static int qca807x_read_status(struct phy_device *phydev)
-{
- if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported)) {
- switch (phydev->port) {
- case PORT_FIBRE:
- return qca807x_read_fiber_status(phydev);
- case PORT_TP:
- return qca807x_read_copper_status(phydev);
- default:
- return -EINVAL;
- }
- } else
- return qca807x_read_copper_status(phydev);
-}
-
-static int qca807x_config_intr(struct phy_device *phydev)
-{
- int ret, val;
-
- val = phy_read(phydev, QCA807X_INTR_ENABLE);
-
- if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
- /* Check for combo port as it has fewer interrupts */
- if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
- val |= QCA807X_INTR_ENABLE_SPEED_CHANGED;
- val |= QCA807X_INTR_ENABLE_LINK_FAIL;
- val |= QCA807X_INTR_ENABLE_LINK_SUCCESS;
- } else {
- val |= QCA807X_INTR_ENABLE_AUTONEG_ERR;
- val |= QCA807X_INTR_ENABLE_SPEED_CHANGED;
- val |= QCA807X_INTR_ENABLE_DUPLEX_CHANGED;
- val |= QCA807X_INTR_ENABLE_LINK_FAIL;
- val |= QCA807X_INTR_ENABLE_LINK_SUCCESS;
- }
- ret = phy_write(phydev, QCA807X_INTR_ENABLE, val);
- } else {
- ret = phy_write(phydev, QCA807X_INTR_ENABLE, 0);
- }
-
- return ret;
-}
-
-static irqreturn_t qca807x_handle_interrupt(struct phy_device *phydev)
-{
- int irq_status, int_enabled;
-
- irq_status = phy_read(phydev, QCA807X_INTR_STATUS);
- if (irq_status < 0) {
- phy_error(phydev);
- return IRQ_NONE;
- }
-
- /* Read the current enabled interrupts */
- int_enabled = phy_read(phydev, QCA807X_INTR_ENABLE);
- if (int_enabled < 0) {
- phy_error(phydev);
- return IRQ_NONE;
- }
-
- /* See if this was one of our enabled interrupts */
- if (!(irq_status & int_enabled))
- return IRQ_NONE;
-
- phy_trigger_machine(phydev);
-
- return IRQ_HANDLED;
-}
-
-static int qca807x_led_config(struct phy_device *phydev)
-{
- struct device_node *node = phydev->mdio.dev.of_node;
- bool led_config = false;
- int val;
-
- val = phy_read_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_LED_1000N_1);
- if (val < 0)
- return val;
-
- if (of_property_read_bool(node, "qcom,single-led-1000")) {
- val |= QCA807X_LED_TXACT_BLK_EN_2;
- val |= QCA807X_LED_RXACT_BLK_EN_2;
- val |= QCA807X_LED_GT_ON_EN_2;
-
- led_config = true;
- }
-
- if (of_property_read_bool(node, "qcom,single-led-100")) {
- val |= QCA807X_LED_HT_ON_EN_2;
-
- led_config = true;
- }
-
- if (of_property_read_bool(node, "qcom,single-led-10")) {
- val |= QCA807X_LED_BT_ON_EN_2;
-
- led_config = true;
- }
-
- if (led_config)
- return phy_write_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_LED_1000N_1, val);
- else
- return 0;
-}
-
-static int qca807x_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
-{
- struct phy_device *phydev = upstream;
- __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, };
- phy_interface_t iface;
- int ret;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
- DECLARE_PHY_INTERFACE_MASK(interfaces);
-
- sfp_parse_support(phydev->sfp_bus, id, support, interfaces);
-#else
- sfp_parse_support(phydev->sfp_bus, id, support);
-#endif
- iface = sfp_select_interface(phydev->sfp_bus, support);
-
- dev_info(&phydev->mdio.dev, "%s SFP module inserted\n", phy_modes(iface));
-
- switch (iface) {
- case PHY_INTERFACE_MODE_1000BASEX:
- case PHY_INTERFACE_MODE_100BASEX:
- /* Set PHY mode to PSGMII combo (1/4 copper + combo ports) mode */
- ret = phy_modify(phydev,
- QCA807X_CHIP_CONFIGURATION,
- QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK,
- QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_FIBER);
- /* Enable fiber mode autodection (1000Base-X or 100Base-FX) */
- ret = phy_set_bits_mmd(phydev,
- MDIO_MMD_AN,
- QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION,
- QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION_EN);
- /* Select fiber page */
- ret = phy_clear_bits(phydev,
- QCA807X_CHIP_CONFIGURATION,
- QCA807X_BT_BX_REG_SEL);
-
- phydev->port = PORT_FIBRE;
- break;
- default:
- dev_err(&phydev->mdio.dev, "Incompatible SFP module inserted\n");
- return -EINVAL;
- }
-
- return ret;
-}
-
-static void qca807x_sfp_remove(void *upstream)
-{
- struct phy_device *phydev = upstream;
-
- /* Select copper page */
- phy_set_bits(phydev,
- QCA807X_CHIP_CONFIGURATION,
- QCA807X_BT_BX_REG_SEL);
-
- phydev->port = PORT_TP;
-}
-
-static const struct sfp_upstream_ops qca807x_sfp_ops = {
- .attach = phy_sfp_attach,
- .detach = phy_sfp_detach,
- .module_insert = qca807x_sfp_insert,
- .module_remove = qca807x_sfp_remove,
-};
-
-static int qca807x_config(struct phy_device *phydev)
-{
- struct device_node *node = phydev->mdio.dev.of_node;
- int control_dac, ret = 0;
- u32 of_control_dac;
-
- /* Check for Combo port */
- if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
- int psgmii_serdes;
-
- /* Prevent PSGMII going into hibernation via PSGMII self test */
- psgmii_serdes = phy_read_mmd(phydev, MDIO_MMD_PCS, PSGMII_MMD3_SERDES_CONTROL);
- psgmii_serdes &= ~BIT(1);
- ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
- PSGMII_MMD3_SERDES_CONTROL,
- psgmii_serdes);
- }
-
- if (!of_property_read_u32(node, "qcom,control-dac", &of_control_dac)) {
- control_dac = phy_read_mmd(phydev, MDIO_MMD_AN,
- QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH);
- control_dac &= ~QCA807X_CONTROL_DAC_MASK;
- control_dac |= FIELD_PREP(QCA807X_CONTROL_DAC_MASK, of_control_dac);
- ret = phy_write_mmd(phydev, MDIO_MMD_AN,
- QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH,
- control_dac);
- }
-
- /* Optionally configure LED-s */
- if (IS_ENABLED(CONFIG_GPIOLIB)) {
- /* Check whether PHY-s pins are used as GPIO-s */
- if (!of_property_read_bool(node, "gpio-controller"))
- ret = qca807x_led_config(phydev);
- } else {
- ret = qca807x_led_config(phydev);
- }
-
- return ret;
-}
-
-static int qca807x_probe(struct phy_device *phydev)
-{
- struct device_node *node = phydev->mdio.dev.of_node;
- int ret = 0;
-
- if (IS_ENABLED(CONFIG_GPIOLIB)) {
- /* Do not register a GPIO controller unless flagged for it */
- if (of_property_read_bool(node, "gpio-controller"))
- ret = qca807x_gpio(phydev);
- }
-
- /* Attach SFP bus on combo port*/
- if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
- ret = phy_sfp_probe(phydev, &qca807x_sfp_ops);
- linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);
- linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->advertising);
- }
-
- return ret;
-}
-
-static int qca807x_psgmii_config(struct phy_device *phydev)
-{
- struct device_node *node = phydev->mdio.dev.of_node;
- int tx_amp, ret = 0;
- u32 tx_driver_strength;
-
- /* Workaround to enable AZ transmitting ability */
- ret = phy_clear_bits_mmd(phydev,
- MDIO_MMD_PMAPMD,
- PSGMII_MODE_CTRL,
- PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK);
-
- /* PSGMII/QSGMII TX amp set to DT defined value instead of default 600mV */
- if (!of_property_read_u32(node, "qcom,tx-driver-strength", &tx_driver_strength)) {
- tx_amp = phy_read(phydev, PSGMII_QSGMII_DRIVE_CONTROL_1);
- tx_amp &= ~PSGMII_QSGMII_TX_DRIVER_MASK;
- tx_amp |= FIELD_PREP(PSGMII_QSGMII_TX_DRIVER_MASK, tx_driver_strength);
- ret = phy_write(phydev, PSGMII_QSGMII_DRIVE_CONTROL_1, tx_amp);
- }
-
- return ret;
-}
-
-static struct phy_driver qca807x_drivers[] = {
- {
- PHY_ID_MATCH_EXACT(PHY_ID_QCA8072),
- .name = "Qualcomm QCA8072",
- .flags = PHY_POLL_CABLE_TEST,
- /* PHY_GBIT_FEATURES */
- .probe = qca807x_probe,
- .config_init = qca807x_config,
- .read_status = qca807x_read_status,
- .config_intr = qca807x_config_intr,
- .handle_interrupt = qca807x_handle_interrupt,
- .soft_reset = genphy_soft_reset,
- .get_tunable = qca807x_get_tunable,
- .set_tunable = qca807x_set_tunable,
- .resume = genphy_resume,
- .suspend = genphy_suspend,
- .cable_test_start = qca807x_cable_test_start,
- .cable_test_get_status = qca807x_cable_test_get_status,
- },
- {
- PHY_ID_MATCH_EXACT(PHY_ID_QCA8075),
- .name = "Qualcomm QCA8075",
- .flags = PHY_POLL_CABLE_TEST,
- /* PHY_GBIT_FEATURES */
- .probe = qca807x_probe,
- .config_init = qca807x_config,
- .read_status = qca807x_read_status,
- .config_intr = qca807x_config_intr,
- .handle_interrupt = qca807x_handle_interrupt,
- .soft_reset = genphy_soft_reset,
- .get_tunable = qca807x_get_tunable,
- .set_tunable = qca807x_set_tunable,
- .resume = genphy_resume,
- .suspend = genphy_suspend,
- .cable_test_start = qca807x_cable_test_start,
- .cable_test_get_status = qca807x_cable_test_get_status,
- },
- {
- PHY_ID_MATCH_EXACT(PHY_ID_QCA807X_PSGMII),
- .name = "Qualcomm QCA807x PSGMII",
- .probe = qca807x_psgmii_config,
- },
-};
-module_phy_driver(qca807x_drivers);
-
-static struct mdio_device_id __maybe_unused qca807x_tbl[] = {
- { PHY_ID_MATCH_EXACT(PHY_ID_QCA8072) },
- { PHY_ID_MATCH_EXACT(PHY_ID_QCA8075) },
- { PHY_ID_MATCH_MODEL(PHY_ID_QCA807X_PSGMII) },
- { }
-};
-
-MODULE_AUTHOR("Robert Marko");
-MODULE_DESCRIPTION("Qualcomm QCA807x PHY driver");
-MODULE_DEVICE_TABLE(mdio, qca807x_tbl);
-MODULE_LICENSE("GPL");
--- /dev/null
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Sartura Ltd.
+ *
+ * Author: Robert Marko <robert.marko@sartura.hr>
+ *
+ * Qualcomm QCA8072 and QCA8075 PHY driver
+ */
+
+#include <linux/version.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/phy.h>
+#include <linux/bitfield.h>
+#include <linux/ethtool_netlink.h>
+#include <linux/gpio.h>
+#include <linux/sfp.h>
+
+#include <dt-bindings/net/qcom-qca807x.h>
+
+#define PHY_ID_QCA8072 0x004dd0b2
+#define PHY_ID_QCA8075 0x004dd0b1
+#define PHY_ID_QCA807X_PSGMII 0x06820805
+
+/* Downshift */
+#define QCA807X_SMARTSPEED_EN BIT(5)
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_MASK GENMASK(4, 2)
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_DEFAULT 5
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_MIN 2
+#define QCA807X_SMARTSPEED_RETRY_LIMIT_MAX 9
+
+/* Cable diagnostic test (CDT) */
+#define QCA807X_CDT 0x16
+#define QCA807X_CDT_ENABLE BIT(15)
+#define QCA807X_CDT_ENABLE_INTER_PAIR_SHORT BIT(13)
+#define QCA807X_CDT_STATUS BIT(11)
+#define QCA807X_CDT_MMD3_STATUS 0x8064
+#define QCA807X_CDT_MDI0_STATUS_MASK GENMASK(15, 12)
+#define QCA807X_CDT_MDI1_STATUS_MASK GENMASK(11, 8)
+#define QCA807X_CDT_MDI2_STATUS_MASK GENMASK(7, 4)
+#define QCA807X_CDT_MDI3_STATUS_MASK GENMASK(3, 0)
+#define QCA807X_CDT_RESULTS_INVALID 0x0
+#define QCA807X_CDT_RESULTS_OK 0x1
+#define QCA807X_CDT_RESULTS_OPEN 0x2
+#define QCA807X_CDT_RESULTS_SAME_SHORT 0x3
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK 0x4
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK 0x8
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK 0xc
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN 0x6
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN 0xa
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN 0xe
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT 0x7
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT 0xb
+#define QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT 0xf
+#define QCA807X_CDT_RESULTS_BUSY 0x9
+#define QCA807X_CDT_MMD3_MDI0_LENGTH 0x8065
+#define QCA807X_CDT_MMD3_MDI1_LENGTH 0x8066
+#define QCA807X_CDT_MMD3_MDI2_LENGTH 0x8067
+#define QCA807X_CDT_MMD3_MDI3_LENGTH 0x8068
+#define QCA807X_CDT_SAME_SHORT_LENGTH_MASK GENMASK(15, 8)
+#define QCA807X_CDT_CROSS_SHORT_LENGTH_MASK GENMASK(7, 0)
+
+#define QCA807X_CHIP_CONFIGURATION 0x1f
+#define QCA807X_BT_BX_REG_SEL BIT(15)
+#define QCA807X_BT_BX_REG_SEL_FIBER 0
+#define QCA807X_BT_BX_REG_SEL_COPPER 1
+#define QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK GENMASK(3, 0)
+#define QCA807X_CHIP_CONFIGURATION_MODE_QSGMII_SGMII 4
+#define QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_FIBER 3
+#define QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_ALL_COPPER 0
+
+#define QCA807X_MEDIA_SELECT_STATUS 0x1a
+#define QCA807X_MEDIA_DETECTED_COPPER BIT(5)
+#define QCA807X_MEDIA_DETECTED_1000_BASE_X BIT(4)
+#define QCA807X_MEDIA_DETECTED_100_BASE_FX BIT(3)
+
+#define QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION 0x807e
+#define QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION_EN BIT(0)
+
+#define QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH 0x801a
+#define QCA807X_CONTROL_DAC_MASK GENMASK(2, 0)
+
+#define QCA807X_MMD7_LED_100N_1 0x8074
+#define QCA807X_MMD7_LED_100N_2 0x8075
+#define QCA807X_MMD7_LED_1000N_1 0x8076
+#define QCA807X_MMD7_LED_1000N_2 0x8077
+#define QCA807X_LED_TXACT_BLK_EN_2 BIT(10)
+#define QCA807X_LED_RXACT_BLK_EN_2 BIT(9)
+#define QCA807X_LED_GT_ON_EN_2 BIT(6)
+#define QCA807X_LED_HT_ON_EN_2 BIT(5)
+#define QCA807X_LED_BT_ON_EN_2 BIT(4)
+#define QCA807X_GPIO_FORCE_EN BIT(15)
+#define QCA807X_GPIO_FORCE_MODE_MASK GENMASK(14, 13)
+
+#define QCA807X_INTR_ENABLE 0x12
+#define QCA807X_INTR_STATUS 0x13
+#define QCA807X_INTR_ENABLE_AUTONEG_ERR BIT(15)
+#define QCA807X_INTR_ENABLE_SPEED_CHANGED BIT(14)
+#define QCA807X_INTR_ENABLE_DUPLEX_CHANGED BIT(13)
+#define QCA807X_INTR_ENABLE_LINK_FAIL BIT(11)
+#define QCA807X_INTR_ENABLE_LINK_SUCCESS BIT(10)
+
+#define QCA807X_FUNCTION_CONTROL 0x10
+#define QCA807X_FC_MDI_CROSSOVER_MODE_MASK GENMASK(6, 5)
+#define QCA807X_FC_MDI_CROSSOVER_AUTO 3
+#define QCA807X_FC_MDI_CROSSOVER_MANUAL_MDIX 1
+#define QCA807X_FC_MDI_CROSSOVER_MANUAL_MDI 0
+
+#define QCA807X_PHY_SPECIFIC_STATUS 0x11
+#define QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED BIT(11)
+#define QCA807X_SS_SPEED_MASK GENMASK(15, 14)
+#define QCA807X_SS_SPEED_1000 2
+#define QCA807X_SS_SPEED_100 1
+#define QCA807X_SS_SPEED_10 0
+#define QCA807X_SS_DUPLEX BIT(13)
+#define QCA807X_SS_MDIX BIT(6)
+
+/* PSGMII PHY specific */
+#define PSGMII_QSGMII_DRIVE_CONTROL_1 0xb
+#define PSGMII_QSGMII_TX_DRIVER_MASK GENMASK(7, 4)
+#define PSGMII_MODE_CTRL 0x6d
+#define PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK BIT(0)
+#define PSGMII_MMD3_SERDES_CONTROL 0x805a
+
+struct qca807x_gpio_priv {
+ struct phy_device *phy;
+};
+
+static int qca807x_get_downshift(struct phy_device *phydev, u8 *data)
+{
+ int val, cnt, enable;
+
+ val = phy_read(phydev, MII_NWAYTEST);
+ if (val < 0)
+ return val;
+
+ enable = FIELD_GET(QCA807X_SMARTSPEED_EN, val);
+ cnt = FIELD_GET(QCA807X_SMARTSPEED_RETRY_LIMIT_MASK, val) + 2;
+
+ *data = enable ? cnt : DOWNSHIFT_DEV_DISABLE;
+
+ return 0;
+}
+
+static int qca807x_set_downshift(struct phy_device *phydev, u8 cnt)
+{
+ int ret, val;
+
+ if (cnt > QCA807X_SMARTSPEED_RETRY_LIMIT_MAX ||
+ (cnt < QCA807X_SMARTSPEED_RETRY_LIMIT_MIN && cnt != DOWNSHIFT_DEV_DISABLE))
+ return -EINVAL;
+
+ if (!cnt) {
+ ret = phy_clear_bits(phydev, MII_NWAYTEST, QCA807X_SMARTSPEED_EN);
+ } else {
+ val = QCA807X_SMARTSPEED_EN;
+ val |= FIELD_PREP(QCA807X_SMARTSPEED_RETRY_LIMIT_MASK, cnt - 2);
+
+ phy_modify(phydev, MII_NWAYTEST,
+ QCA807X_SMARTSPEED_EN |
+ QCA807X_SMARTSPEED_RETRY_LIMIT_MASK,
+ val);
+ }
+
+ ret = genphy_soft_reset(phydev);
+
+ return ret;
+}
+
+static int qca807x_get_tunable(struct phy_device *phydev,
+ struct ethtool_tunable *tuna, void *data)
+{
+ switch (tuna->id) {
+ case ETHTOOL_PHY_DOWNSHIFT:
+ return qca807x_get_downshift(phydev, data);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static int qca807x_set_tunable(struct phy_device *phydev,
+ struct ethtool_tunable *tuna, const void *data)
+{
+ switch (tuna->id) {
+ case ETHTOOL_PHY_DOWNSHIFT:
+ return qca807x_set_downshift(phydev, *(const u8 *)data);
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
+static bool qca807x_distance_valid(int result)
+{
+ switch (result) {
+ case QCA807X_CDT_RESULTS_OPEN:
+ case QCA807X_CDT_RESULTS_SAME_SHORT:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+ return true;
+ }
+ return false;
+}
+
+static int qca807x_report_length(struct phy_device *phydev,
+ int pair, int result)
+{
+ int length;
+ int ret;
+
+ ret = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA807X_CDT_MMD3_MDI0_LENGTH + pair);
+ if (ret < 0)
+ return ret;
+
+ switch (result) {
+ case ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT:
+ length = (FIELD_GET(QCA807X_CDT_SAME_SHORT_LENGTH_MASK, ret) * 800) / 10;
+ break;
+ case ETHTOOL_A_CABLE_RESULT_CODE_OPEN:
+ case ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT:
+ length = (FIELD_GET(QCA807X_CDT_CROSS_SHORT_LENGTH_MASK, ret) * 800) / 10;
+ break;
+ }
+
+ ethnl_cable_test_fault_length(phydev, pair, length);
+
+ return 0;
+}
+
+static int qca807x_cable_test_report_trans(int result)
+{
+ switch (result) {
+ case QCA807X_CDT_RESULTS_OK:
+ return ETHTOOL_A_CABLE_RESULT_CODE_OK;
+ case QCA807X_CDT_RESULTS_OPEN:
+ return ETHTOOL_A_CABLE_RESULT_CODE_OPEN;
+ case QCA807X_CDT_RESULTS_SAME_SHORT:
+ return ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT;
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OK:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OK:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OK:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_OPEN:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_OPEN:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_OPEN:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI1_SAME_SHORT:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI2_SAME_SHORT:
+ case QCA807X_CDT_RESULTS_CROSS_SHORT_WITH_MDI3_SAME_SHORT:
+ return ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT;
+ default:
+ return ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC;
+ }
+}
+
+static int qca807x_cable_test_report(struct phy_device *phydev)
+{
+ int pair0, pair1, pair2, pair3;
+ int ret;
+
+ ret = phy_read_mmd(phydev, MDIO_MMD_PCS, QCA807X_CDT_MMD3_STATUS);
+ if (ret < 0)
+ return ret;
+
+ pair0 = FIELD_GET(QCA807X_CDT_MDI0_STATUS_MASK, ret);
+ pair1 = FIELD_GET(QCA807X_CDT_MDI1_STATUS_MASK, ret);
+ pair2 = FIELD_GET(QCA807X_CDT_MDI2_STATUS_MASK, ret);
+ pair3 = FIELD_GET(QCA807X_CDT_MDI3_STATUS_MASK, ret);
+
+ ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_A,
+ qca807x_cable_test_report_trans(pair0));
+ ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_B,
+ qca807x_cable_test_report_trans(pair1));
+ ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_C,
+ qca807x_cable_test_report_trans(pair2));
+ ethnl_cable_test_result(phydev, ETHTOOL_A_CABLE_PAIR_D,
+ qca807x_cable_test_report_trans(pair3));
+
+ if (qca807x_distance_valid(pair0))
+ qca807x_report_length(phydev, 0, qca807x_cable_test_report_trans(pair0));
+ if (qca807x_distance_valid(pair1))
+ qca807x_report_length(phydev, 1, qca807x_cable_test_report_trans(pair1));
+ if (qca807x_distance_valid(pair2))
+ qca807x_report_length(phydev, 2, qca807x_cable_test_report_trans(pair2));
+ if (qca807x_distance_valid(pair3))
+ qca807x_report_length(phydev, 3, qca807x_cable_test_report_trans(pair3));
+
+ return 0;
+}
+
+static int qca807x_cable_test_get_status(struct phy_device *phydev,
+ bool *finished)
+{
+ int val;
+
+ *finished = false;
+
+ val = phy_read(phydev, QCA807X_CDT);
+ if (!((val & QCA807X_CDT_ENABLE) && (val & QCA807X_CDT_STATUS))) {
+ *finished = true;
+
+ return qca807x_cable_test_report(phydev);
+ }
+
+ return 0;
+}
+
+static int qca807x_cable_test_start(struct phy_device *phydev)
+{
+ int val, ret;
+
+ val = phy_read(phydev, QCA807X_CDT);
+ /* Enable inter-pair short check as well */
+ val &= ~QCA807X_CDT_ENABLE_INTER_PAIR_SHORT;
+ val |= QCA807X_CDT_ENABLE;
+ ret = phy_write(phydev, QCA807X_CDT, val);
+
+ return ret;
+}
+
+#ifdef CONFIG_GPIOLIB
+static int qca807x_gpio_get_direction(struct gpio_chip *gc, unsigned int offset)
+{
+ return GPIO_LINE_DIRECTION_OUT;
+}
+
+static int qca807x_gpio_get_reg(unsigned int offset)
+{
+ return QCA807X_MMD7_LED_100N_2 + (offset % 2) * 2;
+}
+
+static int qca807x_gpio_get(struct gpio_chip *gc, unsigned int offset)
+{
+ struct qca807x_gpio_priv *priv = gpiochip_get_data(gc);
+ int val;
+
+ val = phy_read_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset));
+
+ return FIELD_GET(QCA807X_GPIO_FORCE_MODE_MASK, val);
+}
+
+static void qca807x_gpio_set(struct gpio_chip *gc, unsigned int offset, int value)
+{
+ struct qca807x_gpio_priv *priv = gpiochip_get_data(gc);
+ int val;
+
+ val = phy_read_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset));
+ val &= ~QCA807X_GPIO_FORCE_MODE_MASK;
+ val |= QCA807X_GPIO_FORCE_EN;
+ val |= FIELD_PREP(QCA807X_GPIO_FORCE_MODE_MASK, value);
+
+ phy_write_mmd(priv->phy, MDIO_MMD_AN, qca807x_gpio_get_reg(offset), val);
+}
+
+static int qca807x_gpio_dir_out(struct gpio_chip *gc, unsigned int offset, int value)
+{
+ qca807x_gpio_set(gc, offset, value);
+
+ return 0;
+}
+
+static int qca807x_gpio(struct phy_device *phydev)
+{
+ struct device *dev = &phydev->mdio.dev;
+ struct qca807x_gpio_priv *priv;
+ struct gpio_chip *gc;
+
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ priv->phy = phydev;
+
+ gc = devm_kzalloc(dev, sizeof(*gc), GFP_KERNEL);
+ if (!gc)
+ return -ENOMEM;
+
+ gc->label = dev_name(dev);
+ gc->base = -1;
+ gc->ngpio = 2;
+ gc->parent = dev;
+ gc->owner = THIS_MODULE;
+ gc->can_sleep = true;
+ gc->get_direction = qca807x_gpio_get_direction;
+ gc->direction_output = qca807x_gpio_dir_out;
+ gc->get = qca807x_gpio_get;
+ gc->set = qca807x_gpio_set;
+
+ return devm_gpiochip_add_data(dev, gc, priv);
+}
+#endif
+
+static int qca807x_read_copper_status(struct phy_device *phydev)
+{
+ int ss, err, old_link = phydev->link;
+
+ /* Update the link, but return if there was an error */
+ err = genphy_update_link(phydev);
+ if (err)
+ return err;
+
+ /* why bother the PHY if nothing can have changed */
+ if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+ return 0;
+
+ phydev->speed = SPEED_UNKNOWN;
+ phydev->duplex = DUPLEX_UNKNOWN;
+ phydev->pause = 0;
+ phydev->asym_pause = 0;
+
+ err = genphy_read_lpa(phydev);
+ if (err < 0)
+ return err;
+
+ /* Read the QCA807x PHY-Specific Status register copper page,
+ * which indicates the speed and duplex that the PHY is actually
+ * using, irrespective of whether we are in autoneg mode or not.
+ */
+ ss = phy_read(phydev, QCA807X_PHY_SPECIFIC_STATUS);
+ if (ss < 0)
+ return ss;
+
+ if (ss & QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED) {
+ int sfc;
+
+ sfc = phy_read(phydev, QCA807X_FUNCTION_CONTROL);
+ if (sfc < 0)
+ return sfc;
+
+ switch (FIELD_GET(QCA807X_SS_SPEED_MASK, ss)) {
+ case QCA807X_SS_SPEED_10:
+ phydev->speed = SPEED_10;
+ break;
+ case QCA807X_SS_SPEED_100:
+ phydev->speed = SPEED_100;
+ break;
+ case QCA807X_SS_SPEED_1000:
+ phydev->speed = SPEED_1000;
+ break;
+ }
+ if (ss & QCA807X_SS_DUPLEX)
+ phydev->duplex = DUPLEX_FULL;
+ else
+ phydev->duplex = DUPLEX_HALF;
+
+ if (ss & QCA807X_SS_MDIX)
+ phydev->mdix = ETH_TP_MDI_X;
+ else
+ phydev->mdix = ETH_TP_MDI;
+
+ switch (FIELD_GET(QCA807X_FC_MDI_CROSSOVER_MODE_MASK, sfc)) {
+ case QCA807X_FC_MDI_CROSSOVER_MANUAL_MDI:
+ phydev->mdix_ctrl = ETH_TP_MDI;
+ break;
+ case QCA807X_FC_MDI_CROSSOVER_MANUAL_MDIX:
+ phydev->mdix_ctrl = ETH_TP_MDI_X;
+ break;
+ case QCA807X_FC_MDI_CROSSOVER_AUTO:
+ phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
+ break;
+ }
+ }
+
+ if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete)
+ phy_resolve_aneg_pause(phydev);
+
+ return 0;
+}
+
+static int qca807x_read_fiber_status(struct phy_device *phydev)
+{
+ int ss, err, lpa, old_link = phydev->link;
+
+ /* Update the link, but return if there was an error */
+ err = genphy_update_link(phydev);
+ if (err)
+ return err;
+
+ /* why bother the PHY if nothing can have changed */
+ if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
+ return 0;
+
+ phydev->speed = SPEED_UNKNOWN;
+ phydev->duplex = DUPLEX_UNKNOWN;
+ phydev->pause = 0;
+ phydev->asym_pause = 0;
+
+ if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {
+ lpa = phy_read(phydev, MII_LPA);
+ if (lpa < 0)
+ return lpa;
+
+ linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+ phydev->lp_advertising, lpa & LPA_LPACK);
+ linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
+ phydev->lp_advertising, lpa & LPA_1000XFULL);
+ linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT,
+ phydev->lp_advertising, lpa & LPA_1000XPAUSE);
+ linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+ phydev->lp_advertising,
+ lpa & LPA_1000XPAUSE_ASYM);
+
+ phy_resolve_aneg_linkmode(phydev);
+ }
+
+ /* Read the QCA807x PHY-Specific Status register fiber page,
+ * which indicates the speed and duplex that the PHY is actually
+ * using, irrespective of whether we are in autoneg mode or not.
+ */
+ ss = phy_read(phydev, QCA807X_PHY_SPECIFIC_STATUS);
+ if (ss < 0)
+ return ss;
+
+ if (ss & QCA807X_SS_SPEED_AND_DUPLEX_RESOLVED) {
+ switch (FIELD_GET(QCA807X_SS_SPEED_MASK, ss)) {
+ case QCA807X_SS_SPEED_100:
+ phydev->speed = SPEED_100;
+ break;
+ case QCA807X_SS_SPEED_1000:
+ phydev->speed = SPEED_1000;
+ break;
+ }
+
+ if (ss & QCA807X_SS_DUPLEX)
+ phydev->duplex = DUPLEX_FULL;
+ else
+ phydev->duplex = DUPLEX_HALF;
+ }
+
+ return 0;
+}
+
+static int qca807x_read_status(struct phy_device *phydev)
+{
+ if (linkmode_test_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported)) {
+ switch (phydev->port) {
+ case PORT_FIBRE:
+ return qca807x_read_fiber_status(phydev);
+ case PORT_TP:
+ return qca807x_read_copper_status(phydev);
+ default:
+ return -EINVAL;
+ }
+ } else
+ return qca807x_read_copper_status(phydev);
+}
+
+static int qca807x_config_intr(struct phy_device *phydev)
+{
+ int ret, val;
+
+ val = phy_read(phydev, QCA807X_INTR_ENABLE);
+
+ if (phydev->interrupts == PHY_INTERRUPT_ENABLED) {
+ /* Check for combo port as it has fewer interrupts */
+ if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+ val |= QCA807X_INTR_ENABLE_SPEED_CHANGED;
+ val |= QCA807X_INTR_ENABLE_LINK_FAIL;
+ val |= QCA807X_INTR_ENABLE_LINK_SUCCESS;
+ } else {
+ val |= QCA807X_INTR_ENABLE_AUTONEG_ERR;
+ val |= QCA807X_INTR_ENABLE_SPEED_CHANGED;
+ val |= QCA807X_INTR_ENABLE_DUPLEX_CHANGED;
+ val |= QCA807X_INTR_ENABLE_LINK_FAIL;
+ val |= QCA807X_INTR_ENABLE_LINK_SUCCESS;
+ }
+ ret = phy_write(phydev, QCA807X_INTR_ENABLE, val);
+ } else {
+ ret = phy_write(phydev, QCA807X_INTR_ENABLE, 0);
+ }
+
+ return ret;
+}
+
+static irqreturn_t qca807x_handle_interrupt(struct phy_device *phydev)
+{
+ int irq_status, int_enabled;
+
+ irq_status = phy_read(phydev, QCA807X_INTR_STATUS);
+ if (irq_status < 0) {
+ phy_error(phydev);
+ return IRQ_NONE;
+ }
+
+ /* Read the current enabled interrupts */
+ int_enabled = phy_read(phydev, QCA807X_INTR_ENABLE);
+ if (int_enabled < 0) {
+ phy_error(phydev);
+ return IRQ_NONE;
+ }
+
+ /* See if this was one of our enabled interrupts */
+ if (!(irq_status & int_enabled))
+ return IRQ_NONE;
+
+ phy_trigger_machine(phydev);
+
+ return IRQ_HANDLED;
+}
+
+static int qca807x_led_config(struct phy_device *phydev)
+{
+ struct device_node *node = phydev->mdio.dev.of_node;
+ bool led_config = false;
+ int val;
+
+ val = phy_read_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_LED_1000N_1);
+ if (val < 0)
+ return val;
+
+ if (of_property_read_bool(node, "qcom,single-led-1000")) {
+ val |= QCA807X_LED_TXACT_BLK_EN_2;
+ val |= QCA807X_LED_RXACT_BLK_EN_2;
+ val |= QCA807X_LED_GT_ON_EN_2;
+
+ led_config = true;
+ }
+
+ if (of_property_read_bool(node, "qcom,single-led-100")) {
+ val |= QCA807X_LED_HT_ON_EN_2;
+
+ led_config = true;
+ }
+
+ if (of_property_read_bool(node, "qcom,single-led-10")) {
+ val |= QCA807X_LED_BT_ON_EN_2;
+
+ led_config = true;
+ }
+
+ if (led_config)
+ return phy_write_mmd(phydev, MDIO_MMD_AN, QCA807X_MMD7_LED_1000N_1, val);
+ else
+ return 0;
+}
+
+static int qca807x_sfp_insert(void *upstream, const struct sfp_eeprom_id *id)
+{
+ struct phy_device *phydev = upstream;
+ __ETHTOOL_DECLARE_LINK_MODE_MASK(support) = { 0, };
+ phy_interface_t iface;
+ int ret;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,1,0)
+ DECLARE_PHY_INTERFACE_MASK(interfaces);
+
+ sfp_parse_support(phydev->sfp_bus, id, support, interfaces);
+#else
+ sfp_parse_support(phydev->sfp_bus, id, support);
+#endif
+ iface = sfp_select_interface(phydev->sfp_bus, support);
+
+ dev_info(&phydev->mdio.dev, "%s SFP module inserted\n", phy_modes(iface));
+
+ switch (iface) {
+ case PHY_INTERFACE_MODE_1000BASEX:
+ case PHY_INTERFACE_MODE_100BASEX:
+ /* Set PHY mode to PSGMII combo (1/4 copper + combo ports) mode */
+ ret = phy_modify(phydev,
+ QCA807X_CHIP_CONFIGURATION,
+ QCA807X_CHIP_CONFIGURATION_MODE_CFG_MASK,
+ QCA807X_CHIP_CONFIGURATION_MODE_PSGMII_FIBER);
+ /* Enable fiber mode autodection (1000Base-X or 100Base-FX) */
+ ret = phy_set_bits_mmd(phydev,
+ MDIO_MMD_AN,
+ QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION,
+ QCA807X_MMD7_FIBER_MODE_AUTO_DETECTION_EN);
+ /* Select fiber page */
+ ret = phy_clear_bits(phydev,
+ QCA807X_CHIP_CONFIGURATION,
+ QCA807X_BT_BX_REG_SEL);
+
+ phydev->port = PORT_FIBRE;
+ break;
+ default:
+ dev_err(&phydev->mdio.dev, "Incompatible SFP module inserted\n");
+ return -EINVAL;
+ }
+
+ return ret;
+}
+
+static void qca807x_sfp_remove(void *upstream)
+{
+ struct phy_device *phydev = upstream;
+
+ /* Select copper page */
+ phy_set_bits(phydev,
+ QCA807X_CHIP_CONFIGURATION,
+ QCA807X_BT_BX_REG_SEL);
+
+ phydev->port = PORT_TP;
+}
+
+static const struct sfp_upstream_ops qca807x_sfp_ops = {
+ .attach = phy_sfp_attach,
+ .detach = phy_sfp_detach,
+ .module_insert = qca807x_sfp_insert,
+ .module_remove = qca807x_sfp_remove,
+};
+
+static int qca807x_config(struct phy_device *phydev)
+{
+ struct device_node *node = phydev->mdio.dev.of_node;
+ int control_dac, ret = 0;
+ u32 of_control_dac;
+
+ /* Check for Combo port */
+ if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+ int psgmii_serdes;
+
+ /* Prevent PSGMII going into hibernation via PSGMII self test */
+ psgmii_serdes = phy_read_mmd(phydev, MDIO_MMD_PCS, PSGMII_MMD3_SERDES_CONTROL);
+ psgmii_serdes &= ~BIT(1);
+ ret = phy_write_mmd(phydev, MDIO_MMD_PCS,
+ PSGMII_MMD3_SERDES_CONTROL,
+ psgmii_serdes);
+ }
+
+ if (!of_property_read_u32(node, "qcom,control-dac", &of_control_dac)) {
+ control_dac = phy_read_mmd(phydev, MDIO_MMD_AN,
+ QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH);
+ control_dac &= ~QCA807X_CONTROL_DAC_MASK;
+ control_dac |= FIELD_PREP(QCA807X_CONTROL_DAC_MASK, of_control_dac);
+ ret = phy_write_mmd(phydev, MDIO_MMD_AN,
+ QCA807X_MMD7_1000BASE_T_POWER_SAVE_PER_CABLE_LENGTH,
+ control_dac);
+ }
+
+ /* Optionally configure LED-s */
+ if (IS_ENABLED(CONFIG_GPIOLIB)) {
+ /* Check whether PHY-s pins are used as GPIO-s */
+ if (!of_property_read_bool(node, "gpio-controller"))
+ ret = qca807x_led_config(phydev);
+ } else {
+ ret = qca807x_led_config(phydev);
+ }
+
+ return ret;
+}
+
+static int qca807x_probe(struct phy_device *phydev)
+{
+ struct device_node *node = phydev->mdio.dev.of_node;
+ int ret = 0;
+
+ if (IS_ENABLED(CONFIG_GPIOLIB)) {
+ /* Do not register a GPIO controller unless flagged for it */
+ if (of_property_read_bool(node, "gpio-controller"))
+ ret = qca807x_gpio(phydev);
+ }
+
+ /* Attach SFP bus on combo port*/
+ if (phy_read(phydev, QCA807X_CHIP_CONFIGURATION)) {
+ ret = phy_sfp_probe(phydev, &qca807x_sfp_ops);
+ linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->supported);
+ linkmode_set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, phydev->advertising);
+ }
+
+ return ret;
+}
+
+static int qca807x_psgmii_config(struct phy_device *phydev)
+{
+ struct device_node *node = phydev->mdio.dev.of_node;
+ int tx_amp, ret = 0;
+ u32 tx_driver_strength;
+
+ /* Workaround to enable AZ transmitting ability */
+ ret = phy_clear_bits_mmd(phydev,
+ MDIO_MMD_PMAPMD,
+ PSGMII_MODE_CTRL,
+ PSGMII_MODE_CTRL_AZ_WORKAROUND_MASK);
+
+ /* PSGMII/QSGMII TX amp set to DT defined value instead of default 600mV */
+ if (!of_property_read_u32(node, "qcom,tx-driver-strength", &tx_driver_strength)) {
+ tx_amp = phy_read(phydev, PSGMII_QSGMII_DRIVE_CONTROL_1);
+ tx_amp &= ~PSGMII_QSGMII_TX_DRIVER_MASK;
+ tx_amp |= FIELD_PREP(PSGMII_QSGMII_TX_DRIVER_MASK, tx_driver_strength);
+ ret = phy_write(phydev, PSGMII_QSGMII_DRIVE_CONTROL_1, tx_amp);
+ }
+
+ return ret;
+}
+
+static struct phy_driver qca807x_drivers[] = {
+ {
+ PHY_ID_MATCH_EXACT(PHY_ID_QCA8072),
+ .name = "Qualcomm QCA8072",
+ .flags = PHY_POLL_CABLE_TEST,
+ /* PHY_GBIT_FEATURES */
+ .probe = qca807x_probe,
+ .config_init = qca807x_config,
+ .read_status = qca807x_read_status,
+ .config_intr = qca807x_config_intr,
+ .handle_interrupt = qca807x_handle_interrupt,
+ .soft_reset = genphy_soft_reset,
+ .get_tunable = qca807x_get_tunable,
+ .set_tunable = qca807x_set_tunable,
+ .resume = genphy_resume,
+ .suspend = genphy_suspend,
+ .cable_test_start = qca807x_cable_test_start,
+ .cable_test_get_status = qca807x_cable_test_get_status,
+ },
+ {
+ PHY_ID_MATCH_EXACT(PHY_ID_QCA8075),
+ .name = "Qualcomm QCA8075",
+ .flags = PHY_POLL_CABLE_TEST,
+ /* PHY_GBIT_FEATURES */
+ .probe = qca807x_probe,
+ .config_init = qca807x_config,
+ .read_status = qca807x_read_status,
+ .config_intr = qca807x_config_intr,
+ .handle_interrupt = qca807x_handle_interrupt,
+ .soft_reset = genphy_soft_reset,
+ .get_tunable = qca807x_get_tunable,
+ .set_tunable = qca807x_set_tunable,
+ .resume = genphy_resume,
+ .suspend = genphy_suspend,
+ .cable_test_start = qca807x_cable_test_start,
+ .cable_test_get_status = qca807x_cable_test_get_status,
+ },
+ {
+ PHY_ID_MATCH_EXACT(PHY_ID_QCA807X_PSGMII),
+ .name = "Qualcomm QCA807x PSGMII",
+ .probe = qca807x_psgmii_config,
+ },
+};
+module_phy_driver(qca807x_drivers);
+
+static struct mdio_device_id __maybe_unused qca807x_tbl[] = {
+ { PHY_ID_MATCH_EXACT(PHY_ID_QCA8072) },
+ { PHY_ID_MATCH_EXACT(PHY_ID_QCA8075) },
+ { PHY_ID_MATCH_MODEL(PHY_ID_QCA807X_PSGMII) },
+ { }
+};
+
+MODULE_AUTHOR("Robert Marko");
+MODULE_DESCRIPTION("Qualcomm QCA807x PHY driver");
+MODULE_DEVICE_TABLE(mdio, qca807x_tbl);
+MODULE_LICENSE("GPL");
drivers/net/phy/Makefile | 1 +
2 files changed, 8 insertions(+)
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -366,6 +366,13 @@ config AT803X_PHY
- Currently supports the AR8030, AR8031, AR8033, AR8035 and internal
- QCA8337(Internal qca8k PHY) model
+--- a/drivers/net/phy/qcom/Kconfig
++++ b/drivers/net/phy/qcom/Kconfig
+@@ -15,6 +15,13 @@ config QCA83XX_PHY
+ help
+ Currently supports the internal QCA8337(Internal qca8k PHY) model
+config QCA807X_PHY
+ tristate "Qualcomm QCA807x PHYs"
+ Currently supports the Qualcomm QCA8072, QCA8075 and the PSGMII
+ control PHY.
+
- config QSEMI_PHY
- tristate "Quality Semiconductor PHYs"
- help
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -90,6 +90,7 @@ obj-$(CONFIG_MOTORCOMM_PHY) += motorcomm
- obj-$(CONFIG_NATIONAL_PHY) += national.o
- obj-$(CONFIG_NXP_C45_TJA11XX_PHY) += nxp-c45-tja11xx.o
- obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
+ config QCA808X_PHY
+ tristate "Qualcomm QCA808x PHYs"
+ select QCOM_NET_PHYLIB
+--- a/drivers/net/phy/qcom/Makefile
++++ b/drivers/net/phy/qcom/Makefile
+@@ -2,4 +2,5 @@
+ obj-$(CONFIG_QCOM_NET_PHYLIB) += qcom-phy-lib.o
+ obj-$(CONFIG_AT803X_PHY) += at803x.o
+ obj-$(CONFIG_QCA83XX_PHY) += qca83xx.o
+obj-$(CONFIG_QCA807X_PHY) += qca807x.o
- obj-$(CONFIG_QSEMI_PHY) += qsemi.o
- obj-$(CONFIG_REALTEK_PHY) += realtek.o
- obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
+ obj-$(CONFIG_QCA808X_PHY) += qca808x.o
CONFIG_ARM_THUMB=y
CONFIG_ARM_UNWIND=y
CONFIG_ARM_VIRT_EXT=y
-CONFIG_AT803X_PHY=y
CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLK_MQ_PCI=y
CONFIG_PRINTK_TIME=y
CONFIG_PTP_1588_CLOCK=y
CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_QCA83XX_PHY=y
# CONFIG_QCM_DISPCC_2290 is not set
# CONFIG_QCM_GCC_2290 is not set
# CONFIG_QCOM_A53PLL is not set
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -386,6 +386,12 @@ config ROCKCHIP_PHY
+@@ -381,6 +381,12 @@ config ROCKCHIP_PHY
help
Currently supports the integrated Ethernet PHY.
depends on PTP_1588_CLOCK_OPTIONAL
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -80,6 +80,7 @@ obj-$(CONFIG_MARVELL_PHY) += marvell.o
+@@ -79,6 +79,7 @@ obj-$(CONFIG_MARVELL_PHY) += marvell.o
obj-$(CONFIG_MARVELL_88X2222_PHY) += marvell-88x2222.o
obj-$(CONFIG_MAXLINEAR_GPHY) += mxl-gpy.o
obj-$(CONFIG_MEDIATEK_GE_PHY) += mediatek-ge.o
depends on PTP_1588_CLOCK_OPTIONAL
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
-@@ -79,6 +79,7 @@ obj-$(CONFIG_MARVELL_10G_PHY) += marvell
+@@ -78,6 +78,7 @@ obj-$(CONFIG_MARVELL_10G_PHY) += marvell
obj-$(CONFIG_MARVELL_PHY) += marvell.o
obj-$(CONFIG_MARVELL_88X2222_PHY) += marvell-88x2222.o
obj-$(CONFIG_MAXLINEAR_GPHY) += mxl-gpy.o