From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52570) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUbVm-0000Js-Tj for qemu-devel@nongnu.org; Tue, 23 Apr 2013 07:35:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUbVl-0004wM-4c for qemu-devel@nongnu.org; Tue, 23 Apr 2013 07:35:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44457 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUbVk-0004wG-KV for qemu-devel@nongnu.org; Tue, 23 Apr 2013 07:35:48 -0400 Message-ID: <51767213.4050005@suse.de> Date: Tue, 23 Apr 2013 13:35:47 +0200 From: Alexander Graf MIME-Version: 1.0 References: <1366658298-9275-1-git-send-email-agraf@suse.de> <1366658298-9275-6-git-send-email-agraf@suse.de> <20130423105858.45feae1d@gondolin> In-Reply-To: <20130423105858.45feae1d@gondolin> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 05/12] S390: ccw firmware: Add main program List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: Christian Borntraeger , qemu-devel@nongnu.org, Dominik Dingel On 04/23/2013 10:58 AM, Cornelia Huck wrote: > On Mon, 22 Apr 2013 21:18:11 +0200 > Alexander Graf wrote: > >> This C file is the main driving piece of the s390 ccw firmware. It >> provides a search for a workable block device, sets it as the default >> to boot off of and boots from it. >> >> Signed-off-by: Alexander Graf >> --- >> pc-bios/s390-ccw/main.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ >> 1 files changed, 56 insertions(+), 0 deletions(-) >> create mode 100644 pc-bios/s390-ccw/main.c >> >> diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c >> new file mode 100644 >> index 0000000..0913aac >> --- /dev/null >> +++ b/pc-bios/s390-ccw/main.c >> @@ -0,0 +1,56 @@ >> +/* >> + * S390 virtio-ccw loading program >> + * >> + * Copyright (c) 2013 Alexander Graf >> + * >> + * This work is licensed under the terms of the GNU GPL, version 2 or (at >> + * your option) any later version. See the COPYING file in the top-level >> + * directory. >> + */ >> + >> +#include "s390-ccw.h" >> + >> +struct subchannel_id blk_schid; >> +char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE))); >> + >> +void virtio_panic(const char *string) >> +{ >> + sclp_print(string); >> + while (1) { } >> +} >> + >> +static void virtio_setup(void) >> +{ >> + struct irb irb; >> + int i; >> + int r; >> + bool found = false; >> + >> + blk_schid.one = 1; >> + >> + for (i = 0; i< 0x10000; i++) { >> + blk_schid.sch_no = i; >> + r = tsch(blk_schid,&irb); > You want to do a stsch() loop here, not a tsch() loop :) What does stsch buy us over tsch? > As a bonus, you can exit the loop on cc == 3. > > r = stsch(blk_schid,&schib); > if (r == 3) { > break; > } > >> + if (r != 3) { > if (schib.pmcw.dnv) { > >> + if (virtio_is_blk(blk_schid)) { >> + found = true; >> + break; >> + } >> + } >> + } >> + >> + if (!found) { >> + virtio_panic("No virtio-blk device found!\n"); >> + } >> + >> + virtio_setup_block(blk_schid); > The virtio_is_blk() and virtio_setup_block() functions should go into a > preceding patch, no? The code doesn't get compiled before the end of the series anyway, so ordering might be slightly off :) Alex