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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 873AFC2D0BF for ; Thu, 5 Dec 2019 18:44:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FCF52464D for ; Thu, 5 Dec 2019 18:44:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bWqXTOS4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730109AbfLESos (ORCPT ); Thu, 5 Dec 2019 13:44:48 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:51741 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730020AbfLESop (ORCPT ); Thu, 5 Dec 2019 13:44:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575571484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zF+1nTL39hpMhoor7FYeQYrKEKyp5MFGnjVkThfEyZc=; b=bWqXTOS4sskzkG6UkHnJT88EUzp0TxhZEHt8DOBrJe9tiTl9Vp0APTVbL7XWtK277VEeFn oJ7d2bsExK6cF564xLYIroBHY1MO2MU/YS2HNGPgIXtIMWhaSzQy8gozMM1NjtlCz+4c2x 5nz66CfZ3qUNfEdzY61MwXT95brmy60= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-1-sa4WKFsAODS8uX9XNmSaZg-1; Thu, 05 Dec 2019 13:44:43 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 67090107ACC4; Thu, 5 Dec 2019 18:44:40 +0000 (UTC) Received: from shalem.localdomain.com (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD0C060136; Thu, 5 Dec 2019 18:44:36 +0000 (UTC) From: Hans de Goede To: Ard Biesheuvel , Darren Hart , Andy Shevchenko , Luis Chamberlain , Greg Kroah-Hartman , "Rafael J . Wysocki" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H . Peter Anvin" , Jonathan Corbet , Dmitry Torokhov Cc: Hans de Goede , Peter Jones , Dave Olsthoorn , x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH v9 03/10] firmware: Rename FW_OPT_NOFALLBACK to FW_OPT_NOFALLBACK_SYSFS Date: Thu, 5 Dec 2019 19:44:15 +0100 Message-Id: <20191205184422.7316-4-hdegoede@redhat.com> In-Reply-To: <20191205184422.7316-1-hdegoede@redhat.com> References: <20191205184422.7316-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: sa4WKFsAODS8uX9XNmSaZg-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a preparation patch for adding a new platform fallback mechanism, which will have its own enable/disable FW_OPT_xxx option. Note this also fixes a typo in one of the re-wordwrapped comments: enfoce -> enforce. Acked-by: Luis Chamberlain Signed-off-by: Hans de Goede --- drivers/base/firmware_loader/fallback.c | 11 ++++++----- drivers/base/firmware_loader/firmware.h | 16 ++++++++-------- drivers/base/firmware_loader/main.c | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/drivers/base/firmware_loader/fallback.c b/drivers/base/firmwar= e_loader/fallback.c index 62ee90b4db56..8704e1bae175 100644 --- a/drivers/base/firmware_loader/fallback.c +++ b/drivers/base/firmware_loader/fallback.c @@ -606,7 +606,7 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_flags= ) =09=09return false; =09} =20 -=09if ((opt_flags & FW_OPT_NOFALLBACK)) +=09if ((opt_flags & FW_OPT_NOFALLBACK_SYSFS)) =09=09return false; =20 =09/* Also permit LSMs and IMA to fail firmware sysfs fallback */ @@ -630,10 +630,11 @@ static bool fw_run_sysfs_fallback(enum fw_opt opt_fla= gs) * interface. Userspace is in charge of loading the firmware through the s= ysfs * loading interface. This sysfs fallback mechanism may be disabled comple= tely * on a system by setting the proc sysctl value ignore_sysfs_fallback to t= rue. - * If this false we check if the internal API caller set the @FW_OPT_NOFAL= LBACK - * flag, if so it would also disable the fallback mechanism. A system may = want - * to enfoce the sysfs fallback mechanism at all times, it can do this by - * setting ignore_sysfs_fallback to false and force_sysfs_fallback to true= . + * If this is false we check if the internal API caller set the + * @FW_OPT_NOFALLBACK_SYSFS flag, if so it would also disable the fallback + * mechanism. A system may want to enforce the sysfs fallback mechanism at= all + * times, it can do this by setting ignore_sysfs_fallback to false and + * force_sysfs_fallback to true. * Enabling force_sysfs_fallback is functionally equivalent to build a ker= nel * with CONFIG_FW_LOADER_USER_HELPER_FALLBACK. **/ diff --git a/drivers/base/firmware_loader/firmware.h b/drivers/base/firmwar= e_loader/firmware.h index 7ecd590e67fe..8656e5239a80 100644 --- a/drivers/base/firmware_loader/firmware.h +++ b/drivers/base/firmware_loader/firmware.h @@ -27,16 +27,16 @@ *=09firmware file lookup on storage is avoided. Used for calls where the *=09file may be too big, or where the driver takes charge of its own *=09firmware caching mechanism. - * @FW_OPT_NOFALLBACK: Disable the fallback mechanism. Takes precedence ov= er - *=09&FW_OPT_UEVENT and &FW_OPT_USERHELPER. + * @FW_OPT_NOFALLBACK_SYSFS: Disable the sysfs fallback mechanism. Takes + *=09precedence over &FW_OPT_UEVENT and &FW_OPT_USERHELPER. */ enum fw_opt { -=09FW_OPT_UEVENT =3D BIT(0), -=09FW_OPT_NOWAIT =3D BIT(1), -=09FW_OPT_USERHELPER =3D BIT(2), -=09FW_OPT_NO_WARN =3D BIT(3), -=09FW_OPT_NOCACHE =3D BIT(4), -=09FW_OPT_NOFALLBACK =3D BIT(5), +=09FW_OPT_UEVENT=09=09=09=3D BIT(0), +=09FW_OPT_NOWAIT=09=09=09=3D BIT(1), +=09FW_OPT_USERHELPER=09=09=3D BIT(2), +=09FW_OPT_NO_WARN=09=09=09=3D BIT(3), +=09FW_OPT_NOCACHE=09=09=09=3D BIT(4), +=09FW_OPT_NOFALLBACK_SYSFS=09=09=3D BIT(5), }; =20 enum fw_status { diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_lo= ader/main.c index bf44c79beae9..08f8995a530a 100644 --- a/drivers/base/firmware_loader/main.c +++ b/drivers/base/firmware_loader/main.c @@ -876,7 +876,7 @@ int request_firmware_direct(const struct firmware **fir= mware_p, =09__module_get(THIS_MODULE); =09ret =3D _request_firmware(firmware_p, name, device, NULL, 0, =09=09=09=09FW_OPT_UEVENT | FW_OPT_NO_WARN | -=09=09=09=09FW_OPT_NOFALLBACK); +=09=09=09=09FW_OPT_NOFALLBACK_SYSFS); =09module_put(THIS_MODULE); =09return ret; } --=20 2.23.0