On Thu, 2021-02-11 at 18:21 +0200, Kalle Valo wrote:
> Luca Coelho <luca@xxxxxxxxx> writes:
>
> > From: Luca Coelho <luciano.coelho@xxxxxxxxx>
> >
> > We now support fetching the PNVM data from a UEFI variable. Add the
> > code to read this variable first and use it. If it's not available,
> > we fall back to reading the data from the filesystem, as before.
> >
> > Signed-off-by: Luca Coelho <luciano.coelho@xxxxxxxxx>
>
> [...]
>
> > --- a/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
> > +++ b/drivers/net/wireless/intel/iwlwifi/fw/pnvm.c
> > @@ -10,6 +10,7 @@
> > #include "fw/api/commands.h"
> > #include "fw/api/nvm-reg.h"
> > #include "fw/api/alive.h"
> > +#include <linux/efi.h>
> >
> >
> >
> >
> > struct iwl_pnvm_section {
> > __le32 offset;
> > @@ -219,6 +220,88 @@ static int iwl_pnvm_parse(struct iwl_trans *trans, const u8 *data,
> > return -ENOENT;
> > }
> >
> >
> >
> >
> > +/*
> > + * This is known to be broken on v4.19 and to work on v5.4. Until we
> > + * figure out why this is the case and how to make it work, simply
> > + * disable the feature in old kernels.
> > + */
> > +#if defined(CONFIG_EFI)
>
> The comment doesn't really make sense anymore, can you send a followupb
> patch to remove it? No need to change the tag because of this.
Ugh, sorry about that. I just saw that the version check had slipped
in and fixed it quickly at 2am, so I could still send you the pull-req
before going to sleep...
I'll send a patch removing this now.
--
Cheers,
Luca.
