Changeset e064102 in mainline

Timestamp:

2019-03-31T19:24:35Z (5 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

124bc22, d6dc9a12

Parents:

f27e21d

Message:

dsrlnout_init() needs to get physical address too

The IO address we are passing into dsrlnout_init() should not be a
kernel-identity virtual address, because the device memory should not be
cacheable. Therefore, the function cannot use KA2PA to translate it
back to physical address when creating the parea.

Location:

kernel

Files:

• arch/mips32/src/mach/msim/msim.c (modified) (1 diff)
• genarch/include/genarch/drivers/dsrln/dsrlnout.h (modified) (1 diff)
• genarch/src/drivers/dsrln/dsrlnout.c (modified) (2 diffs)

kernel/arch/mips32/src/mach/msim/msim.c

@@ -81 +81 @@
 {
 #ifdef CONFIG_MSIM_PRN
-        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
+        outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS,
+            KSEG12PA(MSIM_KBD_ADDRESS));
         if (dsrlndev)
                 stdout_wire(dsrlndev);

kernel/genarch/include/genarch/drivers/dsrln/dsrlnout.h

@@ -39 +39 @@
 
 #include <typedefs.h>
+#include <stdint.h>
 #include <console/chardev.h>
 
-extern outdev_t *dsrlnout_init(ioport8_t *);
+extern outdev_t *dsrlnout_init(ioport8_t *, uintptr_t);
 
 #endif

kernel/genarch/src/drivers/dsrln/dsrlnout.c

@@ -68 +68 @@
 };
 
-outdev_t *dsrlnout_init(ioport8_t *base)
+outdev_t *dsrlnout_init(ioport8_t *base, uintptr_t base_phys)
 {
         outdev_t *dsrlndev = malloc(sizeof(outdev_t));
@@ -85 +85 @@
         instance->base = base;
         ddi_parea_init(&instance->parea);
-        instance->parea.pbase = KA2PA(base);
+        instance->parea.pbase = base_phys;
         instance->parea.frames = 1;
         instance->parea.unpriv = false;