* Acess2 VIA Rhine II Driver (VT6102)
* - By John Hodge (thePowersGang)
*/
-#define DEBUG 0
+#define DEBUG 1
#define VERSION ((0<<8)|10)
#include <acess.h>
#include <modules.h>
-#include <fs_devfs.h>
#include <drv_pci.h>
-#include <api_drv_network.h>
#include <semaphore.h>
+#include "rhine2_hw.h"
+#include <IPStack/include/adapters_api.h>
+
+#define N_RX_DESCS 16
+#define RX_BUF_SIZE 1024
+#define N_RX_PAGES ((N_RX_DESCS*RX_BUF_SIZE)/PAGE_SIZE)
+#define N_TX_DESCS ((PAGE_SIZE/16)-N_RX_DESCS)
// === CONSTANTS ===
#define VENDOR_ID 0x1106
#define DEVICE_ID 0x3065
-enum eRegs
-{
- REG_PAR0, REG_PAR1,
- REG_PAR2, REG_PAR3,
- REG_PAR4, REG_PAR5,
- REG_RCR, REG_TCR,
- REG_CR0, REG_CR1,
- REG_rsv0, REG_rsv1,
- REG_ISR0, REG_ISR1,
- REG_IMR0, REG_IMR1,
-};
-
// === TYPES ===
typedef struct sCard
{
Uint16 IOBase;
Uint8 IRQ;
- int NumWaitingPackets;
+ tSemaphore ReadSemaphore;
+
+ struct {
+ Uint32 Phys;
+ void *Virt;
+ } RXBuffers[N_RX_PAGES];
+
+ Uint32 DescTablePhys;
+ void *DescTable;
+
+ struct sTXDesc *TXDescs;
+
+ struct sTXDesc *FirstTX;
+ struct sTXDesc *LastTX; // Most recent unsent packet
- char Name[2];
- tVFS_Node Node;
+ struct sRXDesc *FirstRX; // Most recent unread packet
+ struct sRXDesc *LastRX; // End of RX descriptor queue
+
+ void *IPHandle;
Uint8 MacAddr[6];
} tCard;
// === PROTOTYPES ===
int Rhine2_Install(char **Options);
-char *Rhine2_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node *Rhine2_FindDir(tVFS_Node *Node, const char *Filename);
- int Rhine2_RootIOCtl(tVFS_Node *Node, int ID, void *Arg);
-Uint64 Rhine2_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-Uint64 Rhine2_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
- int Rhine2_IOCtl(tVFS_Node *Node, int ID, void *Arg);
-void Rhine2_IRQHandler(int Num);
+void Rhine2_int_InitialiseCard(tCard *Card);
+tIPStackBuffer *Rhine2_WaitPacket(void *Ptr);
+ int Rhine2_SendPacket(void *Ptr, tIPStackBuffer *Buffer);
+void Rhine2_IRQHandler(int Num, void *Pt);
+// --- Helpers ---
+struct sRXDesc *Rhine2_int_GetDescFromPhys(tCard *Card, Uint32 Addr);
+void *Rhine2_int_GetBufferFromPhys(tCard *Card, Uint32 Addr);
+void Rhine2_int_FreeRXDesc(void *Desc, size_t, size_t, const void*);
+struct sTXDesc *Rhine2_int_AllocTXDesc(tCard *Card);
// === GLOBALS ===
MODULE_DEFINE(0, VERSION, VIARhineII, Rhine2_Install, NULL, NULL);
-tVFS_NodeType gRhine2_DirType = {
- .ReadDir = Rhine2_ReadDir,
- .FindDir = Rhine2_FindDir,
- .IOCtl = Rhine2_RootIOCtl
- };
-tDevFS_Driver gRhine2_DriverInfo = {
- NULL, "Rhine2",
- {
- .NumACLs = 1,
- .ACLs = &gVFS_ACL_EveryoneRX,
- .Flags = VFS_FFLAG_DIRECTORY,
- .Type = &gRhine2_DirType
- }
+tIPStack_AdapterType gRhine2_AdapterType = {
+ .Name = "VIA Rhine II",
+ .SendPacket = Rhine2_SendPacket,
+ .WaitForPacket = Rhine2_WaitPacket,
};
int giRhine2_CardCount;
tCard *gaRhine2_Cards;
// === CODE ===
/**
- * \brief Installs the PCnet3 Driver
+ * \brief Initialises the driver
*/
int Rhine2_Install(char **Options)
{
tCard *card;
giRhine2_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
- Log_Debug("PCnet3", "%i cards", giRhine2_CardCount);
+ Log_Debug("Rhine2", "%i cards", giRhine2_CardCount);
if( giRhine2_CardCount == 0 ) return MODULE_ERR_NOTNEEDED;
LOG("BAR4 = 0x%08x", PCI_GetBAR(id, 4));
LOG("BAR5 = 0x%08x", PCI_GetBAR(id, 5));
-// card->IOBase = base;
-// card->IRQ = PCI_GetIRQ( id );
+ card->IOBase = PCI_GetBAR(id, 0);
+ if( !(card->IOBase & 1) ) {
+ // Oops?
+ Log_Warning("Rhine2", "BAR0 is not in IO space");
+ continue ;
+ }
+ card->IOBase &= ~1;
+ card->IRQ = PCI_GetIRQ( id );
// Install IRQ Handler
-// IRQ_AddHandler(card->IRQ, Rhine2_IRQHandler);
-
-
+ IRQ_AddHandler(card->IRQ, Rhine2_IRQHandler, card);
-// Log_Log("PCnet3", "Card %i 0x%04x, IRQ %i %02x:%02x:%02x:%02x:%02x:%02x",
-// i, card->IOBase, card->IRQ,
-// card->MacAddr[0], card->MacAddr[1], card->MacAddr[2],
-// card->MacAddr[3], card->MacAddr[4], card->MacAddr[5]
-// );
+ Rhine2_int_InitialiseCard(card);
+
+ Log_Log("Rhine2", "Card %i 0x%04x, IRQ %i %02x:%02x:%02x:%02x:%02x:%02x",
+ i, card->IOBase, card->IRQ,
+ card->MacAddr[0], card->MacAddr[1], card->MacAddr[2],
+ card->MacAddr[3], card->MacAddr[4], card->MacAddr[5]
+ );
i ++;
}
- gRhine2_DriverInfo.RootNode.Size = giRhine2_CardCount;
- DevFS_AddDevice( &gRhine2_DriverInfo );
-
return MODULE_ERR_OK;
}
-// --- Root Functions ---
-char *Rhine2_ReadDir(tVFS_Node *Node, int Pos)
+void Rhine2_int_InitialiseCard(tCard *Card)
{
- if( Pos < 0 || Pos >= giRhine2_CardCount ) return NULL;
+ tPAddr phys;
- return strdup( gaRhine2_Cards[Pos].Name );
-}
+ Card->MacAddr[0] = inb(Card->IOBase + REG_PAR0);
+ Card->MacAddr[1] = inb(Card->IOBase + REG_PAR1);
+ Card->MacAddr[2] = inb(Card->IOBase + REG_PAR2);
+ Card->MacAddr[3] = inb(Card->IOBase + REG_PAR3);
+ Card->MacAddr[4] = inb(Card->IOBase + REG_PAR4);
+ Card->MacAddr[5] = inb(Card->IOBase + REG_PAR5);
+
+ outb(Card->IOBase + REG_CR1, CR1_SFRST);
+ // TODO: Timeout
+ while( inb(Card->IOBase + REG_CR1) & CR1_SFRST ) ;
+
+ // Allocate memory for things
+ for( int i = 0; i < N_RX_PAGES; i ++ )
+ {
+ Card->RXBuffers[i].Virt = (void*)MM_AllocDMA(1, 32, &phys);
+ Card->RXBuffers[i].Phys = phys;
+ }
+
+ Card->DescTable = (void*)MM_AllocDMA(1, 32, &phys);
+ Card->DescTablePhys = phys;
-tVFS_Node *Rhine2_FindDir(tVFS_Node *Node, const char *Filename)
-{
- //TODO: It might be an idea to supprt >10 cards
- if(Filename[0] == '\0' || Filename[1] != '\0') return NULL;
- if(Filename[0] < '0' || Filename[0] > '9') return NULL;
- return &gaRhine2_Cards[ Filename[0]-'0' ].Node;
+ // Initialise RX Descriptors
+ struct sRXDesc *rxdescs = Card->DescTable;
+ for( int i = 0; i < N_RX_DESCS; i ++ )
+ {
+ rxdescs[i].RSR = 0;
+ rxdescs[i].BufferSize = RX_BUF_SIZE;
+ rxdescs[i].RXBufferStart = Card->RXBuffers[i/(PAGE_SIZE/RX_BUF_SIZE)].Phys
+ + (i % (PAGE_SIZE/RX_BUF_SIZE)) * RX_BUF_SIZE;
+ rxdescs[i].RDBranchAddress = Card->DescTablePhys + (i+1) * sizeof(struct sRXDesc);
+ rxdescs[i].Length = (1 << 15); // set OWN
+ }
+ rxdescs[ N_RX_DESCS - 1 ].RDBranchAddress = 0;
+ Card->FirstRX = &rxdescs[0];
+ Card->LastRX = &rxdescs[N_RX_DESCS - 1];
+
+ Card->TXDescs = (void*)(rxdescs + N_RX_DESCS);
+ memset(Card->TXDescs, 0, sizeof(struct sTXDesc)*N_TX_DESCS);
+
+
+ // - Initialise card state
+ outb(Card->IOBase + REG_IMR0, 0xFF);
+ outb(Card->IOBase + REG_IMR1, 0xFF);
+ outd(Card->IOBase + REG_CUR_RX_DESC, Card->DescTablePhys);
+
+ outb(Card->IOBase + REG_CR0, CR0_STRT|CR0_RXON);
}
-const char *csaRhine2_RootIOCtls[] = {DRV_IOCTLNAMES, NULL};
-int Rhine2_RootIOCtl(tVFS_Node *Node, int ID, void *Data)
+// --- File Functions ---
+tIPStackBuffer *Rhine2_WaitPacket(void *Ptr)
{
- ENTER("pNode iID pData", Node, ID, Data);
- switch(ID)
+ tCard *card = Ptr;
+ tIPStackBuffer *ret;
+ struct sRXDesc *desc;
+ int nDesc;
+
+ ENTER("pPtr", Ptr);
+
+ if( Semaphore_Wait( &card->ReadSemaphore, 1 ) != 1 )
{
- BASE_IOCTLS(DRV_TYPE_NETWORK, "PCnet3", VERSION, csaRhine2_RootIOCtls);
+ LEAVE('n');
+ return NULL;
}
- LEAVE('i', 0);
- return 0;
+
+ nDesc = 0;
+ desc = card->FirstRX;
+ while( desc->BufferSize & (1 << 15) )
+ {
+ desc = Rhine2_int_GetDescFromPhys(card, desc->RDBranchAddress);
+ nDesc ++;
+ }
+
+ LOG("%i descriptors in packet", nDesc);
+
+ ret = IPStack_Buffer_CreateBuffer(nDesc);
+ desc = card->FirstRX;
+ while( desc->BufferSize & (1 << 15) )
+ {
+ void *data = Rhine2_int_GetBufferFromPhys(card, desc->RXBufferStart);
+ IPStack_Buffer_AppendSubBuffer(ret,
+ desc->Length, 0, data,
+ Rhine2_int_FreeRXDesc, desc
+ );
+ desc = Rhine2_int_GetDescFromPhys(card, desc->RDBranchAddress);
+ }
+ card->FirstRX = desc;
+
+ LEAVE('p', ret);
+ return ret;
}
-// --- File Functions ---
-Uint64 Rhine2_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+int Rhine2_SendPacket(void *Ptr, tIPStackBuffer *Buffer)
{
- #if 0
- tCard *card = Node->ImplPtr;
- Uint16 read_ofs, pkt_length;
- int new_read_ofs;
+ tCard *card = Ptr;
+ size_t len;
+ const void *data;
+ struct sTXDesc *first_desc = NULL;
+ struct sTXDesc *last_desc = NULL;
- ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
+ ENTER("pPtr pBuffer", Ptr, Buffer);
-retry:
- if( Semaphore_Wait( &card->ReadSemaphore, 1 ) != 1 )
+ // Iterate buffers
+ for( int id = -1; -1 != (id = IPStack_Buffer_GetBuffer(Buffer, id, &len, &data)); )
{
- LEAVE_RET('i', 0);
+ tPAddr pdata = MM_GetPhysAddr( (tVAddr)data );
+ struct sTXDesc *desc;
+ #if PHYS_BITS > 32
+ if( pdata >> 32 ) {
+ // TODO: re-map
+ }
+ #endif
+
+ desc = Rhine2_int_AllocTXDesc(card);
+ if(!last_desc)
+ first_desc = desc;
+ else
+ last_desc->TDBranchAddress = MM_GetPhysAddr( (tVAddr)desc );
+
+ desc->TXBufferStart = pdata;
+ desc->BufferSize = len;
+ // TODO: TCR
+ desc->TCR = 0;
+ desc->TSR = TD_TSR_OWN;
+ desc->TDBranchAddress = 0;
+
+ last_desc = desc;
}
- Mutex_Acquire( &card->ReadMutex );
-
- read_ofs = inw( card->IOBase + CAPR );
- LOG("raw read_ofs = %i", read_ofs);
- read_ofs = (read_ofs + 0x10) & 0xFFFF;
- LOG("read_ofs = %i", read_ofs);
-
- pkt_length = *(Uint16*)&card->ReceiveBuffer[read_ofs+2];
-
- // Calculate new read offset
- new_read_ofs = read_ofs + pkt_length + 4;
- new_read_ofs = (new_read_ofs + 3) & ~3; // Align
- if(new_read_ofs > card->ReceiveBufferLength) {
- LOG("wrapping read_ofs");
- new_read_ofs -= card->ReceiveBufferLength;
+ if( !first_desc ) {
+ LEAVE('i', -1);
+ return -1;
}
- new_read_ofs -= 0x10; // I dunno
- LOG("new_read_ofs = %i", new_read_ofs);
-
- // Check for errors
- if( *(Uint16*)&card->ReceiveBuffer[read_ofs] & 0x1E ) {
- // Update CAPR
- outw(card->IOBase + CAPR, new_read_ofs);
- Mutex_Release( &card->ReadMutex );
- goto retry; // I feel evil
+
+ first_desc->TCR |= TD_TCR_STP;
+ last_desc->TCR |= TD_TCR_EDP;
+
+ if( card->LastTX )
+ card->LastTX->TDBranchAddress = MM_GetPhysAddr( (tVAddr)first_desc );
+ else {
+ card->FirstTX = first_desc;
+ card->LastTX = first_desc;
+ outd(card->IOBase + REG_CUR_TX_DESC, MM_GetPhysAddr( (tVAddr)first_desc ));
}
+
+ outb(card->IOBase + REG_CR1, CR1_TDMD);
- // Get packet
- if( Length > pkt_length ) Length = pkt_length;
- memcpy(Buffer, &card->ReceiveBuffer[read_ofs+4], Length);
-
- // Update CAPR
- outw(card->IOBase + CAPR, new_read_ofs);
-
- Mutex_Release( &card->ReadMutex );
-
- LEAVE('i', Length);
- #endif
-
- return Length;
+ // TODO: Wait until the packet has sent, then clean up
+ while( inb(card->IOBase + REG_CR1) & CR1_TDMD )
+ ;
+
+ return 0;
}
-Uint64 Rhine2_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+void Rhine2_IRQHandler(int Num, void *Ptr)
{
- #if 0
- int td;
- Uint32 status;
- tCard *card = Node->ImplPtr;
-
- if( Length > 1500 ) return 0; // MTU exceeded
-
- ENTER("pNode XLength pBuffer", Node, Length, Buffer);
-
- // TODO: Implement a semaphore for avaliable transmit buffers
-
- // Find an avaliable descriptor
- Mutex_Acquire(&card->CurTXProtector);
- td = card->CurTXDescriptor;
- card->CurTXDescriptor ++;
- card->CurTXDescriptor %= 4;
- Mutex_Release(&card->CurTXProtector);
- // - Lock it
- Mutex_Acquire( &card->TransmitInUse[td] );
- LOG("td = %i", td);
-
- // Transmit using descriptor `td`
- LOG("card->PhysTransmitBuffers[td] = %P", card->PhysTransmitBuffers[td]);
- outd(card->IOBase + TSAD0 + td*4, card->PhysTransmitBuffers[td]);
- LOG("card->TransmitBuffers[td] = %p", card->TransmitBuffers[td]);
- // Copy to buffer
- memcpy(card->TransmitBuffers[td], Buffer, Length);
- // Start
- status = 0;
- status |= Length & 0x1FFF; // 0-12: Length
- status |= 0 << 13; // 13: OWN bit
- status |= (0 & 0x3F) << 16; // 16-21: Early TX threshold (zero atm, TODO: check)
- LOG("status = 0x%08x", status);
- outd(card->IOBase + TSD0 + td*4, status);
-
- LEAVE('i', (int)Length);
- #endif
-
- return Length;
}
-const char *csaRhine2_NodeIOCtls[] = {DRV_IOCTLNAMES, NULL};
-int Rhine2_IOCtl(tVFS_Node *Node, int ID, void *Data)
+// --- Helpers ---
+struct sRXDesc *Rhine2_int_GetDescFromPhys(tCard *Card, Uint32 Addr)
+{
+ if( Card->DescTablePhys > Addr ) return NULL;
+ if( Card->DescTablePhys + PAGE_SIZE <= Addr ) return NULL;
+ if( Addr & 15 ) return NULL;
+ return (struct sRXDesc*)Card->DescTable + ((Addr & (PAGE_SIZE-1)) / 16);
+}
+
+void *Rhine2_int_GetBufferFromPhys(tCard *Card, Uint32 Addr)
{
- tCard *card = Node->ImplPtr;
- ENTER("pNode iID pData", Node, ID, Data);
- switch(ID)
+ for( int i = 0; i < N_RX_PAGES; i ++ )
{
- BASE_IOCTLS(DRV_TYPE_NETWORK, "PCnet3", VERSION, csaRhine2_NodeIOCtls);
- case NET_IOCTL_GETMAC:
- if( !CheckMem(Data, 6) ) {
- LEAVE('i', -1);
- return -1;
- }
- memcpy( Data, card->MacAddr, 6 );
- LEAVE('i', 1);
- return 1;
+ if( Card->RXBuffers[i].Phys > Addr ) continue;
+ if( Card->RXBuffers[i].Phys + PAGE_SIZE <= Addr ) continue;
+ return Card->RXBuffers[i].Virt + (Addr & (PAGE_SIZE-1));
}
- LEAVE('i', 0);
- return 0;
+ return NULL;
}
-void Rhine2_IRQHandler(int Num)
+void Rhine2_int_FreeRXDesc(void *Ptr, size_t u1, size_t u2, const void *u3)
{
- #if 0
- int i, j;
- tCard *card;
- Uint16 status;
-
- LOG("Num = %i", Num);
+ struct sRXDesc *desc = Ptr;
- for( i = 0; i < giRhine2_CardCount; i ++ )
+ desc->RSR = 0;
+ desc->Length = (1 << 15); // Reset OWN
+}
+
+struct sTXDesc *Rhine2_int_AllocTXDesc(tCard *Card)
+{
+ for( int i = 0; i < N_TX_DESCS; i ++ )
{
- card = &gaRhine2_Cards[i];
- if( Num != card->IRQ ) break;
-
- status = inw(card->IOBase + ISR);
- LOG("status = 0x%02x", status);
-
- // Transmit OK, a transmit descriptor is now free
- if( status & FLAG_ISR_TOK )
- {
- for( j = 0; j < 4; j ++ )
- {
- if( ind(card->IOBase + TSD0 + j*4) & 0x8000 ) { // TSD TOK
- Mutex_Release( &card->TransmitInUse[j] );
- // TODO: Update semaphore once implemented
- }
- }
- outw(card->IOBase + ISR, FLAG_ISR_TOK);
- }
-
- // Recieve OK, inform read
- if( status & FLAG_ISR_ROK )
- {
- int read_ofs, end_ofs;
- int packet_count = 0;
- int len;
-
- // Scan recieve buffer for packets
- end_ofs = inw(card->IOBase + CBA);
- read_ofs = card->SeenOfs;
- LOG("read_ofs = %i, end_ofs = %i", read_ofs, end_ofs);
- if( read_ofs > end_ofs )
- {
- while( read_ofs < card->ReceiveBufferLength )
- {
- packet_count ++;
- len = *(Uint16*)&card->ReceiveBuffer[read_ofs+2];
- LOG("%i 0x%x Pkt Hdr: 0x%04x, len: 0x%04x",
- packet_count, read_ofs,
- *(Uint16*)&card->ReceiveBuffer[read_ofs],
- len
- );
- if(len > 2000) {
- Log_Warning("PCnet3", "IRQ: Packet in buffer exceeds sanity (%i>2000)", len);
- }
- read_ofs += len + 4;
- read_ofs = (read_ofs + 3) & ~3; // Align
- }
- read_ofs -= card->ReceiveBufferLength;
- LOG("wrapped read_ofs");
- }
- while( read_ofs < end_ofs )
- {
- packet_count ++;
- LOG("%i 0x%x Pkt Hdr: 0x%04x, len: 0x%04x",
- packet_count, read_ofs,
- *(Uint16*)&card->ReceiveBuffer[read_ofs],
- *(Uint16*)&card->ReceiveBuffer[read_ofs+2]
- );
- read_ofs += *(Uint16*)&card->ReceiveBuffer[read_ofs+2] + 4;
- read_ofs = (read_ofs + 3) & ~3; // Align
- }
- if( read_ofs != end_ofs ) {
- Log_Warning("PCnet3", "IRQ: read_ofs (%i) != end_ofs(%i)", read_ofs, end_ofs);
- read_ofs = end_ofs;
- }
- card->SeenOfs = read_ofs;
-
- LOG("packet_count = %i, read_ofs = 0x%x", packet_count, read_ofs);
-
- if( packet_count )
- {
- if( Semaphore_Signal( &card->ReadSemaphore, packet_count ) != packet_count ) {
- // Oops?
- }
- VFS_MarkAvaliable( &card->Node, 1 );
- }
-
- outw(card->IOBase + ISR, FLAG_ISR_ROK);
- }
+ if( Card->TXDescs[i].TSR & TD_TSR_OWN ) continue ;
+ Card->TXDescs[i].TSR = TD_TSR_OWN;
+ return &Card->TXDescs[i];
}
- #endif
+ return NULL;
}
+