From patchwork Tue Apr 29 12:29:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ond=C5=99ej_Jirman?= X-Patchwork-Id: 886985 Received: from vps.xff.cz (vps.xff.cz [195.181.215.36]) (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 6E6152BD5A4; Tue, 29 Apr 2025 12:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.181.215.36 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745929771; cv=none; b=CnxKu5AS+YduSnbDIJwANLMglS594C02m8wFq7VR6naAj22RTmXJ/MYBnwUnhre8ObilThjUom56JVx45lmPNQHnPuVlCHmb6WJ3S07ALY90widLx2k6YxlvErtD7zzfNVlWiWWu8EAgGxOsMfOTWFk91S/TqWwKxkbqQLbLCeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745929771; c=relaxed/simple; bh=AC0dqH/20V+Zz/A32W24g+8shN8ZIwPppXNh69Js2ic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=h58x2mh0Qg/SxgTH5clGUgBGFUt4wmBIg2fNdJ779XVexeGic1biVfowYRk5OKFuyibI96DtDAcJQT65Ekv2qdQQeOzWr4d1dLSNjuOinsBpRteGsM+EC2Dbfhln7lv9RutB52cYZEvVp5H1z1Qgw9ZFuw+AYJAMkBjct14wzxQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=xff.cz; spf=pass smtp.mailfrom=xff.cz; dkim=pass (1024-bit key) header.d=xff.cz header.i=@xff.cz header.b=IQPikh1K; arc=none smtp.client-ip=195.181.215.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=xff.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xff.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xff.cz header.i=@xff.cz header.b="IQPikh1K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xff.cz; s=mail; t=1745929764; bh=AC0dqH/20V+Zz/A32W24g+8shN8ZIwPppXNh69Js2ic=; h=From:To:Cc:Subject:Date:References:From; b=IQPikh1Kg/Roc9Oo9PJ3UJYUym5C3OjRIl5Nt8onP+3kyqO8+DT9kdqNtusG3hlbZ UYkB8g2bVyzpCn6rwTb8kN2MiB1GkgfAoyDRsvrshxRY1SNO+R+EBvUtlApFVDXa/s kGAJfUXRUDuspchC+yy+xzudTb3iw/TeEUPahZ6Q= From: =?utf-8?q?Ond=C5=99ej_Jirman?= To: Ping-Ke Shih Cc: Ondrej Jirman , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rtw-next v3 1/2] wifi: rtw89: Convert rtw89_core_set_supported_band to use devm_* Date: Tue, 29 Apr 2025 14:29:10 +0200 Message-ID: <20250429122916.1734879-2-megi@xff.cz> In-Reply-To: <20250429122916.1734879-1-megi@xff.cz> References: <20250429122916.1734879-1-megi@xff.cz> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Ondrej Jirman The code can be simplified by using device managed memory allocations. Simplify it. Signed-off-by: Ondrej Jirman Acked-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.c | 99 +++++++++-------------- 1 file changed, 36 insertions(+), 63 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index cc9b014457ac..b164bc767e82 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -4361,17 +4361,18 @@ static void rtw89_init_eht_cap(struct rtw89_dev *rtwdev, #define RTW89_SBAND_IFTYPES_NR 2 -static void rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev, - enum nl80211_band band, - struct ieee80211_supported_band *sband) +static int rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev, + enum nl80211_band band, + struct ieee80211_supported_band *sband) { struct ieee80211_sband_iftype_data *iftype_data; enum nl80211_iftype iftype; int idx = 0; - iftype_data = kcalloc(RTW89_SBAND_IFTYPES_NR, sizeof(*iftype_data), GFP_KERNEL); + iftype_data = devm_kcalloc(rtwdev->dev, RTW89_SBAND_IFTYPES_NR, + sizeof(*iftype_data), GFP_KERNEL); if (!iftype_data) - return; + return -ENOMEM; for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { switch (iftype) { @@ -4396,77 +4397,52 @@ static void rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev, } _ieee80211_set_sband_iftype_data(sband, iftype_data, idx); + return 0; } static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) { struct ieee80211_hw *hw = rtwdev->hw; - struct ieee80211_supported_band *sband_2ghz = NULL, *sband_5ghz = NULL; - struct ieee80211_supported_band *sband_6ghz = NULL; + struct ieee80211_supported_band *sband; u32 size = sizeof(struct ieee80211_supported_band); u8 support_bands = rtwdev->chip->support_bands; + struct device *dev = rtwdev->dev; + int ret; if (support_bands & BIT(NL80211_BAND_2GHZ)) { - sband_2ghz = kmemdup(&rtw89_sband_2ghz, size, GFP_KERNEL); - if (!sband_2ghz) - goto err; - rtw89_init_ht_cap(rtwdev, &sband_2ghz->ht_cap); - rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_2GHZ, sband_2ghz); - hw->wiphy->bands[NL80211_BAND_2GHZ] = sband_2ghz; + sband = devm_kmemdup(dev, &rtw89_sband_2ghz, size, GFP_KERNEL); + if (!sband) + return -ENOMEM; + rtw89_init_ht_cap(rtwdev, &sband->ht_cap); + ret = rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_2GHZ, sband); + if (ret) + return ret; + hw->wiphy->bands[NL80211_BAND_2GHZ] = sband; } if (support_bands & BIT(NL80211_BAND_5GHZ)) { - sband_5ghz = kmemdup(&rtw89_sband_5ghz, size, GFP_KERNEL); - if (!sband_5ghz) - goto err; - rtw89_init_ht_cap(rtwdev, &sband_5ghz->ht_cap); - rtw89_init_vht_cap(rtwdev, &sband_5ghz->vht_cap); - rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_5GHZ, sband_5ghz); - hw->wiphy->bands[NL80211_BAND_5GHZ] = sband_5ghz; + sband = devm_kmemdup(dev, &rtw89_sband_5ghz, size, GFP_KERNEL); + if (!sband) + return -ENOMEM; + rtw89_init_ht_cap(rtwdev, &sband->ht_cap); + rtw89_init_vht_cap(rtwdev, &sband->vht_cap); + ret = rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_5GHZ, sband); + if (ret) + return ret; + hw->wiphy->bands[NL80211_BAND_5GHZ] = sband; } if (support_bands & BIT(NL80211_BAND_6GHZ)) { - sband_6ghz = kmemdup(&rtw89_sband_6ghz, size, GFP_KERNEL); - if (!sband_6ghz) - goto err; - rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_6GHZ, sband_6ghz); - hw->wiphy->bands[NL80211_BAND_6GHZ] = sband_6ghz; + sband = devm_kmemdup(dev, &rtw89_sband_6ghz, size, GFP_KERNEL); + if (!sband) + return -ENOMEM; + ret = rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_6GHZ, sband); + if (ret) + return ret; + hw->wiphy->bands[NL80211_BAND_6GHZ] = sband; } return 0; - -err: - hw->wiphy->bands[NL80211_BAND_2GHZ] = NULL; - hw->wiphy->bands[NL80211_BAND_5GHZ] = NULL; - hw->wiphy->bands[NL80211_BAND_6GHZ] = NULL; - if (sband_2ghz) - kfree((__force void *)sband_2ghz->iftype_data); - if (sband_5ghz) - kfree((__force void *)sband_5ghz->iftype_data); - if (sband_6ghz) - kfree((__force void *)sband_6ghz->iftype_data); - kfree(sband_2ghz); - kfree(sband_5ghz); - kfree(sband_6ghz); - return -ENOMEM; -} - -static void rtw89_core_clr_supported_band(struct rtw89_dev *rtwdev) -{ - struct ieee80211_hw *hw = rtwdev->hw; - - if (hw->wiphy->bands[NL80211_BAND_2GHZ]) - kfree((__force void *)hw->wiphy->bands[NL80211_BAND_2GHZ]->iftype_data); - if (hw->wiphy->bands[NL80211_BAND_5GHZ]) - kfree((__force void *)hw->wiphy->bands[NL80211_BAND_5GHZ]->iftype_data); - if (hw->wiphy->bands[NL80211_BAND_6GHZ]) - kfree((__force void *)hw->wiphy->bands[NL80211_BAND_6GHZ]->iftype_data); - kfree(hw->wiphy->bands[NL80211_BAND_2GHZ]); - kfree(hw->wiphy->bands[NL80211_BAND_5GHZ]); - kfree(hw->wiphy->bands[NL80211_BAND_6GHZ]); - hw->wiphy->bands[NL80211_BAND_2GHZ] = NULL; - hw->wiphy->bands[NL80211_BAND_5GHZ] = NULL; - hw->wiphy->bands[NL80211_BAND_6GHZ] = NULL; } static void rtw89_core_ppdu_sts_init(struct rtw89_dev *rtwdev) @@ -5337,7 +5313,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev) ret = rtw89_regd_setup(rtwdev); if (ret) { rtw89_err(rtwdev, "failed to set up regd\n"); - goto err_free_supported_band; + return ret; } hw->wiphy->sar_capa = &rtw89_sar_capa; @@ -5345,7 +5321,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev) ret = ieee80211_register_hw(hw); if (ret) { rtw89_err(rtwdev, "failed to register hw\n"); - goto err_free_supported_band; + return ret; } ret = rtw89_regd_init_hint(rtwdev); @@ -5360,8 +5336,6 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev) err_unregister_hw: ieee80211_unregister_hw(hw); -err_free_supported_band: - rtw89_core_clr_supported_band(rtwdev); return ret; } @@ -5372,7 +5346,6 @@ static void rtw89_core_unregister_hw(struct rtw89_dev *rtwdev) rtw89_rfkill_polling_deinit(rtwdev); ieee80211_unregister_hw(hw); - rtw89_core_clr_supported_band(rtwdev); } int rtw89_core_register(struct rtw89_dev *rtwdev) From patchwork Tue Apr 29 12:29:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ond=C5=99ej_Jirman?= X-Patchwork-Id: 886034 Received: from vps.xff.cz (vps.xff.cz [195.181.215.36]) (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 6E6712BEC35; Tue, 29 Apr 2025 12:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.181.215.36 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745929771; cv=none; b=tGzbsGwy/7ht2fR46udSanG4k3Jzt3GxfJS6P9xSzgeOuHpEUtVF6+d1gzQypCLJ8fQk7mMZx8Qn3sxtau0gdk7+5daANCff1576iolECRPAVs8QOlC462qlWFMJvXDG24l4tDmAbOwkcO5R64Ko5jW8Z7MDYUMcxE49lBZODkc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745929771; c=relaxed/simple; bh=FbzQ5xgMLQCmABRpj7905rWZk9UuHcSN1po5XTM5cog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/Zk+UqZnHFgAVzxa/Nr6sASLJjCEwa7RLZLjlM8cu051xUwi6tocFz0DhsjpKKyLage1YOmY7x9t8fl4VxDW1zI+FnlhQ3aSEytuaasochIgrlEaag+sNFYuZ02x4kwZz/3SJnch/wbAZVM1odHr7TIdeojFACvSArfrw9Ik6k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=xff.cz; spf=pass smtp.mailfrom=xff.cz; dkim=pass (1024-bit key) header.d=xff.cz header.i=@xff.cz header.b=LDGT+Bjv; arc=none smtp.client-ip=195.181.215.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=xff.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xff.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xff.cz header.i=@xff.cz header.b="LDGT+Bjv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=xff.cz; s=mail; t=1745929765; bh=FbzQ5xgMLQCmABRpj7905rWZk9UuHcSN1po5XTM5cog=; h=From:To:Cc:Subject:Date:References:From; b=LDGT+BjvnoBzvkcQR3mok7nNt0/Coy26foIRZLH9JB7a0buy41Y7pWwbMX8LzRi0f 5grLeqzy2NIbAPEH/tdYGQAyDbOjm9u0UQ+mdJBAA95OXtNbMhNf6idWQb4xbJLn4z qNXDEovmq3yD2urOf5OJaBkcBz2gkKZw37lKCapg= From: =?utf-8?q?Ond=C5=99ej_Jirman?= To: Ping-Ke Shih Cc: Ondrej Jirman , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH rtw-next v3 2/2] wifi: rtw89: Fix inadverent sharing of struct ieee80211_supported_band data Date: Tue, 29 Apr 2025 14:29:11 +0200 Message-ID: <20250429122916.1734879-3-megi@xff.cz> In-Reply-To: <20250429122916.1734879-1-megi@xff.cz> References: <20250429122916.1734879-1-megi@xff.cz> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Ondrej Jirman Internally wiphy writes to individual channels in this structure, so we must not share one static definition of channel list between multiple device instances, because that causes hard to debug breakage. For example, with two rtw89 driven devices in the system, channel information may get incoherent, preventing channel use. Signed-off-by: Ondrej Jirman Acked-by: Ping-Ke Shih --- drivers/net/wireless/realtek/rtw89/core.c | 33 +++++++++++++++++++---- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index b164bc767e82..bc26790ed313 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -4400,17 +4400,40 @@ static int rtw89_init_he_eht_cap(struct rtw89_dev *rtwdev, return 0; } +static struct ieee80211_supported_band * +rtw89_core_sband_dup(struct rtw89_dev *rtwdev, + const struct ieee80211_supported_band *sband) +{ + struct ieee80211_supported_band *dup; + + dup = devm_kmemdup(rtwdev->dev, sband, sizeof(*sband), GFP_KERNEL); + if (!dup) + return NULL; + + dup->channels = devm_kmemdup(rtwdev->dev, sband->channels, + sizeof(*sband->channels) * sband->n_channels, + GFP_KERNEL); + if (!dup->channels) + return NULL; + + dup->bitrates = devm_kmemdup(rtwdev->dev, sband->bitrates, + sizeof(*sband->bitrates) * sband->n_bitrates, + GFP_KERNEL); + if (!dup->bitrates) + return NULL; + + return dup; +} + static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) { struct ieee80211_hw *hw = rtwdev->hw; struct ieee80211_supported_band *sband; - u32 size = sizeof(struct ieee80211_supported_band); u8 support_bands = rtwdev->chip->support_bands; - struct device *dev = rtwdev->dev; int ret; if (support_bands & BIT(NL80211_BAND_2GHZ)) { - sband = devm_kmemdup(dev, &rtw89_sband_2ghz, size, GFP_KERNEL); + sband = rtw89_core_sband_dup(rtwdev, &rtw89_sband_2ghz); if (!sband) return -ENOMEM; rtw89_init_ht_cap(rtwdev, &sband->ht_cap); @@ -4421,7 +4444,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) } if (support_bands & BIT(NL80211_BAND_5GHZ)) { - sband = devm_kmemdup(dev, &rtw89_sband_5ghz, size, GFP_KERNEL); + sband = rtw89_core_sband_dup(rtwdev, &rtw89_sband_5ghz); if (!sband) return -ENOMEM; rtw89_init_ht_cap(rtwdev, &sband->ht_cap); @@ -4433,7 +4456,7 @@ static int rtw89_core_set_supported_band(struct rtw89_dev *rtwdev) } if (support_bands & BIT(NL80211_BAND_6GHZ)) { - sband = devm_kmemdup(dev, &rtw89_sband_6ghz, size, GFP_KERNEL); + sband = rtw89_core_sband_dup(rtwdev, &rtw89_sband_6ghz); if (!sband) return -ENOMEM; ret = rtw89_init_he_eht_cap(rtwdev, NL80211_BAND_6GHZ, sband);