From nobody Fri Dec 19 06:29:43 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1657181661; cv=none; d=zohomail.com; s=zohoarc; b=XD3032mdTi8n3DWwqnd0Ll+vcrsXm4pa048a/1Ce/dOzD4vaaSJ9BCmTH7/TuSCiwHaW4nAEAG9vP5jeDQ3Nt1p29hd+WbUuISbsEnSqXQJjW9ZM1o083hT11l6jH04HgXwYwLcsDMMmRN75XheFk4DSPz+AWR5SNAz5DAuJXWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1657181661; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z2kW+26twQo7eSCMM81+twC2ogAa0jx84FCuNB7IkkY=; b=iUMjlJJAU8AtR4N942nhyb5AnG55UAhD1KOojg74EHCVp1b5o/vObh7KfDMg46kvjHjJID099NYnGsFdz3qOYks3DVIDDKzBQ6h9Mv2f3Aiy3FuPL5CvpqR3gj6llMDMmH+lbFabgS5wZQHYTFtN3DjCF93eUweldR6z0A1GHP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1657181661884626.6998524608636; Thu, 7 Jul 2022 01:14:21 -0700 (PDT) Received: from localhost ([::1]:50030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9MeR-0008Mf-8H for importer@patchew.org; Thu, 07 Jul 2022 04:14:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9MLX-0002f4-RC for qemu-devel@nongnu.org; Thu, 07 Jul 2022 03:54:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9MLW-0007V2-0V for qemu-devel@nongnu.org; Thu, 07 Jul 2022 03:54:47 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-593-6wBlPzeqNLyhmXjHYBAGDw-1; Thu, 07 Jul 2022 03:54:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8AAF5811E7A; Thu, 7 Jul 2022 07:54:41 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C4F3400DFA6; Thu, 7 Jul 2022 07:54:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657180485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z2kW+26twQo7eSCMM81+twC2ogAa0jx84FCuNB7IkkY=; b=QGzyORP1lWnhO+acSsP0FNnJC3ul+o+rsxCjNJenCrVB0CjxADSAHvdjcZoYgkxOEHPK0/ MKCz7pi/9VIe7kvBvAimD8lfasAJNhmzIXWKm9unrUGN6NwV1XZ/WnDGEetmqrLzE3Whw6 fGhvuJ8R9NlIJdRjoYzgNnG+i+YyRB4= X-MC-Unique: 6wBlPzeqNLyhmXjHYBAGDw-1 From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org, Christian Borntraeger , Cornelia Huck , Eric Farman Subject: [PULL 07/18] pc-bios/s390-ccw/virtio: Set missing status bits while initializing Date: Thu, 7 Jul 2022 09:54:15 +0200 Message-Id: <20220707075426.1163210-8-thuth@redhat.com> In-Reply-To: <20220707075426.1163210-1-thuth@redhat.com> References: <20220707075426.1163210-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1657181663643100001 Content-Type: text/plain; charset="utf-8" According chapter "3.1.1 Driver Requirements: Device Initialization" of the Virtio specification (v1.1), a driver for a device has to set the ACKNOWLEDGE and DRIVER bits in the status field after resetting the device. The s390-ccw bios skipped these steps so far and seems like QEMU never cared. Anyway, it's better to follow the spec, so let's set these bits now in the right spots, too. Message-Id: <20220704111903.62400-7-thuth@redhat.com> Acked-by: Christian Borntraeger Reviewed-by: Cornelia Huck Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/virtio.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pc-bios/s390-ccw/virtio.c b/pc-bios/s390-ccw/virtio.c index 5d2c6e3381..4e85a2eb82 100644 --- a/pc-bios/s390-ccw/virtio.c +++ b/pc-bios/s390-ccw/virtio.c @@ -220,7 +220,7 @@ int virtio_run(VDev *vdev, int vqid, VirtioCmd *cmd) void virtio_setup_ccw(VDev *vdev) { int i, rc, cfg_size =3D 0; - unsigned char status =3D VIRTIO_CONFIG_S_DRIVER_OK; + uint8_t status; struct VirtioFeatureDesc { uint32_t features; uint8_t index; @@ -234,6 +234,10 @@ void virtio_setup_ccw(VDev *vdev) =20 run_ccw(vdev, CCW_CMD_VDEV_RESET, NULL, 0, false); =20 + status =3D VIRTIO_CONFIG_S_ACKNOWLEDGE; + rc =3D run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), fa= lse); + IPL_assert(rc =3D=3D 0, "Could not write ACKNOWLEDGE status to host"); + switch (vdev->senseid.cu_model) { case VIRTIO_ID_NET: vdev->nr_vqs =3D 2; @@ -253,6 +257,11 @@ void virtio_setup_ccw(VDev *vdev) default: panic("Unsupported virtio device\n"); } + + status |=3D VIRTIO_CONFIG_S_DRIVER; + rc =3D run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), fa= lse); + IPL_assert(rc =3D=3D 0, "Could not write DRIVER status to host"); + IPL_assert( run_ccw(vdev, CCW_CMD_READ_CONF, &vdev->config, cfg_size, false) = =3D=3D 0, "Could not get block device configuration"); @@ -291,9 +300,10 @@ void virtio_setup_ccw(VDev *vdev) run_ccw(vdev, CCW_CMD_SET_VQ, &info, sizeof(info), false) =3D= =3D 0, "Cannot set VQ info"); } - IPL_assert( - run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), false= ) =3D=3D 0, - "Could not write status to host"); + + status |=3D VIRTIO_CONFIG_S_DRIVER_OK; + rc =3D run_ccw(vdev, CCW_CMD_WRITE_STATUS, &status, sizeof(status), fa= lse); + IPL_assert(rc =3D=3D 0, "Could not write DRIVER_OK status to host"); } =20 bool virtio_is_supported(SubChannelId schid) --=20 2.31.1