From patchwork Mon Jul 12 06:09:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 472839 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2643971jao; Sun, 11 Jul 2021 23:23:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMFSOwQVGDLBO45LfTTzpoYZPYOekPuzAELaT1shNo+c9jwrxBziHWRwSMUc6vnvFP2JxK X-Received: by 2002:a17:907:7212:: with SMTP id dr18mr51637773ejc.552.1626071006551; Sun, 11 Jul 2021 23:23:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071006; cv=none; d=google.com; s=arc-20160816; b=xZ+HFT7ZfwmK0G1nAYf147rxNAt0E9tMdw1i9U5KBaf04vyfPB522mon1nqjZvTFx6 bHak1RucMx3X8CdnygXRs+dqSIw8tXsgagRLqxvxfRibBDhsaOunAxQ9+bIt57Z9um5O YoFc1/oEuR23xUeXUE7idCk7+pNJgiHii/hPoK76SklRb9SuTnIi0ECPlIEwS2ns1dqr fW2O5rAV9CY54Bx7nB8XDSabQzLKveNE/5baD5aBOQ9JEiWegxPvaeCfHcVBXFmxs551 s+aAmto56xI7iTZwBLP/z0s/foQ3OhyxP3j/FwtufxKbUBpCXHQTxuRd3x0ENaymQeLl 9fKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=yVc9YHDNzafd5Ue7IhMArxkkWTBuSOPHn1mwH6XeCqw=; b=LEjR0FpIxkqGxWWq5aWHQzlKWnbXx/DBnyRLcenxpLB5c0bpfR0+Yfy2SW1YISgz9m zTCZmyWIOEDr89spkMQ5VZDH9Arx6JeWryyCwqipQlqbaMJl6FmM9bFn7ck5Q2OyXwSN NYNu0SLciyS7OoI6OjxFeS/suC/z5WQpbk/7hbaDDWCHAJn9pv6NOxj2pj2dPDKJwZml avl8Vi7vSzEiacetE9jzaGC4fGWfhFfRNJYMwT4TyE9D1JEs9vLj0UQd32pWNecJ11Cl /vtzNhsYmpstybRwwiAHopk9fkykyS6N9Jy8wyABi8cKYC+dWLbBB8I+bRDUMiDSG9A/ e8LQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ris6w8x9; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t23si17704122ejs.626.2021.07.11.23.23.26; Sun, 11 Jul 2021 23:23:26 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ris6w8x9; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234816AbhGLG0M (ORCPT + 12 others); Mon, 12 Jul 2021 02:26:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:39792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234776AbhGLGZM (ORCPT ); Mon, 12 Jul 2021 02:25:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 76F2D61042; Mon, 12 Jul 2021 06:22:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626070940; bh=gEMKC4px31ZVteeuwx0vh4geHC9pHmrpBGOE39EmHY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ris6w8x91xw7XjfLU3pKc4w/pAR9V4KeiY77+OJDPVnUhIP8L1SMI7NjGUqwkaq/C DjE2Vx9kMp8tYbTCpVTn7aAqvHU1i71P7mZeCJ3uJuA5VrEiruyU91rpyyfLZPyLd3 Eu3jV4k7TcAQ5ZOMaH/JdaUSQvHz9CvzRkAFpz7I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bryan ODonoghue , Kalle Valo , Sasha Levin Subject: [PATCH 5.4 204/348] wcn36xx: Move hal_buf allocation to devm_kmalloc in probe Date: Mon, 12 Jul 2021 08:09:48 +0200 Message-Id: <20210712060728.608758066@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bryan O'Donoghue [ Upstream commit ef48667557c53d4b51a1ee3090eab7699324c9de ] Right now wcn->hal_buf is allocated in wcn36xx_start(). This is a problem since we should have setup all of the buffers we required by the time ieee80211_register_hw() is called. struct ieee80211_ops callbacks may run prior to mac_start() and therefore wcn->hal_buf must be initialized. This is easily remediated by moving the allocation to probe() taking the opportunity to tidy up freeing memory by using devm_kmalloc(). Fixes: 8e84c2582169 ("wcn36xx: mac80211 driver for Qualcomm WCN3660/WCN3680 hardware") Signed-off-by: Bryan O'Donoghue Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20210605173347.2266003-1-bryan.odonoghue@linaro.org Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/wcn36xx/main.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) -- 2.30.2 diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 46ae4ec4ad47..556ba3c6c5d8 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -293,23 +293,16 @@ static int wcn36xx_start(struct ieee80211_hw *hw) goto out_free_dxe_pool; } - wcn->hal_buf = kmalloc(WCN36XX_HAL_BUF_SIZE, GFP_KERNEL); - if (!wcn->hal_buf) { - wcn36xx_err("Failed to allocate smd buf\n"); - ret = -ENOMEM; - goto out_free_dxe_ctl; - } - ret = wcn36xx_smd_load_nv(wcn); if (ret) { wcn36xx_err("Failed to push NV to chip\n"); - goto out_free_smd_buf; + goto out_free_dxe_ctl; } ret = wcn36xx_smd_start(wcn); if (ret) { wcn36xx_err("Failed to start chip\n"); - goto out_free_smd_buf; + goto out_free_dxe_ctl; } if (!wcn36xx_is_fw_version(wcn, 1, 2, 2, 24)) { @@ -336,8 +329,6 @@ static int wcn36xx_start(struct ieee80211_hw *hw) out_smd_stop: wcn36xx_smd_stop(wcn); -out_free_smd_buf: - kfree(wcn->hal_buf); out_free_dxe_ctl: wcn36xx_dxe_free_ctl_blks(wcn); out_free_dxe_pool: @@ -374,8 +365,6 @@ static void wcn36xx_stop(struct ieee80211_hw *hw) wcn36xx_dxe_free_mem_pools(wcn); wcn36xx_dxe_free_ctl_blks(wcn); - - kfree(wcn->hal_buf); } static int wcn36xx_config(struct ieee80211_hw *hw, u32 changed) @@ -1322,6 +1311,12 @@ static int wcn36xx_probe(struct platform_device *pdev) mutex_init(&wcn->hal_mutex); mutex_init(&wcn->scan_lock); + wcn->hal_buf = devm_kmalloc(wcn->dev, WCN36XX_HAL_BUF_SIZE, GFP_KERNEL); + if (!wcn->hal_buf) { + ret = -ENOMEM; + goto out_wq; + } + ret = dma_set_mask_and_coherent(wcn->dev, DMA_BIT_MASK(32)); if (ret < 0) { wcn36xx_err("failed to set DMA mask: %d\n", ret);