From patchwork Mon Apr 7 15:17:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 879198 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 714901FE452; Mon, 7 Apr 2025 15:19:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744039151; cv=none; b=XURPg3QEcl9XjwEOeeL0R7nRABWHRJrzCobFei8XosQJujEHkpi9Dbo6Z4bCHRjjPPXJh6uM2Wt47gaYMnHiwiTQAFfLPg1Hn8MFZeBRGPWkGaAPgYfErUQT9YCiwL/3A6r0z2L73DTrCQr7vVzt8qgekY7cCOH2u9bs1I4P8vY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744039151; c=relaxed/simple; bh=FROZRIdHapvR9KBbWNJFi61sURkGI86NKSTJeiz6PUs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BIF1shQX1jZ4TCtnxLrEjF7/nm2OFhOVSa5pTwfi6yrJ/gjBd7rMNJrXdiR3k6J130XM02Wn+Pny7zC/MqTvmolnfiepXbsRefFzCaXhf9fWEauZkpfVxeTty6/vFkEG+qa61E98w+Igrhq6sGRfqgE7ySY7byoFUJ6jPyCVl6w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c60z3MNh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c60z3MNh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2D264C4CEE9; Mon, 7 Apr 2025 15:19:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744039150; bh=FROZRIdHapvR9KBbWNJFi61sURkGI86NKSTJeiz6PUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c60z3MNhu7L9wh1TQbXSaqnosI9EJaSsLyyJGrqecVhzISwNc9+++gI31zHWPE6WM OCuHfWlKELoHTE//YJPN8SW3PmVrhTgy9fVUqRl8IkX3SfDVV7n9JvJ7/X0ORTyG16 ipak0oEA/VspoaFzjFABNCd3BD7x9w/lv6NNDQbS28e2RSjs8LBddC9nl19liOOxDB kIIixTtAgn6Vwja3Ela9l+xAN6VX03MeNvlap1I6J0RebwTYBwEdcAJoRZPZKw3V8F sMlWIVIa/cZ85ltFoxpb3EzAkIuiF06gj/4aRauXn6sXsiHL6PjXhaphKw32XGNMC5 VcCCjwSqekhKg== From: Mario Limonciello To: mario.limonciello@amd.com, basavaraj.natikar@amd.com, jikos@kernel.org, bentiss@kernel.org, ilpo.jarvinen@linux.intel.com, Shyam-sundar.S-k@amd.com, akshata.mukundshetty@amd.com Cc: Yijun Shen , Yijun Shen , stable@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH v4 1/2] HID: amd_sfh: Fix SRA sensor when it's the only sensor Date: Mon, 7 Apr 2025 10:17:47 -0500 Message-ID: <20250407151835.1200867-2-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250407151835.1200867-1-superm1@kernel.org> References: <20250407151835.1200867-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Mario Limonciello On systems that only have an SRA sensor connected to SFH the sensor doesn't get enabled due to a bad optimization condition of breaking the sensor walk loop. This optimization is unnecessary in the first place because if there is only one device then the loop only runs once. Drop the condition and explicitly mark sensor as enabled. Reported-by: Yijun Shen Tested-By: Yijun Shen Fixes: d1c444b47100d ("HID: amd_sfh: Add support to export device operating states") Cc: stable@vger.kernel.org Signed-off-by: Mario Limonciello --- v2: * Add tag --- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c index 25f0ebfcbd5f5..c1bdf1e0d44af 100644 --- a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +++ b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c @@ -134,9 +134,6 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) for (i = 0; i < cl_data->num_hid_devices; i++) { cl_data->sensor_sts[i] = SENSOR_DISABLED; - if (cl_data->num_hid_devices == 1 && cl_data->sensor_idx[0] == SRA_IDX) - break; - if (cl_data->sensor_idx[i] == SRA_IDX) { info.sensor_idx = cl_data->sensor_idx[i]; writel(0, privdata->mmio + amd_get_p2c_val(privdata, 0)); @@ -145,8 +142,10 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) (privdata, cl_data->sensor_idx[i], ENABLE_SENSOR); cl_data->sensor_sts[i] = (status == 0) ? SENSOR_ENABLED : SENSOR_DISABLED; - if (cl_data->sensor_sts[i] == SENSOR_ENABLED) + if (cl_data->sensor_sts[i] == SENSOR_ENABLED) { + cl_data->is_any_sensor_enabled = true; privdata->dev_en.is_sra_present = true; + } continue; } From patchwork Mon Apr 7 15:17:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mario Limonciello X-Patchwork-Id: 878859 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 3E3F81FDE2E for ; Mon, 7 Apr 2025 15:19:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744039151; cv=none; b=AF7GDdeTKXLULHgACH+pD+eWgwPC4VUAIHAGeGQehjl4aW1PkhX6gBt2ToUsLMUtnYi2eoMk+Yvaf7hOnfuv4VzQv0WCruAoKJ9L26qALdA2hHmt3Yc08sMbgUsI13ZzbOqDKT36MOu/lmw/NfkChQ/8w4DHftheWjB0weiapro= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744039151; c=relaxed/simple; bh=ce3ClsriXC8LZWlvmEpmiJgErfC2vJ+4DZ1F22z7qGs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oOLiJtlRgOBHnltXwS3DYI21wi/WHzC4AxP6k8DSYN6tWdIpyjbHEe/mLtAwWI2CnKwZ9W7BMl/haybPdlHg+Szny8cqqlJ6T7fDgz5pMlK90v1GckTREbbnYU3Ye45ka8U6/UAs0fdLSawwCk1S9HMYxExN4dF3u9KWJLkXiE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DJllcOB6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="DJllcOB6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74FC1C4CEEF; Mon, 7 Apr 2025 15:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744039151; bh=ce3ClsriXC8LZWlvmEpmiJgErfC2vJ+4DZ1F22z7qGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DJllcOB6ApyGl1vtf78eKhMSP9v61uoe7U/RvhVO+YB0oOvYB30QXwzyxpWqp27/f 1fuHh1dlQvYSLkPFddkeuL/G9cGD+ti6Z3TuJ8TKN5vpInCsZLrzlcdEovYEyWNi4s A4iAjxl4U0BTNUkWBtMqpc42VJfizsQh3DGIv/Y1t4hD5/pyXDk4dhuk5x/auqpQ2h b/vHDDFHmJlpno9rsiua3uwp42/KbgeXIt1aOAbVAe7RTyfLvIBRRX5bO6rGgP8HGT yglQV42mDpU7F4wOrw/YYOweHIA33tDi1yOhv7q1AuVLboINJcnP/WmINSPeEFv5SY 2rz4JqYF37WyQ== From: Mario Limonciello To: mario.limonciello@amd.com, basavaraj.natikar@amd.com, jikos@kernel.org, bentiss@kernel.org Cc: Basavaraj Natikar , linux-input@vger.kernel.org Subject: [PATCH v4 2/2] HID: amd_sfh: Avoid clearing reports for SRA sensor Date: Mon, 7 Apr 2025 10:17:48 -0500 Message-ID: <20250407151835.1200867-3-superm1@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250407151835.1200867-1-superm1@kernel.org> References: <20250407151835.1200867-1-superm1@kernel.org> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Mario Limonciello SRA sensor doesn't allocate any memory for reports. Skip trying to clear memory for that sensor in cleanup path. Suggested-by: Basavaraj Natikar Signed-off-by: Mario Limonciello --- v4: * One more case for amd_sfh_hid_client_deinit() v3: * Less changes as amd_sfh_hid_client_deinit() covers a lot v2: * New patch --- drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c index c1bdf1e0d44af..0a9b44ce4904e 100644 --- a/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c +++ b/drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c @@ -83,6 +83,9 @@ static int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata) case ALS_IDX: privdata->dev_en.is_als_present = false; break; + case SRA_IDX: + privdata->dev_en.is_sra_present = false; + break; } if (cl_data->sensor_sts[i] == SENSOR_ENABLED) { @@ -237,6 +240,8 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) cleanup: amd_sfh_hid_client_deinit(privdata); for (i = 0; i < cl_data->num_hid_devices; i++) { + if (cl_data->sensor_idx[i] == SRA_IDX) + continue; devm_kfree(dev, cl_data->feature_report[i]); devm_kfree(dev, in_data->input_report[i]); devm_kfree(dev, cl_data->report_descr[i]);