Merge branch 'master' of ssh.ucc.asn.au:tpg/acess2

diff --git a/KernelLand/Kernel/arch/x86/acpica.c b/KernelLand/Kernel/arch/x86/acpica.c
index 1534789..a4a0bbc 100644 (file)
--- a/KernelLand/Kernel/arch/x86/acpica.c
+++ b/KernelLand/Kernel/arch/x86/acpica.c
@@ -6,7 +6,7 @@
  * - ACPICA Interface
  */
 #define ACPI_DEBUG_OUTPUT      0
-#define DEBUG  0
+#define DEBUG  1
 #define _AcpiModuleName "Shim"
 #define _COMPONENT     "Acess"
 #include <acpi.h>
@@ -49,7 +49,6 @@ int ACPICA_Initialise(void)
                return -1;
        }
 
-       // AcpiInitializeTables?
        rv = AcpiLoadTables();
        if( ACPI_FAILURE(rv) )
        {
@@ -134,6 +133,10 @@ ACPI_STATUS AcpiOsCreateCache(char *CacheName, UINT16 ObjectSize, UINT16 MaxDept
         int    namelen = (CacheName ? strlen(CacheName) : 0) + 1;
        LOG("CacheName=%s, ObjSize=%x, MaxDepth=%x", CacheName, ObjectSize, MaxDepth);
 
+       if( ReturnCache == NULL || ObjectSize < 16) {
+               return AE_BAD_PARAMETER;
+       }
+
        namelen = (namelen + 3) & ~3;
 
        ret = malloc(sizeof(*ret) + MaxDepth*sizeof(char) + namelen + MaxDepth*ObjectSize);
@@ -151,7 +154,7 @@ ACPI_STATUS AcpiOsCreateCache(char *CacheName, UINT16 ObjectSize, UINT16 MaxDept
        else
                ret->Name[0] = 0;
        memset(ret->ObjectStates, 0, sizeof(char)*MaxDepth);
-
+       
        LOG("Allocated cache %p '%s' (%i x 0x%x)", ret, CacheName, MaxDepth, ObjectSize);
        
        *ReturnCache = ret;
@@ -185,11 +188,16 @@ ACPI_STATUS AcpiOsPurgeCache(ACPI_CACHE_T *Cache)
 void *AcpiOsAcquireObject(ACPI_CACHE_T *Cache)
 {
        ENTER("pCache", Cache);
+       LOG("Called by %p", __builtin_return_address(0));
        for(int i = 0; i < Cache->nObj; i ++ )
        {
                if( !Cache->ObjectStates[i] ) {
                        Cache->ObjectStates[i] = 1;
                        void *rv = (char*)Cache->First + i*Cache->ObjectSize;
+                       if(!rv) {
+                               LEAVE('n');
+                               return NULL;
+                       }
                        memset(rv, 0, Cache->ObjectSize);
                        LEAVE('p', rv);
                        return rv;
@@ -213,8 +221,10 @@ ACPI_STATUS AcpiOsReleaseObject(ACPI_CACHE_T *Cache, void *Object)
        delta /= Cache->ObjectSize;
        LOG("Cache=%p, delta = %i, (limit %i)", Cache, delta, Cache->nObj);
        
-       if( delta >= Cache->nObj )
+       if( delta >= Cache->nObj ) {
+               LEAVE('i', AE_BAD_PARAMETER);
                return AE_BAD_PARAMETER;
+       }
        
        Cache->ObjectStates[delta] = 0;
 
@@ -339,6 +349,7 @@ ACPI_STATUS AcpiOsCreateMutex(ACPI_MUTEX *OutHandle)
 
 void AcpiOsDeleteMutex(ACPI_MUTEX Handle)
 {
+       //  TODO: Need `Mutex_Destroy`
        Mutex_Acquire(Handle);
        free(Handle);
 }

diff --git a/KernelLand/Modules/Network/E1000/e1000.c b/KernelLand/Modules/Network/E1000/e1000.c
index 644d694..66c1c86 100644 (file)
--- a/KernelLand/Modules/Network/E1000/e1000.c
+++ b/KernelLand/Modules/Network/E1000/e1000.c
@@ -231,9 +231,11 @@ int E1000_SendPacket(void *Ptr, tIPStackBuffer *Buffer)
                else
                {
                        // Single
-                       Card->TXDescs[txd].Buffer = MM_GetPhysAddr(ptr);
-                       Card->TXDescs[txd].Length = len;
-                       Card->TXDescs[txd].CMD = TXD_CMD_RS;
+                       volatile tTXDesc *txdp = &Card->TXDescs[txd];
+                       txdp->Buffer = MM_GetPhysAddr(ptr);
+                       txdp->Length = len;
+                       txdp->CMD = TXD_CMD_RS;
+                       LOG("%P: %llx %x %x", MM_GetPhysAddr((void*)txdp), txdp->Buffer, txdp->Length, txdp->CMD);
                }
                txd = (txd + 1) % NUM_TX_DESC;
        }
@@ -242,9 +244,18 @@ int E1000_SendPacket(void *Ptr, tIPStackBuffer *Buffer)
 
        // Trigger TX
        IPStack_Buffer_LockBuffer(Buffer);
+       LOG("Triggering TX - Buffers[%i]=%p", last_txd, Buffer);
        REG32(Card, REG_TDT) = Card->FirstFreeTXD;
        Mutex_Release(&Card->lTXDescs);
-       LOG("Waiting for TX");
+       {
+               volatile tTXDesc *txdp = Card->TXDescs + last_txd;
+               LOG("%p %P: %llx %x %x", txdp, MM_GetPhysAddr((void*)txdp), txdp->Buffer, txdp->Length, txdp->CMD);
+               volatile tTXDesc *txdp_base = MM_MapTemp(MM_GetPhysAddr((void*)Card->TXDescs));
+               txdp = txdp_base + last_txd;
+               LOG("%p %P: %llx %x %x", txdp, MM_GetPhysAddr((void*)txdp), txdp->Buffer, txdp->Length, txdp->CMD);
+               MM_FreeTemp( (void*)txdp_base);
+       }
+       LOG("Waiting for TX to complete");
        
        // Wait for completion (lock will block, then release straight away)
        IPStack_Buffer_LockBuffer(Buffer);
@@ -269,21 +280,47 @@ void E1000_IRQHandler(int Num, void *Ptr)
        if( (icr & ICR_TXDW) || (icr & ICR_TXQE) )
        {
                 int    nReleased = 0;
+                int    txd = Card->LastFreeTXD;
+                int    nReleasedAtLastDD = 0;
+                int    idxOfLastDD = txd;
                // Walk descriptors looking for the first non-complete descriptor
                LOG("TX %i:%i", Card->LastFreeTXD, Card->FirstFreeTXD);
-               while( Card->LastFreeTXD != Card->FirstFreeTXD && (Card->TXDescs[Card->LastFreeTXD].Status & TXD_STS_DD) )
+               while( txd != Card->FirstFreeTXD )
                {
                        nReleased ++;
-                       if( Card->TXSrcBuffers[Card->LastFreeTXD] ) {
-                               IPStack_Buffer_UnlockBuffer( Card->TXSrcBuffers[Card->LastFreeTXD] );
-                               Card->TXSrcBuffers[Card->LastFreeTXD] = NULL;
+                       if(Card->TXDescs[txd].Status & TXD_STS_DD) {
+                               nReleasedAtLastDD = nReleased;
+                               idxOfLastDD = txd;
+                       }
+                       txd ++;
+                       if(txd == NUM_TX_DESC)
+                               txd = 0;
+               }
+               if( nReleasedAtLastDD )
+               {
+                       // Unlock buffers
+                       txd = Card->LastFreeTXD;
+                       LOG("TX unlocking range %i-%i", txd, idxOfLastDD);
+                       while( txd != (idxOfLastDD+1)%NUM_TX_DESC )
+                       {
+                               if( Card->TXSrcBuffers[txd] ) {
+                                       LOG("- Unlocking %i:%p", txd, Card->TXSrcBuffers[txd]);
+                                       IPStack_Buffer_UnlockBuffer( Card->TXSrcBuffers[txd] );
+                                       Card->TXSrcBuffers[txd] = NULL;
+                               }
+                               txd ++;
+                               if(txd == NUM_TX_DESC)
+                                       txd = 0;
                        }
-                       Card->LastFreeTXD ++;
-                       if(Card->LastFreeTXD == NUM_TX_DESC)
-                               Card->LastFreeTXD = 0;
+                       // Update last free
+                       Card->LastFreeTXD = txd;
+                       Semaphore_Signal(&Card->FreeTxDescs, nReleasedAtLastDD);
+                       LOG("nReleased = %i", nReleasedAtLastDD);
+               }
+               else
+               {
+                       LOG("No completed TXDs");
                }
-               Semaphore_Signal(&Card->FreeTxDescs, nReleased);
-               LOG("nReleased = %i", nReleased);
        }
        
        if( icr & ICR_LSC )
@@ -292,6 +329,11 @@ void E1000_IRQHandler(int Num, void *Ptr)
                LOG("LSC");
                // TODO: Detect link drop/raise and poke IPStack
        }
+
+       if( icr & ICR_RXO )
+       {
+               LOG("RX Overrun");
+       }
        
        // Pending packet (s)
        if( icr & ICR_RXT0 )
@@ -422,6 +464,7 @@ int E1000_int_InitialiseCard(tCard *Card)
                LEAVE('i', 4);
                return 4;
        }
+       LOG("Card->RXDescs = %p [%P]", Card->TXDescs, MM_GetPhysAddr((void*)Card->TXDescs));
        for( int i = 0; i < NUM_TX_DESC; i ++ )
        {
                Card->TXDescs[i].Buffer = 0;

diff --git a/KernelLand/Modules/Network/E1000/e1000_hw.h b/KernelLand/Modules/Network/E1000/e1000_hw.h
index cd182eb..035a53b 100644 (file)
--- a/KernelLand/Modules/Network/E1000/e1000_hw.h
+++ b/KernelLand/Modules/Network/E1000/e1000_hw.h
@@ -178,7 +178,7 @@ enum eRegs
 #define ICR_LSC        (1 << 2)        // Link Status Change
 #define ICR_RXSEQ      (1 << 3)        // Receive Sequence Error (Framing Error)
 #define ICR_RXDMT0     (1 << 4)        // Receive Descriptor Minimum Threshold Reached (need more RX descs)
-#define ICR_XRO        (1 << 6)        // Receiver overrun
+#define ICR_RXO        (1 << 6)        // Receiver overrun
 #define ICR_RXT0       (1 << 7)        // Receiver Timer Interrupt
 #define ICR_MDAC       (1 << 9)        // MDI/O Access Complete
 #define ICR_RXCFG      (1 << 10)       // Receiving /C/ ordered sets