From patchwork Wed May 17 16:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 95428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1277695vqo; Wed, 17 May 2023 09:49:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ67ah/U1b1D8TFPXZhTutHdMwSu76yMhSiqslSLihfxpr/PKLX4vtomElp7Jw8ZHsA1mu2w X-Received: by 2002:a17:902:ec82:b0:1a9:581d:3efb with SMTP id x2-20020a170902ec8200b001a9581d3efbmr54388127plg.6.1684342167143; Wed, 17 May 2023 09:49:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684342167; cv=none; d=google.com; s=arc-20160816; b=p3AzdVgABtpb0M7jRKKshEpPJqFWDKbGUqot47DPzqglSQRi/4/c3oZF3dx5PmxIjk hKDsClRaRe6cYUNQkRzTBdSrK5QvbsDFzKXBYVIKAdFNmIDAhDKikA+lk+GPNiy9R0zB tXRDNBnuYH+431h1ch3Z0Y6IRWEciiTqSfZka+gyWxUWIB15S5XevWu7fjKU6rl6w0k9 qRqlOLxYbK6UvAmaKmLRyWcl0VNNmr0Lm5/54+xolH0OZw16qV0au5Qcwz4gfEh515w0 NIFPKLw6kPYciw0ghPehxbvM+yqQ8zRHpcy8r4yAiXk3IZ5l1eb5cEbqGvvd5gJlIK+I SGWA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=MQiqGo5OUgc8PM0tlImiY0vOLzMFeyySbnhueagWXW0=; b=ShBzL9ZVal59ABchPvYgKNtcUhkedAm7goqLYgyZw/TkSFcuOd7yJ94a+T8Xg1ukEB ZP5AZHsdbgXvlg+22AmGMAlwS8ytXpyk9NODiE2HQwKQOEZUcsZv08EwEHgK9qd2CCEM W4/y7XuMtE+OYQIbeFaQSiII0jotCQpqLLasU4vsppjOdOLqpcj+2lDtvr5ZhKLtLRqP KkcZVyA9Sz4bNApcDBP0CUjcxOFwp9Lq2A7pLibaga+q0UxOORCt/4lVyFWh0nERSzTU 2XdFvg4XL9pvSUUc8ZTtS2HeG67n6yVhuevW1oVnZUDCoUHqma/AwG0jqhRGJhKBjK5f pSVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NXGPRAWs; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b17-20020a170902ed1100b001ab18eb1764si9207333pld.131.2023.05.17.09.49.14; Wed, 17 May 2023 09:49:27 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=NXGPRAWs; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229791AbjEQQiE (ORCPT + 99 others); Wed, 17 May 2023 12:38:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229803AbjEQQiC (ORCPT ); Wed, 17 May 2023 12:38:02 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49C2B7687 for ; Wed, 17 May 2023 09:37:54 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-50bc5197d33so1882312a12.1 for ; Wed, 17 May 2023 09:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1684341472; x=1686933472; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=MQiqGo5OUgc8PM0tlImiY0vOLzMFeyySbnhueagWXW0=; b=NXGPRAWs7s+I++k10tlcbvOI3I26C+3zPmAV8+Ii6IBAIZGrOqSEHs9TpiATmbJVQY wNIyuJT5G9+qjb0uK6o8T9yStT9hnn6GqXmbk3dtCSlLa1MSqMdGdmbMB+rXMLjwsWUi N4+dB/aMHw41SUns7RwI8JV9/UM04Ngc2wMinIfkBALWhMd3RN0Tz2kxJKvUzT2MfHWI V9VY5IEE52Yx7L3y1NSZeW0Iwo2dpfK1hqAcdCRdt1PTg8FaaLu5s/LFopYobeAvHRN2 8PpB1ehRVTtak9Nk6zR6w4idv3tNj4Rs2AdWZLZ7lbAVhasdkQ+149i5pXA1g8TL6HWW 2IZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684341472; x=1686933472; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MQiqGo5OUgc8PM0tlImiY0vOLzMFeyySbnhueagWXW0=; b=SHc6tuHK/LpGqECP5YeiL6IBxaTC32LxR4Kn/J4DbY+WqrFCuTtCsFmHMp4MHo3pmR PnoWZ5B0KUtQ6HTm8R+frnAEqFSff7JEcnUZDNdeKrB//pEXrEXPDqLF3i97EWL//xSc z6W7fr8KgK+TGy1LqZUW4x/gdzkZSHVF7jWFpMljp5aUgoBBM5+Sbne1ajMn+yD7L1dI J+kEpaToE0udUvwj1blQB2NTfUionR3b5c3+6RY7SpNwi+VlDMfw1YkRHdBEOiARM0aQ sHyM2tpEqT9OK/Wswa6yhp0Mle+5qTBuz1VG+t2xkSHSWvZkMgQIMtlS9+A8Q5jbTezv TJtA== X-Gm-Message-State: AC+VfDxx6UiZqR1iHY+egpqw98xO+5PO9ihGiGy+pTkggBEUoZHvJZrJ sJfewx+9zeP26hX6JUlCl32qHw== X-Received: by 2002:aa7:c0c3:0:b0:50b:cff8:ff1f with SMTP id j3-20020aa7c0c3000000b0050bcff8ff1fmr2388143edp.42.1684341472511; Wed, 17 May 2023 09:37:52 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:c9ff:4c84:dd21:568d]) by smtp.gmail.com with ESMTPSA id t21-20020aa7d715000000b0050bc041d2a8sm9284827edq.15.2023.05.17.09.37.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 09:37:52 -0700 (PDT) From: Krzysztof Kozlowski To: Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , Andy Gross , Bjorn Andersson , Konrad Dybcio , =?utf-8?q?P=C3=A9ter_Ujfalusi?= , Srinivas Kandagatla , Charles Keepax , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] soundwire: qcom: fix unbalanced pm_runtime_put() Date: Wed, 17 May 2023 18:37:49 +0200 Message-Id: <20230517163750.997629-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=unavailable 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?1766160772614301878?= X-GMAIL-MSGID: =?utf-8?q?1766160772614301878?= This reverts commit 57ed510b0547 ("soundwire: qcom: use pm_runtime_resume_and_get()") which introduced unbalanced pm_runtime_put(), when device did not have runtime PM enabled. If pm_runtime_resume_and_get() failed with -EACCES, the driver continued execution and finally called pm_runtime_put_autosuspend(). Since pm_runtime_resume_and_get() drops the usage counter on every error, this lead to double decrement of that counter visible in certain debugfs actions on unattached devices (still in reset state): $ cat /sys/kernel/debug/soundwire/master-0-0/sdw:0:0217:f001:00:0/registers qcom-soundwire 3210000.soundwire-controller: swrm_wait_for_wr_fifo_avail err write overflow soundwire sdw-master-0: trf on Slave 1 failed:-5 read addr e36 count 1 soundwire sdw:0:0217:f001:00:0: Runtime PM usage count underflow! Fixes: 57ed510b0547 ("soundwire: qcom: use pm_runtime_resume_and_get()") Signed-off-by: Krzysztof Kozlowski Reviewed-by: Pierre-Louis Bossart --- drivers/soundwire/qcom.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index aad5942e5980..f442280af9d3 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -614,11 +614,12 @@ static irqreturn_t qcom_swrm_wake_irq_handler(int irq, void *dev_id) struct qcom_swrm_ctrl *ctrl = dev_id; int ret; - ret = pm_runtime_resume_and_get(ctrl->dev); + ret = pm_runtime_get_sync(ctrl->dev); if (ret < 0 && ret != -EACCES) { dev_err_ratelimited(ctrl->dev, - "pm_runtime_resume_and_get failed in %s, ret %d\n", + "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); + pm_runtime_put_noidle(ctrl->dev); return ret; } @@ -1197,11 +1198,12 @@ static int qcom_swrm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai; int ret, i; - ret = pm_runtime_resume_and_get(ctrl->dev); + ret = pm_runtime_get_sync(ctrl->dev); if (ret < 0 && ret != -EACCES) { dev_err_ratelimited(ctrl->dev, - "pm_runtime_resume_and_get failed in %s, ret %d\n", + "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); + pm_runtime_put_noidle(ctrl->dev); return ret; } @@ -1402,11 +1404,12 @@ static int swrm_reg_show(struct seq_file *s_file, void *data) struct qcom_swrm_ctrl *ctrl = s_file->private; int reg, reg_val, ret; - ret = pm_runtime_resume_and_get(ctrl->dev); + ret = pm_runtime_get_sync(ctrl->dev); if (ret < 0 && ret != -EACCES) { dev_err_ratelimited(ctrl->dev, - "pm_runtime_resume_and_get failed in %s, ret %d\n", + "pm_runtime_get_sync failed in %s, ret %d\n", __func__, ret); + pm_runtime_put_noidle(ctrl->dev); return ret; }