Signed-off-by: Yang Xiwen <[email protected]>
---
Changes in v9:
- binding: remove generic fallback compatible as it's not used in driver
- Link to v8: https://lore.kernel.org/r/[email protected]
Changes in v8:
- remove MODULE_ALIAS: rewrite commit msg (Krzysztof Kozlowski)
- driver: use only SoC compatibles (Krzysztof Kozlowski)
- Link to v7: https://lore.kernel.org/r/[email protected]
Changes in v7:
- dt-bindings: squash a bunch of patches to YAML conversion (Krzysztof Kozlowski)
- dt-bindings: drop phy-mode->phy-connection-type conversion (Andrew Lunnm, Krzysztof Kozlowski)
- driver: drop SoC compatibles
- misc: some minor clean ups
- driver: remove MODULE_ALIAS()
- Link to v6: https://lore.kernel.org/r/[email protected]
Changes in v6:
- add missing "not" in commit logs (Andrew)
- rework binding changes, split it into several commits (Krzysztof Kozlowski)
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- hisi-femac-mdio: remove clock completely (Krzysztof Kozlowski)
- dt-bindings: mdio: apply comments from Krzysztof Kozlowski
Changes in v4:
- edit commit log to show why mdio bus clk is optional (Krzysztof Kozlowski)
- add clk_bulk_disable_unprepare() during error path (Maxime Chevallier)
- remove of_node_put() (Simon Horman)
- remove histb-clock.h header in binding example as it's goign to be deprecated.
- rearrange patches so binding comes before driver
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- rearrange patches to fix bot error. (Rob Herring)
- rewrite commit logs (Andrew Lunn)
- use clk_bulk_ APIs (Andrew Lunn)
- fix uninitialization use of ret (assign to -ENODEV before goto) (Simon Horman)
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- replace email.
- hisi-femac: s/BUS/MACIF (Andrew Lunn)
- hisi-femac: add "hisilicon,hisi-femac" compatible since the driver
seems generic enough for various SoCs
- hisi-femac-mdio: convert binding to YAML (Krzysztof Kozlowski)
- rewrite commit logs (Krzysztof Kozlowski)
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Yang Xiwen (9):
dt-bindings: net: hisilicon-femac-mdio: convert to YAML
dt-bindings: net: hisilicon,hisi-femac-mdio: remove clocks
net: mdio: hisi-femac: remove clock
dt-bindings: net: convert hisi-femac.txt to YAML
dt-bindings: net: hisi-femac: add mandatory MDIO bus subnode
dt-bindings: net: hisi-femac: add binding for Hi3798MV200 FEMAC core
net: hisi_femac: remove unused compatible strings
net: hisi_femac: add support for hisi_femac core on Hi3798MV200
net: hisi_femac: remove unneeded MODULE_ALIAS()
.../bindings/net/hisilicon,hisi-femac-mdio.yaml | 39 +++++++
.../bindings/net/hisilicon,hisi-femac.yaml | 118 +++++++++++++++++++++
.../bindings/net/hisilicon-femac-mdio.txt | 22 ----
.../devicetree/bindings/net/hisilicon-femac.txt | 41 -------
drivers/net/ethernet/hisilicon/hisi_femac.c | 77 +++++++++++---
drivers/net/mdio/mdio-hisi-femac.c | 18 +---
6 files changed, 218 insertions(+), 97 deletions(-)
---
base-commit: 90d35da658da8cff0d4ecbb5113f5fac9d00eb72
change-id: 20240216-net-9a208e17c40f
Best regards,
--
Yang Xiwen <[email protected]>
From: Yang Xiwen <[email protected]>
This integrated MDIO bus does not have a dedicated clock, remove it.
Signed-off-by: Yang Xiwen <[email protected]>
---
drivers/net/mdio/mdio-hisi-femac.c | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/drivers/net/mdio/mdio-hisi-femac.c b/drivers/net/mdio/mdio-hisi-femac.c
index 6703f626ee83..faf4688eb1ab 100644
--- a/drivers/net/mdio/mdio-hisi-femac.c
+++ b/drivers/net/mdio/mdio-hisi-femac.c
@@ -5,7 +5,6 @@
* Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
*/
-#include <linux/clk.h>
#include <linux/iopoll.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -21,7 +20,6 @@
#define BIT_WR_DATA_OFFSET 16
struct hisi_femac_mdio_data {
- struct clk *clk;
void __iomem *membase;
};
@@ -93,26 +91,14 @@ static int hisi_femac_mdio_probe(struct platform_device *pdev)
goto err_out_free_mdiobus;
}
- data->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(data->clk)) {
- ret = PTR_ERR(data->clk);
- goto err_out_free_mdiobus;
- }
-
- ret = clk_prepare_enable(data->clk);
- if (ret)
- goto err_out_free_mdiobus;
-
ret = of_mdiobus_register(bus, np);
if (ret)
- goto err_out_disable_clk;
+ goto err_out_free_mdiobus;
platform_set_drvdata(pdev, bus);
return 0;
-err_out_disable_clk:
- clk_disable_unprepare(data->clk);
err_out_free_mdiobus:
mdiobus_free(bus);
return ret;
@@ -121,10 +107,8 @@ static int hisi_femac_mdio_probe(struct platform_device *pdev)
static void hisi_femac_mdio_remove(struct platform_device *pdev)
{
struct mii_bus *bus = platform_get_drvdata(pdev);
- struct hisi_femac_mdio_data *data = bus->priv;
mdiobus_unregister(bus);
- clk_disable_unprepare(data->clk);
mdiobus_free(bus);
}
--
2.43.0
From: Yang Xiwen <[email protected]>
Convert the old text binding to new YAML.
While at it, make some changes to the binding:
- The version numbers are not documented publicly. The version also does
not change programming interface. Remove it until it's really needed.
- A few clocks are missing in old binding file. Add them to match the real
hardware.
Signed-off-by: Yang Xiwen <[email protected]>
---
.../bindings/net/hisilicon,hisi-femac.yaml | 87 ++++++++++++++++++++++
.../devicetree/bindings/net/hisilicon-femac.txt | 41 ----------
2 files changed, 87 insertions(+), 41 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
new file mode 100644
index 000000000000..3344d3bfefb8
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
@@ -0,0 +1,87 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/hisilicon,hisi-femac.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Hisilicon Fast Ethernet MAC controller
+
+maintainers:
+ - Yang Xiwen <[email protected]>
+
+allOf:
+ - $ref: ethernet-controller.yaml
+
+properties:
+ compatible:
+ enum:
+ - hisilicon,hi3516cv300-femac
+
+ reg:
+ items:
+ - description: The first region is the MAC core register base and size.
+ - description: The second region is the global MAC control register.
+
+ interrupts:
+ maxItems: 1
+
+ clocks:
+ items:
+ - description: MAC main clock
+ - description: MAC bus interface clock
+ - description: PHY clock
+
+ clock-names:
+ items:
+ - const: mac
+ - const: macif
+ - const: phy
+
+ resets:
+ items:
+ - description: MAC reset signal
+ - description: PHY reset signal
+
+ reset-names:
+ items:
+ - const: mac
+ - const: phy
+
+ hisilicon,phy-reset-delays-us:
+ description: PHY reset timing requirement (in micro seconds).
+ The integrated PHY usually have a special reset timing sequence and must
+ interact with MAC controller to accomplish the entire reset procedure. So
+ these properties belong to MAC controller, not PHY.
+ items:
+ - description: pre-reset delay for PHY
+ - description: reset pulse for PHY
+ - description: post-reset delay for PHY
+
+required:
+ - compatible
+ - reg
+ - interrupts
+ - clocks
+ - resets
+ - reset-names
+ - phy-mode
+ - phy-handle
+ - hisilicon,phy-reset-delays-us
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ ethernet@10090000 {
+ compatible = "hisilicon,hi3516cv300-femac";
+ reg = <0x10090000 0x1000>, <0x10091300 0x200>;
+ interrupts = <12>;
+ clocks = <&clk_femac>, <&clk_femacif>, <&clk_fephy>;
+ clock-names = "mac", "macif", "phy";
+ resets = <&crg 0xec 0>, <&crg 0xec 3>;
+ reset-names = "mac", "phy";
+ mac-address = [00 00 00 00 00 00];
+ phy-mode = "mii";
+ phy-handle = <&fephy>;
+ hisilicon,phy-reset-delays-us = <10000 20000 20000>;
+ };
diff --git a/Documentation/devicetree/bindings/net/hisilicon-femac.txt b/Documentation/devicetree/bindings/net/hisilicon-femac.txt
deleted file mode 100644
index 5f96976f3cea..000000000000
--- a/Documentation/devicetree/bindings/net/hisilicon-femac.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Hisilicon Fast Ethernet MAC controller
-
-Required properties:
-- compatible: should contain one of the following version strings:
- * "hisilicon,hisi-femac-v1"
- * "hisilicon,hisi-femac-v2"
- and the soc string "hisilicon,hi3516cv300-femac".
-- reg: specifies base physical address(s) and size of the device registers.
- The first region is the MAC core register base and size.
- The second region is the global MAC control register.
-- interrupts: should contain the MAC interrupt.
-- clocks: A phandle to the MAC main clock.
-- resets: should contain the phandle to the MAC reset signal(required) and
- the PHY reset signal(optional).
-- reset-names: should contain the reset signal name "mac"(required)
- and "phy"(optional).
-- phy-mode: see ethernet.txt [1].
-- phy-handle: see ethernet.txt [1].
-- hisilicon,phy-reset-delays-us: triplet of delays if PHY reset signal given.
- The 1st cell is reset pre-delay in micro seconds.
- The 2nd cell is reset pulse in micro seconds.
- The 3rd cell is reset post-delay in micro seconds.
-
-The MAC address will be determined using the optional properties
-defined in ethernet.txt[1].
-
-[1] Documentation/devicetree/bindings/net/ethernet.txt
-
-Example:
- hisi_femac: ethernet@10090000 {
- compatible = "hisilicon,hi3516cv300-femac","hisilicon,hisi-femac-v2";
- reg = <0x10090000 0x1000>,<0x10091300 0x200>;
- interrupts = <12>;
- clocks = <&crg HI3518EV200_ETH_CLK>;
- resets = <&crg 0xec 0>,<&crg 0xec 3>;
- reset-names = "mac","phy";
- mac-address = [00 00 00 00 00 00];
- phy-mode = "mii";
- phy-handle = <&phy0>;
- hisilicon,phy-reset-delays-us = <10000 20000 20000>;
- };
--
2.43.0
From: Yang Xiwen <[email protected]>
Register the sub MDIO bus if it is found. Also implement the internal
PHY reset procedure as needed.
Note it's unable to put the MDIO bus node outside of MAC controller
(i.e. at the same level in the parent bus node). Because we need to
control all clocks and resets in FEMAC driver due to the phy reset
procedure. So the clocks can't be assigned to MDIO bus device, which is
an essential resource for the MDIO bus to work.
Signed-off-by: Yang Xiwen <[email protected]>
---
drivers/net/ethernet/hisilicon/hisi_femac.c | 74 +++++++++++++++++++++++------
1 file changed, 60 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c
index 9bf4beba7987..a4f856710d96 100644
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
@@ -10,8 +10,10 @@
#include <linux/etherdevice.h>
#include <linux/interrupt.h>
#include <linux/module.h>
+#include <linux/of.h>
#include <linux/of_mdio.h>
#include <linux/of_net.h>
+#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/reset.h>
@@ -97,6 +99,13 @@ enum phy_reset_delays {
DELAYS_NUM,
};
+enum clk_type {
+ CLK_MAC,
+ CLK_MACIF,
+ CLK_PHY,
+ CLK_NUM,
+};
+
struct hisi_femac_queue {
struct sk_buff **skb;
dma_addr_t *dma_phys;
@@ -108,7 +117,7 @@ struct hisi_femac_queue {
struct hisi_femac_priv {
void __iomem *port_base;
void __iomem *glb_base;
- struct clk *clk;
+ struct clk_bulk_data *clks;
struct reset_control *mac_rst;
struct reset_control *phy_rst;
u32 phy_reset_delays[DELAYS_NUM];
@@ -116,6 +125,7 @@ struct hisi_femac_priv {
struct device *dev;
struct net_device *ndev;
+ struct platform_device *mdio_pdev;
struct hisi_femac_queue txq;
struct hisi_femac_queue rxq;
@@ -693,6 +703,7 @@ static const struct net_device_ops hisi_femac_netdev_ops = {
static void hisi_femac_core_reset(struct hisi_femac_priv *priv)
{
reset_control_assert(priv->mac_rst);
+ usleep_range(200, 300);
reset_control_deassert(priv->mac_rst);
}
@@ -712,6 +723,10 @@ static void hisi_femac_sleep_us(u32 time_us)
static void hisi_femac_phy_reset(struct hisi_femac_priv *priv)
{
+ /* MAC clock must be disabled before PHY reset
+ */
+ clk_disable(priv->clks[CLK_MAC].clk);
+ clk_disable(priv->clks[CLK_MACIF].clk);
/* To make sure PHY hardware reset success,
* we must keep PHY in deassert state first and
* then complete the hardware reset operation
@@ -727,6 +742,9 @@ static void hisi_femac_phy_reset(struct hisi_femac_priv *priv)
reset_control_deassert(priv->phy_rst);
/* delay some time to ensure later MDIO access */
hisi_femac_sleep_us(priv->phy_reset_delays[POST_DELAY]);
+
+ clk_enable(priv->clks[CLK_MAC].clk);
+ clk_enable(priv->clks[CLK_MACIF].clk);
}
static void hisi_femac_port_init(struct hisi_femac_priv *priv)
@@ -768,11 +786,12 @@ static void hisi_femac_port_init(struct hisi_femac_priv *priv)
static int hisi_femac_drv_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct device_node *node = dev->of_node;
+ struct device_node *node = dev->of_node, *mdio_np;
struct net_device *ndev;
struct hisi_femac_priv *priv;
struct phy_device *phy;
int ret;
+ bool mdio_registered = false;
ndev = alloc_etherdev(sizeof(*priv));
if (!ndev)
@@ -797,17 +816,16 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)
goto out_free_netdev;
}
- priv->clk = devm_clk_get(&pdev->dev, NULL);
- if (IS_ERR(priv->clk)) {
- dev_err(dev, "failed to get clk\n");
- ret = -ENODEV;
+ ret = devm_clk_bulk_get_all(&pdev->dev, &priv->clks);
+ if (ret < 0 || ret != CLK_NUM) {
+ dev_err(dev, "failed to get clk bulk: %d\n", ret);
goto out_free_netdev;
}
- ret = clk_prepare_enable(priv->clk);
+ ret = clk_bulk_prepare_enable(CLK_NUM, priv->clks);
if (ret) {
- dev_err(dev, "failed to enable clk %d\n", ret);
- goto out_free_netdev;
+ dev_err(dev, "failed to enable clk bulk: %d\n", ret);
+ goto out_disable_clk;
}
priv->mac_rst = devm_reset_control_get(dev, "mac");
@@ -830,11 +848,29 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)
hisi_femac_phy_reset(priv);
}
+ // Register the optional MDIO bus
+ for_each_available_child_of_node(node, mdio_np) {
+ if (of_node_name_prefix(mdio_np, "mdio")) {
+ priv->mdio_pdev = of_platform_device_create(mdio_np, NULL, dev);
+ of_node_put(mdio_np);
+ if (!priv->mdio_pdev) {
+ dev_err(dev, "failed to register MDIO bus device\n");
+ ret = -ENODEV;
+ goto out_disable_clk;
+ }
+ mdio_registered = true;
+ break;
+ }
+ }
+
+ if (!mdio_registered)
+ dev_warn(dev, "MDIO subnode not found. This is usually a bug.\n");
+
phy = of_phy_get_and_connect(ndev, node, hisi_femac_adjust_link);
if (!phy) {
dev_err(dev, "connect to PHY failed!\n");
ret = -ENODEV;
- goto out_disable_clk;
+ goto out_unregister_mdio_bus;
}
phy_attached_print(phy, "phy_id=0x%.8lx, phy_mode=%s\n",
@@ -885,8 +921,10 @@ static int hisi_femac_drv_probe(struct platform_device *pdev)
out_disconnect_phy:
netif_napi_del(&priv->napi);
phy_disconnect(phy);
+out_unregister_mdio_bus:
+ platform_device_unregister(priv->mdio_pdev);
out_disable_clk:
- clk_disable_unprepare(priv->clk);
+ clk_bulk_disable_unprepare(CLK_NUM, priv->clks);
out_free_netdev:
free_netdev(ndev);
@@ -902,7 +940,8 @@ static void hisi_femac_drv_remove(struct platform_device *pdev)
unregister_netdev(ndev);
phy_disconnect(ndev->phydev);
- clk_disable_unprepare(priv->clk);
+ platform_device_unregister(priv->mdio_pdev);
+ clk_bulk_disable_unprepare(CLK_NUM, priv->clks);
free_netdev(ndev);
}
@@ -919,7 +958,7 @@ static int hisi_femac_drv_suspend(struct platform_device *pdev,
netif_device_detach(ndev);
}
- clk_disable_unprepare(priv->clk);
+ clk_bulk_disable_unprepare(CLK_NUM, priv->clks);
return 0;
}
@@ -928,8 +967,14 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct hisi_femac_priv *priv = netdev_priv(ndev);
+ int ret;
+
+ ret = clk_bulk_prepare_enable(CLK_NUM, priv->clks);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to enable clk bulk: %d\n", ret);
+ return ret;
+ }
- clk_prepare_enable(priv->clk);
if (priv->phy_rst)
hisi_femac_phy_reset(priv);
@@ -946,6 +991,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
static const struct of_device_id hisi_femac_match[] = {
{.compatible = "hisilicon,hi3516cv300-femac",},
+ {.compatible = "hisilicon,hi3798mv200-femac",},
{},
};
--
2.43.0
From: Yang Xiwen <[email protected]>
This integrated MDIO bus does not have a dedicated clock. Remove it. The
old binding is wrong.
Acked-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Yang Xiwen <[email protected]>
---
Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml
index 36def9d5eecd..dea1bcc27381 100644
--- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml
+++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac-mdio.yaml
@@ -19,13 +19,9 @@ properties:
reg:
maxItems: 1
- clocks:
- maxItems: 1
-
required:
- compatible
- reg
- - clocks
unevaluatedProperties: false
@@ -34,7 +30,6 @@ examples:
mdio@10091100 {
compatible = "hisilicon,hisi-femac-mdio";
reg = <0x10091100 0x20>;
- clocks = <&clk_mdio>;
#address-cells = <1>;
#size-cells = <0>;
--
2.43.0
From: Yang Xiwen <[email protected]>
We already have MODULE_DEVICE_TABLE() that creates the correct alias.
Remove unneeded MODULE_ALIAS().
Signed-off-by: Yang Xiwen <[email protected]>
---
drivers/net/ethernet/hisilicon/hisi_femac.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c
index a4f856710d96..ea8f60f292c1 100644
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
@@ -1015,4 +1015,3 @@ module_platform_driver(hisi_femac_driver);
MODULE_DESCRIPTION("Hisilicon Fast Ethernet MAC driver");
MODULE_AUTHOR("Dongpo Li <[email protected]>");
MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:hisi-femac");
--
2.43.0
From: Yang Xiwen <[email protected]>
HiSilicon FEMAC core is also found on Hi3798MV200 SoC. Document it in
binding.
Signed-off-by: Yang Xiwen <[email protected]>
# Conflicts:
# Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
---
Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
index 5cd2331668bc..4f8a07864eb4 100644
--- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
+++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
@@ -16,6 +16,7 @@ properties:
compatible:
enum:
- hisilicon,hi3516cv300-femac
+ - hisilicon,hi3798mv200-femac
reg:
items:
--
2.43.0
From: Yang Xiwen <[email protected]>
It's hard to get the version number for each FEMAC core and it's unknown
how the version can be used. Remove them until it's really needed.
While at it, remove fallback compatibles and only use SoC compatible.
Signed-off-by: Yang Xiwen <[email protected]>
---
drivers/net/ethernet/hisilicon/hisi_femac.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c
index 2406263c9dd3..9bf4beba7987 100644
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
@@ -945,8 +945,6 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
#endif
static const struct of_device_id hisi_femac_match[] = {
- {.compatible = "hisilicon,hisi-femac-v1",},
- {.compatible = "hisilicon,hisi-femac-v2",},
{.compatible = "hisilicon,hi3516cv300-femac",},
{},
};
--
2.43.0
From: Yang Xiwen <[email protected]>
FEMAC core always has an integrated MDIO bus mapped in its address
space. Add required properties '#address-cells', 'size-cells', 'ranges'
and MDIO bus subnode.
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Signed-off-by: Yang Xiwen <[email protected]>
---
.../bindings/net/hisilicon,hisi-femac.yaml | 30 ++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
index 3344d3bfefb8..5cd2331668bc 100644
--- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
+++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
@@ -22,6 +22,15 @@ properties:
- description: The first region is the MAC core register base and size.
- description: The second region is the global MAC control register.
+ ranges:
+ maxItems: 1
+
+ '#address-cells':
+ const: 1
+
+ '#size-cells':
+ const: 1
+
interrupts:
maxItems: 1
@@ -57,9 +66,16 @@ properties:
- description: reset pulse for PHY
- description: post-reset delay for PHY
+patternProperties:
+ 'mdio@[0-9a-f]+':
+ $ref: hisilicon,hisi-femac-mdio.yaml#
+
required:
- compatible
- reg
+ - ranges
+ - '#address-cells'
+ - '#size-cells'
- interrupts
- clocks
- resets
@@ -75,6 +91,9 @@ examples:
ethernet@10090000 {
compatible = "hisilicon,hi3516cv300-femac";
reg = <0x10090000 0x1000>, <0x10091300 0x200>;
+ ranges = <0x0 0x10090000 0x10000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
interrupts = <12>;
clocks = <&clk_femac>, <&clk_femacif>, <&clk_fephy>;
clock-names = "mac", "macif", "phy";
@@ -84,4 +103,15 @@ examples:
phy-mode = "mii";
phy-handle = <&fephy>;
hisilicon,phy-reset-delays-us = <10000 20000 20000>;
+
+ mdio@1100 {
+ compatible = "hisilicon,hisi-femac-mdio";
+ reg = <0x1100 0x20>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ phy@1 {
+ reg = <1>;
+ };
+ };
};
--
2.43.0
On Thu, Mar 07, 2024 at 07:34:52PM +0800, Yang Xiwen wrote:
> HiSilicon FEMAC core is also found on Hi3798MV200 SoC. Document it in
> binding.
>
> Signed-off-by: Yang Xiwen <[email protected]>
>
> # Conflicts:
> # Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
Need to drop this.
> ---
> Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> index 5cd2331668bc..4f8a07864eb4 100644
> --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> @@ -16,6 +16,7 @@ properties:
> compatible:
> enum:
> - hisilicon,hi3516cv300-femac
> + - hisilicon,hi3798mv200-femac
>
> reg:
> items:
>
> --
> 2.43.0
>
On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
> From: Yang Xiwen <[email protected]>
>
> Convert the old text binding to new YAML.
>
> While at it, make some changes to the binding:
> - The version numbers are not documented publicly. The version also does
> not change programming interface. Remove it until it's really needed.
> - A few clocks are missing in old binding file. Add them to match the real
> hardware.
>
> Signed-off-by: Yang Xiwen <[email protected]>
> ---
> .../bindings/net/hisilicon,hisi-femac.yaml | 87 ++++++++++++++++++++++
> .../devicetree/bindings/net/hisilicon-femac.txt | 41 ----------
> 2 files changed, 87 insertions(+), 41 deletions(-)
>
Reviewed-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
> From: Yang Xiwen <[email protected]>
>
> HiSilicon FEMAC core is also found on Hi3798MV200 SoC. Document it in
> binding.
>
> Signed-off-by: Yang Xiwen <[email protected]>
>
> # Conflicts:
> # Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
Drop
> ---
> Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> index 5cd2331668bc..4f8a07864eb4 100644
> --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> @@ -16,6 +16,7 @@ properties:
> compatible:
> enum:
> - hisilicon,hi3516cv300-femac
> + - hisilicon,hi3798mv200-femac
As I asked two or three or four times: please express compatibility
(oneOf, items). Your driver suggests that they are compatible. If they
are not compatible, mention it in commit msg, but so far it suggests
they are compatible.
Best regards,
Krzysztof
On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
> From: Yang Xiwen <[email protected]>
>
> Register the sub MDIO bus if it is found. Also implement the internal
> PHY reset procedure as needed.
..
>
> @@ -946,6 +991,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
>
> static const struct of_device_id hisi_femac_match[] = {
> {.compatible = "hisilicon,hi3516cv300-femac",},
> + {.compatible = "hisilicon,hi3798mv200-femac",},
Why do you keep growing this table?
Best regards,
Krzysztof
On 3/8/2024 4:01 PM, Krzysztof Kozlowski wrote:
> On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
>> From: Yang Xiwen <[email protected]>
>>
>> HiSilicon FEMAC core is also found on Hi3798MV200 SoC. Document it in
>> binding.
>>
>> Signed-off-by: Yang Xiwen <[email protected]>
>>
>> # Conflicts:
>> # Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
> Drop
>
>> ---
>> Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>> index 5cd2331668bc..4f8a07864eb4 100644
>> --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>> +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>> @@ -16,6 +16,7 @@ properties:
>> compatible:
>> enum:
>> - hisilicon,hi3516cv300-femac
>> + - hisilicon,hi3798mv200-femac
> As I asked two or three or four times: please express compatibility
> (oneOf, items). Your driver suggests that they are compatible. If they
> are not compatible, mention it in commit msg, but so far it suggests
> they are compatible.
They are compatible as far as i see.
>
> Best regards,
> Krzysztof
>
--
Regards,
Yang Xiwen
On 3/8/2024 4:02 PM, Krzysztof Kozlowski wrote:
> On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
>> From: Yang Xiwen <[email protected]>
>>
>> Register the sub MDIO bus if it is found. Also implement the internal
>> PHY reset procedure as needed.
> ...
>
>>
>> @@ -946,6 +991,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
>>
>> static const struct of_device_id hisi_femac_match[] = {
>> {.compatible = "hisilicon,hi3516cv300-femac",},
>> + {.compatible = "hisilicon,hi3798mv200-femac",},
>
> Why do you keep growing this table?
I'm completely confused. Don't I need to keep binding and driver
compatible ids sync?
The FEMAC cores on 2 SoCs are compatible afaik. That's why i want to add
a generic "hisilicon,hisi-femac" compatible. Though i know nothing about
the mysterious version numbers (v1, v2 etc..) documented in the old
binding, so i want them to be removed. Instead only keep one generic
fallback compatible.
Do you mean that i broke the backward compatibility for
"hisilicon,hi3516cv300-femac"?
>
> Best regards,
> Krzysztof
>
--
Regards,
Yang Xiwen
On 08/03/2024 09:07, Yang Xiwen wrote:
> On 3/8/2024 4:02 PM, Krzysztof Kozlowski wrote:
>> On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
>>> From: Yang Xiwen <[email protected]>
>>>
>>> Register the sub MDIO bus if it is found. Also implement the internal
>>> PHY reset procedure as needed.
>> ...
>>
>>>
>>> @@ -946,6 +991,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
>>>
>>> static const struct of_device_id hisi_femac_match[] = {
>>> {.compatible = "hisilicon,hi3516cv300-femac",},
>>> + {.compatible = "hisilicon,hi3798mv200-femac",},
>>
>> Why do you keep growing this table?
>
>
> I'm completely confused. Don't I need to keep binding and driver
> compatible ids sync?
>
>
> The FEMAC cores on 2 SoCs are compatible afaik. That's why i want to add
> a generic "hisilicon,hisi-femac" compatible. Though i know nothing about
> the mysterious version numbers (v1, v2 etc..) documented in the old
> binding, so i want them to be removed. Instead only keep one generic
> fallback compatible.
>
>
> Do you mean that i broke the backward compatibility for
> "hisilicon,hi3516cv300-femac"?
No. I meant, use one as fallback and only fallback needs to be in the
device ID table. There are dozens if not hundreds of such examples in
the tree.
Best regards,
Krzysztof
On 3/8/2024 4:09 PM, Krzysztof Kozlowski wrote:
> On 08/03/2024 09:07, Yang Xiwen wrote:
>> On 3/8/2024 4:02 PM, Krzysztof Kozlowski wrote:
>>> On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
>>>> From: Yang Xiwen <[email protected]>
>>>>
>>>> Register the sub MDIO bus if it is found. Also implement the internal
>>>> PHY reset procedure as needed.
>>> ...
>>>
>>>>
>>>> @@ -946,6 +991,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
>>>>
>>>> static const struct of_device_id hisi_femac_match[] = {
>>>> {.compatible = "hisilicon,hi3516cv300-femac",},
>>>> + {.compatible = "hisilicon,hi3798mv200-femac",},
>>> Why do you keep growing this table?
>>
>> I'm completely confused. Don't I need to keep binding and driver
>> compatible ids sync?
>>
>>
>> The FEMAC cores on 2 SoCs are compatible afaik. That's why i want to add
>> a generic "hisilicon,hisi-femac" compatible. Though i know nothing about
>> the mysterious version numbers (v1, v2 etc..) documented in the old
>> binding, so i want them to be removed. Instead only keep one generic
>> fallback compatible.
>>
>>
>> Do you mean that i broke the backward compatibility for
>> "hisilicon,hi3516cv300-femac"?
> No. I meant, use one as fallback and only fallback needs to be in the
> device ID table. There are dozens if not hundreds of such examples in
> the tree.
I don't think an arbitrary SoC compatible is a good name for a fallback
compatible. Why can't we have "hisilicon,hisi-femac" instead of the odd
"hisilicon,hi3516cv300-femac", If we are not going to keep backward
compatibility? Hi3516CV300 is just an old and outdated ordinary SoC
after all, but the FEMAC core is still being used in latest SoCs afaik.
I can't see the reason to relate this core to some old SoC and keep the
compatible forever.
>
> Best regards,
> Krzysztof
>
--
Regards,
Yang Xiwen
On 08/03/2024 09:18, Yang Xiwen wrote:
> On 3/8/2024 4:09 PM, Krzysztof Kozlowski wrote:
>> On 08/03/2024 09:07, Yang Xiwen wrote:
>>> On 3/8/2024 4:02 PM, Krzysztof Kozlowski wrote:
>>>> On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
>>>>> From: Yang Xiwen <[email protected]>
>>>>>
>>>>> Register the sub MDIO bus if it is found. Also implement the internal
>>>>> PHY reset procedure as needed.
>>>> ...
>>>>
>>>>>
>>>>> @@ -946,6 +991,7 @@ static int hisi_femac_drv_resume(struct platform_device *pdev)
>>>>>
>>>>> static const struct of_device_id hisi_femac_match[] = {
>>>>> {.compatible = "hisilicon,hi3516cv300-femac",},
>>>>> + {.compatible = "hisilicon,hi3798mv200-femac",},
>>>> Why do you keep growing this table?
>>>
>>> I'm completely confused. Don't I need to keep binding and driver
>>> compatible ids sync?
>>>
>>>
>>> The FEMAC cores on 2 SoCs are compatible afaik. That's why i want to add
>>> a generic "hisilicon,hisi-femac" compatible. Though i know nothing about
>>> the mysterious version numbers (v1, v2 etc..) documented in the old
>>> binding, so i want them to be removed. Instead only keep one generic
>>> fallback compatible.
>>>
>>>
>>> Do you mean that i broke the backward compatibility for
>>> "hisilicon,hi3516cv300-femac"?
>> No. I meant, use one as fallback and only fallback needs to be in the
>> device ID table. There are dozens if not hundreds of such examples in
>> the tree.
>
>
> I don't think an arbitrary SoC compatible is a good name for a fallback
> compatible. Why can't we have "hisilicon,hisi-femac" instead of the odd
Why? Anyway, why rules for Hisilicon should be different than for
everyone else?
> "hisilicon,hi3516cv300-femac", If we are not going to keep backward
> compatibility? Hi3516CV300 is just an old and outdated ordinary SoC
> after all, but the FEMAC core is still being used in latest SoCs afaik.
> I can't see the reason to relate this core to some old SoC and keep the
> compatible forever.
Why rules for Hisilicon should be different than for everyone else?
Best regards,
Krzysztof
On 08/03/2024 09:02, Yang Xiwen wrote:
> On 3/8/2024 4:01 PM, Krzysztof Kozlowski wrote:
>> On 07/03/2024 12:34, Yang Xiwen via B4 Relay wrote:
>>> From: Yang Xiwen <[email protected]>
>>>
>>> HiSilicon FEMAC core is also found on Hi3798MV200 SoC. Document it in
>>> binding.
>>>
>>> Signed-off-by: Yang Xiwen <[email protected]>
>>>
>>> # Conflicts:
>>> # Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>> Drop
>>
>>> ---
>>> Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>>> index 5cd2331668bc..4f8a07864eb4 100644
>>> --- a/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>>> +++ b/Documentation/devicetree/bindings/net/hisilicon,hisi-femac.yaml
>>> @@ -16,6 +16,7 @@ properties:
>>> compatible:
>>> enum:
>>> - hisilicon,hi3516cv300-femac
>>> + - hisilicon,hi3798mv200-femac
>> As I asked two or three or four times: please express compatibility
>> (oneOf, items). Your driver suggests that they are compatible. If they
>> are not compatible, mention it in commit msg, but so far it suggests
>> they are compatible.
>
>
> They are compatible as far as i see.
Sorry, that's not a Schroedinger's cat. Either it seems compatible or it
is not. You cannot say here "compatible as far as I see" and in second
thread say "If we are not going to keep backward compatibility".
Hardware is fixed, released, done.
Best regards,
Krzysztof