[OpenBIOS] OpenBIOS documentation
Programmingkid
programmingkidx at gmail.com
Mon Oct 17 04:59:21 CEST 2016
Here is the better version of the patch I sent you earlier. The first patch will make OpenBIOS compile without warnings or errors, but doesn't make USB work. This patch is an attempt to make USB work. It looks like changes were made to the original code to make it compile in OpenBIOS. These changes may have disabled the OHCI code.
https://chromium.googlesource.com/chromiumos/third_party/coreboot/+/ecec80e062f7efe32a9a17479dcf8cb678a4a98b/payloads/libpayload/drivers/usb/ohci.c
This page has very similar code to usbohci.c has. Using this page I filled in what I thought were the missing function calls. My changes no longer allow OpenBIOS to boot, so consider this a work in progress for now.
---
drivers/usbohci.c | 48 ++++++++++++++++++++++++------------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/usbohci.c b/drivers/usbohci.c
index 774164b..222ab37 100644
--- a/drivers/usbohci.c
+++ b/drivers/usbohci.c
@@ -227,14 +227,14 @@ ohci_init (void *bar)
OHCI_INST (controller)->opreg->HcCommandStatus = __cpu_to_le32(HostControllerReset);
udelay (10); /* at most 10us for reset to complete. State must be set to Operational within 2ms (5.1.1.4) */
OHCI_INST (controller)->opreg->HcFmInterval = interval;
- ofmem_posix_memalign((void **)&(OHCI_INST (controller)->hcca), 256, 256);
+ ofmem_posix_memalign((void *)(OHCI_INST (controller)->hcca), 256, 256);
memset((void*)OHCI_INST (controller)->hcca, 0, 256);
usb_debug("HCCA addr %p\n", OHCI_INST(controller)->hcca);
/* Initialize interrupt table. */
u32 *const intr_table = OHCI_INST(controller)->hcca->HccaInterruptTable;
- ed_t *const periodic_ed;
- ofmem_posix_memalign((void **)&periodic_ed, sizeof(ed_t), sizeof(ed_t));
+ ed_t *const periodic_ed = (ed_t *)malloc(sizeof(ed_t));
+ ofmem_posix_memalign((void *)periodic_ed, sizeof(ed_t), sizeof(ed_t));
memset((void *)periodic_ed, 0, sizeof(*periodic_ed));
for (i = 0; i < 32; ++i)
intr_table[i] = __cpu_to_le32(virt_to_phys(periodic_ed));
@@ -378,8 +378,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen
int pages = (dalen==0)?0:(last_page - first_page + 1);
/* First TD. */
- td_t *const first_td;
- ofmem_posix_memalign((void **)&first_td, sizeof(td_t), sizeof(td_t));
+ td_t *const first_td = (td_t *)malloc(sizeof(td_t));
+ ofmem_posix_memalign((void *)first_td, sizeof(td_t), sizeof(td_t));
memset((void *)first_td, 0, sizeof(*first_td));
cur = first_td;
@@ -393,8 +393,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen
while (pages > 0) {
/* One more TD. */
- td_t *const next;
- ofmem_posix_memalign((void **)&next, sizeof(td_t), sizeof(td_t));
+ td_t *const next = (td_t *)malloc(sizeof(td_t));
+ ofmem_posix_memalign((void *)next, sizeof(td_t), sizeof(td_t));
memset((void *)next, 0, sizeof(*next));
/* Linked to the previous. */
cur->next_td = __cpu_to_le32(virt_to_phys(next));
@@ -428,8 +428,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen
}
/* One more TD. */
- td_t *const next_td;
- ofmem_posix_memalign((void **)&next_td, sizeof(td_t), sizeof(td_t));
+ td_t *const next_td = (td_t *)malloc(sizeof(td_t));
+ ofmem_posix_memalign((void *)next_td, sizeof(td_t), sizeof(td_t));
memset((void *)next_td, 0, sizeof(*next_td));
/* Linked to the previous. */
cur->next_td = __cpu_to_le32(virt_to_phys(next_td));
@@ -444,15 +444,15 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen
cur->buffer_end = 0;
/* Final dummy TD. */
- td_t *const final_td;
- ofmem_posix_memalign((void **)&final_td, sizeof(td_t), sizeof(td_t));
+ td_t *const final_td = (td_t *)malloc(sizeof(td_t));
+ ofmem_posix_memalign((void *)final_td, sizeof(td_t), sizeof(td_t));
memset((void *)final_td, 0, sizeof(*final_td));
/* Linked to the previous. */
cur->next_td = __cpu_to_le32(virt_to_phys(final_td));
/* Data structures */
- ed_t *head;
- ofmem_posix_memalign((void **)&head, sizeof(ed_t), sizeof(ed_t));
+ ed_t *head = (ed_t *)malloc(sizeof(ed_t));
+ ofmem_posix_memalign((void *)head, sizeof(ed_t), sizeof(ed_t));
memset((void*)head, 0, sizeof(*head));
head->config = __cpu_to_le32((dev->address << ED_FUNC_SHIFT) |
(0 << ED_EP_SHIFT) |
@@ -507,8 +507,8 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize)
}
/* First TD. */
- td_t *const first_td;
- ofmem_posix_memalign((void **)&first_td, sizeof(td_t), sizeof(td_t));
+ td_t *const first_td = (td_t *)malloc(sizeof(td_t));
+ ofmem_posix_memalign((void *)first_td, sizeof(td_t), sizeof(td_t));
memset((void *)first_td, 0, sizeof(*first_td));
cur = next = first_td;
@@ -546,7 +546,7 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize)
data += second_page_size;
}
/* One more TD. */
- ofmem_posix_memalign((void **)&next, sizeof(td_t), sizeof(td_t));
+ ofmem_posix_memalign((void *)next, sizeof(td_t), sizeof(td_t));
memset((void *)next, 0, sizeof(*next));
/* Linked to the previous. */
cur->next_td = __cpu_to_le32(virt_to_phys(next));
@@ -558,8 +558,8 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize)
cur = next;
/* Data structures */
- ed_t *head;
- ofmem_posix_memalign((void **)&head, sizeof(ed_t), sizeof(ed_t));
+ ed_t *head = (ed_t *)malloc(sizeof(ed_t));
+ ofmem_posix_memalign((void *)head, sizeof(ed_t), sizeof(ed_t));
memset((void*)head, 0, sizeof(*head));
head->config = __cpu_to_le32((ep->dev->address << ED_FUNC_SHIFT) |
((ep->endpoint & 0xf) << ED_EP_SHIFT) |
@@ -652,8 +652,8 @@ ohci_create_intr_queue(endpoint_t *const ep, const int reqsize,
if (reqsize > 4096)
return NULL;
- intr_queue_t *const intrq;
- ofmem_posix_memalign((void **)&intrq, sizeof(intrq->ed), sizeof(*intrq));
+ intr_queue_t *const intrq = (intr_queue_t *)malloc(sizeof(*intrq));
+ ofmem_posix_memalign((void *)intrq, sizeof(intrq->ed), sizeof(*intrq));
memset(intrq, 0, sizeof(*intrq));
intrq->data = (u8 *)malloc(reqcount * reqsize);
intrq->reqsize = reqsize;
@@ -662,8 +662,8 @@ ohci_create_intr_queue(endpoint_t *const ep, const int reqsize,
/* Create #reqcount TDs. */
u8 *cur_data = intrq->data;
for (i = 0; i < reqcount; ++i) {
- intrq_td_t *const td;
- ofmem_posix_memalign((void **)&td, sizeof(td->td), sizeof(*td));
+ intrq_td_t *const td = (intrq_td_t *)malloc(sizeof(*td));
+ ofmem_posix_memalign((void *)td, sizeof(td->td), sizeof(*td));
++intrq->remaining_tds;
ohci_fill_intrq_td(td, intrq, cur_data);
cur_data += reqsize;
@@ -675,8 +675,8 @@ ohci_create_intr_queue(endpoint_t *const ep, const int reqsize,
}
/* Create last, dummy TD. */
- intrq_td_t *dummy_td;
- ofmem_posix_memalign((void **)&dummy_td, sizeof(dummy_td->td), sizeof(*dummy_td));
+ intrq_td_t *dummy_td = malloc(sizeof(*dummy_td));
+ ofmem_posix_memalign((void *)dummy_td, sizeof(dummy_td->td), sizeof(*dummy_td));
memset(dummy_td, 0, sizeof(*dummy_td));
dummy_td->intrq = intrq;
if (last_td)
--
2.7.2
More information about the OpenBIOS
mailing list