From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFF49C433DF for ; Mon, 22 Jun 2020 10:05:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7D35A206FA for ; Mon, 22 Jun 2020 10:05:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="AhptaLK7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D35A206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnJKR-0003h2-Qj for qemu-devel@archiver.kernel.org; Mon, 22 Jun 2020 06:05:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnJJm-0003Gk-Sc for qemu-devel@nongnu.org; Mon, 22 Jun 2020 06:04:46 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56967 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnJJl-0007bH-Gg for qemu-devel@nongnu.org; Mon, 22 Jun 2020 06:04:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592820284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:openpgp:openpgp; bh=iwNBBsQC2lrcBfa0zxVt4DLyDvyl57k4k8eDxBjq09c=; b=AhptaLK7dBikhBAF8odeKBFT6e3MaKPp5md5trnzrIRNM8Sr81/kISAPOmc4uGUwMchdd0 rgZgMbcI3UYQor8j6Sm9DD2FawLp3m3H/FNWXlr480TkHtzdO1uLCoPTaUcAWVzbAfTBd7 ikWF0MdqyJnpKL2dby2FdNELHjmmssw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-352-dZuAT5UJOlGh-nsgG9ntQA-1; Mon, 22 Jun 2020 06:04:40 -0400 X-MC-Unique: dZuAT5UJOlGh-nsgG9ntQA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3913108BCA1; Mon, 22 Jun 2020 10:04:39 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-125.ams2.redhat.com [10.36.112.125]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9AD15C240; Mon, 22 Jun 2020 10:04:34 +0000 (UTC) Subject: Re: [PATCH v4 2/9] pc-bios: s390x: Consolidate timing functions into time.h From: Thomas Huth To: Janosch Frank , qemu-devel@nongnu.org References: <20200622074235.32528-1-frankja@linux.ibm.com> <20200622074235.32528-3-frankja@linux.ibm.com> <98bf10d9-76cb-0196-5fef-8a4e3a5b1c4f@redhat.com> Openpgp: preference=signencrypt Message-ID: <9f1346c6-1561-5bb7-fc02-d364d34f017f@redhat.com> Date: Mon, 22 Jun 2020 12:04:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <98bf10d9-76cb-0196-5fef-8a4e3a5b1c4f@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=205.139.110.61; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 03:17:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com, david@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 22/06/2020 12.02, Thomas Huth wrote: > On 22/06/2020 09.42, Janosch Frank wrote: >> Let's consolidate timing related functions into one header. >> >> Signed-off-by: Janosch Frank >> --- >> pc-bios/s390-ccw/menu.c | 1 + >> pc-bios/s390-ccw/netmain.c | 15 +++------------ >> pc-bios/s390-ccw/s390-ccw.h | 8 ++++---- >> pc-bios/s390-ccw/s390-time.h | 23 +++++++++++++++++++++++ >> pc-bios/s390-ccw/virtio-net.c | 1 + >> pc-bios/s390-ccw/virtio-scsi.c | 1 + >> pc-bios/s390-ccw/virtio.c | 18 +++--------------- >> 7 files changed, 36 insertions(+), 31 deletions(-) >> create mode 100644 pc-bios/s390-ccw/s390-time.h >> >> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c >> index ce3815b201..de8260a5d6 100644 >> --- a/pc-bios/s390-ccw/menu.c >> +++ b/pc-bios/s390-ccw/menu.c >> @@ -12,6 +12,7 @@ >> #include "libc.h" >> #include "s390-ccw.h" >> #include "sclp.h" >> +#include "s390-time.h" > > You could maybe drop these additional includes... > >> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h >> index 21f27e7990..fae1de363f 100644 >> --- a/pc-bios/s390-ccw/s390-ccw.h >> +++ b/pc-bios/s390-ccw/s390-ccw.h >> @@ -74,8 +74,6 @@ unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2, >> bool virtio_is_supported(SubChannelId schid); >> void virtio_blk_setup_device(SubChannelId schid); >> int virtio_read(ulong sector, void *load_addr); >> -u64 get_clock(void); >> -ulong get_second(void); >> >> /* bootmap.c */ >> void zipl_load(void); >> @@ -153,11 +151,13 @@ static inline void yield(void) >> >> #define MAX_SECTOR_SIZE 4096 >> >> +#include "s390-time.h" > > ... since you already include s390-time.h here in this central header > file... > >> static inline void sleep(unsigned int seconds) >> { >> - ulong target = get_second() + seconds; >> + ulong target = get_time_seconds() + seconds; >> >> - while (get_second() < target) { >> + while (get_time_seconds() < target) { >> yield(); >> } >> } > > ... or you could move the sleep() function into s390-time.h, too? Never mind, I just saw that you move it in the next patch to a different header. That's fine. Thomas