From patchwork Mon Oct 24 11:31:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8769 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp430435wru; Mon, 24 Oct 2022 05:41:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4n8jAXZHYgeu10nkkFpW+wMcjhJ7loYp2HwUUapKY9dPkXXGtEwha0NlPMAx5r076xrY/B X-Received: by 2002:a17:902:b718:b0:17a:d64:de09 with SMTP id d24-20020a170902b71800b0017a0d64de09mr34182985pls.106.1666615292120; Mon, 24 Oct 2022 05:41:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615292; cv=none; d=google.com; s=arc-20160816; b=AkNN/dSx68JU3B1636bkssyuqmUV+dQdbGW3byF5GlIatIqhafZ66ct/k4miXWOL27 61Lh4ZindAePxomsT5AD7kbKGIUiQVbA2gnoCIybPqzgE/YEg995d2a7/HPjuTvUHAU+ 4pARCSJXuYfChtcHmCsRuoedNVbPVuSmTHp3OWLSWapaHUdrwSCogBGmdS4u86kWoaJ6 bNq88hEoUKvUYNf73qWtzG6VCSyK/5cKeqzWF7IzL/DW2x7ACJMMVExp90kOpOoz63jl dfaMvOB27GbQiCC9idhcsgUZacQH5UoYvQt02bzrG6nEigKM880rLKMVrnI4vwFpQPho WgKA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=E+/t8BnEX4mhmoDVaRu8cIqiQK2xg3Cb0/9qus8yrZ8=; b=FWrFtr6TzVrFNdcmoOd3Wri1mRmgstSH51FSW8qsI5tYPuTKKaQq0wJCgNmOjnwMe7 3HkyRXmHVTPJvwMMs1dGkS4vj1DFnnZv8Ft3a+OP9R3113lp2uigmwTMw2CzyjXu/eUx Q7RVq8i9/IiUASACzyZDtvBgW5WShJTuEFerSVK5Bn42V7a236MyyKY6w04LFw7lZLKY 10PMR3O2pcqikmFeYffdiT5PD0NBBRUSe2hUs8wG2lhqo/mw2CydYhEr9/TNXLp/2Jz9 TWuUvjGfk5VmDyrAMquvhF7uVAFyLx7RexlYv2AET0WopKMhZKuAqUYBKIq1jENXlHUI ZCUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rlRPA41i; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 192-20020a6301c9000000b0044bf53e335dsi34393151pgb.767.2022.10.24.05.41.19; Mon, 24 Oct 2022 05:41:32 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=rlRPA41i; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233825AbiJXMav (ORCPT + 99 others); Mon, 24 Oct 2022 08:30:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233864AbiJXM22 (ORCPT ); Mon, 24 Oct 2022 08:28:28 -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 D56F986FA4; Mon, 24 Oct 2022 05:02:12 -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 AC22E612F0; Mon, 24 Oct 2022 12:01:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BB629C433D6; Mon, 24 Oct 2022 12:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612912; bh=54tY2h5Qry2GXNveBLK3B1tcepdEC6wKQ9dOikm8r2Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rlRPA41i86zuCJ9VOKFWhHgb6ZlY5HeHpv40qtbnCgdMMaUnZ2gFQcm23CzYU3kzC 6NEhkZRX52fIqrgbi3blYES5+Ysw0m917aG7RdnOytMt/5FESiV+FeEwp/IP2AzI4B 9ByiQxQU8DXtGkR4zVVeXsTfUHb6HYF8yMTLv0iw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thierry Reding , John Garry , Robin Murphy , Thierry Reding , Joerg Roedel , Sasha Levin Subject: [PATCH 4.19 167/229] iommu/iova: Fix module config properly Date: Mon, 24 Oct 2022 13:31:26 +0200 Message-Id: <20221024113004.479893418@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112959.085534368@linuxfoundation.org> References: <20221024112959.085534368@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747572796845961446?= X-GMAIL-MSGID: =?utf-8?q?1747572796845961446?= From: Robin Murphy [ Upstream commit 4f58330fcc8482aa90674e1f40f601e82f18ed4a ] IOMMU_IOVA is intended to be an optional library for users to select as and when they desire. Since it can be a module now, this means that built-in code which has chosen not to select it should not fail to link if it happens to have selected as a module by someone else. Replace IS_ENABLED() with IS_REACHABLE() to do the right thing. CC: Thierry Reding Reported-by: John Garry Fixes: 15bbdec3931e ("iommu: Make the iova library a module") Signed-off-by: Robin Murphy Reviewed-by: Thierry Reding Link: https://lore.kernel.org/r/548c2f683ca379aface59639a8f0cccc3a1ac050.1663069227.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- include/linux/iova.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/iova.h b/include/linux/iova.h index 84fbe73d2ec0..8d4616c532da 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h @@ -133,7 +133,7 @@ static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova) return iova >> iova_shift(iovad); } -#if IS_ENABLED(CONFIG_IOMMU_IOVA) +#if IS_REACHABLE(CONFIG_IOMMU_IOVA) int iova_cache_get(void); void iova_cache_put(void);