From patchwork Wed May 18 01:14:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lenski X-Patchwork-Id: 9115791 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E31AC9F1C3 for ; Wed, 18 May 2016 01:15:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BC2B20253 for ; Wed, 18 May 2016 01:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 205382022D for ; Wed, 18 May 2016 01:15:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752397AbcERBPa (ORCPT ); Tue, 17 May 2016 21:15:30 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35290 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752362AbcERBP3 (ORCPT ); Tue, 17 May 2016 21:15:29 -0400 Received: by mail-pf0-f196.google.com with SMTP id b66so3395763pfb.2 for ; Tue, 17 May 2016 18:15:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kZZTjyMFzi4RkWwHTBxlM+QGyLUIuF6nTooKGOAtMTI=; b=xHIH+sVYJJGogLkU+AowpCBsbgvnc1xBVHTcBhdyXTApJ3vwRmml8ErenrEvjlDRhe RIllHmcHOX0BCXQ7C6ooDeP3BDOrZFATy8VmfAxwQGL8isBb/AfH5OPmTlZpiAw+GYJ5 ROvuOBh62nniDK7c82fmnbCxaqmcVBdfeIJmMjHF/UbdbvdGL5BVyX3FoAX45Z+yroqQ eBv+9X2kuE0HKRt6KKmlgY9/+Vkq9YEkg/frzmEpwmg9wJYU6PlsKKiENVkjddipsk4C nSXvGPCHhkEhMVka2OmETHm+M99frDdhDCoR5rRKrwtS6cFpSPlTO+w9gA993JzOPsGo kPgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kZZTjyMFzi4RkWwHTBxlM+QGyLUIuF6nTooKGOAtMTI=; b=jVAMh7wcvFXzxxBefWFqJiKxmc8F4muB8Pcq9fKxOBT2nHdMmJF7VhkPzGtSvlK5CT aMrHoO/toOzdkuIrvYgbVpYkfeT08ZDIx2epYmTJBUeineIMlc8TCYGLrcbJ+9ngko3E TyDPrjoTFfxuQlRhGuh2llaUGk07nfm8bBOMRP7HwlTmvXL7GFpM1XSYT9IabfGa5jKj EWp92nXs8jqjtW/f8vLUkUMYNe46JjdxzOUTmdYkyet1JN7ATH5/3Echi7G81qn2DtKD FyFY72R1Gbf25yX6chQ4/qDDJxrCWjZ3QvFd8npzpn+JeK1WQeMqyTtgFRmb2X9+n1CC Ejww== X-Gm-Message-State: AOPr4FUArKS0/S5QIK9ZD6YlIwOUVwvBT5JPXu43ESktvESrSckDiG8YwZqVm+zVHnx6jg== X-Received: by 10.98.33.207 with SMTP id o76mr6578747pfj.80.1463534128760; Tue, 17 May 2016 18:15:28 -0700 (PDT) Received: from localhost.localdomain ([70.102.74.164]) by smtp.gmail.com with ESMTPSA id q70sm7489545pfj.81.2016.05.17.18.15.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 May 2016 18:15:27 -0700 (PDT) From: Dan Lenski To: linux-wireless@vger.kernel.org Cc: Dan Lenski , jes.sorensen@redhat.com Subject: [PATCH 2/2] rtl8xxxu: Make polling timeout for firmware configurable Date: Tue, 17 May 2016 18:14:46 -0700 Message-Id: <1463534086-22353-3-git-send-email-dlenski@gmail.com> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1463534086-22353-1-git-send-email-dlenski@gmail.com> References: <1463534086-22353-1-git-send-email-dlenski@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch makes RTL8XXXU_FIRMWARE_POLL_MAX into a configurable module parameter, firmware_poll_max. Signed-off-by: Dan Lenski Reviewed-by: Julian Calaby --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c index 6aed923..a1efb2c 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c @@ -44,6 +44,7 @@ static int rtl8xxxu_debug; static bool rtl8xxxu_ht40_2g; +static int rtl8xxxu_firmware_poll_max = RTL8XXXU_FIRMWARE_POLL_MAX; MODULE_AUTHOR("Jes Sorensen "); MODULE_DESCRIPTION("RTL8XXXu USB mac80211 Wireless LAN Driver"); @@ -59,6 +60,8 @@ module_param_named(debug, rtl8xxxu_debug, int, 0600); MODULE_PARM_DESC(debug, "Set debug mask"); module_param_named(ht40_2g, rtl8xxxu_ht40_2g, bool, 0600); MODULE_PARM_DESC(ht40_2g, "Enable HT40 support on the 2.4GHz band"); +module_param_named(firmware_poll_max, rtl8xxxu_firmware_poll_max, int, 0600); +MODULE_PARM_DESC(firmware_poll_max, "Maximum polling count for firmware startup (increase if firmware fails to start)"); #define USB_VENDOR_ID_REALTEK 0x0bda /* Minimum IEEE80211_MAX_FRAME_LEN */ @@ -2050,13 +2053,13 @@ static int rtl8xxxu_start_firmware(struct rtl8xxxu_priv *priv) u32 val32; /* Poll checksum report */ - for (i = 0; i < RTL8XXXU_FIRMWARE_POLL_MAX; i++) { + for (i = 0; i < rtl8xxxu_firmware_poll_max; i++) { val32 = rtl8xxxu_read32(priv, REG_MCU_FW_DL); if (val32 & MCU_FW_DL_CSUM_REPORT) break; } - if (i == RTL8XXXU_FIRMWARE_POLL_MAX) { + if (i == rtl8xxxu_firmware_poll_max) { dev_warn(dev, "Firmware checksum poll timed out\n"); ret = -EAGAIN; goto exit; @@ -2068,7 +2071,7 @@ static int rtl8xxxu_start_firmware(struct rtl8xxxu_priv *priv) rtl8xxxu_write32(priv, REG_MCU_FW_DL, val32); /* Wait for firmware to become ready */ - for (i = 0; i < RTL8XXXU_FIRMWARE_POLL_MAX; i++) { + for (i = 0; i < rtl8xxxu_firmware_poll_max; i++) { val32 = rtl8xxxu_read32(priv, REG_MCU_FW_DL); if (val32 & MCU_WINT_INIT_READY) break; @@ -2076,7 +2079,7 @@ static int rtl8xxxu_start_firmware(struct rtl8xxxu_priv *priv) udelay(100); } - if (i == RTL8XXXU_FIRMWARE_POLL_MAX) { + if (i == rtl8xxxu_firmware_poll_max) { dev_warn(dev, "Firmware failed to start\n"); ret = -EAGAIN; goto exit;