Received: by 2002:a05:7412:e794:b0:fa:551:50a7 with SMTP id o20csp2516215rdd; Fri, 12 Jan 2024 11:51:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFVCJKrTnbe0XkifMN3bvmalBMg9KSR5qzbBcsvqvjj4lILaPs+J76SamI0tu9zTKaM39K/ X-Received: by 2002:a17:906:6849:b0:a2c:e47a:1ef3 with SMTP id a9-20020a170906684900b00a2ce47a1ef3mr523831ejs.70.1705089096746; Fri, 12 Jan 2024 11:51:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705089096; cv=none; d=google.com; s=arc-20160816; b=qgzqSpUGu1UzG2PMFmwTfjo0ytQiy0mrNgZB+a7i4bRbQ0z8hcUzkFEVVNNtCjf8Ic EChgNdEyCoh8BdYjmoO2DdDtFWF7jAPrlGBfPHCr0/+hdc6635hEKohxOICPeyDp98fD yUail4lT0jFtE5LwG0fWyrz34i4R94zqX7vu/fh9LqrC08F8Pux7Pd+euP038yMe2o/U 5OkZhcCm7PqlID0LynHza8msr1kFTLzD+fhM3yLYaZAOfZ2l4tLoa8dT8GMhvJajFK6w lJoWZa2tCvi69K024kM/N+QTiRzEOT/OTR/Zy6eSYcpnO6FKw5ue6iA5hawminJp/ZnR Pf9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:date:message-id:dkim-signature; bh=5KnsbOGdxXkhxj4fVWBh+ufn+zH4Ob6tXtsoNnDKGEA=; fh=rkIxfIjFzB5Og97966ENSJbwrt8pkS9AnSY/zHDVTmQ=; b=vSyODWZ+m6esv5yUEpUPA8fqEAN5XdA09vqcrQThO0Vo/52n46jfHtuezfP3S7dkNq orqZG49I9Q7sA9MHhT8wZFgs8DyBWJxOZxuITia+hq5SpkDrzpRMrkA3j4bzQr5L7+Hl /0B7ZzPY1abg1ouPuxkAeeFhju5B/rqUENgSe5D2QeYsNFSCOth5D+4nIjPZYH74tnjS g+o/zvBr+b0jk3gKZNu7NiWXdQDmxlZnhR1fAlrhagsg1H+ZAXs2GsQJPo6vIdIxmbDG Sk8H+XhV4HFpskNywRopN24PXBikhMv3Yd6dQq5D0EUWkQYCBZPjjOw6KLQaYV8ftneb y4iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="ZSikA/01"; spf=pass (google.com: domain of linux-wireless+bounces-1845-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-wireless+bounces-1845-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v13-20020a170906380d00b00a28eed5b645si1587648ejc.791.2024.01.12.11.51.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 11:51:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless+bounces-1845-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="ZSikA/01"; spf=pass (google.com: domain of linux-wireless+bounces-1845-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-wireless+bounces-1845-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id D486A1F25DA6 for ; Fri, 12 Jan 2024 19:51:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BE0E915AFE; Fri, 12 Jan 2024 19:51:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZSikA/01" X-Original-To: linux-wireless@vger.kernel.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9A4715AFA for ; Fri, 12 Jan 2024 19:51:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-40e636fd3d2so12446945e9.1 for ; Fri, 12 Jan 2024 11:51:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705089089; x=1705693889; darn=vger.kernel.org; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=5KnsbOGdxXkhxj4fVWBh+ufn+zH4Ob6tXtsoNnDKGEA=; b=ZSikA/012EdeOhbKF/Sk4EYSYs6M23QOu1m9/7mqeAs8sYNHEX6VeSPSuo+/q6FjVR UZmePJ3w976tnS55WhB2nvooLh4O1zbe3fo0ShMgP8tZpXoly6iWC/OBJWRJXlRxek+P e4HR07j8v+3gQc9am8O53DAQE9PruNc6jqUkQoEE0aEXvd9WGpw2fFnYi96oryVBMEUQ qZ3nUX2cv1OO/Ps0TwtQ8NOf2Mj2PpA8uju7gDapfbsmMKnP/GWax64jsS0F91RDbSBv Q6cZUSmiMN6ljyzBNZ+/X1PSh6V50N9sEXeuJKDeyX/NHeiqB6r+ugEPHdjB74BJrF+C C6Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705089089; x=1705693889; h=content-transfer-encoding:content-language:cc:to:subject:from :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=5KnsbOGdxXkhxj4fVWBh+ufn+zH4Ob6tXtsoNnDKGEA=; b=CTfYHKbiPh8tUNE5nVzEZwZbYRuxfQoVFHQ5g8U+eGOxZRGnsWK+HqNzNhBKqBznWw oyoGbQYhR9Jk2tkpDIHoF97dIdQIsaIcoxdQMWEKO3wvrfXL6iYp8r9o5//oVlZh/viC WwStUCXWn6Zhg8YEeYFgEHTmig0nkl9yupMqxI1/NbAbmnk42+ryMbRVwuiF1e97F7CH Ty8CSACNmrYi09iI0LMV2vHQZ6SNqshAK6pyAl5d4PudtDGcXtrFOO5eecTE0PjwlPe6 sWbKJMzsjE43TZJUuK3gKApnghWMtonU1RpDJoftzz+fmQTEiyT8qJW4tvK+ePOqSRSn DjQg== X-Gm-Message-State: AOJu0Ywog1YW/jytzr3AJgmTKhZpFhBakDaysMDnoISRrW0zio8B/Q3d pKeEvreHXlNYXtJFFaa4H/cneh/14Ro= X-Received: by 2002:a05:600c:5490:b0:40e:4e44:96ac with SMTP id iv16-20020a05600c549000b0040e4e4496acmr1044847wmb.6.1705089089084; Fri, 12 Jan 2024 11:51:29 -0800 (PST) Received: from [192.168.1.50] ([81.196.40.51]) by smtp.gmail.com with ESMTPSA id t21-20020a05600c451500b0040e3ac9f4c8sm10569337wmo.28.2024.01.12.11.51.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 12 Jan 2024 11:51:28 -0800 (PST) Message-ID: <0d262acd-4f94-41c2-8d15-83486aeb976b@gmail.com> Date: Fri, 12 Jan 2024 21:51:27 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Bitterblue Smith Subject: [PATCH] wifi: rtlwifi: Speed up firmware loading for USB To: "linux-wireless@vger.kernel.org" Cc: Ping-Ke Shih , Larry Finger Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Currently it takes almost 6 seconds to upload the firmware for RTL8192CU (and 11 seconds for RTL8192DU). That's because the firmware is uploaded one byte at a time. Also, after plugging the device, the firmware gets uploaded three times before a connection to the AP is established. Maybe this is fine for most users, but when testing changes to the driver it's really annoying to wait so long. Speed up the firmware upload by writing chunks of 64 bytes at a time. This way it takes about 110 ms for RTL8192CU (and about 210 ms for RTL8192DU). PCI devices could upload it in chunks of 4 bytes, but I don't have any to test and commit 89d32c9071aa ("rtlwifi: Download firmware as bytes rather than as dwords") decided otherwise anyway. Signed-off-by: Bitterblue Smith --- drivers/net/wireless/realtek/rtlwifi/efuse.c | 65 +++++++++++++++++-- drivers/net/wireless/realtek/rtlwifi/efuse.h | 4 +- .../wireless/realtek/rtlwifi/rtl8192cu/sw.c | 6 +- drivers/net/wireless/realtek/rtlwifi/usb.c | 9 +++ drivers/net/wireless/realtek/rtlwifi/wifi.h | 8 +++ 5 files changed, 82 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/efuse.c b/drivers/net/wireless/realtek/rtlwifi/efuse.c index 2e945554ed6d..870a276299f5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/efuse.c +++ b/drivers/net/wireless/realtek/rtlwifi/efuse.c @@ -1287,18 +1287,73 @@ int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv, } EXPORT_SYMBOL_GPL(rtl_get_hwinfo); -void rtl_fw_block_write(struct ieee80211_hw *hw, const u8 *buffer, u32 size) +static void _rtl_fw_block_write_usb(struct ieee80211_hw *hw, u8 *buffer, u32 size) +{ + struct rtl_priv *rtlpriv = rtl_priv(hw); + u32 blockcount, blockcount8, blockcount4; + u32 remain8 = 0, remain4 = 0, remain = 0; + const u32 blocksize = 64; + const u32 blocksize8 = 8; + const u32 blocksize4 = 4; + u32 i, offset; + + blockcount = size / blocksize; + remain8 = size % blocksize; + for (i = 0; i < blockcount; i++) { + offset = i * blocksize; + rtl_write_chunk(rtlpriv, + START_ADDRESS + offset, + blocksize, buffer + offset); + } + + if (remain8) { + offset = blockcount * blocksize; + blockcount8 = remain8 / blocksize8; + remain4 = remain8 % blocksize8; + + for (i = 0; i < blockcount8; i++) + rtl_write_chunk(rtlpriv, + START_ADDRESS + offset + i * blocksize8, + blocksize8, + buffer + offset + i * blocksize8); + } + + if (remain4) { + offset += blockcount8 * blocksize8; + blockcount4 = remain4 / blocksize4; + remain = remain8 % blocksize4; + + for (i = 0; i < blockcount4; i++) + rtl_write_dword(rtlpriv, + START_ADDRESS + offset + i * blocksize4, + cpu_to_le32(*(u32 *)(buffer + offset + i))); + } + + if (remain) { + offset += blockcount4 * blocksize4; + + for (i = 0; i < remain; i++) + rtl_write_byte(rtlpriv, START_ADDRESS + offset + i, + *(buffer + offset + i)); + } +} + +void rtl_fw_block_write(struct ieee80211_hw *hw, u8 *buffer, u32 size) { struct rtl_priv *rtlpriv = rtl_priv(hw); - u8 *pu4byteptr = (u8 *)buffer; u32 i; - for (i = 0; i < size; i++) - rtl_write_byte(rtlpriv, (START_ADDRESS + i), *(pu4byteptr + i)); + if (rtlpriv->rtlhal.interface == INTF_PCI) { + for (i = 0; i < size; i++) + rtl_write_byte(rtlpriv, (START_ADDRESS + i), + *(buffer + i)); + } else if (rtlpriv->rtlhal.interface == INTF_USB) { + _rtl_fw_block_write_usb(hw, buffer, size); + } } EXPORT_SYMBOL_GPL(rtl_fw_block_write); -void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, const u8 *buffer, +void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, u8 *buffer, u32 size) { struct rtl_priv *rtlpriv = rtl_priv(hw); diff --git a/drivers/net/wireless/realtek/rtlwifi/efuse.h b/drivers/net/wireless/realtek/rtlwifi/efuse.h index 1ec59f439382..4821625ad1e5 100644 --- a/drivers/net/wireless/realtek/rtlwifi/efuse.h +++ b/drivers/net/wireless/realtek/rtlwifi/efuse.h @@ -91,8 +91,8 @@ void efuse_power_switch(struct ieee80211_hw *hw, u8 write, u8 pwrstate); int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv, int max_size, u8 *hwinfo, int *params); void rtl_fill_dummy(u8 *pfwbuf, u32 *pfwlen); -void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, const u8 *buffer, +void rtl_fw_page_write(struct ieee80211_hw *hw, u32 page, u8 *buffer, u32 size); -void rtl_fw_block_write(struct ieee80211_hw *hw, const u8 *buffer, u32 size); +void rtl_fw_block_write(struct ieee80211_hw *hw, u8 *buffer, u32 size); void rtl_efuse_ops_init(struct ieee80211_hw *hw); #endif diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c index 20b4aac69642..9f4cf09090d6 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c @@ -40,7 +40,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw) rtlpriv->dm.thermalvalue = 0; /* for firmware buf */ - rtlpriv->rtlhal.pfirmware = vzalloc(0x4000); + rtlpriv->rtlhal.pfirmware = kmalloc(0x4000, GFP_KERNEL); if (!rtlpriv->rtlhal.pfirmware) { pr_err("Can't alloc buffer for fw\n"); return 1; @@ -61,7 +61,7 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw) fw_name, rtlpriv->io.dev, GFP_KERNEL, hw, rtl_fw_cb); if (err) { - vfree(rtlpriv->rtlhal.pfirmware); + kfree(rtlpriv->rtlhal.pfirmware); rtlpriv->rtlhal.pfirmware = NULL; } return err; @@ -72,7 +72,7 @@ static void rtl92cu_deinit_sw_vars(struct ieee80211_hw *hw) struct rtl_priv *rtlpriv = rtl_priv(hw); if (rtlpriv->rtlhal.pfirmware) { - vfree(rtlpriv->rtlhal.pfirmware); + kfree(rtlpriv->rtlhal.pfirmware); rtlpriv->rtlhal.pfirmware = NULL; } } diff --git a/drivers/net/wireless/realtek/rtlwifi/usb.c b/drivers/net/wireless/realtek/rtlwifi/usb.c index 07a7e6fa46af..1fc480fe18ad 100644 --- a/drivers/net/wireless/realtek/rtlwifi/usb.c +++ b/drivers/net/wireless/realtek/rtlwifi/usb.c @@ -125,6 +125,14 @@ static void _usb_write32_sync(struct rtl_priv *rtlpriv, u32 addr, u32 val) _usb_write_sync(rtlpriv, addr, val, 4); } +static void _usb_write_chunk_sync(struct rtl_priv *rtlpriv, u32 addr, + u32 length, u8 *data) +{ + struct usb_device *udev = to_usb_device(rtlpriv->io.dev); + + _usbctrl_vendorreq_sync(udev, REALTEK_USB_VENQT_WRITE, addr, data, length); +} + static void _rtl_usb_io_handler_init(struct device *dev, struct ieee80211_hw *hw) { @@ -135,6 +143,7 @@ static void _rtl_usb_io_handler_init(struct device *dev, rtlpriv->io.write8 = _usb_write8_sync; rtlpriv->io.write16 = _usb_write16_sync; rtlpriv->io.write32 = _usb_write32_sync; + rtlpriv->io.write_chunk = _usb_write_chunk_sync; rtlpriv->io.read8 = _usb_read8_sync; rtlpriv->io.read16 = _usb_read16_sync; rtlpriv->io.read32 = _usb_read32_sync; diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index 53af324f3807..3821f6e31447 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -1450,6 +1450,8 @@ struct rtl_io { void (*write8)(struct rtl_priv *rtlpriv, u32 addr, u8 val); void (*write16)(struct rtl_priv *rtlpriv, u32 addr, u16 val); void (*write32)(struct rtl_priv *rtlpriv, u32 addr, u32 val); + void (*write_chunk)(struct rtl_priv *rtlpriv, u32 addr, u32 length, + u8 *data); u8 (*read8)(struct rtl_priv *rtlpriv, u32 addr); u16 (*read16)(struct rtl_priv *rtlpriv, u32 addr); @@ -2962,6 +2964,12 @@ static inline void rtl_write_dword(struct rtl_priv *rtlpriv, rtlpriv->io.read32(rtlpriv, addr); } +static inline void rtl_write_chunk(struct rtl_priv *rtlpriv, + u32 addr, u32 length, u8 *data) +{ + rtlpriv->io.write_chunk(rtlpriv, addr, length, data); +} + static inline u32 rtl_get_bbreg(struct ieee80211_hw *hw, u32 regaddr, u32 bitmask) { -- 2.43.0