Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp4615194iob; Sun, 8 May 2022 19:18:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhWW2el9+xOkapD+I7KN3TIh8jXJXQFijGCLo9SbJzmblrK1GAHcZocJQ4GY06wzcDsszw X-Received: by 2002:a63:6705:0:b0:3c1:976d:bd68 with SMTP id b5-20020a636705000000b003c1976dbd68mr11547779pgc.133.1652062692535; Sun, 08 May 2022 19:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652062692; cv=none; d=google.com; s=arc-20160816; b=UeTzA6cQZ/0ovyZkoU28PiMoxVnFwyhS3KwaLBuYyjDhWDhyrQLD/q3/HrVvDd2N23 Zu6LasjyV+d1LyyLmuproK+0gcWzTglovJ1y2VOIH/dA7jmrQBOgKQNNKlG9Z69pnlrO AyuNvYRJuaJMPCCp1OqM09jeiHxhH85B5cS9bjkp2xg9uyiJPzGFl2UHikCenCIH7gEo XHV75VqUYra8dQlELnqQmoVT3utpVAXQdl7dmqU3oUbmsvM+dqMQSDw3NsCeARwvK3p7 cQKrCF+dhYcFP01lYqYUTwo1+Yd46DGw/848u/i4EDZ4DQnLdtQ/qqgeJb7vCQ1YMFNE YA9w== 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=/rWBVdico0iiyGKevljJizALLEOFmOPCxt+jADdaKMU=; b=ZWBBubJX1ZafjUAyV9X5LJdkvmWZlFj+kOBJS+QNbHhCQkmS571tcCGHKo03rTAPMv 6R0glkwP8POUmlQyAo/GN+mXthaJ7kOuSy5+ivHB9lAFBOF92bCJRBHDChX394EioEk9 4ve0472IlWVXCo8C6hvYAu1+k5MZiCDlBGjhS3sazDfy03qRwLkqB5idU707hGeJhurs RPaw/gWc3XYlgVWB4kl2AtFsjHJIpFedhbhWEs9ycgwxovqVwhAn7zuoZaIBy43fCZJo XlZn0KLuBU53rClT4t86yN56/5NSoc3FB2pWZMKMm2ADC/ZmDQtRLpq3OceoBAWhBxq/ 186Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zjWOo3IZ; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id h8-20020a056a00218800b005061f41c548si14044342pfi.352.2022.05.08.19.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 May 2022 19:18:12 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zjWOo3IZ; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 06A6C580FD; Sun, 8 May 2022 19:18:07 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359111AbiEDRrX (ORCPT + 99 others); Wed, 4 May 2022 13:47:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356445AbiEDRNn (ORCPT ); Wed, 4 May 2022 13:13:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 712444C7AC; Wed, 4 May 2022 09:58:01 -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 51DE161794; Wed, 4 May 2022 16:58:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A3E2EC385A4; Wed, 4 May 2022 16:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683480; bh=T65hD3lkedDqHQ8Jk1haw7M3WC4ltemQG+9Pml3DHDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zjWOo3IZpltVESaWGEriZ7J7AQGXd/X4CbWiU7EnM4df1rqiHb23Vtxkhw/ThiJUr 7WOQFgVWyPoOtDVDkwh4y11ZdEbvqH7F3Q9zBG+f53m6UUYmm/1GqC4W2yQ6WtNIoa YrA1SwmmVj/JgVfiEHjBxgtVHXr7KQ/60fwotzjo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Luke D. Jones" , Hans de Goede , Sasha Levin Subject: [PATCH 5.17 142/225] platform/x86: asus-wmi: Fix driver not binding when fan curve control probe fails Date: Wed, 4 May 2022 18:46:20 +0200 Message-Id: <20220504153122.887393189@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Hans de Goede [ Upstream commit 9fe1bb29ea0ab231aa916dad4bcf0c435beb5869 ] Before this commit fan_curve_check_present() was trying to not cause the probe to fail on devices without fan curve control by testing for known error codes returned by asus_wmi_evaluate_method_buf(). Checking for ENODATA or ENODEV, with the latter being returned by this function when an ACPI integer with a value of ASUS_WMI_UNSUPPORTED_METHOD is returned. But for other ACPI integer returns this function just returns them as is, including the ASUS_WMI_DSTS_UNKNOWN_BIT value of 2. On the Asus U36SD ASUS_WMI_DSTS_UNKNOWN_BIT gets returned, leading to: asus-nb-wmi: probe of asus-nb-wmi failed with error 2 Instead of playing whack a mole with error codes here, simply treat all errors as there not being any fan curves, fixing the driver no longer loading on the Asus U36SD laptop. Fixes: e3d13da7f77d ("platform/x86: asus-wmi: Fix regression when probing for fan curve control") BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=2079125 Cc: Luke D. Jones Signed-off-by: Hans de Goede Link: https://lore.kernel.org/r/20220427114956.332919-1-hdegoede@redhat.com Signed-off-by: Sasha Levin --- drivers/platform/x86/asus-wmi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 399a4a345224..1e7bc0c595c7 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -2227,9 +2227,10 @@ static int fan_curve_check_present(struct asus_wmi *asus, bool *available, err = fan_curve_get_factory_default(asus, fan_dev); if (err) { - if (err == -ENODEV || err == -ENODATA) - return 0; - return err; + pr_debug("fan_curve_get_factory_default(0x%08x) failed: %d\n", + fan_dev, err); + /* Don't cause probe to fail on devices without fan-curves */ + return 0; } *available = true; -- 2.35.1