From nobody Wed May 8 23:20:02 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 1503350073054452.57275947702476; Mon, 21 Aug 2017 14:14:33 -0700 (PDT) Received: from localhost ([::1]:56216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dju1m-0003fc-6t for importer@patchew.org; Mon, 21 Aug 2017 17:14:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dju0o-0003E5-D4 for qemu-devel@nongnu.org; Mon, 21 Aug 2017 17:13:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dju0l-0006M9-7u for qemu-devel@nongnu.org; Mon, 21 Aug 2017 17:13:30 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:35771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dju0l-0006L8-0x for qemu-devel@nongnu.org; Mon, 21 Aug 2017 17:13:27 -0400 Received: by mail-wr0-x243.google.com with SMTP id p8so16923240wrf.2 for ; Mon, 21 Aug 2017 14:13:25 -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 j16sm7933532wre.82.2017.08.21.14.13.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Aug 2017 14:13:24 -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=41n7tztzg7RejNyca0tKiRyHqIxcsLt7TONckU5UAno=; b=c9CMhjF6ltzX7OZdvsHhyabR5rTlTJ1ol09HU1bN7Xp1Hw83+RMo+xtRRE00BoH8UT SGzOw9tODw/kSdKnvuf2Gvq2Brlwp0k25mKkd//HN207e29k+KDFi0lIZg5TO6xGB9tN 5iWspSO5O9qvoegi2S+Ibd9oaz5hDgejq3dIe4w9aNdIOywNgLAe2B1/5uwqWUlSpe/t 4ufMTEb/fPRP5fgSDimPivraWHTyVm3lLWk74hdA7htxTBLCKW6pMaIKILBLGcbUWFBU yXYWLqUdM7Zn1pIWbqgZwmhZscSTRxRku1D4EAT1xmApgZRKuQhybk9wruqz5enMnkyX Mxxg== 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=41n7tztzg7RejNyca0tKiRyHqIxcsLt7TONckU5UAno=; b=fB329OpmzSaK3CA4O2eWYzjxRB4wyphzD4LzD8EDGIDYD1lu9n6pWe24lk5DQOOl0w Tnz54yI8sA6kcyahTwXK8s1lJFhffMIfr7j2vwcMAYK0hCgWn5IsQpb4/f2t5Zw4NG1c G1zgcVxepGPqrXwBUfvlB9sR841N8VsDtsxY0tjR83/WVgN1pfwZkbD+HQ84bcTfIDbd cu8zvSy7v9OOtkp5d+Rzzrhsggev+zeONLJISsiYfhTSWBHJarta5x1PpP1VCXULfKhg WXSXEYnEW12MSCaDDsxmCs45ZFh+cQeD4LsQQpxZuh5VDElvTRcJE26z7Yd6rilcEuHO yBkw== X-Gm-Message-State: AHYfb5ip+7aNztFh52GW7DLbV3rxpCpYGVQfvjuXmbUpaGBILxLWv4Sq v1hXCtnnnL3HQC6v X-Received: by 10.28.230.135 with SMTP id e7mr6625479wmi.160.1503350004590; Mon, 21 Aug 2017 14:13:24 -0700 (PDT) From: Matt Parker To: qemu-devel@nongnu.org Date: Mon, 21 Aug 2017 22:13:20 +0100 Message-Id: <20170821211320.7026-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] audio: intel-hda: 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: kraxel@redhat.com 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" intel-hda is still using the old_mmio accessors for io. This updates the device to use .read and .write accessors instead. --- hw/audio/intel-hda.c | 56 +++++++++---------------------------------------= ---- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 06acc98f7b..c0f002f744 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -1043,66 +1043,28 @@ static void intel_hda_regs_reset(IntelHDAState *d) =20 /* --------------------------------------------------------------------- */ =20 -static void intel_hda_mmio_writeb(void *opaque, hwaddr addr, uint32_t val) +static void intel_hda_mmio_write(void *opaque, hwaddr addr, uint64_t val, = unsigned size) { IntelHDAState *d =3D opaque; const IntelHDAReg *reg =3D intel_hda_reg_find(d, addr); =20 - intel_hda_reg_write(d, reg, val, 0xff); + intel_hda_reg_write(d, reg, val, (1UL << (size * 8)) - 1); } =20 -static void intel_hda_mmio_writew(void *opaque, hwaddr addr, uint32_t val) +static uint64_t intel_hda_mmio_read(void *opaque, hwaddr addr, unsigned si= ze) { IntelHDAState *d =3D opaque; const IntelHDAReg *reg =3D intel_hda_reg_find(d, addr); =20 - intel_hda_reg_write(d, reg, val, 0xffff); -} - -static void intel_hda_mmio_writel(void *opaque, hwaddr addr, uint32_t val) -{ - IntelHDAState *d =3D opaque; - const IntelHDAReg *reg =3D intel_hda_reg_find(d, addr); - - intel_hda_reg_write(d, reg, val, 0xffffffff); -} - -static uint32_t intel_hda_mmio_readb(void *opaque, hwaddr addr) -{ - IntelHDAState *d =3D opaque; - const IntelHDAReg *reg =3D intel_hda_reg_find(d, addr); - - return intel_hda_reg_read(d, reg, 0xff); -} - -static uint32_t intel_hda_mmio_readw(void *opaque, hwaddr addr) -{ - IntelHDAState *d =3D opaque; - const IntelHDAReg *reg =3D intel_hda_reg_find(d, addr); - - return intel_hda_reg_read(d, reg, 0xffff); -} - -static uint32_t intel_hda_mmio_readl(void *opaque, hwaddr addr) -{ - IntelHDAState *d =3D opaque; - const IntelHDAReg *reg =3D intel_hda_reg_find(d, addr); - - return intel_hda_reg_read(d, reg, 0xffffffff); + return intel_hda_reg_read(d, reg, (1UL << (size * 8)) - 1); } =20 static const MemoryRegionOps intel_hda_mmio_ops =3D { - .old_mmio =3D { - .read =3D { - intel_hda_mmio_readb, - intel_hda_mmio_readw, - intel_hda_mmio_readl, - }, - .write =3D { - intel_hda_mmio_writeb, - intel_hda_mmio_writew, - intel_hda_mmio_writel, - }, + .read =3D intel_hda_mmio_read, + .write =3D intel_hda_mmio_write, + .impl =3D { + .min_access_size =3D 1, + .max_access_size =3D 4, }, .endianness =3D DEVICE_NATIVE_ENDIAN, }; --=20 2.13.2