From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 CD387314A86 for ; Wed, 9 Sep 2026 15:09:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788966594; cv=none; b=F4pnyXalH+4Ex4pef7EkMRfUhaWgGzaawsoM7G85FcDBIXgjLKxvo8mPexDsedx8uECDfvYdI18tblEduCfV59DKyB1eDX6eoX4XFruClyt+OMfJqr38+2BB8wcn3sHbOYjEZ+OuToUy0YmyvwrmWBoI7Na3BRVnXwVfBcjZCqM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788966594; c=relaxed/simple; bh=ULKPLRQf+yo3YJ+mGa+gQENlD+fxpRgDDxiOVwMoP3Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Nn2M4KhB4go5LlQzXchDRRhJAFbJfvVmh4aBLZRXuTzzsR9uXyFYGlKmKIMAJPW+4IVs3jm/cGj8/x9T91/1uUFJx8uf05vIp46vlDWe9SwyU6IcKgqsmPEHTc6ZY2H6txHJGOTbjJfSICbF5JBLVkhJwkQVa6I3CrFPwwmtx/0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bmXcGWOR; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bmXcGWOR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4254A1F00A3E; Wed, 9 Sep 2026 15:09:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788966591; bh=bQUDOCPesm0Bw57PAta2qknvb/7vOb7XD94wwFDnXeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bmXcGWORbKBvD39WqcST4AFP0YVt7D463FkH1jzp+z+79/6EF+/Z9hn/Feku8ZrMh b7pSmouMsrGX9U0gsH2UEfQDJWH3C7P78qro+EuUiN6iOFmQp7xrBaaE/1Gi8BIPn2 Zk2LtkBZ+xKJQYMDa5+hn/n4BZNcUFC9GDbE6PWQhzWMQrlMoeYFU+rZUlRT4P2/sM ujZsQlLqlNO2uDiu+EUppeJW9XumhflQHxwCx8x/jfmTEQg0G5aM9jDoctRwvJKvWf 7WUj+RoyE0Oqpnv6NDvhQlVm/1Nlla8BsK+bbou0bkJEK4UENGLtQx2YGbMWK0U62B c3WMxyXCjqi2Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Mario Limonciello , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Sasha Levin Subject: [PATCH 6.18.y] platform/x86/amd/pmc: Fix msg_port restoration in amd_stb_debugfs_open_v2() Date: Wed, 9 Sep 2026 11:09:49 -0400 Message-ID: <20260909150949.2816083-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026090331-president-referable-7380@gregkh> References: <2026090331-president-referable-7380@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Mario Limonciello [ Upstream commit cbb32ff92f8a62212e0f7384b1de986ced92082b ] amd_stb_debugfs_open_v2() switches dev->msg_port to MSG_PORT_S2D to query S2D telemetry but only restores it to MSG_PORT_PMC on one path. The early return on the dump_custom_stb path (and the error/allocation returns) leave the port stuck on MSG_PORT_S2D, so subsequent SMU communication - including the s2idle prepare/restore handlers - is directed at the wrong mailbox. Consolidate the exit path through a single label so the message port is always restored, mirroring the fix in amd_stb_s2d_init(). Reported-by: sashiko.dev Link: https://sashiko.dev/#/patchset/20260717162023.956346-1-mario.limonciello%40amd.com Fixes: 2851f4f8ed4e ("platform/x86/amd/pmc: Define enum for S2D/PMC msg_port and add helper function") Cc: stable@vger.kernel.org Signed-off-by: Mario Limonciello Link: https://patch.msgid.link/20260721181756.143084-3-mario.limonciello@amd.com Reviewed-by: Ilpo Järvinen Signed-off-by: Ilpo Järvinen [ adjusted allocation context to retain kmalloc(struct_size(...), GFP_KERNEL) instead of kmalloc_flex() ] Signed-off-by: Sasha Levin --- drivers/platform/x86/amd/pmc/mp1_stb.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/platform/x86/amd/pmc/mp1_stb.c b/drivers/platform/x86/amd/pmc/mp1_stb.c index 1a06425f596de..c2f4e6caf58b6 100644 --- a/drivers/platform/x86/amd/pmc/mp1_stb.c +++ b/drivers/platform/x86/amd/pmc/mp1_stb.c @@ -157,7 +157,7 @@ static int amd_stb_debugfs_open_v2(struct inode *inode, struct file *filp) struct amd_pmc_dev *dev = filp->f_inode->i_private; u32 fsize, num_samples, val, stb_rdptr_offset = 0; struct amd_stb_v2_data *stb_data_arr; - int ret; + int ret = 0; /* Write dummy postcode while reading the STB buffer */ ret = amd_stb_write(dev, AMD_PMC_STB_DUMMY_PC); @@ -176,22 +176,24 @@ static int amd_stb_debugfs_open_v2(struct inode *inode, struct file *filp) * the enhanced dram size. Note that we land here only for the * platforms that support enhanced dram size reporting. */ - if (dump_custom_stb) - return amd_stb_handle_efr(filp); + if (dump_custom_stb) { + ret = amd_stb_handle_efr(filp); + goto out; + } /* Get the num_samples to calculate the last push location */ ret = amd_pmc_send_cmd(dev, S2D_NUM_SAMPLES, &num_samples, dev->stb_arg.s2d_msg_id, true); - /* Clear msg_port for other SMU operation */ - dev->msg_port = MSG_PORT_PMC; if (ret) { dev_err(dev->dev, "error: S2D_NUM_SAMPLES not supported : %d\n", ret); - return ret; + goto out; } fsize = min(num_samples, S2D_TELEMETRY_BYTES_MAX); stb_data_arr = kmalloc(struct_size(stb_data_arr, data, fsize), GFP_KERNEL); - if (!stb_data_arr) - return -ENOMEM; + if (!stb_data_arr) { + ret = -ENOMEM; + goto out; + } stb_data_arr->size = fsize; @@ -214,7 +216,10 @@ static int amd_stb_debugfs_open_v2(struct inode *inode, struct file *filp) filp->private_data = stb_data_arr; - return 0; +out: + /* Restore the default message port for subsequent SMU operations */ + dev->msg_port = MSG_PORT_PMC; + return ret; } static ssize_t amd_stb_debugfs_read_v2(struct file *filp, char __user *buf, size_t size, -- 2.53.0