From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by mx.groups.io with SMTP id smtpd.web10.11487.1675333300851208931 for ; Thu, 02 Feb 2023 02:21:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=SWPNK1jW; spf=pass (domain: gmail.com, ip: 209.85.218.49, mailfrom: savvamtr@gmail.com) Received: by mail-ej1-f49.google.com with SMTP id m2so4524644ejb.8 for ; Thu, 02 Feb 2023 02:21:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rlcB5J3jg9wWkHg3CDGN7W9vkxBm6BMn504jpQrgr0U=; b=SWPNK1jWlSjAPxBakuCTd5GI7Ho2VtjE0gFawKyS7SDmM1IbB9oTjUrqL1hVvJWLGp P9vzzutQGHUdlN9To+cPO3VicdeAFmgNBne3JYpwFfglkd8YlCmCJntCbSg6lKVZVLfG gBLUye87vHedNgxM7BS2Mv1IeM0fFAvXpDlwioCvz/Sl91ME+0aKUM+C4wAvgwUNLHOF RlDjvGuV8t+t3PG8nEzsW03Cos3tJr5fCKwxTxQzWqM7GVCGzX5/+YZj9cfeDEdrrn2v xJZh07WvYCSNHdd/WIpN1rlRClKh2cfsfBN3ouLcZON27QTsEJ0C/MY9S/wawOpVZ7zr RNnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rlcB5J3jg9wWkHg3CDGN7W9vkxBm6BMn504jpQrgr0U=; b=2o1jKlo8gXyIjq/blEZZyY32vMeij/vUI6QldkPrRkZKwnNmfa7nYtoGkxr4HJm9dE akzKOr3fmacAffF6W+bcJJYwEikbxvTOc9LO3lrp28PytLQ2BGLHe3yQm1IdNrcd9MVs 5HX3LByIr75c+RL24nY6Sx9pXOhDve2AUiouUU3DpcJfd4cylBmVUVfLzvGaD9rYcL4K oNp4tLvT9KnOJinJuRJq6KY72Qz2rt4+Ik8a/Cgwv99PxIQNu0vvO6+PFa3xXBtNxH/b yB0HpfTqng2+MZqSIwtIlfSK1smr6z0fHhwzndVu3273vQjf8zkq25jtY1MwabMp0Qv7 GLew== X-Gm-Message-State: AO0yUKUhpCiSfeZq9ocMN5Dl2ehw6+r6tA7s+KsKs683pM6cxLekGRBt Zj3jiguy7LE28fftQ9oeeohEHQkTF3BuLw== X-Google-Smtp-Source: AK7set+SnRzfAuGRRl35pW898svXH0qkzGkSkOgq5Dc/b+3c5G1nDWfyEKQE3u+Shgk22quK2ZeCVw== X-Received: by 2002:a17:906:a246:b0:881:9531:35a1 with SMTP id bi6-20020a170906a24600b00881953135a1mr5922310ejb.41.1675333299021; Thu, 02 Feb 2023 02:21:39 -0800 (PST) Return-Path: Received: from localhost.localdomain ([176.62.67.29]) by smtp.gmail.com with ESMTPSA id ci22-20020a170906c35600b0087bcda2b07bsm10013121ejb.202.2023.02.02.02.21.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Feb 2023 02:21:38 -0800 (PST) From: "Savva Mitrofanov" To: devel@edk2.groups.io Cc: =?UTF-8?q?Marvin=20H=C3=A4user?= , Pedro Falcato , Vitaly Cheptsov Subject: [edk2-platforms][PATCH v4 02/12] Ext4Pkg: Fix incorrect checksum metadata feature check Date: Thu, 2 Feb 2023 16:21:23 +0600 Message-Id: <20230202102133.51606-3-savvamtr@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230202102133.51606-1-savvamtr@gmail.com> References: <20230202102133.51606-1-savvamtr@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to check EXT4_FEATURE_RO_COMPAT_METADATA_CSUM in the FeatureRoCompat field instead of FeaturesCompat. The proper way to do this is to use macro EXT4_HAS_METADATA_CSUM. Also, replace the EXT4_FEATURE_INCOMPAT_CSUM_SEED check with predefined macro EXT4_HAS_INCOMPAT Cc: Marvin Häuser Cc: Pedro Falcato Cc: Vitaly Cheptsov Fixes: d9ceedca6c8f ("Ext4Pkg: Add Ext4Dxe driver.") Signed-off-by: Savva Mitrofanov Reviewed-by: Pedro Falcato Reviewed-by: Marvin Häuser --- Features/Ext4Pkg/Ext4Dxe/Superblock.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Features/Ext4Pkg/Ext4Dxe/Superblock.c b/Features/Ext4Pkg/Ext4Dxe/Superblock.c index 5a3c7f478187..35dcf3c007c8 100644 --- a/Features/Ext4Pkg/Ext4Dxe/Superblock.c +++ b/Features/Ext4Pkg/Ext4Dxe/Superblock.c @@ -220,13 +220,11 @@ Ext4OpenSuperblock ( } // At the time of writing, it's the only supported checksum. - if (Partition->FeaturesCompat & EXT4_FEATURE_RO_COMPAT_METADATA_CSUM && - (Sb->s_checksum_type != EXT4_CHECKSUM_CRC32C)) - { + if (EXT4_HAS_METADATA_CSUM (Partition) && (Sb->s_checksum_type != EXT4_CHECKSUM_CRC32C)) { return EFI_UNSUPPORTED; } - if ((Partition->FeaturesIncompat & EXT4_FEATURE_INCOMPAT_CSUM_SEED) != 0) { + if (EXT4_HAS_INCOMPAT (Partition, EXT4_FEATURE_INCOMPAT_CSUM_SEED)) { Partition->InitialSeed = Sb->s_checksum_seed; } else { Partition->InitialSeed = Ext4CalculateChecksum (Partition, Sb->s_uuid, 16, ~0U); -- 2.39.1