From patchwork Tue Mar 28 21:01:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 667872 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp9090wrt; Tue, 28 Mar 2023 14:02:34 -0700 (PDT) X-Google-Smtp-Source: AKy350YVi3NTvSxmV6yKkBZfGndR8BVp6QAGpQucdwBWJLjTPU9A5kXoPwa0gS25VGbW2CCI8s9F X-Received: by 2002:a05:6214:e6e:b0:5c8:f391:9442 with SMTP id jz14-20020a0562140e6e00b005c8f3919442mr26542716qvb.18.1680037354622; Tue, 28 Mar 2023 14:02:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680037354; cv=none; d=google.com; s=arc-20160816; b=YeliC4jM4SWJON+smsAT+rbyTUjvdABHhUw6g52BZgsNthuTy15mHGXqqHqZ4+P7rV hLz0jk5yLLZAhLEYG/f1c81ZiCrQuzzkWfJyZvWvUxCRZJrV2K/U0DxDwDqZ88goZROc cxAfih9288EQG671DPTy2/rV61tDUDyIpDZw1rU05Gk6UIVSNS9WZBokImAKYrGYrRz6 n37PyTuYXSGNSvJ35w9JP0ZkWk9EIVfHkUCWYZWBzG19I/bsrZLWSS7DSNVC9DEeHTTa 02x5BejrmGExOAWU2ZAV28Vi6QHG7lm11nKTwLnTS3C+7Hxfgn3hFIZBGvtd4N7F6MQo lQag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature; bh=YNS6DKRP4wwEN6+6knCb2rHr3UGglLVmviV4kxalOdI=; b=oaslc/u5/G80DLCFCrH/nRZQZi9+uZFIcYIhW/uKUOLBi3GKqp3YHbbO47MjKbjwoe OIQnfcj9yl7laeSe0ndd31aeMqcUBPw+1FdC5Sx36XyFF8LiXzh74cyyuI8tGU8uVK3E stMwM01BrS7FMVnd1Eyy2UegYYJXr7AEnfNaaUeE6can3WChYoX61RFYQ6xztNMPmZA+ diqYAPXxfor1ojkVn4OJ5fykRrXzVbm4kd5gl4Lz0lOeuaMaGpc+2Ccf7jxtCp2e6WlQ 1hYktlYfAH/dHPsMe42f1bVSm3ue9z0cHvX5OSf8Mvyn9KNzjBql1UyE1L2Vvrb9O2HS 8H3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pqnZzBIo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q185-20020a3743c2000000b007456fa51212si20292153qka.250.2023.03.28.14.02.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Mar 2023 14:02:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pqnZzBIo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phGRp-0000TI-Da; Tue, 28 Mar 2023 17:01:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1phGRi-0000SZ-Me for qemu-devel@nongnu.org; Tue, 28 Mar 2023 17:01:35 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phGRf-0002xV-E4 for qemu-devel@nongnu.org; Tue, 28 Mar 2023 17:01:33 -0400 Received: by mail-wm1-x32b.google.com with SMTP id bg13-20020a05600c3c8d00b003ef90adc168so591482wmb.5 for ; Tue, 28 Mar 2023 14:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680037289; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YNS6DKRP4wwEN6+6knCb2rHr3UGglLVmviV4kxalOdI=; b=pqnZzBIoRL/bKh6iZfkB7xgM0iXFRGbgdKMU1RIJ2YqydTrEQ0sgLbWmZ8iHqzI80a JjUOS5ux2RmVUk8z30wNKGAm5z8zFHpoU89+xIOEvEHvvU47A5GmCBFU9Fbc1rC8b+NH jSbhIAsm9qzuz2UZF3wq8T5bA70tMTs8U7g8tUHkQxTfqLBr9dUxnTFuyZIgPQFnNX5a HxhO+G5iE9fEoUo6E25TE7i4Lz58frnlQ2TyYHgugxtOesuD81JHGpNNFQiJA5NKxJz3 agq/h3vsFFidtgIwin5sZPSlko0E+3a0t0puTw9HcdMr3BcPYqhubZXRBoZroclwt20F M8VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680037289; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YNS6DKRP4wwEN6+6knCb2rHr3UGglLVmviV4kxalOdI=; b=0okVdoE9p565xL7TYeg9pwyWE7uAlAVW18DDZDx9ZaX500F+lInWAJSswwWYiPjTl0 wlhRZCF/zoHKjNH/id5ZHYCOAHT2cAfhdy0TFH/VmeBFz95el33khTpYi0nE0+uXcvkW UgeltEGSZtyYypFPdBBXifYAFuPJTvz4ooO6YPLKofCNZv2MkznEexqIyQ4F54Wbpwfw eKDm7+ZtpwMAZlZ0ziMFNWpxyoXoRnQkn4NIS4UNvSSSrQxyaiKURaNsjmNp1W4Lqevo UOj97DDxiyyXgvRV9s2zsLxwUpnY9s1O2WXPVycC7CCRVC9cIYLMhxGhnPYrJ0TSltg5 IIQA== X-Gm-Message-State: AO0yUKXnF4extiozI+4Sr4F1Evn5x9rBrEDYjpAqguSUUj38m3XZM+FC pgU4oWaPp0cQvyE8crPynCHUJe581kKduoCiVQM= X-Received: by 2002:a7b:cb44:0:b0:3ee:672d:caa3 with SMTP id v4-20020a7bcb44000000b003ee672dcaa3mr14381579wmj.18.1680037289595; Tue, 28 Mar 2023 14:01:29 -0700 (PDT) Received: from localhost.localdomain ([176.187.210.212]) by smtp.gmail.com with ESMTPSA id h6-20020a05600c350600b003ee8ab8d6cfsm13605831wmq.21.2023.03.28.14.01.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 28 Mar 2023 14:01:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-block@nongnu.org, Hannes Reinecke , Paolo Bonzini , Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2] hw/scsi/megasas: Silent GCC duplicated-cond warning Date: Tue, 28 Mar 2023 23:01:26 +0200 Message-Id: <20230328210126.16282-1-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé GCC9 is confused when building with CFLAG -O3: hw/scsi/megasas.c: In function ‘megasas_scsi_realize’: hw/scsi/megasas.c:2387:26: error: duplicated ‘if’ condition [-Werror=duplicated-cond] 2387 | } else if (s->fw_sge >= 128 - MFI_PASS_FRAME_SIZE) { hw/scsi/megasas.c:2385:19: note: previously used here 2385 | if (s->fw_sge >= 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. However if the firmware limit isn't changed (MEGASAS_MAX_SGE = 128), the code ends doing the same check twice. Per the maintainer [*]: > The original code assumed that one could change MFI_PASS_FRAME_SIZE, > but it turned out not to be possible as it's being hardcoded in the > drivers themselves (even though the interface provides mechanisms to > query it). So we can remove the duplicate lines. Add the 'MEGASAS_MIN_SGE' definition for the '64' magic value, slightly rewrite the condition check to simplify a bit the logic and remove the unnecessary / duplicated check. [*] https://lore.kernel.org/qemu-devel/e0029fc5-882f-1d63-15e3-1c3dbe9b6a2c@suse.de/ Suggested-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Hannes Reinecke --- v1: https://lore.kernel.org/qemu-devel/20191217173425.5082-6-philmd@redhat.com/ --- hw/scsi/megasas.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 9cbbb16121..32c70c9e99 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -42,6 +42,7 @@ #define MEGASAS_MAX_FRAMES 2048 /* Firmware limit at 65535 */ #define MEGASAS_DEFAULT_FRAMES 1000 /* Windows requires this */ #define MEGASAS_GEN2_DEFAULT_FRAMES 1008 /* Windows requires this */ +#define MEGASAS_MIN_SGE 64 #define MEGASAS_MAX_SGE 128 /* Firmware limit */ #define MEGASAS_DEFAULT_SGE 80 #define MEGASAS_MAX_SECTORS 0xFFFF /* No real limit */ @@ -2356,6 +2357,7 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) MegasasState *s = MEGASAS(dev); MegasasBaseClass *b = MEGASAS_GET_CLASS(s); uint8_t *pci_conf; + uint32_t sge; int i, bar_type; Error *err = NULL; int ret; @@ -2424,13 +2426,15 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) if (!s->hba_serial) { s->hba_serial = g_strdup(MEGASAS_HBA_SERIAL); } - if (s->fw_sge >= MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE) { - s->fw_sge = MEGASAS_MAX_SGE - MFI_PASS_FRAME_SIZE; - } else if (s->fw_sge >= 128 - MFI_PASS_FRAME_SIZE) { - s->fw_sge = 128 - MFI_PASS_FRAME_SIZE; - } else { - s->fw_sge = 64 - MFI_PASS_FRAME_SIZE; + + sge = s->fw_sge + MFI_PASS_FRAME_SIZE; + if (sge < MEGASAS_MIN_SGE) { + sge = MEGASAS_MIN_SGE; + } else if (sge >= MEGASAS_MAX_SGE) { + sge = MEGASAS_MAX_SGE; } + s->fw_sge = sge - MFI_PASS_FRAME_SIZE; + if (s->fw_cmds > MEGASAS_MAX_FRAMES) { s->fw_cmds = MEGASAS_MAX_FRAMES; }