From patchwork Fri Jan 6 15:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 40171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp879956wrt; Fri, 6 Jan 2023 07:26:16 -0800 (PST) X-Google-Smtp-Source: AMrXdXu1CRvPMdh/+HMkpi2phjNHsxc7CYIKFRK2kGbt8cxzlgy0h/UiiDvvatqSRZ3W1H8a8uz3 X-Received: by 2002:a05:6a20:4b1e:b0:a3:dc4e:74f9 with SMTP id fp30-20020a056a204b1e00b000a3dc4e74f9mr63629458pzb.19.1673018776171; Fri, 06 Jan 2023 07:26:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673018776; cv=none; d=google.com; s=arc-20160816; b=uBEG0xxWRcQQzywzyCFms7ovdcCjTiuRSFHATgF1MW/Idwru4Kr9OnUy4o7ewe3sED FnNaM9reOhWlV7DUOCdqqHpQeNyWxxBnNNu/HX73M83eFyBjGs9M/2Zchf+TqKIRORu5 XfXCEk1EwCf/EBTjs/fwuCixkZGWXS6JMy2U27LL/KgO6R1yYLih6+uHst/aMM8woLZK PwyYNVwGt1HI7cz46la32I9yalIaZd2jqrad6g/aBJdFX4l+1LuQ2DAPdRT6FystIokN CMa72NknjLGCEpZ2UDdsuxrDUylh8rNqxLUkXPMqQrUSsG7U35e2p42ch8LlbnBg3iSy aKvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=On1VhKFXiyUifKiYiOeeQs/2CXAvl2DCG+iNNigzgzM=; b=MV3x6leDN+iLXU4WkKaDtsJVntCIw2/kGxOkUPf/iHJbl+P6LTG75NGYt23iTjYVtd rXmSofb9cCKhp2a2JcxJ1S8qSrtLiIT1vUvADGeukbSbneef45EWVjfgaKuAOCcQNbxT BW93YrOFSgyOMs7EMKhbhSK7rsOpiFA0ApyzLLb3i3nKxQ+WrboffWS0vMCXVbL30uAK rG2VFSkgvJo05Xej/S4WGU7gD+TEE1pKV/+GXjz/YVnw9LUM0B98jPXQve2S15uSnoVd NMteK1WkLZM8G8j6Jqk31+9bP9C0NqvC65peaeztpEhYnHtpfHN/tLrdJIRDgRRKi+6C YUMg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 79-20020a630252000000b004792f347556si1884311pgc.623.2023.01.06.07.25.39; Fri, 06 Jan 2023 07:26:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234465AbjAFPXw (ORCPT + 99 others); Fri, 6 Jan 2023 10:23:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230442AbjAFPXp (ORCPT ); Fri, 6 Jan 2023 10:23:45 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3390845666 for ; Fri, 6 Jan 2023 07:23:44 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C8C6A143D; Fri, 6 Jan 2023 07:24:25 -0800 (PST) Received: from e126815.warwick.arm.com (e126815.arm.com [10.32.32.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 654243F71A; Fri, 6 Jan 2023 07:23:42 -0800 (PST) From: James Clark To: coresight@lists.linaro.org, quic_jinlmao@quicinc.com, suzuki.poulose@arm.com, mike.leach@linaro.org Cc: James Clark , Mathieu Poirier , Leo Yan , Alexander Shishkin , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] coresight: cti: Add PM runtime call in enable_store Date: Fri, 6 Jan 2023 15:23:29 +0000 Message-Id: <20230106152331.1374973-3-james.clark@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230106152331.1374973-1-james.clark@arm.com> References: <20230106152331.1374973-1-james.clark@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754287273721936916?= X-GMAIL-MSGID: =?utf-8?q?1754287336404539748?= From: Mao Jinlong In commit 6746eae4bbad ("coresight: cti: Fix hang in cti_disable_hw()") PM runtime calls are removed from cti_enable_hw/cti_disable_hw. When enabling CTI by writing enable sysfs node, clock for accessing CTI register won't be enabled. Device will crash due to register access issue. Add PM runtime call in enable_store to fix this issue. Fixes: 6746eae4bbad ("coresight: cti: Fix hang in cti_disable_hw()") Signed-off-by: Mao Jinlong [Change to only call pm_runtime_put if a disable happened] Signed-off-by: James Clark --- drivers/hwtracing/coresight/coresight-cti-sysfs.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-cti-sysfs.c b/drivers/hwtracing/coresight/coresight-cti-sysfs.c index 6d59c815ecf5..71e7a8266bb3 100644 --- a/drivers/hwtracing/coresight/coresight-cti-sysfs.c +++ b/drivers/hwtracing/coresight/coresight-cti-sysfs.c @@ -108,10 +108,19 @@ static ssize_t enable_store(struct device *dev, if (ret) return ret; - if (val) + if (val) { + ret = pm_runtime_resume_and_get(dev->parent); + if (ret) + return ret; ret = cti_enable(drvdata->csdev); - else + if (ret) + pm_runtime_put(dev->parent); + } else { ret = cti_disable(drvdata->csdev); + if (!ret) + pm_runtime_put(dev->parent); + } + if (ret) return ret; return size;