SFP plugged in logs continuously printed for DAC SFP

NET:ETH:PHY:A2 might not be valid for A0 need to avoid SFP plugin log

NET:ETH:PHY:rate limit the SFP plugin(out) log

Co-authored-by: Narayan, Preetam <preetam.narayan@altera.com>

Author: preetam-narayan

drivers/net/phy/sfp-mem-core.c

@@ -158,7 +158,7 @@ static ssize_t sfp_connected_show(struct device *dev, struct device_attribute *a
 	bool plugin;
 
 	mutex_lock(&sfp->lock);
-	plugin = check_sfp_plugin(sfp) && (sfp->init == SFP_INIT_DONE);
+	plugin = check_sfp_plugin(sfp) && (sfp->state == SFP_INIT_DONE);
 	mutex_unlock(&sfp->lock);
 
 	return sysfs_emit(buf, "%u\n", plugin);
@@ -201,28 +201,32 @@ static void sfp_check_hotplug(struct work_struct *work)
 
 	is_sfp_pluggedin = check_sfp_plugin(sfp);
 
-	if ((!is_sfp_pluggedin) && (sfp->init != SFP_INIT_RESET)) {
-		dev_info(sfp->dev, "detected SFP unplugin\n");
-		WRITE_ONCE(sfp->init, SFP_INIT_RESET);
+	if ((!is_sfp_pluggedin) && (sfp->state != SFP_DETECT)) {
+		dev_info_ratelimited(sfp->dev, "detected SFP plug out\n");
+		WRITE_ONCE(sfp->state, SFP_DETECT);
 	}
 
 	/* in case of error observed then we need to take defensive action */
 	if (stat_off & A2_UPD_ERROR)
-                WRITE_ONCE(sfp->init, SFP_A2_UPDATE_ERROR);
+                WRITE_ONCE(sfp->state, SFP_A2_UPDATE_ERROR);
 
 	if (stat_off & A0_UPD_ERROR)
-		WRITE_ONCE(sfp->init, SFP_A0_UPDATE_ERROR);
+		WRITE_ONCE(sfp->state, SFP_A0_UPDATE_ERROR);
 
-	switch(sfp->init) {
+	switch(sfp->state) {
 
-	case SFP_INIT_RESET:
+	case SFP_DETECT:
 		if (is_sfp_pluggedin) {
-			dev_info(sfp->dev, "detected SFP plugin\n");
-			if(sfp_init(sfp))
-				WRITE_ONCE(sfp->init, SFP_INIT_DONE);
-			sfp->tolerance_count = IP_RESPONSE_TOLERANCE_LIMIT;
+			dev_info_ratelimited(sfp->dev, "detected SFP plugin\n");
+			WRITE_ONCE(sfp->state, SFP_INIT_RESET);
 		}
 		break;
+	
+	case SFP_INIT_RESET:
+		if(sfp_init(sfp))
+			WRITE_ONCE(sfp->state, SFP_INIT_DONE);
+		sfp->tolerance_count = IP_RESPONSE_TOLERANCE_LIMIT;
+		break;
 
 	case SFP_INIT_DONE:
 		if (!(stat_off & A0_UPD_RDY_TO_START))
@@ -236,16 +240,17 @@ static void sfp_check_hotplug(struct work_struct *work)
 					    		  (stat_off & A0_UPD_IN_PROG)),
 							  10, I2C_MAX_TIMEOUT);
 			if (!poll_timeout) {
-				WRITE_ONCE(sfp->init, SFP_A0PAGE_UPDATE_INPROG);
+				WRITE_ONCE(sfp->state, SFP_A0PAGE_UPDATE_INPROG);
 				sfp->tolerance_count = IP_RESPONSE_TOLERANCE_LIMIT;
+				break;
 			} else {
 				dev_warn_ratelimited(sfp->dev,
 					 "SFP FSM state change to SFP_A0PAGE_UPDATE_INPROG"
 					 "unexpected delay\n");
 			}
 
 			if (--sfp->tolerance_count == IP_IRRESPONSIVE) {
-				WRITE_ONCE(sfp->init, SFP_INIT_RESET);
+				WRITE_ONCE(sfp->state, SFP_INIT_RESET);
 				break;
 			}
 		}
@@ -266,35 +271,35 @@ static void sfp_check_hotplug(struct work_struct *work)
 			 */
 			writeq(sfp_sel, sfp->base + CONF_OFF);
 
-			WRITE_ONCE(sfp->init, SFP_A0PAGE_UPDATE_COMPLETE);
+			WRITE_ONCE(sfp->state, SFP_A0PAGE_UPDATE_COMPLETE);
 		}
 		break;
 
 	case SFP_A0PAGE_UPDATE_COMPLETE:
 
 		writeq(CONF_POLL_EN, sfp->base + CONF_OFF);
-		WRITE_ONCE(sfp->init, SFP_A2PAGE_UPDATE_INPROG);
+		WRITE_ONCE(sfp->state, SFP_A2PAGE_UPDATE_INPROG);
 		sfp->tolerance_count = IP_RESPONSE_TOLERANCE_LIMIT;
 
 		break;
 
 	case SFP_A2PAGE_UPDATE_INPROG:
 		if (stat_off & A2_UPD_COMPLETE) {
-			WRITE_ONCE(sfp->init, SFP_A2PAGE_UPDATE_COMPLETE);
+			WRITE_ONCE(sfp->state, SFP_A2PAGE_UPDATE_COMPLETE);
 		} else {
 		       	if (--sfp->tolerance_count == IP_IRRESPONSIVE)
-				WRITE_ONCE(sfp->init, SFP_INIT_RESET);
+				WRITE_ONCE(sfp->state, SFP_INIT_RESET);
 		}
 		break;
 
 	case SFP_A0_UPDATE_ERROR:
 		dev_err(sfp->dev, "SFP: A0 Page error observed, restarting A0 page operation\n");
-		WRITE_ONCE(sfp->init, SFP_INIT_RESET);
+		WRITE_ONCE(sfp->state, SFP_INIT_RESET);
 		break;
 
 	case SFP_A2_UPDATE_ERROR:
 		dev_err(sfp->dev, "SFP: A2 Page error observed, restarting A2 page operation\n");
-		WRITE_ONCE(sfp->init, SFP_A0PAGE_UPDATE_COMPLETE);
+		WRITE_ONCE(sfp->state, SFP_A0PAGE_UPDATE_COMPLETE);
 		break;
 
 	case SFP_A2PAGE_UPDATE_COMPLETE:	
@@ -348,7 +353,7 @@ static void sfp_page_copy(struct sfp *sfp)
 static int sfp_module_info(struct sfp *sfp, struct ethtool_modinfo *modinfo)
 {
 	/* Atleast A0 page update is completed */
-	if (!(sfp->init >= SFP_A0PAGE_UPDATE_COMPLETE))
+	if (!(sfp->state >= SFP_A0PAGE_UPDATE_COMPLETE))
 		return -EIO;
 
 	sfp_page_copy(sfp);
@@ -450,7 +455,7 @@ static const struct sfp_socket_ops sfp_module_ops = {
 
 int sfp_init_work(struct sfp *sfp)
 {
-	sfp->init = SFP_INIT_RESET;
+	sfp->state = SFP_DETECT;
 
 	sfp->sfp_bus = sfp_register_socket(sfp->dev, sfp, &sfp_module_ops);
 	if (!sfp->sfp_bus)

include/linux/phy/sfp-mem.h

@@ -27,7 +27,8 @@
 #define A2_EEPROM_SIZE (ETH_MODULE_SFF_8472_LEN/2) * IMPLEMENTED_A2PAGES
 
 enum sfp_init_status {
-	SFP_INIT_RESET = 0,
+	SFP_DETECT = 0,
+	SFP_INIT_RESET,
 	SFP_INIT_DONE,
 	SFP_A0PAGE_UPDATE_INPROG,
 	SFP_A0PAGE_UPDATE_COMPLETE,
@@ -52,15 +53,15 @@ union sfp_a0_page {
  * @regmap: regmap for device.
  * @dwork: work struct for checking sfp plugin status.
  * @dev: point to device.
- * @init: sfp init status.
+ * @state: sfp status.
  * @lock: lock for sfp initial function and status.
  */
 struct sfp {
 	void __iomem *base;
 	struct regmap *regmap;
 	struct delayed_work dwork;
 	struct device *dev;
-	enum sfp_init_status init;
+	enum sfp_init_status state;
 	struct mutex lock;
 	u32 tolerance_count;
 	struct sfp_bus *sfp_bus;