From patchwork Thu Feb 15 05:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maulik Shah X-Patchwork-Id: 201247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp185136dyb; Wed, 14 Feb 2024 21:36:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWos2kGuz2k8zjXYCaTM6xRud0HEWqOUTZtkV7rm5QthTqZ5KkZ/OvKz5p6skoMi4snkKeb9UwuKUskS5C0RVsqGzFI+g== X-Google-Smtp-Source: AGHT+IEzmcqu8IWdZDFD+9kALpcWQsexCdpEOXH4qEi2wEUNArCTWAHVIvH8ANVLCAhqaOLh9plx X-Received: by 2002:a17:903:11cd:b0:1db:82e3:8d7f with SMTP id q13-20020a17090311cd00b001db82e38d7fmr955919plh.16.1707975401526; Wed, 14 Feb 2024 21:36:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707975401; cv=pass; d=google.com; s=arc-20160816; b=Jpe0CCruaQ9FsrDtmEHljuZNbmos108hLCsUfRgFPvewmwaTkckj582sGsAnWs1fIK eQ3mk/MjurCnItCxG7IEc/uN9gKpr7m6et+sykeQJ4egGruv71ewO9DLEzY+MXxP/yjY h4RuUPwrJuTYj64o8ABTsYBz15JJhqMM6liIxHe2aSwWaQvNDK3ugoYJKyAghemnK7l+ LFvpTxxMZcinGoh48/xgVYyPg1p7qyCQapeAwTEqjo6hmwWp5CQX5VFMDCOFyHvNbHBq 256/2+6o/pf3jdSbg4CfX2/OTPPE3B+a/RW1vxwXxcxp4dR7V0M523512VXO9dd2EDU4 biXw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:message-id:content-transfer-encoding:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:subject:date :from:dkim-signature; bh=2+V8D7uubvlbgt8ur3hiSutHCd9haEhiJihAqruyUd0=; fh=FCKNhyi0FHSFO3Nsx6LSI8RkwaArpAJi+RFmX2hLnvg=; b=tEKQRCTlvPG0HlAJyQnoLzrwE4SJySAN3EUCx8ztEIYskneGqapqcS5y/YPaUviU01 /6i6w5DsqAgMML9FasTY9QetehZqcLPYlMnuII1prHTP57AjJ8CmE2zeAiR7STBJ/QRK PQy4EnyvWpYM4kNJfQ6kkNiFC2ZtOSnOx+/hLLvCiMJHzvnJPfeHeFmnBe3yfIKkPKiI OuiJnfnLPgRIyCFaSNRO5TpRFzqgIUp6g232vmZEM5t0ohbs72rJSQDVR1s52/Ddstbw CiaZGsk53hh4E4f4Zt7Q+AS/JPFXygbCYUeddFAzqOHjr0tnqcxqAMl7z05fmwo/h6zV OpFA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=moB1e84M; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-66306-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66306-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id j13-20020a170903028d00b001db420e7535si548673plr.23.2024.02.14.21.36.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 21:36:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-66306-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=moB1e84M; arc=pass (i=1 spf=pass spfdomain=quicinc.com dkim=pass dkdomain=quicinc.com dmarc=pass fromdomain=quicinc.com); spf=pass (google.com: domain of linux-kernel+bounces-66306-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66306-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 4045FB27108 for ; Thu, 15 Feb 2024 05:26:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3E23BC15B; Thu, 15 Feb 2024 05:26:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="moB1e84M" Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.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 0DC111C02; Thu, 15 Feb 2024 05:25:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707974757; cv=none; b=UHkEjvagH8XeXtikROSHjQk5pjgXp6su2MSdqUEf21nfKsyb1/mN8WYpwXYstx1s4DoixAWHD+XHSq6lVMzbnM6JCDhys0qGXk77ZONw2/+e3mrZ8aJ+B90gzcflGJQlMaVCV00LzlZRnYMa4x8QlS1Hw/zt0Br0Stg3dg9XymY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707974757; c=relaxed/simple; bh=MQNrlxLfOlQ4+IBBzfR0pPFIYEcyFupeT8e5JPiivjc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:To:CC; b=ktaZmAcK3PuDZTFIrCQfCow4hzQklMhxKi1W3oEEDalDg8tYNpMaTkVyGSTpYgxzvBtPdIOoy9cNatJKW6ipalavuoUBPL7vWkFQN6BplVp2ThoU/mkJHXnIkeut7U6avPLoLGCHRVkYXUNJq1q8g93kSrVxlW31eJAHif3uPCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=moB1e84M; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 41F4EH1C018334; Thu, 15 Feb 2024 05:25:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= from:date:subject:mime-version:content-type :content-transfer-encoding:message-id:to:cc; s=qcppdkim1; bh=2+V 8D7uubvlbgt8ur3hiSutHCd9haEhiJihAqruyUd0=; b=moB1e84MSwoP9o98EVk 1h9mJLSPwEhbuRVNuS1VS37s1lzgCf0GXDAu+0aFCaT2OYM6nNXO1/DZn8Kvjy0y lqx65/mYu70JxX8AKRqdyIzNzrTKywJb7PtBWX2o8YWUW1aSPtAZyD7vl02JXOQ4 O2KJJ4bGa6jtdoTGmrpMYG5tXtjBN1ZoHsmH0fXFs2bQGijKfpIu1XNWgE2NbXOi 5VL5acZJG/w56R+AF+2YYCgdEU6dFL5+lTNT9FRBxkedlLNhxEEtPWnkUgNCPCSc iCwfVn45tX10ENDYWff3Yzw3xS+Zp3jjdLv7YgFYqEqjSaQuv0ZbDTcJfmP1Fwez +3Q== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3w8jrjb33f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 05:25:51 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 41F5Pobr020422 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Feb 2024 05:25:50 GMT Received: from hu-mkshah-hyd.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 14 Feb 2024 21:25:47 -0800 From: Maulik Shah Date: Thu, 15 Feb 2024 10:55:44 +0530 Subject: [PATCH v4] soc: qcom: rpmh-rsc: Enhance check for VRM in-flight request Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20240215-rpmh-rsc-fixes-v4-1-9cbddfcba05b@quicinc.com> X-B4-Tracking: v=1; b=H4sIAFegzWUC/2XOyw6CMBQE0F8hXXtNX0Bw5X8YFm252C54eItEQ /h3C4kx6nIymZNZWEQKGNkpWxjhHGIY+hT0IWPOm/6KEJqUmeRScyk40Nh5oOigDQ+MoEppysp YVWjL0mgk3Iu0udQptzR0MHlC82GEqH6ZWYIA1NJxU6EqWn6+3YMLvTu6odtcH+I00HP/OatNf 1+Sf5ZKlrDIm5LnjbX5l1Wv6/oCNfuH2/YAAAA= To: Bjorn Andersson , Konrad Dybcio CC: , , , , , , Maulik Shah X-Mailer: b4 0.12.5-dev-2aabd X-Developer-Signature: v=1; a=ed25519-sha256; t=1707974747; l=6089; i=quic_mkshah@quicinc.com; s=20240109; h=from:subject:message-id; bh=MQNrlxLfOlQ4+IBBzfR0pPFIYEcyFupeT8e5JPiivjc=; b=ncVEmfi6adSTQLStwXVSxVhR0V/BCDV7sQKLVpLa5xi0sLFOhxEuPle6d5y88yNxknktVMCi4 +oeuZtHyYAFBfMnWplig6jWRZfRFjQjemmY4SNdxRy6dEgcmA6Y+TCG X-Developer-Key: i=quic_mkshah@quicinc.com; a=ed25519; pk=bd9h5FIIliUddIk8p3BlQWBlzKEQ/YW5V+fe759hTWQ= X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: WaqstAw6PoR5XW2vSaaAghjzHAFJG5DF X-Proofpoint-ORIG-GUID: WaqstAw6PoR5XW2vSaaAghjzHAFJG5DF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-02-15_04,2024-02-14_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 impostorscore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 spamscore=0 phishscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2401310000 definitions=main-2402150037 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790667212544812675 X-GMAIL-MSGID: 1790942014872573108 Each RPMh VRM accelerator resource has 3 or 4 contiguous 4-byte aligned addresses associated with it. These control voltage, enable state, mode, and in legacy targets, voltage headroom. The current in-flight request checking logic looks for exact address matches. Requests for different addresses of the same RPMh resource as thus not detected as in-flight. Add new cmd-db API cmd_db_match_resource_addr() to enhance the in-flight request check for VRM requests by ignoring the address offset. This ensures that only one request is allowed to be in-flight for a given VRM resource. This is needed to avoid scenarios where request commands are carried out by RPMh hardware out-of-order leading to LDO regulator over-current protection triggering. Fixes: 658628e7ef78 ("drivers: qcom: rpmh-rsc: add RPMH controller for QCOM SoCs") cc: stable@vger.kernel.org Reviewed-by: Konrad Dybcio Tested-by: Elliot Berman # sm8650-qrd Signed-off-by: Maulik Shah --- Changes in v4: - Simplify cmd_db_match_resource_addr() - Remove unrelated changes to newly added logic - Update function description comments - Replace Signed-off-by: with Tested-by: from Elliot - Link to v3: https://lore.kernel.org/r/20240212-rpmh-rsc-fixes-v3-1-1be0d705dbb5@quicinc.com Changes in v3: - Fix s-o-b chain - Add cmd-db API to compare addresses - Reuse already defined resource types in cmd-db - Add Fixes tag and Cc to stable - Retain Reviewed-by tag of v2 - Link to v2: https://lore.kernel.org/r/20240119-rpmh-rsc-fixes-v2-1-e42c0a9e36f0@quicinc.com Changes in v2: - Use GENMASK() and FIELD_GET() - Link to v1: https://lore.kernel.org/r/20240117-rpmh-rsc-fixes-v1-1-71ee4f8f72a4@quicinc.com --- drivers/soc/qcom/cmd-db.c | 32 +++++++++++++++++++++++++++++++- drivers/soc/qcom/rpmh-rsc.c | 3 ++- include/soc/qcom/cmd-db.h | 10 +++++++++- 3 files changed, 42 insertions(+), 3 deletions(-) --- base-commit: 615d300648869c774bd1fe54b4627bb0c20faed4 change-id: 20240210-rpmh-rsc-fixes-372a79ab364b Best regards, diff --git a/drivers/soc/qcom/cmd-db.c b/drivers/soc/qcom/cmd-db.c index a5fd68411bed..86fb2cd4f484 100644 --- a/drivers/soc/qcom/cmd-db.c +++ b/drivers/soc/qcom/cmd-db.c @@ -1,6 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved. */ +/* + * Copyright (c) 2016-2018, 2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. + */ +#include #include #include #include @@ -17,6 +21,8 @@ #define MAX_SLV_ID 8 #define SLAVE_ID_MASK 0x7 #define SLAVE_ID_SHIFT 16 +#define SLAVE_ID(addr) FIELD_GET(GENMASK(19, 16), addr) +#define VRM_ADDR(addr) FIELD_GET(GENMASK(19, 4), addr) /** * struct entry_header: header for each entry in cmddb @@ -220,6 +226,30 @@ const void *cmd_db_read_aux_data(const char *id, size_t *len) } EXPORT_SYMBOL_GPL(cmd_db_read_aux_data); +/** + * cmd_db_match_resource_addr() - Compare if both Resource addresses are same + * + * @addr1: Resource address to compare + * @addr2: Resource address to compare + * + * Return: true if two addresses refer to the same resource, false otherwise + */ +bool cmd_db_match_resource_addr(u32 addr1, u32 addr2) +{ + /* + * Each RPMh VRM accelerator resource has 3 or 4 contiguous 4-byte + * aligned addresses associated with it. Ignore the offset to check + * for VRM requests. + */ + if (addr1 == addr2) + return true; + else if (SLAVE_ID(addr1) == CMD_DB_HW_VRM && VRM_ADDR(addr1) == VRM_ADDR(addr2)) + return true; + + return false; +} +EXPORT_SYMBOL_GPL(cmd_db_match_resource_addr); + /** * cmd_db_read_slave_id - Get the slave ID for a given resource address * diff --git a/drivers/soc/qcom/rpmh-rsc.c b/drivers/soc/qcom/rpmh-rsc.c index a021dc71807b..daf64be966fe 100644 --- a/drivers/soc/qcom/rpmh-rsc.c +++ b/drivers/soc/qcom/rpmh-rsc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved. */ #define pr_fmt(fmt) "%s " fmt, KBUILD_MODNAME @@ -557,7 +558,7 @@ static int check_for_req_inflight(struct rsc_drv *drv, struct tcs_group *tcs, for_each_set_bit(j, &curr_enabled, MAX_CMDS_PER_TCS) { addr = read_tcs_cmd(drv, drv->regs[RSC_DRV_CMD_ADDR], i, j); for (k = 0; k < msg->num_cmds; k++) { - if (addr == msg->cmds[k].addr) + if (cmd_db_match_resource_addr(msg->cmds[k].addr, addr)) return -EBUSY; } } diff --git a/include/soc/qcom/cmd-db.h b/include/soc/qcom/cmd-db.h index c8bb56e6852a..47a6cab75e63 100644 --- a/include/soc/qcom/cmd-db.h +++ b/include/soc/qcom/cmd-db.h @@ -1,5 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. */ +/* + * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved. + * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. + */ #ifndef __QCOM_COMMAND_DB_H__ #define __QCOM_COMMAND_DB_H__ @@ -21,6 +24,8 @@ u32 cmd_db_read_addr(const char *resource_id); const void *cmd_db_read_aux_data(const char *resource_id, size_t *len); +bool cmd_db_match_resource_addr(u32 addr1, u32 addr2); + enum cmd_db_hw_type cmd_db_read_slave_id(const char *resource_id); int cmd_db_ready(void); @@ -31,6 +36,9 @@ static inline u32 cmd_db_read_addr(const char *resource_id) static inline const void *cmd_db_read_aux_data(const char *resource_id, size_t *len) { return ERR_PTR(-ENODEV); } +static inline bool cmd_db_match_resource_addr(u32 addr1, u32 addr2) +{ return false; } + static inline enum cmd_db_hw_type cmd_db_read_slave_id(const char *resource_id) { return -ENODEV; }