From: "tip-bot2 for Amadeusz Sławiński" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: amadeuszx.slawinski@linux.intel.com,
Cezary Rojewski <cezary.rojewski@intel.com>,
Ard Biesheuvel <ardb@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: efi/urgent] efi/efivars: Set generic ops before loading SSDT
Date: Fri, 27 Nov 2020 16:49:26 -0000 [thread overview]
Message-ID: <160649576626.3364.8890840511181549442.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201123172817.124146-1-amadeuszx.slawinski@linux.intel.com>
The following commit has been merged into the efi/urgent branch of tip:
Commit-ID: 50bdcf047503e30126327d0be4f0ad7337106d68
Gitweb: https://git.kernel.org/tip/50bdcf047503e30126327d0be4f0ad7337106d68
Author: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
AuthorDate: Mon, 23 Nov 2020 12:28:17 -05:00
Committer: Ard Biesheuvel <ardb@kernel.org>
CommitterDate: Wed, 25 Nov 2020 16:55:02 +01:00
efi/efivars: Set generic ops before loading SSDT
Efivars allows for overriding of SSDT tables, however starting with
commit
bf67fad19e493b ("efi: Use more granular check for availability for variable services")
this use case is broken. When loading SSDT generic ops should be set
first, however mentioned commit reversed order of operations. Fix this
by restoring original order of operations.
Fixes: bf67fad19e493b ("efi: Use more granular check for availability for variable services")
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20201123172817.124146-1-amadeuszx.slawinski@linux.intel.com
Tested-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
---
drivers/firmware/efi/efi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 5e5480a..6c6eec0 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -390,10 +390,10 @@ static int __init efisubsys_init(void)
if (efi_rt_services_supported(EFI_RT_SUPPORTED_GET_VARIABLE |
EFI_RT_SUPPORTED_GET_NEXT_VARIABLE_NAME)) {
- efivar_ssdt_load();
error = generic_ops_register();
if (error)
goto err_put;
+ efivar_ssdt_load();
platform_device_register_simple("efivars", 0, NULL, 0);
}
parent reply other threads:[~2020-11-27 16:50 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <20201123172817.124146-1-amadeuszx.slawinski@linux.intel.com>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160649576626.3364.8890840511181549442.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=amadeuszx.slawinski@linux.intel.com \
--cc=ardb@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).