Changeset 677a6d5 in mainline for genarch

Timestamp:

2006-01-08T16:24:32Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f275cb3

Parents:

59adc2b

Message:

Memory management work.
Pass address space identifier to functions in page_operations to support single global page hash table.

Location:

genarch/src

Files:

• acpi/acpi.c (modified) (2 diffs)
• mm/page_ht.c (modified) (3 diffs)
• mm/page_pt.c (modified) (4 diffs)

genarch/src/acpi/acpi.c

@@ -30 +30 @@
 #include <genarch/acpi/madt.h>
 #include <arch/bios/bios.h>
-
+#include <mm/asid.h>
 #include <mm/page.h>
 #include <print.h>
@@ -80 +80 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-        page_mapping_insert((__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert((__address) sdt, ASID_KERNEL, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
         map_structure((__address) sdt, sdt->length);
 }

genarch/src/mm/page_ht.c

@@ -30 +30 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
 #include <arch/asm.h>
 
-static void ht_mapping_insert(__address page, __address frame, int flags, __address root);
-static pte_t *ht_mapping_find(__address page, __address root);
+static void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
+static pte_t *ht_mapping_find(__address page, asid_t asid, __address root);
 
 page_operations_t page_ht_operations = {
@@ -48 +49 @@
  *
  * @param page Virtual address of the page to be mapped.
+ * @param asid Address space to which page belongs.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
  * @param root Explicit PTL0 address.
  */
-void ht_mapping_insert(__address page, __address frame, int flags, __address root)
+void ht_mapping_insert(__address page,  asid_t asid, __address frame, int flags, __address root)
 {
 }
@@ -61 +63 @@
  *
  * @param page Virtual page.
+ * @param asid Address space to wich page belongs.
  * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *ht_mapping_find(__address page, __address root)
+pte_t *ht_mapping_find(__address page, asid_t asid, __address root)
 {
         return NULL;

genarch/src/mm/page_pt.c

@@ -31 +31 @@
 #include <mm/frame.h>
 #include <arch/mm/page.h>
+#include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -36 +37 @@
 #include <memstr.h>
 
-static void pt_mapping_insert(__address page, __address frame, int flags, __address root);
-static pte_t *pt_mapping_find(__address page, __address root);
+static void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
+static pte_t *pt_mapping_find(__address page, asid_t asid, __address root);
 
 page_operations_t page_pt_operations = {
@@ -50 +51 @@
  *
  * @param page Virtual address of the page to be mapped.
+ * @param asid Ignored.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
  * @param root Explicit PTL0 address.
  */
-void pt_mapping_insert(__address page, __address frame, int flags, __address root)
+void pt_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;
@@ -97 +99 @@
  *
  * @param page Virtual page.
+ * @param asid Ignored.
  * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *pt_mapping_find(__address page, __address root)
+pte_t *pt_mapping_find(__address page, asid_t asid, __address root)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;