/kernel/trunk/genarch/include/mm/page_pt.h |
---|
87,7 → 87,7 |
extern page_operations_t page_pt_operations; |
extern void page_mapping_insert_pt(__address page, __address frame, int flags, __address root); |
extern pte_t *page_mapping_find_pt(__address page, __address root); |
extern void page_mapping_insert_pt(as_t *as, __address page, __address frame, int flags, __address root); |
extern pte_t *page_mapping_find_pt(as_t *as, __address page, __address root); |
#endif |
/kernel/trunk/genarch/src/mm/page_pt.c |
---|
30,14 → 30,14 |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <arch/mm/page.h> |
#include <arch/mm/asid.h> |
#include <arch/mm/as.h> |
#include <arch/types.h> |
#include <typedefs.h> |
#include <arch/asm.h> |
#include <memstr.h> |
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); |
static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root); |
static pte_t *pt_mapping_find(as_t *as, __address page, __address root); |
page_operations_t page_pt_operations = { |
.mapping_insert = pt_mapping_insert, |
49,13 → 49,13 |
* Map virtual address 'page' to physical address 'frame' |
* using 'flags'. |
* |
* @param as Ignored. |
* @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, asid_t asid, __address frame, int flags, __address root) |
void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root) |
{ |
pte_t *ptl0, *ptl1, *ptl2, *ptl3; |
__address newpt; |
97,13 → 97,13 |
* |
* Find mapping for virtual page. |
* |
* @param as Ignored. |
* @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, asid_t asid, __address root) |
pte_t *pt_mapping_find(as_t *as, __address page, __address root) |
{ |
pte_t *ptl0, *ptl1, *ptl2, *ptl3; |
/kernel/trunk/genarch/src/mm/page_ht.c |
---|
30,6 → 30,7 |
#include <mm/page.h> |
#include <mm/frame.h> |
#include <mm/heap.h> |
#include <mm/as.h> |
#include <arch/mm/asid.h> |
#include <arch/types.h> |
#include <typedefs.h> |
52,8 → 53,8 |
*/ |
pte_t *page_ht = NULL; |
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); |
static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root); |
static pte_t *ht_mapping_find(as_t *as, __address page, __address root); |
page_operations_t page_ht_operations = { |
.mapping_insert = ht_mapping_insert, |
67,13 → 68,13 |
* new mappings are appended to the end of the collision |
* chain. |
* |
* @param as Address space to which page belongs. Must be locked prior the call. |
* @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 Ignored. |
*/ |
void ht_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root) |
void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root) |
{ |
pte_t *t, *u; |
ipl_t ipl; |
80,8 → 81,8 |
ipl = interrupts_disable(); |
spinlock_lock(&page_ht_lock); |
t = HT_HASH(page, asid); |
t = HT_HASH(page, as->asid); |
if (!HT_SLOT_EMPTY(t)) { |
/* |
91,7 → 92,7 |
do { |
u = t; |
if (HT_COMPARE(page, asid, t)) { |
if (HT_COMPARE(page, as->asid, t)) { |
/* |
* Nothing to do, |
* the record is already there. |
109,7 → 110,7 |
HT_SET_NEXT(u, t); |
} |
HT_SET_RECORD(t, page, asid, frame, flags); |
HT_SET_RECORD(t, page, as->asid, frame, flags); |
HT_SET_NEXT(t, NULL); |
spinlock_unlock(&page_ht_lock); |
122,22 → 123,22 |
* |
* Interrupts must be disabled. |
* |
* @param as Address space to wich page belongs. Must be locked prior the call. |
* @param page Virtual page. |
* @param asid Address space to wich page belongs. |
* @param root Ignored. |
* |
* @return NULL if there is no such mapping; requested mapping otherwise. |
*/ |
pte_t *ht_mapping_find(__address page, asid_t asid, __address root) |
pte_t *ht_mapping_find(as_t *as, __address page, __address root) |
{ |
pte_t *t; |
spinlock_lock(&page_ht_lock); |
t = HT_HASH(page, asid); |
t = HT_HASH(page, as->asid); |
if (!HT_SLOT_EMPTY(t)) { |
while (!HT_COMPARE(page, asid, t) && HT_GET_NEXT(t)) |
while (!HT_COMPARE(page, as->asid, t) && HT_GET_NEXT(t)) |
t = HT_GET_NEXT(t); |
t = HT_COMPARE(page, asid, t) ? t : NULL; |
t = HT_COMPARE(page, as->asid, t) ? t : NULL; |
} else { |
t = NULL; |
} |
/kernel/trunk/genarch/src/acpi/acpi.c |
---|
29,7 → 29,7 |
#include <genarch/acpi/acpi.h> |
#include <genarch/acpi/madt.h> |
#include <arch/bios/bios.h> |
#include <mm/asid.h> |
#include <mm/as.h> |
#include <mm/page.h> |
#include <print.h> |
79,7 → 79,7 |
static void map_sdt(struct acpi_sdt_header *sdt) |
{ |
page_mapping_insert((__address) sdt, ASID_KERNEL, (__address) sdt, PAGE_NOT_CACHEABLE, 0); |
page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0); |
map_structure((__address) sdt, sdt->length); |
} |