This patch updates ‘current_value’ permissions to match the value
reported by ‘is_readonly’ value associated with the attribute.
‘current_value’ permissions are set to read-only if ‘is_readonly’
value is 1. ‘current_value’ permissions are set to read-write if
‘is_readonly’ value is zero. Other read-only and write-only
permissions will remain unchanged.
Signed-off-by: Jorge Lopez <jorge.lopez2@xxxxxx>
---
drivers/platform/x86/hp/bioscfg.c | 17 +++++++++++++++++
drivers/platform/x86/hp/bioscfg.h | 1 +
drivers/platform/x86/hp/enum-attributes.c | 4 ++++
drivers/platform/x86/hp/int-attributes.c | 4 ++++
drivers/platform/x86/hp/ordered-attributes.c | 6 +++++-
drivers/platform/x86/hp/string-attributes.c | 4 ++++
6 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/hp/bioscfg.c b/drivers/platform/x86/hp/bioscfg.c
index f08bcae5752a..72dd963f29ae 100644
--- a/drivers/platform/x86/hp/bioscfg.c
+++ b/drivers/platform/x86/hp/bioscfg.c
@@ -542,6 +542,23 @@ inline int encode_outsize_for_pvsz(int outsize)
return 1;
}
+/**
+ * update_attribute_permissions() - Update attributes permissions when
+ * isReadOnly value is 1
+ *
+ * @isReadOnly: ReadOnly value
+ * @current_val: kobj_attribute corresponding to attribute.
+ *
+ **/
+void update_attribute_permissions(u32 isReadOnly, struct kobj_attribute *current_val)
+{
+ if (isReadOnly)
+ current_val->attr.mode = (umode_t)0444;
+ else
+ current_val->attr.mode = (umode_t)0600;
+}
+
+
/**
* destroy_attribute_objs() - Free a kset of kobjects
* @kset: The kset to destroy
diff --git a/drivers/platform/x86/hp/bioscfg.h b/drivers/platform/x86/hp/bioscfg.h
index ac02c8c1e5f2..ff030399b3a2 100644
--- a/drivers/platform/x86/hp/bioscfg.h
+++ b/drivers/platform/x86/hp/bioscfg.h
@@ -520,6 +520,7 @@ __BIN_ATTR(_name, 0444 | 0200, _group##_##_name##_read, _group##_##_name##_write
union acpi_object *get_wmiobj_pointer(int instance_id, const char *guid_string);
int get_instance_count(const char *guid_string);
void strlcpy_attr(char *dest, char *src);
+void update_attribute_permissions(u32 isReadOnly, struct kobj_attribute *current_val);
/* String attributes */
int populate_string_buffer_data(union acpi_object *str_obj,
diff --git a/drivers/platform/x86/hp/enum-attributes.c b/drivers/platform/x86/hp/enum-attributes.c
index 9d4b6e97bd16..f4fe6a583ca4 100644
--- a/drivers/platform/x86/hp/enum-attributes.c
+++ b/drivers/platform/x86/hp/enum-attributes.c
@@ -190,6 +190,8 @@ int populate_enumeration_package_data(union acpi_object *enum_obj, int instance_
str_value = NULL;
populate_enumeration_elements_from_package(enum_obj, instance_id, HPWMI_ENUMERATION_TYPE);
+ update_attribute_permissions(bioscfg_drv.enumeration_data[instance_id].is_readonly,
+ &enumeration_current_val);
return sysfs_create_group(attr_name_kobj, &enumeration_attr_group);
}
@@ -362,6 +364,8 @@ int populate_enumeration_buffer_data(union acpi_object *enum_obj, int instance_i
/* Populate enumeration elements */
populate_enumeration_elements_from_buffer(enum_obj, instance_id, HPWMI_ENUMERATION_TYPE);
+ update_attribute_permissions(bioscfg_drv.enumeration_data[instance_id].is_readonly,
+ &enumeration_current_val);
return sysfs_create_group(attr_name_kobj, &enumeration_attr_group);
}
diff --git a/drivers/platform/x86/hp/int-attributes.c b/drivers/platform/x86/hp/int-attributes.c
index aa61497b44d5..eaae4b065098 100644
--- a/drivers/platform/x86/hp/int-attributes.c
+++ b/drivers/platform/x86/hp/int-attributes.c
@@ -168,6 +168,8 @@ int populate_integer_package_data(union acpi_object *elements, int instance_id,
str_value = NULL;
populate_integer_elements_from_package(elements, instance_id, HPWMI_INTEGER_TYPE);
+ update_attribute_permissions(bioscfg_drv.integer_data[instance_id].is_readonly,
+ &integer_current_val);
return sysfs_create_group(attr_name_kobj, &integer_attr_group);
}
@@ -329,6 +331,8 @@ int populate_integer_buffer_data(union acpi_object *integer_obj, int instance_id
/* Populate integer elements */
populate_integer_elements_from_buffer(integer_obj, instance_id, HPWMI_INTEGER_TYPE);
+ update_attribute_permissions(bioscfg_drv.integer_data[instance_id].is_readonly,
+ &integer_current_val);
return sysfs_create_group(attr_name_kobj, &integer_attr_group);
}
diff --git a/drivers/platform/x86/hp/ordered-attributes.c b/drivers/platform/x86/hp/ordered-attributes.c
index 585abc3bd362..723db9a0316d 100644
--- a/drivers/platform/x86/hp/ordered-attributes.c
+++ b/drivers/platform/x86/hp/ordered-attributes.c
@@ -239,6 +239,9 @@ int populate_ordered_list_package_data(union acpi_object *order_obj, int instanc
str_value = NULL;
populate_ordered_list_elements_from_package(order_obj, instance_id, HPWMI_ORDERED_LIST_TYPE);
+ update_attribute_permissions(bioscfg_drv.ordered_list_data[instance_id].is_readonly,
+ &ordered_list_current_val);
+
return sysfs_create_group(attr_name_kobj, &ordered_list_attr_group);
}
@@ -426,7 +429,8 @@ int populate_ordered_list_buffer_data(union acpi_object *order_obj, int instance
/* Populate ordered list elements */
populate_ordered_list_elements_from_buffer(order_obj, instance_id, HPWMI_ORDERED_LIST_TYPE);
-
+ update_attribute_permissions(bioscfg_drv.ordered_list_data[instance_id].is_readonly,
+ &ordered_list_current_val);
return sysfs_create_group(attr_name_kobj, &ordered_list_attr_group);
}
diff --git a/drivers/platform/x86/hp/string-attributes.c b/drivers/platform/x86/hp/string-attributes.c
index c85688cfbccc..a8e4f8b60dff 100644
--- a/drivers/platform/x86/hp/string-attributes.c
+++ b/drivers/platform/x86/hp/string-attributes.c
@@ -164,6 +164,8 @@ int populate_string_package_data(union acpi_object *elements, int instance_id,
str_value = NULL;
populate_string_elements_from_package(elements, instance_id, HPWMI_STRING_TYPE);
+ update_attribute_permissions(bioscfg_drv.string_data[instance_id].is_readonly,
+ &string_current_val);
return sysfs_create_group(attr_name_kobj, &string_attr_group);
}
@@ -321,6 +323,8 @@ int populate_string_buffer_data(union acpi_object *string_obj, int instance_id,
/* Populate string elements */
populate_string_elements_from_buffer(string_obj, instance_id, HPWMI_STRING_TYPE);
+ update_attribute_permissions(bioscfg_drv.string_data[instance_id].is_readonly,
+ &string_current_val);
return sysfs_create_group(attr_name_kobj, &string_attr_group);
}
--
2.34.1
