From patchwork Fri Feb 16 02:29:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="N0m8/ffe"; dkim-atps=neutral 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 3zjHJk2ksPz9t5R for ; Fri, 16 Feb 2018 13:33:58 +1100 (AEDT) Received: from localhost ([::1]:57250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVqW-0008Ci-EB for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:33:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVmc-0005LZ-SY for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmb-0002TD-Qz for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:54 -0500 Received: from mail-ua0-x241.google.com ([2607:f8b0:400c:c08::241]:37008) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmb-0002T4-N2 for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:53 -0500 Received: by mail-ua0-x241.google.com with SMTP id q8so1107454uae.4 for ; Thu, 15 Feb 2018 18:29:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lozniz2bfYUXWtMvsNH9xAbCoclQlr7hAtTQFkfd8hY=; b=N0m8/ffezeL8ZwOcnsPW4uTY0d+cRwfST7HwyJkH2o145NWzbpWFR8Nsth3rHtSbiv Zth9Z7a0EaYA0rHCtq3f+WZImeabXSV7iCmGkbiGsWXgNiaMF8+dp5isk41sn+nMQrjT mHuk7sOYNTF0HIGCTEExKeqnQM8OvHnmRzvlMladp3mo4Ymflh5LahowVjB3rcSNt7X6 +oL4pyM2gJe/6JxT2Drh3W8VeDte3s7IfV9OxLXwcmjVEzyaY1iBWYXSJASSZxHLAg6F 2i/J4bBcm5d8n3zNhRhCSUT0tVsB1iXetd6ikN4sMcOxDx0+tBak9BIJpsVlcJ0lKoSx Zf7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lozniz2bfYUXWtMvsNH9xAbCoclQlr7hAtTQFkfd8hY=; b=TnD5Hd7gSdXgu8LLUqAqA3Vc4G8WluIMDQHJFi/jRBo2J1VP8OVm/hmZ7eOZbvz9De ct+HnI738Nt0NAPhYCt/I+9Ft+vv/Nmj5cUKtcHydSHimiiGVjqmkg0S27658QvOwdGc tStcXYSkR3m0nzzSYoII+IZB5tMV80uAMmf3siQEsobJnf5rJ7KkBJxaAlFeh2rs8zXv q0PQ5JkZ+IswJz1XKLisTgJNGX1WkLQBrzASHuOZWSqNl6T5P6fztbjmHuUvI0wYWFwf 2kJ3nBwxGpFKKFjA5Sz9Lt8GCPoJLdNLQITW9xJUmmZqfnnnvtjesmzTvY4B4B//SNqm AIvw== X-Gm-Message-State: APf1xPCOhTj+vPLgj0+mHmK10as4vo7kIk4qZ9d/ck78Xf4BnZcJPFEi 0riSiBAszLe4eX7QIiXAD84= X-Google-Smtp-Source: AH8x226Flg29/kyOUhmzudlLqujgvqrcw8VbMZiDJSHMDNPoofxZb9EJeVv2aOIURScN0YqurlRi0g== X-Received: by 10.176.28.14 with SMTP id a14mr3737018uaj.146.1518748193139; Thu, 15 Feb 2018 18:29:53 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.29.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:29:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:26 -0300 Message-Id: <20180216022933.10945-2-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c08::241 Subject: [Qemu-devel] [PATCH v3 1/7] hw/sd/milkymist-memcard: use qemu_log_mask() 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Acked-by: Michael Walle --- hw/sd/milkymist-memcard.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 341da88552..1292c0c099 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -22,11 +22,12 @@ */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "hw/hw.h" #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "trace.h" -#include "qemu/error-report.h" +#include "include/qapi/error.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/sd/sd.h" @@ -138,8 +139,8 @@ static uint64_t memcard_read(void *opaque, hwaddr addr, } else { r = s->response[s->response_read_ptr++]; if (s->response_read_ptr > s->response_len) { - error_report("milkymist_memcard: " - "read more cmd bytes than available. Clipping."); + qemu_log_mask(LOG_GUEST_ERROR, "milkymist_memcard: " + "read more cmd bytes than available. Clipping."); s->response_read_ptr = 0; } } @@ -163,8 +164,9 @@ static uint64_t memcard_read(void *opaque, hwaddr addr, break; default: - error_report("milkymist_memcard: read access to unknown register 0x" - TARGET_FMT_plx, addr << 2); + qemu_log_mask(LOG_UNIMP, "milkymist_memcard: " + "read access to unknown register 0x%" HWADDR_PRIx "\n", + addr << 2); break; } @@ -220,8 +222,9 @@ static void memcard_write(void *opaque, hwaddr addr, uint64_t value, break; default: - error_report("milkymist_memcard: write access to unknown register 0x" - TARGET_FMT_plx, addr << 2); + qemu_log_mask(LOG_UNIMP, "milkymist_memcard: " + "write access to unknown register 0x%" HWADDR_PRIx " " + "(value 0x%" PRIx64 ")\n", addr << 2, value); break; } } From patchwork Fri Feb 16 02:29:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SUuMkhWI"; dkim-atps=neutral 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 3zjHF86SjDz9t3v for ; Fri, 16 Feb 2018 13:30:52 +1100 (AEDT) Received: from localhost ([::1]:57234 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVnW-0005R5-Ub for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:30:51 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVmg-0005OO-PH for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmf-0002U8-Oz for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:58 -0500 Received: from mail-vk0-x244.google.com ([2607:f8b0:400c:c05::244]:36208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmf-0002Tw-KN for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:29:57 -0500 Received: by mail-vk0-x244.google.com with SMTP id m197so1063951vka.3 for ; Thu, 15 Feb 2018 18:29:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zAU7OHE0p1sVLM81A5CNlqLm9SyQCG2KgSyQZo9ce4Q=; b=SUuMkhWI4KST94MuAq1FWOs1Slpw9ffGOO3YOpNcB5ZwLLU2DjQ+Ly7oAKUcA5DAiM LaxH06t5fL2tmnVikI58FC1wgDsX1JtY7pIJkg9m3c5GGGGB177VnND8rfolSsGY2X0v H/u6jYrAJHgtwfzACX4LZP51nuuBRzKq9IpPUKQxNLIb8F70jlzyEszYzkEme9iULP9w VcgSQivONN5WFLNlRobHt0J8DsfpNJjoJtFjzqzJyG1/QzX6m9okz4rB88hyQY7wlsvO vsqEvFuanIpgl8H8/VNmRr/HrL1voZN+yk9tuuPki63UXSmxovJq6R+0otrmF+tr0Pbo oDQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zAU7OHE0p1sVLM81A5CNlqLm9SyQCG2KgSyQZo9ce4Q=; b=qcHdyYtDqUC14oLi2MCqSq7M2eGLnWrP3Ehd/ziSsLH1g7YRS/Ad+VoQXYPT1lXTbY uN7ohKl6UoADY18o8ga5sxDH9QHSSbbz/a+u1wX0hAGbzISWPD8WXD7Xi++VS72bgQkR du5xtPqJ1IwMXmYo9pW5w0icPxbnxqlc2jSS1HT9A3MFN7s5cGjJH40W/E466lbobywu blTm2pYxlPwmgC6NZ6TA62eOURCAWw+5HQpVokew83xQTTwxEQfR4OqV9Tk+G5hUhYJS DhFd4B1SnxzAATbq8lOYV+p2ucGKywb/KEWYvF4Z0B9E/zmm+tzOFxZlVPYbN2gDwTS5 LKjA== X-Gm-Message-State: APf1xPAIgtDrKgQx5VwezV0sxiJVXEFV0rQSBkd6oLqpa5jE+gYavO9f NBgIivK0GqVSsNf62w0Z8/M= X-Google-Smtp-Source: AH8x227fwaEJl9wG2ef4sUU43goirpDfw2b83fNVdsehYdGjXkkdQ++/rQ6wtNkToikwlAa14mqNMQ== X-Received: by 10.31.236.195 with SMTP id k186mr3623994vkh.166.1518748197056; Thu, 15 Feb 2018 18:29:57 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.29.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:29:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:27 -0300 Message-Id: <20180216022933.10945-3-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c05::244 Subject: [Qemu-devel] [PATCH v3 2/7] hw/sd/milkymist-memcard: split realize() out of SysBusDevice init() 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Create the SDCard in the realize() function. Suggested-by: Michael Walle Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Acked-by: Michael Walle --- hw/sd/milkymist-memcard.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index 1292c0c099..a8e65892c7 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -257,27 +257,31 @@ static void milkymist_memcard_reset(DeviceState *d) device_reset(DEVICE(s->card)); } -static int milkymist_memcard_init(SysBusDevice *dev) +static void milkymist_memcard_init(Object *obj) +{ + MilkymistMemcardState *s = MILKYMIST_MEMCARD(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); + + memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s, + "milkymist-memcard", R_MAX * 4); + sysbus_init_mmio(dev, &s->regs_region); +} + +static void milkymist_memcard_realize(DeviceState *dev, Error **errp) { MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev); - DriveInfo *dinfo; BlockBackend *blk; + DriveInfo *dinfo; /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; s->card = sd_init(blk, false); if (s->card == NULL) { - return -1; + error_setg(errp, "failed to init SD card"); + return; } - s->enabled = blk && blk_is_inserted(blk); - - memory_region_init_io(&s->regs_region, OBJECT(s), &memcard_mmio_ops, s, - "milkymist-memcard", R_MAX * 4); - sysbus_init_mmio(dev, &s->regs_region); - - return 0; } static const VMStateDescription vmstate_milkymist_memcard = { @@ -300,9 +304,8 @@ static const VMStateDescription vmstate_milkymist_memcard = { static void milkymist_memcard_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_memcard_init; + dc->realize = milkymist_memcard_realize; dc->reset = milkymist_memcard_reset; dc->vmsd = &vmstate_milkymist_memcard; /* Reason: init() method uses drive_get_next() */ @@ -313,6 +316,7 @@ static const TypeInfo milkymist_memcard_info = { .name = TYPE_MILKYMIST_MEMCARD, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistMemcardState), + .instance_init = milkymist_memcard_init, .class_init = milkymist_memcard_class_init, }; From patchwork Fri Feb 16 02:29:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874255 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VD3JGK0i"; dkim-atps=neutral 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 3zjHFF5lM4z9t3v for ; Fri, 16 Feb 2018 13:30:57 +1100 (AEDT) Received: from localhost ([::1]:57237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVnb-0005TW-RV for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:30:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60350) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVml-0005RW-Jf for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmk-0002Vq-Hy for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:03 -0500 Received: from mail-ua0-x241.google.com ([2607:f8b0:400c:c08::241]:35954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmk-0002Vg-DQ for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:02 -0500 Received: by mail-ua0-x241.google.com with SMTP id i15so1108168uak.3 for ; Thu, 15 Feb 2018 18:30:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ouj1tqjUbLRGKZoruiEsmhvDzM/+AsJn0wUcFNnLHkg=; b=VD3JGK0imj6atcJm2g+CVEeD1ifWqTFDCIJLB57sxp4mA27morEl6G3NzR7IbegdcW mYm7QkcSGNTvyTHl2w/6EqTR5W0z+7o/Wc+RWSZV325U0gvTxERcP9x8du3QPNMzN/CU D1HvGnfh9o0etVDyWbiHeCQFc1E/v33QBf64eyvOaAT3sw/H8h6XdrDHkoxJjdMkDOZO yL+O4fVhC/xRuQQiRe50tMU1WObQAMCm7O+J/2ImhblrHZ5TbxQvbgtrAkL9tnX/uozA m40m1pRCCuhsywDQuYeoptNpv25Cj9sM5zqU2oFRcJmtF5crcn0MraVoA9ExlFZDT9PN ISNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ouj1tqjUbLRGKZoruiEsmhvDzM/+AsJn0wUcFNnLHkg=; b=ji/KvyXKxfjOBvxU8/YS83muvgiWgDw9dvz9UnrH8aVrU/AdQT6bIEtlteHPb2d2t3 OnRT2qa4ON6H1rhqqyMzsdcHOOi3IdpVoQLpLbvHyXVORN5cd9q7PFlJlkZCR/f3eFgj ATfmeGL+fo01dM11Ky5Ct8Y+Nf3F1mfzHGpjPcOKOynDZMrNjY7x/v+bWz8WdBfr/t7Z jx65M5l6r5QBbt4uqrs2//vfnUdexf1i1A992xf5FyuCVHXMT4ApeDjTBZpEpwqt4D34 TY1aTmVUX6Czm16NlFhibmCY/ZF/zFKFJjyT4HL0y7P4dH9q/sVL2o+ToOZonn2K/eu6 FPSw== X-Gm-Message-State: APf1xPBZ1NuLqA8cd+fGlbq2yLk4MPctMXrgVgSmjgI1d2R/DRxlOCh8 L93s9zjUsyv1q3CXn7ar2vppARDGJW0= X-Google-Smtp-Source: AH8x225TtRAmipiyCVI4Y+lkBgQpKepiBqqxtw0KFmLjBDd0YXB8S1Hhcg682mMuPywQrKfU5fAybg== X-Received: by 10.176.13.130 with SMTP id i2mr3756028uak.85.1518748201893; Thu, 15 Feb 2018 18:30:01 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.29.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:30:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:28 -0300 Message-Id: <20180216022933.10945-4-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c08::241 Subject: [Qemu-devel] [PATCH v3 3/7] hw/sd/milkymist-memcard: expose a SDBus and connect the SDCard to it 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" using the sdbus_*() API. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Acked-by: Michael Walle --- hw/sd/milkymist-memcard.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index a8e65892c7..5570c1e9a0 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -69,7 +69,7 @@ struct MilkymistMemcardState { SysBusDevice parent_obj; MemoryRegion regs_region; - SDState *card; + SDBus sdbus; int command_write_ptr; int response_read_ptr; @@ -105,7 +105,7 @@ static void memcard_sd_command(MilkymistMemcardState *s) req.crc = s->command[5]; s->response[0] = req.cmd; - s->response_len = sd_do_command(s->card, &req, s->response+1); + s->response_len = sdbus_do_command(&s->sdbus, &req, s->response + 1); s->response_read_ptr = 0; if (s->response_len == 16) { @@ -150,10 +150,10 @@ static uint64_t memcard_read(void *opaque, hwaddr addr, r = 0xffffffff; } else { r = 0; - r |= sd_read_data(s->card) << 24; - r |= sd_read_data(s->card) << 16; - r |= sd_read_data(s->card) << 8; - r |= sd_read_data(s->card); + r |= sdbus_read_data(&s->sdbus) << 24; + r |= sdbus_read_data(&s->sdbus) << 16; + r |= sdbus_read_data(&s->sdbus) << 8; + r |= sdbus_read_data(&s->sdbus); } break; case R_CLK2XDIV: @@ -207,10 +207,10 @@ static void memcard_write(void *opaque, hwaddr addr, uint64_t value, if (!s->enabled) { break; } - sd_write_data(s->card, (value >> 24) & 0xff); - sd_write_data(s->card, (value >> 16) & 0xff); - sd_write_data(s->card, (value >> 8) & 0xff); - sd_write_data(s->card, value & 0xff); + sdbus_write_data(&s->sdbus, (value >> 24) & 0xff); + sdbus_write_data(&s->sdbus, (value >> 16) & 0xff); + sdbus_write_data(&s->sdbus, (value >> 8) & 0xff); + sdbus_write_data(&s->sdbus, value & 0xff); break; case R_ENABLE: s->regs[addr] = value; @@ -251,10 +251,6 @@ static void milkymist_memcard_reset(DeviceState *d) for (i = 0; i < R_MAX; i++) { s->regs[i] = 0; } - /* Since we're still using the legacy SD API the card is not plugged - * into any bus, and we must reset it manually. - */ - device_reset(DEVICE(s->card)); } static void milkymist_memcard_init(Object *obj) @@ -270,15 +266,23 @@ static void milkymist_memcard_init(Object *obj) static void milkymist_memcard_realize(DeviceState *dev, Error **errp) { MilkymistMemcardState *s = MILKYMIST_MEMCARD(dev); + DeviceState *carddev; BlockBackend *blk; DriveInfo *dinfo; + Error *err = NULL; + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, + dev, "sd-bus"); + + /* Create and plug in the sd card */ /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; - s->card = sd_init(blk, false); - if (s->card == NULL) { - error_setg(errp, "failed to init SD card"); + carddev = qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + qdev_prop_set_drive(carddev, "drive", blk, &err); + object_property_set_bool(OBJECT(carddev), true, "realized", &err); + if (err) { + error_setg(errp, "failed to init SD card: %s", error_get_pretty(err)); return; } s->enabled = blk && blk_is_inserted(blk); From patchwork Fri Feb 16 02:29:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hk5NbUz7"; dkim-atps=neutral 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 3zjHK64F9sz9t3v for ; Fri, 16 Feb 2018 13:34:18 +1100 (AEDT) Received: from localhost ([::1]:57260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVqq-00006M-LZ for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:34:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVmp-0005Tb-Gn for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmo-0002Xt-8X for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:07 -0500 Received: from mail-ua0-x241.google.com ([2607:f8b0:400c:c08::241]:34091) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmo-0002Xl-3k for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:06 -0500 Received: by mail-ua0-x241.google.com with SMTP id m43so1117090uah.1 for ; Thu, 15 Feb 2018 18:30:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DhxZ8leHQ9jxPBNjccOuKJijS6vbpElFzkXsMnebttU=; b=hk5NbUz7hj27yZM9TViOi7bSn19ZHmLzNa23PCAkCLiGzWmVVTIM0C34/Ol3rV4SGr XzRF1f+eP8xU019az+oEiku5fg7XrgQm6MkUp1kkauEB4cgZZN91fl8jcjxRE93XAajb lipvFvv3kTcauCR2m1w9NzFHv/xy3S2UvRmcdJN55gpIeprikoym53SdpZ4a9416FLNp 5L+AnUdND+Qd0E44GsCx2RDkap7nWxPqu9BeCa+3SkA4RTrdmSha6fX696XytG+YG7zQ OrG+HRZtMi9x+2IrRcV76xyS2SGW0Ydjs/4xoJuddDOF7r/p/z9eBucXs6++Zu+yLmUU a6jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=DhxZ8leHQ9jxPBNjccOuKJijS6vbpElFzkXsMnebttU=; b=NwsWvNjN0+V92poKRuUEjqJXELy5ELlgxAB7bWiu8HBHC9IivuQ5oMA1AtUZ+63X1s fdHd1A0s8YfrhOPJFbcIvtgpAjLf3rI6en6uYCjuuusV7k8dLZQjSh/OzStX+AaVeQIr kuypwfkNrnCX8IHQXiT777040jVU/P9WlVOhMXDuG6VgiASn8eg60aonEkyv9HkaZDns Qz3yMGmMg8bET2wSsPA+VJD04ibNnli2BmknGeGUf39GXeYy0CZOngtXV9MTDysAm3nc WOZuh85alYcSi7z/IFivY8D51va0DNKHnoVzkHkE4cL8XYXhTkIrF4rHr/da21whN5+4 qayQ== X-Gm-Message-State: APf1xPDEzbb2kpQzO/jupyX6t19/LTLo4QSAIACNPIKfyEpMDe+7jeix NxjDheS9jPJxFb0V1UQCWRI= X-Google-Smtp-Source: AH8x224E9stYdGcB+Ec7HoUklkKiMX/LK+G2ezwishz3tSqOpkbp3RwjqvcBcUutSNQK9LFTTEzdrw== X-Received: by 10.176.76.93 with SMTP id d29mr4024271uag.89.1518748205581; Thu, 15 Feb 2018 18:30:05 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.30.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:30:05 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:29 -0300 Message-Id: <20180216022933.10945-5-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c08::241 Subject: [Qemu-devel] [PATCH v3 4/7] hw/sd/ssi-sd: use the SDBus API, connect the SDCard to the bus 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" On reset the bus will reset the card, we can now drop the device_reset() call. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/ssi-sd.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index f88f509e0a..ae04b6641b 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -47,7 +47,7 @@ typedef struct { int32_t arglen; int32_t response_pos; int32_t stopping; - SDState *sd; + SDBus sdbus; } ssi_sd_state; #define TYPE_SSI_SD "ssi-sd" @@ -100,7 +100,7 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t val) request.arg = (s->cmdarg[0] << 24) | (s->cmdarg[1] << 16) | (s->cmdarg[2] << 8) | s->cmdarg[3]; DPRINTF("CMD%d arg 0x%08x\n", s->cmd, request.arg); - s->arglen = sd_do_command(s->sd, &request, longresp); + s->arglen = sdbus_do_command(&s->sdbus, &request, longresp); if (s->arglen <= 0) { s->arglen = 1; s->response[0] = 4; @@ -177,7 +177,7 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t val) DPRINTF("Response 0x%02x\n", s->response[s->response_pos]); return s->response[s->response_pos++]; } - if (sd_data_ready(s->sd)) { + if (sdbus_data_ready(&s->sdbus)) { DPRINTF("Data read\n"); s->mode = SSI_SD_DATA_START; } else { @@ -190,8 +190,8 @@ static uint32_t ssi_sd_transfer(SSISlave *dev, uint32_t val) s->mode = SSI_SD_DATA_READ; return 0xfe; case SSI_SD_DATA_READ: - val = sd_read_data(s->sd); - if (!sd_data_ready(s->sd)) { + val = sdbus_read_data(&s->sdbus); + if (!sdbus_data_ready(&s->sdbus)) { DPRINTF("Data read end\n"); s->mode = SSI_SD_CMD; } @@ -242,13 +242,24 @@ static const VMStateDescription vmstate_ssi_sd = { static void ssi_sd_realize(SSISlave *d, Error **errp) { ssi_sd_state *s = FROM_SSI_SLAVE(ssi_sd_state, d); + DeviceState *carddev; DriveInfo *dinfo; + Error *err = NULL; + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, + DEVICE(d), "sd-bus"); + + /* Create and plug in the sd card */ /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); - s->sd = sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, true); - if (s->sd == NULL) { - error_setg(errp, "Device initialization failed."); + carddev = qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + if (dinfo) { + qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), &err); + } + object_property_set_bool(OBJECT(carddev), true, "spi", &err); + object_property_set_bool(OBJECT(carddev), true, "realized", &err); + if (err) { + error_setg(errp, "failed to init SD card: %s", error_get_pretty(err)); return; } } @@ -264,11 +275,6 @@ static void ssi_sd_reset(DeviceState *dev) s->arglen = 0; s->response_pos = 0; s->stopping = 0; - - /* Since we're still using the legacy SD API the card is not plugged - * into any bus, and we must reset it manually. - */ - device_reset(DEVICE(s->sd)); } static void ssi_sd_class_init(ObjectClass *klass, void *data) From patchwork Fri Feb 16 02:29:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="s7Z05+7l"; dkim-atps=neutral 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 3zjHK50gpcz9t3v for ; Fri, 16 Feb 2018 13:34:17 +1100 (AEDT) Received: from localhost ([::1]:57257 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVqp-0008Vz-4q for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:34:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVmv-0005dp-RD for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVms-0002b8-MQ for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:13 -0500 Received: from mail-vk0-x241.google.com ([2607:f8b0:400c:c05::241]:41771) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVms-0002ah-Hp; Thu, 15 Feb 2018 21:30:10 -0500 Received: by mail-vk0-x241.google.com with SMTP id t201so1060403vke.8; Thu, 15 Feb 2018 18:30:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bQ/WLf/gj3SLLZYXbCfd+kVPfJ6iBrMRkq8+ucUmfU8=; b=s7Z05+7lvk8Gqhk/VR/PQCnNMXhvIB/SAjtzM9zbEy1aFWUXgvR0z7i2Z5WkrkRKnl BsWm563T3FiWnBccgSC5b8o5+p3xRTUWh0l0CB8aR/XIDqqsBarkIwQtJji3J9Ekqn5p BE6EK4E60j98ImPT8T4UA2OHY4fmyIiZnlYIx+URcQgQDX7EjDBwkkUOcOVu+w4TN1SY N7run7+mdamp1hpZAaOY+wVq8Cys7VzX8H4MY6L91e1U9bMW7Ch95H2vAg8PfPfe504V +ijnHTe88Z9dM8lz7g4XMFQH2GZE0A6bh9Diezuojak3RzEdZazYGM1wHj8yoyvj+7aF 1s2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bQ/WLf/gj3SLLZYXbCfd+kVPfJ6iBrMRkq8+ucUmfU8=; b=dQx6/dXYCb4PYZtF+KOt6gHqHp5KMWF5MOrhyh4vHqa7Y8GxDGmVInghaMnRfP+iyH BLYqSvWKYYc6TI+IPWtIgKN/KExJavrsL6FzHnwBzypsoD7splA6yaCNt5IwvSuMRyes 88SkhzcFTtODIGaaPMAGY4HAT7UDFYrhtkSBW6B3ZhiJgFi5y9R7WQkkmanN+H/gbo/i JtFrXTyX9m9O6tO8JuU6v77V2KJ96+jynIna4FM9ugWR4H6wNXa9ZFhhNqhpMwv9xDhC JmT137xdUUibbXbom97EIfZ3TScc7noEZHWIiJvgA7NRZtsHuIpVpBFoXWjxqSAW4r9v fNtw== X-Gm-Message-State: APf1xPB+QK1c7LU7uLryVXmnYr3cRjjRdR5Y/l1aLk/8K3rSRYcoHTAt lx4Mp0ffJvw5Qecg1pEQIXw= X-Google-Smtp-Source: AH8x227a4gANwSylKI8ITpXqBn2XKVPg5hW5CI0XHF2I8nykhvY4b73OPfwxgklXVrTAXduXycv0Wg== X-Received: by 10.31.199.198 with SMTP id x189mr3627801vkf.154.1518748209977; Thu, 15 Feb 2018 18:30:09 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.30.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:30:09 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Eduardo Habkost , =?utf-8?q?Andreas_F=C3=A4rber?= Date: Thu, 15 Feb 2018 23:29:30 -0300 Message-Id: <20180216022933.10945-6-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c05::241 Subject: [Qemu-devel] [RFC PATCH v3 5/7] hw/sd/pl181: expose a SDBus and connect the SDCard to it 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle , "open list:ARM PrimeCell and..." Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" using the sdbus_*() API. Signed-off-by: Philippe Mathieu-Daudé --- RFC because how pl181_sdbus_create_inplace() doing class_init(SDBus) in realize(pl181) seems weird... from http://lists.nongnu.org/archive/html/qemu-devel/2018-02/msg01268.html: I think you have to change that sd_set_cb() code now. If you look at sd_cardchange() it uses "is this SD card object on an SDBus" to determine whether to notify the controller via the old-API IRQ lines, or using the set_inserted() and set_readonly() callbacks on the SDBusClass. This previous series intended to enforce a cleaner OOP design, adding a TYPE_SD_BUS_MASTER_INTERFACE TypeInfo: http://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02322.html http://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02326.html http://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg02327.html --- hw/sd/pl181.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 15 deletions(-) diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 3ba1f7dd23..97e85e4a64 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -33,7 +33,7 @@ typedef struct PL181State { SysBusDevice parent_obj; MemoryRegion iomem; - SDState *card; + SDBus sdbus; uint32_t clock; uint32_t power; uint32_t cmdarg; @@ -179,7 +179,7 @@ static void pl181_send_command(PL181State *s) request.cmd = s->cmd & PL181_CMD_INDEX; request.arg = s->cmdarg; DPRINTF("Command %d %08x\n", request.cmd, request.arg); - rlen = sd_do_command(s->card, &request, response); + rlen = sdbus_do_command(&s->sdbus, &request, response); if (rlen < 0) goto error; if (s->cmd & PL181_CMD_RESPONSE) { @@ -223,12 +223,12 @@ static void pl181_fifo_run(PL181State *s) int is_read; is_read = (s->datactrl & PL181_DATA_DIRECTION) != 0; - if (s->datacnt != 0 && (!is_read || sd_data_ready(s->card)) + if (s->datacnt != 0 && (!is_read || sdbus_data_ready(&s->sdbus)) && !s->linux_hack) { if (is_read) { n = 0; while (s->datacnt && s->fifo_len < PL181_FIFO_LEN) { - value |= (uint32_t)sd_read_data(s->card) << (n * 8); + value |= (uint32_t)sdbus_read_data(&s->sdbus) << (n * 8); s->datacnt--; n++; if (n == 4) { @@ -249,7 +249,7 @@ static void pl181_fifo_run(PL181State *s) } n--; s->datacnt--; - sd_write_data(s->card, value & 0xff); + sdbus_write_data(&s->sdbus, value & 0xff); value >>= 8; } } @@ -477,13 +477,6 @@ static void pl181_reset(DeviceState *d) s->linux_hack = 0; s->mask[0] = 0; s->mask[1] = 0; - - /* We can assume our GPIO outputs have been wired up now */ - sd_set_cb(s->card, s->cardstatus[0], s->cardstatus[1]); - /* Since we're still using the legacy SD API the card is not plugged - * into any bus, and we must reset it manually. - */ - device_reset(DEVICE(s->card)); } static void pl181_init(Object *obj) @@ -499,16 +492,52 @@ static void pl181_init(Object *obj) qdev_init_gpio_out(dev, s->cardstatus, 2); } +static void pl181_set_readonly(DeviceState *dev, bool level) +{ + PL181State *s = (PL181State *)dev; + + qemu_set_irq(s->cardstatus[0], level); +} + +static void pl181_set_inserted(DeviceState *dev, bool level) +{ + PL181State *s = (PL181State *)dev; + + qemu_set_irq(s->cardstatus[1], level); +} + +static void pl181_sdbus_create_inplace(SDBus *sdbus, DeviceState *dev) +{ + SDBusClass *sbc; + + qbus_create_inplace(sdbus, sizeof(SDBus), TYPE_SD_BUS, dev, "sd-bus"); + + /* pl181_sdbus_class_init */ + sbc = SD_BUS_GET_CLASS(sdbus); + sbc->set_inserted = pl181_set_inserted; + sbc->set_readonly = pl181_set_readonly; +} + static void pl181_realize(DeviceState *dev, Error **errp) { PL181State *s = PL181(dev); + DeviceState *carddev; DriveInfo *dinfo; + Error *err = NULL; + + pl181_sdbus_create_inplace(&s->sdbus, dev); + /* Create and plug in the sd card */ /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); - s->card = sd_init(dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, false); - if (s->card == NULL) { - error_setg(errp, "sd_init failed"); + carddev = qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + if (dinfo) { + qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), &err); + } + object_property_set_bool(OBJECT(carddev), true, "realized", &err); + if (err) { + error_setg(errp, "failed to init SD card: %s", error_get_pretty(err)); + return; } } From patchwork Fri Feb 16 02:29:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qSTB6K9V"; dkim-atps=neutral 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 3zjHFb1kgVz9t3v for ; Fri, 16 Feb 2018 13:31:15 +1100 (AEDT) Received: from localhost ([::1]:57243 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVnt-0005jL-9a for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:31:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVmx-0005g7-S5 for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVmw-0002eY-V9 for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:15 -0500 Received: from mail-vk0-x242.google.com ([2607:f8b0:400c:c05::242]:32842) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVmw-0002eO-QA for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:14 -0500 Received: by mail-vk0-x242.google.com with SMTP id w201so1067617vkw.0 for ; Thu, 15 Feb 2018 18:30:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BvyBAJjZIT72bCBUYE4Z5/a2MRITLhsyueWNHdF6kAo=; b=qSTB6K9V9YFJlt+D3mIaPhqTV2KFQ5AJZU4PF4mQgyRw+e5Q0mp5qXRHBZBoMnWrOY QekYkr261prmHpJoDoyW9cre4oWovxZ4FoHX5K6G526QsrUdDsjOiX8LIiKNR5Gb/Ae8 SFLsiLQT6gYv2b9brPrXQyUzICfKxvE2nBrwGwUDWgJhwTmbPvrR9l0XIRy/TH4FGZ6t ncw31w4KyCU3jrx58ICT0nE5ZYwK7MB5c/Ov6RaTa4BxHN9XFPb3h9d4r1ztPXGD9iV8 NgZLqO3y67D+kF7hEFDE2qJgn4+/OkGWH39vdELX5wN6f9ImFRtUHlzScsPvKK2m/p33 TqEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BvyBAJjZIT72bCBUYE4Z5/a2MRITLhsyueWNHdF6kAo=; b=Trr6yCujcrwC81Z+WFQqXmeM7oUu9xU+TXXYDhaS+dpSq0LzqXjcrPAh/rK0yZUWPG HlEHfY9I4E+6aRmjbayCnty7/6kFmzo4roBQJCrg137FErZ12H+vTcvC1XlAyCbiZhZA zcO0HWsn0Xl+kTdEFO34efgOEIAslEs2DQCEhhtMeX1hNIMG9qw9irEh2J8/VNZDytDt rbBT91R+8O0lzsJJiJsR1c8EBUTSk90PhlPWlVyEQPfS83bqQ5i9zvwTd+ummNsIuuXI t+bQE3rRzFQd5MAyMkZxHqllREpCgclZv5VbP0QhcaDzhKtczSwXJ7COKEPXJuXe2Hlg yRFg== X-Gm-Message-State: APf1xPAphMB/XyBg7pFJFU76HvZ4h2CNcNxfC2J8o38j4MliZU7+E+7j WATLbA42968Jl6FUu79oTpY= X-Google-Smtp-Source: AH8x227YT5K26FQIxy1WGYAt36IzoQ9LmQ01yvZQBEx9BuIcwDHs2y2g3x5A3WW647FJjXIxYo4RWw== X-Received: by 10.31.174.147 with SMTP id x141mr3631711vke.41.1518748214250; Thu, 15 Feb 2018 18:30:14 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.30.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:30:13 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:31 -0300 Message-Id: <20180216022933.10945-7-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c05::242 Subject: [Qemu-devel] [PATCH v3 6/7] hw/sd: make sd_data_ready() static 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It belongs to the legacy API (the last user has been converted). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/sd/sd.h | 1 - hw/sd/sd.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index bf1eb0713c..4491db98de 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -138,7 +138,6 @@ int sd_do_command(SDState *sd, SDRequest *req, void sd_write_data(SDState *sd, uint8_t value); uint8_t sd_read_data(SDState *sd); void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); -bool sd_data_ready(SDState *sd); /* sd_enable should not be used -- it is only used on the nseries boards, * where it is part of a broken implementation of the MMC card slot switch * (there should be two card slots which are multiplexed to a single MMC diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 9ac9b63ff8..72d32f7845 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1885,7 +1885,7 @@ uint8_t sd_read_data(SDState *sd) return ret; } -bool sd_data_ready(SDState *sd) +static bool sd_data_ready(SDState *sd) { return sd->state == sd_sendingdata_state; } From patchwork Fri Feb 16 02:29:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="s2RCWT5R"; dkim-atps=neutral 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 3zjHND6FN2z9t3v for ; Fri, 16 Feb 2018 13:37:00 +1100 (AEDT) Received: from localhost ([::1]:57445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVtS-0002hL-Uc for incoming@patchwork.ozlabs.org; Thu, 15 Feb 2018 21:36:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emVn4-0005oE-7L for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emVn1-0002fo-4b for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:22 -0500 Received: from mail-ua0-x241.google.com ([2607:f8b0:400c:c08::241]:37009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emVn0-0002fg-VB for qemu-devel@nongnu.org; Thu, 15 Feb 2018 21:30:19 -0500 Received: by mail-ua0-x241.google.com with SMTP id q8so1107839uae.4 for ; Thu, 15 Feb 2018 18:30:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9iKQclT2JgnRw7DfHyavMjksYafurrWeDjDITAZV2Kc=; b=s2RCWT5RjZgKRO9oln2ixPJE2he9juucoLozTF5dEVnU6BSlGPdwXZlsiAN6BpOK7f WDonmDASHiTkJQ2BgtCdcqVQhf1IltAR01t3sR6uujjPBHOeK29YNgRzRa13dJX8aaCr ZbZpaLR+VMu7I4JOybDkk8IGNAmpymeSh6eJUH+vsy5OFul34w3MTeW4OoJl40SKREOt MqoH7QE8VB0nKJm2FCy69Ia8RYCsZNzbw4crxLH+Wv4u7kdnFQA7PO7xZKYuiMsFYnVC KGiR7E8EYigaZL34qC+kR9sCs2Z8Z51jR69xzaJvy5PcbIt1wR4sdVzW7GI74DyNWm4I MK8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9iKQclT2JgnRw7DfHyavMjksYafurrWeDjDITAZV2Kc=; b=mFNCbM9XU4LxGaIFQuR7as4rfDaxfuWdpSD+7/ocVb9WFKwNVVTuOt0MAEIl04BQ5F 4lO9bXbNa3EMzfEyN2jT0gVbwgDMJHaNPVDLv+pnQKLA2CEFd2+NsrwEM5BYcrGJK08K ZkrjT61jwiT5E1/frUwBdkjPbkb8IpEg0YM0F8YIthJ7HT+YJDMNfSkC/pEsN8B5MJSM 299NYC+C38HQsZAKA60HzD9OiNxAuZnGq7/0w/Y3FDMSzUxAVwW29NfzH1xigA6GjgDI GpWEuq9bTK5u5HiQJZqOUfZIagZxR7y8kdzj9PkQ29aJ2IBav7hOLp0fAXFwMh2F9jkv Wv9A== X-Gm-Message-State: APf1xPCsOECeZOdt+zGtNyJav7iG3YHHXDZqjNxDvyMwmPib1AhtI7QM I11LmOzXkgw3MwFJWqS5kJg= X-Google-Smtp-Source: AH8x225YJQwV6VoisRLV0My10EuPpswmjuWoSsAT9/C6rJcIkqlyxSgDo+v5iG5Pks7jHhep+tlqOA== X-Received: by 10.159.56.79 with SMTP id q15mr3530017uad.137.1518748218382; Thu, 15 Feb 2018 18:30:18 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id q5sm6295200uaj.17.2018.02.15.18.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 18:30:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Thu, 15 Feb 2018 23:29:32 -0300 Message-Id: <20180216022933.10945-8-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180216022933.10945-1-f4bug@amsat.org> References: <20180216022933.10945-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400c:c08::241 Subject: [Qemu-devel] [PATCH v3 7/7] hw/sd: move sdcard legacy API to "hw/sd/sdcard_legacy.h" 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: "Edgar E . Iglesias" , Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Michael Walle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" omap_mmc.c is the last user left. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/sd/sd.h | 16 -------------- include/hw/sd/sdcard_legacy.h | 50 +++++++++++++++++++++++++++++++++++++++++++ hw/sd/omap_mmc.c | 2 +- hw/sd/sd.c | 1 + 4 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 include/hw/sd/sdcard_legacy.h diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h index 4491db98de..58528b4d2c 100644 --- a/include/hw/sd/sd.h +++ b/include/hw/sd/sd.h @@ -131,22 +131,6 @@ typedef struct { void (*set_readonly)(DeviceState *dev, bool readonly); } SDBusClass; -/* Legacy functions to be used only by non-qdevified callers */ -SDState *sd_init(BlockBackend *bs, bool is_spi); -int sd_do_command(SDState *sd, SDRequest *req, - uint8_t *response); -void sd_write_data(SDState *sd, uint8_t value); -uint8_t sd_read_data(SDState *sd); -void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert); -/* sd_enable should not be used -- it is only used on the nseries boards, - * where it is part of a broken implementation of the MMC card slot switch - * (there should be two card slots which are multiplexed to a single MMC - * controller, but instead we model it with one card and controller and - * disable the card when the second slot is selected, so it looks like the - * second slot is always empty). - */ -void sd_enable(SDState *sd, bool enable); - /* Functions to be used by qdevified callers (working via * an SDBus rather than directly with SDState) */ diff --git a/include/hw/sd/sdcard_legacy.h b/include/hw/sd/sdcard_legacy.h new file mode 100644 index 0000000000..8681f8089b --- /dev/null +++ b/include/hw/sd/sdcard_legacy.h @@ -0,0 +1,50 @@ +/* + * SD Memory Card emulation (deprecated legacy API) + * + * Copyright (c) 2006 Andrzej Zaborowski + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef HW_SDCARD_LEGACY_H +#define HW_SDCARD_LEGACY_H + +#include "hw/sd/sd.h" + +/* Legacy functions to be used only by non-qdevified callers */ +SDState *sd_init(BlockBackend *blk, bool is_spi); +int sd_do_command(SDState *card, SDRequest *request, uint8_t *response); +void sd_write_data(SDState *card, uint8_t value); +uint8_t sd_read_data(SDState *card); +void sd_set_cb(SDState *card, qemu_irq readonly, qemu_irq insert); + +/* sd_enable should not be used -- it is only used on the nseries boards, + * where it is part of a broken implementation of the MMC card slot switch + * (there should be two card slots which are multiplexed to a single MMC + * controller, but instead we model it with one card and controller and + * disable the card when the second slot is selected, so it looks like the + * second slot is always empty). + */ +void sd_enable(SDState *card, bool enable); + +#endif /* HW_SDCARD_LEGACY_H */ diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c index 5b47cadf11..be14ac4f40 100644 --- a/hw/sd/omap_mmc.c +++ b/hw/sd/omap_mmc.c @@ -19,7 +19,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/arm/omap.h" -#include "hw/sd/sd.h" +#include "hw/sd/sdcard_legacy.h" struct omap_mmc_s { qemu_irq irq; diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 72d32f7845..ae2d915977 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -34,6 +34,7 @@ #include "hw/hw.h" #include "sysemu/block-backend.h" #include "hw/sd/sd.h" +#include "hw/sd/sdcard_legacy.h" #include "qapi/error.h" #include "qemu/bitmap.h" #include "hw/qdev-properties.h"