From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Mahmoud Mandour" <ma.mandourr@gmail.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Alexandre Iooss" <erdnaxe@crans.org>,
"Jason Wang" <jasowang@redhat.com>,
"Aleksandar Rikalo" <arikalo@gmail.com>,
"Anton Johansson" <anjo@rev.ng>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Sven Schnelle" <svens@stackframe.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
qemu-arm@nongnu.org, "Aurelien Jarno" <aurelien@aurel32.net>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Paul Burton" <paulburton@kernel.org>
Subject: [PATCH 13/13] hw/net/tulip: Use ld/st_endian_pci_dma() API
Date: Mon, 30 Sep 2024 09:34:50 +0200 [thread overview]
Message-ID: <20240930073450.33195-14-philmd@linaro.org> (raw)
In-Reply-To: <20240930073450.33195-1-philmd@linaro.org>
Refactor to use the recently introduced ld/st_endian_pci_dma()
API. No logical change intended.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/net/tulip.c | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/hw/net/tulip.c b/hw/net/tulip.c
index 9df3e17162..6c67958da7 100644
--- a/hw/net/tulip.c
+++ b/hw/net/tulip.c
@@ -71,36 +71,24 @@ static void tulip_desc_read(TULIPState *s, hwaddr p,
struct tulip_descriptor *desc)
{
const MemTxAttrs attrs = { .memory = true };
+ bool use_big_endian = s->csr[0] & CSR0_DBO;
- if (s->csr[0] & CSR0_DBO) {
- ldl_be_pci_dma(&s->dev, p, &desc->status, attrs);
- ldl_be_pci_dma(&s->dev, p + 4, &desc->control, attrs);
- ldl_be_pci_dma(&s->dev, p + 8, &desc->buf_addr1, attrs);
- ldl_be_pci_dma(&s->dev, p + 12, &desc->buf_addr2, attrs);
- } else {
- ldl_le_pci_dma(&s->dev, p, &desc->status, attrs);
- ldl_le_pci_dma(&s->dev, p + 4, &desc->control, attrs);
- ldl_le_pci_dma(&s->dev, p + 8, &desc->buf_addr1, attrs);
- ldl_le_pci_dma(&s->dev, p + 12, &desc->buf_addr2, attrs);
- }
+ ldl_endian_pci_dma(use_big_endian, &s->dev, p, &desc->status, attrs);
+ ldl_endian_pci_dma(use_big_endian, &s->dev, p + 4, &desc->control, attrs);
+ ldl_endian_pci_dma(use_big_endian, &s->dev, p + 8, &desc->buf_addr1, attrs);
+ ldl_endian_pci_dma(use_big_endian, &s->dev, p + 12, &desc->buf_addr2, attrs);
}
static void tulip_desc_write(TULIPState *s, hwaddr p,
struct tulip_descriptor *desc)
{
const MemTxAttrs attrs = { .memory = true };
+ bool use_big_endian = s->csr[0] & CSR0_DBO;
- if (s->csr[0] & CSR0_DBO) {
- stl_be_pci_dma(&s->dev, p, desc->status, attrs);
- stl_be_pci_dma(&s->dev, p + 4, desc->control, attrs);
- stl_be_pci_dma(&s->dev, p + 8, desc->buf_addr1, attrs);
- stl_be_pci_dma(&s->dev, p + 12, desc->buf_addr2, attrs);
- } else {
- stl_le_pci_dma(&s->dev, p, desc->status, attrs);
- stl_le_pci_dma(&s->dev, p + 4, desc->control, attrs);
- stl_le_pci_dma(&s->dev, p + 8, desc->buf_addr1, attrs);
- stl_le_pci_dma(&s->dev, p + 12, desc->buf_addr2, attrs);
- }
+ stl_endian_pci_dma(use_big_endian, &s->dev, p, desc->status, attrs);
+ stl_endian_pci_dma(use_big_endian, &s->dev, p + 4, desc->control, attrs);
+ stl_endian_pci_dma(use_big_endian, &s->dev, p + 8, desc->buf_addr1, attrs);
+ stl_endian_pci_dma(use_big_endian, &s->dev, p + 12, desc->buf_addr2, attrs);
}
static void tulip_update_int(TULIPState *s)
--
2.45.2
next prev parent reply other threads:[~2024-09-30 8:02 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-30 7:34 [PATCH 00/13] hw: Add ld/st_endian() APIs Philippe Mathieu-Daudé
2024-09-30 7:34 ` [PATCH 01/13] qemu/bswap: Introduce ld/st_endian_p() API Philippe Mathieu-Daudé
2024-10-01 16:45 ` Pierrick Bouvier
2024-10-03 20:50 ` Philippe Mathieu-Daudé
2024-10-03 21:28 ` Richard Henderson
2024-10-03 21:34 ` Philippe Mathieu-Daudé
2024-10-03 21:37 ` Richard Henderson
2024-10-03 21:46 ` Philippe Mathieu-Daudé
2024-09-30 7:34 ` [PATCH 02/13] hw/virtio/virtio-access: Use the " Philippe Mathieu-Daudé
2024-10-01 16:46 ` Pierrick Bouvier
2024-09-30 7:34 ` [PATCH 03/13] target/arm/ptw: " Philippe Mathieu-Daudé
2024-10-01 16:46 ` Pierrick Bouvier
2024-09-30 7:34 ` [PATCH 04/13] hw/mips: Pass BlCpuCfg argument to bootloader API Philippe Mathieu-Daudé
2024-10-01 16:49 ` Pierrick Bouvier
2024-09-30 7:34 ` [PATCH 05/13] hw/mips: Add cpu_is_bigendian field to BlCpuCfg structure Philippe Mathieu-Daudé
2024-10-01 16:50 ` Pierrick Bouvier
2024-09-30 7:34 ` [PATCH 06/13] tests/tcg/plugins: Use the ld/st_endian_p() API Philippe Mathieu-Daudé
2024-10-01 16:50 ` Pierrick Bouvier
2024-10-02 12:18 ` Alex Bennée
2024-09-30 7:34 ` [PATCH 07/13] hw/xtensa/xtfpga: Remove TARGET_BIG_ENDIAN #ifdef'ry Philippe Mathieu-Daudé
2024-09-30 14:28 ` Thomas Huth
2024-10-01 16:51 ` Pierrick Bouvier
2024-10-03 21:35 ` Richard Henderson
2024-10-10 18:08 ` Philippe Mathieu-Daudé
2024-09-30 7:34 ` [PATCH 08/13] hw/xtensa/xtfpga: Replace memcpy()+tswap32() by stl_endian_p() Philippe Mathieu-Daudé
2024-09-30 14:32 ` Thomas Huth
2024-10-03 16:02 ` Philippe Mathieu-Daudé
2024-10-03 16:04 ` Pierrick Bouvier
2024-10-03 20:48 ` Philippe Mathieu-Daudé
2024-10-03 21:31 ` Pierrick Bouvier
2024-10-03 21:34 ` Pierrick Bouvier
2024-10-03 21:40 ` Philippe Mathieu-Daudé
2024-10-04 6:44 ` Thomas Huth
2024-10-04 14:08 ` Richard Henderson
2024-09-30 7:34 ` [PATCH 09/13] exec/memory_ldst_phys: Introduce ld/st_endian_phys() API Philippe Mathieu-Daudé
2024-10-01 16:54 ` Pierrick Bouvier
2024-10-03 21:39 ` Richard Henderson
2024-10-03 21:47 ` Richard Henderson
2024-09-30 7:34 ` [PATCH 10/13] hw/virtio/virtio-access: Use " Philippe Mathieu-Daudé
2024-10-01 16:54 ` Pierrick Bouvier
2024-09-30 7:34 ` [PATCH 11/13] hw/pci/pci_device: Add PCI_DMA_DEFINE_LDST_END() macro Philippe Mathieu-Daudé
2024-10-01 16:56 ` Pierrick Bouvier
2024-09-30 7:34 ` [PATCH 12/13] hw/pci/pci_device: Introduce ld/st_endian_pci_dma() API Philippe Mathieu-Daudé
2024-10-01 16:57 ` Pierrick Bouvier
2024-10-03 22:04 ` Richard Henderson
2024-09-30 7:34 ` Philippe Mathieu-Daudé [this message]
2024-10-01 16:57 ` [PATCH 13/13] hw/net/tulip: Use " Pierrick Bouvier
2024-10-03 22:10 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240930073450.33195-14-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=anjo@rev.ng \
--cc=arikalo@gmail.com \
--cc=aurelien@aurel32.net \
--cc=chenhuacai@kernel.org \
--cc=erdnaxe@crans.org \
--cc=jasowang@redhat.com \
--cc=jcmvbkbc@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=ma.mandourr@gmail.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=paulburton@kernel.org \
--cc=peter.maydell@linaro.org \
--cc=pierrick.bouvier@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=svens@stackframe.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).