[][kernel][common][eth][Refactor MDC divider support]
[Description]
Refactor MDC divider support.
Refactor MDC setup function refers to Daniel Golle's upstream patch.
- https://patchwork.kernel.org/project/linux-mediatek/patch/
689e941a0408e5a54466d28d22c9130c0599cd0d.1678357225.git.
daniel@makrotopia.org/
And move MDC setup function to mtk_hw_init().
If without this patch, MDC will revert to 2.5MHz after SER reset.
[Release-log]
N/A
Change-Id: I33a5a6dc0b3c51fcd993a0d3a72f64814ced759c
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/7255778
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-emmc.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-emmc.dts
index 428d3d2..7ac39b6 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-emmc.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-emmc.dts
@@ -201,7 +201,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-sd.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-sd.dts
index 4805f15..a95813b 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-sd.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-sd.dts
@@ -192,7 +192,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-snfi-nand.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-snfi-nand.dts
index d2ce655..9d7b54c 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-snfi-nand.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-snfi-nand.dts
@@ -227,7 +227,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nand.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nand.dts
index fc9d17c..63d8578 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nand.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nand.dts
@@ -372,7 +372,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nor.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nor.dts
index 093a55d..7db5164 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nor.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-dsa-10g-spim-nor.dts
@@ -217,7 +217,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand-4pcie.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand-4pcie.dts
index 3e61896..5f03637 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand-4pcie.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand-4pcie.dts
@@ -323,7 +323,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand.dts
index 53d0b93..c19e0bf 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988a-gsw-10g-spim-nand.dts
@@ -343,7 +343,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-emmc.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-emmc.dts
index 4cd6054..fe54f53 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-emmc.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-emmc.dts
@@ -193,7 +193,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-sd.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-sd.dts
index e8743bf..38ee0de 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-sd.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-sd.dts
@@ -184,7 +184,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-snfi-nand.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-snfi-nand.dts
index fc3f58d..cbc7ff0 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-snfi-nand.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-snfi-nand.dts
@@ -219,7 +219,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nand.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nand.dts
index 22ec0a1..bef96d4 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nand.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nand.dts
@@ -359,7 +359,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nor.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nor.dts
index 26fd171..67c6508 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nor.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-dsa-10g-spim-nor.dts
@@ -209,7 +209,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-gsw-10g-spim-nand.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-gsw-10g-spim-nand.dts
index 473ea27..f1ac7c9 100644
--- a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-gsw-10g-spim-nand.dts
+++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7988c-gsw-10g-spim-nand.dts
@@ -335,7 +335,7 @@
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
- mdc-max-frequency = <10500000>;
+ clock-frequency = <10500000>;
phy0: ethernet-phy@0 {
reg = <0>;
diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 782ff76..3eaa951 100755
--- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1081,10 +1081,10 @@
.mac_link_up = mtk_mac_link_up,
};
-static int mtk_mdio_init(struct mtk_eth *eth)
+static int mtk_mdc_init(struct mtk_eth *eth)
{
struct device_node *mii_np;
- int clk = 25000000, max_clk = 2500000, divider = 1;
+ int max_clk = 2500000, divider;
int ret;
u32 val;
@@ -1099,33 +1099,17 @@
goto err_put_node;
}
- eth->mii_bus = devm_mdiobus_alloc(eth->dev);
- if (!eth->mii_bus) {
- ret = -ENOMEM;
- goto err_put_node;
- }
-
- eth->mii_bus->name = "mdio";
- eth->mii_bus->read = mtk_mdio_read;
- eth->mii_bus->write = mtk_mdio_write;
- eth->mii_bus->reset = mtk_mdio_reset;
- eth->mii_bus->priv = eth;
- eth->mii_bus->parent = eth->dev;
-
- if(snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%pOFn", mii_np) < 0) {
- ret = -ENOMEM;
- goto err_put_node;
- }
-
- if (!of_property_read_u32(mii_np, "mdc-max-frequency", &val))
+ if (!of_property_read_u32(mii_np, "clock-frequency", &val)) {
+ if (val > MDC_MAX_FREQ ||
+ val < MDC_MAX_FREQ / MDC_MAX_DIVIDER) {
+ dev_err(eth->dev, "MDIO clock frequency out of range");
+ ret = -EINVAL;
+ goto err_put_node;
+ }
max_clk = val;
-
- while (clk / divider > max_clk) {
- if (divider >= 63)
- break;
+ }
- divider++;
- };
+ divider = min_t(unsigned int, DIV_ROUND_UP(MDC_MAX_FREQ, max_clk), 63);
/* Configure MDC Turbo Mode */
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V3)) {
@@ -1144,7 +1128,46 @@
val |= FIELD_PREP(PPSC_MDC_CFG, divider);
mtk_w32(eth, val, MTK_PPSC);
+ dev_info(eth->dev, "MDC is running on %d Hz\n", MDC_MAX_FREQ / divider);
+
+err_put_node:
+ of_node_put(mii_np);
+ return ret;
+}
+
+static int mtk_mdio_init(struct mtk_eth *eth)
+{
+ struct device_node *mii_np;
+ int ret;
+
+ mii_np = of_get_child_by_name(eth->dev->of_node, "mdio-bus");
+ if (!mii_np) {
+ dev_err(eth->dev, "no %s child node found", "mdio-bus");
+ return -ENODEV;
+ }
+
- dev_info(eth->dev, "MDC is running on %d Hz\n", clk / divider);
+ if (!of_device_is_available(mii_np)) {
+ ret = -ENODEV;
+ goto err_put_node;
+ }
+
+ eth->mii_bus = devm_mdiobus_alloc(eth->dev);
+ if (!eth->mii_bus) {
+ ret = -ENOMEM;
+ goto err_put_node;
+ }
+
+ eth->mii_bus->name = "mdio";
+ eth->mii_bus->read = mtk_mdio_read;
+ eth->mii_bus->write = mtk_mdio_write;
+ eth->mii_bus->reset = mtk_mdio_reset;
+ eth->mii_bus->priv = eth;
+ eth->mii_bus->parent = eth->dev;
+
+ if (snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%pOFn", mii_np) < 0) {
+ ret = -ENOMEM;
+ goto err_put_node;
+ }
ret = of_mdiobus_register(eth->mii_bus, mii_np);
@@ -3659,6 +3682,9 @@
else
mtk_eth_cold_reset(eth);
+ if (!MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
+ mtk_mdc_init(eth);
+
if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_RX_V2)) {
/* Set FE to PDMAv2 if necessary */
mtk_w32(eth, mtk_r32(eth, MTK_FE_GLO_MISC) | MTK_PDMA_V2, MTK_FE_GLO_MISC);
diff --git a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index c7510b3..5b860d6 100755
--- a/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -635,6 +635,8 @@
#define MTK_PPSC 0x10000
#define PPSC_MDC_CFG GENMASK(29, 24)
#define PPSC_MDC_TURBO BIT(20)
+#define MDC_MAX_FREQ 25000000
+#define MDC_MAX_DIVIDER 63
/* PHY Indirect Access Control registers */
#define MTK_PHY_IAC 0x10004