From patchwork Thu Jun 1 21:32:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp630696vqr; Thu, 1 Jun 2023 14:45:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4BXOhPDnpYkFaugdWJs0f6irr0H4qjUp2p6k49BiT6slAp7VBbLnf/Rfb21uRuZYvyVOtJ X-Received: by 2002:a17:902:e744:b0:1af:a349:3f0d with SMTP id p4-20020a170902e74400b001afa3493f0dmr675968plf.23.1685655925813; Thu, 01 Jun 2023 14:45:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685655925; cv=none; d=google.com; s=arc-20160816; b=Ge3kWTxr1cK80vGjpf46wxvD17MiXRmFgniXmbHs+0g0LjDaYYoCOAiCBtZ6ut/l+o 0vin4OZt0pmdT/2tdxVkR4gWifHn5+ndichBkjoCBoZIdAUczz4IT955DmKqkLHJ2js7 U9qqXzx5vz2zNQWhncPUwma4WhoLnEwsVbVVnIpfvbvnrLocTNjlThmeC8HnCdWwgil7 6lJAPVnwJnTCccsvyiwnzElzcoIE+U2Qk7XQd0jzgtJkgK+Qxp5/+Jbhkmep+do8lk84 d3l1en1r3GS2Q6ai9W+dCh93NE/GUTHpjMCmkIP6b0h/4powFAL4Oaul07J5DMh8u1WF WB9w== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=IUlNAHdeUEPxzXeRfoiIAhRyJGN3WCZJNbFnzu56qME=; b=MC8O9A48BLOWztYF+21SJDTCy+QNJj/lBE36EkLYINkyJEDFAS+8NCGWPUBDb1LJHZ B9zCngKhS//x5BL7SfZlR9rsJha2O+5O2OayfKW+c1DGIZUNo27bZJUtOofMQK2wW6mA zhWRH3NY2U7f+OvsQGqnLc9/oGhMbP4K1zankClz4+KHDaN/faeaFoptRl8aOlctqvsV k3HICe4KlqcPuxugZPuPTqOaXq6CHpcIxD8OWrdAc6sc7LU5swe+QXgxGwHVFnsxc7OR d3NaRYLc1kkhGzglnMDc3KS5pzp0istj7T9A845k4/FT3lv7mDXDMM9ZJi+ugS/BEUXG OREA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Qt2KlGyj; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jb18-20020a170903259200b001b02ce8470dsi3142817plb.543.2023.06.01.14.45.08; Thu, 01 Jun 2023 14:45:25 -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=@kernel.org header.s=k20201202 header.b=Qt2KlGyj; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229648AbjFAVcz (ORCPT + 99 others); Thu, 1 Jun 2023 17:32:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229610AbjFAVcy (ORCPT ); Thu, 1 Jun 2023 17:32: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 CB6F6184; Thu, 1 Jun 2023 14:32:52 -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 5F45164A01; Thu, 1 Jun 2023 21:32:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4923C433EF; Thu, 1 Jun 2023 21:32:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685655171; bh=g2rzy9p5nDkRT5WQ+jqTex7ivDzoyB3d1o/6rkyQ008=; h=From:To:Cc:Subject:Date:From; b=Qt2KlGyjZVky0lAKv82opTBW9mUDkM0Vd5xFaNjCWso1aWryPa/Nb4exeTSfkSDTH GW1Jw1c0j3TeKqjmlsh5ccslCVjDMlnzCLX2YBzVnoUIrD3+viiRt7LloUH63oM/+/ 18jNbCe4745xU19oWfP0BkDw5RXimB4jgzkd6ZMCBVPRhzRkvK9Gi+rIdUIxutt8iZ CvncHntkYE6bnLHhCULprPYzhr46zG/GQxwDU80HRnFS7ckLmzC4p2Kr5qMj4fwwtO LZ0VUlvFlDY9sacDCiCIvMJtqjyF/pCYOCsbnF8wzC0ahpWlktBeRX7mTgWfJxdaDE fsxzgrF0KAnLQ== From: Arnd Bergmann To: "Rafael J. Wysocki" , Zhang Rui Cc: Arnd Bergmann , Lukasz Luba , Cristian Marussi , Sudeep Holla , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] powercap: intel_rapl: fix CONFIG_IOSF_MBI dependency Date: Thu, 1 Jun 2023 23:32:41 +0200 Message-Id: <20230601213246.3271412-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1767538348172243487?= X-GMAIL-MSGID: =?utf-8?q?1767538348172243487?= From: Arnd Bergmann When the intel_rapl driver is built-in, but iosf_mbi is a loadable module, the kernel fails to link: x86_64-linux-ld: vmlinux.o: in function `set_floor_freq_atom': intel_rapl_common.c:(.text+0x2dac9b8): undefined reference to `iosf_mbi_write' x86_64-linux-ld: intel_rapl_common.c:(.text+0x2daca66): undefined reference to `iosf_mbi_read' The driver can work with iosf_mbi completely disabled, so add a dependency that still allows this configuration, but otherwise forces it to not be built-in when iosf_mbi is a loadable module. Fixes: 9eef7f9da928c ("powercap: intel_rapl: Introduce RAPL TPMI interface driver") Signed-off-by: Arnd Bergmann Reported-by: Arnd Bergmann Signed-off-by: Zhang Rui --- drivers/powercap/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/Kconfig b/drivers/powercap/Kconfig index e71399804c143..21ad50b22d6b9 100644 --- a/drivers/powercap/Kconfig +++ b/drivers/powercap/Kconfig @@ -36,6 +36,7 @@ config INTEL_RAPL config INTEL_RAPL_TPMI tristate "Intel RAPL Support via TPMI Interface" depends on X86 + depends on IOSF_MBI || IOSF_MBI=n depends on INTEL_TPMI select INTEL_RAPL_CORE help