drivers: ethernet: phy: mii: simplify if all are fixed link

If all instances are fixed link, remove code that is
not needed for that.

Signed-off-by: Fin Maaß <[email protected]>

Author: maass-hamburg

drivers/ethernet/phy/phy_mii.c

@@ -18,6 +18,9 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(phy_mii, CONFIG_PHY_LOG_LEVEL);
 
+#define ANY_DYNAMIC_LINK UTIL_NOT(DT_ALL_INST_HAS_PROP_STATUS_OKAY(fixed_link))
+#define ANY_FIXED_LINK   DT_ANY_INST_HAS_PROP_STATUS_OKAY(fixed_link)
+
 struct phy_mii_dev_config {
 	uint8_t phy_addr;
 	bool no_reset;
@@ -30,12 +33,14 @@ struct phy_mii_dev_data {
 	const struct device *dev;
 	phy_callback_t cb;
 	void *cb_data;
-	struct k_work_delayable monitor_work;
-	struct k_work_delayable autoneg_work;
 	struct phy_link_state state;
 	struct k_sem sem;
+#if ANY_DYNAMIC_LINK
+	struct k_work_delayable monitor_work;
+	struct k_work_delayable autoneg_work;
 	bool gigabit_supported;
 	uint32_t autoneg_timeout;
+#endif
 };
 
 /* Offset to align capabilities bits of 1000BASE-T Control and Status regs */
@@ -46,9 +51,9 @@ struct phy_mii_dev_data {
 /* How often to poll auto-negotiation status while waiting for it to complete */
 #define MII_AUTONEG_POLL_INTERVAL_MS 100
 
-static int phy_mii_get_link_state(const struct device *dev,
-				  struct phy_link_state *state);
+static void invoke_link_cb(const struct device *dev);
 
+#if ANY_DYNAMIC_LINK
 static inline int phy_mii_reg_read(const struct device *dev, uint16_t reg_addr,
 			   uint16_t *value)
 {
@@ -284,20 +289,6 @@ static int check_autonegotiation_completion(const struct device *dev)
 	return 0;
 }
 
-static void invoke_link_cb(const struct device *dev)
-{
-	struct phy_mii_dev_data *const data = dev->data;
-	struct phy_link_state state;
-
-	if (data->cb == NULL) {
-		return;
-	}
-
-	phy_mii_get_link_state(dev, &state);
-
-	data->cb(data->dev, &state, data->cb_data);
-}
-
 static void monitor_work_handler(struct k_work *work)
 {
 	struct k_work_delayable *dwork = k_work_delayable_from_work(work);
@@ -465,6 +456,7 @@ static int phy_mii_cfg_link(const struct device *dev,
 
 	return 0;
 }
+#endif /* ANY_DYNAMIC_LINK */
 
 static int phy_mii_get_link_state(const struct device *dev,
 				  struct phy_link_state *state)
@@ -480,6 +472,20 @@ static int phy_mii_get_link_state(const struct device *dev,
 	return 0;
 }
 
+static void invoke_link_cb(const struct device *dev)
+{
+	struct phy_mii_dev_data *const data = dev->data;
+	struct phy_link_state state;
+
+	if (data->cb == NULL) {
+		return;
+	}
+
+	phy_mii_get_link_state(dev, &state);
+
+	data->cb(dev, &state, data->cb_data);
+}
+
 static int phy_mii_link_cb_set(const struct device *dev, phy_callback_t cb,
 			       void *user_data)
 {
@@ -497,83 +503,88 @@ static int phy_mii_link_cb_set(const struct device *dev, phy_callback_t cb,
 	return 0;
 }
 
-static int phy_mii_initialize(const struct device *dev)
+#if ANY_FIXED_LINK
+static int phy_mii_initialize_fixed_link(const struct device *dev)
 {
 	const struct phy_mii_dev_config *const cfg = dev->config;
 	struct phy_mii_dev_data *const data = dev->data;
-	uint32_t phy_id;
-
-	k_sem_init(&data->sem, 1, 1);
-
-	data->dev = dev;
-	data->cb = NULL;
 
 	/**
 	 * If this is a *fixed* link then we don't need to communicate
 	 * with a PHY. We set the link parameters as configured
 	 * and set link state to up.
 	 */
-	if (cfg->fixed) {
-		const static int speed_to_phy_link_speed[] = {
-			LINK_HALF_10BASE,
-			LINK_FULL_10BASE,
-			LINK_HALF_100BASE,
-			LINK_FULL_100BASE,
-			LINK_HALF_1000BASE,
-			LINK_FULL_1000BASE,
-		};
-
-		data->state.speed = speed_to_phy_link_speed[cfg->fixed_speed];
-		data->state.is_up = true;
-	} else {
-		data->state.is_up = false;
 
-		mdio_bus_enable(cfg->mdio);
+	const static int speed_to_phy_link_speed[] = {
+		LINK_HALF_10BASE,
+		LINK_FULL_10BASE,
+		LINK_HALF_100BASE,
+		LINK_FULL_100BASE,
+		LINK_HALF_1000BASE,
+		LINK_FULL_1000BASE,
+	};
 
-		if (cfg->no_reset == false) {
-			reset(dev);
-		}
+	data->state.speed = speed_to_phy_link_speed[cfg->fixed_speed];
+	data->state.is_up = true;
+
+	return 0;
+}
+#endif /* ANY_FIXED_LINK */
+
+#if ANY_DYNAMIC_LINK
+static int phy_mii_initialize_dynamic_link(const struct device *dev)
+{
+	const struct phy_mii_dev_config *const cfg = dev->config;
+	struct phy_mii_dev_data *const data = dev->data;
+	uint32_t phy_id;
 
-		if (get_id(dev, &phy_id) == 0) {
-			if (phy_id == MII_INVALID_PHY_ID) {
-				LOG_ERR("No PHY found at address %d",
-					cfg->phy_addr);
+	data->state.is_up = false;
 
-				return -EINVAL;
-			}
+	mdio_bus_enable(cfg->mdio);
 
-			LOG_INF("PHY (%d) ID %X", cfg->phy_addr, phy_id);
+	if (cfg->no_reset == false) {
+		reset(dev);
+	}
+
+	if (get_id(dev, &phy_id) == 0) {
+		if (phy_id == MII_INVALID_PHY_ID) {
+			LOG_ERR("No PHY found at address %d", cfg->phy_addr);
+
+			return -EINVAL;
 		}
 
-		data->gigabit_supported = is_gigabit_supported(dev);
+		LOG_INF("PHY (%d) ID %X", cfg->phy_addr, phy_id);
+	}
+
+	data->gigabit_supported = is_gigabit_supported(dev);
 
-		/* Advertise all speeds */
-		phy_mii_cfg_link(dev, LINK_HALF_10BASE |
-				      LINK_FULL_10BASE |
-				      LINK_HALF_100BASE |
-				      LINK_FULL_100BASE |
-				      LINK_HALF_1000BASE |
-				      LINK_FULL_1000BASE);
+	/* Advertise all speeds */
+	phy_mii_cfg_link(dev, LINK_HALF_10BASE |
+			      LINK_FULL_10BASE |
+			      LINK_HALF_100BASE |
+			      LINK_FULL_100BASE |
+			      LINK_HALF_1000BASE |
+			      LINK_FULL_1000BASE);
 
-		k_work_init_delayable(&data->monitor_work,
-					monitor_work_handler);
-		k_work_init_delayable(&data->autoneg_work,
-					autoneg_work_handler);
+	k_work_init_delayable(&data->monitor_work, monitor_work_handler);
+	k_work_init_delayable(&data->autoneg_work, autoneg_work_handler);
 
-		monitor_work_handler(&data->monitor_work.work);
-	}
+	monitor_work_handler(&data->monitor_work.work);
 
 	return 0;
 }
+#endif /* ANY_DYNAMIC_LINK */
 
 #define IS_FIXED_LINK(n)	DT_INST_NODE_HAS_PROP(n, fixed_link)
 
 static DEVICE_API(ethphy, phy_mii_driver_api) = {
 	.get_link = phy_mii_get_link_state,
-	.cfg_link = phy_mii_cfg_link,
 	.link_cb_set = phy_mii_link_cb_set,
+#if ANY_DYNAMIC_LINK
+	.cfg_link = phy_mii_cfg_link,
 	.read = phy_mii_read,
 	.write = phy_mii_write,
+#endif
 };
 
 #define PHY_MII_CONFIG(n)						 \
@@ -586,11 +597,22 @@ static const struct phy_mii_dev_config phy_mii_dev_config_##n = {	 \
 			 DEVICE_DT_GET(DT_INST_BUS(n)))			 \
 };
 
+#define PHY_MII_DATA(n)							 \
+static struct phy_mii_dev_data phy_mii_dev_data_##n = {			 \
+	.dev = DEVICE_DT_INST_GET(n),					 \
+	.cb = NULL,							 \
+	.sem = Z_SEM_INITIALIZER(phy_mii_dev_data_##n.sem, 1, 1),	 \
+};
+
+#define PHY_MII_INIT(n)							 \
+	COND_CODE_1(IS_FIXED_LINK(n), (&phy_mii_initialize_fixed_link),	 \
+		   (&phy_mii_initialize_dynamic_link))
+
 #define PHY_MII_DEVICE(n)						\
 	PHY_MII_CONFIG(n);						\
-	static struct phy_mii_dev_data phy_mii_dev_data_##n;		\
+	PHY_MII_DATA(n);						\
 	DEVICE_DT_INST_DEFINE(n,					\
-			      &phy_mii_initialize,			\
+			      PHY_MII_INIT(n),				\
 			      NULL,					\
 			      &phy_mii_dev_data_##n,			\
 			      &phy_mii_dev_config_##n, POST_KERNEL,	\