From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1WAQPq-0004xW-21 for mharc-grub-devel@gnu.org; Mon, 03 Feb 2014 15:46:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAQPk-0004x0-9D for grub-devel@gnu.org; Mon, 03 Feb 2014 15:46:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WAQPf-0004Wa-J3 for grub-devel@gnu.org; Mon, 03 Feb 2014 15:46:44 -0500 Received: from mail-ee0-x22f.google.com ([2a00:1450:4013:c00::22f]:36343) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WAQPf-0004WR-BO for grub-devel@gnu.org; Mon, 03 Feb 2014 15:46:39 -0500 Received: by mail-ee0-f47.google.com with SMTP id d49so3887059eek.34 for ; Mon, 03 Feb 2014 12:46:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type; bh=nH5WBBkPrhjEkD1HI9131nB2Z4i5lNchU6moU7Frl70=; b=SPedQJon6r+R3HmuEpvQ4d+ARWp5vXlej9IKxFOZMjtwlNWIacgwil7FVRH4yefOxC yHr4Vq7x3g20l4JAx9bscqyFYWcVWtliACCNOSlSV897ed4buOgtPXuB1zQBGSABy85W ro+rtKRFRsu3GVC3JDSk0gXBdiFWII5koEP+UjVBP4kUG4Swt4S0oRjXX8Tzop0iBnr7 AIpZ1HwmV+nZcln9hB/Vj13JcVkla7pMyIszXXTCkHTvSSXbr3ApYHTLzipv3gSbjGcy K0JXLfNBrPgEWIy4kbHW5NzOvLv4B7BirtT5+1wykwUKTnyqT7ryKnmY2jOXDMF0WL6Z uNeg== X-Received: by 10.15.42.136 with SMTP id u8mr10548226eev.52.1391460397844; Mon, 03 Feb 2014 12:46:37 -0800 (PST) Received: from [129.132.211.79] (vpn-global-079-dhcp.ethz.ch. [129.132.211.79]) by mx.google.com with ESMTPSA id 8sm73922513eef.1.2014.02.03.12.46.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Feb 2014 12:46:36 -0800 (PST) Message-ID: <52EFCBED.9020007@gmail.com> Date: Mon, 03 Feb 2014 18:03:41 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Icedove/24.2.0 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: Fix serial output for OpenBSD current References: <1391338082.19518.4.camel@keks> In-Reply-To: <1391338082.19518.4.camel@keks> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8jBCMonaDThCsEWvLqwPswUQ8BEGT8lSA" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c00::22f X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Feb 2014 20:46:49 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --8jBCMonaDThCsEWvLqwPswUQ8BEGT8lSA Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 02.02.2014 11:48, Markus M=C3=BCller wrote: > Hi all, >=20 > attached is a patch that fixes serial console output with OpenBSD > current (will be 5.5). Grub uses an old struct for providing the kernel= > with information about the serial console that is now gone [1]. Since > the new way is in OpenBSD since 5.2, even older versions are still > supported with this patch. >=20 Could you try this patch instead? diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c index ea0edfa..19985f0 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -1646,6 +1646,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int a= rgc, char *argv[]) =20 serial.device =3D (GRUB_OPENBSD_COM_MAJOR << 8) | port; serial.speed =3D speed; + serial.addr =3D grub_ns8250_hw_get_port (port); =20 grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (seria= l)); bootflags |=3D OPENBSD_RB_SERCONS; @@ -1656,6 +1657,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int a= rgc, char *argv[]) =20 grub_memset (&serial, 0, sizeof (serial)); serial.device =3D (GRUB_OPENBSD_VGA_MAJOR << 8); + serial.addr =3D 0xffffffff; grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (seria= l)); bootflags &=3D ~OPENBSD_RB_SERCONS; } diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/open= bsd_bootarg.h index 01ca486..9ebe6b4 100644 --- a/include/grub/i386/openbsd_bootarg.h +++ b/include/grub/i386/openbsd_bootarg.h @@ -75,6 +75,8 @@ struct grub_openbsd_bootarg_console { grub_uint32_t device; grub_uint32_t speed; + grub_uint32_t addr; + grub_uint32_t frequency; }; =20 struct grub_openbsd_bootarg_pcibios > Regards, > Markus >=20 >=20 > [1] http://marc.info/?l=3Dopenbsd-cvs&m=3D138340457301045 >=20 >=20 >=20 > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel >=20 --8jBCMonaDThCsEWvLqwPswUQ8BEGT8lSA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iF4EAREKAAYFAlLvy+0ACgkQmBXlbbo5nOt56wD/eYx1oBZwmNtY/B3snLT8Csti MjmyvQa/EcjR5vHBrm8A/jsUHWN194xrYWx1fhYHbmbFgr03wm44cbhYvXBJ53qW =2ctg -----END PGP SIGNATURE----- --8jBCMonaDThCsEWvLqwPswUQ8BEGT8lSA--