Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Aug 2010 20:52:40 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r211823 - head/sys/compat/x86bios
Message-ID:  <201008252052.o7PKqeWQ022169@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jkim
Date: Wed Aug 25 20:52:40 2010
New Revision: 211823
URL: http://svn.freebsd.org/changeset/base/211823

Log:
  Check opcode for short jump as well.  Some option ROMs do short jumps
  (e.g., some NVIDIA video cards) and we were not able to do POST while
  resuming because we only honored long jump.
  
  MFC after:	3 days

Modified:
  head/sys/compat/x86bios/x86bios.c

Modified: head/sys/compat/x86bios/x86bios.c
==============================================================================
--- head/sys/compat/x86bios/x86bios.c	Wed Aug 25 20:48:24 2010	(r211822)
+++ head/sys/compat/x86bios/x86bios.c	Wed Aug 25 20:52:40 2010	(r211823)
@@ -801,7 +801,8 @@ x86bios_get_orm(uint32_t offset)
 
 	/* Does the shadow ROM contain BIOS POST code for x86? */
 	p = x86bios_offset(offset);
-	if (p == NULL || p[0] != 0x55 || p[1] != 0xaa || p[3] != 0xe9)
+	if (p == NULL || p[0] != 0x55 || p[1] != 0xaa ||
+	    (p[3] != 0xe9 && p[3] != 0xeb))
 		return (NULL);
 
 	return (p);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008252052.o7PKqeWQ022169>