Changeset 850235d in mainline for kernel/arch/arm32/include/arch/mm/page_fault.h

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/arm32/include/arch/mm/page_fault.h (modified) (1 diff)

kernel/arch/arm32/include/arch/mm/page_fault.h

@@ -40 +40 @@
 
 
-/** Decribes CP15 "fault status register" (FSR). */
-typedef struct {
-        unsigned status : 3;
-        unsigned domain : 4;
-        unsigned zero : 1;
-        unsigned should_be_zero : 24;
-} ATTRIBUTE_PACKED fault_status_t;
-
-
-/** Help union used for casting integer value into #fault_status_t. */
+/** Decribes CP15 "fault status register" (FSR).
+ *
+ * "VMSAv6 added a fifth fault status bit (bit[10]) to both the IFSR and DFSR.
+ * It is IMPLEMENTATION DEFINED how this bit is encoded in earlier versions of
+ * the architecture. A write flag (bit[11] of the DFSR) has also been
+ * introduced."
+ * ARM Architecture Reference Manual version i ch. B4.6 (PDF p. 719)
+ *
+ * See ARM Architecture Reference Manual ch. B4.9.6 (pdf p.743). for FSR info
+ */
 typedef union {
-        fault_status_t fs;
-        uint32_t dummy;
-} fault_status_union_t;
+        struct {
+                unsigned status : 4;
+                unsigned domain : 4;
+                unsigned zero : 1;
+                unsigned lpae : 1; /**< Needs LPAE support implemented */
+                unsigned fs : 1; /**< armv6+ mandated, earlier IPLM. DEFINED */
+                unsigned wr : 1; /**< armv6+ only */
+                unsigned ext : 1 ; /**< external abort */
+                unsigned cm : 1; /**< Cache maintenance, needs LPAE support */
+                unsigned should_be_zero : 18;
+        } data;
+        struct {
+                unsigned status : 4;
+                unsigned sbz0 : 6;
+                unsigned fs : 1;
+                unsigned should_be_zero : 21;
+        } inst;
+        uint32_t raw;
+} fault_status_t;