From patchwork Fri Nov 18 09:08:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 22219 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp80742wrr; Fri, 18 Nov 2022 01:16:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf4cMwK5/qVlHY+A2Sk0b4Mnfo1hJ2T4Xw7KrzP8FgQe8AC8tGaSdNHtpi04r3EJRS2ZOiSS X-Received: by 2002:a17:907:204c:b0:7ae:63b8:d688 with SMTP id pg12-20020a170907204c00b007ae63b8d688mr5302335ejb.222.1668762979724; Fri, 18 Nov 2022 01:16:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668762979; cv=none; d=google.com; s=arc-20160816; b=oFl2+Xbrmk7gBAhWfJW5UTNsNhPoMinvypDq0LBAf9fF5KO2IYiDzeJajIQ39Nmm3y Qr+yR51E/tO1zppbVMPL5QQk/9+G8jDe0SNdkb44YUG/SMM6Ddu1j7we3z+Ar9Lvda3v FXO/SQrvHOtKfR2yfy96Bqg5cv302WCAyXj49H3tST4ZGN+fnHHzZ61UJKMZm5AvZJS/ neSWZ8DQz5l2yWip0krUllbOjW0mCctOeChEEnW3aI5/zrpEJoXHWWdPkzm6JDOvCpn0 WgEbgD635NDdLn8fbKX964RsYb6m2Yn0ssvUk94ceqwUdgYxjqVGshQFDceiiyaViT4r yNTQ== 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=jRa/PoxgqDRwmd3eIz//88s67gtNdYgRfX+YpZPu+BM=; b=cSiNJZNNgcAWcDX+c4BzgWCHTCbHsX/4uHBBpEd4Bk0poiqLiC9TRZ14FJNtuUlkHl 31zBbE+g59Hema8cW0bEeiCl4B8W+1REIfoLtBDCVZlDfjBpZoBZGbswjz/W+jkaf6dz 9dQ2/SqGudClQwV4gSjTREZBkZApKvxeA2HSzfxI58qErYP/3hmSBqlpK+eP63Qyt3+G VRA6LM3zfNhJjtBnL1IqyEMtaHK/SVmm9qbZMrwvhpclMl/3bZET2QHl5WaVDFh/L6r0 +ObKapZQty+pgs91dng5PwgH/8XYYYivT+VHhHAsoQmxsPdyM0nt28PJoPN4TXK191hS 65aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=pGDB+b0k; 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=fairphone.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d15-20020aa7d68f000000b0045829a1c0b3si2580491edr.251.2022.11.18.01.15.54; Fri, 18 Nov 2022 01:16:19 -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; dkim=pass header.i=@fairphone.com header.s=fair header.b=pGDB+b0k; 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=fairphone.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241773AbiKRJMD (ORCPT + 99 others); Fri, 18 Nov 2022 04:12:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241766AbiKRJL5 (ORCPT ); Fri, 18 Nov 2022 04:11:57 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 601A2BF72 for ; Fri, 18 Nov 2022 01:11:55 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id v17so6248221edc.8 for ; Fri, 18 Nov 2022 01:11:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jRa/PoxgqDRwmd3eIz//88s67gtNdYgRfX+YpZPu+BM=; b=pGDB+b0kZ/sQIJwkZVnS6mJ7ZHtv/wyTZg8nv9lMsZgqMRY3qSg3K4iYahUKU1UPMy 6oxTtEbLtTIgMekKU6EGmV8xG8HOBX/eBx+zPYrgtTyt4MexT81gGPMcpve6KrHdllvi cAcT6AIjTv8pDRpLwf+HUKK/70BCiuZnkcpOm1e3f8Z+KVwdAD/dCjajmZ+YRdlPbnPQ gws48p64W7rF9njDLmrxgIoy8e+puJXk/Mu0Xg9vsi/JGcFXXOJI2nfrAPA1dnNWUR0P 7VRGUTU3T2yg/LEmo20Tw7wpQv7cLZ6SSctEkUQXLss2NLsRH1POhLQBisnIX/fuxy7C yQZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=jRa/PoxgqDRwmd3eIz//88s67gtNdYgRfX+YpZPu+BM=; b=M52Mir3NDBc7HC/mpNOsLjEB6nNqsnAi7TpeaC5rwz/nDJB6E6kduFcAG4nHVtu8Fk VNdjEoscsUAHPZiLX+XD/CGFyvClNiuNqSA8rpokAteUJ9VCrCqYL8FTI5MTxezDTh8p 4DgnTuUdvAS3s3BWsAwcJQwNnunX8EI8Fjihr212g/iuOMf0LwgG62gS6Ee+fyGDrR0K C2vWiUZl7sgURidsbtWfsYRfsRXyYmm45WZrtm92BvBLJGomz7SdXoy4OY2xohLbbHMG 8ZPpBhDVeq0UvCNMOtT89m/x29wIIEpil7LZKK61UZAqBOGrd4vX2Q7w2Ydr2irZ+/5l IS3g== X-Gm-Message-State: ANoB5pnqQgxj8Jtvr6m75keW4x1bc/utJO5HDqjSfgteescYCHQwEsD1 oWjCOF+7W8HauMnmrKFbjFPtRg== X-Received: by 2002:aa7:d593:0:b0:461:de5e:ba52 with SMTP id r19-20020aa7d593000000b00461de5eba52mr5304051edq.177.1668762713858; Fri, 18 Nov 2022 01:11:53 -0800 (PST) Received: from otso.arnhem.chello.nl (k10064.upc-k.chello.nl. [62.108.10.64]) by smtp.gmail.com with ESMTPSA id v15-20020aa7dbcf000000b0046182b3ad46sm1535647edt.20.2022.11.18.01.11.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 01:11:53 -0800 (PST) From: Luca Weiss To: linux-arm-msm@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Luca Weiss , Mukesh Ojha , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Rishabh Bhatnagar , Siddharth Gupta , Sibi Sankar , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] remoteproc: qcom_q6v5_pas: disable wakeup on probe fail or remove Date: Fri, 18 Nov 2022 10:08:15 +0100 Message-Id: <20221118090816.100012-1-luca.weiss@fairphone.com> X-Mailer: git-send-email 2.38.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 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?1749824810262330862?= X-GMAIL-MSGID: =?utf-8?q?1749824810262330862?= Leaving wakeup enabled during probe fail (-EPROBE_DEFER) or remove makes the subsequent probe fail. [ 3.749454] remoteproc remoteproc0: releasing 3000000.remoteproc [ 3.752949] qcom_q6v5_pas: probe of 3000000.remoteproc failed with error -17 [ 3.878935] remoteproc remoteproc0: releasing 4080000.remoteproc [ 3.887602] qcom_q6v5_pas: probe of 4080000.remoteproc failed with error -17 [ 4.319552] remoteproc remoteproc0: releasing 8300000.remoteproc [ 4.332716] qcom_q6v5_pas: probe of 8300000.remoteproc failed with error -17 Fix this by disabling wakeup in both cases so the driver can properly probe on the next try. Fixes: a781e5aa5911 ("remoteproc: core: Prevent system suspend during remoteproc recovery") Fixes: dc86c129b4fb ("remoteproc: qcom: pas: Mark devices as wakeup capable") Reviewed-by: Mukesh Ojha Signed-off-by: Luca Weiss Reviewed-by: Sibi Sankar Reviewed-by: Caleb Connolly --- Changes in v2: * move new line before rproc_free which frees 'adsp' as well * pick up tags drivers/remoteproc/qcom_q6v5_pas.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 6afd0941e552..67f5152e2398 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -556,6 +556,7 @@ static int adsp_probe(struct platform_device *pdev) detach_proxy_pds: adsp_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); free_rproc: + device_init_wakeup(adsp->dev, false); rproc_free(rproc); return ret; @@ -572,6 +573,7 @@ static int adsp_remove(struct platform_device *pdev) qcom_remove_sysmon_subdev(adsp->sysmon); qcom_remove_smd_subdev(adsp->rproc, &adsp->smd_subdev); qcom_remove_ssr_subdev(adsp->rproc, &adsp->ssr_subdev); + device_init_wakeup(adsp->dev, false); rproc_free(adsp->rproc); return 0;