From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D894DC432BE for ; Mon, 9 Aug 2021 11:21:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0BB461019 for ; Mon, 9 Aug 2021 11:21:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235059AbhHILWR (ORCPT ); Mon, 9 Aug 2021 07:22:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234657AbhHILWP (ORCPT ); Mon, 9 Aug 2021 07:22:15 -0400 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59C5FC061796 for ; Mon, 9 Aug 2021 04:21:55 -0700 (PDT) Received: by mail-pl1-x630.google.com with SMTP id f3so5357984plg.3 for ; Mon, 09 Aug 2021 04:21:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rtst-co-kr.20150623.gappssmtp.com; s=20150623; h=date:from:to:subject:message-id:mime-version:content-disposition; bh=EYzmb24oO7kORuQLhjfqCmnqc8pvZHlXH9eI7yhHiBw=; b=YHWTslJOxVAlF/QdmEawCacCLPEoNYsZAuaYSbBEimHNxWDvF9o+8CciewOoc/ZmZb WPy6B/9gGw6j6K8TotQ/YCx9YniYNI7/mU26Mhr+5humcZTpCzcg5vhfBG7qDZbnc8oL VlFDrdyHte0Xid5O+37KsAUrYEqXeqXFpjL/BveDXe2a8vS+aI6O8qq7PP+iWrCHKkRE QD8JAbWZc5npRq8ngsXxupB7nQHxW7LdB1/sKX/jxN4Kf/phoZ+oQm9c/oY6KhzbEIMN j9TuxysNhTf+57h47z7a6r0/lsL4S3eBw0+pt4Hm9xaNM9iSdUsyB8ndHB4YVs9t8Nys P7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition; bh=EYzmb24oO7kORuQLhjfqCmnqc8pvZHlXH9eI7yhHiBw=; b=VcjH60lxP1FrcaK99db2B4NN9TqVz3Zc/ft3Ka2Vr13N+HDsG3B6WeoxX38NP6VkGG LaU9Y9EkCvpGEYIWoUPp86LMu0ES63s8lNul7HFPQYvvZ94ElrWGLQPKnJpia0SYtI50 lyO8iZFwGtN9DzyAcEaxDKUts7yeXDABaFYsMtjsadNZmt9v46RsxHhWFVVQfEkcYrow QKQK8IRdBxOEnxwM7HeTwvTZw3cRXO5+UXd5gTTxWS86i+wr2O9CS/DGravSP2BlOCr7 a9UdrtEVhAitSTMSdIyhFnRyeVrAfPCZ81b9y4WIvfydCf767CI7EYxE5+SV+mYcgLWs x5Lg== X-Gm-Message-State: AOAM533O81rdo0CUzsD9etUqHd+5COxm5iyhgxA8ngVHGljLu/e3sbxA FR+gvAcLoJNqJx3WL+rRxMU7+g== X-Google-Smtp-Source: ABdhPJxV096VLuX3ainMU9lCZ4pdriNo8Ca8f3hd1ru5/OHjGWWo70JyRvsMfAC5Cbqts6rPuAD87Q== X-Received: by 2002:a65:5603:: with SMTP id l3mr26367pgs.281.1628508114846; Mon, 09 Aug 2021 04:21:54 -0700 (PDT) Received: from ubuntu ([106.245.77.4]) by smtp.gmail.com with ESMTPSA id y62sm19815607pfy.183.2021.08.09.04.21.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Aug 2021 04:21:54 -0700 (PDT) Date: Mon, 9 Aug 2021 20:20:48 +0900 From: Jeaho Hwang To: Peter Chen , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] usb: chipidea: add loop timeout for hw_ep_set_halt() Message-ID: <20210809112048.GA3319230@ubuntu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If ctrl EP priming is failed (very rare case in standard linux), hw_ep_set_halt goes infinite loop. 50 was enough for zynq7000. Signed-off-by: Jeaho Hwang --- drivers/usb/chipidea/udc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index d0cd1de1b6c7..92ca0b7e4310 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -210,6 +210,9 @@ static int hw_ep_prime(struct ci_hdrc *ci, int num, int dir, int is_ctrl) return 0; } +/*will it be enough?*/ +#define HW_EP_SET_HALT_COUNT_MAX 100 + /** * hw_ep_set_halt: configures ep halt & resets data toggle after clear (execute * without interruption) @@ -222,6 +225,7 @@ static int hw_ep_prime(struct ci_hdrc *ci, int num, int dir, int is_ctrl) */ static int hw_ep_set_halt(struct ci_hdrc *ci, int num, int dir, int value) { + int count = HW_EP_SET_HALT_COUNT_MAX; if (value != 0 && value != 1) return -EINVAL; @@ -233,9 +237,9 @@ static int hw_ep_set_halt(struct ci_hdrc *ci, int num, int dir, int value) /* data toggle - reserved for EP0 but it's in ESS */ hw_write(ci, reg, mask_xs|mask_xr, value ? mask_xs : mask_xr); - } while (value != hw_ep_get_halt(ci, num, dir)); + } while (value != hw_ep_get_halt(ci, num, dir) && --count > 0); - return 0; + return count ? 0 : -EAGAIN; } /** -- 2.25.1