Changes in kernel/arch/amd64/src/amd64.c [2a103b5:de96d3b] in mainline

File:

• kernel/arch/amd64/src/amd64.c (modified) (4 diffs)

kernel/arch/amd64/src/amd64.c

@@ -37 +37 @@
 #include <stdint.h>
 #include <errno.h>
-#include <mem.h>
+#include <memw.h>
 #include <interrupt.h>
 #include <console/console.h>
@@ -60 +60 @@
 #include <arch/vreg.h>
 #include <arch/kseg.h>
+#include <arch/mm/pat.h>
 #include <genarch/pic/pic_ops.h>
 
@@ -115 +116 @@
         /* Disable alignment check */
         write_cr0(read_cr0() & ~CR0_AM);
+
+        /* Use PCD+PWT bit combination in PTE to mean write-combining mode. */
+        if (pat_supported())
+                pat_set_mapping(false, true, true, PAT_TYPE_WRITE_COMBINING);
 
         if (config.cpu_active == 1) {
@@ -224 +229 @@
             ns16550_out_ptr);
         if (ns16550_instance) {
+                ns16550_format_set(ns16550_instance, 38400,
+                    LCR_PARITY_NONE | LCR_STOP_BIT_TWO | LCR_WORD_LEN_8);
 #ifdef CONFIG_NS16550
                 srln_instance_t *srln_instance = srln_init();