From nobody Wed Feb 11 00:55:25 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=1682505919; cv=none; d=zohomail.com; s=zohoarc; b=OQOBM8wEn5FifrfUIkRNxchQpRfPbm0+7c7laOUHn78e8O4epf+rufbjua73Cu9r56fBKLJ1BmpPwUg2yjgvpo2NxY+yBnDt3ZQT+mB9knAO2hWyO8r61YmhtIwzBS1AHKrDnTN+/6/OQf4IPVPDe0ldEt7NfKrm10nP7BCFruE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682505919; h=Content-Type: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=MrtCRX6iQBVwgwLH2Xil/FY7eqoBzL39/3IOXtgkA6M=; b=V/dn6fL0G6wmBMaNgNMu5BEe8OhE+VzeptqJH2aVII4RKeBANvDNLftdx5gVNZ2tdPW12TFDRhl9dQEN/iz5DemivOP/Ohr+bXu92BVyIiXEWMD0m9TAKPvxUA2cGHDAR9612JYfmu1NYTVUFFZTG7sN863ozB/H4TaZWjRQQJ4= 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 1682505919564291.6502189824953; Wed, 26 Apr 2023 03:45:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prcY8-00031U-GF; Wed, 26 Apr 2023 06:39:00 -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 1prcY3-0002oL-5O for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:38:55 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prcY1-0003Gf-Ki for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:38:54 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-63b78b344d5so5532288b3a.1 for ; Wed, 26 Apr 2023 03:38:53 -0700 (PDT) Received: from alarm.u-tokyo.ac.jp ([157.82.194.15]) by smtp.gmail.com with ESMTPSA id m11-20020a63580b000000b0051322a5aa64sm9317919pgb.3.2023.04.26.03.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 03:38:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1682505532; x=1685097532; 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=MrtCRX6iQBVwgwLH2Xil/FY7eqoBzL39/3IOXtgkA6M=; b=DKReVZ4q6laiO1kEePrRfMjWY6bB+7nxURadLjDiyJC1+B3KzZhnYxhK2eYoZwutC5 l4k4HXlH6vRFooU/9qMNk0TrKQxYAxYjK9Ny7BJglv+p2X8T4kU+aC69lBNgAeZX1Z7w 1Lb6cWJZFKf7u5ksxaagk44nB/bm0xMd1QSCfGqG+xNsDTmL0lCmuphQSyfZFytJML2h wcYan6djxaGV2K5eT2JqItfLDkVLCf7jrHdPLTQ4AvvafMQVMMxuuMnYXOl5POpTD1U+ nMyC+C/PkVVYEP6cn01TJ9EKV7mOE+mHq70LpGCUqrd1s6d3A73Tc/JA7TfgNh+83pke 6moQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682505532; x=1685097532; 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=MrtCRX6iQBVwgwLH2Xil/FY7eqoBzL39/3IOXtgkA6M=; b=YYMLMywg+/c91Z1JIbEPbLpYXDRqe5Sf2DUpmDufxy29JjDy7LsTojjqcU5l8QtINu o4rGctJuJqG8FAwSvPSvECtrfULpUM5Bt59zIMNCw6SfA/X4FSn8mUcdUXDMiwiZwj1Q aueY5wCCsj9HTNMtGW5z9cXpYrxHlyYWmJJygCOI7+7zdfmr5WprkYPpTIBCqJtuI7po wQ3uP+yTQLn87ulhpH7eMgq6hSaZ0Fr2fWxTYWKwC+XMjAOpH48mt4nmrS99Zvx1AnWz 9h0bjWmdrkI97s4sh+0L1vZzArguKD7qiys5K5p1ZzbjZD+7Dyyp6sF5gMwst2kOL6jH appQ== X-Gm-Message-State: AAQBX9c9ZbmZ8WStEMIn+1AF0qDxBYQKlObWCk0BoQnKUYl5Ld8YtPVx YJTM4OFxNA+SOp4QTn1rZt28SXlcEOfEmWUxWB4= X-Google-Smtp-Source: AKy350Za4zLE+SgC47DwDNS4ga4zM4dnGjCtbQn+ZMqP+pk3/fQpmBK0ifntC95djyIJjqdlJDEcrg== X-Received: by 2002:a05:6a20:748c:b0:f1:c0a1:803c with SMTP id p12-20020a056a20748c00b000f1c0a1803cmr24995892pzd.3.1682505532497; Wed, 26 Apr 2023 03:38:52 -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, Tomasz Dzieciol , Akihiko Odaki Subject: [PATCH v4 25/48] igb: Share common VF constants Date: Wed, 26 Apr 2023 19:36:53 +0900 Message-Id: <20230426103716.26279-26-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426103716.26279-1-akihiko.odaki@daynix.com> References: <20230426103716.26279-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::429; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x429.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: 1682505919965100023 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_common.h | 8 ++++++++ hw/net/igb.c | 10 +++++----- hw/net/igbvf.c | 7 ------- 3 files changed, 13 insertions(+), 12 deletions(-) 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/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/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