admin/LithosAnanake
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stage K-5: xHCI Input Context allocated full size once per slot (FABRIC-3.10.8 §4.5)

Browse Source 
- New XHCI_INPUT_CTX_BYTES (control ctx + slot + 31 EP contexts).
  Address Device allocates the Input Context at that size once per slot;
  Configure Endpoint reuses it (bounds-checked). It allocated a fresh one
  on every attach and never freed the old.
- Probe (removed), identical on all three ISAs: after the standard
  sequence's attach/detach/re-attach, input-context allocations=2 (one
  per xHCI slot) against configure-endpoint=3.
- Standard sequence on amd64/aarch64/riscv64: hash, G, ledger unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Robert Allan James
2026-09-26 06:43:59 -04:00
co-authored by Claude Opus 5.5
parent 1166713cc9
commit bfa876a0e2
15 changed files with 54926 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/starkernel/usb/xhci.c
+14 -17
View File
@@ -484,9 +484,9 @@ int xhci_cmd_address_device(xhci_dev_t *dev, uint32_t slot_id,
* All three re-initialised fully below regardless of whether this is
* the first call for this slot. */
if (!ms->input_ctx) {
ms->input_ctx = kmalloc_aligned(
sizeof(xhci_input_ctrl_ctx32_t) + sizeof(xhci_slot_ctx32_t) +
sizeof(xhci_ep_ctx32_t), 64);
/* K-5: full size (XHCI_INPUT_CTX_BYTES), so Configure Endpoint can
* reuse it for every DCI instead of allocating its own. */
ms->input_ctx = kmalloc_aligned(XHCI_INPUT_CTX_BYTES, 64);
if (!ms->input_ctx) return -1;
}
/* FABRIC-3.9.8 (found at Stage O-C, 2026-09-25): the Output Device
@@ -622,22 +622,19 @@ int xhci_cmd_configure_endpoint(xhci_dev_t *dev, uint32_t slot_id)
* put it. */
if (max_dci >= XHCI_DEVICE_CTX_ENTRIES) return -1;
/* ms->input_ctx is reused from Address Device -- same allocation
* (96 bytes: Input Control Ctx + Slot Ctx + one EP Ctx) is too small
* to also hold two more EP Contexts. Configure Endpoint's Input
* Context must span every DCI up to max_dci (xHCI 1.2 spec section
* 6.2.5.1: "the Input Context data structure shall contain output
* context data structures... up to the value of the Context Entries
* field"), not just the ones actually being added -- unused slots
* between EP0 (DCI 1) and the bulk endpoints are left zeroed
* (Add/Drop flags for those DCIs are 0, so the controller ignores
* their content). Reallocated here rather than growing the existing
* 96-byte block in place. */
/* Configure Endpoint's Input Context must span every DCI up to
* max_dci (xHCI 1.2 spec section 6.2.5.1: "the Input Context data
* structure shall contain output context data structures... up to the
* value of the Context Entries field"), not just the ones actually
* being added -- unused slots between EP0 (DCI 1) and the bulk
* endpoints are left zeroed (Add/Drop flags for those DCIs are 0, so
* the controller ignores their content). FABRIC-3.10.8 K-5: reuses
* ms->input_ctx from Address Device, now allocated full size
* (XHCI_INPUT_CTX_BYTES); this used to allocate a new one here on
* every attach and never free the old. */
size_t ctx_count = 1 /* Slot */ + max_dci; /* DCI 1..max_dci, one xhci_ep_ctx32_t each */
size_t total = sizeof(xhci_input_ctrl_ctx32_t) + ctx_count * sizeof(xhci_ep_ctx32_t);
void *new_input_ctx = kmalloc_aligned(total, 64);
if (!new_input_ctx) return -1;
ms->input_ctx = new_input_ctx;
if (total > XHCI_INPUT_CTX_BYTES) return -1; /* max_dci < XHCI_DEVICE_CTX_ENTRIES above */
uint8_t *ictx = (uint8_t *)ms->input_ctx;
for (size_t i = 0; i < total; i++) ictx[i] = 0;