Update PDDF kernel modules with 5.10 kernel and fix some compilation …

platform/pddf/i2c/Makefile

@@ -1 +1 @@
-subdir-m := modules
+obj-m := modules/

platform/pddf/i2c/debian/rules

@@ -18,7 +18,7 @@ PACKAGE_PRE_NAME := sonic-platform-pddf
 KVERSION   ?= $(shell uname -r)
 KERNEL_SRC :=  /lib/modules/$(KVERSION)
 MOD_SRC_DIR:= $(shell pwd)
-MODULE_DIRS:= client cpld cpld/driver cpldmux cpldmux/driver fan fan/driver fan/vendor_api mux gpio led psu psu/driver sysstatus xcvr xcvr/driver
+MODULE_DIRS:= client cpld cpld/driver cpldmux cpldmux/driver fan fan/driver mux gpio led psu psu/driver sysstatus xcvr xcvr/driver
 MODULE_DIR:= modules
 UTILS_DIR := utils
 SERVICE_DIR := service
@@ -35,8 +35,10 @@ clean:
 	make -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR) clean
 
 build:
+	set -e; \
 	make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR); \
 	$(PYTHON) $(MOD_SRC_DIR)/setup.py build; \
+	set +e
 
 binary: binary-arch binary-indep
 	# Nothing to do
@@ -50,11 +52,13 @@ binary-indep:
 	dh_installdirs -p$(PACKAGE_PRE_NAME) $(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 	dh_installdirs -p$(PACKAGE_PRE_NAME) usr/local/bin; \
 	# Custom package commands
+	set -e; \
 	(for mod in $(MODULE_DIRS); do \
 			cp $(MOD_SRC_DIR)/$(MODULE_DIR)/$${mod}/*.ko debian/$(PACKAGE_PRE_NAME)/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
 	done) ; \
 	cp -r $(MOD_SRC_DIR)/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)/usr/local/bin/; \
-	$(PYTHON) $(MOD_SRC_DIR)/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME) --install-layout=deb;
+	$(PYTHON) $(MOD_SRC_DIR)/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME) --install-layout=deb; \
+	set +e
 
 	# Resuming debhelper scripts
 	dh_testroot

platform/pddf/i2c/modules/Makefile

@@ -1 +1 @@
-subdir-m := client cpld cpldmux xcvr mux gpio psu fan led sysstatus
+obj-m := client/ cpld/ cpldmux/ xcvr/ mux/ gpio/ psu/ fan/ led/ sysstatus/

platform/pddf/i2c/modules/cpld/Makefile

@@ -1,4 +1,4 @@
-subdir-m := driver
-obj-m := pddf_cpld_module.o
+obj-m := driver/
+obj-m += pddf_cpld_module.o
 
-CFLAGS_$(obj-m):= -I$(M)/modules/include
+ccflags-y:= -I$(M)/modules/include

platform/pddf/i2c/modules/cpld/driver/pddf_cpld_driver.c

@@ -30,9 +30,58 @@ static struct mutex	 list_lock;
 
 struct cpld_client_node {
 	struct i2c_client *client;
+	char name[CPLD_CLIENT_NAME_LEN];
 	struct list_head   list;
 };
 
+int board_i2c_cpld_read_new(unsigned short cpld_addr, char *name, u8 reg)
+{
+	struct list_head   *list_node = NULL;
+	struct cpld_client_node *cpld_node = NULL;
+	int ret = -EPERM;
+
+	mutex_lock(&list_lock);
+
+	list_for_each(list_node, &cpld_client_list)
+	{
+		cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+		if ((cpld_node->client->addr == cpld_addr) && (strncmp(cpld_node->name, name, strlen(name)) == 0)) {
+			ret = i2c_smbus_read_byte_data(cpld_node->client, reg);
+			break;
+		}
+	}
+
+	mutex_unlock(&list_lock);
+
+	return ret;
+}
+EXPORT_SYMBOL(board_i2c_cpld_read_new);
+
+int board_i2c_cpld_write_new(unsigned short cpld_addr, char *name, u8 reg, u8 value)
+{
+	struct list_head   *list_node = NULL;
+	struct cpld_client_node *cpld_node = NULL;
+	int ret = -EIO;
+
+	mutex_lock(&list_lock);
+
+	list_for_each(list_node, &cpld_client_list)
+	{
+		cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+		if ((cpld_node->client->addr == cpld_addr) && (strncmp(cpld_node->name, name, strlen(name)) == 0)){
+			ret = i2c_smbus_write_byte_data(cpld_node->client, reg, value);
+			break;
+		}
+	}
+
+	mutex_unlock(&list_lock);
+
+	return ret;
+}
+EXPORT_SYMBOL(board_i2c_cpld_write_new);
+
 int board_i2c_cpld_read(unsigned short cpld_addr, u8 reg)
 {
 	struct list_head   *list_node = NULL;
@@ -128,7 +177,9 @@ static void board_i2c_cpld_add_client(struct i2c_client *client)
 	}
 
 	node->client = client;
-
+	strcpy(node->name, (char *)client->dev.platform_data);
+	dev_dbg(&client->dev, "Adding %s to the cpld client list\n", node->name);
+
 	mutex_lock(&list_lock);
 	list_add(&node->list, &cpld_client_list);
 	mutex_unlock(&list_lock);
@@ -188,8 +239,14 @@ static int board_i2c_cpld_probe(struct i2c_client *client,
 
 static int board_i2c_cpld_remove(struct i2c_client *client)
 {
-    sysfs_remove_group(&client->dev.kobj, &cpld_attribute_group);
+	/* Platform data is just a char string */
+	char *platdata = (char *)client->dev.platform_data;
+	sysfs_remove_group(&client->dev.kobj, &cpld_attribute_group);
 	board_i2c_cpld_remove_client(client);
+	if (platdata)
+	{
+	    kfree(platdata);
+	}
 
 	return 0;
 }

platform/pddf/i2c/modules/cpld/pddf_cpld_module.c

@@ -37,7 +37,7 @@ EXPORT_SYMBOL(pddf_cpld_data);
 
 static ssize_t do_device_operation(struct device *dev, struct device_attribute *da, const char *buf, size_t count);
 static ssize_t store_pddf_cpld_data(struct device *dev, struct device_attribute *da, const char *buf, size_t count);
-ssize_t show_pddf_cpld_data(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t show_pddf_cpld_data(struct device *dev, struct device_attribute *da, char *buf);
 
 extern void *get_device_table(char *name);
 extern void delete_device_table(char *name);
@@ -77,9 +77,8 @@ static ssize_t store_pddf_cpld_data(struct device *dev, struct device_attribute
 
     return count;
 }
-EXPORT_SYMBOL(store_pddf_cpld_data);
 
-ssize_t show_pddf_cpld_data(struct device *dev, struct device_attribute *da, char *buf)
+static ssize_t show_pddf_cpld_data(struct device *dev, struct device_attribute *da, char *buf)
 {
     int ret = 0;
     PDDF_ATTR *ptr = (PDDF_ATTR *)da;
@@ -91,7 +90,6 @@ ssize_t show_pddf_cpld_data(struct device *dev, struct device_attribute *da, cha
 
     return ret;
 }
-EXPORT_SYMBOL(show_pddf_cpld_data);
 
 static ssize_t do_device_operation(struct device *dev, struct device_attribute *da, const char *buf, size_t count)
 {
@@ -100,24 +98,27 @@ static ssize_t do_device_operation(struct device *dev, struct device_attribute *
 	struct i2c_adapter *adapter;
 	static struct i2c_board_info board_info;
 	struct i2c_client *client_ptr;
+	char *pddf_cpld_name = NULL;
 
 	if (strncmp(buf, "add", strlen(buf)-1)==0)
 	{
 		adapter = i2c_get_adapter(device_ptr->parent_bus);
 
 		if (strncmp(device_ptr->dev_type, "i2c_cpld", strlen("i2c_cpld"))==0)
 		{
+			pddf_cpld_name = (char *)kzalloc(CPLD_CLIENT_NAME_LEN, GFP_KERNEL);
+			if (pddf_cpld_name != NULL) strcpy(pddf_cpld_name, device_ptr->i2c_name);
+
 			board_info = (struct i2c_board_info) {
-				.platform_data = (void *)NULL,
+				.platform_data = (void *)pddf_cpld_name,
 			};
 
 			board_info.addr = device_ptr->dev_addr;
 			strcpy(board_info.type, device_ptr->dev_type);
 
-			/*pddf_dbg(KERN_ERR "Creating a client %s on 0x%x, platform_data 0x%x\n", board_info.type, board_info.addr, board_info.platform_data);*/
 			client_ptr = i2c_new_client_device(adapter, &board_info);
 
-			if (client_ptr != NULL) {
+			if (!IS_ERR(client_ptr)) {
 				i2c_put_adapter(adapter);
 				pddf_dbg(CPLD, KERN_ERR "Created %s client: 0x%p\n", device_ptr->i2c_name, (void *)client_ptr);
 				add_device_table(device_ptr->i2c_name, (void*)client_ptr);
@@ -152,8 +153,12 @@ static ssize_t do_device_operation(struct device *dev, struct device_attribute *
 	{
 		printk(KERN_ERR "PDDF_ERROR: %s: Invalid value for dev_ops %s", __FUNCTION__, buf);
 	}
+	goto clear_data;
 
 free_data:
+	if (board_info.platform_data)
+	    kfree(board_info.platform_data);
+clear_data:
 	/*TODO: free the device_ptr->data is dynamically allocated*/
 	memset(device_ptr, 0 , sizeof(NEW_DEV_ATTR));
 

platform/pddf/i2c/modules/cpldmux/Makefile

@@ -1,4 +1,4 @@
-subdir-m := driver
-obj-m := pddf_cpldmux_module.o
+obj-m := driver/
+obj-m += pddf_cpldmux_module.o
 
-CFLAGS_$(obj-m):= -I$(M)/modules/include
+ccflags-y:= -I$(M)/modules/include

platform/pddf/i2c/modules/cpldmux/driver/pddf_cpldmux_driver.c

@@ -20,7 +20,6 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/dmi.h>
-#include <linux/platform_data/pca954x.h>
 #include <linux/i2c-mux.h>
 #include <linux/platform_device.h>
 #include "pddf_client_defs.h"

platform/pddf/i2c/modules/fan/Makefile

@@ -1,4 +1,4 @@
-subdir-m := driver
-obj-m := pddf_fan_module.o
+obj-m := driver/
+obj-m += pddf_fan_module.o
 
-CFLAGS_$(obj-m):= -I$(M)/modules/include
+ccflags-y:= -I$(M)/modules/include

platform/pddf/i2c/modules/fan/driver/pddf_fan_api.c

@@ -64,20 +64,20 @@ int fan_update_hw(struct device *dev, struct fan_attr_info *info, FAN_DATA_ATTR
 	{
 		status = (sysfs_attr_data->pre_set)(client, udata, info);
 		if (status!=0)
-			printk(KERN_ERR "%s: pre_set function fails for %s attribute\n", __FUNCTION__, udata->aname);
+			dev_warn(&client->dev, "%s: pre_set function fails for %s attribute. ret %d\n", __FUNCTION__, udata->aname, status);
 	}
 	if (sysfs_attr_data->do_set != NULL)
 	{
 		status = (sysfs_attr_data->do_set)(client, udata, info);
 		if (status!=0)
-			printk(KERN_ERR "%s: do_set function fails for %s attribute\n", __FUNCTION__, udata->aname);
+			dev_warn(&client->dev, "%s: do_set function fails for %s attribute. ret %d\n", __FUNCTION__, udata->aname, status);
 
 	}
 	if (sysfs_attr_data->post_set != NULL)
 	{
 		status = (sysfs_attr_data->post_set)(client, udata, info);
 		if (status!=0)
-			printk(KERN_ERR "%s: post_set function fails for %s attribute\n", __FUNCTION__, udata->aname);
+			dev_warn(&client->dev, "%s: post_set function fails for %s attribute. ret %d\n", __FUNCTION__, udata->aname, status);
 	}
 
     mutex_unlock(&info->update_lock);
@@ -104,20 +104,20 @@ int fan_update_attr(struct device *dev, struct fan_attr_info *info, FAN_DATA_ATT
 		{
 			status = (sysfs_attr_data->pre_get)(client, udata, info);
 			if (status!=0)
-				printk(KERN_ERR "%s: pre_get function fails for %s attribute\n", __FUNCTION__, udata->aname);
+				dev_warn(&client->dev, "%s: pre_get function fails for %s attribute. ret %d\n", __FUNCTION__, udata->aname, status);
 		}
 		if (sysfs_attr_data->do_get != NULL)
 		{
 			status = (sysfs_attr_data->do_get)(client, udata, info);
 			if (status!=0)
-                printk(KERN_ERR "%s: do_get function fails for %s attribute\n", __FUNCTION__, udata->aname);
+				dev_warn(&client->dev, "%s: do_get function fails for %s attribute. ret %d\n", __FUNCTION__, udata->aname, status);
 
 		}
 		if (sysfs_attr_data->post_get != NULL)
 		{
 			status = (sysfs_attr_data->post_get)(client, udata, info);
 			if (status!=0)
-                printk(KERN_ERR "%s: post_get function fails for %s attribute\n", __FUNCTION__, udata->aname);
+				dev_warn(&client->dev, "%s: post_get function fails for %s attribute.ret %d\n", __FUNCTION__, udata->aname, status);
 		}
 
 
@@ -346,7 +346,10 @@ int sonic_i2c_get_fan_present_default(void *client, FAN_DATA_ATTR *udata, void *
 	    val = i2c_smbus_read_byte_data((struct i2c_client *)client, udata->offset);
     }
 
-    painfo->val.intval = ((val & udata->mask) == udata->cmpval);
+	if (val < 0)
+		status = val;
+	else
+		painfo->val.intval = ((val & udata->mask) == udata->cmpval);
 
 
     return status;
@@ -355,7 +358,7 @@ int sonic_i2c_get_fan_present_default(void *client, FAN_DATA_ATTR *udata, void *
 int sonic_i2c_get_fan_rpm_default(void *client, FAN_DATA_ATTR *udata, void *info)
 {
     int status = 0;
-	uint32_t val = 0;
+	int val = 0;
     struct fan_attr_info *painfo = (struct fan_attr_info *)info;
 
     if (strcmp(udata->devtype, "cpld") == 0)
@@ -375,10 +378,15 @@ int sonic_i2c_get_fan_rpm_default(void *client, FAN_DATA_ATTR *udata, void *info
         }
     }
 
-	if (udata->is_divisor)
-		painfo->val.intval = udata->mult / (val >> 3);
+	if (val < 0)
+		status = val;
 	else
-		painfo->val.intval = udata->mult * val;
+	{
+		if (udata->is_divisor)
+			painfo->val.intval = udata->mult / (val >> 3);
+		else
+			painfo->val.intval = udata->mult * val;
+	}
 
 	return status;
 }
@@ -471,7 +479,7 @@ int sonic_i2c_set_fan_pwm_default(struct i2c_client *client, FAN_DATA_ATTR *udat
 int sonic_i2c_get_fan_pwm_default(void *client, FAN_DATA_ATTR *udata, void *info)
 {
     int status = 0;
-	uint32_t val = 0;
+	int val = 0;
     struct fan_attr_info *painfo = (struct fan_attr_info *)info;
 
     if (strcmp(udata->devtype, "cpld") == 0)
@@ -491,15 +499,20 @@ int sonic_i2c_get_fan_pwm_default(void *client, FAN_DATA_ATTR *udata, void *info
         }
     }
 
-	val = val & udata->mask;
-	painfo->val.intval = val;
+	if (val < 0)
+		status = val;
+	else
+	{
+		val = val & udata->mask;
+		painfo->val.intval = val;
+	}
     return status;
 }
 
 int sonic_i2c_get_fan_fault_default(void *client, FAN_DATA_ATTR *udata, void *info)
 {
     int status = 0;
-	uint32_t val = 0;
+	int val = 0;
     struct fan_attr_info *painfo = (struct fan_attr_info *)info;
 
 	/*Assuming fan fault to be denoted by 1 byte only*/
@@ -512,8 +525,10 @@ int sonic_i2c_get_fan_fault_default(void *client, FAN_DATA_ATTR *udata, void *in
 	    val = i2c_smbus_read_byte_data((struct i2c_client *)client, udata->offset);
     }
 
-	val = val & udata->mask;
-	painfo->val.intval = val;
+	if (val < 0)
+		status = val;
+	else
+		painfo->val.intval = ((val & udata->mask) == udata->cmpval);
     return status;
 }
 

platform/pddf/i2c/modules/fan/driver/pddf_fan_driver.c

@@ -357,7 +357,7 @@ static int pddf_fan_probe(struct i2c_client *client,
         goto exit_free;
     }
 
-    data->hwmon_dev = hwmon_device_register(&client->dev);
+    data->hwmon_dev = hwmon_device_register_with_info(&client->dev, client->name, NULL, NULL, NULL);
     if (IS_ERR(data->hwmon_dev)) {
         status = PTR_ERR(data->hwmon_dev);
         goto exit_remove;

platform/pddf/i2c/modules/fan/pddf_fan_module.c

@@ -159,9 +159,9 @@ static ssize_t do_device_operation(struct device *dev, struct device_attribute *
         board_info = i2c_get_fan_board_info(fdata, cdata);
 
         /* Populate the platform data for fan */
-        client_ptr = i2c_new_device(adapter, board_info);
+        client_ptr = i2c_new_client_device(adapter, board_info);
 
-        if(client_ptr != NULL)
+        if(!IS_ERR(client_ptr))
         {
             i2c_put_adapter(adapter);
             pddf_dbg(FAN, KERN_ERR "Created a %s client: 0x%p\n", cdata->i2c_name, (void *)client_ptr);

platform/pddf/i2c/modules/gpio/Makefile

@@ -1,4 +1,4 @@
 
 obj-m := pddf_gpio_module.o
 
-CFLAGS_$(obj-m):= -I$(M)/modules/include
+ccflags-y := -I$(M)/modules/include