From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13D2BC77B7F for ; Tue, 9 May 2023 02:54:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233586AbjEICyz (ORCPT ); Mon, 8 May 2023 22:54:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47278 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229647AbjEICyy (ORCPT ); Mon, 8 May 2023 22:54:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1854F659F for ; Mon, 8 May 2023 19:54:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9004D6303F for ; Tue, 9 May 2023 02:54:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8206DC433EF; Tue, 9 May 2023 02:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1683600889; bh=On6legijzGunDv9Dvt78pjcwAy8Nf+18OyIk7f85ll0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=ZCqVvWepmYyWOx0YtOhg4tVLa+CBnXZNQ7knLNTd1vZYr4dx98Oqjms123kj6WCRs MUv/m3ott5DFPYxAZZHmwM2P2Wf4C+jlVqkkyg07BDkrvzZrAiC9AkYf0CN8zA0XOh nxAoRiZlncAih8gcXkEIR3r2CSapAtQWUg0kuzX8= Date: Tue, 9 May 2023 04:54:45 +0200 From: Greg Kroah-Hartman To: Conor Dooley Cc: Dhruva Gole , stable@vger.kernel.org, patches@lists.linux.dev, Mark Brown , Sasha Levin Subject: Re: [PATCH 6.1 455/611] spi: bcm63xx: remove PM_SLEEP based conditional compilation Message-ID: <2023050940-outscore-kindle-f333@gregkh> References: <20230508094421.513073170@linuxfoundation.org> <20230508094436.944529030@linuxfoundation.org> <0138fb50-507d-bccf-40bb-07340f3cbb33@ti.com> <2023050808-overbite-dancing-53c5@gregkh> <2023050845-pancreas-postage-5769@gregkh> <20230508-undefined-opium-c9824d160898@spud> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230508-undefined-opium-c9824d160898@spud> Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, May 08, 2023 at 11:27:42PM +0100, Conor Dooley wrote: > On Mon, May 08, 2023 at 03:25:11PM +0200, Greg Kroah-Hartman wrote: > > On Mon, May 08, 2023 at 03:15:15PM +0200, Greg Kroah-Hartman wrote: > > > On Mon, May 08, 2023 at 05:55:50PM +0530, Dhruva Gole wrote: > > > > Hi Greg, > > > > > > > > On 08/05/23 15:14, Greg Kroah-Hartman wrote: > > > > > From: Dhruva Gole > > > > > > > > > > [ Upstream commit 25f0617109496e1aff49594fbae5644286447a0f ] > > > > > > > > > > Get rid of conditional compilation based on CONFIG_PM_SLEEP because > > > > > it may introduce build issues with certain configs where it maybe disabled > > > > > This is because if above config is not enabled the suspend-resume > > > > > functions are never part of the code but the bcm63xx_spi_pm_ops struct > > > > > still inits them to non-existent suspend-resume functions. > > > > > > > > > > Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver") > > > > > > > > > > Signed-off-by: Dhruva Gole > > > > > Link: https://lore.kernel.org/r/20230420121615.967487-1-d-gole@ti.com > > > > > Signed-off-by: Mark Brown > > > > > Signed-off-by: Sasha Levin > > > > > --- > > > > > drivers/spi/spi-bcm63xx.c | 2 -- > > > > > 1 file changed, 2 deletions(-) > > > > > > > > > > diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c > > > > > index 80fa0ef8909ca..0324ab3ce1c84 100644 > > > > > --- a/drivers/spi/spi-bcm63xx.c > > > > > +++ b/drivers/spi/spi-bcm63xx.c > > > > > @@ -630,7 +630,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) > > > > > return 0; > > > > > } > > > > > -#ifdef CONFIG_PM_SLEEP > > > > > static int bcm63xx_spi_suspend(struct device *dev) > > > > > { > > > > > struct spi_master *master = dev_get_drvdata(dev); > > > > > @@ -657,7 +656,6 @@ static int bcm63xx_spi_resume(struct device *dev) > > > > > return 0; > > > > > } > > > > > -#endif > > > > > > > > This patch may cause build failures with some of the configs that disable > > > > CONFIG_PM I understand, > > > > So to fix that I had sent another patch: > > > > https://lore.kernel.org/all/CAOiHx==anPTqXNJNG7zap1XP2zKUp5SbaVJdyUsUvvitKRUHZw@mail.gmail.com/ > > > > > > > > However missed out adding the fixes tag. > > > > > > > > I humbly request you to add > > > > https://lore.kernel.org/all/20230424102546.1604484-1-d-gole@ti.com/ > > > > > > > > this patch to fix this patch throughout the stable fixes trees. > > > > > > > > It can also be found on Linus' master branch here: > > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/spi/spi-bcm63xx.c?id=cc5f6fa4f6590e3b9eb8d34302ea43af4a3cfed7 > > > > > static const struct dev_pm_ops bcm63xx_spi_pm_ops = { > > > > > SET_SYSTEM_SLEEP_PM_OPS(bcm63xx_spi_suspend, bcm63xx_spi_resume) > > > > > > Sure, now queued up, thanks! > > > > > > Nope, sorry, that broke the build in many places, so I've dropped it now > > from kernels 5.15.y and older. > > I retriggered my CI after seeing these mails, but the build is still > broken on RISC-V. Now dropped, thanks. greg k-h