From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04FCDC77B75 for ; Sun, 7 May 2023 10:56:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230523AbjEGK41 (ORCPT ); Sun, 7 May 2023 06:56:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230489AbjEGK40 (ORCPT ); Sun, 7 May 2023 06:56:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 518FB59EE for ; Sun, 7 May 2023 03:56:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D31DF61B51 for ; Sun, 7 May 2023 10:56:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5555C433EF; Sun, 7 May 2023 10:56:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683456984; bh=+XUtfj4gYnfxNEuqR0bHmHMhuA66vLYAKaUvjNccu1U=; h=Subject:To:Cc:From:Date:From; b=LkPb8ifLzFftAqJg0h1W18F5bHJSZzdR5kamq1QpnmYnx6uXC0rAOwMAiDV2P8fKH aA8J3xgnsj31yGkB9vm1dnV5qFR2UqCgC2Dq6XPaIWzT3EAi+/N0j7xdgK4q5PY66Z g46Ca2GOkajDhCF0a2uQ6I5s7PD3yOZ0AuDsx6q4= Subject: FAILED: patch "[PATCH] wifi: ath9k: Don't mark channelmap stack variable read-only" failed to apply to 6.2-stable tree To: toke@toke.dk, quic_kvalo@quicinc.com Cc: From: Date: Sun, 07 May 2023 12:56:13 +0200 Message-ID: <2023050713-pension-another-34bb@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.2-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.2.y git checkout FETCH_HEAD git cherry-pick -x b956e3110a797a3663f91f9b8935b667cc23fe72 # git commit -s git send-email --to '' --in-reply-to '2023050713-pension-another-34bb@gregkh' --subject-prefix 'PATCH 6.2.y' HEAD^.. Possible dependencies: b956e3110a79 ("wifi: ath9k: Don't mark channelmap stack variable read-only in ath9k_mci_update_wlan_channels()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From b956e3110a797a3663f91f9b8935b667cc23fe72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= Date: Mon, 17 Apr 2023 13:35:03 +0300 Subject: [PATCH] wifi: ath9k: Don't mark channelmap stack variable read-only in ath9k_mci_update_wlan_channels() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This partially reverts commit e161d4b60ae3a5356e07202e0bfedb5fad82c6aa. Turns out the channelmap variable is not actually read-only, it's modified through the MCI_GPM_CLR_CHANNEL_BIT() macro further down in the function, so making it read-only causes page faults when that code is hit. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217183 Fixes: e161d4b60ae3 ("wifi: ath9k: Make arrays prof_prio and channelmap static const") Cc: stable@vger.kernel.org Signed-off-by: Toke Høiland-Jørgensen Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20230413214118.153781-1-toke@toke.dk diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c index 3363fc4e8966..a0845002d6fe 100644 --- a/drivers/net/wireless/ath/ath9k/mci.c +++ b/drivers/net/wireless/ath/ath9k/mci.c @@ -646,9 +646,7 @@ void ath9k_mci_update_wlan_channels(struct ath_softc *sc, bool allow_all) struct ath_hw *ah = sc->sc_ah; struct ath9k_hw_mci *mci = &ah->btcoex_hw.mci; struct ath9k_channel *chan = ah->curchan; - static const u32 channelmap[] = { - 0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff - }; + u32 channelmap[] = {0x00000000, 0xffff0000, 0xffffffff, 0x7fffffff}; int i; s16 chan_start, chan_end; u16 wlan_chan;