From patchwork Mon Jul 19 14:49:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479930 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240778jao; Mon, 19 Jul 2021 08:38:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycEcKXURg4aD/gx7Nh5dDKPyT+NwtZ/JMoi1ej5vjj4gyO7/jl4uTsHsFUPdtv9O4MsjBO X-Received: by 2002:a02:ccec:: with SMTP id l12mr22211113jaq.61.1626709121572; Mon, 19 Jul 2021 08:38:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709121; cv=none; d=google.com; s=arc-20160816; b=psWfwDcO++ANo1oyxMkZQvAvop4BAVxvXzYXZOFMRSU8hGGj2dV+nBh6oPcLAVlUPe yMtN25zb775dMCXKOKRjr67PIpjJhpTqiTKVXTFqUrVs32IEvu6aEfTOW4DB/zUf5WFk HqRczlubP+204rBFZrws88mixpoCKdeAt+/UHba06HdzI1RIcwk4Nw8jf093Y1WaxIMg 5Eq7bEl4pog6AEUvT0NauhrW9z38PI2xa1IVYdEHxm0X/C4ewlCpyMuVUFD5WejlpUEP 7/jBYtjYY7JWMcJeW7MGDhBZy4gagYXIczf/opq1sAvruOVJqGJGTa0CtDFi9+bI+lBT Pgtg== 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=TrvDDKUIpvUa8OPlS7oaKbLZ/3PDR6fLLaBpS1Y9k0g=; b=eDvW5RCYoPwJfHeWrzHbn1PSKVVhTpCh56+j63Ll9OVE9b+l3BA6AO7zKVVmTt8LKF RPPyFrWYRypDs1EHzEtqUO2KjTW3auHOZtcK4SC3emlychs+px3NEfu4aPh5FZsw5qJW ORqU/5i410sEtxqgDQjAZnWqYgYvcwkvzBNm9OzYZO6IaSgVnGePcj4S4BTNyZUODkHS h5qFSzulI3RN4C94JoY0HAszgTxo95P42PPczU/RAmaJHZdZi9VTeTAaYEmHoHibKaCc ufwuAixHP3moQNC6emuFfb8k9862V3vvSBvZ6MQ2Bg3wY3iZPj+++I+UFcuyVxMHlYSZ wFYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=C069pYRa; 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 s16si20227841jan.83.2021.07.19.08.38.41; Mon, 19 Jul 2021 08:38:41 -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=C069pYRa; 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 S245248AbhGSO57 (ORCPT + 12 others); Mon, 19 Jul 2021 10:57:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:52770 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244548AbhGSO5C (ORCPT ); Mon, 19 Jul 2021 10:57:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5EA7361375; Mon, 19 Jul 2021 15:34:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708879; bh=HHXKvtBZLV1ygGrqo7mH1V8f8ZtZsNbbpfa4QL6BnUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C069pYRaK7qfFLmpCe4ZCR2umjy/MXFT+/Z/UduUhOT+7Mbge6nB+s3c2oc247obO X/2PpHCfF9lxnjybYqBqHQpDuzG6ZpfgRYVMQnWo6Z67CwePJBrTDkoXsnfXC/w4TY WP6Q79EWKdfrMd71ML4ye58jtsqyTNuvworglCHc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kalle Valo , Arnd Bergmann , Sasha Levin Subject: [PATCH 4.19 166/421] mwifiex: re-fix for unaligned accesses Date: Mon, 19 Jul 2021 16:49:37 +0200 Message-Id: <20210719144952.195754122@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 8f4e3d48bb50765ab27ae5bebed2595b20de80a1 ] A patch from 2017 changed some accesses to DMA memory to use get_unaligned_le32() and similar interfaces, to avoid problems with doing unaligned accesson uncached memory. However, the change in the mwifiex_pcie_alloc_sleep_cookie_buf() function ended up changing the size of the access instead, as it operates on a pointer to u8. Change this function back to actually access the entire 32 bits. Note that the pointer is aligned by definition because it came from dma_alloc_coherent(). Fixes: 92c70a958b0b ("mwifiex: fix for unaligned reads") Acked-by: Kalle Valo Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/mwifiex/pcie.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- 2.30.2 diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 5907b34037c2..2f0141c964e2 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -1084,7 +1084,7 @@ static int mwifiex_pcie_delete_cmdrsp_buf(struct mwifiex_adapter *adapter) static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter) { struct pcie_service_card *card = adapter->card; - u32 tmp; + u32 *cookie; card->sleep_cookie_vbase = pci_alloc_consistent(card->dev, sizeof(u32), &card->sleep_cookie_pbase); @@ -1093,13 +1093,11 @@ static int mwifiex_pcie_alloc_sleep_cookie_buf(struct mwifiex_adapter *adapter) "pci_alloc_consistent failed!\n"); return -ENOMEM; } + cookie = (u32 *)card->sleep_cookie_vbase; /* Init val of Sleep Cookie */ - tmp = FW_AWAKE_COOKIE; - put_unaligned(tmp, card->sleep_cookie_vbase); + *cookie = FW_AWAKE_COOKIE; - mwifiex_dbg(adapter, INFO, - "alloc_scook: sleep cookie=0x%x\n", - get_unaligned(card->sleep_cookie_vbase)); + mwifiex_dbg(adapter, INFO, "alloc_scook: sleep cookie=0x%x\n", *cookie); return 0; }