From nobody Wed Apr 24 16:15:20 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 1502573686551240.67881386026068; Sat, 12 Aug 2017 14:34:46 -0700 (PDT) Received: from localhost ([::1]:50099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dge3P-0007wG-7y for importer@patchew.org; Sat, 12 Aug 2017 17:34:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dge2U-0007WW-GF for qemu-devel@nongnu.org; Sat, 12 Aug 2017 17:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dge2R-0002ku-E0 for qemu-devel@nongnu.org; Sat, 12 Aug 2017 17:33:46 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:36990) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dge2R-0002k6-77 for qemu-devel@nongnu.org; Sat, 12 Aug 2017 17:33:43 -0400 Received: by mail-wr0-x243.google.com with SMTP id f38so4715103wrf.4 for ; Sat, 12 Aug 2017 14:33:41 -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 o82sm2538138wmg.34.2017.08.12.14.33.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Aug 2017 14:33:40 -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=TFBjmHzKoX9goXAuE4WO3xjDdkhFLZhyNxgrBhud4ei56A8O+6KzIUb7mSUPmIQ4Tn 7P+yGeVJ5r8aAMBq7iCFCc9ilaJsidAzYAq2Olxor7QNMJb+MYzhpD+fg5RoFsEdZftg /9MmC+0r2undgGzNAmGd6uoRubqNwLe+qNBHij5J3DVTv3UNlGo+JBWEjmKemi4PbDHO 1NTEY4suTiqQQd8QXJL+qTXCujwW/UBxQCKgCX/qmOsB4dAQjxYZBOa30o3uM7abptkp L/IfjVcIPm+OSjS89DsKnHbps9nS925PV965afX5OPtOaeNkolQqvBLwsY4Ku/KqFQoe WloQ== 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=PlKHuNYmvQ/FoHgc/pfaX3oeZ5DxUF7i/IGq+/jaayabVYQrGWINU8FYnNlE6OITk1 nazyyVKMAwNpV8HJp9VF1+3MNhNbau/LaxaUcdDTqyfyZnVRMN/RsNzW0YxbNcqPOMYu sb3sI/BpSpGA6zIXN0vWN1l4tScpUb71VZVB8ivQy9k9t+GNMS3k0pTgXqt0jqqMiQ88 ixCYMzrkMIJPlQU8YP/1+q803XcqanNzYW0xl4cgIqXipFOmwYfLooGa1B7MYCGFYmb1 0AkA0mvU7nbJT0zJW2r7Uxo1Q1RjdLSXrMq4S4uaNfE4wscGDdeNqDKYhOf54ihuRBvk M4Mg== X-Gm-Message-State: AHYfb5iXIxZE+Hjt2jEHAKicI9Q+Dq0oM+HYadiMX2SZmtMN16fmkPHS cJsxhwpFKt/G1Q== X-Received: by 10.223.152.147 with SMTP id w19mr13075386wrb.118.1502573620732; Sat, 12 Aug 2017 14:33:40 -0700 (PDT) From: Matt Parker To: qemu-devel@nognu.org Date: Sat, 12 Aug 2017 22:33:30 +0100 Message-Id: <20170812213330.20539-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 , "open list:All patches CC here" 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