Christian Marangi
25de25827e
Backport additional upstream patch in preparation for multi-serdes and proper PCS support. Automatically refresh all affected patch. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
146 lines
3.9 KiB
Diff
146 lines
3.9 KiB
Diff
From 843e2892f2d9353bf039e0dfb5442a600e75009e Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Date: Thu, 9 Oct 2025 23:46:08 +0300
|
|
Subject: [PATCH] net: airoha: disable external phy code if PCS_AIROHA is not
|
|
enabled
|
|
|
|
External phy code breaks building for EN7523, so disable it if
|
|
PCS_AIROHA is not selected.
|
|
|
|
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 16 ++++++++++++++++
|
|
drivers/net/ethernet/airoha/airoha_eth.h | 2 ++
|
|
2 files changed, 18 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -72,10 +72,12 @@ static void airoha_qdma_irq_disable(stru
|
|
airoha_qdma_set_irqmask(irq_bank, index, mask, 0);
|
|
}
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
static bool airhoa_is_phy_external(struct airoha_gdm_port *port)
|
|
{
|
|
return port->id != 1;
|
|
}
|
|
+#endif
|
|
|
|
static void airoha_set_macaddr(struct airoha_gdm_port *port, const u8 *addr)
|
|
{
|
|
@@ -1647,6 +1649,7 @@ static int airoha_dev_open(struct net_de
|
|
struct airoha_qdma *qdma = port->qdma;
|
|
u32 pse_port = FE_PSE_PORT_PPE1;
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
if (airhoa_is_phy_external(port)) {
|
|
err = phylink_of_phy_connect(port->phylink, dev->dev.of_node, 0);
|
|
if (err) {
|
|
@@ -1657,6 +1660,7 @@ static int airoha_dev_open(struct net_de
|
|
|
|
phylink_start(port->phylink);
|
|
}
|
|
+#endif
|
|
|
|
netif_tx_start_all_queues(dev);
|
|
err = airoha_set_vip_for_gdm_port(port, true);
|
|
@@ -1722,10 +1726,12 @@ static int airoha_dev_stop(struct net_de
|
|
}
|
|
}
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
if (airhoa_is_phy_external(port)) {
|
|
phylink_stop(port->phylink);
|
|
phylink_disconnect_phy(port->phylink);
|
|
}
|
|
+#endif
|
|
|
|
return 0;
|
|
}
|
|
@@ -2858,6 +2864,7 @@ static const struct ethtool_ops airoha_e
|
|
.get_link = ethtool_op_get_link,
|
|
};
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
static struct phylink_pcs *airoha_phylink_mac_select_pcs(struct phylink_config *config,
|
|
phy_interface_t interface)
|
|
{
|
|
@@ -2871,6 +2878,7 @@ static void airoha_mac_config(struct phy
|
|
const struct phylink_link_state *state)
|
|
{
|
|
}
|
|
+#endif
|
|
|
|
static int airoha_metadata_dst_alloc(struct airoha_gdm_port *port)
|
|
{
|
|
@@ -2916,6 +2924,7 @@ bool airoha_is_valid_gdm_port(struct air
|
|
return false;
|
|
}
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
static void airoha_mac_link_up(struct phylink_config *config, struct phy_device *phy,
|
|
unsigned int mode, phy_interface_t interface,
|
|
int speed, int duplex, bool tx_pause, bool rx_pause)
|
|
@@ -3008,6 +3017,7 @@ static int airoha_setup_phylink(struct n
|
|
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
static int airoha_alloc_gdm_port(struct airoha_eth *eth,
|
|
struct device_node *np)
|
|
@@ -3080,11 +3090,13 @@ static int airoha_alloc_gdm_port(struct
|
|
port->id = id;
|
|
eth->ports[p] = port;
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
if (airhoa_is_phy_external(port)) {
|
|
err = airoha_setup_phylink(dev);
|
|
if (err)
|
|
return err;
|
|
}
|
|
+#endif
|
|
|
|
return airoha_metadata_dst_alloc(port);
|
|
}
|
|
@@ -3213,10 +3225,12 @@ error_napi_stop:
|
|
|
|
if (port->dev->reg_state == NETREG_REGISTERED)
|
|
unregister_netdev(port->dev);
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
if (airhoa_is_phy_external(port)) {
|
|
phylink_destroy(port->phylink);
|
|
airoha_pcs_destroy(port->pcs);
|
|
}
|
|
+#endif
|
|
airoha_metadata_dst_free(port);
|
|
}
|
|
airoha_hw_cleanup(eth);
|
|
@@ -3243,10 +3257,12 @@ static void airoha_remove(struct platfor
|
|
|
|
unregister_netdev(port->dev);
|
|
airoha_metadata_dst_free(port);
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
if (airhoa_is_phy_external(port)) {
|
|
phylink_destroy(port->phylink);
|
|
airoha_pcs_destroy(port->pcs);
|
|
}
|
|
+#endif
|
|
}
|
|
airoha_hw_cleanup(eth);
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
|
|
@@ -537,9 +537,11 @@ struct airoha_gdm_port {
|
|
struct net_device *dev;
|
|
int id;
|
|
|
|
+#if defined(CONFIG_PCS_AIROHA)
|
|
struct phylink *phylink;
|
|
struct phylink_config phylink_config;
|
|
struct phylink_pcs *pcs;
|
|
+#endif
|
|
|
|
struct airoha_hw_stats stats;
|
|
|