by Kevin O'Connor
On Tue, Dec 24, 2013 at 02:09:17AM +0100, Idwer Vollering wrote:
> 2013/12/24 Kevin O'Connor <kevin(a)koconnor.net>:
> > On Sun, Dec 22, 2013 at 09:54:02PM -0500, Kevin O'Connor wrote:
> > FYI, it seems my USB3 controller really wants to see 64bit writes to
> > pci registers. With the change below (on top of the other changes) I
> > can now boot my e350m1 from a USB3 flash drive.
> >
> > I'm still seeing failures on my keyboard/mouse though:
[...]
> This is captured on my f2a85-m, with CONFIG_DEBUG_LEVEL=7:
Hi Idwer,
>From IRC, I understand that after you applied my last "status
direction" patch you were able to get your high speed flash device to
work on the xhci controller, but not your keyboard.
Can you also try the patch below? I still can't get any high/low
speed devices to work (though my super speed flash device does work).
Maybe you'll have more luck with this patch though.
-Kevin
commit 5779c75cbea304d182a0291efd1f9422922200ce
Author: Kevin O'Connor <kevin(a)koconnor.net>
Date: Fri Dec 27 13:37:11 2013 -0500
xhci: Set the interval parameter on interrupt pipes.
Be sure to set the interval parameter when creating an interrupt based
pipe.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c
index d0df6ee..9d5449c 100644
--- a/src/hw/usb-xhci.c
+++ b/src/hw/usb-xhci.c
@@ -895,6 +895,8 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev
in->slot.ctx[0] |= (31 << 27); // context entries
int e = pipe->epid-1;
+ if (eptype == USB_ENDPOINT_XFER_INT)
+ in->ep[e].ctx[0] = (usb_getFrameExp(usbdev, epdesc) + 3) << 16;
in->ep[e].ctx[1] |= (eptype << 3);
if (epdesc->bEndpointAddress & USB_DIR_IN)
in->ep[e].ctx[1] |= (1 << 5);
by Kevin O'Connor
The previous code attempts to correlate which UHCI and OHCI
controllers correlate with which EHCI controllers so that it can
ensure high speed devices are handled by the EHCI code while low/full
speed devices are handled by the UHCI/OHCI code. Replace this logic
by initializing all EHCI controllers first, and then initializing all
UHCI and OHCI controllers. This simplifies the code and improves
support for some hardware devices that don't follow the OHCI/UHCI to
EHCI correlation standard.
Also, remove the unused usb->busid field.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/hw/usb-ehci.c | 83 ++++++++++++++++++-------------------------------------
src/hw/usb-ehci.h | 2 +-
src/hw/usb-ohci.c | 21 ++++++++++----
src/hw/usb-ohci.h | 2 +-
src/hw/usb-uhci.c | 21 ++++++++++----
src/hw/usb-uhci.h | 2 +-
src/hw/usb-xhci.c | 26 +++++++++++------
src/hw/usb-xhci.h | 2 +-
src/hw/usb.c | 59 ++++++++-------------------------------
src/hw/usb.h | 1 -
10 files changed, 92 insertions(+), 127 deletions(-)
diff --git a/src/hw/usb-ehci.c b/src/hw/usb-ehci.c
index b495d6c..10c92fe 100644
--- a/src/hw/usb-ehci.c
+++ b/src/hw/usb-ehci.c
@@ -1,6 +1,6 @@
// Code for handling EHCI USB controllers.
//
-// Copyright (C) 2010 Kevin O'Connor <kevin(a)koconnor.net>
+// Copyright (C) 2010-2013 Kevin O'Connor <kevin(a)koconnor.net>
//
// This file may be distributed under the terms of the GNU LGPLv3 license.
@@ -14,8 +14,6 @@
#include "string.h" // memset
#include "usb.h" // struct usb_s
#include "usb-ehci.h" // struct ehci_qh
-#include "usb-ohci.h" // ohci_setup
-#include "usb-uhci.h" // uhci_setup
#include "util.h" // msleep
#include "x86.h" // readl
@@ -24,9 +22,7 @@ struct usb_ehci_s {
struct ehci_caps *caps;
struct ehci_regs *regs;
struct ehci_qh *async_qh;
- struct pci_device *companion[8];
int checkports;
- int legacycount;
};
struct ehci_pipe {
@@ -36,6 +32,8 @@ struct ehci_pipe {
struct usb_pipe pipe;
};
+static int PendingEHCIPorts;
+
/****************************************************************
* Root hub
@@ -44,33 +42,6 @@ struct ehci_pipe {
#define EHCI_TIME_POSTPOWER 20
#define EHCI_TIME_POSTRESET 2
-// Check if need companion controllers for full/low speed devices
-static void
-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++) {
- struct pci_device *pci = cntl->companion[i];
- if (!pci)
- break;
-
- // ohci/uhci_setup call pci_config_X - don't run from irq handler.
- wait_preempt();
-
- if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_UHCI)
- uhci_setup(pci, cntl->usb.busid + i);
- else if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_OHCI)
- ohci_setup(pci, cntl->usb.busid + i);
- }
-}
-
// Check if device attached to port
static int
ehci_hub_detect(struct usbhub_s *hub, u32 port)
@@ -97,7 +68,6 @@ ehci_hub_detect(struct usbhub_s *hub, u32 port)
if ((portsc & PORT_LINESTATUS_MASK) == PORT_LINESTATUS_KSTATE) {
// low speed device
- cntl->legacycount++;
writel(portreg, portsc | PORT_OWNER);
goto doneearly;
}
@@ -111,7 +81,7 @@ ehci_hub_detect(struct usbhub_s *hub, u32 port)
return 0;
doneearly:
- ehci_note_port(cntl);
+ PendingEHCIPorts--;
return -1;
}
@@ -135,14 +105,13 @@ ehci_hub_reset(struct usbhub_s *hub, u32 port)
goto resetfail;
if (!(portsc & PORT_PE)) {
// full speed device
- cntl->legacycount++;
writel(portreg, portsc | PORT_OWNER);
goto resetfail;
}
rv = USB_HIGHSPEED;
resetfail:
- ehci_note_port(cntl);
+ PendingEHCIPorts--;
return rv;
}
@@ -310,7 +279,6 @@ configure_ehci(void *data)
// Set default of high speed for root hub.
writel(&cntl->regs->configflag, 1);
- cntl->checkports = readl(&cntl->caps->hcsparams) & HCS_N_PORTS_MASK;
// Find devices
int count = check_ehci_ports(cntl);
@@ -329,12 +297,10 @@ fail:
free(cntl);
}
-int
-ehci_setup(struct pci_device *pci, int busid, struct pci_device *comppci)
+static void
+ehci_controller_setup(struct pci_device *pci)
{
- if (! CONFIG_USB_EHCI)
- return -1;
-
+ wait_preempt(); // Avoid pci_config_readl when preempting
u16 bdf = pci->bdf;
u32 baseaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0);
struct ehci_caps *caps = (void*)(baseaddr & PCI_BASE_ADDRESS_MEM_MASK);
@@ -343,16 +309,17 @@ ehci_setup(struct pci_device *pci, int busid, struct pci_device *comppci)
struct usb_ehci_s *cntl = malloc_tmphigh(sizeof(*cntl));
if (!cntl) {
warn_noalloc();
- return -1;
+ return;
}
memset(cntl, 0, sizeof(*cntl));
- cntl->usb.busid = busid;
cntl->usb.pci = pci;
cntl->usb.type = USB_TYPE_EHCI;
cntl->caps = caps;
+ cntl->checkports = readl(&cntl->caps->hcsparams) & HCS_N_PORTS_MASK;
cntl->regs = (void*)caps + readb(&caps->caplength);
if (hcc_params & HCC_64BIT_ADDR)
cntl->regs->ctrldssegment = 0;
+ PendingEHCIPorts += cntl->checkports;
dprintf(1, "EHCI init on dev %02x:%02x.%x (regs=%p)\n"
, pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf)
@@ -362,20 +329,24 @@ ehci_setup(struct pci_device *pci, int busid, struct pci_device *comppci)
// XXX - check for and disable SMM control?
- // Find companion controllers.
- int count = 0;
- for (;;) {
- if (!comppci || comppci == pci)
- break;
- if (pci_classprog(comppci) == PCI_CLASS_SERIAL_USB_UHCI)
- cntl->companion[count++] = comppci;
- else if (pci_classprog(comppci) == PCI_CLASS_SERIAL_USB_OHCI)
- cntl->companion[count++] = comppci;
- comppci = container_of(comppci->node.next, struct pci_device, node);
+ run_thread(configure_ehci, cntl);
+}
+
+void
+ehci_setup(void)
+{
+ if (! CONFIG_USB_EHCI)
+ return;
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_EHCI)
+ ehci_controller_setup(pci);
}
- run_thread(configure_ehci, cntl);
- return 0;
+ // Wait for all EHCI ports to initialize. This forces OHCI/UHCI
+ // setup to always be after any EHCI ports are set to low speed.
+ while (PendingEHCIPorts)
+ yield();
}
diff --git a/src/hw/usb-ehci.h b/src/hw/usb-ehci.h
index 5672033..fcb8d94 100644
--- a/src/hw/usb-ehci.h
+++ b/src/hw/usb-ehci.h
@@ -2,7 +2,7 @@
#define __USB_EHCI_H
// usb-ehci.c
-int ehci_setup(struct pci_device *pci, int busid, struct pci_device *comppci);
+void ehci_setup(void);
struct usbdevice_s;
struct usb_endpoint_descriptor;
struct usb_pipe *ehci_alloc_pipe(struct usbdevice_s *usbdev
diff --git a/src/hw/usb-ohci.c b/src/hw/usb-ohci.c
index 313e3fd..d55b64a 100644
--- a/src/hw/usb-ohci.c
+++ b/src/hw/usb-ohci.c
@@ -9,6 +9,7 @@
#include "malloc.h" // free
#include "output.h" // dprintf
#include "pci.h" // pci_bdf_to_bus
+#include "pci_ids.h" // PCI_CLASS_SERIAL_USB_OHCI
#include "pci_regs.h" // PCI_BASE_ADDRESS_0
#include "string.h" // memset
#include "usb.h" // struct usb_s
@@ -265,21 +266,19 @@ free:
free(intr_ed);
}
-void
-ohci_setup(struct pci_device *pci, int busid)
+static void
+ohci_controller_setup(struct pci_device *pci)
{
- if (! CONFIG_USB_OHCI)
- return;
struct usb_ohci_s *cntl = malloc_tmphigh(sizeof(*cntl));
if (!cntl) {
warn_noalloc();
return;
}
memset(cntl, 0, sizeof(*cntl));
- cntl->usb.busid = busid;
cntl->usb.pci = pci;
cntl->usb.type = USB_TYPE_OHCI;
+ wait_preempt(); // Avoid pci_config_readl when preempting
u16 bdf = pci->bdf;
u32 baseaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0);
cntl->regs = (void*)(baseaddr & PCI_BASE_ADDRESS_MEM_MASK);
@@ -301,6 +300,18 @@ ohci_setup(struct pci_device *pci, int busid)
run_thread(configure_ohci, cntl);
}
+void
+ohci_setup(void)
+{
+ if (! CONFIG_USB_OHCI)
+ return;
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_OHCI)
+ ohci_controller_setup(pci);
+ }
+}
+
/****************************************************************
* End point communication
diff --git a/src/hw/usb-ohci.h b/src/hw/usb-ohci.h
index ad0ffec..3cae21f 100644
--- a/src/hw/usb-ohci.h
+++ b/src/hw/usb-ohci.h
@@ -2,7 +2,7 @@
#define __USB_OHCI_H
// usb-ohci.c
-void ohci_setup(struct pci_device *pci, int busid);
+void ohci_setup(void);
struct usbdevice_s;
struct usb_endpoint_descriptor;
struct usb_pipe *ohci_alloc_pipe(struct usbdevice_s *usbdev
diff --git a/src/hw/usb-uhci.c b/src/hw/usb-uhci.c
index 03eb5e1..2321e21 100644
--- a/src/hw/usb-uhci.c
+++ b/src/hw/usb-uhci.c
@@ -9,6 +9,7 @@
#include "malloc.h" // free
#include "output.h" // dprintf
#include "pci.h" // pci_bdf_to_bus
+#include "pci_ids.h" // PCI_CLASS_SERIAL_USB_UHCI
#include "pci_regs.h" // PCI_BASE_ADDRESS_4
#include "string.h" // memset
#include "usb.h" // struct usb_s
@@ -237,19 +238,17 @@ fail:
free(cntl);
}
-void
-uhci_setup(struct pci_device *pci, int busid)
+static void
+uhci_controller_setup(struct pci_device *pci)
{
- if (! CONFIG_USB_UHCI)
- return;
u16 bdf = pci->bdf;
struct usb_uhci_s *cntl = malloc_tmphigh(sizeof(*cntl));
if (!cntl) {
warn_noalloc();
return;
}
+ wait_preempt(); // Avoid pci_config_readl when preempting
memset(cntl, 0, sizeof(*cntl));
- cntl->usb.busid = busid;
cntl->usb.pci = pci;
cntl->usb.type = USB_TYPE_UHCI;
cntl->iobase = (pci_config_readl(bdf, PCI_BASE_ADDRESS_4)
@@ -266,6 +265,18 @@ uhci_setup(struct pci_device *pci, int busid)
run_thread(configure_uhci, cntl);
}
+void
+uhci_setup(void)
+{
+ if (! CONFIG_USB_UHCI)
+ return;
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_UHCI)
+ uhci_controller_setup(pci);
+ }
+}
+
/****************************************************************
* End point communication
diff --git a/src/hw/usb-uhci.h b/src/hw/usb-uhci.h
index b83c487..2916465 100644
--- a/src/hw/usb-uhci.h
+++ b/src/hw/usb-uhci.h
@@ -2,7 +2,7 @@
#define __USB_UHCI_H
// usb-uhci.c
-void uhci_setup(struct pci_device *pci, int busid);
+void uhci_setup(void);
struct usbdevice_s;
struct usb_endpoint_descriptor;
struct usb_pipe *uhci_alloc_pipe(struct usbdevice_s *usbdev
diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c
index 6c24855..dc98e5d 100644
--- a/src/hw/usb-xhci.c
+++ b/src/hw/usb-xhci.c
@@ -5,6 +5,7 @@
#include "x86.h" // readl
#include "malloc.h" // memalign_low
#include "pci.h" // pci_bdf_to_bus
+#include "pci_ids.h" // PCI_CLASS_SERIAL_USB_XHCI
#include "pci_regs.h" // PCI_BASE_ADDRESS_0
#include "usb.h" // struct usb_s
#include "usb-xhci.h" // struct ehci_qh
@@ -1067,20 +1068,17 @@ xhci_poll_intr(struct usb_pipe *p, void *data)
return 0;
}
-int
-xhci_setup(struct pci_device *pci, int busid)
+static void
+xhci_controller_setup(struct pci_device *pci)
{
- ASSERT32FLAT();
- if (!CONFIG_USB_XHCI)
- return -1;
-
struct usb_xhci_s *xhci = malloc_low(sizeof(*xhci));
if (!xhci) {
warn_noalloc();
- return -1;
+ return;
}
memset(xhci, 0, sizeof(*xhci));
+ wait_preempt(); // Avoid pci_config_readl when preempting
xhci->baseaddr = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0)
& PCI_BASE_ADDRESS_MEM_MASK;
xhci->caps = (void*)(xhci->baseaddr);
@@ -1095,7 +1093,6 @@ xhci_setup(struct pci_device *pci, int busid)
xhci->slots = hcs1 & 0xff;
xhci->xcap = ((hcc >> 16) & 0xffff) << 2;
- xhci->usb.busid = busid;
xhci->usb.pci = pci;
xhci->usb.type = USB_TYPE_XHCI;
xhci->hub.cntl = &xhci->usb;
@@ -1138,5 +1135,16 @@ xhci_setup(struct pci_device *pci, int busid)
pci_config_maskw(pci->bdf, PCI_COMMAND, 0, PCI_COMMAND_MASTER);
run_thread(configure_xhci, xhci);
- return 0;
+}
+
+void
+xhci_setup(void)
+{
+ if (! CONFIG_USB_XHCI)
+ return;
+ struct pci_device *pci;
+ foreachpci(pci) {
+ if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_XHCI)
+ xhci_controller_setup(pci);
+ }
}
diff --git a/src/hw/usb-xhci.h b/src/hw/usb-xhci.h
index 6bbe127..a28ac7f 100644
--- a/src/hw/usb-xhci.h
+++ b/src/hw/usb-xhci.h
@@ -8,7 +8,7 @@ struct usb_pipe;
// --------------------------------------------------------------
// usb-xhci.c
-int xhci_setup(struct pci_device *pci, int busid);
+void xhci_setup(void);
struct usb_pipe *xhci_alloc_pipe(struct usbdevice_s *usbdev
, struct usb_endpoint_descriptor *epdesc);
struct usb_pipe *xhci_update_pipe(struct usbdevice_s *usbdev
diff --git a/src/hw/usb.c b/src/hw/usb.c
index 8fe741f..8430e50 100644
--- a/src/hw/usb.c
+++ b/src/hw/usb.c
@@ -1,6 +1,6 @@
// Main code for handling USB controllers and devices.
//
-// Copyright (C) 2009 Kevin O'Connor <kevin(a)koconnor.net>
+// Copyright (C) 2009-2013 Kevin O'Connor <kevin(a)koconnor.net>
//
// This file may be distributed under the terms of the GNU LGPLv3 license.
@@ -8,9 +8,6 @@
#include "config.h" // CONFIG_*
#include "malloc.h" // free
#include "output.h" // dprintf
-#include "pci.h" // foreachpci
-#include "pci_ids.h" // PCI_CLASS_SERIAL_USB_UHCI
-#include "pci_regs.h" // PCI_CLASS_REVISION
#include "string.h" // memset
#include "usb.h" // struct usb_s
#include "usb-ehci.h" // ehci_setup
@@ -439,52 +436,20 @@ usb_enumerate(struct usbhub_s *hub)
}
void
+__usb_setup(void *data)
+{
+ dprintf(3, "init usb\n");
+ xhci_setup();
+ ehci_setup();
+ uhci_setup();
+ ohci_setup();
+}
+
+void
usb_setup(void)
{
ASSERT32FLAT();
if (! CONFIG_USB)
return;
-
- dprintf(3, "init usb\n");
-
- // Look for USB controllers
- int count = 0;
- struct pci_device *pci, *ehcipci = NULL;
- foreachpci(pci) {
- if (pci->class != PCI_CLASS_SERIAL_USB)
- continue;
-
- if (!ehcipci || pci->bdf >= ehcipci->bdf) {
- // Check to see if this device has an ehci controller
- int found = 0;
- ehcipci = pci;
- for (;;) {
- if (pci_classprog(ehcipci) == PCI_CLASS_SERIAL_USB_EHCI) {
- // Found an ehci controller.
- int ret = ehci_setup(ehcipci, count++, pci);
- if (ret)
- // Error
- break;
- count += found;
- pci = ehcipci;
- break;
- }
- if (ehcipci->class == PCI_CLASS_SERIAL_USB)
- found++;
- ehcipci = container_of_or_null(
- ehcipci->node.next, struct pci_device, node);
- if (!ehcipci || (pci_bdf_to_busdev(ehcipci->bdf)
- != pci_bdf_to_busdev(pci->bdf)))
- // No ehci controller found.
- break;
- }
- }
-
- if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_UHCI)
- uhci_setup(pci, count++);
- else if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_OHCI)
- ohci_setup(pci, count++);
- else if (pci_classprog(pci) == PCI_CLASS_SERIAL_USB_XHCI)
- xhci_setup(pci, count++);
- }
+ run_thread(__usb_setup, NULL);
}
diff --git a/src/hw/usb.h b/src/hw/usb.h
index 22173fb..883c608 100644
--- a/src/hw/usb.h
+++ b/src/hw/usb.h
@@ -35,7 +35,6 @@ struct usb_s {
struct usb_pipe *freelist;
struct mutex_s resetlock;
struct pci_device *pci;
- int busid;
u8 type;
u8 maxaddr;
};
--
1.8.3.1
by Kevin O'Connor
The thread cleanup was being performed on whatever thread stack was
next in the list. However, with high debugging this causes spurious
_free() debug messages to show up in random threads which can be
confusing when analyzing the debug output. So, always run
__end_thread() on the MainThread stack to prevent this confusion.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/stacks.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/stacks.c b/src/stacks.c
index b7d8ade..9c528f5 100644
--- a/src/stacks.c
+++ b/src/stacks.c
@@ -293,13 +293,13 @@ switch_next(struct thread_info *cur)
: "ebx", "edx", "esi", "edi", "cc", "memory");
}
-// Last thing called from a thread (called on "next" stack).
+// Last thing called from a thread (called on MainThread stack).
static void
__end_thread(struct thread_info *old)
{
hlist_del(&old->node);
- free(old);
dprintf(DEBUG_thread, "\\%08x/ End thread\n", (u32)old);
+ free(old);
if (!have_threads())
dprintf(1, "All threads complete.\n");
}
@@ -316,11 +316,10 @@ run_thread(void (*func)(void*), void *data)
if (!thread)
goto fail;
+ dprintf(DEBUG_thread, "/%08x\\ Start thread\n", (u32)thread);
thread->stackpos = (void*)thread + THREADSTACKSIZE;
struct thread_info *cur = getCurThread();
hlist_add_after(&thread->node, &cur->node);
-
- dprintf(DEBUG_thread, "/%08x\\ Start thread\n", (u32)thread);
asm volatile(
// Start thread
" pushl $1f\n" // store return pc
@@ -330,15 +329,16 @@ run_thread(void (*func)(void*), void *data)
" calll *%%ecx\n" // Call func
// End thread
- " movl 4(%%ebx), %%ecx\n" // %ecx = thread->node.next
- " movl -4(%%ecx), %%esp\n" // %esp = next->stackpos
- " movl %%ebx, %%eax\n"
+ " movl %%ebx, %%eax\n" // %eax = thread
+ " movl 4(%%ebx), %%ebx\n" // %ebx = thread->node.next
+ " movl (%5), %%esp\n" // %esp = MainThread.stackpos
" calll %4\n" // call __end_thread(thread)
+ " movl -4(%%ebx), %%esp\n" // %esp = next->stackpos
" popl %%ebp\n" // restore %ebp
" retl\n" // restore pc
"1:\n"
: "+a"(data), "+c"(func), "+b"(thread), "+d"(cur)
- : "m"(*(u8*)__end_thread)
+ : "m"(*(u8*)__end_thread), "m"(MainThread)
: "esi", "edi", "cc", "memory");
return;
--
1.8.3.1
by Kevin O'Connor
Now that the op->count field is cleared in a global location on simple
errors, remove various local clears done in individual drivers.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/block.c | 1 -
src/cdrom.c | 1 -
src/hw/ahci.c | 1 -
src/hw/ata.c | 2 --
src/hw/blockcmd.c | 1 -
src/hw/floppy.c | 44 ++++++++++++++------------------------------
src/hw/ramdisk.c | 1 -
src/hw/usb-msc.c | 1 -
src/hw/virtio-blk.c | 1 -
9 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/src/block.c b/src/block.c
index 4fbf058..ac2a830 100644
--- a/src/block.c
+++ b/src/block.c
@@ -328,7 +328,6 @@ process_scsi_op(struct disk_op_s *op)
case CMD_SEEK:
return DISK_RET_SUCCESS;
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/cdrom.c b/src/cdrom.c
index 811bef5..ff419c0 100644
--- a/src/cdrom.c
+++ b/src/cdrom.c
@@ -104,7 +104,6 @@ process_cdemu_op(struct disk_op_s *op)
case CMD_ISREADY:
return DISK_RET_SUCCESS;
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/hw/ahci.c b/src/hw/ahci.c
index 687cc7d..ff5d5f9 100644
--- a/src/hw/ahci.c
+++ b/src/hw/ahci.c
@@ -314,7 +314,6 @@ process_ahci_op(struct disk_op_s *op)
return DISK_RET_SUCCESS;
default:
dprintf(1, "AHCI: unknown disk command %d\n", op->command);
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/hw/ata.c b/src/hw/ata.c
index de2a919..d805706 100644
--- a/src/hw/ata.c
+++ b/src/hw/ata.c
@@ -452,7 +452,6 @@ ata_dma_transfer(struct disk_op_s *op)
dprintf(6, "IDE DMA error (dma=%x ide=%x/%x/%x)\n", status, idestatus
, inb(iobase2 + ATA_CB_ASTAT), inb(iobase1 + ATA_CB_ERR));
- op->count = 0;
return -1;
}
@@ -575,7 +574,6 @@ process_ata_op(struct disk_op_s *op)
case CMD_SEEK:
return DISK_RET_SUCCESS;
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/hw/blockcmd.c b/src/hw/blockcmd.c
index 96950f2..97c6675 100644
--- a/src/hw/blockcmd.c
+++ b/src/hw/blockcmd.c
@@ -49,7 +49,6 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize)
if (!MODESEGMENT)
return ahci_cmd_data(op, cdbcmd, blocksize);
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/hw/floppy.c b/src/hw/floppy.c
index b848203..f4d7c01 100644
--- a/src/hw/floppy.c
+++ b/src/hw/floppy.c
@@ -538,9 +538,9 @@ static int
floppy_read(struct disk_op_s *op)
{
struct chs_s chs = lba2chs(op);
- int res = floppy_prep(op->drive_gf, chs.cylinder);
- if (res)
- goto fail;
+ int ret = floppy_prep(op->drive_gf, chs.cylinder);
+ if (ret)
+ return ret;
// send read-normal-data command to controller
u8 floppyid = GET_GLOBALFLAT(op->drive_gf->cntl_id);
@@ -553,13 +553,7 @@ floppy_read(struct disk_op_s *op)
param[5] = chs.sector + op->count - 1; // last sector to read on track
param[6] = FLOPPY_GAPLEN;
param[7] = FLOPPY_DATALEN;
- res = floppy_dma_cmd(op, op->count * DISK_SECTOR_SIZE, FC_READ, param);
- if (res)
- goto fail;
- return DISK_RET_SUCCESS;
-fail:
- op->count = 0; // no sectors read
- return res;
+ return floppy_dma_cmd(op, op->count * DISK_SECTOR_SIZE, FC_READ, param);
}
// Write Diskette Sectors
@@ -567,9 +561,9 @@ static int
floppy_write(struct disk_op_s *op)
{
struct chs_s chs = lba2chs(op);
- int res = floppy_prep(op->drive_gf, chs.cylinder);
- if (res)
- goto fail;
+ int ret = floppy_prep(op->drive_gf, chs.cylinder);
+ if (ret)
+ return ret;
// send write-normal-data command to controller
u8 floppyid = GET_GLOBALFLAT(op->drive_gf->cntl_id);
@@ -582,13 +576,7 @@ floppy_write(struct disk_op_s *op)
param[5] = chs.sector + op->count - 1; // last sector to write on track
param[6] = FLOPPY_GAPLEN;
param[7] = FLOPPY_DATALEN;
- res = floppy_dma_cmd(op, op->count * DISK_SECTOR_SIZE, FC_WRITE, param);
- if (res)
- goto fail;
- return DISK_RET_SUCCESS;
-fail:
- op->count = 0; // no sectors read
- return res;
+ return floppy_dma_cmd(op, op->count * DISK_SECTOR_SIZE, FC_WRITE, param);
}
// Verify Diskette Sectors
@@ -596,15 +584,12 @@ static int
floppy_verify(struct disk_op_s *op)
{
struct chs_s chs = lba2chs(op);
- int res = floppy_prep(op->drive_gf, chs.cylinder);
- if (res)
- goto fail;
+ int ret = floppy_prep(op->drive_gf, chs.cylinder);
+ if (ret)
+ return ret;
// This command isn't implemented - just return success.
return DISK_RET_SUCCESS;
-fail:
- op->count = 0; // no sectors read
- return res;
}
// format diskette track
@@ -612,9 +597,9 @@ static int
floppy_format(struct disk_op_s *op)
{
struct chs_s chs = lba2chs(op);
- int res = floppy_prep(op->drive_gf, chs.cylinder);
- if (res)
- return res;
+ int ret = floppy_prep(op->drive_gf, chs.cylinder);
+ if (ret)
+ return ret;
// send format-track command to controller
u8 floppyid = GET_GLOBALFLAT(op->drive_gf->cntl_id);
@@ -645,7 +630,6 @@ process_floppy_op(struct disk_op_s *op)
case CMD_FORMAT:
return floppy_format(op);
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/hw/ramdisk.c b/src/hw/ramdisk.c
index 81aed50..1177bc0 100644
--- a/src/hw/ramdisk.c
+++ b/src/hw/ramdisk.c
@@ -106,7 +106,6 @@ process_ramdisk_op(struct disk_op_s *op)
case CMD_RESET:
return DISK_RET_SUCCESS;
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
diff --git a/src/hw/usb-msc.c b/src/hw/usb-msc.c
index 7e2e440..2cf9725 100644
--- a/src/hw/usb-msc.c
+++ b/src/hw/usb-msc.c
@@ -117,7 +117,6 @@ usb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize)
fail:
// XXX - reset connection
dprintf(1, "USB transmission failed\n");
- op->count = 0;
return DISK_RET_EBADTRACK;
}
diff --git a/src/hw/virtio-blk.c b/src/hw/virtio-blk.c
index 0290d67..7b22bf5 100644
--- a/src/hw/virtio-blk.c
+++ b/src/hw/virtio-blk.c
@@ -94,7 +94,6 @@ process_virtio_blk_op(struct disk_op_s *op)
case CMD_SEEK:
return DISK_RET_SUCCESS;
default:
- op->count = 0;
return DISK_RET_EPARAM;
}
}
--
1.8.3.1
by Kevin O'Connor
The total number of blocks transferred is part of the return status of
the BIOS API. This is normally the total number of blocks requested.
However, in an error it is possible for this count to be less. Add a
global check to ensure that on an error event the block count is
updated - if it hasn't been updated, assume that no blocks have been
transferred successfully (the common case).
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/block.c | 40 +++++++++++++++++++++++++++-------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/src/block.c b/src/block.c
index 7493a5d..4fbf058 100644
--- a/src/block.c
+++ b/src/block.c
@@ -350,28 +350,37 @@ int
process_op(struct disk_op_s *op)
{
ASSERT16();
+ int ret, origcount = op->count;
u8 type = GET_GLOBALFLAT(op->drive_gf->type);
switch (type) {
case DTYPE_FLOPPY:
- return process_floppy_op(op);
+ ret = process_floppy_op(op);
+ break;
case DTYPE_ATA:
- return process_ata_op(op);
+ ret = process_ata_op(op);
+ break;
case DTYPE_RAMDISK:
- return process_ramdisk_op(op);
+ ret = process_ramdisk_op(op);
+ break;
case DTYPE_CDEMU:
- return process_cdemu_op(op);
+ ret = process_cdemu_op(op);
+ break;
case DTYPE_VIRTIO_BLK:
- return process_virtio_blk_op(op);
+ ret = process_virtio_blk_op(op);
+ break;
case DTYPE_AHCI: ;
extern void _cfunc32flat_process_ahci_op(void);
- return call32(_cfunc32flat_process_ahci_op
- , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM);
+ ret = call32(_cfunc32flat_process_ahci_op
+ , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM);
+ break;
case DTYPE_ATA_ATAPI:
- return process_atapi_op(op);
+ ret = process_atapi_op(op);
+ break;
case DTYPE_AHCI_ATAPI: ;
extern void _cfunc32flat_process_atapi_op(void);
- return call32(_cfunc32flat_process_atapi_op
- , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM);
+ ret = call32(_cfunc32flat_process_atapi_op
+ , (u32)MAKE_FLATPTR(GET_SEG(SS), op), DISK_RET_EPARAM);
+ break;
case DTYPE_USB:
case DTYPE_UAS:
case DTYPE_VIRTIO_SCSI:
@@ -379,11 +388,16 @@ process_op(struct disk_op_s *op)
case DTYPE_ESP_SCSI:
case DTYPE_MEGASAS:
case DTYPE_PVSCSI:
- return process_scsi_op(op);
+ ret = process_scsi_op(op);
+ break;
default:
- op->count = 0;
- return DISK_RET_EPARAM;
+ ret = DISK_RET_EPARAM;
+ break;
}
+ if (ret && op->count == origcount)
+ // If the count hasn't changed on error, assume no data transferred.
+ op->count = 0;
+ return ret;
}
// Execute a "disk_op_s" request - this runs on the extra stack.
--
1.8.3.1
by Kevin O'Connor
The PMM handle argument will almost always be 0xffffffff. Use
separate code for the few rare cases where it may not be the default
value. Gcc produces better code if _malloc() only requires three
parameters.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
src/fw/csm.c | 4 ++--
src/fw/romfile_loader.c | 2 +-
src/malloc.c | 23 ++++++++++++++++++-----
src/malloc.h | 23 ++++++++++++-----------
src/pmm.c | 19 ++++++++++++-------
5 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/src/fw/csm.c b/src/fw/csm.c
index dfb0d12..a44ed26 100644
--- a/src/fw/csm.c
+++ b/src/fw/csm.c
@@ -257,9 +257,9 @@ handle_csm_0006(struct bregs *regs)
size, align, region);
if (region & 2)
- chunk = _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, align);
+ chunk = _malloc(&ZoneLow, size, align);
if (!chunk && (region & 1))
- chunk = _malloc(&ZoneFSeg, MALLOC_DEFAULT_HANDLE, size, align);
+ chunk = _malloc(&ZoneFSeg, size, align);
dprintf(3, "Legacy16GetTableAddress size %x align %x region %d yields %p\n",
size, align, region, chunk);
diff --git a/src/fw/romfile_loader.c b/src/fw/romfile_loader.c
index 325a0fa..f4b17ff 100644
--- a/src/fw/romfile_loader.c
+++ b/src/fw/romfile_loader.c
@@ -57,7 +57,7 @@ static void romfile_loader_allocate(struct romfile_loader_entry_s *entry,
file->file = romfile_find(entry->alloc_file);
if (!file->file || !file->file->size)
return;
- data = _malloc(zone, MALLOC_DEFAULT_HANDLE, file->file->size, alloc_align);
+ data = _malloc(zone, file->file->size, alloc_align);
if (!data) {
warn_noalloc();
return;
diff --git a/src/malloc.c b/src/malloc.c
index 6ef418a..c4cb171 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -225,7 +225,7 @@ zonelow_expand(u32 size, u32 align, struct allocinfo_s *fill)
// Allocate memory from the given zone and track it as a PMM allocation
void * __malloc
-_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align)
+_malloc(struct zone_s *zone, u32 size, u32 align)
{
ASSERT32FLAT();
if (!size)
@@ -240,6 +240,7 @@ _malloc(struct zone_s *zone, u32 handle, u32 size, u32 align)
if (!detail)
return NULL;
}
+ detail->handle = MALLOC_DEFAULT_HANDLE;
// Find and reserve space for main allocation
void *data = allocSpace(zone, size, align, &detail->datainfo);
@@ -250,9 +251,8 @@ _malloc(struct zone_s *zone, u32 handle, u32 size, u32 align)
return NULL;
}
- dprintf(8, "_malloc zone=%p handle=%x size=%d align=%x ret=%p (detail=%p)\n"
- , zone, handle, size, align, data, detail);
- detail->handle = handle;
+ dprintf(8, "_malloc zone=%p size=%d align=%x ret=%p (detail=%p)\n"
+ , zone, size, align, data, detail);
return data;
}
@@ -296,9 +296,22 @@ malloc_getspace(struct zone_s *zone)
return maxspace - reserve;
}
+// Set a handle associated with an allocation.
+void
+malloc_sethandle(void *data, u32 handle)
+{
+ ASSERT32FLAT();
+ struct allocinfo_s *info = findAlloc(data);
+ if (!info || data == (void*)info || data == info->dataend)
+ return;
+ struct allocdetail_s *detail = container_of(
+ info, struct allocdetail_s, datainfo);
+ detail->handle = handle;
+}
+
// Find the data block allocated with _malloc with a given handle.
void *
-malloc_find(u32 handle)
+malloc_findhandle(u32 handle)
{
int i;
for (i=0; i<ARRAY_SIZE(Zones); i++) {
diff --git a/src/malloc.h b/src/malloc.h
index af8a21d..2bcb5bf 100644
--- a/src/malloc.h
+++ b/src/malloc.h
@@ -15,29 +15,30 @@ void malloc_preinit(void);
extern u32 LegacyRamSize;
void malloc_init(void);
void malloc_prepboot(void);
-void *_malloc(struct zone_s *zone, u32 handle, u32 size, u32 align);
+void *_malloc(struct zone_s *zone, u32 size, u32 align);
int _free(void *data);
u32 malloc_getspace(struct zone_s *zone);
-void *malloc_find(u32 handle);
+void malloc_sethandle(void *data, u32 handle);
+void *malloc_findhandle(u32 handle);
#define MALLOC_DEFAULT_HANDLE 0xFFFFFFFF
// Minimum alignment of malloc'd memory
#define MALLOC_MIN_ALIGN 16
// Helper functions for memory allocation.
static inline void *malloc_low(u32 size) {
- return _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+ return _malloc(&ZoneLow, size, MALLOC_MIN_ALIGN);
}
static inline void *malloc_high(u32 size) {
- return _malloc(&ZoneHigh, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+ return _malloc(&ZoneHigh, size, MALLOC_MIN_ALIGN);
}
static inline void *malloc_fseg(u32 size) {
- return _malloc(&ZoneFSeg, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+ return _malloc(&ZoneFSeg, size, MALLOC_MIN_ALIGN);
}
static inline void *malloc_tmplow(u32 size) {
- return _malloc(&ZoneTmpLow, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+ return _malloc(&ZoneTmpLow, size, MALLOC_MIN_ALIGN);
}
static inline void *malloc_tmphigh(u32 size) {
- return _malloc(&ZoneTmpHigh, MALLOC_DEFAULT_HANDLE, size, MALLOC_MIN_ALIGN);
+ return _malloc(&ZoneTmpHigh, size, MALLOC_MIN_ALIGN);
}
static inline void *malloc_tmp(u32 size) {
void *ret = malloc_tmphigh(size);
@@ -46,16 +47,16 @@ static inline void *malloc_tmp(u32 size) {
return malloc_tmplow(size);
}
static inline void *memalign_low(u32 align, u32 size) {
- return _malloc(&ZoneLow, MALLOC_DEFAULT_HANDLE, size, align);
+ return _malloc(&ZoneLow, size, align);
}
static inline void *memalign_high(u32 align, u32 size) {
- return _malloc(&ZoneHigh, MALLOC_DEFAULT_HANDLE, size, align);
+ return _malloc(&ZoneHigh, size, align);
}
static inline void *memalign_tmplow(u32 align, u32 size) {
- return _malloc(&ZoneTmpLow, MALLOC_DEFAULT_HANDLE, size, align);
+ return _malloc(&ZoneTmpLow, size, align);
}
static inline void *memalign_tmphigh(u32 align, u32 size) {
- return _malloc(&ZoneTmpHigh, MALLOC_DEFAULT_HANDLE, size, align);
+ return _malloc(&ZoneTmpHigh, size, align);
}
static inline void *memalign_tmp(u32 align, u32 size) {
void *ret = memalign_tmphigh(align, size);
diff --git a/src/pmm.c b/src/pmm.c
index be03bdb..304faab 100644
--- a/src/pmm.c
+++ b/src/pmm.c
@@ -65,21 +65,26 @@ handle_pmm00(u16 *args)
if (align < MALLOC_MIN_ALIGN)
align = MALLOC_MIN_ALIGN;
}
+ void *data;
switch (flags & 3) {
default:
case 0:
return 0;
case 1:
- return (u32)_malloc(lowzone, handle, size, align);
+ data = _malloc(lowzone, size, align);
+ break;
case 2:
- return (u32)_malloc(highzone, handle, size, align);
+ data = _malloc(highzone, size, align);
+ break;
case 3: {
- void *data = _malloc(lowzone, handle, size, align);
- if (data)
- return (u32)data;
- return (u32)_malloc(highzone, handle, size, align);
+ data = _malloc(lowzone, size, align);
+ if (!data)
+ data = _malloc(highzone, size, align);
}
}
+ if (data && handle != MALLOC_DEFAULT_HANDLE)
+ malloc_sethandle(data, handle);
+ return (u32)data;
}
// PMM - find
@@ -90,7 +95,7 @@ handle_pmm01(u16 *args)
dprintf(3, "pmm01: handle=%x\n", handle);
if (handle == MALLOC_DEFAULT_HANDLE)
return 0;
- return (u32)malloc_find(handle);
+ return (u32)malloc_findhandle(handle);
}
// PMM - deallocate
--
1.8.3.1
by Gelip
I make more test with floppy BOOT-PROM3 and floppy image over PXE server and grub4dos from USB stick. With vendor bios floppy or floppy image boot OK from all: FDD, image over PXE and image over grub4dos from USB stick.
With coreboot + SeaBIOS is very interesting situation: boot OK only image over PXE server with gPXE
Not boot from real FDD or image from USB with grub4dos. While boot from USB have this info:
=========================================================
Autodetect number-of-heads failed. Use default value 2
Autodetect sectors-per-track failed. Use default value 18
=========================================================
and after some seconds, menu appears and next is same problem like from real FDD
BOOT-PROM3 floppy image is non standard and while try open it e.g. in WinHex have warning http://savepic.net/4142258.htm that sectors count is less than in boot sector but why this image or floppy working only with vendor BIOS or from PXE server? Why not boot over grub4dos from USB and real FDD only from coreboot bios?
Link for BOOT-PROM3 floppy image: http://www49.zippyshare.com/v/75868779/file.html
Please test this image with PXE, grub4dos from USB and real floppy in QEMU.
by Gerd Hoffmann
Hi,
> XHCI init on dev 00:10.1: regs @ 0xf014a000, 4 ports, 32 slots
What hardware is this?
> |bf0fe000| xhci_control: enable slot: got slotid 1
Enable slot worked. Good.
Was a problem before, but possibly on other hardware (other reporter).
> |bf0fe000| xhci_cmd_address_device: slotid 1
> |bf0fe000| xhci_trb_queue: ring 0xbf11ed00 [nidx 2, len 0]
> init megasas
> |bf0fe000| xhci_process_events: ring 0xbf11ed00 [trb 0xbf11ed10, evt
> 0xbf11ee00, type 33, eidx 2, cc 1]
Address device works too.
> |bf0fe000| xhci_update_pipe: usbdev 0xbf102170, ring 0xbf11e500,
> slotid 1, epid 1
> |bf0fe000| config_usb: 0xbf11e620
> |bf0fe000| xhci_trb_queue: ring 0xbf11e500 [nidx 1, len 8]
> |bf0fe000| xhci_trb_queue: ring 0xbf11e500 [nidx 2, len 8]
> |bf0fe000| xhci_trb_queue: ring 0xbf11e500 [nidx 3, len 0]
> |bf0fe000| xhci_xfer_kick: ring 0xbf11e500, slotid 1, epid 1
> |bf0fe000| WARNING - Timeout at xhci_event_wait:404!
> |bf0fe000| xhci_control: control xfer failed (cc -1)
First control transfer times out. Hmm.
cheers,
Gerd
by Kevin O'Connor
Revision 5325e91e introduced a change to force the rebuild of the
.config file when the src/Kconfig (or vgasrc/Kconfig) file changes.
However, this was causing a complete rebuild of the user's .config
file which would throw away the user's current settings.
On a rebuild, use the kbuild olddefconfig rule instead of defconfig to
attempt to keep the user's current settings.
Signed-off-by: Kevin O'Connor <kevin(a)koconnor.net>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index cb15217..aba8a62 100644
--- a/Makefile
+++ b/Makefile
@@ -260,7 +260,7 @@ $(Q)$(MAKE) -C $(OUT) -f $(CURDIR)/scripts/kconfig/Makefile srctree=$(CURDIR) sr
endef
$(OUT)autoconf.h : $(KCONFIG_CONFIG) ; $(call do-kconfig, silentoldconfig)
-$(KCONFIG_CONFIG): src/Kconfig vgasrc/Kconfig ; $(call do-kconfig, defconfig)
+$(KCONFIG_CONFIG): src/Kconfig vgasrc/Kconfig ; $(call do-kconfig, olddefconfig)
%onfig: ; $(call do-kconfig, $@)
help: ; $(call do-kconfig, $@)
--
1.8.3.1
