From nobody Tue May 7 00:31:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593983611; cv=none; d=zohomail.com; s=zohoarc; b=MaQ9W3uHI9bjsA0KQp4D4geYvNdUgOleAOdWwqQP58C9DU5eJmq56HETkxhXgVTAnDZH/+Z+mfIECJzex3tpaQUlkjg7YJ3h6fnsYMEcJFRQ8PbUlkK0b8VPZLHs18lu+QK6HiH5Ecw0+6rZ3dQzhzagT4f23HJpH2LtVid4E8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593983611; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0uVc1RwrLMQTCvhtTK0p0uUR1koiTD8RW3TLjeqwhns=; b=A3PLcT2fTvoeQqWrMUZUI7Fbu+QnychVYsvL+AOZrVrPy3dmyqUPBYEKpH16G7cJD1dsswFj1zinRRjgwhdHImuW3elABjp8hw0z+3lp0hR+J/LlVPEgfx/kJk2enBJ6tc124/sBCWtfhanl8Lq3y8pSjFozJ3K35q6ptr4lKrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593983611543337.06877897158415; Sun, 5 Jul 2020 14:13:31 -0700 (PDT) Received: from localhost ([::1]:50352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBx4-0003KI-Bs for importer@patchew.org; Sun, 05 Jul 2020 17:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBu3-0007Bs-D8 for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:24 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41301) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBu1-0004qZ-QZ for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:23 -0400 Received: by mail-wr1-x444.google.com with SMTP id z15so27494932wrl.8 for ; Sun, 05 Jul 2020 14:10:21 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id r8sm21102004wrp.40.2020.07.05.14.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 14:10:19 -0700 (PDT) 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=0uVc1RwrLMQTCvhtTK0p0uUR1koiTD8RW3TLjeqwhns=; b=jQyhI/5YYDXiS/6oRlHxKFZRz39HKRwaJryKzojw8cFnKCp5SscGDOawLoQfQSv7gn CQdxjB7M2RyEn1PxeK/OohUpFOhjYFL8uT0RbJK+tTnSy/gSWukidzwU9e2bmPZwlljf vtTOq9yUvGMZHbyGahEKB84Zg2SrKmOViw7Wonwx5N8SiCecThtfbaCVTKF0DrtvGa3l G1+IRUNdLgUCFpHwrCnYElB1lzZYpkAIotHx/eA93zFEz3V+h2S6nmLFt/A2qSIp5I3P xERr/sLzTp0lvedmFR9Be9TlLRCwg3n4MJzIXqsfOfw+sRUBHY4COv/Ih2rWFycxRcgQ GcSA== 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=0uVc1RwrLMQTCvhtTK0p0uUR1koiTD8RW3TLjeqwhns=; b=NbjDcACoRXuOQAZ+tewMj+fdg/bQWgcoOqktQBUBDJ6jor3XXxl9TVhNRQ7UYRqQbU TW06dCoVmR+1EtI23S6odG+o0Y4RrnHzmS9NtsB86Hevg6Hb7RgQkDQcuPLRO0p6d4Q7 qHCYIVj8Gua8CObd/C0ykbM+f852GmBT6QtgZfwUC+y53iorXuSW1Ek+flwPyBCDUhS3 v/b9iFcFIKquuZBdnN8UfHMZr7IWSO7/BUQLPAWGvHs07vEGRKGFF9H7nPvTXsua0NhY bGmGH0rgsEuruKey1Pb4m7sWJ4ttPV/QsZl1IWPWZGNf6AG5E6nP7yCgaogUNqwPORKO n4ww== X-Gm-Message-State: AOAM532rrqsHEEcJUN6XqxssKbliS+d8fF7Yv9NA8NWVsWrxN9tSaKfe gnXZi0yiJncYfbOqygMjh6EXE9k63+Y= X-Google-Smtp-Source: ABdhPJwGaPdNiouywgbyHEMo19745phH81vXpdYVh82rIUV6Z7/+4yvJoR6lFcyqy9bcuMR7WOLYxQ== X-Received: by 2002:adf:ed4f:: with SMTP id u15mr44625398wro.318.1593983420004; Sun, 05 Jul 2020 14:10:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/4] hw/lm32/milkymist: Un-inline milkymist_memcard_create() Date: Sun, 5 Jul 2020 23:10:13 +0200 Message-Id: <20200705211016.15241-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705211016.15241-1-f4bug@amsat.org> References: <20200705211016.15241-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Michael Walle , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As we will modify milkymist_memcard_create(), move it first to the source file where it is used. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/lm32/milkymist-hw.h | 11 ----------- hw/lm32/milkymist.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h index 05e2c2a5a7..5dca5d52f5 100644 --- a/hw/lm32/milkymist-hw.h +++ b/hw/lm32/milkymist-hw.h @@ -31,17 +31,6 @@ static inline DeviceState *milkymist_hpdmc_create(hwaddr= base) return dev; } =20 -static inline DeviceState *milkymist_memcard_create(hwaddr base) -{ - DeviceState *dev; - - dev =3D qdev_new("milkymist-memcard"); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); - - return dev; -} - static inline DeviceState *milkymist_vgafb_create(hwaddr base, uint32_t fb_offset, uint32_t fb_mask) { diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 85913bb68b..469e3c4322 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -80,6 +80,17 @@ static void main_cpu_reset(void *opaque) env->deba =3D reset_info->flash_base; } =20 +static DeviceState *milkymist_memcard_create(hwaddr base) +{ + DeviceState *dev; + + dev =3D qdev_new("milkymist-memcard"); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + + return dev; +} + static void milkymist_init(MachineState *machine) { --=20 2.21.3 From nobody Tue May 7 00:31:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1593983522; cv=none; d=zohomail.com; s=zohoarc; b=K+vxZ70lggr0fODiRoJOLbSKFd9DAvrby/cAGkFDd0/qgmfrPvKD1rxVy3jig4oPyKQLGFe2q/MGfhfOc8UKlPt+hheSHu3UGFQ0txOwKxeTpw+jTM0cDBCUHqz4tuJr41VZcw8+UYEpKswJIDoYMw3VvmUO57ZBaL9mniF3tVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593983522; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JgXQcZX51V7t77DAFUY2XleRV/WzIO1Iw/ek8pGYzRQ=; b=S/z4MHeBhzgpDY38l1rYd9xENVpSfjNyzZOpjFbHxEL8F9HPIyU1FKzW8DhBcsGzZWrqomoe/gmbqOGnaAQwuPqbW63uRXQVt6K+AGTI+oxnaXvxlfxSZ/wf3CBHOEueIwfzpIrO1R1KDbAEkfu/n+d3mkjbQMr3mRqSSH1Djrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593983522835935.2526517210617; Sun, 5 Jul 2020 14:12:02 -0700 (PDT) Received: from localhost ([::1]:44512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBvc-0000rq-EX for importer@patchew.org; Sun, 05 Jul 2020 17:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBu3-0007Bu-TX for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:24 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35824) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBu2-0004rI-J9 for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:23 -0400 Received: by mail-wm1-x342.google.com with SMTP id l2so38123399wmf.0 for ; Sun, 05 Jul 2020 14:10:22 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id r8sm21102004wrp.40.2020.07.05.14.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 14:10:20 -0700 (PDT) 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=JgXQcZX51V7t77DAFUY2XleRV/WzIO1Iw/ek8pGYzRQ=; b=MdSgeYToOdzmupULd48ervtyi0JgdjlRtmpaAtg+67QTTPKrQf1VAclJrOb1Aiub+3 ZcNdJPeosWcPm5qa4sAm1NRMtXce5BoVJETFMMYpQohX9N9NXW5dojn1rL6qJcDV49Ep VdoTwpxcf0aDzF1HG26+YI3ks0Lqpt04J9Z5/N9jvd1RrjjkpeKduWXrY9iXADpPQa3Y zYz1gnUvP0tLQcU+MQVIsG0bcreakrIfPhmNAlSvB55nxqfmINddKamnfdM6isACPx+Q bPiozwSpSPgxCg9d1ptWwfaK8JGRSt/fK+h93C5X62tPJz2JNVcGOjL/WR/BVq87PaTx eEXQ== 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=JgXQcZX51V7t77DAFUY2XleRV/WzIO1Iw/ek8pGYzRQ=; b=N4UKv1XPmrPPGPtHFzEIpCCrVcx+lQHHhl269A7/2kM7ij1cH52Z/dp9uwuEuRJP6f 8M8ocgK2v/Hh+ahDhkIhX/8XsFzrvfj/aQyVGqatuRWJv5IXpD8O/eiS9RLLiaTBSsgD h9Jt23q/cxhGkJIboYtBWuxmHvd1CxictXz0I8mtCZrJoRhH0Z0dFeBYXg64dOIIIbu3 q8mhCw9PzgXhZI8NboLUqqjwUyTMXI6UEDJQngu7RAeWjELiOWyrOcgyds6slXOTR5aB 5+dRi0WDVgYp63Q5FAoAwLplHzaSNrh8RyWQ7YDHfhzRJgvjfuwqiH0EeDSTkf1BdYnb 4wvw== X-Gm-Message-State: AOAM530DZdu8AYuqI5dqJ1rGxSsVkYVhWgmm/Zx1CoTmwKU70YOVSjmE /tv/gyObtA0gGomTbdJPz8AUBTfZjds= X-Google-Smtp-Source: ABdhPJxCi8KLQ/YjESPFsV2YeEedkEfvEuKDVAe5cA3MfXUZLfDP1UkdPpFCUi0qCOJYkVSAyBfb1g== X-Received: by 2002:a7b:c441:: with SMTP id l1mr44009680wmi.7.1593983421083; Sun, 05 Jul 2020 14:10:21 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/4] hw/lm32/milkymist: Comment to remember some IRQs lines are left unwired Date: Sun, 5 Jul 2020 23:10:14 +0200 Message-Id: <20200705211016.15241-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705211016.15241-1-f4bug@amsat.org> References: <20200705211016.15241-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Michael Walle , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The 'card is readonly' and 'card inserted' IRQs are not wired. Add a comment in case someone know where to wire them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/lm32/milkymist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 469e3c4322..117973c967 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -87,6 +87,7 @@ static DeviceState *milkymist_memcard_create(hwaddr base) dev =3D qdev_new("milkymist-memcard"); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); + /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */ =20 return dev; } --=20 2.21.3 From nobody Tue May 7 00:31:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593983524; cv=none; d=zohomail.com; s=zohoarc; b=cnOWAGPNo2kVcov+XslIhw0YSCEJIcY2ioBOhxAZHxxC1IEMe6BatOBr49bAgXUnYlXEnvwDYnYVJ+cy1YyzEjj0P/pOze9RpyauGdnPVjNWkGrZOjhtKcQmAMCQ19MD5oVxy9u/4ufJ34/btiSd/Vfhuv+z6lKBHL7iRiBlImw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593983524; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=USmnM0sdBNCY4V6MFVCaDnSU9PQa4HFTC5SUnR3ioHU=; b=SGe1RTo/+uROtPuR9wdR6l/N7A5ut2R49+IMT63WIshZ41AA0OfxHJUONWBk+Iw6URabMuWg12szzex8t05qeWPJ/MLM+5dXvHRtDJmL4fTb2TKaCnIL7/2zDuQBZlQRS8dwlDvB1awOw7ySeXcVCK5LQ/aLVLOceoTkdYjwX7I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159398352428692.57321682453482; Sun, 5 Jul 2020 14:12:04 -0700 (PDT) Received: from localhost ([::1]:44684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBve-0000w2-Sk for importer@patchew.org; Sun, 05 Jul 2020 17:12:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBu6-0007Cb-P3 for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:26 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53527) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBu3-0004rr-WA for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:25 -0400 Received: by mail-wm1-x343.google.com with SMTP id j18so37117815wmi.3 for ; Sun, 05 Jul 2020 14:10:23 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id r8sm21102004wrp.40.2020.07.05.14.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 14:10:21 -0700 (PDT) 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=USmnM0sdBNCY4V6MFVCaDnSU9PQa4HFTC5SUnR3ioHU=; b=aRn2T70dr+tLX6R/ToDrhbt4Eyy9mIow/saapukBfQyUcmKImpV6D2cGbXTwuPTJkf Yqxf/PsIjtxyK7KidPrXMsJbDMtcoHxtWhkjRBW8j0hoxREcVHyjJj/sAdjxSM+nCy+p EpWpGQ6Ge1lBHZkyPg3/5D1WYRzhDKUUobruMFWtzl128SumCUSwq6YfUFufjnascyd7 WaGCuQ6V+/8++gSpYEDcsSFEfFzVfPIalTtO7uEct83Kd6MDTbW/HmZmc7f56GfRj7d8 rCPg6lgPK73y1oOrAsB/SWTrbMosG0YbDR5YmUBbHvHqku8fVJg22Tb3OWWN1V8fwvZf GpTw== 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=USmnM0sdBNCY4V6MFVCaDnSU9PQa4HFTC5SUnR3ioHU=; b=OZ5gO/BtwW6SUnj+aLl6M0VtlS83ZmezFpFky2OtYY697xm9G33ZASg/d8tHMrv0+T 6KVYlR5Ll9LgjBNTJvsOJhs4biSCIMRSN8ATAAHczRwD9wYI0xstNZXoMPlyuqAmJ9rv qU2DVKg8rVlSVunh30Ru/MYD244XWNMtpu+umd/4MqzMjAOlI7ya95PmrTMn9UJtNUrH ha6VwhvyrGjW+atr+EKSleH9HL9XKu6nHJgvMMgR0dV19z179CLyOgElaQQewgYrY+2O noXitCYuyitCM7fv269QV8TP5qOnPg8+Bq6PMhF2/x0R3j9lK7bvCzSWtndR0aNRxBVt F7cw== X-Gm-Message-State: AOAM531zwoWvWuzd59vyKIosi9jB0KLosLzSJB+mH4x31myWTPQY7ktD LPfvB5GOmbpMaHY/5pbEMJjTnadBPi0= X-Google-Smtp-Source: ABdhPJwQuzpQBiEmalIjadR3IXS6fJMe7GkesAKQx1BtbbrGjWQDgTvpwFIBVY3vlo5b4wP/h11k1A== X-Received: by 2002:a1c:dd09:: with SMTP id u9mr44695796wmg.70.1593983422134; Sun, 05 Jul 2020 14:10:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/4] hw/sd/milkymist: Create the SDBus at init() Date: Sun, 5 Jul 2020 23:10:15 +0200 Message-Id: <20200705211016.15241-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705211016.15241-1-f4bug@amsat.org> References: <20200705211016.15241-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Michael Walle , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We don't need to wait until realize() to create the SDBus, create it in init() directly. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/milkymist-memcard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index afdb8aa0c0..fb02309f07 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -261,6 +261,9 @@ static void milkymist_memcard_init(Object *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); + + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SD_BUS, + DEVICE(obj), "sd-bus"); } =20 static void milkymist_memcard_realize(DeviceState *dev, Error **errp) @@ -271,9 +274,6 @@ static void milkymist_memcard_realize(DeviceState *dev,= Error **errp) DriveInfo *dinfo; Error *err =3D NULL; =20 - 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 =3D drive_get_next(IF_SD); --=20 2.21.3 From nobody Tue May 7 00:31:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593983528; cv=none; d=zohomail.com; s=zohoarc; b=Cqe3cI+lLQ7izQhNvCEei8qgCSu9fORSFE6fHPo1ZNLQNsqYHPH1T8Drks6QWUFKxzAusSJEyfJk1FE0be0A0hA9M/ovaWZjblb21ZSQmxmEi6+PDsQJc68NKMKWS41HQJUgcrwLa0u+8tVbkEHb/yYpoBSNmvgMKW3Y+/ZLFcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593983528; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZL9T7KFWD7HCyn+1/9Rr0VvAdk4V+i9LaitRKQS9OF0=; b=ikRi5/R5AvrOTWhi80bG15/t7TMzTCQHEZOIoLTkOaDWMa1LH1/7zV8ijbZs6G+X30oeobcZ961Q/31E3E2W6apr3dLfsPbydMz5Nj7PtJyvUhaQRBxgi0lAIaXadqHM6l0qUpHxyTSNDnbOZceXbfd3+ZgnKd4Y0T2Ebp6MqmE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593983528179484.35006643234397; Sun, 5 Jul 2020 14:12:08 -0700 (PDT) Received: from localhost ([::1]:45100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsBvi-000187-PG for importer@patchew.org; Sun, 05 Jul 2020 17:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsBu9-0007Gt-HH for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:29 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42294) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jsBu6-0004s6-E7 for qemu-devel@nongnu.org; Sun, 05 Jul 2020 17:10:29 -0400 Received: by mail-wr1-x442.google.com with SMTP id o11so38807276wrv.9 for ; Sun, 05 Jul 2020 14:10:24 -0700 (PDT) Received: from localhost.localdomain (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id r8sm21102004wrp.40.2020.07.05.14.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2020 14:10:22 -0700 (PDT) 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=ZL9T7KFWD7HCyn+1/9Rr0VvAdk4V+i9LaitRKQS9OF0=; b=Vq2D07LXep6KOqympd9raTJTXOvxd5ZhxsgXeWtQpiGYbwju0n72B2VWJtpg3Lns5Z Q2c+t/WDDT0HW7H1goR0p8RcdSkrigFj3TS/G+XfV7p7sbK1ZrceXPpvNIiY/XRj5phg BKH+LOvfhne4vp6xXx4PFpN5Y8/jJHRwSwem0iA3t1lx/4OD51TP+aPJsZ3DwC/k7Ubz k+wupdOyRQr3i3wqij4SUnD/HZveQGKSxkNW9vPjxxHPO1ZE0IyvxQiBU0qtkuayxj3E 5syPd4YPZWSqsDVHY6cXQ5Mp4VWvc2hSHmHbEgw7h8ROW7fM7mEvd64abAm9Fyb/wFa4 RGMg== 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=ZL9T7KFWD7HCyn+1/9Rr0VvAdk4V+i9LaitRKQS9OF0=; b=Uh+zN2BTU+KeY2NTZddy2UMckOcxC+3im3PztP2gEsXWrT4mxBK2QNc/6m8eQ8zIAz JRPkwJMZFrEvcLmAI+UO08Yi2Tqn2QpjVluhhub6PGTYk0GKnBzErSfYx5gtrwTtSr+s M9be3uL/jnTsks2SJkiRpXaXcb0fAJgsMvoYtOdP4aIDhxUDqz3AP0+P+sXugwhFjLWl 4Q3WEXWfr1z7t+bBOU4WlJMmnYGu3jjPAyyaFQ8E257HkHQ8YrTQD/XrJ1tpji+ATgxg a3zSXd28XxgKkyGInEG84w7I9D1ChY/46Sm85PocROsiUQ2+towt0CoOSOc+t10E8OZk NycQ== X-Gm-Message-State: AOAM531o8zqlhgJVYqs3l6+IE2WMtcAjwXOJ42c6qcT9R+X5V+fL1JuW otkdQH+kjpit/Anjmr0BQ/aMF9+sRIA= X-Google-Smtp-Source: ABdhPJwsP8/I0Urr8xV58BPuY19kIhiQaPrtNXjBwNF0213Hs6A7XFrEgFBZm7f+3jBKFDiGpMyRjA== X-Received: by 2002:a5d:504b:: with SMTP id h11mr44724670wrt.160.1593983423231; Sun, 05 Jul 2020 14:10:23 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/4] hw/sd/milkymist: Do not create SD card within the SDHCI controller Date: Sun, 5 Jul 2020 23:10:16 +0200 Message-Id: <20200705211016.15241-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200705211016.15241-1-f4bug@amsat.org> References: <20200705211016.15241-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Michael Walle , Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) SDHCI controllers provide a SD Bus to plug SD cards, but don't come with SD card plugged in :) Let the machine/board object create and plug the SD cards when required. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/lm32/milkymist.c | 13 +++++++++ hw/sd/milkymist-memcard.c | 55 +++++++++++++++++++++++---------------- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c index 117973c967..8e2c68da5a 100644 --- a/hw/lm32/milkymist.c +++ b/hw/lm32/milkymist.c @@ -34,6 +34,7 @@ #include "elf.h" #include "milkymist-hw.h" #include "hw/display/milkymist_tmu2.h" +#include "hw/sd/sd.h" #include "lm32.h" #include "exec/address-spaces.h" #include "qemu/cutils.h" @@ -83,12 +84,24 @@ static void main_cpu_reset(void *opaque) static DeviceState *milkymist_memcard_create(hwaddr base) { DeviceState *dev; + DriveInfo *dinfo; =20 dev =3D qdev_new("milkymist-memcard"); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base); /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */ =20 + dinfo =3D drive_get_next(IF_SD); + if (dinfo) { + DeviceState *card; + + card =3D qdev_new(TYPE_SD_CARD); + qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"), + &error_fatal); + } + return dev; } =20 diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index fb02309f07..e9f5db5e22 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -66,6 +66,8 @@ enum { #define MILKYMIST_MEMCARD(obj) \ OBJECT_CHECK(MilkymistMemcardState, (obj), TYPE_MILKYMIST_MEMCARD) =20 +#define TYPE_MILKYMIST_SDBUS "milkymist-sdbus" + struct MilkymistMemcardState { SysBusDevice parent_obj; =20 @@ -253,6 +255,19 @@ static void milkymist_memcard_reset(DeviceState *d) } } =20 +static void milkymist_memcard_set_readonly(DeviceState *dev, bool level) +{ + qemu_log_mask(LOG_UNIMP, + "milkymist_memcard: read-only mode not supported\n"); +} + +static void milkymist_memcard_set_inserted(DeviceState *dev, bool level) +{ + MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(dev); + + s->enabled =3D !!level; +} + static void milkymist_memcard_init(Object *obj) { MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(obj); @@ -266,27 +281,6 @@ static void milkymist_memcard_init(Object *obj) DEVICE(obj), "sd-bus"); } =20 -static void milkymist_memcard_realize(DeviceState *dev, Error **errp) -{ - MilkymistMemcardState *s =3D MILKYMIST_MEMCARD(dev); - DeviceState *carddev; - BlockBackend *blk; - DriveInfo *dinfo; - Error *err =3D NULL; - - /* Create and plug in the sd card */ - /* FIXME use a qdev drive property instead of drive_get_next() */ - dinfo =3D drive_get_next(IF_SD); - blk =3D dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; - carddev =3D qdev_new(TYPE_SD_CARD); - qdev_prop_set_drive(carddev, "drive", blk); - if (!qdev_realize_and_unref(carddev, BUS(&s->sdbus), &err)) { - error_propagate_prepend(errp, err, "failed to init SD card: %s"); - return; - } - s->enabled =3D blk && blk_is_inserted(blk); -} - static const VMStateDescription vmstate_milkymist_memcard =3D { .name =3D "milkymist-memcard", .version_id =3D 1, @@ -308,10 +302,9 @@ static void milkymist_memcard_class_init(ObjectClass *= klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->realize =3D milkymist_memcard_realize; dc->reset =3D milkymist_memcard_reset; dc->vmsd =3D &vmstate_milkymist_memcard; - /* Reason: init() method uses drive_get_next() */ + /* Reason: output IRQs should be wired up */ dc->user_creatable =3D false; } =20 @@ -323,9 +316,25 @@ static const TypeInfo milkymist_memcard_info =3D { .class_init =3D milkymist_memcard_class_init, }; =20 +static void milkymist_sdbus_class_init(ObjectClass *klass, void *data) +{ + SDBusClass *sbc =3D SD_BUS_CLASS(klass); + + sbc->set_inserted =3D milkymist_memcard_set_inserted; + sbc->set_readonly =3D milkymist_memcard_set_readonly; +} + +static const TypeInfo milkymist_sdbus_info =3D { + .name =3D TYPE_MILKYMIST_SDBUS, + .parent =3D TYPE_SD_BUS, + .instance_size =3D sizeof(SDBus), + .class_init =3D milkymist_sdbus_class_init, +}; + static void milkymist_memcard_register_types(void) { type_register_static(&milkymist_memcard_info); + type_register_static(&milkymist_sdbus_info); } =20 type_init(milkymist_memcard_register_types) --=20 2.21.3