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.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 5724BC43603 for ; Wed, 18 Dec 2019 17:53:32 +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 2CC972064B for ; Wed, 18 Dec 2019 17:53:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="MDlcYxHH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CC972064B 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]:58558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihdVq-0008S0-Fp for qemu-devel@archiver.kernel.org; Wed, 18 Dec 2019 12:53:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56229) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihdUv-0007ec-5H for qemu-devel@nongnu.org; Wed, 18 Dec 2019 12:52:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihdUr-0001aa-Lu for qemu-devel@nongnu.org; Wed, 18 Dec 2019 12:52:31 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:37818 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihdUq-0001Ve-3T for qemu-devel@nongnu.org; Wed, 18 Dec 2019 12:52:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576691546; 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; bh=mqg0Hqh1h6ScbTcwhh5SWMh3HUuJu7TKLUZYNxshdFk=; b=MDlcYxHHqaLA8312lPqkrEurErxrESlJpWujGLiTiFS8QlbC4szKcY4wuoECJiGbOKXnzi q9dck8T6ex32gwEe+s/t3YQXuVIyMJilE8/cOMauWXnqOrz6mP6HzJVE9r/N80NRhTwbZP ZGIEhRcYMCMIU3FFj/rFt3DIh2fMp+0= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-115-LLMpOXw4NfWU_jNlHqSsxQ-1; Wed, 18 Dec 2019 12:52:23 -0500 Received: by mail-wr1-f70.google.com with SMTP id w6so47641wrm.16 for ; Wed, 18 Dec 2019 09:52:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=X0c5BkxyPTbFBv2YtbtERUODj2FEvP0pkA9OscXlgoI=; b=JylvccrcTcTQW7vli65woIztRrR+lfQCADqUvm+uP/XjCUjuWksr3RGXuPZtxZ5kAw 5xP5v60dzRVM6LyRpydI8WPCZuY+ExYl/fH396YKS+RfImL+MMus70hRhAL1oiXRKwJD k5VtR5E5AaZqDUBlB1ktx2TieCIN1iIs76BEIiA4KekRkDmaboDtGSt/VMMaNQJXb6w3 FuJ7jhWJ1wIfP+8HANx9EZOQkLVlDtYthZ3ZnwygF+s+EmNdBJA+9Lsj9PatpRHxZ91r kVp7tflwmRhkqnSoElPry9wceQ1KhwLpe5wtBXNFDxwbM16Kssi5hSskYSxprv321CjO /myw== X-Gm-Message-State: APjAAAWT4P+LQRAlbZCE4Cf6nh2Ihrxz+bjwRhYS4IeLSuFC2MlX4Dbl JgiDgqtiLDydk2bTZMzRJ13suO3uefiBLmcjAFWP98QTi0CmavQQXI/K01/mlo0DVW5nVMTOQHK Ojk7QogInGGUz7c8= X-Received: by 2002:adf:fa12:: with SMTP id m18mr4046213wrr.309.1576691542832; Wed, 18 Dec 2019 09:52:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwZ+auCFqkdFehZbjyhHOVhI4hmNTdDc8guXDzGXH19VY7mXGxd2Hr1yAgs9b08yxgkvnU9ww== X-Received: by 2002:adf:fa12:: with SMTP id m18mr4046194wrr.309.1576691542645; Wed, 18 Dec 2019 09:52:22 -0800 (PST) Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id v22sm3070737wml.11.2019.12.18.09.52.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Dec 2019 09:52:22 -0800 (PST) Subject: Re: [PATCH 5/6] hw/scsi/megasas: Silent GCC9 duplicated-cond warning To: Richard Henderson , qemu-devel@nongnu.org References: <20191217173425.5082-1-philmd@redhat.com> <20191217173425.5082-6-philmd@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: <71c58178-6bd5-bbb9-5691-77bdae7d2788@redhat.com> Date: Wed, 18 Dec 2019 18:52:21 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-MC-Unique: LLMpOXw4NfWU_jNlHqSsxQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Fam Zheng , qemu-trivial@nongnu.org, Hannes Reinecke , qemu-block@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 12/18/19 5:03 AM, Richard Henderson wrote: > On 12/17/19 7:34 AM, Philippe Mathieu-Daud=C3=A9 wrote: >> GCC9 is confused when building with CFLAG -O3: >> >> hw/scsi/megasas.c: In function =E2=80=98megasas_scsi_realize=E2=80=99= : >> hw/scsi/megasas.c:2387:26: error: duplicated =E2=80=98if=E2=80=99 con= dition [-Werror=3Dduplicated-cond] >> 2387 | } else if (s->fw_sge >=3D 128 - MFI_PASS_FRAME_SIZE) { >> hw/scsi/megasas.c:2385:19: note: previously used here >> 2385 | if (s->fw_sge >=3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE)= { >> cc1: all warnings being treated as errors >> >> When this device was introduced in commit e8f943c3bcc, the author >> cared about modularity, using a definition for the firmware limit. >> If we modify the limit, the code is valid. Add a check if the >> definition got modified to a bigger limit. >> >> Signed-off-by: Philippe Mathieu-Daud=C3=A9 >> --- >> Cc: Hannes Reinecke >> Cc: Paolo Bonzini >> Cc: Fam Zheng >> Cc: qemu-block@nongnu.org >> --- >> hw/scsi/megasas.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c >> index de9bd20887..ece1601b66 100644 >> --- a/hw/scsi/megasas.c >> +++ b/hw/scsi/megasas.c >> @@ -2382,7 +2382,8 @@ static void megasas_scsi_realize(PCIDevice *dev, E= rror **errp) >> if (!s->hba_serial) { >> s->hba_serial =3D g_strdup(MEGASAS_HBA_SERIAL); >> } >> - if (s->fw_sge >=3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE) { >> + if (MEGASAS_MAX_SGE > 128 >> + && s->fw_sge >=3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE) { >> s->fw_sge =3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE; >> } else if (s->fw_sge >=3D 128 - MFI_PASS_FRAME_SIZE) { >> s->fw_sge =3D 128 - MFI_PASS_FRAME_SIZE; >> >=20 > I'm not keen on this. It looks to me like the raw 128 case should be rem= oved > -- surely that's the point of the symbolic constant. But I'll defer if a > maintainer disagrees. Is that approach acceptable? -- >8 -- @@ -54,6 +54,9 @@ #define MEGASAS_FLAG_USE_QUEUE64 1 #define MEGASAS_MASK_USE_QUEUE64 (1 << MEGASAS_FLAG_USE_QUEUE64) +QEMU_BUILD_BUG_MSG(MEGASAS_MAX_SGE > 128, + "Firmware limit too big for this device model"); + static const char *mfi_frame_desc[] =3D { "MFI init", "LD Read", "LD Write", "LD SCSI", "PD SCSI", "MFI Doorbell", "MFI Abort", "MFI SMP", "MFI Stop"}; @@ -2382,9 +2385,7 @@ static void megasas_scsi_realize(PCIDevice *dev,=20 Error **errp) if (!s->hba_serial) { s->hba_serial =3D g_strdup(MEGASAS_HBA_SERIAL); } - if (s->fw_sge >=3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE) { - s->fw_sge =3D MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE; - } else if (s->fw_sge >=3D 128 - MFI_PASS_FRAME_SIZE) { + if (s->fw_sge >=3D 128 - MFI_PASS_FRAME_SIZE) { s->fw_sge =3D 128 - MFI_PASS_FRAME_SIZE; } else { s->fw_sge =3D 64 - MFI_PASS_FRAME_SIZE; ---