From patchwork Fri Nov 18 09:08:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 22220 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp80989wrr; Fri, 18 Nov 2022 01:16:55 -0800 (PST) X-Google-Smtp-Source: AA0mqf64veaZ6hUugOuMjAT/Wt0py5PYVfJ/fDil92G1xru8hhZ6uK3g5tvwDP0gyyrQUgeaFyXE X-Received: by 2002:a17:906:298c:b0:7ad:eb7f:d082 with SMTP id x12-20020a170906298c00b007adeb7fd082mr5083175eje.356.1668763014978; Fri, 18 Nov 2022 01:16:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668763014; cv=none; d=google.com; s=arc-20160816; b=Apn8IWLFYhpCevkdVYluwYrV5G3HAimDqqQNlx+0lyIJh83O+4h4D4rsQQyPgar6uv RaWKqXpuoiTtve1JbrnLk8q4CDHZ9oRZJoH+RxXB/ZB3tzSwWxTk96aGD2CQfbv3wXao OIgQlXh96amSSL8qp64ko4qlt3pMQ102qqbuL6NnfGNJD/w2LsHVWuuwQ7cdzZ1eBCbn kFjsM+wOHPqsTeOooAvNv7UtQYY60QdoKEcoVIO8fozAR5CYbVvy1tf5jQizB+i1gx1J 1zXoJ9X7GW+OMPrh6Om8Kw5383eH1afNW2iDAgVTc7LmqmokT4KhVH0jSmOhYm3lMm/9 nkcg== 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 :dkim-signature; bh=kkFb1u/bvHgUN39MgLh4iioExuZRwxW/sCGAVXGpD1w=; b=TgVzPf5GZGWB6tuqXG/jNKPUUQ5309n+ZYs1+9/3HMAV1gKnjy6QIHz4giqrS1zkUK NN4IIxNKppo5Kk5lZqo6EVBIAYVGf7qgG3LQYOwUXnIhBSFtex61PvI5AvUd58ZR0iYI QeUuoZUuWLQMNNazlETHy3kka1CfK5wCGUqfdVLLQbeXCt9UEcj5EuG1JYVlPCQi68+I tNusVxsH4wc3Wq0fh4zAnsTHP/QaDiafkQTrZCiKJm30tOzENKNa/365v26ug78A3Tw8 tL5BklIpPM7NObqalcK+LeAgq3wo0o9wjy2hN2HTu2uLVow677JyxdH/7jFkWpUhgyzL 5kJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=IMnvVf87; 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 g11-20020a056402090b00b00463ba265d95si3049670edz.392.2022.11.18.01.16.27; Fri, 18 Nov 2022 01:16:54 -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=IMnvVf87; 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 S241779AbiKRJMG (ORCPT + 99 others); Fri, 18 Nov 2022 04:12:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241787AbiKRJMA (ORCPT ); Fri, 18 Nov 2022 04:12:00 -0500 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57BE56150A for ; Fri, 18 Nov 2022 01:11:56 -0800 (PST) Received: by mail-ej1-x633.google.com with SMTP id n20so11657116ejh.0 for ; Fri, 18 Nov 2022 01:11:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kkFb1u/bvHgUN39MgLh4iioExuZRwxW/sCGAVXGpD1w=; b=IMnvVf87a7Lzj0PVzl0gYKSZgaRzxdyMizeIXc3qsaD96qJl5aUWbc95xrL1pG34aB Gouzh4wes8Wtn31PpcB8hJpHPGGHVPhGX4QVmk8v/SLa2vDTEFZUTBAT+DpuMLHN1ErS UbETbxJc69f0JSViyXF5GHa9MElblvPOok/mhI3iommcdV53vBDBHs3CUu7AS+FFd97v NVt3e8whlz++DfvmP+9Sg6jzEj9Og0ikVGxU86h+dFsrFl1pvunrdCAh+YbJi/71Ge6u SHz/HHaPH+XqxyhZuV46YtayBV9wMOJMZXMNU8hJ4a02CvWv0d+MX7N5UdVW5oooJQjv veLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kkFb1u/bvHgUN39MgLh4iioExuZRwxW/sCGAVXGpD1w=; b=IHkireWlXOVAblEOyyQkA93l3Tdt/WXEVXKP61qYEV8QdZGO5bl7/u54ljnG6usANt ZQm1V5Mi+vPyQE2ybBntoHizhtbex+H3PEGhi+29qO1Au31qq1yha6J+T5tKQqi1htLN ub5B33o9oRSmv/CMP1j1wkKTShJn3pdkpIHiBhN/XXm38zyMutel/Do9RifbDYBwJfrU aBiOFxosBeQKizrnAGI/pI+bnYK9I26NIviw+m1B/260GZLaUBEsS5kj4RTr3QSC+t9a vszYDHJYfUM/YEX1/RZrbZ7KKu+iaUB/z26kLws6LNmwz2NBa+9OXbMuvtRq1GbEhbnU qAlA== X-Gm-Message-State: ANoB5plrJdt7PNXs5gho4YFvklumuJa5CqrlV1r2T9FIdfnbRmq5l6cF cNhb2gzczSuIN5xS5P5fMVnlAg== X-Received: by 2002:a17:906:1614:b0:78d:4e5b:ffaa with SMTP id m20-20020a170906161400b0078d4e5bffaamr5082112ejd.455.1668762714878; Fri, 18 Nov 2022 01:11:54 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Nov 2022 01:11:54 -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 , Sibi Sankar , Mukesh Ojha , Andy Gross , Bjorn Andersson , Konrad Dybcio , Mathieu Poirier , Sibi Sankar , linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] remoteproc: qcom_q6v5_pas: detach power domains on remove Date: Fri, 18 Nov 2022 10:08:16 +0100 Message-Id: <20221118090816.100012-2-luca.weiss@fairphone.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221118090816.100012-1-luca.weiss@fairphone.com> References: <20221118090816.100012-1-luca.weiss@fairphone.com> 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=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?1749824847285220590?= X-GMAIL-MSGID: =?utf-8?q?1749824847285220590?= We need to detach from the power domains also on remove, not just on probe fail so a subsequent probe works as expected. Otherwise the following error appears on re-probe: [ 29.452005] sysfs: cannot create duplicate filename '/devices/genpd:0:3000000.remoteproc' [ 29.477121] CPU: 1 PID: 483 Comm: sh Tainted: G W 6.1.0-rc4-00075-g71a113770bda #78 [ 29.510319] Hardware name: Fairphone 4 (DT) [ 29.538335] Call trace: [ 29.564470] dump_backtrace.part.0+0xe0/0xf0 [ 29.592602] show_stack+0x18/0x30 [ 29.619616] dump_stack_lvl+0x64/0x80 [ 29.646834] dump_stack+0x18/0x34 [ 29.673541] sysfs_warn_dup+0x60/0x7c [ 29.700592] sysfs_create_dir_ns+0xec/0x110 [ 29.728057] kobject_add_internal+0xb8/0x374 [ 29.755530] kobject_add+0x9c/0x104 [ 29.782072] device_add+0xbc/0x8a0 [ 29.808445] device_register+0x20/0x30 [ 29.835175] genpd_dev_pm_attach_by_id+0xa4/0x190 [ 29.862851] genpd_dev_pm_attach_by_name+0x3c/0xb0 [ 29.890472] dev_pm_domain_attach_by_name+0x20/0x30 [ 29.918212] adsp_probe+0x278/0x580 [ 29.944384] platform_probe+0x68/0xc0 [ 29.970603] really_probe+0xbc/0x2dc [ 29.996662] __driver_probe_device+0x78/0xe0 [ 30.023491] device_driver_attach+0x48/0xac [ 30.050215] bind_store+0xb8/0x114 [ 30.075957] drv_attr_store+0x24/0x3c [ 30.101874] sysfs_kf_write+0x44/0x54 [ 30.127751] kernfs_fop_write_iter+0x120/0x1f0 [ 30.154448] vfs_write+0x1ac/0x380 [ 30.179937] ksys_write+0x70/0x104 [ 30.205274] __arm64_sys_write+0x1c/0x2c [ 30.231060] invoke_syscall+0x48/0x114 [ 30.256594] el0_svc_common.constprop.0+0x44/0xec [ 30.283183] do_el0_svc+0x2c/0xd0 [ 30.308320] el0_svc+0x2c/0x84 [ 30.333059] el0t_64_sync_handler+0xf4/0x120 [ 30.359001] el0t_64_sync+0x18c/0x190 [ 30.384385] kobject_add_internal failed for genpd:0:3000000.remoteproc with -EEXIST, don't try to register things with the same name in the same directory. [ 30.406029] remoteproc remoteproc0: releasing 3000000.remoteproc [ 30.416064] qcom_q6v5_pas: probe of 3000000.remoteproc failed with error -17 Fixes: 17ee2fb4e856 ("remoteproc: qcom: pas: Vote for active/proxy power domains") Reviewed-by: Sibi Sankar Reviewed-by: Mukesh Ojha Signed-off-by: Luca Weiss --- Changes in v2: * pick up tags drivers/remoteproc/qcom_q6v5_pas.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index 67f5152e2398..a14ff1142e76 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c @@ -573,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); + adsp_pds_detach(adsp, adsp->proxy_pds, adsp->proxy_pd_count); device_init_wakeup(adsp->dev, false); rproc_free(adsp->rproc);