From patchwork Thu May 11 12:53:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Pavlu X-Patchwork-Id: 92563 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp4359783vqo; Thu, 11 May 2023 06:11:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5Ofj05x2BvP/UDU5v3W3N4yPKN3+p1YclUR/lDr6WQVb6LMbcL9IuecENoRzFijBJ48RNR X-Received: by 2002:a17:90b:3e8c:b0:24e:55a8:bdb with SMTP id rj12-20020a17090b3e8c00b0024e55a80bdbmr21948615pjb.39.1683810702709; Thu, 11 May 2023 06:11:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683810702; cv=none; d=google.com; s=arc-20160816; b=kNxj18bABfg/FjkHHX8AetZPm7hjQ6MulYjO27bEyhVqzO9jcNNxy7yHue6agyeg8x Gf4YLuMBZz7cuxlJkDOhk5okPWI3CuqGkBAC+hLe/W89GvMhiRk32hapt9sVUvZEKjq+ q1S3B1PuXEW1tJe9gfgw5v/4S+i4EcvPVWk8tJf3hW3os+e8KyDIff/do2vY+sOlawQT +Xa4iwlm2AITs5Zpxz1HGiD2FGAT7cwL2b/goBNwwhBi3lihCY3UUvH5mP3cjvAoXVPD +tyRRLNnbCTFdJrKevmELhqBLJ8COyBUJD9KwlNVSk0rlOPVOCglSutubCZAK7XZ5W1G yL+g== 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=62ALVCH5ZevkIHeaTUvt0zHjnJ7Is2/sjOVWpC5SGqQ=; b=ptNwACcirH0YtWfsOBeQMa0bpMV212fMqNBmWRrjDr198KrMrcZPqJIFch1C4s7ZfP iey9x+ITSAcaaFcfoMf29SnrHBi7NN2ax9UO3nDW2cqRsMkqvbZJExpm1K2IIvfeQV4n +MgIKHdg7d0k7iXYfNCwpkO6XencBr+Y9Zfs8tb6OaC0y2W7ccKveOcwFC2IVNByxONH neKy9ougWGf7fhVCGqB0RGKXD48Rq+FYu/hSnMYhR441WDuS9wyBhSSDqRF9JtVfCDAe qRXEEALNGT5MS2h1ec821+3TuzBbOPnqMnnHh9VfLt65qB969OQtXWwoqCkVooOSBtLn rkHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.com header.s=susede1 header.b=gtO0bURA; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a17090a67ce00b00244a3e7bc69si20827428pjm.38.2023.05.11.06.11.27; Thu, 11 May 2023 06:11:42 -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=@suse.com header.s=susede1 header.b=gtO0bURA; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237840AbjEKMxc (ORCPT + 99 others); Thu, 11 May 2023 08:53:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237233AbjEKMxa (ORCPT ); Thu, 11 May 2023 08:53:30 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25412106; Thu, 11 May 2023 05:53:29 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id D27181FE91; Thu, 11 May 2023 12:53:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1683809607; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=62ALVCH5ZevkIHeaTUvt0zHjnJ7Is2/sjOVWpC5SGqQ=; b=gtO0bURAAmLSMXELEolZprS8f5jLRq8u9m5BtTDFG9Ppbih92HvAJDtnVmcRcebCLtflZK d6ydqx3qMsm7QwSqFwiszwrNX00eeNVfjtD8HGmjUvO9GhGg3DfQp6XSp0WuIDSMHFLDtp ws3waSrkF6q3ZAhFa1ZRo8k1/MwLowk= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7BE9C138FA; Thu, 11 May 2023 12:53:27 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id orjKG0flXGT3EgAAMHmgww (envelope-from ); Thu, 11 May 2023 12:53:27 +0000 From: Petr Pavlu To: rafael@kernel.org, kevin@kevinlocke.name Cc: viresh.kumar@linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Petr Pavlu Subject: [PATCH] ACPI: cpufreq: Prevent a warning when another frequency driver is loaded Date: Thu, 11 May 2023 14:53:12 +0200 Message-Id: <20230511125312.24207-1-petr.pavlu@suse.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,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?1765603491059096048?= X-GMAIL-MSGID: =?utf-8?q?1765603491059096048?= The recent change to use platform devices to load ACPI PPC and PCC drivers caused that a misleading warning is reported when a respective module cannot be loaded because another CPU frequency driver is already registered: kernel: acpi-cpufreq: probe of acpi-cpufreq failed with error -17 Address it by changing the return code in acpi-cpufreq and pcc-cpufreq for this case from -EEXIST to -ENODEV which silences the warning in call_driver_probe(). The change has also a benefit for users of init_module() as this return code is propagated out from the syscall. The previous -EEXIST code made the callers, such as kmod, wrongly believe that the module was already loaded instead of that it failed to load. Fixes: 691a63712347 ("ACPI: cpufreq: Use platform devices to load ACPI PPC and PCC drivers") Reported-by: Kevin Locke Link: https://lore.kernel.org/lkml/ZFreh8SDMX67EaB6@kevinlocke.name/ Signed-off-by: Petr Pavlu Tested-by: Kevin Locke --- drivers/cpufreq/acpi-cpufreq.c | 2 +- drivers/cpufreq/pcc-cpufreq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index 29904395e95f..b2f05d27167e 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -975,7 +975,7 @@ static int __init acpi_cpufreq_probe(struct platform_device *pdev) /* don't keep reloading if cpufreq_driver exists */ if (cpufreq_get_current_driver()) - return -EEXIST; + return -ENODEV; pr_debug("%s\n", __func__); diff --git a/drivers/cpufreq/pcc-cpufreq.c b/drivers/cpufreq/pcc-cpufreq.c index 1d2cfea9858a..73efbcf5513b 100644 --- a/drivers/cpufreq/pcc-cpufreq.c +++ b/drivers/cpufreq/pcc-cpufreq.c @@ -583,7 +583,7 @@ static int __init pcc_cpufreq_probe(struct platform_device *pdev) /* Skip initialization if another cpufreq driver is there. */ if (cpufreq_get_current_driver()) - return -EEXIST; + return -ENODEV; if (acpi_disabled) return -ENODEV;