From patchwork Fri Dec 12 15:58:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 420539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C958B1400E9 for ; Sat, 13 Dec 2014 03:00:30 +1100 (AEDT) Received: from localhost ([::1]:57994 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzSdp-0001By-0w for incoming@patchwork.ozlabs.org; Fri, 12 Dec 2014 11:00:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzScj-0007eC-Oi for qemu-devel@nongnu.org; Fri, 12 Dec 2014 10:59:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzScd-000389-L4 for qemu-devel@nongnu.org; Fri, 12 Dec 2014 10:59:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36382) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzScd-000382-DK for qemu-devel@nongnu.org; Fri, 12 Dec 2014 10:59:15 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBCFxDea006987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 12 Dec 2014 10:59:13 -0500 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-82.ams2.redhat.com [10.36.116.82]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBCFwtbr027767; Fri, 12 Dec 2014 10:59:10 -0500 From: Laszlo Ersek To: peter.maydell@linaro.org, qemu-devel@nongnu.org, rjones@redhat.com, drjones@redhat.com, lersek@redhat.com Date: Fri, 12 Dec 2014 16:58:48 +0100 Message-Id: <1418399932-7658-5-git-send-email-lersek@redhat.com> In-Reply-To: <1418399932-7658-1-git-send-email-lersek@redhat.com> References: <1418399932-7658-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 4/8] fw_cfg: expose the "data_memwidth" prop with fw_cfg_init_data_memwidth() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We rebase fw_cfg_init() to the new function for compatibility with current callers. Signed-off-by: Laszlo Ersek --- Notes: v4: - unchanged v3: - new in v3 [Drew Jones] include/hw/nvram/fw_cfg.h | 3 +++ hw/nvram/fw_cfg.c | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 56e1ed7..fd7c35c 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -77,8 +77,11 @@ void fw_cfg_add_file_callback(FWCfgState *s, const char *filename, FWCfgReadCallback callback, void *callback_opaque, void *data, size_t len); void *fw_cfg_modify_file(FWCfgState *s, const char *filename, void *data, size_t len); +FWCfgState *fw_cfg_init_data_memwidth(uint32_t ctl_port, uint32_t data_port, + hwaddr ctl_addr, hwaddr data_addr, + uint32_t data_memwidth); FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, hwaddr crl_addr, hwaddr data_addr); FWCfgState *fw_cfg_find(void); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 0947136..081acd2 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -560,20 +560,20 @@ static void fw_cfg_machine_ready(struct Notifier *n, void *data) FWCfgState *s = container_of(n, FWCfgState, machine_ready); qemu_register_reset(fw_cfg_machine_reset, s); } -FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, - hwaddr ctl_addr, hwaddr data_addr) +FWCfgState *fw_cfg_init_data_memwidth(uint32_t ctl_port, uint32_t data_port, + hwaddr ctl_addr, hwaddr data_addr, + uint32_t data_memwidth) { DeviceState *dev; SysBusDevice *d; FWCfgState *s; dev = qdev_create(NULL, TYPE_FW_CFG); qdev_prop_set_uint32(dev, "ctl_iobase", ctl_port); qdev_prop_set_uint32(dev, "data_iobase", data_port); - qdev_prop_set_uint32(dev, "data_memwidth", - fw_cfg_data_mem_ops.valid.max_access_size); + qdev_prop_set_uint32(dev, "data_memwidth", data_memwidth); d = SYS_BUS_DEVICE(dev); s = FW_CFG(dev); @@ -602,8 +602,15 @@ FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, return s; } +FWCfgState *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + hwaddr ctl_addr, hwaddr data_addr) +{ + return fw_cfg_init_data_memwidth(ctl_port, data_port, ctl_addr, data_addr, + fw_cfg_data_mem_ops.valid.max_access_size); +} + static void fw_cfg_initfn(Object *obj) { SysBusDevice *sbd = SYS_BUS_DEVICE(obj); FWCfgState *s = FW_CFG(obj);