Changeset 3e828ea in mainline for kernel/arch/ppc32/src

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

Location:

kernel/arch/ppc32/src

Files:

• debug/stacktrace.c (modified) (1 diff)
• drivers/pic.c (modified) (4 diffs)
• interrupt.c (modified) (1 diff)
• ppc32.c (modified) (1 diff)

kernel/arch/ppc32/src/debug/stacktrace.c

@@ -67 +67 @@
 bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev)
 {
-        return !copy_from_uspace((void *) prev,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev));
+        return !copy_from_uspace(prev,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_FP_PREV, sizeof(*prev));
 }
 
 bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra)
 {
-        return !copy_from_uspace((void *) ra,
-            (uint32_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra));
+        return !copy_from_uspace(ra,
+            ctx->fp + sizeof(uintptr_t) * FRAME_OFFSET_RA, sizeof(*ra));
 }
 

kernel/arch/ppc32/src/drivers/pic.c

@@ -37 +37 @@
 #include <byteorder.h>
 #include <bitops.h>
+#include <typedefs.h>
 
-static volatile uint32_t *pic = NULL;
+static ioport32_t *pic = NULL;
 
 void pic_init(uintptr_t base, size_t size, cir_t *cir, void **cir_arg)
@@ -50 +51 @@
 void pic_enable_interrupt(inr_t intnum)
 {
-        if (pic) {
-                if (intnum < 32)
-                        pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum);
-                else
-                        pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32));
+        if (!pic)
+                return;
+
+        if (intnum < 32) {
+                pio_write_32(&pic[PIC_MASK_LOW],
+                    pio_read_32(&pic[PIC_MASK_LOW]) | (1 << intnum));
+        } else {
+                pio_write_32(&pic[PIC_MASK_HIGH],
+                    pio_read_32(&pic[PIC_MASK_HIGH]) | (1 << (intnum - 32)));
         }
-
 }
 
 void pic_disable_interrupt(inr_t intnum)
 {
-        if (pic) {
-                if (intnum < 32)
-                        pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum));
-                else
-                        pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32)));
+        if (!pic)
+                return;
+
+        if (intnum < 32) {
+                pio_write_32(&pic[PIC_MASK_LOW],
+                    pio_read_32(&pic[PIC_MASK_LOW]) & (~(1 << intnum)));
+        } else {
+                pio_write_32(&pic[PIC_MASK_HIGH],
+                    pio_read_32(&pic[PIC_MASK_HIGH]) & (~(1 << (intnum - 32))));
         }
 }
@@ -71 +79 @@
 void pic_ack_interrupt(void *arg, inr_t intnum)
 {
-        if (pic) {
-                if (intnum < 32)
-                        pic[PIC_ACK_LOW] = 1 << intnum;
-                else
-                        pic[PIC_ACK_HIGH] = 1 << (intnum - 32);
+        if (!pic)
+                return;
+
+        if (intnum < 32) {
+                pio_write_32(&pic[PIC_ACK_LOW], 1 << intnum);
+        } else {
+                pio_write_32(&pic[PIC_ACK_HIGH], 1 << (intnum - 32));
         }
 }
@@ -87 +97 @@
                 uint32_t pending;
 
-                pending = pic[PIC_PENDING_LOW];
+                pending = pio_read_32(&pic[PIC_PENDING_LOW]);
                 if (pending != 0)
                         return fnzb32(pending);
 
-                pending = pic[PIC_PENDING_HIGH];
+                pending = pio_read_32(&pic[PIC_PENDING_HIGH]);
                 if (pending != 0)
                         return fnzb32(pending) + 32;

kernel/arch/ppc32/src/interrupt.c

@@ -141 +141 @@
                             " (inum=%" PRIu8 ")", CPU->id, inum);
 #endif
+                        pic_ack_interrupt(NULL, inum);
+                        break;
                 }
         }

kernel/arch/ppc32/src/ppc32.c

@@ -292 +292 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        userspace_asm((uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_stack +
+        userspace_asm(kernel_uarg->uspace_uarg,
+            kernel_uarg->uspace_stack +
             kernel_uarg->uspace_stack_size - SP_DELTA,
-            (uintptr_t) kernel_uarg->uspace_entry);
+            kernel_uarg->uspace_entry);
 
         unreachable();