Changeset 904b1bc in mainline for kernel/arch/sparc64

Timestamp:

2018-05-22T10:36:58Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a4eb3ba2

Parents:

4f8772d4

git-author:

Jiri Svoboda <jiri@…> (2018-05-21 17:36:30)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-22 10:36:58)

Message:

Fix remaining ccheck issues.

Location:

kernel/arch/sparc64

Files:

• include/arch/mm/sun4u/tsb.h (modified) (1 diff)
• include/arch/sun4u/cpu.h (modified) (1 diff)
• include/arch/sun4v/cpu.h (modified) (1 diff)
• src/mm/sun4u/tsb.c (modified) (2 diffs)
• src/sun4v/md.c (modified) (1 diff)

kernel/arch/sparc64/include/arch/mm/sun4u/tsb.h

@@ -66 +66 @@
         uint64_t value;
         struct {
-                uint64_t base : 51;     /**< TSB base address, bits 63:13. */
-                unsigned split : 1;     /**< Split vs. common TSB for 8K and 64K
-                                         * pages. HelenOS uses only 8K pages
-                                         * for user mappings, so we always set
-                                         * this to 0.
-                                         */
+                /** TSB base address, bits 63:13. */
+                uint64_t base : 51;
+                /** Split vs. common TSB for 8K and 64K pages. HelenOS uses
+                 * only 8K pages for user mappings, so we always set this to 0.
+                 */
+                unsigned split : 1;
                 unsigned : 9;
-                unsigned size : 3;      /**< TSB size. Number of entries is
-                                         * 512 * 2^size. */
+                /** TSB size. Number of entries is 512 * 2^size. */
+                unsigned size : 3;
         } __attribute__((packed));
 } tsb_base_reg_t;

kernel/arch/sparc64/include/arch/sun4u/cpu.h

@@ -62 +62 @@
 
 typedef struct {
-        uint32_t mid;              /**< Processor ID as read from
-                                        UPA_CONFIG/FIREPLANE_CONFIG. */
+        /** Processor ID as read from UPA_CONFIG/FIREPLANE_CONFIG. */
+        uint32_t mid;
         ver_reg_t ver;
-        uint32_t clock_frequency;  /**< Processor frequency in Hz. */
-        uint64_t next_tick_cmpr;   /**< Next clock interrupt should be
-                                        generated when the TICK register
-                                        matches this value. */
+        /** Processor frequency in Hz. */
+        uint32_t clock_frequency;
+        /** Next clock interrupt should be generated when the TICK register
+         * matches this value.
+         */
+        uint64_t next_tick_cmpr;
 } cpu_arch_t;
 

kernel/arch/sparc64/include/arch/sun4v/cpu.h

@@ -59 +59 @@
 
 typedef struct cpu_arch {
-        uint64_t id;                  /**< virtual processor ID */
-        uint32_t clock_frequency;     /**< Processor frequency in Hz. */
-        uint64_t next_tick_cmpr;      /**< Next clock interrupt should be
-                                           generated when the TICK register
-                                           matches this value. */
-        exec_unit_t *exec_unit;       /**< Physical core. */
-        unsigned long proposed_nrdy;  /**< Proposed No. of ready threads
-                                           so that cores are equally balanced. */
+        /** Virtual processor ID */
+        uint64_t id;
+        /** Processor frequency in Hz */
+        uint32_t clock_frequency;
+        /** Next clock interrupt should be generated when the TICK register
+         * matches this value.
+         */
+        uint64_t next_tick_cmpr;
+        /** Physical core. */
+        exec_unit_t *exec_unit;
+        /** Proposed No. of ready threads so that cores are equally balanced. */
+        unsigned long proposed_nrdy;
 } cpu_arch_t;
 

kernel/arch/sparc64/src/mm/sun4u/tsb.c

@@ -97 +97 @@
          */
 
-        tte->tag.invalid = true;        /* invalidate the entry
-                                         * (tag target has this
-                                         * set to 0) */
+        /* Invalidate the entry (tag target has this set to 0) */
+        tte->tag.invalid = true;
 
         write_barrier();
@@ -142 +141 @@
          */
 
-        tte->tag.invalid = true;        /* invalidate the entry
-                                         * (tag target has this
-                                         * set to 0) */
+        /* Invalidate the entry (tag target has this set to 0) */
+        tte->tag.invalid = true;
 
         write_barrier();

kernel/arch/sparc64/src/sun4v/md.c

@@ -66 +66 @@
 /** machine description element (in the node block) */
 typedef struct {
-        uint8_t tag;                    /**< Type of element */
-        uint8_t name_len;               /**< Length in bytes of element name */
-        uint16_t _reserved_field;       /**< reserved field (zeros) */
-        uint32_t name_offset;           /**< Location offset of name associated
-                                             with this element relative to
-                                             start of name block */
+        /** Type of element */
+        uint8_t tag;
+        /** Length in bytes of element name */
+        uint8_t name_len;
+        /** Reserved field (zeros) */
+        uint16_t _reserved_field;
+        /** Location offset of name associated with this element relative to
+         * start of name block
+         */
+        uint32_t name_offset;
+
         union {
                 /** for elements of type “PROP_STR” and of type “PROP_DATA” */