diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
| commit | 9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch) | |
| tree | d446bb455780d9058efe1760745bfb63207090de /arch/x86/platform/efi/quirks.c | |
| parent | 987da3fe175933c28aab2293505c3597052ff0e2 (diff) | |
| parent | dd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff) | |
| download | linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz | |
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'arch/x86/platform/efi/quirks.c')
| -rw-r--r-- | arch/x86/platform/efi/quirks.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 8a99a2e96537..5b513ccffde4 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -592,7 +592,18 @@ static int qrk_capsule_setup_info(struct capsule_info *cap_info, void **pkbuff, /* * Update the first page pointer to skip over the CSH header. */ - cap_info->pages[0] += csh->headersize; + cap_info->phys[0] += csh->headersize; + + /* + * cap_info->capsule should point at a virtual mapping of the entire + * capsule, starting at the capsule header. Our image has the Quark + * security header prepended, so we cannot rely on the default vmap() + * mapping created by the generic capsule code. + * Given that the Quark firmware does not appear to care about the + * virtual mapping, let's just point cap_info->capsule at our copy + * of the capsule header. + */ + cap_info->capsule = &cap_info->header; return 1; } |