powerpc/secvar: Use u64 in secvar_operations

There's no reason for secvar_operations to use uint64_t vs the more
common kernel type u64.

The types are compatible, but they require different printk format
strings which can lead to confusion.

Change all the secvar related routines to use u64.

Reviewed-by: Russell Currey <ruscur@russell.cc>
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20230210080401.345462-5-ajd@linux.ibm.com

diff --git a/arch/powerpc/include/asm/secvar.h b/arch/powerpc/include/asm/secvar.h
index 4cc35b58b986273068f671c036e3fd40accce970..07ba36f868a720b89631cd4f21fa4d8f19cb93c8 100644 (file)
--- a/arch/powerpc/include/asm/secvar.h
+++ b/arch/powerpc/include/asm/secvar.h
@@ -14,12 +14,9 @@
 extern const struct secvar_operations *secvar_ops;
 
 struct secvar_operations {
-       int (*get)(const char *key, uint64_t key_len, u8 *data,
-                  uint64_t *data_size);
-       int (*get_next)(const char *key, uint64_t *key_len,
-                       uint64_t keybufsize);
-       int (*set)(const char *key, uint64_t key_len, u8 *data,
-                  uint64_t data_size);
+       int (*get)(const char *key, u64 key_len, u8 *data, u64 *data_size);
+       int (*get_next)(const char *key, u64 *key_len, u64 keybufsize);
+       int (*set)(const char *key, u64 key_len, u8 *data, u64 data_size);
 };
 
 #ifdef CONFIG_PPC_SECURE_BOOT

diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secvar-sysfs.c
index 7fa5f8ed9542ea5e8cf1309a9f943cbdbd77dee3..702044edf14df8569d670210c30d83cf4a6c8594 100644 (file)
--- a/arch/powerpc/kernel/secvar-sysfs.c
+++ b/arch/powerpc/kernel/secvar-sysfs.c
@@ -47,7 +47,7 @@ out:
 static ssize_t size_show(struct kobject *kobj, struct kobj_attribute *attr,
                         char *buf)
 {
-       uint64_t dsize;
+       u64 dsize;
        int rc;
 
        rc = secvar_ops->get(kobj->name, strlen(kobj->name) + 1, NULL, &dsize);
@@ -64,8 +64,8 @@ static ssize_t data_read(struct file *filep, struct kobject *kobj,
                         struct bin_attribute *attr, char *buf, loff_t off,
                         size_t count)
 {
-       uint64_t dsize;
        char *data;
+       u64 dsize;
        int rc;
 
        rc = secvar_ops->get(kobj->name, strlen(kobj->name) + 1, NULL, &dsize);
@@ -166,9 +166,9 @@ out:
 
 static int secvar_sysfs_load(void)
 {
-       char *name;
-       uint64_t namesize = 0;
        struct kobject *kobj;
+       u64 namesize = 0;
+       char *name;
        int rc;
 
        name = kzalloc(NAME_MAX_SIZE, GFP_KERNEL);

diff --git a/arch/powerpc/platforms/powernv/opal-secvar.c b/arch/powerpc/platforms/powernv/opal-secvar.c
index 14133e120bdd26896dbc514cf94fbf706733c020..ef89861569e00034241f8a9600d7268f7a3eb247 100644 (file)
--- a/arch/powerpc/platforms/powernv/opal-secvar.c
+++ b/arch/powerpc/platforms/powernv/opal-secvar.c
@@ -54,8 +54,7 @@ static int opal_status_to_err(int rc)
        return err;
 }
 
-static int opal_get_variable(const char *key, uint64_t ksize,
-                            u8 *data, uint64_t *dsize)
+static int opal_get_variable(const char *key, u64 ksize, u8 *data, u64 *dsize)
 {
        int rc;
 
@@ -71,8 +70,7 @@ static int opal_get_variable(const char *key, uint64_t ksize,
        return opal_status_to_err(rc);
 }
 
-static int opal_get_next_variable(const char *key, uint64_t *keylen,
-                                 uint64_t keybufsize)
+static int opal_get_next_variable(const char *key, u64 *keylen, u64 keybufsize)
 {
        int rc;
 
@@ -88,8 +86,7 @@ static int opal_get_next_variable(const char *key, uint64_t *keylen,
        return opal_status_to_err(rc);
 }
 
-static int opal_set_variable(const char *key, uint64_t ksize, u8 *data,
-                            uint64_t dsize)
+static int opal_set_variable(const char *key, u64 ksize, u8 *data, u64 dsize)
 {
        int rc;
 

diff --git a/security/integrity/platform_certs/load_powerpc.c b/security/integrity/platform_certs/load_powerpc.c
index a2900cb8535712f227abd858bdd6e8a11e606b1b..1e4f80a4e71c36d1d0d72f9d3ae7816fe46fad17 100644 (file)
--- a/security/integrity/platform_certs/load_powerpc.c
+++ b/security/integrity/platform_certs/load_powerpc.c
@@ -18,7 +18,7 @@
 /*
  * Get a certificate list blob from the named secure variable.
  */
-static __init void *get_cert_list(u8 *key, unsigned long keylen, uint64_t *size)
+static __init void *get_cert_list(u8 *key, unsigned long keylen, u64 *size)
 {
        int rc;
        void *db;
@@ -51,7 +51,7 @@ static __init void *get_cert_list(u8 *key, unsigned long keylen, uint64_t *size)
 static int __init load_powerpc_certs(void)
 {
        void *db = NULL, *dbx = NULL;
-       uint64_t dbsize = 0, dbxsize = 0;
+       u64 dbsize = 0, dbxsize = 0;
        int rc = 0;
        struct device_node *node;