From nobody Fri Apr 26 05:12:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502573767892832.8037612718373; Sat, 12 Aug 2017 14:36:07 -0700 (PDT) Received: from localhost ([::1]:50218 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dge4j-0000oC-R2 for importer@patchew.org; Sat, 12 Aug 2017 17:36:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dge3c-00008t-IS for qemu-devel@nongnu.org; Sat, 12 Aug 2017 17:34:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dge3Z-00034P-Ej for qemu-devel@nongnu.org; Sat, 12 Aug 2017 17:34:56 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:38574) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dge3Z-000347-8T for qemu-devel@nongnu.org; Sat, 12 Aug 2017 17:34:53 -0400 Received: by mail-wr0-x243.google.com with SMTP id g32so4705672wrd.5 for ; Sat, 12 Aug 2017 14:34:53 -0700 (PDT) Received: from solar.home (host81-147-83-176.range81-147.btcentralplus.com. [81.147.83.176]) by smtp.gmail.com with ESMTPSA id e27sm4953726wra.25.2017.08.12.14.34.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Aug 2017 14:34:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=FvGfEUJ+5wECN0ntBvJK9Vl3TEXWujw5UNGeqsM8PcE=; b=lhFTa1wKeqAGPO63qmgpI/hcQSnhwRjIuKY5MZVCE78aV7vWNgUuHtUsB8Hej/HUSq YFmN9Yao6GpdxeV8BId/c5ToxGcQS6q28nLvIF58LhrYrELUBPo0S6hL6j0AW8GzO0xO fAcJiPpLoYvuIZ6x0cBUJayRxA96SamKhTOHEuiCKleTDtcCJ97mDLKDqP4X7oqj6v1l XLdzoMu9513NR1iQsK1p9pSVqgOFlcSe/mMAH0VNer0Ul5KVPDCneKayrE72hhIiO5ZJ LyxPYjrMb6OZvG2P/Ic0ttDBooKrQMwLExeSiZZim5Rv4dBV327/M0b4cykE3HnYRP9I ACVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FvGfEUJ+5wECN0ntBvJK9Vl3TEXWujw5UNGeqsM8PcE=; b=YMLVe+Mk93UMHRqoA2D7DCCXa7TjdzsZXmRPElXUxC3mFAIaMotDeTZw5QdifBK38w 50bNyGt8t/sdgKJFnwILlJKoXznKm0aJ9coZb64hM5209/t7fm4HrDJGpEPBgV8bsYKT aV35MJm49CoBHXGBsmz2Gkrwdbg9KbrRBYJVi5WKoU+mW2vJglD8aE3N8lIdGrniI3Bh OFQBJ0OQPV0rHqdIS8JUY1zftucWdo65cYFPxAPl+wymEPzE1ZwEkq4zxpQQQMHgXnZx 7FBBhRPqopU4rO6owtd7to1GD5f+BrTlw+cIxJH3W9PEsXteAHkVuZcIR0fMGOqGq4uc PmPA== X-Gm-Message-State: AHYfb5itPxK5D72+ONQ8Ld2mxRivQXjTEfN+wC9GxnPdpBVnt4dFrbEf r5QOt9lCxoB6aRMx X-Received: by 10.223.169.11 with SMTP id u11mr12995458wrc.17.1502573692116; Sat, 12 Aug 2017 14:34:52 -0700 (PDT) From: Matt Parker To: qemu-devel@nongnu.org Date: Sat, 12 Aug 2017 22:34:48 +0100 Message-Id: <20170812213448.20624-1-mtparkr@gmail.com> X-Mailer: git-send-email 2.13.2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PATCH] net: rtl8139: do not use old_mmio accesses X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This updates the current MemoryRegionOps for the bar 1 memory region from using the old_mmio accessors to the .read and .write accessors. Signed-off-by: Matt Parker --- hw/net/rtl8139.c | 60 +++++++++++++++-------------------------------------= ---- 1 file changed, 16 insertions(+), 44 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 671c7e48c6..b3aefda291 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -3131,39 +3131,6 @@ static uint32_t rtl8139_io_readl(void *opaque, uint8= _t addr) } =20 /* */ - -static void rtl8139_mmio_writeb(void *opaque, hwaddr addr, uint32_t val) -{ - rtl8139_io_writeb(opaque, addr & 0xFF, val); -} - -static void rtl8139_mmio_writew(void *opaque, hwaddr addr, uint32_t val) -{ - rtl8139_io_writew(opaque, addr & 0xFF, val); -} - -static void rtl8139_mmio_writel(void *opaque, hwaddr addr, uint32_t val) -{ - rtl8139_io_writel(opaque, addr & 0xFF, val); -} - -static uint32_t rtl8139_mmio_readb(void *opaque, hwaddr addr) -{ - return rtl8139_io_readb(opaque, addr & 0xFF); -} - -static uint32_t rtl8139_mmio_readw(void *opaque, hwaddr addr) -{ - uint32_t val =3D rtl8139_io_readw(opaque, addr & 0xFF); - return val; -} - -static uint32_t rtl8139_mmio_readl(void *opaque, hwaddr addr) -{ - uint32_t val =3D rtl8139_io_readl(opaque, addr & 0xFF); - return val; -} - static int rtl8139_post_load(void *opaque, int version_id) { RTL8139State* s =3D opaque; @@ -3344,18 +3311,23 @@ static const MemoryRegionOps rtl8139_io_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 +static uint64_t rtl8139_mmio_read(void *opaque, hwaddr addr, unsigned size) +{ + return rtl8139_ioport_read(opaque, addr & 0xFF, size); +} + +static void rtl8139_mmio_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) +{ + return rtl8139_ioport_write(opaque, addr & 0xFF, val, size); +} + static const MemoryRegionOps rtl8139_mmio_ops =3D { - .old_mmio =3D { - .read =3D { - rtl8139_mmio_readb, - rtl8139_mmio_readw, - rtl8139_mmio_readl, - }, - .write =3D { - rtl8139_mmio_writeb, - rtl8139_mmio_writew, - rtl8139_mmio_writel, - }, + .read =3D rtl8139_mmio_read, + .write =3D rtl8139_mmio_write, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 4, }, .endianness =3D DEVICE_LITTLE_ENDIAN, }; --=20 2.13.2