Skip to content

fix(XusbControllerDxe): use BaseMemoryLib functions #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgarver merged 1 commit into from
Jan 16, 2026
Merged

fix(XusbControllerDxe): use BaseMemoryLib functions #148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 28 additions & 32 deletions Silicon/NVIDIA/Drivers/XusbControllerDxe/XusbControllerDxe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include "XusbDevControllerPriv.h"
#include <Library/DmaLib.h>
#include "XusbDevControllerDesc.h"
#include <string.h>

#define XUSB_INTERRUPT_POLL_PERIOD 10000
#define NUM_TRB_EVENT_RING 32U
Expand Down Expand Up @@ -252,7 +251,7 @@ XudcQueueTrb (

/* If Control EP */
if (ep_index == EP0_IN) {
memcpy (
CopyMem (
(VOID *)p_xusb_dev_context->cntrl_epenqueue_ptr,
(VOID *)p_trb,
sizeof (NORMAL_TRB_STRUCT)
Expand All @@ -278,7 +277,7 @@ XudcQueueTrb (
}
/* Bulk Endpoint */
else if (ep_index == EP1_OUT) {
memcpy (
CopyMem (
(VOID *)p_xusb_dev_context->bulkout_epenqueue_ptr,
(VOID *)p_trb,
sizeof (NORMAL_TRB_STRUCT)
Expand All @@ -299,7 +298,7 @@ XudcQueueTrb (
}
/* Bulk Endpoint */
else if (ep_index == EP1_IN) {
memcpy (
CopyMem (
(VOID *)p_xusb_dev_context->bulkin_epenqueue_ptr,
(VOID *)p_trb,
sizeof (NORMAL_TRB_STRUCT)
Expand Down Expand Up @@ -372,7 +371,7 @@ XudcIssueStatusTrb (
return e;
}

memset ((VOID *)&strb, 0, sizeof (STATUS_TRB_STRUCT));
ZeroMem ((VOID *)&strb, sizeof (STATUS_TRB_STRUCT));
XudcCreateStatusTrb (&strb, direction);

/* Note EP0_IN is bi-directional. */
Expand Down Expand Up @@ -608,7 +607,7 @@ XudcGetDesc (
}

*tx_length = MIN (wlength, desc_length);
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
break;

case USB_DT_CONFIG:
Expand All @@ -631,7 +630,7 @@ XudcGetDesc (
desc[30] = 0;
}

memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
break;

case USB_DT_STRING:
Expand All @@ -641,27 +640,27 @@ XudcGetDesc (
case USB_MANF_ID:
DEBUG ((EFI_D_ERROR, "%a: Get desc. Manf ID\r\n", __FUNCTION__));
*tx_length = MIN (wlength, (UINT16)sizeof (s_usb_manufacturer_id));
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_manufacturer_id[0], *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_manufacturer_id[0], *tx_length);
break;

case USB_PROD_ID:
DEBUG ((EFI_D_ERROR, "%a: Get desc. Prod ID\r\n", __FUNCTION__));
desc = (UINT8 *)g_usbconfig->product.desc;
*tx_length = MIN (wlength, g_usbconfig->product.len);
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
break;

case USB_SERIAL_ID:
DEBUG ((EFI_D_ERROR, "%a: Get desc. Serial ID\r\n", __FUNCTION__));
desc = (UINT8 *)g_usbconfig->serialno.desc;
*tx_length = MIN (wlength, g_usbconfig->serialno.len);
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)desc, *tx_length);
break;

case USB_LANGUAGE_ID:
DEBUG ((EFI_D_ERROR, "%a: Get desc. Lang ID\r\n", __FUNCTION__));
*tx_length = MIN (wlength, (UINT16)sizeof (s_usb_language_id));
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_language_id[0], *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_language_id[0], *tx_length);
break;

default:
Expand All @@ -674,7 +673,7 @@ XudcGetDesc (
case USB_DT_DEVICE_QUALIFIER:
DEBUG ((EFI_D_ERROR, "%a: Get desc. Dev qualifier\r\n", __FUNCTION__));
*tx_length = MIN (wlength, (UINT16)sizeof (s_usb_device_qualifier));
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_device_qualifier[0], *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_device_qualifier[0], *tx_length);
break;

case USB_DT_OTHER_SPEED_CONFIG:
Expand All @@ -697,13 +696,13 @@ XudcGetDesc (
}

*tx_length = MIN (wlength, (UINT16)sizeof (s_other_speed_config_desc));
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_other_speed_config_desc[0], *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_other_speed_config_desc[0], *tx_length);
break;

case USB_DT_BOS:
DEBUG ((EFI_D_ERROR, "%a: Get BOS\r\n", __FUNCTION__));
*tx_length = MIN (wlength, (UINT16)sizeof (s_bos_descriptor));
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_bos_descriptor[0], *tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_bos_descriptor[0], *tx_length);
break;

default:
Expand Down Expand Up @@ -742,7 +741,7 @@ XudcEpGetStatus (
}

*tx_length = (UINT16)sizeof (endpoint_status);
memcpy ((VOID *)ptr_setup_buffer, (VOID *)&endpoint_status[0], sizeof (endpoint_status));
CopyMem ((VOID *)ptr_setup_buffer, (VOID *)&endpoint_status[0], sizeof (endpoint_status));
}

static VOID
Expand Down Expand Up @@ -794,7 +793,7 @@ XudcIssueDataTrb (
return EFI_SUCCESS;
}

memset ((VOID *)&dtrb, 0, sizeof (DATA_TRB_STRUCT));
ZeroMem ((VOID *)&dtrb, sizeof (DATA_TRB_STRUCT));
XudcCreateDataTrb (&dtrb, buffer, bytes, direction);

/* Note EP0_IN is bi-directional. */
Expand Down Expand Up @@ -1009,13 +1008,13 @@ XudcHandleSetupPkt (
case GET_STATUS:
DEBUG ((EFI_D_ERROR, "%a: Get status\r\n", __FUNCTION__));
tx_length = MIN (wlength, (UINT16)sizeof (s_usb_dev_status));
memcpy ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_dev_status[0], tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, (VOID *)&s_usb_dev_status[0], tx_length);
break;

case GET_CONFIGURATION:
DEBUG ((EFI_D_ERROR, "%a: Get Config\r\n", __FUNCTION__));
tx_length = MIN (wlength, (UINT16)sizeof (p_xusb_dev_context->config_num));
memcpy ((VOID *)mPrivate->pSetupBuffer, &p_xusb_dev_context->config_num, tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, &p_xusb_dev_context->config_num, tx_length);
break;

case GET_DESCRIPTOR:
Expand Down Expand Up @@ -1054,15 +1053,15 @@ XudcHandleSetupPkt (
UINT8 interface_status[2] = { 0, 0 };

tx_length = MIN (wlength, (UINT16)sizeof (interface_status));
memcpy ((VOID *)mPrivate->pSetupBuffer, &interface_status[0], tx_length);
CopyMem ((VOID *)mPrivate->pSetupBuffer, &interface_status[0], tx_length);
break;

case GET_INTERFACE:
/* Just sending 0s. */
DEBUG ((EFI_D_ERROR, "%a: Get Interface D2H_I/F\r\n", __FUNCTION__));
tx_length = MIN (wlength, (UINT16)sizeof (p_xusb_dev_context->interface_num));

memcpy (
CopyMem (
(VOID *)mPrivate->pSetupBuffer,
&p_xusb_dev_context->interface_num,
tx_length
Expand Down Expand Up @@ -1571,7 +1570,7 @@ XudcHandleTxferEvent (
mPrivate->DataReceivedCallback (ReportReceived, mPrivate->DataPacket);

/* Prepare next Rx packet */
memset (mPrivate->DataPacket, 0, MAX_TFR_LENGTH);
ZeroMem (mPrivate->DataPacket, MAX_TFR_LENGTH);

/* check the data size to put the next TRB */
if (mPrivate->CurrentRxLength == mPrivate->TotalRxLength) {
Expand Down Expand Up @@ -1687,7 +1686,7 @@ XudcPollForEvent (
#endif
/* Check if we are waiting for setup packet */
p_setup_event_trb = (SETUP_EVENT_TRB_STRUCT *)p_event_trb;
memcpy (
CopyMem (
(VOID *)&mPrivate->usb_setup_data[0],
(VOID *)&p_setup_event_trb->data[0],
8
Expand Down Expand Up @@ -1900,21 +1899,18 @@ XudcInitTransferRing (

/* zero out tx ring */
if ((ep_index == EP0_IN) || (ep_index == EP0_OUT)) {
memset (
ZeroMem (
(VOID *)mPrivate->pTxRingEP0,
0,
NUM_TRB_TRANSFER_RING * sizeof (DATA_TRB_STRUCT)
);
} else if (ep_index == EP1_IN) {
memset (
ZeroMem (
(VOID *)mPrivate->pTxRingEP1In,
0,
NUM_TRB_TRANSFER_RING * sizeof (DATA_TRB_STRUCT)
);
} else if (ep_index == EP1_OUT) {
memset (
ZeroMem (
(VOID *)mPrivate->pTxRingEP1Out,
0,
NUM_TRB_TRANSFER_RING * sizeof (DATA_TRB_STRUCT)
);
} else {
Expand Down Expand Up @@ -2034,7 +2030,7 @@ XudcInitEpContext (

/* Control Endpoint 0. */
if (ep_index == EP0_IN) {
memset ((VOID *)ep_info, 0, sizeof (EP_CONTEXT));
ZeroMem ((VOID *)ep_info, sizeof (EP_CONTEXT));
/* Set Endpoint State to running. */
ep_info->ep_state = EP_RUNNING;
/* Set error count to 3 */
Expand Down Expand Up @@ -2080,7 +2076,7 @@ XudcInitEpContext (
p_link_trb->trb_type = LINK_TRB;
} else {
if (ep_index == EP1_OUT) {
memset ((VOID *)ep_info, 0, sizeof (EP_CONTEXT));
ZeroMem ((VOID *)ep_info, sizeof (EP_CONTEXT));
ep_info->ep_state = EP_RUNNING;
/* Set error count to 3 */
ep_info->cerr = 3;
Expand Down Expand Up @@ -2134,7 +2130,7 @@ XudcInitEpContext (
p_link_trb->trb_type = LINK_TRB;
} else {
/* EP IN */
memset ((VOID *)ep_info, 0, sizeof (EP_CONTEXT));
ZeroMem ((VOID *)ep_info, sizeof (EP_CONTEXT));
ep_info->ep_state = EP_RUNNING;
/* Set error count to 3 */
ep_info->cerr = 3;
Expand Down Expand Up @@ -2615,7 +2611,7 @@ XudcIssueNormalTrb (
UINTN BufferSize = bytes;
VOID *Mapping;

memset ((void *)&normal_trb, 0, sizeof (NORMAL_TRB_STRUCT));
ZeroMem ((void *)&normal_trb, sizeof (NORMAL_TRB_STRUCT));
e = DmaMap (
MapOperationBusMasterCommonBuffer,
(VOID *)buffer,
Expand Down