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 61D71C352A1 for ; Wed, 30 Mar 2022 12:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346415AbiC3MQf (ORCPT ); Wed, 30 Mar 2022 08:16:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344875AbiC3L4j (ORCPT ); Wed, 30 Mar 2022 07:56:39 -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 906572F019; Wed, 30 Mar 2022 04:54:36 -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 03CC36137A; Wed, 30 Mar 2022 11:54:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4C01C34111; Wed, 30 Mar 2022 11:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648641274; bh=TqU5EmJu4m0utOcnrYUkdqj+QyURN3AhnZAL6wOyBec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ilc0Y0dX2Mv+wP+9wvcyElveeHuRATXW5Tqr8L3tA3LAkC+8tvaELAhSTnNLltgFC EcMgrvL+AgNF0BgFawqFSizNz35VeeKsymZ1eUl2uxQYG+uB9eMvkYP4EBjBQ+el4q qOqvY246kQSzvnzNiBCXHAX6mi5TVRBT3NOeCAUJ6yoEe2gZnmLn303e624y0WAAu8 5Njgj/vOlXJszYAqAEKV/9xOQUhwOzmQQXarPisIi+bTwymYQtSqMErrvOaHNl1IOF a0wUPOsmfZAMZL0OUiPkKau5rmbfLC2MAefLveNprlkx35yQyxwhaK44BagqEy6Fzz nCT/OeG9+WvWw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 16/17] mmc: host: Return an error when ->enable_sdio_irq() ops is missing Date: Wed, 30 Mar 2022 07:54:05 -0400 Message-Id: <20220330115407.1673214-16-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220330115407.1673214-1-sashal@kernel.org> References: <20220330115407.1673214-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ulf Hansson [ Upstream commit d6c9219ca1139b74541b2a98cee47a3426d754a9 ] Even if the current WARN() notifies the user that something is severely wrong, we can still end up in a PANIC() when trying to invoke the missing ->enable_sdio_irq() ops. Therefore, let's also return an error code and prevent the host from being added. While at it, move the code into a separate function to prepare for subsequent changes and for further host caps validations. Signed-off-by: Ulf Hansson Link: https://lore.kernel.org/r/20220303165142.129745-1-ulf.hansson@linaro.org Signed-off-by: Sasha Levin --- drivers/mmc/core/host.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 848b3453517e..60c2ca58dec3 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -403,6 +403,16 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev) EXPORT_SYMBOL(mmc_alloc_host); +static int mmc_validate_host_caps(struct mmc_host *host) +{ + if (host->caps & MMC_CAP_SDIO_IRQ && !host->ops->enable_sdio_irq) { + dev_warn(host->parent, "missing ->enable_sdio_irq() ops\n"); + return -EINVAL; + } + + return 0; +} + /** * mmc_add_host - initialise host hardware * @host: mmc host @@ -415,8 +425,9 @@ int mmc_add_host(struct mmc_host *host) { int err; - WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) && - !host->ops->enable_sdio_irq); + err = mmc_validate_host_caps(host); + if (err) + return err; err = device_add(&host->class_dev); if (err) -- 2.34.1