Simmadha/qsfp mem controller driver (#22)

Sync with linux-dfl branch

Author: KrishnaSimmadhari

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

@@ -107,17 +107,33 @@ int check_qsfp_plugin(struct qsfp *qsfp)
 }
 EXPORT_SYMBOL_GPL(check_qsfp_plugin);
 
-u32 qsfp_connected_show(struct qsfp *qsfp)
+ssize_t qsfp_connected_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
+	struct qsfp *qsfp = dev_get_drvdata(dev);
 	u32 plugin;
 
 	mutex_lock(&qsfp->lock);
 	plugin = check_qsfp_plugin(qsfp) && (qsfp->init == QSFP_INIT_DONE);
 	mutex_unlock(&qsfp->lock);
 
-	return plugin;
+	return sysfs_emit(buf, "%u\n", plugin);
 }
-EXPORT_SYMBOL_GPL(qsfp_connected_show);
+static DEVICE_ATTR_RO(qsfp_connected);
+
+static struct attribute *qsfp_mem_attrs[] = {
+	&dev_attr_qsfp_connected.attr,
+	NULL,
+};
+
+static const struct attribute_group qsfp_mem_group = {
+	.attrs = qsfp_mem_attrs,
+};
+
+const struct attribute_group *qsfp_mem_groups[] = {
+	&qsfp_mem_group,
+	NULL,
+};
+EXPORT_SYMBOL_GPL(qsfp_mem_groups);
 
 void qsfp_check_hotplug(struct work_struct *work)
 {

drivers/net/phy/qsfp-mem-dfl.c

@@ -5,30 +5,14 @@
  * Copyright (C) 2022 Intel Corporation. All rights reserved.
  */
 #include <linux/dfl.h>
-#include <linux/phy/qsfp-mem.h>
 #include <linux/module.h>
-
-ssize_t dfl_qsfp_connected_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-	struct qsfp *qsfp = dev_get_drvdata(dev);
-	u32 plugin = qsfp_connected_show(qsfp);
-
-	return sysfs_emit(buf, "%u\n", plugin);
-}
-
-static DEVICE_ATTR_RO(dfl_qsfp_connected);
-
-static struct attribute *qsfp_mem_attrs[] = {
-	&dev_attr_dfl_qsfp_connected.attr,
-	NULL,
-};
-ATTRIBUTE_GROUPS(qsfp_mem);
+#include <linux/phy/qsfp-mem.h>
 
 static int qsfp_dfl_probe(struct dfl_device *dfl_dev)
 {
 	struct device *dev = &dfl_dev->dev;
 	struct qsfp *qsfp;
-	int ret = 0;
+	int ret;
 
 	qsfp = devm_kzalloc(dev, sizeof(*qsfp), GFP_KERNEL);
 	if (!qsfp)
@@ -44,11 +28,23 @@ static int qsfp_dfl_probe(struct dfl_device *dfl_dev)
 	dev_set_drvdata(dev, qsfp);
 
 	ret = qsfp_init_work(qsfp);
-	if (ret != 0) {
-		dev_err(dev, "Failed to initialize delayed work to read QSFP\n");
-		return ret;
+	if (ret) {
+		dev_err_probe(dev, ret,
+			      "Failed to initialize delayed work to read QSFP\n");
+		goto exit;
 	}
-	return qsfp_register_regmap(qsfp);
+
+	ret = qsfp_register_regmap(qsfp);
+	if (ret)
+		goto cancel_work;
+
+	return 0;
+
+cancel_work:
+	qsfp_remove_device(qsfp);
+exit:
+	mutex_destroy(&qsfp->lock);
+	return ret;
 }
 
 static void qsfp_dfl_remove(struct dfl_device *dfl_dev)

drivers/net/phy/qsfp-mem-platform.c

@@ -5,11 +5,11 @@
  * Copyright (C) 2022 Intel Corporation. All rights reserved.
  */
 
-#include <linux/phy/qsfp-mem.h>
 #include <linux/bitfield.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/phy/qsfp-mem.h>
 #include <linux/processor.h>
 #include <linux/slab.h>
 
@@ -21,7 +21,7 @@ static int qsfp_platform_probe(struct platform_device *pdev)
 	struct resource *region = NULL;
 	struct resource *qsfpconfig = NULL;
 	struct qsfp *qsfp = NULL;
-	int ret = 0;
+	int ret;
 
 	qsfp = devm_kzalloc(dev, sizeof(*qsfp), GFP_KERNEL);
 	if (!qsfp)
@@ -35,8 +35,7 @@ static int qsfp_platform_probe(struct platform_device *pdev)
 	qsfpconfig = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 						  INTEL_QSFP_MEM_CONTROLLER_NAME);
 	if (!qsfpconfig) {
-		dev_err(dev, "resource %s not defined\n",
-			INTEL_QSFP_MEM_CONTROLLER_NAME);
+		dev_err(dev, "resource %s not defined\n", INTEL_QSFP_MEM_CONTROLLER_NAME);
 		return -ENODEV;
 	}
 
@@ -53,12 +52,23 @@ static int qsfp_platform_probe(struct platform_device *pdev)
 	}
 
 	ret = qsfp_init_work(qsfp);
-	if (ret != 0) {
-		dev_err(dev, "Failed to initialize delayed work to read QSFP\n");
-		return ret;
+	if (ret) {
+		dev_err_probe(dev, ret,
+			      "Failed to initialize delayed work to read QSFP\n");
+		goto exit;
 	}
 
-	return qsfp_register_regmap(qsfp);
+	ret = qsfp_register_regmap(qsfp);
+	if (ret)
+		goto cancel_work;
+
+	return 0;
+
+cancel_work:
+	qsfp_remove_device(qsfp);
+exit:
+	mutex_destroy(&qsfp->lock);
+	return ret;
 }
 
 static int qsfp_platform_remove(struct platform_device *pdev)
@@ -72,8 +82,7 @@ static int qsfp_platform_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id intel_fpga_qsfp_mem_ids[] = {
-	{ .compatible = "intel,qsfp-mem",
-		.data = NULL, },
+	{ .compatible = "intel,qsfp-mem", .data = NULL, },
 	{},
 };
 MODULE_DEVICE_TABLE(of, intel_fpga_qsfp_mem_ids);
@@ -84,7 +93,8 @@ static struct platform_driver qsfp_driver = {
 	.suspend    = NULL,
 	.resume     = NULL,
 	.driver     = {
-		.name   = "intel,qsfp-mem",
+		.name   = "qsfp-mem",
+		.dev_groups = qsfp_mem_groups,
 		.owner  = THIS_MODULE,
 		.of_match_table = intel_fpga_qsfp_mem_ids,
 	},
@@ -94,4 +104,3 @@ module_platform_driver(qsfp_driver);
 MODULE_DESCRIPTION("Intel(R) Memory based QSFP Platform driver");
 MODULE_AUTHOR("Intel Corporation");
 MODULE_LICENSE("GPL");
-

include/linux/phy/qsfp-mem.h

@@ -45,6 +45,6 @@ int qsfp_init_work(struct qsfp *qsfp);
 int qsfp_register_regmap(struct qsfp *qsfp);
 void qsfp_remove_device(struct qsfp *qsfp);
 int check_qsfp_plugin(struct qsfp *qsfp);
-u32 qsfp_connected_show(struct qsfp *qsfp);
+extern const struct attribute_group *qsfp_mem_groups[];
 
 #endif //__LINUX_QSFP_MEM_H