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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3B815C433EF for ; Thu, 31 Mar 2022 10:11:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 745D284217; Thu, 31 Mar 2022 12:11:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="S6/disXU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3B166841F7; Thu, 31 Mar 2022 12:10:21 +0200 (CEST) Received: from mail-wm1-x349.google.com (mail-wm1-x349.google.com [IPv6:2a00:1450:4864:20::349]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 03AB484203 for ; Thu, 31 Mar 2022 12:10:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=3An5FYgYKBi0JbLdUUPXXPUN.LXVd-KXXcURbcb.MNWg.MN@flex--ascull.bounces.google.com Received: by mail-wm1-x349.google.com with SMTP id l7-20020a05600c1d0700b0038c9c48f1e7so1216000wms.2 for ; Thu, 31 Mar 2022 03:10:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=QrSXQ2EYzd1xuCCm5HACSMHM5x5D9hiHVamXgTvE/Ns=; b=S6/disXUe4zrgKEIRh6UHuyqfsPg+IIb4t7ewty9hscVb1rJ1Bys2e01hdlGYeZRFc t1nrKdzrJCk2Eh7Hd5zNhFcJzBEtxFjTvqKVI2q3k7YG0SKQ2rGXikKH4ypzT+cvK1ZL kwDqrpRS6J1ETAwmQ4RcBn6z4Ws7ELwU8UgNJkJCIPKL76otevh8dArEHdw5FSuBH+qK 4eV4108FlK8Kpi/AjBJ6XkICWGr91oq6uMKRxInKfN00a42dXFzVOo74KDd+GIu56Upb x9XBApB6zLYERxU53adELuj4H4E6Rppcn0aQNoViUOJh/RzvMMx4/5soxGUPbbbpHwJN KSrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=QrSXQ2EYzd1xuCCm5HACSMHM5x5D9hiHVamXgTvE/Ns=; b=Nn7oikATxOQyfL3QPvCZe2CDmcP/lBLrxmUpGDiI4sNddvRzT+20GT2jcwPxPnEakP sJmTvN69s70mpzG2dIRBXJYC+SYkCdVaiuQyv1ZqZySjPb17O5UsnaTzloh92wF/4ufW y1rjKE6lA8/5FUaErL7EdabRlbLtcUG3t9v691c4laR7KoK9IwNNRm6EhW4tgY4teffB sRpApDDkvNqgY4VVCTotrf7bhT/l20JH1eeY+cfqjdh0wp0dUtKevM43Z5cpxiXaoYsh r7LlDFaUmxD2pZH8XWhiNpZUCrdYqAQpDLyMV7JuCY23DNZumsGSIXUrSsOQT2pmvikS ecyA== X-Gm-Message-State: AOAM533aaWKEaXgZvuBOioxB+jZ3adoBx2k95FSB0pm0KH8Gsmjif7ya q12GP1oyUMvRMdnqFt1iGDw87EICboRwZF7waJsHytHmhzPCym2CDN6le0y+Ozv0v7p/CKW0fI9 0aV7ZYNK659tvg68G7sqboksssZcPAXB9JwI81hg30uOJoj7+u3X18KoCfXs= X-Google-Smtp-Source: ABdhPJzDxhuH32BsVZhK3K3xWb3ZkXgS+CR3CdY8TZOAYHVaGOaLrvtgVaWR9MOwaZkpuREed0W0bPl5Pyk= X-Received: from ascull.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1510]) (user=ascull job=sendgmr) by 2002:a05:6000:184a:b0:203:f8f0:3407 with SMTP id c10-20020a056000184a00b00203f8f03407mr3714194wri.190.1648721410503; Thu, 31 Mar 2022 03:10:10 -0700 (PDT) Date: Thu, 31 Mar 2022 10:09:44 +0000 In-Reply-To: <20220331100949.3637425-1-ascull@google.com> Message-Id: <20220331100949.3637425-7-ascull@google.com> Mime-Version: 1.0 References: <20220331100949.3637425-1-ascull@google.com> X-Mailer: git-send-email 2.35.1.1094.g7c7d902a7c-goog Subject: [PATCH 06/11] virtio: sandbox: Fix device features bitfield From: Andrew Scull To: u-boot@lists.denx.de Cc: sjg@chromium.org, bmeng.cn@gmail.com, adelva@google.com, keirf@google.com, ptosi@google.com, Andrew Scull Content-Type: text/plain; charset="UTF-8" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean The virtio sandbox transport was setting the device features value to the bit index rather than shifting a bit to the right index. Fix this using the bit manipulation macros. Signed-off-by: Andrew Scull --- drivers/virtio/virtio_sandbox.c | 2 +- test/dm/virtio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/virtio/virtio_sandbox.c b/drivers/virtio/virtio_sandbox.c index aafb7beb94..a73b123454 100644 --- a/drivers/virtio/virtio_sandbox.c +++ b/drivers/virtio/virtio_sandbox.c @@ -160,7 +160,7 @@ static int virtio_sandbox_probe(struct udevice *udev) struct virtio_dev_priv *uc_priv = dev_get_uclass_priv(udev); /* fake some information for testing */ - priv->device_features = VIRTIO_F_VERSION_1; + priv->device_features = BIT_ULL(VIRTIO_F_VERSION_1); uc_priv->device = VIRTIO_ID_BLOCK; uc_priv->vendor = ('u' << 24) | ('b' << 16) | ('o' << 8) | 't'; diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 4cf0f56260..63fcc22172 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -77,7 +77,7 @@ static int dm_test_virtio_all_ops(struct unit_test_state *uts) ut_assertok(virtio_get_status(dev, &status)); ut_asserteq(0, status); ut_assertok(virtio_get_features(dev, &features)); - ut_asserteq(VIRTIO_F_VERSION_1, features); + ut_asserteq_64(BIT_ULL(VIRTIO_F_VERSION_1), features); ut_assertok(virtio_set_features(dev)); ut_assertok(virtio_find_vqs(dev, nvqs, vqs)); ut_assertok(virtio_del_vqs(dev)); -- 2.35.1.1094.g7c7d902a7c-goog