From patchwork Thu Feb 25 21:35:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Baumann X-Patchwork-Id: 8426851 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6ADEA9F52D for ; Thu, 25 Feb 2016 21:35:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 704EC20394 for ; Thu, 25 Feb 2016 21:35:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65EED202E9 for ; Thu, 25 Feb 2016 21:35:57 +0000 (UTC) Received: from localhost ([::1]:46008 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ3Zk-0003Mg-Ic for patchwork-qemu-devel@patchwork.kernel.org; Thu, 25 Feb 2016 16:35:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ3ZV-0003Lx-5P for qemu-devel@nongnu.org; Thu, 25 Feb 2016 16:35:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZ3ZS-0003yE-TI for qemu-devel@nongnu.org; Thu, 25 Feb 2016 16:35:41 -0500 Received: from mail-by2on0144.outbound.protection.outlook.com ([207.46.100.144]:27680 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZ3ZS-0003xl-LF for qemu-devel@nongnu.org; Thu, 25 Feb 2016 16:35:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=0mQFSHdn/FJQxy5+w65vY/DV+B4FYeHXEeHil7577ho=; b=cvykIeD0mqJYnmM+F24U182rNzxbwmeJTFatclR3M+dmc2Nj99YTY/9nC2PzhFjqDmWZOFHjzPpC8+BOems9wp8XNH2Ck30qV2+VexQ4ijPyOct43yvbyu/ra+q3FvgiTYmirKIzqgP8vBJN871GPRDqMLJMAOagm6fcM7jeits= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=microsoft.com; Received: from baumann-desk.redmond.corp.microsoft.com (2001:4898:80e8:a::724) by BY2PR0301MB2039.namprd03.prod.outlook.com (10.163.196.153) with Microsoft SMTP Server (TLS) id 15.1.409.15; Thu, 25 Feb 2016 21:35:37 +0000 From: Andrew Baumann To: Date: Thu, 25 Feb 2016 13:35:30 -0800 Message-ID: <1456436130-7048-3-git-send-email-Andrew.Baumann@microsoft.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1456436130-7048-1-git-send-email-Andrew.Baumann@microsoft.com> References: <1456436130-7048-1-git-send-email-Andrew.Baumann@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:a::724] X-ClientProxiedBy: BY1PR10CA0020.namprd10.prod.outlook.com (25.160.197.30) To BY2PR0301MB2039.namprd03.prod.outlook.com (25.163.196.153) X-MS-Office365-Filtering-Correlation-Id: 8e025594-8a49-4da7-97aa-08d33e2b99b9 X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2039; 2:318IJi6VQWAnCfcsplgTDeVK2QUKYWqjrKoE0blMp+puuTe2aeW6341bqidoOFdzAFfhQzUVhPOsy+Mw3866DYDX9QAkxsrqGqwSq3L6K6NsFo7rva9wfgxq3gjiDcliswzAHPL6reZ0dL0/JYQcl5sCxpeuuySNiymBMRW/CXH8hCQpFw2Dy0Gpr5VNUpz6; 3:8J3ralALJacmCCdQJbSh1VhxMcdFMflFRhaodi1jMQ9zU6QuO1xo3yTrdI8dK6BurD++B/Caam1Gz1viQ4dd2pEg2I0pYTaWPGg4fVzsVtqOnUoXaRZKZj29U6Pc1zNl; 25:UavD4ZZqJm9DNVe4GOHjdTPKZo+xuaFLKFQoUfSDM51mgXXgwYRLa0paXXCRPyGYrNW8vEqEn67qO/E45Siu6cSeJcnzlr/i3vGdPhxKhBTUf9+By9bb2CLmhtcohEjfXe2EhHszYGwdgygGJapiosjq97UOwUzoSIBoywxyUSNxjOb2GadUvqTmerWDgVI5dUMbDCkteB7T4zGBj1OSkvi+LN7FZLR/zNWranOV1Gn0BMyBqQoKjOkKLSxCYl9IEaMHL4qxC+a04yx12TzTh8tXo9CyyC5yUQ8gt8yvfSAYsbffOMAhsi7aHQ4fUzpKAcdUwyGJH49piRQKPoIs2A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB2039; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2039; 20:l066Exeyjg0k24RiBOB+K5by1O30kM98nAON39mTJQAVXc+LrftIbnRwEJMaJq5lHRMHOQR6yjjv55lCtYgrGY/hYjJKnlu9FKQuS3TvPu/263O5lRenDhfKyo/AZ2wRpLi6lAg1rKcOiW+N3eyYlr/bJLMkCuv4BlZqWDn3XdsEFoToMjWHIxlwjESL2zVXBchA0h5b5joQRzkR0DGg2oiMEnxXTfAwqKidco24EAnKRZyczSOrxWbVAYf7cW5H/azzLKIpy2z1u+3W9+Qf7SyxPgj1DzeulPhgw4z5DAkXeQqbpGpFHpvtYM1ldvxU5sxXnZCC03QpmaKD4IdQCX1h2i7WizJl7uzkrZrawHhZr6BUaE9vD7kntnxENCAIqIJs2/x9XSNXW6qjAFulvlPgamLksEg2lO+5qjKVTCg+5FpCew2xNxqbRL/4NOEbA8KrRZHRASj0NlnxicDIWnb2q5AK7zulkbYB5K0JUVkATQtLFwh48tJ31Dh2ek/f; 4:BehDbkro8Ej/ZbVHIv+UixcBIzex3TO5UbWRGUXHk+2pHCw/8dT032I2/IESC7FPaRkWLpqAYzxI1wPmdq/VF3nP2jAyzQKedhus6zCdfdYgx8Jw7A9fFsGp1penKSlHQvGQfIRPeJec8yUf1w2CnzdHfmz+1taVaJTF0EI9j+gGNhPUtnmAYvj/LuHRN4o8UDmOBL15Q6QbH5JWYuvI1IXkSFcWL0F+qsO4aSrQjAkn5G7LqZFQFpMuWtL0lPfHdBnofP2ODhE9mASgD9qh7Hu7FVrcJqX1OiGsDXrp+zwlAhdSHB1na9a3b/B+X+KcawlJW3zd8TuSRWVQpCJNvwOmjna8aBxkDqzBUvPK0cXMvKdfpx4ZSHzWRB3E7v+Q X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:BY2PR0301MB2039; BCL:0; PCL:0; RULEID:; SRVR:BY2PR0301MB2039; X-Forefront-PRVS: 08635C03D4 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(50226001)(5004730100002)(229853001)(2351001)(92566002)(48376002)(6116002)(50466002)(19580405001)(19580395003)(77096005)(10290500002)(86362001)(40100003)(15975445007)(5005710100001)(2950100001)(86612001)(122386002)(2906002)(5003940100001)(189998001)(76176999)(5001960100002)(87976001)(107886002)(110136002)(42186005)(50986999)(5008740100001)(4326007)(47776003)(1096002)(586003)(575784001)(4001430100002)(36756003)(7059030)(3826002); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR0301MB2039; H:baumann-desk.redmond.corp.microsoft.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB2039; 23:otrUbSFO5qN5xFA1DmaTk9v9ElsXynIMtFICb5I?= =?us-ascii?Q?8d0I7s27tOmjEM/mTwMbHbnk0v5NMpKM3IHOThkqPNNB014W1BMDlriXcI9Z?= =?us-ascii?Q?6DnmZVAZzwNzoTfO/tdWZDj83/uXvYMV8Gq4TXx53whvauHVD7wlkM0348rM?= =?us-ascii?Q?6vXI+sUXG2mMUkiIJkyAwy498DExNC4iNhzhXdhVCes3Ge8xTvv71GX+eOkV?= =?us-ascii?Q?ITIMYKYIDvNty+/hJ7/HLLly5DNHY61Dh8TcuKFkYOJHsCYY5b1xiLvb5p+N?= =?us-ascii?Q?35IoPynqjtJa5ogEm8sQApAeW5bB9p32jf+yGCPT9kpNOf/c6Hk7X0HKQZAf?= =?us-ascii?Q?IhjmN6DJhmtLIUvFUW9aS62mAU3TgJ277g7ReqBDYN+Und1yWYmaYNoJg64M?= =?us-ascii?Q?Zl9UEMpzXYLXaF46tXpjf2U5hA8JOMHc9jcl//xLOnXoDAfm8SuXHcSvCobE?= =?us-ascii?Q?vYhWRo9BCgoyiCpdBjNuL3mFa71VXMrm0215zmzhTyUad0fhZHL4SRIaPrDn?= =?us-ascii?Q?sw5G0ek7O+qvSAa8oBrTDUbgy6k8f1iUI/pEnbx2nklDAoncJjJqOd0GMPqY?= =?us-ascii?Q?cHwPgGtGutOrsXtbn7evRoyd98/AE9pxgYqtWoC9pmOyg8CYpOU61ldI/aKq?= =?us-ascii?Q?tXhpsZGfadfOCtzWrRfqiuBYYqyrA8VdUIFb/JXSlceZsNw5Jf8nFSh0JdMv?= =?us-ascii?Q?6zI7zFx4rOtjTLOXNDtXqKsfPEcgJiZIFWGbO0XwHl7zvGmDwdAm8+7g20ol?= =?us-ascii?Q?knMIG404ToGJoZIsmczJDxxTT3+5hejyLyJLUOm2ykiPghkRbz9UOTXkm2Kp?= =?us-ascii?Q?hwORSYTkkOM+AWlJuq9L44XYQ5EDe/ajdu+QKKKnChoWkRWOlfCb0PC1LU+W?= =?us-ascii?Q?d5A1b0ioERitH9D3fdIvpYs+9grDSFdpQeQeS84NfE3kH5ObrsL4lZXe8qGN?= =?us-ascii?Q?ttmxaqoRV9wRKRtXtOIo4WPLNPo0LAg5ZVxugX/6BOsGTeaQoPFgFFC5xCtT?= =?us-ascii?Q?H1xde2ExBDTKD1V+XrWHWIMGEiv1ND1wqrjMByfB5SEBFEBtG3P//4j9nSCF?= =?us-ascii?Q?Xh6PTEW8Al9IZzliCvg5/ttaxsiQlTMdd+9+ZQyFA3O5w0Bw7VA0rvM+y0GV?= =?us-ascii?Q?/MSpmppPBIRs=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB2039; 5:uXCRiDnuqFCuuGP5NQp+OyorDgfZokmC4V/noRDGd/kSAgeY2WUEVvv2cNAlxGoHmvI8gVaqhFNHkcCe2FlFqAjkxt/lTon9TKlLyY5r+uLFzcfdy64SphiHQTBPPI+Or0Lh7Y59f/yoJVQZ4XN0iw==; 24:TlNUFLAFTKcQALuaeJCFYQfC0TVFkeMilCSt+dfT1A8RFUrL6C5+/RqgHX903lxPAl2VqH/0362XiHIsoAGwHfoMGFQkPvoWxEDCI2QfyEs= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2016 21:35:37.1073 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR0301MB2039 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.144 Cc: Peter Maydell , Igor Mitsyanko , Andrew Baumann , Sai Pavan Boddu , Peter Crosthwaite , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v4 2/2] sdhci: add quirk property for card insert interrupt status on Raspberry Pi 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-1.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This quirk is a workaround for the following hardware behaviour, on which UEFI (specifically, the bootloader for Windows on Pi2) depends: 1. at boot with an SD card present, the interrupt status/enable registers are initially zero 2. upon enabling it in the interrupt enable register, the card insert bit in the interrupt status register is immediately set 3. after a subsequent controller reset, the card insert interrupt does not fire, even if enabled in the interrupt enable register Signed-off-by: Andrew Baumann --- Notes: There's a fairly extensive discussion of the hardware behaviour that this patch seeks to model in the thread at: https://lists.gnu.org/archive/html/qemu-devel/2016-01/msg00605.html v4: split pending_insert bool into to separate flags: pending_insert_quirk for the property that enables the quirk, pending_insert_state to record whether an insert is pending (and which is cleared on delivery/reset) v3: changed to use subsection for vmstate, to preserve backward compatibility v2: changed implementation to use pending_insert bool rather than masking norintsts at read time, since the older version diverges from actual hardware behaviour when an interrupt is masked without being acked hw/sd/sdhci.c | 38 +++++++++++++++++++++++++++++++++++++- include/hw/sd/sdhci.h | 2 ++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index f175b30..e087c17 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -204,6 +204,7 @@ static void sdhci_reset(SDHCIState *s) s->data_count = 0; s->stopped_state = sdhc_not_stopped; + s->pending_insert_state = false; } static void sdhci_data_transfer(void *opaque); @@ -1095,6 +1096,13 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) } else { s->norintsts &= ~SDHC_NIS_ERR; } + /* Quirk for Raspberry Pi: pending card insert interrupt + * appears when first enabled after power on */ + if ((s->norintstsen & SDHC_NISEN_INSERT) && s->pending_insert_state) { + assert(s->pending_insert_quirk); + s->norintsts |= SDHC_NIS_INSERT; + s->pending_insert_state = false; + } sdhci_update_irq(s); break; case SDHC_NORINTSIGEN: @@ -1181,6 +1189,24 @@ static void sdhci_uninitfn(SDHCIState *s) s->fifo_buffer = NULL; } +static bool sdhci_pending_insert_vmstate_needed(void *opaque) +{ + SDHCIState *s = opaque; + + return s->pending_insert_state; +} + +static const VMStateDescription sdhci_pending_insert_vmstate = { + .name = "sdhci/pending-insert", + .version_id = 1, + .minimum_version_id = 1, + .needed = sdhci_pending_insert_vmstate_needed, + .fields = (VMStateField[]) { + VMSTATE_BOOL(pending_insert_state, SDHCIState), + VMSTATE_END_OF_LIST() + }, +}; + const VMStateDescription sdhci_vmstate = { .name = "sdhci", .version_id = 1, @@ -1215,7 +1241,11 @@ const VMStateDescription sdhci_vmstate = { VMSTATE_TIMER_PTR(insert_timer, SDHCIState), VMSTATE_TIMER_PTR(transfer_timer, SDHCIState), VMSTATE_END_OF_LIST() - } + }, + .subsections = (const VMStateDescription*[]) { + &sdhci_pending_insert_vmstate, + NULL + }, }; /* Capabilities registers provide information on supported features of this @@ -1273,6 +1303,8 @@ static Property sdhci_sysbus_properties[] = { DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, + false), DEFINE_PROP_END_OF_LIST(), }; @@ -1300,6 +1332,10 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", SDHC_REGISTERS_MAP_SIZE); sysbus_init_mmio(sbd, &s->iomem); + + if (s->pending_insert_quirk) { + s->pending_insert_state = true; + } } static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 4816516..0f0c3f1 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -76,6 +76,8 @@ typedef struct SDHCIState { uint32_t buf_maxsz; uint16_t data_count; /* current element in FIFO buffer */ uint8_t stopped_state;/* Current SDHC state */ + bool pending_insert_quirk;/* Quirk for Raspberry Pi card insert int */ + bool pending_insert_state; /* Buffer Data Port Register - virtual access point to R and W buffers */ /* Software Reset Register - always reads as 0 */ /* Force Event Auto CMD12 Error Interrupt Reg - write only */