From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C7D5142B75E for ; Thu, 14 May 2026 15:16:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778771811; cv=none; b=kgJ/QVbx6KJOghSWsaBYR5HMsyR1vgTTHkZACRcEM4KM47cPZnx/TqiXADv/vivzsMtjsP1mSqFS3AKXRvHXpWoHKWkUZwo1yYWY39xzgpYsuFmuZC3pQqWzBBQ4LXJcTnXEYbcfiuMM93TEb10R+j+BCgb08lH7fxE4QINQQIg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778771811; c=relaxed/simple; bh=r6yyn9c+pEGCGrRnbGng9gWHUTiASkQtVSpMtwRZf7U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=BCSDbfEG4DzU7XqqRrf1u7chCiy4lrcRZhMoe4gMjjTJItxsbh+DqAPJ7t4B3gvAcPBWFBBC5YCN+fBakUEUPIvBRrVqz/wvHP6WMpZxVgEIU5u1+abSQhpupBLfKitj/U5QWlSrnSoEaXlUQoDyLrQ+pRuEGH0nqoeak75qV74= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ER0twsuI; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ARI30k8i; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ER0twsuI"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ARI30k8i" Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64EBeTDK1717872 for ; Thu, 14 May 2026 15:16:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= bPlHXawxs1R9kEavnhYmyNHAkkm5AEaUrclL97PXn8s=; b=ER0twsuI+A0m6XO0 E7jy7MRvRULwj5LPJZvuvPQEMDozE9LqMkGh6M4hatVZV270ufHKN8XXJ5fmKo3C zu+GZNoSXn7YGBLhUQ2lMDYrTbWs/5uRshdzYC0VZqS6E7SEYzr5A10PSNdwdgy/ 3Bltea42BMH6cpzJkjy0NLtCUUVLMEJwVCBolhTKklJE0AYcePx/TcUE4ELq/O5R qs8egG8mcrv8Ygl7AOY4eDXM40KXqV9enDvQoRwsRyIX58Z0iY05UxD0Nkb0Bq7Z JJiqOE2zbTKZWrEXBuWXuUfrwvIdudEfJV91/siIOyYi+cSxg5D9SAtwdcM8s37X Vnfh4w== Received: from mail-dl1-f71.google.com (mail-dl1-f71.google.com [74.125.82.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e57y7j4hv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 14 May 2026 15:16:47 +0000 (GMT) Received: by mail-dl1-f71.google.com with SMTP id a92af1059eb24-134cf343c58so2247936c88.1 for ; Thu, 14 May 2026 08:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778771807; x=1779376607; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=bPlHXawxs1R9kEavnhYmyNHAkkm5AEaUrclL97PXn8s=; b=ARI30k8iYeDsquCAkoOxc1ES5Hvhc49IWzdxSjUazkd2uPi3/TJS1gVGwgglCzvLFr FsbxhacidD+905Bikt7Zv/r5g0nd/y9LXRpB5WFUJa9Ps87QpnNwtEG+LzaANOmF7TfH aTRz4TUnxWb5I2SeHPLPOOUgs1r0VYr7yHdpmNB8Q8SMlrsQ+OyuabUpYqGOm6JrO7vN yqWdLAXF9Cvxl7FCbdHOTuU2Z69tV+ZyFlbR4DjEW/vyUzUEynSAMNkNhIF9ThbP5iDh gT7eW/Tmwbtjpf/EP73OA8qy74zNiyisp/ZSigO5DA/jB+3ZcNxlgu4lsp6JjjC3KFuQ f6GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778771807; x=1779376607; h=content-transfer-encoding:in-reply-to:content-language:from :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=bPlHXawxs1R9kEavnhYmyNHAkkm5AEaUrclL97PXn8s=; b=VTruNP9W4eXq3bLKK3rz1hOhn4Y2nAj7e3Bk4177E5PNyYj54XeqRZNez66gqUkhNW kw66UMN71V5m/0h3Jp7v80kgQ/wUoWMSNJeJ0JTobHT1FsKwW4Nj/KNFR0pFvHnYMLht tsV75efG96AQYnjRzRlAY8ucKQWOQsnx1l0mKkM1ANQeCptd47jMk1Gt5IoDSRj9upSs Uzy6mMy+u8YNpzIaxTOyVwBBqP918yj/yaTwUcVnpsqtUvOo8k/QWveN0S9yiegKjvIw y/fvDb414ccZDk9uk1C4Ql9O1//JipMIL7B1u53LM+toCEE92Zfi/HaW1mYhwTE2x7rK 4oqw== X-Forwarded-Encrypted: i=1; AFNElJ+9fiJV0+LtSESaj8+7z8Xf4biwi1B7j4EqKKEi8FT0lEuQbDxW6JFD06JFtd+V4JELPAmbSY0xB+fpFkI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxg2FZ9QmGj2Z/XjAYU49QCAzhkzuShcmRdWhC/ojvLcLy9Rynw Qyb5wqGPNXrDe5JQOSewIB4WuQPApQH6zha2a+qfWOp3ZZ1PjeWR45ReLemO/2OPuMijbna/ag9 237TlQCgpzrd1IdoteKNQi0wUbRfMIypETj/yJBANFFprodYWhWY+wyDduUufA9squyjHkWs88e A= X-Gm-Gg: Acq92OGGBtMeElDmHxhUtmwRcRyVMY7tAGS6Nlde8C/Vvm5Blcp8UKt5K9XiWlDOm2Z QA0goLn5tYMd7WPI0V8Q9k/BDZeA0JqvObEvInvbm+ThAUZ8m2UckkGIeJlpWYQ2QaWHDXHWcBL PD/aDsgTQwtz6eCQZCOtCIfE670QFiXWszXTsnH14JgQJIgBmUVsr9Bni9OEQaJeyUQ/pwk5knb WyvtfnAtk2ySYCqA5rc7aHcQVzh4CXEZyX+GdIBE/kM2RyRiQoZtQHOt1Ki/JoaOHVXUc4eTFwt OsTWU9BptMz7yPZlqm2mCgieZxthF3F3SehLQFIvdnemGpdmYtwNRW/YxpwfjGEAljVqR8v1vAU BngbVnBqDhRpNnXHXWQDDH7GbgcXgYjcnmKSggnSBcoCtLfnO/k3kB/Ai1q1NrYmtRqD0DSxqSZ nl7lh21w== X-Received: by 2002:a05:7022:618a:b0:12d:de3f:f3d9 with SMTP id a92af1059eb24-13436ba610dmr4727841c88.35.1778771807086; Thu, 14 May 2026 08:16:47 -0700 (PDT) X-Received: by 2002:a05:7022:618a:b0:12d:de3f:f3d9 with SMTP id a92af1059eb24-13436ba610dmr4727809c88.35.1778771806398; Thu, 14 May 2026 08:16:46 -0700 (PDT) Received: from [10.227.110.203] (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-134cbed531esm4920679c88.8.2026.05.14.08.16.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 14 May 2026 08:16:45 -0700 (PDT) Message-ID: Date: Thu, 14 May 2026 08:16:44 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] wifi: ath11k: clear shared SRNG pointer state on restart To: kfarnung@gmail.com, Jeff Johnson , Muhammad Usama Anjum , Baochen Qiang Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, linux-kernel@vger.kernel.org, santiagorr@riseup.net, stable@vger.kernel.org References: <20260513-kfarnung-ath11k-srng-clear-pointer-state-v1-1-bc700dd8b333@gmail.com> From: Jeff Johnson Content-Language: en-US In-Reply-To: <20260513-kfarnung-ath11k-srng-clear-pointer-state-v1-1-bc700dd8b333@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-ORIG-GUID: 8Qtd8TOMYNLqmCXGjCwWwStWS3vGKV_E X-Authority-Analysis: v=2.4 cv=UY9hjqSN c=1 sm=1 tr=0 ts=6a05e75f cx=c_pps a=JYo30EpNSr/tUYqK9jHPoA==:117 a=JYp8KDb2vCoCEuGobkYCKw==:17 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=VwQbUJbxAAAA:8 a=pGLkceISAAAA:8 a=xNf9USuDAAAA:8 a=yURyTq39TCQ5d30jD7MA:9 a=QEXdDO2ut3YA:10 a=Fk4IpSoW4aLDllm1B1p-:22 a=3w6iy9BqfFbDrj__1GvT:22 X-Proofpoint-GUID: 8Qtd8TOMYNLqmCXGjCwWwStWS3vGKV_E X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE0MDE1MyBTYWx0ZWRfXyPchB8uROAVD fLBPDYyJtc1IVHFgDKOHpIqwrNCvMH+wppZe2BcvfKPs6ce0wx9kQ9fpzxksqAzZxvpVIZA1CaD cJjfietXjq30gnM9yuKvJEZqsHTMb6+07YvwerE02RkhW1IPEfv4m3gCsP4OmeAGkQQJiKSRQeC lp+4Mn8+tsygHWZdHIP7pK74PuxX2ENKJjn8dNgx5rBJaiPf3JD/KA19lxTeU4eFFrixuUi66F8 GGZvMcy0nu2laILUk+sJZwcLDOtc8/Vgj3QKvL/sdyFkc5h2Amb7PihDnO4/jcEM0I6ZxuHHzIc XwVO9ONzE9SUSiZzuYl+lmz4vENVNoNV5dL8KKSH1gBQXi7k/Sq5hr3NH1gEehTB6cjrGB1XSWK 3uGcOhlZBiGQ7Q7znoApqvEzH2lzK5Z12NbSohyf4DVYRO+HFZ0HYUZPppxLiN5yKCS1vbEYf/f BZKZkmV05cOO2Zj+uhQ== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-14_03,2026-05-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 priorityscore=1501 bulkscore=0 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605140153 On 5/13/2026 9:52 PM, Kyle Farnung via B4 Relay wrote: > From: Kyle Farnung > > LMAC rings reuse the shared rdp/wrp pointer buffers without going > through the normal SRNG hw-init path that zeros non-LMAC ring > pointers. After restart, ath11k_hal_srng_clear() can therefore hand > stale hp/tp state from the previous firmware instance back to the new > one. > > Clear the shared pointer buffers while keeping the allocations in > place so restart still avoids reallocating SRNG DMA memory, but starts > with fresh ring-pointer state. > > Fixes: 32be3ca4cf78b ("wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again") > Cc: stable@vger.kernel.org > Link: https://lore.kernel.org/all/CAOPSVF04q6uvVdq8GTRLHBrVMdpt9=o9wVcFMc6f-yhmSBcZqQ@mail.gmail.com/ I'm going to change this to a Closes: tag in my pending branch > Signed-off-by: Kyle Farnung > --- > This patch is the result of investigating suspend/resume failures on a > Lenovo ThinkPad P14s Gen 5 AMD with ath11k. > > I originally proposed extending the existing ath11k PM quirk for this > platform, but after discussion in [1] and bisection the issue appears to > be a regression introduced by [2]. There is also a parallel report in [3] > that appears consistent with the same root cause. This patch keeps the > intended no-reallocation behavior from that change, but clears the > preserved shared SRNG pointer state so restart begins from a clean state. > > Testing so far has been limited to local suspend/resume cycling on the > affected system. The issue was originally reproduced on v7.0.4, and the > patch was also built and tested on top of ath-current with repeated > suspend/resume cycles on a Lenovo ThinkPad P14s Gen 5 AMD. > > [1] https://lore.kernel.org/all/CAOPSVF04q6uvVdq8GTRLHBrVMdpt9=o9wVcFMc6f-yhmSBcZqQ@mail.gmail.com/ > [2] 32be3ca4cf78b ("wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again") > [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1132343 > --- > drivers/net/wireless/ath/ath11k/hal.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/ath/ath11k/hal.c > index e821e5a62c1c0..0c0aeb803018e 100644 > --- a/drivers/net/wireless/ath/ath11k/hal.c > +++ b/drivers/net/wireless/ath/ath11k/hal.c > @@ -1387,14 +1387,21 @@ EXPORT_SYMBOL(ath11k_hal_srng_deinit); > > void ath11k_hal_srng_clear(struct ath11k_base *ab) > { > - /* No need to memset rdp and wrp memory since each individual > - * segment would get cleared in ath11k_hal_srng_src_hw_init() > - * and ath11k_hal_srng_dst_hw_init(). > + /* Preserve the shared pointer buffers, but clear the previous Since you are touching it I'm going to change this from the obsolete networking block comment style to the universal block comment style with /* on a line by itself > + * firmware instance's hp/tp state before handing them back to FW. > + * LMAC rings reuse this shared memory without going through the > + * normal SRNG hw-init path that zeros non-LMAC ring pointers. > */ > memset(ab->hal.srng_list, 0, > sizeof(ab->hal.srng_list)); > memset(ab->hal.shadow_reg_addr, 0, > sizeof(ab->hal.shadow_reg_addr)); > + if (ab->hal.rdp.vaddr) > + memset(ab->hal.rdp.vaddr, 0, > + sizeof(*ab->hal.rdp.vaddr) * HAL_SRNG_RING_ID_MAX); > + if (ab->hal.wrp.vaddr) > + memset(ab->hal.wrp.vaddr, 0, > + sizeof(*ab->hal.wrp.vaddr) * HAL_SRNG_NUM_LMAC_RINGS); > ab->hal.avail_blk_resource = 0; > ab->hal.current_blk_index = 0; > ab->hal.num_shadow_reg_configured = 0; > > --- > base-commit: 54a5b38e4396530e5b2f12b54d3844e860ab6784 > change-id: 20260513-kfarnung-ath11k-srng-clear-pointer-state-91d8ab07e5e2 > > Best regards,