Changeset 772 for GPL/trunk/lib32/misc.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/misc.c (modified) (3 diffs)

GPL/trunk/lib32/misc.c

@@ -28 +28 @@
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/of.h>
 #include <linux/poll.h>
 #define CONFIG_PROC_FS 1
@@ -39 +40 @@
 #include <linux/firmware.h>
 #include <linux/ctype.h>
+#include <linux/math64.h>
 #include <dbgos2.h>
 
 void StringOut(char *DbgStr);
+extern int vscnprintf(char *buf, size_t size, const char *fmt, va_list args);
 
 struct new_utsname system_utsname = {0};
@@ -784 +787 @@
         free_pages((unsigned long) ptr, pg);
 }
+
+/**
+ * of_node_put() - Decrement refcount of a node
+ * @node:       Node to dec refcount, NULL is supported to simplify writing of
+ *              callers
+ */
+void of_node_put(struct device_node *node)
+{
+        if (node)
+                kobject_put(&node->kobj);
+}
+
+/**
+ * sysfs_streq - return true if strings are equal, modulo trailing newline
+ * @s1: one string
+ * @s2: another string
+ *
+ * This routine returns true iff two strings are equal, treating both
+ * NUL and newline-then-NUL as equivalent string terminations.  It's
+ * geared for use with sysfs input strings, which generally terminate
+ * with newlines but are compared against values without newlines.
+ */
+bool sysfs_streq(const char *s1, const char *s2)
+{
+        while (*s1 && *s1 == *s2) {
+                s1++;
+                s2++;
+        }
+
+        if (*s1 == *s2)
+                return true;
+        if (!*s1 && *s2 == '\n' && !s2[1])
+                return true;
+        if (*s1 == '\n' && !s1[1] && !*s2)
+                return true;
+        return false;
+}
+EXPORT_SYMBOL(sysfs_streq);
+
+u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
+{
+        u32 high = divisor >> 32;
+        u64 quot;
+
+        if (high == 0) {
+                u32 rem32;
+                quot = div_u64_rem(dividend, divisor, &rem32);
+                *remainder = rem32;
+        } else {
+                int n = fls(high);
+                quot = div_u64(dividend >> n, divisor >> n);
+
+                if (quot != 0)
+                        quot--;
+
+                *remainder = dividend - quot * divisor;
+                if (*remainder >= divisor) {
+                        quot++;
+                        *remainder -= divisor;
+                }
+        }
+
+        return quot;
+}
+
+/**
+ * memset32() - Fill a memory area with a uint32_t
+ * @s: Pointer to the start of the area.
+ * @v: The value to fill the area with
+ * @count: The number of values to store
+ *
+ * Differs from memset() in that it fills with a uint32_t instead
+ * of a byte.  Remember that @count is the number of uint32_ts to
+ * store, not the number of bytes.
+ */
+void *memset32(uint32_t *s, uint32_t v, size_t count)
+{
+        uint32_t *xs = s;
+
+        while (count--)
+                *xs++ = v;
+        return s;
+}
+EXPORT_SYMBOL(memset32);
+
+/**
+ *      sysfs_emit - scnprintf equivalent, aware of PAGE_SIZE buffer.
+ *      @buf:   start of PAGE_SIZE buffer.
+ *      @fmt:   format
+ *      @...:   optional arguments to @format
+ *
+ *
+ * Returns number of characters written to @buf.
+ */
+int sysfs_emit(char *buf, const char *fmt, ...)
+{
+        va_list args;
+        int len;
+
+#ifdef NOT_USED
+        if (WARN(!buf || offset_in_page(buf),
+                 "invalid sysfs_emit: buf:%p\n", buf))
+                return 0;
+#endif
+
+        va_start(args, fmt);
+        len = vscnprintf(buf, PAGE_SIZE, fmt, args);
+        va_end(args);
+
+        return len;
+}
+EXPORT_SYMBOL_GPL(sysfs_emit);
+
+/**
+ *      sysfs_emit_at - scnprintf equivalent, aware of PAGE_SIZE buffer.
+ *      @buf:   start of PAGE_SIZE buffer.
+ *      @at:    offset in @buf to start write in bytes
+ *              @at must be >= 0 && < PAGE_SIZE
+ *      @fmt:   format
+ *      @...:   optional arguments to @fmt
+ *
+ *
+ * Returns number of characters written starting at &@buf[@at].
+ */
+int sysfs_emit_at(char *buf, int at, const char *fmt, ...)
+{
+        va_list args;
+        int len;
+
+#ifdef NOT_USED
+        if (WARN(!buf || offset_in_page(buf) || at < 0 || at >= PAGE_SIZE,
+                 "invalid sysfs_emit_at: buf:%p at:%d\n", buf, at))
+                return 0;
+#endif
+
+        va_start(args, fmt);
+        len = vscnprintf(buf + at, PAGE_SIZE - at, fmt, args);
+        va_end(args);
+
+        return len;
+}
+EXPORT_SYMBOL_GPL(sysfs_emit_at);