X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=KernelLand%2FKernel%2Farch%2Fx86%2Fmm_virt.c;h=216bc1e63fea8c6b27f6f4cf680826177d95548c;hb=d8976435eade14e409b01e58850b75990ad9a4a7;hp=868fe86a55d2039c64e8ca52558fe0de84378dfa;hpb=e02f66c7125bf18f77c6c53587238cbd49da2c89;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/x86/mm_virt.c b/KernelLand/Kernel/arch/x86/mm_virt.c
index 868fe86a..216bc1e6 100644
--- a/KernelLand/Kernel/arch/x86/mm_virt.c
+++ b/KernelLand/Kernel/arch/x86/mm_virt.c
@@ -414,7 +414,7 @@ void MM_Deallocate(tVAddr VAddr)
  * \fn tPAddr MM_GetPhysAddr(tVAddr Addr)
  * \brief Checks if the passed address is accesable
  */
-tPAddr MM_GetPhysAddr(const void *Addr)
+tPAddr MM_GetPhysAddr(volatile const void *Addr)
 {
 	tVAddr	addr = (tVAddr)Addr;
 	if( !(gaPageDir[addr >> 22] & 1) )
@@ -1027,14 +1027,19 @@ void MM_FreeTemp(void *VAddr)
  * \fn tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
  * \brief Allocates a contigous number of pages
  */
-tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
+void *MM_MapHWPages(tPAddr PAddr, Uint Number)
 {
-	 int	i, j;
+	 int	j;
 	
 	PAddr &= ~0xFFF;
-	
+
+	if( PAddr < 1024*1024 && (1024*1024-PAddr) >= Number * PAGE_SIZE )
+	{
+		return (void*)(KERNEL_BASE + PAddr);
+	}
+
 	// Scan List
-	for( i = 0; i < NUM_HW_PAGES; i ++ )
+	for( int i = 0; i < NUM_HW_PAGES; i ++ )
 	{		
 		// Check if addr used
 		if( gaPageTable[ (HW_MAP_ADDR >> 12) + i ] & 1 )
@@ -1054,7 +1059,7 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
 				MM_RefPhys( PAddr + (j<<12) );
 				gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] = (PAddr + (j<<12)) | 3;
 			}
-			return HW_MAP_ADDR + (i<<12);
+			return (void*)(HW_MAP_ADDR + (i<<12));
 		}
 	}
 	// If we don't find any, return NULL
@@ -1069,10 +1074,10 @@ tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
  * \param PhysAddr	Pointer to the location to place the physical address allocated
  * \return Virtual address allocate
  */
-tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
+void *MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 {
 	tPAddr	phys;
-	tVAddr	ret;
+	void	*ret;
 	
 	ENTER("iPages iMaxBits pPhysAddr", Pages, MaxBits, PhysAddr);
 	
@@ -1080,7 +1085,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 		MaxBits = PHYS_BITS;
 	
 	// Sanity Check
-	if(MaxBits < 12 || !PhysAddr) {
+	if(MaxBits < 12) {
 		LEAVE('i', 0);
 		return 0;
 	}
@@ -1089,11 +1094,11 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 	if(Pages == 1 && MaxBits >= PHYS_BITS)
 	{
 		phys = MM_AllocPhys();
+		if( PhysAddr )
+			*PhysAddr = phys;
 		if( !phys ) {
-			*PhysAddr = 0;
 			LEAVE_RET('i', 0);
 		}
-		*PhysAddr = phys;
 		ret = MM_MapHWPages(phys, 1);
 		if(ret == 0) {
 			MM_DerefPhys(phys);
@@ -1101,7 +1106,7 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 			return 0;
 		}
 		LEAVE('x', ret);
-		return ret;
+		return (void*)ret;
 	}
 	
 	// Slow Allocate
@@ -1122,9 +1127,10 @@ tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
 		return 0;
 	}
 	
-	*PhysAddr = phys;
+	if( PhysAddr )
+		*PhysAddr = phys;
 	LEAVE('x', ret);
-	return ret;
+	return (void*)ret;
 }
 
 /**
@@ -1136,7 +1142,11 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 	 int	i, j;
 	
 	//Log_Debug("VirtMem", "MM_UnmapHWPages: (VAddr=0x%08x, Number=%i)", VAddr, Number);
-	
+
+	//
+	if( KERNEL_BASE <= VAddr && VAddr < KERNEL_BASE + 1024*1024 )
+		return ;	
+
 	// Sanity Check
 	if(VAddr < HW_MAP_ADDR || VAddr+Number*0x1000 > HW_MAP_MAX)	return;
 	
@@ -1148,6 +1158,7 @@ void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
 	{
 		MM_DerefPhys( gaPageTable[ i + j ] & ~0xFFF );
 		gaPageTable[ i + j ] = 0;
+		INVLPG( (tVAddr)(i+j) << 12 );
 	}
 	
 	Mutex_Release( &glTempMappings );