From nobody Wed Feb 11 08:40:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1681472474; cv=none; d=zohomail.com; s=zohoarc; b=C72hA+0lEQu0C3GZ4oKik0dSQRIMfuTynxhAbwn+7Ij4B7E0menWQYmqSPIiuiMABPH+L8HZKfBnY/7pYPVgQkJnMT6pO2bOtVhZ+oxSqnZHki29o24LCsFGKbxz2zQM4cofDwF6qyFIPAogkow+YKl2a3L6a0uc07l8fFArM40= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681472474; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=iGGkpOeRoMnbppxreVdfShoqcfQT5nlYtzSOOL7DPQ4=; b=QD2dK9xDyD9I09S1lpMf7bwjb6Q8GDwjstkdAftR/P7727LKDzyMo333/mr0svUqhb5PRdcXu0bdKOqqGdDWVZ+6NssShbpAxhJUY8+hwzj/iAqcLm0sz7EnwCy7Wv3tV/kb6Yyth/bchkHguI/LbBVHOF00DW9utGjSqsWxADA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1681472474139121.49344943766482; Fri, 14 Apr 2023 04:41:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnHmQ-0003ZA-Oq; Fri, 14 Apr 2023 07:39:53 -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 1pnHmE-0002dE-5F for qemu-devel@nongnu.org; Fri, 14 Apr 2023 07:39:39 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnHmB-0001RV-8H for qemu-devel@nongnu.org; Fri, 14 Apr 2023 07:39:37 -0400 Received: by mail-pj1-x102c.google.com with SMTP id l9-20020a17090a3f0900b0023d32684e7fso8351399pjc.1 for ; Fri, 14 Apr 2023 04:39:34 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u19-20020a170902a61300b001a20b31a23fsm2889249plq.293.2023.04.14.04.39.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Apr 2023 04:39:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1681472374; x=1684064374; 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=iGGkpOeRoMnbppxreVdfShoqcfQT5nlYtzSOOL7DPQ4=; b=acsr918Bt52Wj9N3nNpoi2gUZB0ik2QJFt03n0RlXHSJcpZbBRnducJQc+oL1A7ztB 7ws+xrNTR3M74U/zW7BwGG15L7xbZayYOvUEUIizoojnZChN69mvd4dbf/myb4qa8Ypy 0JQkcxsB3yRcCkG6ng/qCf1maUicEtoHP6HxYYKpyMhgfyB23cSLQLsZCm8yXnGCma+M R01dHo5r7MNx3VkzrnUDviueoO+8MWyx4NA1GuhrR48waDsZz7LTRHhxaI3RvHo7oNzP wgwxfQTlYKvdNJW0dlwK73BRzT7EFQwDNlsKH8RGCEljD7y8QVywM9GWRszOv68tcQdC S1LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681472374; x=1684064374; 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=iGGkpOeRoMnbppxreVdfShoqcfQT5nlYtzSOOL7DPQ4=; b=UTwRdIt4thaIOGfvm1PmjWovyzbJv4SDpGsIKPxZWjWGmG2I2ZmPwLad7TIRPkQfdL g3+RA3XMwleldFz6wwfw5x79mIrbHJd2WkvTL9ylBisPiWaIeKqPwSk9wqVpdh1OQHjx JqvIEgu9h5sOd7dc+9OSvLccoqrHjzrP5sc39v430nAiu70qDXtH3QFyo3xwurl/K630 M9rZCi2sTykBtMrYyCJRXUn9hh1e5FvG0Kwa76CAoKmPtSQyGwsVtqAUt03aU6GOuRRG n+J5LjwYO2aM357vu21KwDQMcDyZLqJYII/mw/0VDXHHuesYkrAxl61vft7AhuSTy6Ie F2PQ== X-Gm-Message-State: AAQBX9fuRPVF8laSdvsKFinpHlXlJkXnpur5nkkfDw/xiD8wEHIBMSJg QH5JO8mJ1lHWgmKAzA8W8lAAOw== X-Google-Smtp-Source: AKy350Zat4OuoZjXRvMjJ2s3CPRzFkGNJcUoCEYGOczkIRhFMDYOIIO7IcXgnuRLb3glPiMYBqomGA== X-Received: by 2002:a17:902:f706:b0:19f:3b86:4715 with SMTP id h6-20020a170902f70600b0019f3b864715mr3057406plo.8.1681472374608; Fri, 14 Apr 2023 04:39:34 -0700 (PDT) From: Akihiko Odaki To: Cc: Sriram Yagnaraman , Jason Wang , Dmitry Fleytman , "Michael S. Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org, Akihiko Odaki Subject: [PATCH 23/40] igb: Share common VF constants Date: Fri, 14 Apr 2023 20:37:20 +0900 Message-Id: <20230414113737.62803-24-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230414113737.62803-1-akihiko.odaki@daynix.com> References: <20230414113737.62803-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::102c; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1681472476236100001 Content-Type: text/plain; charset="utf-8" The constants need to be consistent between the PF and VF. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Sriram Yagnaraman --- hw/net/igb.c | 10 +++++----- hw/net/igb_common.h | 8 ++++++++ hw/net/igbvf.c | 7 ------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/net/igb.c b/hw/net/igb.c index 51a7e9133e..1c989d7677 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -433,16 +433,16 @@ static void igb_pci_realize(PCIDevice *pci_dev, Error= **errp) =20 pcie_ari_init(pci_dev, 0x150, 1); =20 - pcie_sriov_pf_init(pci_dev, IGB_CAP_SRIOV_OFFSET, "igbvf", + pcie_sriov_pf_init(pci_dev, IGB_CAP_SRIOV_OFFSET, TYPE_IGBVF, IGB_82576_VF_DEV_ID, IGB_MAX_VF_FUNCTIONS, IGB_MAX_VF_FUNCTIONS, IGB_VF_OFFSET, IGB_VF_STRIDE); =20 - pcie_sriov_pf_init_vf_bar(pci_dev, 0, + pcie_sriov_pf_init_vf_bar(pci_dev, IGBVF_MMIO_BAR_IDX, PCI_BASE_ADDRESS_MEM_TYPE_64 | PCI_BASE_ADDRESS_MEM_PREFETCH, - 16 * KiB); - pcie_sriov_pf_init_vf_bar(pci_dev, 3, + IGBVF_MMIO_SIZE); + pcie_sriov_pf_init_vf_bar(pci_dev, IGBVF_MSIX_BAR_IDX, PCI_BASE_ADDRESS_MEM_TYPE_64 | PCI_BASE_ADDRESS_MEM_PREFETCH, - 16 * KiB); + IGBVF_MSIX_SIZE); =20 igb_init_net_peer(s, pci_dev, macaddr); =20 diff --git a/hw/net/igb_common.h b/hw/net/igb_common.h index 69ac490f75..f2a9065791 100644 --- a/hw/net/igb_common.h +++ b/hw/net/igb_common.h @@ -28,6 +28,14 @@ =20 #include "igb_regs.h" =20 +#define TYPE_IGBVF "igbvf" + +#define IGBVF_MMIO_BAR_IDX (0) +#define IGBVF_MSIX_BAR_IDX (3) + +#define IGBVF_MMIO_SIZE (16 * 1024) +#define IGBVF_MSIX_SIZE (16 * 1024) + #define defreg(x) x =3D (E1000_##x >> 2) #define defreg_indexed(x, i) x##i =3D (E1000_##x(i) >> 2) #define defreg_indexeda(x, i) x##i##_A =3D (E1000_##x##_A(i) >> 2) diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c index 70beb7af50..284ea61184 100644 --- a/hw/net/igbvf.c +++ b/hw/net/igbvf.c @@ -50,15 +50,8 @@ #include "trace.h" #include "qapi/error.h" =20 -#define TYPE_IGBVF "igbvf" OBJECT_DECLARE_SIMPLE_TYPE(IgbVfState, IGBVF) =20 -#define IGBVF_MMIO_BAR_IDX (0) -#define IGBVF_MSIX_BAR_IDX (3) - -#define IGBVF_MMIO_SIZE (16 * 1024) -#define IGBVF_MSIX_SIZE (16 * 1024) - struct IgbVfState { PCIDevice parent_obj; =20 --=20 2.40.0