From patchwork Thu Feb 22 10:12:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 204668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp153584dyb; Thu, 22 Feb 2024 02:13:53 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVKV9+9H3z/anHWi7YPBtfJaZBYtl22g57Yy1+APFVIuZTKEvtAMHeQ6nRG1LRTf6Bu7MOP4Dx9EeOuXMLRhHCZQ2npjg== X-Google-Smtp-Source: AGHT+IEfEiGwiYzyhYIsWgo+vvguaojSDRg0s8KG2agiIVFO8RL4CbXSj/nOvTv8avS9Pa34ZhBk X-Received: by 2002:a05:6a20:d04e:b0:19c:a3de:647d with SMTP id hv14-20020a056a20d04e00b0019ca3de647dmr26792058pzb.19.1708596833193; Thu, 22 Feb 2024 02:13:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708596833; cv=pass; d=google.com; s=arc-20160816; b=PqpOoIb+tuhhPA/cbTJ8Q5ME9FBRn/cumRhuAhCH7F2XX7LzK+ioWRn9yfytu0zAeg owbFZfdeyXPUEM0S466SIPEG1Io0674LpjpQT+iQ+wgL3gRe0/yBQrQ0LNXMS0EzeLPA 8r6b+nn8gWZF9owmJeIvIDp7lf3WW3+EtEpO3DYeguQXgTF8vEfhvdpcBixfh1SsYpQI QBM1bfx36Sdm24S4JFUgQs/+ODnXWtM4BMWGVBHmbJEPAXqfpQ92OqCSUndzygBDiDEq S6k3CQLkA5QUnmUVfQCi7+ugz3/lZbwbrxTZ/65rr9AwSbHJwgup0J+cBCgNDh/VGekl h7Eg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=PYyfGG5F+SG8R9R5MyMBf2L1QHcp8qaW343NfMmdTxo=; fh=Oc81uuoSiCYmWPIZrJKh6tUWDhA09tD21Re6ielkk1Y=; b=i5CltL1muKbiUhM978l7ZFHsN9b/owEQrTwiyRFs6yzVWFCesR4vyetEFeI9ejeEF0 seqgNTIr7K59KelFVNEqpqdUv7jaxpkKiatsuXMaWe1ZDCN9Z4uHY/agvrhgBPqjcmLI LwWs+wR4XNvhb4h+Rw8L3Wwm9AIcQZNUGkgxaIBHh7tM86LD7w0+l35LR1fzWy6c49QJ lwexYjVMpiWp8E/+tglO+tnzBtp1uHcpJEaVm8YilYyu3cqyBK5XMS/VS0ixjsb7ouo2 jO2cll8qTVMUoSvvNzDgxkyPqculkBevMWQpYyAc2d7mB4Vpv1Qxrqf6CLcLUKbM0SI/ hC1Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=C12geg+A; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76301-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76301-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id e12-20020a170902cf4c00b001dc3c3be4a3si2271052plg.642.2024.02.22.02.13.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:13:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76301-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=C12geg+A; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76301-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76301-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 09FC0282645 for ; Thu, 22 Feb 2024 10:13:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 160023F9EA; Thu, 22 Feb 2024 10:12:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="C12geg+A" Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (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 ADA8A39864; Thu, 22 Feb 2024 10:12:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596759; cv=none; b=tATfKLumMEmykV4X8GNmo82jpVup/qIjG2osBe18wncspJoLWVycbxDT9ENVW4kkT4U70qq1BOFCpQ6+j9uN5CRXJQYaFy2rAqDHDbVcb4GOV7yOBfwMc3AVrx4vqway/9J0vcv0JJo7TQV2/aa5YpxytT39a0BxP4v8DDMumv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596759; c=relaxed/simple; bh=pM5LYZyHZMUxJj8CsXE8e5NI/BUXEphnfuI4iyKBZ3I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MEWqwmOO+CcbX9N4TRwdS4GBD2VVRm/in+yc63gtHBjzxyq7bH+p+Grg4uVZP/kP0gbzwYym3yezMsQ1k55rmQSm0+HFWuP6+Cji/6CtCwjc6MHNTb+I8irOvt1f/rzzH8RE9tVcdaILQGhZXiVjN61pdMQR0ChbkzmOE8X7NkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=C12geg+A; arc=none smtp.client-ip=217.70.183.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id CC85B20004; Thu, 22 Feb 2024 10:12:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708596751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PYyfGG5F+SG8R9R5MyMBf2L1QHcp8qaW343NfMmdTxo=; b=C12geg+ATDXZAWApHIm+FM8jNWV2pVTmU59v+gb3sVRSDhDlvErRLgwTh0Uv8UIkhVzs+4 YnDYb5yCVWElbCaz7tP4LNhgwfa6O9ppsCMqWnUeC0qzFiLGe5GeclDxvWjnUtXKHFe9Gl dmG5QRnAoXHR1Z1vShl8oobqr5esxgh4PL2vEdTigvUqGbM58T7eZL0SptBIYTPZ87qQMJ 5fukdbCBjFHL3amwiG2kEZ/AZ2zb29hi8EEfwJMKvvqfcQy7sV81sGECuUB9LJRKR9IbuK Rj5Bsvn2QVdXVG6mcnO2EMKOAgdxhs15vkdxAQ1z/DtH0wGrGkkIZbXkfDESLg== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Thu, 22 Feb 2024 11:12:29 +0100 Subject: [PATCH v4 1/4] spi: cadence-qspi: fix pointer reference in runtime PM hooks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240222-cdns-qspi-pm-fix-v4-1-6b6af8bcbf59@bootlin.com> References: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> In-Reply-To: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> To: Mark Brown , Apurva Nandan , Dhruva Gole Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT , Vladimir Kondratiev , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.13.0 X-GND-Sasl: theo.lebrun@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791593632943190712 X-GMAIL-MSGID: 1791593632943190712 dev_get_drvdata() gets used to acquire the pointer to cqspi and the SPI controller. Neither embed the other; this lead to memory corruption. On a given platform (Mobileye EyeQ5) the memory corruption is hidden inside cqspi->f_pdata. Also, this uninitialised memory is used as a mutex (ctlr->bus_lock_mutex) by spi_controller_suspend(). Fixes: 2087e85bb66e ("spi: cadence-quadspi: fix suspend-resume implementations") Reviewed-by: Dhruva Gole Signed-off-by: Théo Lebrun --- drivers/spi/spi-cadence-quadspi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index 74647dfcb86c..d19ba024c80b 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1930,10 +1930,9 @@ static void cqspi_remove(struct platform_device *pdev) static int cqspi_suspend(struct device *dev) { struct cqspi_st *cqspi = dev_get_drvdata(dev); - struct spi_controller *host = dev_get_drvdata(dev); int ret; - ret = spi_controller_suspend(host); + ret = spi_controller_suspend(cqspi->host); cqspi_controller_enable(cqspi, 0); clk_disable_unprepare(cqspi->clk); @@ -1944,7 +1943,6 @@ static int cqspi_suspend(struct device *dev) static int cqspi_resume(struct device *dev) { struct cqspi_st *cqspi = dev_get_drvdata(dev); - struct spi_controller *host = dev_get_drvdata(dev); clk_prepare_enable(cqspi->clk); cqspi_wait_idle(cqspi); @@ -1953,7 +1951,7 @@ static int cqspi_resume(struct device *dev) cqspi->current_cs = -1; cqspi->sclk = 0; - return spi_controller_resume(host); + return spi_controller_resume(cqspi->host); } static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend, From patchwork Thu Feb 22 10:12:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 204667 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp153529dyb; Thu, 22 Feb 2024 02:13:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUnkSoL/mGIwJTdGZW6AGV+V9eiwwiNfOMbi/XYGbW1d3fjN+QV4bylEQ5yeTDY/rjWNRp0I91eZX3ZcpruMOOed5Gn/w== X-Google-Smtp-Source: AGHT+IGyZDZuPGBaMizqgN8fEOlNk2EQO/0y8N6mh/BlnnDvDD0+1I21gZfpHE1jPWf/XZg+snLd X-Received: by 2002:a05:6512:951:b0:512:b914:7d6f with SMTP id u17-20020a056512095100b00512b9147d6fmr6020993lft.65.1708596822326; Thu, 22 Feb 2024 02:13:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708596822; cv=pass; d=google.com; s=arc-20160816; b=ylL/8FcXc+t7kd24H06g2qm2kB+XyBDCgvvFik7dOWGex+E24JoZr8HouVsHn+5/KY /TZrkUAHJ9FmBGtSq+RjrmwbxP3Om5O5kXJ2dbrPvpADEBN7FU32MJNmzdOUfaaeDtXD EU59wkEnxvM/aDYyvIGoL/ZcfjfVt7EpPkJDKy6IjD3uo2LF70+kCTxBvLlv2eVAYOcG syOqtly8bGGuYm/TFh1uWI2XGXgCsCgyaGdn+U5r4QaofUspznPPQP4A97bXBLUmH4kF YJ+epUchPDIkzfTZsAJgfGDMUVNZN2mcPhzPwPeTs1wdOrHd78bBqhoE4n9AfxhrRvnf vtow== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=Kr+jGKZ7wa4euSb09lk+qCqBrZfe1hy6OrbVIm5KELU=; fh=Oc81uuoSiCYmWPIZrJKh6tUWDhA09tD21Re6ielkk1Y=; b=YlHm+fREVePQHzc8OmbzIUvEts8hmp8vlg+b6hjVoBE3mnvSEwAetwOHI4ZurhAI44 pkz/RByVQ7JmjXPCViRY286aMJMradEPmTu1tQ7aybY6rfG1+Ktw73I7m9t7Cw8nlQhf N9sGQQrNqWQy5h2lchGejeUdn/4ef4BF/lg1IVume9IBLp2iBOPYNimP7a8+IcTkxCiG hro7mxDN6D+tzcJPk7AqQJA40fADGMC4e6E8mDCPBItifhYlZbG0UqajMaU+uKN4oY9l T4YNfFeOP2fIpcOkWr08KDIBdGjkChkMs/z+2bS2rtfJ2OkbWZUaUKH/QymQI9MCR6/f e3Ag==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dsw6aMVe; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76300-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76300-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id i9-20020a05640242c900b005650584775fsi1182002edc.188.2024.02.22.02.13.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:13:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76300-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dsw6aMVe; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76300-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76300-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.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 am.mirrors.kernel.org (Postfix) with ESMTPS id A5BA81F22AEF for ; Thu, 22 Feb 2024 10:13:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 903B23F9C0; Thu, 22 Feb 2024 10:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="dsw6aMVe" Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (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 ADB343987A; Thu, 22 Feb 2024 10:12:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596758; cv=none; b=CPbwKFM/GgQGFsiuOXCPdVpNtiB9SpJTetLd+qdguv5qF1tduXq6C3rYMXUlII2RbNOBNB9BHJ+bnTGNlZBb5T3sjen9KbVdV1FxmLUrXAGcXOzu1PHkAIdnltHFQj9i3bqNKy+D+snMZHVMy/trSRYU/8lyR6FJvxtWMP1toIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596758; c=relaxed/simple; bh=U+gzS1ckVJjVA+ftOBxZZr+oCPKKnY2akQ+FTUE4Vlo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JimIglmSvNhdVYyTGbFWrp98VTI8397ueBQi9hXVABdFLl8F/mqyqIrRymuhGwtd7urMrXbmw3BxT+bF+lAkVY5rUw86EHautfhaapToPBYZwMnndauHdY+FwJcWV5qtoTFugSo7gzHAA3KRmz8pZGOPddlp2Hllfd1THCNfJa0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=dsw6aMVe; arc=none smtp.client-ip=217.70.183.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 538872000D; Thu, 22 Feb 2024 10:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708596751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Kr+jGKZ7wa4euSb09lk+qCqBrZfe1hy6OrbVIm5KELU=; b=dsw6aMVe503SzQB89/ddzyuJ08+ZL7xstYhTijpcje0Wv9Zr92DVNUljvFTlOHNMCg0TFY NSDq8XEDWEvjkbsXHhxTXNBHcGwmwLH9CRFP17TfJVWJZ12xX/oyKLs3NwcFgu0Gnvlwpm ft6uzCM7UCQ96ffobAChRCH1vFNm6YyukGTRAZZ/TRnXboUVmFN38QcZ6CWVvVK0FcF+0h fFtlhR14w0ApR5fUA58MefDhqH5oeFxBkGhZ8XAs5VdPLEpYU57EGuwTZiZsft+4mEVvyT ZvsFuIk4OQ4FsvaOWA4Tlu7lQaU38ZKCUbrV8RNoQhFHL5ev2LL6ZuWqvDX7BQ== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Thu, 22 Feb 2024 11:12:30 +0100 Subject: [PATCH v4 2/4] spi: cadence-qspi: remove system-wide suspend helper calls from runtime PM hooks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240222-cdns-qspi-pm-fix-v4-2-6b6af8bcbf59@bootlin.com> References: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> In-Reply-To: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> To: Mark Brown , Apurva Nandan , Dhruva Gole Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT , Vladimir Kondratiev , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.13.0 X-GND-Sasl: theo.lebrun@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791593621247512828 X-GMAIL-MSGID: 1791593621247512828 The ->runtime_suspend() and ->runtime_resume() callbacks are not expected to call spi_controller_suspend() and spi_controller_resume(). Remove calls to those in the cadence-qspi driver. Those helpers have two roles currently: - They stop/start the queue, including dealing with the kworker. - They toggle the SPI controller SPI_CONTROLLER_SUSPENDED flag. It requires acquiring ctlr->bus_lock_mutex. Step one is irrelevant because cadence-qspi is not queued. Step two however has two implications: - A deadlock occurs, because ->runtime_resume() is called in a context where the lock is already taken (in the ->exec_op() callback, where the usage count is incremented). - It would disallow all operations once the device is auto-suspended. Here is a brief call tree highlighting the mutex deadlock: spi_mem_exec_op() ... spi_mem_access_start() mutex_lock(&ctlr->bus_lock_mutex) cqspi_exec_mem_op() pm_runtime_resume_and_get() cqspi_resume() spi_controller_resume() mutex_lock(&ctlr->bus_lock_mutex) ... spi_mem_access_end() mutex_unlock(&ctlr->bus_lock_mutex) ... Fixes: 0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") Signed-off-by: Théo Lebrun --- drivers/spi/spi-cadence-quadspi.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index d19ba024c80b..809bbbb876ad 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1930,14 +1930,10 @@ static void cqspi_remove(struct platform_device *pdev) static int cqspi_suspend(struct device *dev) { struct cqspi_st *cqspi = dev_get_drvdata(dev); - int ret; - ret = spi_controller_suspend(cqspi->host); cqspi_controller_enable(cqspi, 0); - clk_disable_unprepare(cqspi->clk); - - return ret; + return 0; } static int cqspi_resume(struct device *dev) @@ -1950,8 +1946,7 @@ static int cqspi_resume(struct device *dev) cqspi->current_cs = -1; cqspi->sclk = 0; - - return spi_controller_resume(cqspi->host); + return 0; } static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend, From patchwork Thu Feb 22 10:12:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 204666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp153461dyb; Thu, 22 Feb 2024 02:13:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVgBsUuiMLk1FSMSnpZM8+Alf5IRiM3ahm4FZQlwqXPsCtxIpfiWW6zUS6WbjMnVNn0HW3duHez16XAKfE+xCKzgROcRg== X-Google-Smtp-Source: AGHT+IEMinHyiy6XFdJhDuovfR+tsbf30cqXd4bZqgUfIPTvtMuzcitwoY6jBX6HVLv9txWO82Bz X-Received: by 2002:a05:6870:232a:b0:21e:a6fb:28eb with SMTP id w42-20020a056870232a00b0021ea6fb28ebmr13154126oao.35.1708596811938; Thu, 22 Feb 2024 02:13:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708596811; cv=pass; d=google.com; s=arc-20160816; b=g4yoMNdNteqBdkGN8b56MBjT7j+vYRUYuOGe/6srXWn54uFU3yXAorvOdnl8p2xqVN gm1R9R6XPudOSn85VD+qHhaZ9NcbpGrF4Vf/vWvapwL0AC42Zcg4gcAhDr7hTt5BJACk 7C96sHVCSQNKiLRCkdHYji76dphnVsntMjLw7Ah/Zj0ihqLRfrKUhw2x26ZXzTmDpaBI n2lX02mly9wP8uSAO8RsyxnSPtrzLZ9LfPTCMjwzFiGUIRsEaKZKeXMKWABz5sX64fZK BL/Fv5xN1JYbOpu1K3HZ0NHnX10IhJlXEkPay7slcsl0iojhx8BpezH4gOMuUz9YSW2N MNQw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=mvoigvJmPhizIcq2GVnu6+m2ifoXHPhDFh2hNqMqK4E=; fh=Oc81uuoSiCYmWPIZrJKh6tUWDhA09tD21Re6ielkk1Y=; b=nvf0jr8wlO9A1yTQE+uj8e12iE1jNvbvKwhHPknNBmKaySysFtK16uO7s9JX4K9fhR 1aHb2APpP+BNmqn1OHsnzyJ/FYtClF2Y9pj3pP+rQPh4YTORP1cSZ3/G1Wf1dzBQszkC HubRNXiZrfkjKYQBsVbzhqlMO+5j3HQvw47Y/ohImj1Th/uGMvanN1PyCdajze1a+vsM /1SJ1PepIDptGB1MGSmLeZV+eToLbqKWtXEjD9zVHSdWPA75kVsquHL8Zd44/70gsKdt 3k8phJwtrqFLclCrtZ0PhS7jOIgIVjfSM6SmLetxWBA8od9bw34hxCnqE5C5Z++0wsuS +2Mw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dfvMuerq; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76298-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76298-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id x27-20020a63b21b000000b005dc85e8a9e1si9968410pge.45.2024.02.22.02.13.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:13:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76298-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=dfvMuerq; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76298-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76298-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id B82C5282649 for ; Thu, 22 Feb 2024 10:13:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2754F3EA8A; Thu, 22 Feb 2024 10:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="dfvMuerq" Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (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 A2D7339860; Thu, 22 Feb 2024 10:12:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596757; cv=none; b=h8XEHn9H9La0mCP44P+yPVIinV6ZAZpHnME0kTPWHKq5t4vEctw2X4lrdwYI8VTdt6EevBStqf/pNZNVBZjeC897SNDLkVn2mi6zFgjT4UxSERX93fqv+A9IZhxnj7ejCVU4CmxyrYUTbfVYXD/wuiWoZuCY78GGTKXjctHyIpc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596757; c=relaxed/simple; bh=8k//nV4PgtS77JaVQHMDyRcyJk3UctPeuulRegs63Dc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ddiEmeT+Sknx5JCsSrCB/zCna/jkTL0wV5E+LJH79pjjTQxBu5QfcIS0x9MnVGFvfVHjrNkF2hRKGQIUKr5MH5Xlcfh8Grzrz043KYJ1k32YJdXUNHWpAHhvUiFPiLiitUrViSH6ZRtyUrV1k3kn0H+TaCSyM1wzcGeUYw6taqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=dfvMuerq; arc=none smtp.client-ip=217.70.183.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id CA9D820003; Thu, 22 Feb 2024 10:12:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708596752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mvoigvJmPhizIcq2GVnu6+m2ifoXHPhDFh2hNqMqK4E=; b=dfvMuerqqH9Msxa66Jb04Loi05gLrfXlH4U7nG19LWMspJ5RZrc+/RIIDj84N+4ipp5HxA SvbJjT+cIwSjxXVEmKiWLUwUrxwMG0QCa97fPqjItYJ1NiD00/5QzrXPy4VXuADVvyyjKa KBwIFDs9m7ih7V5mGBnnHmSdtIyto1jWVesTlXtCwPKtwN6kLVS8CYD7OeSWpZ6ctVBbkA dUAOinAR2lXOA4OL7ZswXSsYKV3EY8784LKdMjCmC9e51kFNJonrI0JNyu8t5B+mMcT4op tfFYOpMHrIEpM9h2Y5861K/Qrm3s8KtsrF0oiiJ0RjqsiYOLNRr1zDezYq6fAA== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Thu, 22 Feb 2024 11:12:31 +0100 Subject: [PATCH v4 3/4] spi: cadence-qspi: put runtime in runtime PM hooks names Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240222-cdns-qspi-pm-fix-v4-3-6b6af8bcbf59@bootlin.com> References: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> In-Reply-To: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> To: Mark Brown , Apurva Nandan , Dhruva Gole Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT , Vladimir Kondratiev , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.13.0 X-GND-Sasl: theo.lebrun@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791593610556149100 X-GMAIL-MSGID: 1791593610556149100 Follow kernel naming convention with regards to power-management callback function names. The convention in the kernel is: - prefix_suspend means the system-wide suspend callback; - prefix_runtime_suspend means the runtime PM suspend callback. The same applies to resume callbacks. Signed-off-by: Théo Lebrun Reviewed-by: Dhruva Gole --- drivers/spi/spi-cadence-quadspi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index 809bbbb876ad..ee14965142ba 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1927,7 +1927,7 @@ static void cqspi_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); } -static int cqspi_suspend(struct device *dev) +static int cqspi_runtime_suspend(struct device *dev) { struct cqspi_st *cqspi = dev_get_drvdata(dev); @@ -1936,7 +1936,7 @@ static int cqspi_suspend(struct device *dev) return 0; } -static int cqspi_resume(struct device *dev) +static int cqspi_runtime_resume(struct device *dev) { struct cqspi_st *cqspi = dev_get_drvdata(dev); @@ -1949,8 +1949,8 @@ static int cqspi_resume(struct device *dev) return 0; } -static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_suspend, - cqspi_resume, NULL); +static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_runtime_suspend, + cqspi_runtime_resume, NULL); static const struct cqspi_driver_platdata cdns_qspi = { .quirks = CQSPI_DISABLE_DAC_MODE, From patchwork Thu Feb 22 10:12:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Th=C3=A9o_Lebrun?= X-Patchwork-Id: 204665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp153391dyb; Thu, 22 Feb 2024 02:13:22 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWbC5AQrvciMITepI1xCIs2MszfhTNQLUZJY4xq76BLUpxJqPJWpI41C69iRecFdoXVRJQhHVc0XpqxLJgF8Nmw19vMpw== X-Google-Smtp-Source: AGHT+IHXlSWoz9VFfcrDGmhs7xroA2TKjJJH3V9kURdDLlYuJ0AQAPZRQOeG/6hankQkYvwzQDY9 X-Received: by 2002:a05:6402:5151:b0:564:fa70:a2e7 with SMTP id n17-20020a056402515100b00564fa70a2e7mr2625083edd.40.1708596802350; Thu, 22 Feb 2024 02:13:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708596802; cv=pass; d=google.com; s=arc-20160816; b=XQFEr6/ZJdnxrvBiP4rZpl1xMn4BHiMykPS6xyi4X7c9zIpeuvw6ViJjYx3+feynCH AFY0QMBP0lLD2rtEMOGuUkYzi/54MUG2aQCewKt4TrR6mjhuVivbkdROBS191sDzTwLy 7EkduJg4Z2YJlS/rCupr0At+JlNKhHPFgMV/+TbQ/o05LzZyTQtnq/3UOYNlTf/xuuD6 CXXqHxJ/GFJ4dPaOVrfZHxKR+7j5tRHuyGT3M/+RiATJI1b3AebskZG2byUG6osIjO2D HlAUIoZgOL3NMLsgxOuRgwGYkVa4ZebAPGtI/6cHJlcN6oCNMDuUmo5pOzN/TTUoBA6U LsaQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :subject:date:from:dkim-signature; bh=Eg97yjO7KdqvwAZXBVokHmZiB+7Ptk8zlKT2d8Y1vCs=; fh=Oc81uuoSiCYmWPIZrJKh6tUWDhA09tD21Re6ielkk1Y=; b=BONjQnO8ymGTG0rUwRPL/BfR0FDZWNs6VMaFt+Fdqqjb8oM9ZA8TZ8aks6rdQxhp1c k9vwq/8VC7O5R4zOymQFPPe4KRd5502z2ayPO1lJWAAhx/wWqjcPbSspaJSLTWwEGxTd fo1I7Bk3ZnIPQNQbhXd4TRPnMucPZmh1AbpplY5srUc9Yi0ycg0w4VRwvlaJlYIYxtks crHi2atEp7A9ZI/ijhfjxFLRcfnxFnBllXRBC61br3A8c9fbgiEQ2oYbDNLQeLwZfjOy JdTH9oVx0bAqBVAJB+Ttr9kv5LrYucq+9F/CXod3ZVkTorgEgWt56e1ON1kFekO4jO/T qexQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=SqGH+qEE; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76297-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76297-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id i10-20020a05640242ca00b005645fd0e569si4082656edc.183.2024.02.22.02.13.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 02:13:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-76297-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@bootlin.com header.s=gm1 header.b=SqGH+qEE; arc=pass (i=1 spf=pass spfdomain=bootlin.com dkim=pass dkdomain=bootlin.com dmarc=pass fromdomain=bootlin.com); spf=pass (google.com: domain of linux-kernel+bounces-76297-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-76297-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=bootlin.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 am.mirrors.kernel.org (Postfix) with ESMTPS id CA9261F22705 for ; Thu, 22 Feb 2024 10:13:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AA70E3D97D; Thu, 22 Feb 2024 10:12:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="SqGH+qEE" Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (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 ADB0239876; Thu, 22 Feb 2024 10:12:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.200 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596757; cv=none; b=o9ubogkRHDnhyXDaoSRaFVTQmBX7FcFF9pJY8xRo9xnmFrrNOzU8TQpc3o4DGegSAp2zeF9V/pxzguRhWjJuAb/f9jAkvEtPHNRzPgydEgtEvvs4mPpT4f/YymjHixi3sO821RUI0tZUSDBO/IN2UZi5RhO6zEqaAWUP8eJWhgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708596757; c=relaxed/simple; bh=phqB6EsMKmMZCxST51NEKAHp04XCYXDRfwNdDc4qp3c=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DYnaqOZOAvLvuUlitX1JKj3TiYcL4RQHyBaiRc52+BK8ocvg9RTFLAfo2VP5if7M++RVNAb9NdHfeVxws6m6hf8P9EOMMxYa/P0hwKaJVzoSCINFVu2KjjN66SZ1O/9LX3qPHc6p/z6XjbDQtoOMEmXFALNPkTiTGByr2ePlOeg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=SqGH+qEE; arc=none smtp.client-ip=217.70.183.200 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Received: by mail.gandi.net (Postfix) with ESMTPSA id 5239320013; Thu, 22 Feb 2024 10:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1708596752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Eg97yjO7KdqvwAZXBVokHmZiB+7Ptk8zlKT2d8Y1vCs=; b=SqGH+qEEI2ulAOG8ee55jdUpIZiKanKdcg3SxLMP34ZEIL0BtCd4sBiOQU0Tra3JQhnFbD PjaMzsqcC5FdcQLbQ1pRoYgt1dX9lmG3fW1z3HZA6RCI7cdsAyKv34zCRGJyygK7L7bHDU wHeAzwYBq7D5Ai1cGs2XeLRjFA3KNFQpdfTAwozXeWoVAKiiXwRFT8DruAPifaj8DnSaWH kIZtV8CZtGFTG6rdP35efOOTIaSsysvUDaze0bdkXfkk+/TdBUzlksUi4/nPjECEpa0sMu +y18tn4dI5IPHVHkGrJYbNgXrhEXrCb6SJBVN7L3O6jcrVk/x5Pd5EUs3gCYeg== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Thu, 22 Feb 2024 11:12:32 +0100 Subject: [PATCH v4 4/4] spi: cadence-qspi: add system-wide suspend and resume callbacks Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240222-cdns-qspi-pm-fix-v4-4-6b6af8bcbf59@bootlin.com> References: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> In-Reply-To: <20240222-cdns-qspi-pm-fix-v4-0-6b6af8bcbf59@bootlin.com> To: Mark Brown , Apurva Nandan , Dhruva Gole Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Gregory CLEMENT , Vladimir Kondratiev , Thomas Petazzoni , Tawfik Bayouk , =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.13.0 X-GND-Sasl: theo.lebrun@bootlin.com X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791593600463545936 X-GMAIL-MSGID: 1791593600463545936 Each SPI controller is expected to call the spi_controller_suspend() and spi_controller_resume() callbacks at system-wide suspend and resume. It (1) handles the kthread worker for queued controllers and (2) marks the controller as suspended to have spi_sync() fail while the controller is unavailable. Those two operations do not require the controller to be active, we do not need to increment the runtime PM usage counter. Signed-off-by: Théo Lebrun --- drivers/spi/spi-cadence-quadspi.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index ee14965142ba..8bcbab90cb75 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -1949,8 +1949,24 @@ static int cqspi_runtime_resume(struct device *dev) return 0; } -static DEFINE_RUNTIME_DEV_PM_OPS(cqspi_dev_pm_ops, cqspi_runtime_suspend, - cqspi_runtime_resume, NULL); +static int cqspi_suspend(struct device *dev) +{ + struct cqspi_st *cqspi = dev_get_drvdata(dev); + + return spi_controller_suspend(cqspi->host); +} + +static int cqspi_resume(struct device *dev) +{ + struct cqspi_st *cqspi = dev_get_drvdata(dev); + + return spi_controller_resume(cqspi->host); +} + +static const struct dev_pm_ops cqspi_dev_pm_ops = { + RUNTIME_PM_OPS(cqspi_runtime_suspend, cqspi_runtime_resume, NULL) + SYSTEM_SLEEP_PM_OPS(cqspi_suspend, cqspi_resume) +}; static const struct cqspi_driver_platdata cdns_qspi = { .quirks = CQSPI_DISABLE_DAC_MODE,