From nobody Tue May 13 09:38:01 2025 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1675089446; cv=none; d=zohomail.com; s=zohoarc; b=GYFMIpZCmbr5ONa2D1RdcoiYJFM5kp64GwIX7b2A91HsyNXY1rTNBiTqWbqL3tjvx7IQMcuyXanWC7ULlB9kdOfoJhfEYlGKL0bChEQql9GwgCKo+Z6eU6J8OLOYvsEGTSYpyZh6+NJm2ZCYuB4oq9PSDvZmolumi+U9XKT8MN8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675089446; 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=qmT83Cik5eBHOjOQZb4K96ZDXLl3GpmhUFr2qiDr+qY=; b=RGd5jfHp6+RjIdhNr+aO1rHcuCoW4ptz01IO9xGCo0w5TNSA2JnHJUCVm66zmSKQ2CcHR3lrqXoUprrYTLcnkaPF3tlAK155SRvcbawVaCctiFqsK0k9M5NS2C8IyJlwbb7xAwCf3JzDFnqmsKYY7amtDp8Z1vZxOmFh0PiXW94= 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+importer2=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 1675089446277561.8242255989145; Mon, 30 Jan 2023 06:37:26 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pMUqf-0002jV-8E; Mon, 30 Jan 2023 09:09:29 -0500 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 1pMUqd-0002fb-9i for qemu-devel@nongnu.org; Mon, 30 Jan 2023 09:09:27 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMUqb-0007l6-OE for qemu-devel@nongnu.org; Mon, 30 Jan 2023 09:09:27 -0500 Received: by mail-pj1-x102b.google.com with SMTP id b10so11206879pjo.1 for ; Mon, 30 Jan 2023 06:09:25 -0800 (PST) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:4457:c267:5e09:481b]) by smtp.gmail.com with ESMTPSA id u70-20020a638549000000b004468cb97c01sm6962977pgd.56.2023.01.30.06.09.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:09:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.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=qmT83Cik5eBHOjOQZb4K96ZDXLl3GpmhUFr2qiDr+qY=; b=A32vaDGjlhKSil2OU2L7jrKn3rbTxMukU9TEVJe3aZEmD9a53n/pO/K+eHAr8n01K8 SD/tr0IoHyZLHioEONK7rQkGJn/W9nCIZixONkWcpJCHBwGINdIBLnRDsfRyaJoxSwbi 1dB7Pb8Jy0/pbsInfN1VCUOnjYoWEblG6IRQ1j7+l4jQW3pfrcwjMA+uo7aGTGChqCks ZHsM68rDwhErQvDsWejOPTLX3EcFzDN4EuwkE3oJmDsDt/mtPi73OzCa/gnAOzWmN2eE nNPpCOl6dIv9EBYA5SecPjymOa1d8JL1xKpXMRUOu7VIAsBjOfpbmGpARUZ8m6hPU9St aa/A== 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=qmT83Cik5eBHOjOQZb4K96ZDXLl3GpmhUFr2qiDr+qY=; b=ZdoZgn1rWjAnrL4OITuGSsdbPe409ojJLw+WAQIoHkg+eNGw7CG52UoL/B/pGNMnAc Zyo4VdUNpev7FWF5TQUAU9/lyIqZdlFTbCsBm8cO4hwQiaE/bd7WSV7oJKys/NRnQWz/ M9e/gXrzbeGUwqCWG0QzETwBrIa395sBWS7mZ8/WJAZO6iCg7z9oJrjSMHFFizv3KQmJ OFnud0mzAzuVaeFe7amq+1+11+h41QRBtHfKcGI9W5gkhoMwsh7vpHH2zQD1z82m2vwE HDXv/z3Iteg/jaSGWnFupU07GzRcNNeE0zlrXvic/zbE6XgoHVCyEfmlo7xJn9tOYm8B k/fw== X-Gm-Message-State: AO0yUKVCWfco5gyRk2NJLDJzSOZT9ZM9HNUWbmwXkCEXH0GOoThLygR8 XKw1fLdZreqB72zNalr99oP8Dw== X-Google-Smtp-Source: AK7set8LtsxRsgAkKfY6TDyo4K9a0ZxpccUlfacqJErpbD2180jfNo6moG2dO68Ac9Q20yZBNpu34w== X-Received: by 2002:a05:6a20:3956:b0:bd:ce7:22d2 with SMTP id r22-20020a056a20395600b000bd0ce722d2mr4388986pzg.25.1675087764911; Mon, 30 Jan 2023 06:09:24 -0800 (PST) From: Akihiko Odaki To: Cc: Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , Marcel Apfelbaum , =?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 , Alexander Bulekov , Bandan Das , Stefan Hajnoczi , Darren Kenny , Qiuhao Li , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, devel@daynix.com, Yan Vugenfirer , Yuri Benditovich , Sriram Yagnaraman , Gal Hammer , Akihiko Odaki Subject: [PATCH v5 6/9] tests/qtest/libqos/e1000e: Export macreg functions Date: Mon, 30 Jan 2023 23:08:06 +0900 Message-Id: <20230130140809.78262-7-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230130140809.78262-1-akihiko.odaki@daynix.com> References: <20230130140809.78262-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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::102b; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102b.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 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1675089544539100001 Content-Type: text/plain; charset="utf-8" They will be useful for igb testing. Signed-off-by: Akihiko Odaki Reviewed-by: Thomas Huth --- tests/qtest/libqos/e1000e.c | 12 ------------ tests/qtest/libqos/e1000e.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c index 28fb3052aa..925654c7fd 100644 --- a/tests/qtest/libqos/e1000e.c +++ b/tests/qtest/libqos/e1000e.c @@ -36,18 +36,6 @@ =20 #define E1000E_RING_LEN (0x1000) =20 -static void e1000e_macreg_write(QE1000E *d, uint32_t reg, uint32_t val) -{ - QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); - qpci_io_writel(&d_pci->pci_dev, d_pci->mac_regs, reg, val); -} - -static uint32_t e1000e_macreg_read(QE1000E *d, uint32_t reg) -{ - QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); - return qpci_io_readl(&d_pci->pci_dev, d_pci->mac_regs, reg); -} - void e1000e_tx_ring_push(QE1000E *d, void *descr) { QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h index 5e2b201aa7..30643c8094 100644 --- a/tests/qtest/libqos/e1000e.h +++ b/tests/qtest/libqos/e1000e.h @@ -42,6 +42,18 @@ struct QE1000E_PCI { QE1000E e1000e; }; =20 +static inline void e1000e_macreg_write(QE1000E *d, uint32_t reg, uint32_t = val) +{ + QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); + qpci_io_writel(&d_pci->pci_dev, d_pci->mac_regs, reg, val); +} + +static inline uint32_t e1000e_macreg_read(QE1000E *d, uint32_t reg) +{ + QE1000E_PCI *d_pci =3D container_of(d, QE1000E_PCI, e1000e); + return qpci_io_readl(&d_pci->pci_dev, d_pci->mac_regs, reg); +} + void e1000e_wait_isr(QE1000E *d, uint16_t msg_id); void e1000e_tx_ring_push(QE1000E *d, void *descr); void e1000e_rx_ring_push(QE1000E *d, void *descr); --=20 2.39.1