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 E169EC433F5 for ; Thu, 21 Apr 2022 16:11:48 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 78F8583E4C; Thu, 21 Apr 2022 18:11:32 +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="CuvVy9A7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E1D4183DEB; Thu, 21 Apr 2022 18:11:26 +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 79ED983DEB for ; Thu, 21 Apr 2022 18:11:24 +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=3LIJhYgYKBs8vDxF6619916z.x97F-w99E63DED.yz8I.yz@flex--ascull.bounces.google.com Received: by mail-wm1-x349.google.com with SMTP id c62-20020a1c3541000000b0038ec265155fso4676377wma.6 for ; Thu, 21 Apr 2022 09:11:24 -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=c1sNHI9VbCX6dV9mR5jDJXJBNlbi+Ccw8N12CAL9HPc=; b=CuvVy9A7FW5Vkij0mb7adhFBBLwwo9O884JotayLWCn/sa/lyszDkCXOfGuWwYgpan LFZlqWo3hL0L1k+dJV3vYYS/HzEwOpgyPN4D7/HRsYm2yI81QWGAQsZ4691nuupeRf/T sbv1SCQlWsJDnUlZfvw/NlVw5zcWVbYaKj63Eg7egJBgpwzxtyhfF2Kjuoydi2VSN+DS /db5JPEo6H0EUajuXk0PZ6wLTxTb4N8/ZABeLAo2kLCQrhxMLUs7VX4xpVBQYbTUhYtp oDa2AkRY4eWVwP9xeJs5e4PcoxiLhPdYUW2I5IdtSFWfQJQ5E9xNlBL2bb56nv8yO4Vw yBhQ== 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=c1sNHI9VbCX6dV9mR5jDJXJBNlbi+Ccw8N12CAL9HPc=; b=yYMCzBZXYiI7kjfoKPHvuNAEf3ylAjvB14hvLPQydJ1fcgG49Kgf76VCRTTBKfFZ6X y8VobiQTgb/bcHZCEh6QQbgY1ZjLImokt3mY83QswI3+m+Ax1jJrFncBgo8vV2J3hEgc kWHMrhdQiWdFlQ4oZEiVjp+ic+GFihtvMIoGo0WdT4Qjw2Gr9qxrrFFRuli7anREsLBU v1l36FdtPT/fhoqmRuyx9FjcWQ/TL/5QmAu4aYb0z2N0iUkpQH3Mhc8tbqmBVzSq5BgJ TFWqlJqqf/WYwRhoQP8AXybszbflgFpcIvnDC6p1R0Hxl+A2C58QLeT0DQdNMbVasRv/ 9LSA== X-Gm-Message-State: AOAM530oJRfUlBBJN43G86AMCG1KKibG/GN61MpOiyjWrrA//TYpt3dJ q5W7eQKJEvq6rgYYOFXKsVTiimXVPYy87py7lReb87vSmWdiGWgELeLKXo4jdHuocEgvnWIBxgj cjf2GMPpJZYSI8kV5vI5TjKJKfmddRf3N8tQ2ylWShQ/bsRpjxbBYBdgvxqE= X-Google-Smtp-Source: ABdhPJygUVrLscQkQkWAxqaYvuhxLYP66Pu5A/1UgxstlIjdIvlIu0zYhhL5QaTxXxjyb2eiCwzwIv9TU/Q= X-Received: from ascull.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:1510]) (user=ascull job=sendgmr) by 2002:a05:600c:1456:b0:38e:bd55:700 with SMTP id h22-20020a05600c145600b0038ebd550700mr98549wmi.204.1650557484082; Thu, 21 Apr 2022 09:11:24 -0700 (PDT) Date: Thu, 21 Apr 2022 16:11:00 +0000 In-Reply-To: <20220421161116.1202023-1-ascull@google.com> Message-Id: <20220421161116.1202023-3-ascull@google.com> Mime-Version: 1.0 References: <20220421161116.1202023-1-ascull@google.com> X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v3 02/18] virtio: pci: Fix discovery of device config length From: Andrew Scull To: u-boot@lists.denx.de Cc: sjg@chromium.org, bmeng.cn@gmail.com, trini@konsulko.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 length of the device config was erroneously being taken from the notify capability. Correct this by finding the length in the device capability. Fixes: 550435edf810 ("virtio: pci: Support non-legacy PCI transport device") Signed-off-by: Andrew Scull Reviewed-by: Bin Meng --- drivers/virtio/virtio_pci_modern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c index fd8a1f3fec..55d25cb81b 100644 --- a/drivers/virtio/virtio_pci_modern.c +++ b/drivers/virtio/virtio_pci_modern.c @@ -497,7 +497,7 @@ static int virtio_pci_probe(struct udevice *udev) */ device = virtio_pci_find_capability(udev, VIRTIO_PCI_CAP_DEVICE_CFG); if (device) { - offset = notify + offsetof(struct virtio_pci_cap, length); + offset = device + offsetof(struct virtio_pci_cap, length); dm_pci_read_config32(udev, offset, &priv->device_len); } -- 2.36.0.rc2.479.g8af0fa9b8e-goog