i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed UHCI for x86_64.

Browse Source
This commit is contained in:
Alex Smith
2012-08-06 12:29:12 +01:00
parent 44672ada83
commit 2997a19125
4 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/Haiku64Image
+3 -3
View File
@@ -71,9 +71,9 @@ if $(HAIKU_ATA_STACK) = 1 {
AddFilesToHaikuImage system add-ons kernel busses scsi AddFilesToHaikuImage system add-ons kernel busses scsi
: ahci ; : ahci ;
AddFilesToHaikuImage system add-ons kernel busses usb AddFilesToHaikuImage system add-ons kernel busses usb
: <usb>ehci ; : <usb>uhci <usb>ehci ;
AddFilesToHaikuImage system add-ons kernel debugger AddFilesToHaikuImage system add-ons kernel debugger
: <kdebug>demangle ; : <kdebug>demangle <kdebug>invalidate_on_exit <kdebug>usb_keyboard ;
AddFilesToHaikuImage system add-ons kernel file_systems AddFilesToHaikuImage system add-ons kernel file_systems
: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ; : $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
AddFilesToHaikuImage system add-ons kernel generic AddFilesToHaikuImage system add-ons kernel generic
@@ -232,7 +232,7 @@ AddFilesToHaikuImage system : haiku_loader ;
# boot module links # boot module links
AddBootModuleSymlinksToHaikuImage AddBootModuleSymlinksToHaikuImage
$(ATA_ONLY)ata pci config_manager dpc scsi usb $(ATA_ONLY)ata_adapter $(ATA_ONLY)ata pci config_manager dpc scsi usb $(ATA_ONLY)ata_adapter
locked_pool scsi_periph ahci generic_ide_pci <usb>ehci locked_pool scsi_periph ahci generic_ide_pci <usb>uhci <usb>ehci
scsi_cd scsi_disk usb_disk scsi_cd scsi_disk usb_disk
intel intel
bfs bfs
src/add-ons/kernel/busses/usb/uhci.cpp
+49 -40
View File
@@ -146,7 +146,8 @@ void
print_descriptor_chain(uhci_td *descriptor) print_descriptor_chain(uhci_td *descriptor)
{ {
while (descriptor) { while (descriptor) {
dprintf("ph: 0x%08lx; lp: 0x%08lx; vf: %s; q: %s; t: %s; st: 0x%08lx; to: 0x%08lx\n", dprintf("ph: 0x%08" B_PRIx32 "; lp: 0x%08" B_PRIx32 "; vf: %s; q: %s; "
"t: %s; st: 0x%08" B_PRIx32 "; to: 0x%08" B_PRIx32 "\n",
descriptor->this_phy & 0xffffffff, descriptor->link_phy & 0xfffffff0, descriptor->this_phy & 0xffffffff, descriptor->link_phy & 0xfffffff0,
descriptor->link_phy & 0x4 ? "y" : "n", descriptor->link_phy & 0x4 ? "y" : "n",
descriptor->link_phy & 0x2 ? "qh" : "td", descriptor->link_phy & 0x2 ? "qh" : "td",
@@ -174,13 +175,13 @@ Queue::Queue(Stack *stack)
mutex_init(&fLock, "uhci queue lock"); mutex_init(&fLock, "uhci queue lock");
void *physicalAddress; phys_addr_t physicalAddress;
fStatus = fStack->AllocateChunk((void **)&fQueueHead, &physicalAddress, fStatus = fStack->AllocateChunk((void **)&fQueueHead, &physicalAddress,
sizeof(uhci_qh)); sizeof(uhci_qh));
if (fStatus < B_OK) if (fStatus < B_OK)
return; return;
fQueueHead->this_phy = (addr_t)physicalAddress; fQueueHead->this_phy = (uint32)physicalAddress;
fQueueHead->element_phy = QH_TERMINATE; fQueueHead->element_phy = QH_TERMINATE;
fStrayDescriptor = NULL; fStrayDescriptor = NULL;
@@ -193,10 +194,10 @@ Queue::~Queue()
Lock(); Lock();
mutex_destroy(&fLock); mutex_destroy(&fLock);
fStack->FreeChunk(fQueueHead, (void *)fQueueHead->this_phy, sizeof(uhci_qh)); fStack->FreeChunk(fQueueHead, fQueueHead->this_phy, sizeof(uhci_qh));
if (fStrayDescriptor) if (fStrayDescriptor)
fStack->FreeChunk(fStrayDescriptor, (void *)fStrayDescriptor->this_phy, fStack->FreeChunk(fStrayDescriptor, fStrayDescriptor->this_phy,
sizeof(uhci_td)); sizeof(uhci_td));
} }
@@ -244,7 +245,7 @@ Queue::TerminateByStrayDescriptor()
{ {
// According to the *BSD USB sources, there needs to be a stray transfer // According to the *BSD USB sources, there needs to be a stray transfer
// descriptor in order to get some chipset to work nicely (like the PIIX). // descriptor in order to get some chipset to work nicely (like the PIIX).
void *physicalAddress; phys_addr_t physicalAddress;
status_t result = fStack->AllocateChunk((void **)&fStrayDescriptor, status_t result = fStack->AllocateChunk((void **)&fStrayDescriptor,
&physicalAddress, sizeof(uhci_td)); &physicalAddress, sizeof(uhci_td));
if (result < B_OK) { if (result < B_OK) {
@@ -253,7 +254,7 @@ Queue::TerminateByStrayDescriptor()
} }
fStrayDescriptor->status = 0; fStrayDescriptor->status = 0;
fStrayDescriptor->this_phy = (addr_t)physicalAddress; fStrayDescriptor->this_phy = (uint32)physicalAddress;
fStrayDescriptor->link_phy = TD_TERMINATE; fStrayDescriptor->link_phy = TD_TERMINATE;
fStrayDescriptor->link_log = NULL; fStrayDescriptor->link_log = NULL;
fStrayDescriptor->buffer_phy = 0; fStrayDescriptor->buffer_phy = 0;
@@ -263,7 +264,7 @@ Queue::TerminateByStrayDescriptor()
| (0x7f << TD_TOKEN_DEVADDR_SHIFT) | TD_TOKEN_IN; | (0x7f << TD_TOKEN_DEVADDR_SHIFT) | TD_TOKEN_IN;
if (!Lock()) { if (!Lock()) {
fStack->FreeChunk(fStrayDescriptor, (void *)fStrayDescriptor->this_phy, fStack->FreeChunk(fStrayDescriptor, fStrayDescriptor->this_phy,
sizeof(uhci_td)); sizeof(uhci_td));
return B_ERROR; return B_ERROR;
} }
@@ -346,7 +347,7 @@ Queue::RemoveTransfer(uhci_qh *transfer, bool lock)
} }
addr_t uint32
Queue::PhysicalAddress() Queue::PhysicalAddress()
{ {
return fQueueHead->this_phy; return fQueueHead->this_phy;
@@ -358,8 +359,14 @@ Queue::PrintToStream()
{ {
#ifdef TRACE_USB #ifdef TRACE_USB
TRACE("queue:\n"); TRACE("queue:\n");
dprintf("link phy: 0x%08lx; link type: %s; terminate: %s\n", fQueueHead->link_phy & 0xfff0, fQueueHead->link_phy & 0x0002 ? "QH" : "TD", fQueueHead->link_phy & 0x0001 ? "yes" : "no"); dprintf("link phy: 0x%08" B_PRIx32 "; link type: %s; terminate: %s\n",
dprintf("elem phy: 0x%08lx; elem type: %s; terminate: %s\n", fQueueHead->element_phy & 0xfff0, fQueueHead->element_phy & 0x0002 ? "QH" : "TD", fQueueHead->element_phy & 0x0001 ? "yes" : "no"); fQueueHead->link_phy & 0xfff0,
fQueueHead->link_phy & 0x0002 ? "QH" : "TD",
fQueueHead->link_phy & 0x0001 ? "yes" : "no");
dprintf("elem phy: 0x%08" B_PRIx32 "; elem type: %s; terminate: %s\n",
fQueueHead->element_phy & 0xfff0,
fQueueHead->element_phy & 0x0002 ? "QH" : "TD",
fQueueHead->element_phy & 0x0001 ? "yes" : "no");
#endif #endif
} }
@@ -413,11 +420,11 @@ UHCI::UHCI(pci_info *info, Stack *stack)
fRegisterBase = sPCIModule->read_pci_config(fPCIInfo->bus, fRegisterBase = sPCIModule->read_pci_config(fPCIInfo->bus,
fPCIInfo->device, fPCIInfo->function, PCI_memory_base, 4); fPCIInfo->device, fPCIInfo->function, PCI_memory_base, 4);
fRegisterBase &= PCI_address_io_mask; fRegisterBase &= PCI_address_io_mask;
TRACE("iospace offset: 0x%08lx\n", fRegisterBase); TRACE("iospace offset: 0x%08" B_PRIx32 "\n", fRegisterBase);
if (fRegisterBase == 0) { if (fRegisterBase == 0) {
fRegisterBase = fPCIInfo->u.h0.base_registers[0]; fRegisterBase = fPCIInfo->u.h0.base_registers[0];
TRACE_ALWAYS("register base: 0x%08lx\n", fRegisterBase); TRACE_ALWAYS("register base: 0x%08" B_PRIx32 "\n", fRegisterBase);
} }
// enable pci address access // enable pci address access
@@ -444,9 +451,9 @@ UHCI::UHCI(pci_info *info, Stack *stack)
} }
// Setup the frame list // Setup the frame list
void *physicalAddress; phys_addr_t physicalAddress;
fFrameArea = fStack->AllocateArea((void **)&fFrameList, fFrameArea = fStack->AllocateArea((void **)&fFrameList, &physicalAddress,
(void **)&physicalAddress, 4096, "USB UHCI framelist"); 4096, "USB UHCI framelist");
if (fFrameArea < B_OK) { if (fFrameArea < B_OK) {
TRACE_ERROR("unable to create an area for the frame pointer list\n"); TRACE_ERROR("unable to create an area for the frame pointer list\n");
@@ -641,7 +648,7 @@ UHCI::Start()
bool running = false; bool running = false;
for (int32 i = 0; i < 10; i++) { for (int32 i = 0; i < 10; i++) {
uint16 status = ReadReg16(UHCI_USBSTS); uint16 status = ReadReg16(UHCI_USBSTS);
TRACE("current loop %ld, status 0x%04x\n", i, status); TRACE("current loop %" B_PRId32 ", status 0x%04x\n", i, status);
if (status & UHCI_USBSTS_HCHALT) if (status & UHCI_USBSTS_HCHALT)
snooze(10000); snooze(10000);
@@ -1149,7 +1156,7 @@ UHCI::SubmitIsochronous(Transfer *transfer)
} }
} }
TRACE("isochronous submitted size=%ld bytes, TDs=%ld, " TRACE("isochronous submitted size=%ld bytes, TDs=%" B_PRId32 ", "
"packetSize=%ld, restSize=%ld\n", transfer->DataLength(), "packetSize=%ld, restSize=%ld\n", transfer->DataLength(),
isochronousData->packet_count, packetSize, restSize); isochronousData->packet_count, packetSize, restSize);
@@ -1328,8 +1335,8 @@ UHCI::FinishTransfers()
continue; continue;
TRACE("finishing transfers (first transfer: 0x%08lx; last" TRACE("finishing transfers (first transfer: 0x%08lx; last"
" transfer: 0x%08lx)\n", (uint32)fFirstTransfer, " transfer: 0x%08lx)\n", (addr_t)fFirstTransfer,
(uint32)fLastTransfer); (addr_t)fLastTransfer);
transfer_data *lastTransfer = NULL; transfer_data *lastTransfer = NULL;
transfer_data *transfer = fFirstTransfer; transfer_data *transfer = fFirstTransfer;
Unlock(); Unlock();
@@ -1343,15 +1350,16 @@ UHCI::FinishTransfers()
uint32 status = descriptor->status; uint32 status = descriptor->status;
if (status & TD_STATUS_ACTIVE) { if (status & TD_STATUS_ACTIVE) {
// still in progress // still in progress
TRACE("td (0x%08lx) still active\n", descriptor->this_phy); TRACE("td (0x%08" B_PRIx32 ") still active\n",
descriptor->this_phy);
break; break;
} }
if (status & TD_ERROR_MASK) { if (status & TD_ERROR_MASK) {
// an error occured // an error occured
TRACE_ERROR("td (0x%08lx) error: status: 0x%08lx;" TRACE_ERROR("td (0x%08" B_PRIx32 ") error: status: 0x%08"
" token: 0x%08lx;\n", descriptor->this_phy, status, B_PRIx32 "; token: 0x%08" B_PRIx32 ";\n",
descriptor->token); descriptor->this_phy, status, descriptor->token);
uint8 errorCount = status >> TD_ERROR_COUNT_SHIFT; uint8 errorCount = status >> TD_ERROR_COUNT_SHIFT;
errorCount &= TD_ERROR_COUNT_MASK; errorCount &= TD_ERROR_COUNT_MASK;
@@ -1396,7 +1404,7 @@ UHCI::FinishTransfers()
&& uhci_td_actual_length(descriptor) && uhci_td_actual_length(descriptor)
< uhci_td_maximum_length(descriptor))) { < uhci_td_maximum_length(descriptor))) {
// all descriptors are done, or we have a short packet // all descriptors are done, or we have a short packet
TRACE("td (0x%08lx) ok\n", descriptor->this_phy); TRACE("td (0x%08" B_PRIx32 ") ok\n", descriptor->this_phy);
callbackStatus = B_OK; callbackStatus = B_OK;
transferDone = true; transferDone = true;
break; break;
@@ -1919,8 +1927,8 @@ UHCI::AddTo(Stack *stack)
if (!sPCIModule) { if (!sPCIModule) {
status_t status = get_module(B_PCI_MODULE_NAME, (module_info **)&sPCIModule); status_t status = get_module(B_PCI_MODULE_NAME, (module_info **)&sPCIModule);
if (status < B_OK) { if (status < B_OK) {
TRACE_MODULE_ERROR("AddTo(): getting pci module failed! 0x%08lx\n", TRACE_MODULE_ERROR("AddTo(): getting pci module failed! 0x%08"
status); B_PRIx32 "\n", status);
return status; return status;
} }
} }
@@ -1956,8 +1964,8 @@ UHCI::AddTo(Stack *stack)
} }
if (bus->InitCheck() < B_OK) { if (bus->InitCheck() < B_OK) {
TRACE_MODULE_ERROR("AddTo(): InitCheck() failed 0x%08lx\n", TRACE_MODULE_ERROR("AddTo(): InitCheck() failed 0x%08" B_PRIx32
bus->InitCheck()); "\n", bus->InitCheck());
delete bus; delete bus;
continue; continue;
} }
@@ -2027,12 +2035,12 @@ uhci_qh *
UHCI::CreateTransferQueue(uhci_td *descriptor) UHCI::CreateTransferQueue(uhci_td *descriptor)
{ {
uhci_qh *queueHead; uhci_qh *queueHead;
void *physicalAddress; phys_addr_t physicalAddress;
if (fStack->AllocateChunk((void **)&queueHead, if (fStack->AllocateChunk((void **)&queueHead, &physicalAddress,
&physicalAddress, sizeof(uhci_qh)) < B_OK) sizeof(uhci_qh)) < B_OK)
return NULL; return NULL;
queueHead->this_phy = (addr_t)physicalAddress; queueHead->this_phy = (uint32)physicalAddress;
queueHead->element_phy = descriptor->this_phy; queueHead->element_phy = descriptor->this_phy;
return queueHead; return queueHead;
} }
@@ -2044,7 +2052,7 @@ UHCI::FreeTransferQueue(uhci_qh *queueHead)
if (!queueHead) if (!queueHead)
return; return;
fStack->FreeChunk(queueHead, (void *)queueHead->this_phy, sizeof(uhci_qh)); fStack->FreeChunk(queueHead, queueHead->this_phy, sizeof(uhci_qh));
} }
@@ -2052,7 +2060,7 @@ uhci_td *
UHCI::CreateDescriptor(Pipe *pipe, uint8 direction, size_t bufferSize) UHCI::CreateDescriptor(Pipe *pipe, uint8 direction, size_t bufferSize)
{ {
uhci_td *result; uhci_td *result;
void *physicalAddress; phys_addr_t physicalAddress;
if (fStack->AllocateChunk((void **)&result, &physicalAddress, if (fStack->AllocateChunk((void **)&result, &physicalAddress,
sizeof(uhci_td)) < B_OK) { sizeof(uhci_td)) < B_OK) {
@@ -2060,7 +2068,7 @@ UHCI::CreateDescriptor(Pipe *pipe, uint8 direction, size_t bufferSize)
return NULL; return NULL;
} }
result->this_phy = (addr_t)physicalAddress; result->this_phy = (uint32)physicalAddress;
result->status = TD_STATUS_ACTIVE; result->status = TD_STATUS_ACTIVE;
if (pipe->Type() & USB_OBJECT_ISO_PIPE) if (pipe->Type() & USB_OBJECT_ISO_PIPE)
result->status |= TD_CONTROL_ISOCHRONOUS; result->status |= TD_CONTROL_ISOCHRONOUS;
@@ -2090,12 +2098,13 @@ UHCI::CreateDescriptor(Pipe *pipe, uint8 direction, size_t bufferSize)
return result; return result;
} }
if (fStack->AllocateChunk(&result->buffer_log, (void **)&result->buffer_phy, if (fStack->AllocateChunk(&result->buffer_log, &physicalAddress,
bufferSize) < B_OK) { bufferSize) < B_OK) {
TRACE_ERROR("unable to allocate space for the buffer\n"); TRACE_ERROR("unable to allocate space for the buffer\n");
fStack->FreeChunk(result, (void *)result->this_phy, sizeof(uhci_td)); fStack->FreeChunk(result, result->this_phy, sizeof(uhci_td));
return NULL; return NULL;
} }
result->buffer_phy = physicalAddress;
return result; return result;
} }
@@ -2150,10 +2159,10 @@ UHCI::FreeDescriptor(uhci_td *descriptor)
if (descriptor->buffer_log) { if (descriptor->buffer_log) {
fStack->FreeChunk(descriptor->buffer_log, fStack->FreeChunk(descriptor->buffer_log,
(void *)descriptor->buffer_phy, descriptor->buffer_size); descriptor->buffer_phy, descriptor->buffer_size);
} }
fStack->FreeChunk(descriptor, (void *)descriptor->this_phy, sizeof(uhci_td)); fStack->FreeChunk(descriptor, descriptor->this_phy, sizeof(uhci_td));
} }
src/add-ons/kernel/busses/usb/uhci.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
status_t RemoveTransfer(uhci_qh *transfer, status_t RemoveTransfer(uhci_qh *transfer,
bool lock = true); bool lock = true);
addr_t PhysicalAddress(); uint32 PhysicalAddress();
void PrintToStream(); void PrintToStream();
src/add-ons/kernel/busses/usb/uhci_hardware.h
+2 -2
View File
@@ -92,7 +92,7 @@ typedef struct
uint32 token; // Contains the packet header (where it needs to be sent) uint32 token; // Contains the packet header (where it needs to be sent)
uint32 buffer_phy; // A pointer to the buffer with the actual packet uint32 buffer_phy; // A pointer to the buffer with the actual packet
// Software part // Software part
addr_t this_phy; // A physical pointer to this address uint32 this_phy; // A physical pointer to this address
void *link_log; // Pointer to the next logical TD/QT void *link_log; // Pointer to the next logical TD/QT
void *buffer_log; // Pointer to the logical buffer void *buffer_log; // Pointer to the logical buffer
size_t buffer_size; // Size of the buffer size_t buffer_size; // Size of the buffer
@@ -167,7 +167,7 @@ typedef struct
uint32 link_phy; // Link to the next TD/QH uint32 link_phy; // Link to the next TD/QH
uint32 element_phy; // Pointer to the first element in the queue uint32 element_phy; // Pointer to the first element in the queue
// Software part // Software part
addr_t this_phy; // The physical pointer to this address uint32 this_phy; // The physical pointer to this address
void *link_log; // Pointer to the next logical TD/QH void *link_log; // Pointer to the next logical TD/QH
} uhci_qh; } uhci_qh;