On Wed, Oct 16, 2024 at 10:09:30AM -0700, Adam Williamson wrote:
> 7b192ec4c rejigged the serial port detection code when no port
> is explicitly specified. Before 7b192ec4c we did
> grub_serial_find ("com0") in this case, which on *any* platform
> would return a port called "com0" if one was found. 7b192ec4c
> changed this so we do grub_serial_find ("auto"), and added a
> block to handle the "auto" string which tries to detect a port
> from the SPCR by calling grub_ns8250_spcr_init (), then falls
> through to com0 if that doesn't work.
>
> However, that block was placed such that it was wrapped in two
> ifdefs that limit its scope. This means that we would no longer
> default to com0 unless the requirements of *both* ifdefs are met.
>
> To fix this, move the handling of "auto" up to happen first,
> before the ifdef around "port" handling kicks in. If we don't
> find an SPCR, change the name to "com0", so it will be handled
> by the existing "exact match by name" block that comes next,
> just as it was before 7b192ec4c. In the handling of "auto", have
> the ifdef that is meant to block grub_ns8250_spcr_init on
> inappropriate platforms *only* wrap that call, not *also* wrap
> the fallback to com0.
>
> Signed-off-by: Adam Williamson <awill...@redhat.com>It seems to me this patch is not based on latest upstream master. Please rebase and resend... Daniel _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
