Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1M17GB-0006c9-C1 for mharc-grub-devel@gnu.org; Mon, 04 May 2009 19:07:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M17G9-0006bw-PE for grub-devel@gnu.org; Mon, 04 May 2009 19:07:41 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M17G8-0006bj-Gf for grub-devel@gnu.org; Mon, 04 May 2009 19:07:41 -0400 Received: from [199.232.76.173] (port=38191 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M17G8-0006bg-Bf for grub-devel@gnu.org; Mon, 04 May 2009 19:07:40 -0400 Received: from 74-93-104-97-washington.hfc.comcastbusiness.net ([74.93.104.97]:46304 helo=sunset.davemloft.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M17G7-0001OY-N4 for grub-devel@gnu.org; Mon, 04 May 2009 19:07:39 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id B5EFF35C00F for ; Mon, 4 May 2009 16:07:33 -0700 (PDT) Date: Mon, 04 May 2009 16:07:33 -0700 (PDT) Message-Id: <20090504.160733.142514272.davem@davemloft.net> To: grub-devel@gnu.org From: David Miller X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [PATCH]: Fix hangs and stalls on sparc64 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2009 23:07:41 -0000 1) If there isn't a CDROM in the drive, trying to do an ieee1275 open() on a cdroom device hangs nearly indefinitely. 2) If you try to open the bare device "ide/disk" for example (with no "@X,Y" ID selector) this hangs for 5 seconds then spits out ugly errors about not being able to read disk labels etc. So bypass these cases for now, we're only really interested in the explicitly listed aliases anyways. As for cdrom grub2 booting, I have some plans for this and I will look into them after I get some feedback about some details of OpenBoot from one of my engineering contacts at Sun. Committed. 2009-05-04 David S. Miller * disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Bypass cdrom devices, and do not traverse down under controller nodes. Index: disk/ieee1275/ofdisk.c =================================================================== --- disk/ieee1275/ofdisk.c (revision 2185) +++ disk/ieee1275/ofdisk.c (working copy) @@ -106,13 +106,9 @@ } } - if (! grub_strcmp (alias->type, "block")) + if (! grub_strcmp (alias->type, "block") && + grub_strcmp (alias->name, "cdrom")) ret = hook (alias->name); - else if ((! grub_strcmp (alias->type, "scsi")) - || (! grub_strcmp (alias->type, "ide")) - || (! grub_strcmp (alias->type, "ata"))) - /* Search for block-type children of these bus controllers. */ - ret = grub_children_iterate (alias->name, dev_iterate); return ret; }