From: "Laszlo Ersek" <lersek@redhat.com>
To: devel@edk2.groups.io, rsingh@ventanamicro.com
Cc: Ray Ni <ray.ni@intel.com>
Subject: Re: [edk2-devel] [PATCH v3 2/2] MdeModulePkg/Bus/Pci/XhciDxe: Fix MISSING_BREAK Coverity issues
Date: Mon, 13 Nov 2023 18:00:17 +0100 [thread overview]
Message-ID: <57ee760a-ea90-b566-55ac-ea5162cb1d2c@redhat.com> (raw)
In-Reply-To: <20231110052231.447797-3-rsingh@ventanamicro.com>
On 11/10/23 06:22, Ranbir Singh wrote:
> From: Ranbir Singh <Ranbir.Singh3@Dell.com>
>
> The functions
> XhcInitializeEndpointContext and XhcInitializeEndpointContext64 has
> a switch-case code in which the case USB_ENDPOINT_CONTROL: falls
> through to default:
>
> While this may be intentional, it may not be evident to any general code
> reader/developer or static analyis tool why there is no break in between.
>
> Merge the USB_ENDPOINT_CONTROL and default using conditional debug print.
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4221
>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Ranbir Singh <rsingh@ventanamicro.com>
> ---
> MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 33 +++++++++++---------
> 1 file changed, 19 insertions(+), 14 deletions(-)
>
> diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> index 05528a478baf..00b3a13a95bb 100644
> --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c
> @@ -2825,6 +2825,7 @@ XhcInitializeEndpointContext (
> UINTN NumEp;
> UINTN EpIndex;
> UINT8 EpAddr;
> + UINT8 EpType;
> UINT8 Direction;
> UINT8 Dci;
> UINT8 MaxDci;
> @@ -2871,7 +2872,8 @@ XhcInitializeEndpointContext (
> InputContext->EP[Dci-1].MaxBurstSize = 0x0;
> }
>
> - switch (EpDesc->Attributes & USB_ENDPOINT_TYPE_MASK) {
> + EpType = EpDesc->Attributes & USB_ENDPOINT_TYPE_MASK;
> + switch (EpType) {
> case USB_ENDPOINT_BULK:
> if (Direction == EfiUsbDataIn) {
> InputContext->EP[Dci-1].CErr = 3;
> @@ -2974,13 +2976,13 @@ XhcInitializeEndpointContext (
>
> break;
>
> - case USB_ENDPOINT_CONTROL:
> - //
> - // Do not support control transfer now.
> - //
> - DEBUG ((DEBUG_INFO, "XhcInitializeEndpointContext: Unsupport Control EP found, Transfer ring is not allocated.\n"));
> default:
> - DEBUG ((DEBUG_INFO, "XhcInitializeEndpointContext: Unknown EP found, Transfer ring is not allocated.\n"));
> + DEBUG ((
> + DEBUG_INFO,
> + "%a: %a found, Transfer ring is not allocated.\n",
> + __func__,
> + (EpType == USB_ENDPOINT_CONTROL ? "Unsupported Control EP" : "Unknown EP")
> + ));
> EpDesc = (USB_ENDPOINT_DESCRIPTOR *)((UINTN)EpDesc + EpDesc->Length);
> continue;
> }
> @@ -3028,6 +3030,7 @@ XhcInitializeEndpointContext64 (
> UINTN NumEp;
> UINTN EpIndex;
> UINT8 EpAddr;
> + UINT8 EpType;
> UINT8 Direction;
> UINT8 Dci;
> UINT8 MaxDci;
> @@ -3074,7 +3077,8 @@ XhcInitializeEndpointContext64 (
> InputContext->EP[Dci-1].MaxBurstSize = 0x0;
> }
>
> - switch (EpDesc->Attributes & USB_ENDPOINT_TYPE_MASK) {
> + EpType = EpDesc->Attributes & USB_ENDPOINT_TYPE_MASK;
> + switch (EpType) {
> case USB_ENDPOINT_BULK:
> if (Direction == EfiUsbDataIn) {
> InputContext->EP[Dci-1].CErr = 3;
> @@ -3177,13 +3181,14 @@ XhcInitializeEndpointContext64 (
>
> break;
>
> - case USB_ENDPOINT_CONTROL:
> - //
> - // Do not support control transfer now.
> - //
> - DEBUG ((DEBUG_INFO, "XhcInitializeEndpointContext64: Unsupport Control EP found, Transfer ring is not allocated.\n"));
> default:
> - DEBUG ((DEBUG_INFO, "XhcInitializeEndpointContext64: Unknown EP found, Transfer ring is not allocated.\n"));
> + DEBUG ((
> + DEBUG_INFO,
> + "%a: %a found, Transfer ring is not allocated.\n",
> + __func__,
> + ((EpType == USB_ENDPOINT_CONTROL) ? "Unsupported Control EP" : "Unknown EP")
> + ));
> +
> EpDesc = (USB_ENDPOINT_DESCRIPTOR *)((UINTN)EpDesc + EpDesc->Length);
> continue;
> }
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111167): https://edk2.groups.io/g/devel/message/111167
Mute This Topic: https://groups.io/mt/102502056/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
prev parent reply other threads:[~2023-11-13 17:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 5:22 [edk2-devel] [PATCH v3 0/2] BZ 4221: Fix MdeModulePkg/Bus/Pci/XhciDxe issues pointed by Coverity Ranbir Singh
2023-11-10 5:22 ` [edk2-devel] [PATCH v3 1/2] MdeModulePkg/Bus/Pci/XhciDxe: Fix FORWARD_NULL Coverity issues Ranbir Singh
2023-11-13 16:57 ` Laszlo Ersek
2023-11-10 5:22 ` [edk2-devel] [PATCH v3 2/2] MdeModulePkg/Bus/Pci/XhciDxe: Fix MISSING_BREAK " Ranbir Singh
2023-11-13 17:00 ` Laszlo Ersek [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=57ee760a-ea90-b566-55ac-ea5162cb1d2c@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox