Changeset 82dcd25 in mainline

Timestamp:

2019-04-06T16:14:01Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3ef901d0

Parents:

46e886f

Message:

Pass physical address / port to ns16550_init

We need to know the physical address of the device's registers so that
we can put it into the registered parea.

Location:

kernel

Files:

• arch/mips32/include/arch/mach/malta/malta.h (modified) (2 diffs)
• genarch/src/drivers/ns16550/ns16550.c (modified) (4 diffs)

kernel/arch/mips32/include/arch/mach/malta/malta.h

@@ -41 +41 @@
 #include <typedefs.h>
 
-#define MALTA_PCI_BASE          PA2KSEG1(0x18000000UL)
+#define MALTA_PCI_PHYSBASE      0x18000000UL
+
+#define MALTA_PCI_BASE          PA2KSEG1(MALTA_PCI_PHYSBASE)
 #define MALTA_GT64120_BASE      PA2KSEG1(0x1be00000UL)
 
@@ -49 +51 @@
 #define ISA_IRQ_COUNT           16
 
-#define TTY_BASE                (MALTA_PCI_BASE + 0x3f8)
+#define TTY_BASE                (MALTA_PCI_PHYSBASE + 0x3f8)
 #define TTY_ISA_IRQ             4
 

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -39 +39 @@
 #include <genarch/drivers/ns16550/ns16550.h>
 #include <ddi/irq.h>
+#include <ddi/ddi.h>
 #include <arch/asm.h>
 #include <console/chardev.h>
 #include <stdlib.h>
+#include <align.h>
 #include <str.h>
 
@@ -143 +145 @@
  *
  */
-ns16550_instance_t *ns16550_init(ioport8_t *dev, unsigned reg_shift, inr_t inr,
-    cir_t cir, void *cir_arg, outdev_t **output)
-{
-        ns16550_instance_t *instance =
-            malloc(sizeof(ns16550_instance_t));
+ns16550_instance_t *ns16550_init(ioport8_t *dev_phys, unsigned reg_shift,
+    inr_t inr, cir_t cir, void *cir_arg, outdev_t **output)
+{
+        size_t size = 6 * (1U << reg_shift);
+        ioport8_t *dev = pio_map((void *) dev_phys, size);
+
+        ns16550_instance_t *instance = malloc(sizeof(ns16550_instance_t));
         if (instance) {
                 instance->ns16550 = dev;
@@ -158 +162 @@
                         if (!instance->output) {
                                 free(instance);
+                                pio_unmap((void *) dev_phys, (void *) dev,
+                                    size);
                                 return NULL;
                         }
@@ -176 +182 @@
 
                 ddi_parea_init(&instance->parea);
-                instance->parea.pbase = (uintptr_t) dev;
-                instance->parea.frames = 1;
+                instance->parea.pbase = ALIGN_DOWN((uintptr_t) dev_phys,
+                    PAGE_SIZE);
+                instance->parea.frames = ALIGN_UP(size, PAGE_SIZE);
                 instance->parea.unpriv = false;
                 instance->parea.mapped = false;