From: Ard Biesheuvel <ardb@kernel.org>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Randy Dunlap <rdunlap@infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-efi <linux-efi@vger.kernel.org>,
DRI Development <dri-devel@lists.freedesktop.org>,
Javier Martinez Canillas <javierm@redhat.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Mark Brown <broonie@kernel.org>,
Linux-Next <linux-next@vger.kernel.org>
Subject: Re: [PATCH] efi: sysfb_efi: fix build when EFI is not set
Date: Wed, 28 Jul 2021 10:50:32 +0200 [thread overview]
Message-ID: <CAMj1kXFVYneiWtiq7PcpMSL_u2K6YJvgkr9hTO2m81bYbs1WWQ@mail.gmail.com> (raw)
In-Reply-To: <CAMuHMdXrDLvPRNMy_pEtu1u=7ML8GT3mpKLba8vRnHU3iF8U+w@mail.gmail.com>
On Wed, 28 Jul 2021 at 10:39, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Randy,
>
> On Tue, Jul 27, 2021 at 7:06 AM Randy Dunlap <rdunlap@infradead.org> wrote:
> > When # CONFIG_EFI is not set, there are 2 definitions of
> > sysfb_apply_efi_quirks(). The stub from sysfb.h should be used
> > and the __init function from sysfb_efi.c should not be used.
> >
> > ../drivers/firmware/efi/sysfb_efi.c:337:13: error: redefinition of ‘sysfb_apply_efi_quirks’
> > __init void sysfb_apply_efi_quirks(struct platform_device *pd)
> > ^~~~~~~~~~~~~~~~~~~~~~
> > In file included from ../drivers/firmware/efi/sysfb_efi.c:26:0:
> > ../include/linux/sysfb.h:65:20: note: previous definition of ‘sysfb_apply_efi_quirks’ was here
> > static inline void sysfb_apply_efi_quirks(struct platform_device *pd)
> > ^~~~~~~~~~~~~~~~~~~~~~
> >
> > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>
> Thanks for your patch!
>
> > --- linext-20210726.orig/drivers/firmware/efi/sysfb_efi.c
> > +++ linext-20210726/drivers/firmware/efi/sysfb_efi.c
> > @@ -332,6 +332,7 @@ static const struct fwnode_operations ef
> > .add_links = efifb_add_links,
> > };
> >
> > +#ifdef CONFIG_EFI
> > static struct fwnode_handle efifb_fwnode;
> >
> > __init void sysfb_apply_efi_quirks(struct platform_device *pd)
> > @@ -354,3 +355,4 @@ __init void sysfb_apply_efi_quirks(struc
> > pd->dev.fwnode = &efifb_fwnode;
> > }
> > }
> > +#endif
>
> How come you enter drivers/firmware/efi/ without CONFIG_EFI?
>
> Oh:
>
> drivers/firmware/Makefile:obj-$(CONFIG_EFI) += efi/
> drivers/firmware/Makefile:obj-$(CONFIG_UEFI_CPER) += efi/
>
> Looks like UEFI_CPER is not related to EFI at all (it's not set in
> my arm64 config which has CONFIG_EFI=y). Perhaps it should be moved
> to drivers/acpi/ instead?
>
I think we should move this into drivers/firmware/cper/ instead, or
simply into drivers/firmware/
prev parent reply other threads:[~2021-07-28 8:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-27 5:04 [PATCH] efi: sysfb_efi: fix build when EFI is not set Randy Dunlap
2021-07-27 7:05 ` Ard Biesheuvel
2021-07-27 7:54 ` Javier Martinez Canillas
2021-07-27 9:15 ` Thomas Zimmermann
2021-07-27 9:54 ` Daniel Vetter
2021-07-27 16:25 ` kernel test robot
2021-07-28 8:39 ` Geert Uytterhoeven
2021-07-28 8:50 ` Ard Biesheuvel [this message]
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=CAMj1kXFVYneiWtiq7PcpMSL_u2K6YJvgkr9hTO2m81bYbs1WWQ@mail.gmail.com \
--to=ardb@kernel.org \
--cc=broonie@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=geert@linux-m68k.org \
--cc=javierm@redhat.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rdunlap@infradead.org \
--cc=tzimmermann@suse.de \
/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).