Re: [SeaBIOS] [Qemu-devel] SeaBIOS error with Juniper FreeBSD kernel
by Kevin O'Connor
On Sun, Feb 21, 2010 at 04:18:38PM -0700, Brandon Bennett wrote:
> > On Sat, Feb 20, 2010 at 9:05 PM, Kevin O'Connor <kevin(a)koconnor.net> wrote:
> >> Should a kernel fail during boot, I'd suspect it doesn't like one of
> >> the apm/pcibios callbacks, or it doesn't like one of the
> >> smbios/mptable/acpi tables. You could try compiling the SeaBIOS code
> >> (see http://seabios.org/Download ) and increasing the debugging by
> >> modifying src/config.h. Specifically, you could increase
> >> CONFIG_DEBUG_LEVEL, and set DEBUG_HDL_pcibios32 and DEBUG_HDL_apm to
> >> 1. Also, you could try disabling some of the features to see if that
> >> prevents the fault (eg, disabling CONFIG_ACPI / CONFIG_SMBIOS /
> >> CONFIG_MPTABLE).
> >
>
> I have narrowed it down to SMBIOS. If I disable CONFIG_SMBIOS the
> image boots up fine.
Gleb, have you seen this thread?
Some of the recent changes to smbios that look like possible culprits
are:
Make SMBIOS table pass MS SVVP test
Use MaxCountCPUs during building of per cpu tables.
Add malloc_high/fseg() and rework bios table creation to use them.
There were other changes, but the comments indicate they were only
ports of changes already in bochs. I suppose it's also possible the
lack of smbios is turning off some other feature in the guest (eg,
acpi) that's the real culprit.
-Kevin
7 years, 10 months
Bochs cvs + SeaBIOS git master + FreeDOS = slow load + invalid opcode
by Sebastian Herbszt
I have tried SeaBIOS 0.5.1 on Bochs cvs with FreeDOS 1.0 Final boot floppy.
Loading from floppy was utterly slow and then FreeDOS dumped
Invalid Opcode at 0013 0000 0202 800F 01F3 20F4 10AA 10AA 109A 0000 0000 0000 00
00
Bad or missing Command Interpreter: A:\COMMAND.COM A:\ /E:2048 /F /MSG /P=A:\FRE
EDOS\FDAUTO.BAT
Enter the full shell command line:
Bochs log has
00477945139i[BIOS ] Booting from Floppy...
00510608951i[BIOS ] Booting from 0000:7c00
05264161428i[FDD ] controller reset in software
05445136148i[FDD ] controller reset in software
05625186768i[FDD ] controller reset in software
05803824012i[FDD ] controller reset in software
05985259728i[FDD ] controller reset in software
05985285461i[CPU0 ] LOCK prefix unallowed (op1=0x53, attr=0x0, mod=0x0, nnn=0)
Same floppy and Bochs version work fine and fast with Bochs BIOS.
Any clues?
- Sebastian
9 years
Re: [SeaBIOS] About cpu_set, CPU hotplug and related subjects
by Kevin O'Connor
On Mon, Apr 19, 2010 at 04:34:54PM -0300, Lucas Meneghel Rodrigues wrote:
> After doing some reading it seems to me that the reason why that is not
> happening is because SeaBIOS still doesn't have code to support CPU hot
> plugging as BochsBIOS did.
As I understand it, the hotplug support was only in the kvm copy of
bochs bios. It also limited the number of cpus one could use (I think
16).
The current smp support in SeaBIOS doesn't limit the number of cpus.
So, there has been reluctance to just port the old kvm bios code
forward.
-Kevin
9 years
Re: [SeaBIOS] [Qemu-devel] QEMU regression problems
by Roy Tam
2010/4/12 Gerhard Wiesinger <lists(a)wiesinger.com>:
> Hello,
>
> Checkit reports some problems under DOS:
> 1.) NPU functions are not correct: NPU Trigonometric Functions: FAILED.
> Seems to be a problem of the instruction set.
> 2.) Real-Time Clock Alarm: FAILED (This might be also the reason for the
> KVM problem, see my previous post). Seems to be that real-time clock is not
> working correct.
> 3.) There is also a problem with the reported base memory under QEMM386
> (HIMEM.SYS and EMM386.EXE is correct here). It is 646kB instead of 640kB.
> Therefore base memory test fails. I guess that reporting memory CMOS
> tables/interrupt functions are not implemented correctly.
>
> Details are listed below.
>
> All issues are NOT present under VMWare Server 2.0 and with real hardware.
>
> QEMU: 0.12.3 under Fedora 11, 2.6.30.10-105.2.23.fc11.x86 on AMD Phenom II
> Quad Core, x86_64-softmmu.
>
> Any comments?
>
Tested with Checkit 3.0 and QEMM 9.0.
- The NPU error is confirmed and it seems to be a floating point
rounding error in QEMU. This should be a 0.12 regression as it works
in 0.11.1 and 0.10.6.
- The RTC Alarm failure is confirmed too. Is it unimplemented in QEMU?
- The Base Memory > 640K error seems to be SeaBIOS related. QEMU Bochs
BIOS(tested with both -old-bios hack in 0.12 series and old 0.11.1)
will just freeze after QEMU counted RAM.(Tested with ScriptPC and
Bochs).
> Thnx.
>
> Ciao,
> Gerhard
>
> --
> http://www.wiesinger.com/
>
> Details:
> 1.)
> NPU Trigonometric Functions.................................FAILED ***
> Step 1, Expected 0.42926, received 0.42926
>
> Double 'Npu_oldans1' = 0.429259 (3FDB78F91894EFA5h).
> Double 'Npu_oldans2' = 0.628319 (3FE41B2F769CF0E0h).
> Double 'Npu_result ' = 0.429259 (3FDB78F91894EFA6h).
>
> 2.)
> Compare Current Time............................................Passed
> DOS: 16:24:39.89 Real-Time Clock: 16:24:39.00 (.89 apart)
>
> Compare Current Date............................................Passed
> DOS: 04/11/2010 Real-Time Clock: 04/11/2010.
>
> Real-Time Clock Alarm...........................................FAILED ***
>
> Compare Elapsed Time............................................Passed
> DOS: 11.97 Seconds Real-Time Clock: 12.00 Seconds (.03 apart)
>
> 3.) Known Memory:
> Base 646K From 0K to 646K (0000000h to 00A17FFh)
> Base Memory.................................................FAILED ***
> ERROR at Address 0A0000h, Bits FEDCBA9876543210
> ERROR at Address 0A0004h, Bits FEDCBA9876543210
> ERROR at Address 0A0006h, Bits FEDCBA9876543210
> ERROR at Address 0A0008h, Bits FEDCBA9876543210
> ERROR at Address 0A000Ah, Bits FEDCBA9876543210
> ERROR at Address 0A000Ch, Bits FEDCBA9876543210
> ERROR at Address 0A000Eh, Bits FEDCBA9876543210
> ERROR at Address 0A0010h, Bits FEDCBA9876543210
> ERROR at Address 0A0012h, Bits FEDCBA9876543210
> ERROR at Address 0A0014h, Bits FEDCBA9876543210
> ERROR at Address 0A0016h, Bits FEDCBA9876543210
> ERROR at Address 0A0018h, Bits FEDCBA9876543210
> ERROR at Address 0A001Ah, Bits FEDCBA9876543210
> ERROR at Address 0A001Ch, Bits FEDCBA9876543210
> ERROR at Address 0A001Eh, Bits FEDCBA9876543210
> ERROR at Address 0A0020h, Bits FEDCBA9876543210
> ADDITIONAL MEMORY ERRORS WERE NOT LISTED DUE TO LACK OF SPACE.
>
>
>
9 years, 1 month
Re: [SeaBIOS] questions about seabios ohci code
by Kevin O'Connor
I'm CC'ing the mailing list.
On Wed, Apr 14, 2010 at 02:04:48AM +0800, Qing Pei Wang wrote:
> hi kevin,
> i am learning the code of seabios/ohci stack followed with OHCI spec. I
> have some question.
Note that the OHCI support has only been tested on a modified qemu - I
haven't had any reports on real hardware.
> 1) in the function alloc_intr_pipe (usb.c line118)what does the frameexp
> mean?
It's log2(epdesc->bInterval) - the log of the sampling time (in ms)
requested by the device.
> 2) how does ohci get the intervals. the code just use epdesc->bInterval, how
> does it init? can pass the parameter from the usb-hid.c?
The epdesc structure is populated by get_device_config() - the config
read from the device includes the device config, interface
descriptions, and end point descriptions.
-Kevin
9 years, 1 month
[PATCH] Some improvements to optionrom preemption support.
by Kevin O'Connor
Enable preemption during VGA mode switch call - this call can take
several milliseconds on real hardware.
Call yield() in finish_preempt() - when preemption is configured it
allows threads in wait_preempt() to run; when not configured it gives
an opportunity for threads to execute after the implicit delay from
optionrom execution.
Don't penalize priority in run_thread(). The run_thread() code would
implicitly yield because it created the new thread on the list after
the current thread and then jumped to it. When in a preemption event,
a yield effectively waits approximately one millisecond (to the next
rtc irq). The implicit yielding in run_thread thus limited the number
of threads one could launch during preemption to 1 per millisecond.
So, change the code so that the new thread is created prior to the
current thread - thus eliminating the effective yield from
run_thread().
---
src/optionroms.c | 2 ++
src/stacks.c | 21 ++++++++++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/optionroms.c b/src/optionroms.c
index 47f5808..ad88e0c 100644
--- a/src/optionroms.c
+++ b/src/optionroms.c
@@ -470,7 +470,9 @@ vga_setup(void)
memset(&br, 0, sizeof(br));
br.flags = F_IF;
br.ax = 0x0003;
+ start_preempt();
call16_int(0x10, &br);
+ finish_preempt();
// Write to screen.
printf("Starting SeaBIOS (version %s)\n\n", VERSION);
diff --git a/src/stacks.c b/src/stacks.c
index 570948a..92d91a0 100644
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -116,9 +116,12 @@ stack_hop(u32 eax, u32 edx, void *func)
#define THREADSTACKSIZE 4096
+// Thread info - stored at bottom of each thread stack - don't change
+// without also updating the inline assembler below.
struct thread_info {
struct thread_info *next;
void *stackpos;
+ struct thread_info **pprev;
};
struct thread_info VAR16VISIBLE MainThread;
@@ -128,6 +131,7 @@ void
thread_setup(void)
{
MainThread.next = &MainThread;
+ MainThread.pprev = &MainThread.next;
MainThread.stackpos = NULL;
CanPreempt = 0;
}
@@ -185,10 +189,8 @@ yield(void)
static void
__end_thread(struct thread_info *old)
{
- struct thread_info *pos = &MainThread;
- while (pos->next != old)
- pos = pos->next;
- pos->next = old->next;
+ old->next->pprev = old->pprev;
+ *old->pprev = old->next;
free(old);
dprintf(DEBUG_thread, "\\%08x/ End thread\n", (u32)old);
}
@@ -207,8 +209,10 @@ run_thread(void (*func)(void*), void *data)
thread->stackpos = (void*)thread + THREADSTACKSIZE;
struct thread_info *cur = getCurThread();
- thread->next = cur->next;
- cur->next = thread;
+ thread->next = cur;
+ thread->pprev = cur->pprev;
+ cur->pprev = &thread->next;
+ *thread->pprev = thread;
dprintf(DEBUG_thread, "/%08x\\ Start thread\n", (u32)thread);
asm volatile(
@@ -289,11 +293,14 @@ start_preempt(void)
void
finish_preempt(void)
{
- if (! CONFIG_THREADS || ! CONFIG_THREAD_OPTIONROMS)
+ if (! CONFIG_THREADS || ! CONFIG_THREAD_OPTIONROMS) {
+ yield();
return;
+ }
CanPreempt = 0;
releaseRTC();
dprintf(1, "Done preempt - %d checks\n", PreemptCount);
+ yield();
}
// Check if preemption is on, and wait for it to complete if so.
--
1.6.6.1
9 years, 1 month
[PATCH] Refactor USB hub code.
by Kevin O'Connor
All four implementations of hubs (and root hubs) were very similar.
Replace them with a single implementation that uses callbacks for the
three custom parts (detect, reset, disconnect) of each type of hub.
---
src/usb-ehci.c | 100 ++++++++++++++++++++++++++---------------------------
src/usb-hub.c | 106 ++++++++++++++++++++++++++-----------------------------
src/usb-hub.h | 10 -----
src/usb-ohci.c | 82 ++++++++++++++++++-------------------------
src/usb-uhci.c | 75 ++++++++++++++++++---------------------
src/usb.c | 64 ++++++++++++++++++++++++++++++++-
src/usb.h | 25 ++++++++++++--
7 files changed, 253 insertions(+), 209 deletions(-)
diff --git a/src/usb-ehci.c b/src/usb-ehci.c
index 8e3219f..1f683c8 100644
--- a/src/usb-ehci.c
+++ b/src/usb-ehci.c
@@ -13,7 +13,6 @@
#include "pci_regs.h" // PCI_BASE_ADDRESS_0
#include "usb.h" // struct usb_s
#include "farptr.h" // GET_FLATPTR
-#include "usb-hub.h" // struct usbhub_s
#include "usb-uhci.h" // init_uhci
#include "usb-ohci.h" // init_ohci
@@ -40,13 +39,17 @@ struct usb_ehci_s {
#define EHCI_TIME_POSTPOWER 20
#define EHCI_TIME_POSTRESET 2
-// Start processing of companion controllers for full/low speed devices
+// Check if need companion controllers for full/low speed devices
static void
-ehci_startcompanion(struct usb_ehci_s *cntl)
+ehci_note_port(struct usb_ehci_s *cntl)
{
+ if (--cntl->checkports)
+ // Ports still being detected.
+ return;
if (! cntl->legacycount)
// No full/low speed devices found.
return;
+ // Start companion controllers.
int i;
for (i=0; i<ARRAY_SIZE(cntl->companion); i++) {
u16 type = cntl->companion[i].type;
@@ -59,13 +62,11 @@ ehci_startcompanion(struct usb_ehci_s *cntl)
}
}
-static void
-init_ehci_port(void *data)
+// Check if device attached to port
+static int
+ehci_hub_detect(struct usbhub_s *hub, u32 port)
{
- struct usbhub_s *hub = data;
- u32 port = hub->port; // XXX - find better way to pass port
struct usb_ehci_s *cntl = container_of(hub->cntl, struct usb_ehci_s, usb);
-
u32 *portreg = &cntl->regs->portsc[port];
u32 portsc = readl(portreg);
@@ -92,15 +93,31 @@ init_ehci_port(void *data)
// XXX - if just powered up, need to wait for USB_TIME_ATTDB?
- // Reset port
+ // Begin reset on port
portsc = (portsc & ~PORT_PE) | PORT_RESET;
writel(portreg, portsc);
msleep(USB_TIME_DRSTR);
- mutex_lock(&cntl->usb.resetlock);
+ return 0;
+
+doneearly:
+ ehci_note_port(cntl);
+ return -1;
+}
+
+// Reset device on port
+static int
+ehci_hub_reset(struct usbhub_s *hub, u32 port)
+{
+ struct usb_ehci_s *cntl = container_of(hub->cntl, struct usb_ehci_s, usb);
+ u32 *portreg = &cntl->regs->portsc[port];
+ u32 portsc = readl(portreg);
+
+ // Finish reset on port
portsc &= ~PORT_RESET;
writel(portreg, portsc);
msleep(EHCI_TIME_POSTRESET);
+ int rv = -1;
portsc = readl(portreg);
if (!(portsc & PORT_CONNECT))
// No longer connected
@@ -112,58 +129,39 @@ init_ehci_port(void *data)
goto resetfail;
}
- if (! --cntl->checkports)
- ehci_startcompanion(cntl);
-
- struct usb_pipe *pipe = usb_set_address(hub, port, USB_HIGHSPEED);
- if (!pipe) {
- writel(portreg, portsc & ~PORT_PE);
- mutex_unlock(&cntl->usb.resetlock);
- goto done;
- }
- mutex_unlock(&cntl->usb.resetlock);
-
- // Configure port
- int count = configure_usb_device(pipe);
- free_pipe(pipe);
- if (! count)
- // Disable port
- writel(portreg, portsc & ~PORT_PE);
- hub->devcount += count;
-done:
- hub->threads--;
- return;
-
+ rv = USB_HIGHSPEED;
resetfail:
- mutex_unlock(&cntl->usb.resetlock);
-doneearly:
- if (! --cntl->checkports)
- ehci_startcompanion(cntl);
- goto done;
+ ehci_note_port(cntl);
+ return rv;
+}
+
+// Disable port
+static void
+ehci_hub_disconnect(struct usbhub_s *hub, u32 port)
+{
+ struct usb_ehci_s *cntl = container_of(hub->cntl, struct usb_ehci_s, usb);
+ u32 *portreg = &cntl->regs->portsc[port];
+ u32 portsc = readl(portreg);
+ writel(portreg, portsc & ~PORT_PE);
}
+static struct usbhub_op_s ehci_HubOp = {
+ .detect = ehci_hub_detect,
+ .reset = ehci_hub_reset,
+ .disconnect = ehci_hub_disconnect,
+};
+
// Find any devices connected to the root hub.
static int
check_ehci_ports(struct usb_ehci_s *cntl)
{
ASSERT32FLAT();
-
- // Launch a thread for every port.
struct usbhub_s hub;
memset(&hub, 0, sizeof(hub));
hub.cntl = &cntl->usb;
- int ports = cntl->checkports;
- hub.threads = ports;
- int i;
- for (i=0; i<ports; i++) {
- hub.port = i;
- run_thread(init_ehci_port, &hub);
- }
-
- // Wait for threads to complete.
- while (hub.threads)
- yield();
-
+ hub.portcount = cntl->checkports;
+ hub.op = &ehci_HubOp;
+ usb_enumerate(&hub);
return hub.devcount;
}
diff --git a/src/usb-hub.c b/src/usb-hub.c
index 9effbc3..1586bac 100644
--- a/src/usb-hub.c
+++ b/src/usb-hub.c
@@ -28,7 +28,7 @@ set_port_feature(struct usbhub_s *hub, int port, int feature)
req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER;
req.bRequest = USB_REQ_SET_FEATURE;
req.wValue = feature;
- req.wIndex = port;
+ req.wIndex = port + 1;
req.wLength = 0;
mutex_lock(&hub->lock);
int ret = send_default_control(hub->pipe, &req, NULL);
@@ -43,7 +43,7 @@ clear_port_feature(struct usbhub_s *hub, int port, int feature)
req.bRequestType = USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_OTHER;
req.bRequest = USB_REQ_CLEAR_FEATURE;
req.wValue = feature;
- req.wIndex = port;
+ req.wIndex = port + 1;
req.wLength = 0;
mutex_lock(&hub->lock);
int ret = send_default_control(hub->pipe, &req, NULL);
@@ -58,7 +58,7 @@ get_port_status(struct usbhub_s *hub, int port, struct usb_port_status *sts)
req.bRequestType = USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_OTHER;
req.bRequest = USB_REQ_GET_STATUS;
req.wValue = 0;
- req.wIndex = port;
+ req.wIndex = port + 1;
req.wLength = sizeof(*sts);
mutex_lock(&hub->lock);
int ret = send_default_control(hub->pipe, &req, sts);
@@ -66,12 +66,10 @@ get_port_status(struct usbhub_s *hub, int port, struct usb_port_status *sts)
return ret;
}
-static void
-init_hub_port(void *data)
+// Check if device attached to port
+static int
+usb_hub_detect(struct usbhub_s *hub, u32 port)
{
- struct usbhub_s *hub = data;
- u32 port = hub->port; // XXX - find better way to pass port
-
// Turn on power to port.
int ret = set_port_feature(hub, port, USB_PORT_FEAT_POWER);
if (ret)
@@ -92,29 +90,48 @@ init_hub_port(void *data)
break;
if (check_time(end))
// No device found.
- goto done;
+ return -1;
msleep(5);
}
// XXX - wait USB_TIME_ATTDB time?
- // Reset port.
- mutex_lock(&hub->cntl->resetlock);
- ret = set_port_feature(hub, port, USB_PORT_FEAT_RESET);
+ return 0;
+
+fail:
+ dprintf(1, "Failure on hub port %d detect\n", port);
+ return -1;
+}
+
+// Disable port
+static void
+usb_hub_disconnect(struct usbhub_s *hub, u32 port)
+{
+ int ret = clear_port_feature(hub, port, USB_PORT_FEAT_ENABLE);
+ if (ret)
+ dprintf(1, "Failure on hub port %d disconnect\n", port);
+}
+
+// Reset device on port
+static int
+usb_hub_reset(struct usbhub_s *hub, u32 port)
+{
+ int ret = set_port_feature(hub, port, USB_PORT_FEAT_RESET);
if (ret)
- goto resetfail;
+ goto fail;
// Wait for reset to complete.
- end = calc_future_tsc(USB_TIME_DRST * 2);
+ struct usb_port_status sts;
+ u64 end = calc_future_tsc(USB_TIME_DRST * 2);
for (;;) {
ret = get_port_status(hub, port, &sts);
if (ret)
- goto resetfail;
+ goto fail;
if (!(sts.wPortStatus & USB_PORT_STAT_RESET))
break;
if (check_time(end)) {
warn_timeout();
- goto resetfail;
+ goto fail;
}
msleep(5);
}
@@ -122,37 +139,23 @@ init_hub_port(void *data)
// Reset complete.
if (!(sts.wPortStatus & USB_PORT_STAT_CONNECTION))
// Device no longer present
- goto resetfail;
-
- // Set address of port
- struct usb_pipe *pipe = usb_set_address(
- hub, port, ((sts.wPortStatus & USB_PORT_STAT_SPEED_MASK)
- >> USB_PORT_STAT_SPEED_SHIFT));
- if (!pipe)
- goto resetfail;
- mutex_unlock(&hub->cntl->resetlock);
-
- // Configure the device
- int count = configure_usb_device(pipe);
- free_pipe(pipe);
- if (!count) {
- ret = clear_port_feature(hub, port, USB_PORT_FEAT_ENABLE);
- if (ret)
- goto fail;
- }
- hub->devcount += count;
-done:
- hub->threads--;
- return;
-
-resetfail:
- clear_port_feature(hub, port, USB_PORT_FEAT_ENABLE);
- mutex_unlock(&hub->cntl->resetlock);
+ return -1;
+
+ return ((sts.wPortStatus & USB_PORT_STAT_SPEED_MASK)
+ >> USB_PORT_STAT_SPEED_SHIFT);
+
fail:
- dprintf(1, "Failure on hub port %d setup\n", port);
- goto done;
+ dprintf(1, "Failure on hub port %d reset\n", port);
+ usb_hub_disconnect(hub, port);
+ return -1;
}
+static struct usbhub_op_s HubOp = {
+ .detect = usb_hub_detect,
+ .reset = usb_hub_reset,
+ .disconnect = usb_hub_disconnect,
+};
+
// Configure a usb hub and then find devices connected to it.
int
usb_hub_init(struct usb_pipe *pipe)
@@ -171,18 +174,9 @@ usb_hub_init(struct usb_pipe *pipe)
hub.pipe = pipe;
hub.cntl = pipe->cntl;
hub.powerwait = desc.bPwrOn2PwrGood * 2;
-
- // Launch a thread for every port.
- int i;
- for (i=1; i<=desc.bNbrPorts; i++) {
- hub.port = i;
- hub.threads++;
- run_thread(init_hub_port, &hub);
- }
-
- // Wait for threads to complete.
- while (hub.threads)
- yield();
+ hub.portcount = desc.bNbrPorts;
+ hub.op = &HubOp;
+ usb_enumerate(&hub);
dprintf(1, "Initialized USB HUB (%d ports used)\n", hub.devcount);
if (hub.devcount)
diff --git a/src/usb-hub.h b/src/usb-hub.h
index 0994320..7672028 100644
--- a/src/usb-hub.h
+++ b/src/usb-hub.h
@@ -1,16 +1,6 @@
#ifndef __USB_HUB_H
#define __USB_HUB_H
-struct usbhub_s {
- struct usb_pipe *pipe;
- struct usb_s *cntl;
- struct mutex_s lock;
- u32 powerwait;
- u32 port;
- u32 threads;
- u32 devcount;
-};
-
// usb-hub.c
struct usb_pipe;
int usb_hub_init(struct usb_pipe *pipe);
diff --git a/src/usb-ohci.c b/src/usb-ohci.c
index 71ae561..43fe238 100644
--- a/src/usb-ohci.c
+++ b/src/usb-ohci.c
@@ -11,7 +11,6 @@
#include "pci_regs.h" // PCI_BASE_ADDRESS_0
#include "usb.h" // struct usb_s
#include "farptr.h" // GET_FLATPTR
-#include "usb-hub.h" // struct usbhub_s
#define FIT (1 << 31)
@@ -25,23 +24,36 @@ struct usb_ohci_s {
* Root hub
****************************************************************/
-static void
-init_ohci_port(void *data)
+// Check if device attached to port
+static int
+ohci_hub_detect(struct usbhub_s *hub, u32 port)
{
- struct usbhub_s *hub = data;
- u32 port = hub->port; // XXX - find better way to pass port
struct usb_ohci_s *cntl = container_of(hub->cntl, struct usb_ohci_s, usb);
-
u32 sts = readl(&cntl->regs->roothub_portstatus[port]);
if (!(sts & RH_PS_CCS))
// No device.
- goto done;
+ return -1;
// XXX - need to wait for USB_TIME_ATTDB if just powered up?
- // Signal reset
- mutex_lock(&cntl->usb.resetlock);
+ return 0;
+}
+
+// Disable port
+static void
+ohci_hub_disconnect(struct usbhub_s *hub, u32 port)
+{
+ struct usb_ohci_s *cntl = container_of(hub->cntl, struct usb_ohci_s, usb);
+ writel(&cntl->regs->roothub_portstatus[port], RH_PS_CCS|RH_PS_LSDA);
+}
+
+// Reset device on port
+static int
+ohci_hub_reset(struct usbhub_s *hub, u32 port)
+{
+ struct usb_ohci_s *cntl = container_of(hub->cntl, struct usb_ohci_s, usb);
writel(&cntl->regs->roothub_portstatus[port], RH_PS_PRS);
+ u32 sts;
u64 end = calc_future_tsc(USB_TIME_DRSTR * 2);
for (;;) {
sts = readl(&cntl->regs->roothub_portstatus[port]);
@@ -51,39 +63,25 @@ init_ohci_port(void *data)
if (check_time(end)) {
// Timeout.
warn_timeout();
- goto resetfail;
+ ohci_hub_disconnect(hub, port);
+ return -1;
}
yield();
}
if ((sts & (RH_PS_CCS|RH_PS_PES)) != (RH_PS_CCS|RH_PS_PES))
// Device no longer present
- goto resetfail;
-
- // Set address of port
- struct usb_pipe *pipe = usb_set_address(hub, port, !!(sts & RH_PS_LSDA));
- if (!pipe)
- goto resetfail;
- mutex_unlock(&cntl->usb.resetlock);
-
- // Configure the device
- int count = configure_usb_device(pipe);
- free_pipe(pipe);
- if (! count)
- // Shutdown port
- writel(&cntl->regs->roothub_portstatus[port], RH_PS_CCS|RH_PS_LSDA);
- hub->devcount += count;
-done:
- hub->threads--;
- return;
+ return -1;
-resetfail:
- // Shutdown port
- writel(&cntl->regs->roothub_portstatus[port], RH_PS_CCS|RH_PS_LSDA);
- mutex_unlock(&cntl->usb.resetlock);
- goto done;
+ return !!(sts & RH_PS_LSDA);
}
+static struct usbhub_op_s ohci_HubOp = {
+ .detect = ohci_hub_detect,
+ .reset = ohci_hub_reset,
+ .disconnect = ohci_hub_disconnect,
+};
+
// Find any devices connected to the root hub.
static int
check_ohci_ports(struct usb_ohci_s *cntl)
@@ -97,22 +95,12 @@ check_ohci_ports(struct usb_ohci_s *cntl)
msleep((rha >> 24) * 2);
// XXX - need to sleep for USB_TIME_SIGATT if just powered up?
- // Lanuch a thread per port.
struct usbhub_s hub;
memset(&hub, 0, sizeof(hub));
hub.cntl = &cntl->usb;
- int ports = rha & RH_A_NDP;
- hub.threads = ports;
- int i;
- for (i=0; i<ports; i++) {
- hub.port = i;
- run_thread(init_ohci_port, &hub);
- }
-
- // Wait for threads to complete.
- while (hub.threads)
- yield();
-
+ hub.portcount = rha & RH_A_NDP;
+ hub.op = &ohci_HubOp;
+ usb_enumerate(&hub);
return hub.devcount;
}
diff --git a/src/usb-uhci.c b/src/usb-uhci.c
index 4e0c276..b05e09a 100644
--- a/src/usb-uhci.c
+++ b/src/usb-uhci.c
@@ -12,7 +12,6 @@
#include "pci_regs.h" // PCI_BASE_ADDRESS_4
#include "usb.h" // struct usb_s
#include "farptr.h" // GET_FLATPTR
-#include "usb-hub.h" // struct usbhub_s
struct usb_uhci_s {
struct usb_s usb;
@@ -26,55 +25,59 @@ struct usb_uhci_s {
* Root hub
****************************************************************/
-static void
-init_uhci_port(void *data)
+// Check if device attached to a given port
+static int
+uhci_hub_detect(struct usbhub_s *hub, u32 port)
{
- struct usbhub_s *hub = data;
- u32 port = hub->port; // XXX - find better way to pass port
struct usb_uhci_s *cntl = container_of(hub->cntl, struct usb_uhci_s, usb);
u16 ioport = cntl->iobase + USBPORTSC1 + port * 2;
u16 status = inw(ioport);
if (!(status & USBPORTSC_CCS))
// No device
- goto done;
+ return -1;
// XXX - if just powered up, need to wait for USB_TIME_ATTDB?
- // Reset port
+ // Begin reset on port
outw(USBPORTSC_PR, ioport);
msleep(USB_TIME_DRSTR);
- mutex_lock(&cntl->usb.resetlock);
+ return 0;
+}
+
+// Reset device on port
+static int
+uhci_hub_reset(struct usbhub_s *hub, u32 port)
+{
+ struct usb_uhci_s *cntl = container_of(hub->cntl, struct usb_uhci_s, usb);
+ u16 ioport = cntl->iobase + USBPORTSC1 + port * 2;
+
+ // Finish reset on port
outw(0, ioport);
udelay(6); // 64 high-speed bit times
- status = inw(ioport);
+ u16 status = inw(ioport);
if (!(status & USBPORTSC_CCS))
// No longer connected
- goto resetfail;
+ return -1;
outw(USBPORTSC_PE, ioport);
- struct usb_pipe *pipe = usb_set_address(
- hub, port, !!(status & USBPORTSC_LSDA));
- if (!pipe)
- goto resetfail;
- mutex_unlock(&cntl->usb.resetlock);
-
- // Configure port
- int count = configure_usb_device(pipe);
- free_pipe(pipe);
- if (! count)
- // Disable port
- outw(0, ioport);
- hub->devcount += count;
-done:
- hub->threads--;
- return;
-
-resetfail:
+ return !!(status & USBPORTSC_LSDA);
+}
+
+// Disable port
+static void
+uhci_hub_disconnect(struct usbhub_s *hub, u32 port)
+{
+ struct usb_uhci_s *cntl = container_of(hub->cntl, struct usb_uhci_s, usb);
+ u16 ioport = cntl->iobase + USBPORTSC1 + port * 2;
outw(0, ioport);
- mutex_unlock(&cntl->usb.resetlock);
- goto done;
}
+static struct usbhub_op_s uhci_HubOp = {
+ .detect = uhci_hub_detect,
+ .reset = uhci_hub_reset,
+ .disconnect = uhci_hub_disconnect,
+};
+
// Find any devices connected to the root hub.
static int
check_uhci_ports(struct usb_uhci_s *cntl)
@@ -83,17 +86,9 @@ check_uhci_ports(struct usb_uhci_s *cntl)
struct usbhub_s hub;
memset(&hub, 0, sizeof(hub));
hub.cntl = &cntl->usb;
- hub.threads = 2;
-
- // Launch a thread for every port.
- run_thread(init_uhci_port, &hub);
- hub.port = 1;
- run_thread(init_uhci_port, &hub);
-
- // Wait for threads to complete.
- while (hub.threads)
- yield();
-
+ hub.portcount = 2;
+ hub.op = &uhci_HubOp;
+ usb_enumerate(&hub);
return hub.devcount;
}
diff --git a/src/usb.c b/src/usb.c
index 8b3c36e..694ea28 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -242,7 +242,7 @@ set_configuration(struct usb_pipe *pipe, u16 val)
// Assign an address to a device in the default state on the given
// controller.
-struct usb_pipe *
+static struct usb_pipe *
usb_set_address(struct usbhub_s *hub, int port, int speed)
{
ASSERT32FLAT();
@@ -299,7 +299,7 @@ usb_set_address(struct usbhub_s *hub, int port, int speed)
// Called for every found device - see if a driver is available for
// this device and do setup if so.
-int
+static int
configure_usb_device(struct usb_pipe *pipe)
{
ASSERT32FLAT();
@@ -356,6 +356,66 @@ fail:
return 0;
}
+static void
+usb_init_hub_port(void *data)
+{
+ struct usbhub_s *hub = data;
+ u32 port = hub->port; // XXX - find better way to pass port
+
+ // Detect if device present (and possibly start reset)
+ int ret = hub->op->detect(hub, port);
+ if (ret)
+ // No device present
+ goto done;
+
+ // Reset port and determine device speed
+ mutex_lock(&hub->cntl->resetlock);
+ ret = hub->op->reset(hub, port);
+ if (ret < 0)
+ // Reset failed
+ goto resetfail;
+
+ // Set address of port
+ struct usb_pipe *pipe = usb_set_address(hub, port, ret);
+ if (!pipe) {
+ hub->op->disconnect(hub, port);
+ goto resetfail;
+ }
+ mutex_unlock(&hub->cntl->resetlock);
+
+ // Configure the device
+ int count = configure_usb_device(pipe);
+ free_pipe(pipe);
+ if (!count)
+ hub->op->disconnect(hub, port);
+ hub->devcount += count;
+done:
+ hub->threads--;
+ return;
+
+resetfail:
+ mutex_unlock(&hub->cntl->resetlock);
+ goto done;
+}
+
+void
+usb_enumerate(struct usbhub_s *hub)
+{
+ u32 portcount = hub->portcount;
+ hub->threads = portcount;
+
+ // Launch a thread for every port.
+ int i;
+ for (i=0; i<portcount; i++) {
+ hub->port = i;
+ run_thread(usb_init_hub_port, hub);
+ }
+
+ // Wait for threads to complete.
+ while (hub->threads)
+ yield();
+}
+
void
usb_setup(void)
{
diff --git a/src/usb.h b/src/usb.h
index b5cbf2e..f28a3a7 100644
--- a/src/usb.h
+++ b/src/usb.h
@@ -4,6 +4,7 @@
#include "util.h" // struct mutex_s
+// Information on a USB end point.
struct usb_pipe {
struct usb_s *cntl;
u8 type;
@@ -24,6 +25,26 @@ struct usb_s {
u8 maxaddr;
};
+// Information for enumerating USB hubs
+struct usbhub_s {
+ struct usbhub_op_s *op;
+ struct usb_pipe *pipe;
+ struct usb_s *cntl;
+ struct mutex_s lock;
+ u32 powerwait;
+ u32 port;
+ u32 threads;
+ u32 portcount;
+ u32 devcount;
+};
+
+// Hub callback (32bit) info
+struct usbhub_op_s {
+ int (*detect)(struct usbhub_s *hub, u32 port);
+ int (*reset)(struct usbhub_s *hub, u32 port);
+ void (*disconnect)(struct usbhub_s *hub, u32 port);
+};
+
#define USB_TYPE_UHCI 1
#define USB_TYPE_OHCI 2
#define USB_TYPE_EHCI 3
@@ -175,9 +196,7 @@ struct usb_endpoint_descriptor {
// usb.c
void usb_setup(void);
-struct usbhub_s;
-struct usb_pipe *usb_set_address(struct usbhub_s *hub, int port, int speed);
-int configure_usb_device(struct usb_pipe *pipe);
+void usb_enumerate(struct usbhub_s *hub);
int send_default_control(struct usb_pipe *pipe, const struct usb_ctrlrequest *req
, void *data);
int usb_send_bulk(struct usb_pipe *pipe, int dir, void *data, int datasize);
--
1.6.6.1
9 years, 1 month
