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=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 EADACC76188 for ; Fri, 19 Jul 2019 11:50:55 +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 C38C820873 for ; Fri, 19 Jul 2019 11:50:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C38C820873 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]:44226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoRPa-0004Ds-Qb for qemu-devel@archiver.kernel.org; Fri, 19 Jul 2019 07:50:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42428) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoRPJ-0003Ok-PN for qemu-devel@nongnu.org; Fri, 19 Jul 2019 07:50:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoRPI-0004Sv-QI for qemu-devel@nongnu.org; Fri, 19 Jul 2019 07:50:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hoRPI-0004SM-L8; Fri, 19 Jul 2019 07:50:36 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id DA39959474; Fri, 19 Jul 2019 11:50:35 +0000 (UTC) Received: from localhost (dhcp-192-181.str.redhat.com [10.33.192.181]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 895215C1A1; Fri, 19 Jul 2019 11:50:35 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Fri, 19 Jul 2019 13:50:31 +0200 Message-Id: <20190719115031.16331-2-cohuck@redhat.com> In-Reply-To: <20190719115031.16331-1-cohuck@redhat.com> References: <20190719115031.16331-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 19 Jul 2019 11:50:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL for-4.1 1/1] s390x/pci: add some fallthrough annotations 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: Stefan Weil , qemu-s390x@nongnu.org, Cornelia Huck , qemu-devel@nongnu.org, Collin Walling Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" According to the comment, the bits are supposed to accumulate. Reported-by: Stefan Weil Fixes: 5d1abf234462 ("s390x/pci: enforce zPCI state checking") Acked-by: Collin Walling Signed-off-by: Cornelia Huck --- hw/s390x/s390-pci-inst.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 61f30b8e55d2..00235148bed7 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -1209,8 +1209,10 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1,= uint64_t fiba, uint8_t ar, * FH Enabled bit is set to one in states of ENABLED, BLOCKED or ERR= OR. */ case ZPCI_FS_ERROR: fib.fc |=3D 0x20; + /* fallthrough */ case ZPCI_FS_BLOCKED: fib.fc |=3D 0x40; + /* fallthrough */ case ZPCI_FS_ENABLED: fib.fc |=3D 0x80; if (pbdev->iommu->enabled) { --=20 2.20.1