Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <23DC077F-69DF-402C-A940-2E7EEABF2D97@live.com>
 <CAMj1kXG03-0AdM_ROf2UhH-N2Z52v7ox_emSQw=y5p3sMeTrMA@mail.gmail.com> <E48DD0F8-D9C5-4BD2-87A9-CFF0C22D0447@live.com>
In-Reply-To: <E48DD0F8-D9C5-4BD2-87A9-CFF0C22D0447@live.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Wed, 26 Oct 2022 23:20:20 +0200
Message-ID: <CAMj1kXH+ZQNcGXk96ta6SmAkU_hTCnCgU_AH0UbeAbfZtr83CA@mail.gmail.com>
Subject: Re: [REGRESSION] Failure to write the NVRAM variables starting from
 kernel 6.0 on T2 Macs
To:     Aditya Garg <gargaditya08@live.com>
Cc:     "matthew.garrett@nebula.com" <matthew.garrett@nebula.com>,
        "jk@ozlabs.org" <jk@ozlabs.org>,
        "linux-efi@vger.kernel.org" <linux-efi@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Orlando Chamberlain <redecorating@protonmail.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 26 Oct 2022 at 23:18, Aditya Garg <gargaditya08@live.com> wrote:
>
> Hi Ard
>
> Just a friendly reminder to get updates on the patch you asked me to test, as it seems to fix my issue.
>

This should be fixed now in v6.1-rc2


> > Thanks for the report. I did identify an issue in some refactoring
> > work of the efivars layer that went into 6.0
> >
> > Can you please check whether the change below fixes the issue for you?
> >
> > diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
> > index dd74d2ad3184..35edba93cf14 100644
> > --- a/drivers/firmware/efi/vars.c
> > +++ b/drivers/firmware/efi/vars.c
> > @@ -209,7 +209,7 @@ efivar_set_variable_blocking(efi_char16_t *name,
> > efi_guid_t *vendor,
> >        if (data_size > 0) {
> >                status = check_var_size(attr, data_size +
> >                                              ucs2_strsize(name, 1024));
> > -               if (status != EFI_SUCCESS)
> > +               if (status != EFI_SUCCESS && status != EFI_UNSUPPORTED)
> >                        return status;
> >        }
> >        return __efivars->ops->set_variable(name, vendor, attr,
> > data_size, data);
> > @@ -242,7 +242,7 @@ efi_status_t
> > efivar_set_variable_locked(efi_char16_t *name, efi_guid_t *vendor,
> >        if (data_size > 0) {
> >                status = check_var_size_nonblocking(attr, data_size +
> >
> > ucs2_strsize(name, 1024));
> > -               if (status != EFI_SUCCESS)
> > +               if (status != EFI_SUCCESS && status != EFI_UNSUPPORTED)
> >                        return status;
> >        }
> >        return setvar(name, vendor, attr, data_size, data);
>
> Regards
> Aditya