From patchwork Wed Feb 24 22:47:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Baumann X-Patchwork-Id: 8414901 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 669DFC0553 for ; Wed, 24 Feb 2016 22:48:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AB01D20361 for ; Wed, 24 Feb 2016 22:48:29 +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 E2E5220266 for ; Wed, 24 Feb 2016 22:48:28 +0000 (UTC) Received: from localhost ([::1]:38860 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYiEO-0003bs-1t for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Feb 2016 17:48:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYiEE-0003bN-OE for qemu-devel@nongnu.org; Wed, 24 Feb 2016 17:48:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aYiE9-00048P-Lh for qemu-devel@nongnu.org; Wed, 24 Feb 2016 17:48:18 -0500 Received: from mail-by2on0129.outbound.protection.outlook.com ([207.46.100.129]:14010 helo=na01-by2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aYiE9-00048K-5i for qemu-devel@nongnu.org; Wed, 24 Feb 2016 17:48:13 -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=k3d0G2SUWAfe87j6SURIaBVbfQ1VJbjmFJFdaTMmSYs=; b=TmLyEDR1tPm6DtEebFjbrQBf724UoRqYZ1b4s9WaIo1liOJB8tv869lHHBYcgSqPvnye9pyxrdQWqD8qgbX3d/PkaWJYePR+Dr8Ze1NCSs35lj2VdwXcY7LraGbiWkOPwAc1+ZZAXjl74RbqG1h2y1DOqbiOld4o16d4++gO9rU= 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:d::724) by BLUPR0301MB2036.namprd03.prod.outlook.com (10.164.22.26) with Microsoft SMTP Server (TLS) id 15.1.409.15; Wed, 24 Feb 2016 22:48:10 +0000 From: Andrew Baumann To: Date: Wed, 24 Feb 2016 14:47:54 -0800 Message-ID: <1456354075-8424-2-git-send-email-Andrew.Baumann@microsoft.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1456354075-8424-1-git-send-email-Andrew.Baumann@microsoft.com> References: <1456354075-8424-1-git-send-email-Andrew.Baumann@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:d::724] X-ClientProxiedBy: CO2PR05CA041.namprd05.prod.outlook.com (10.141.241.169) To BLUPR0301MB2036.namprd03.prod.outlook.com (25.164.22.26) X-MS-Office365-Filtering-Correlation-Id: d74c9b64-1784-4f81-b0e4-08d33d6c924b X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2036; 2:n8chBGgaCOOZBSpoqTa36uTkoVl2zqRAvfqoFSlbQQru5t8A62l/dbkLD1dj3tsgTzQz4AK/SZ6mhpS/0P2LQEBdVOokgX9MU54lXF9lwM9mAiqfCC24reTFrfEt9Slrw4s2EYnUGF37noEacaRslqQ8nkR7+nPZfM3JRCZ81YIPBI5tWLSbCxyRNO9w3Zxe; 3:UIOXBg5pIbowH1crKRubzZQcOYxlrO5MpPhAOtZ5tcEHKNWGvSk3gZn3oiij4V4V0yaFt1NkkWxev0PH+KGRulIloyctFgwo3niRDkOpAja9FoSm/X7C+MmFO5uJ2Vp8; 25:LAqM6eESPy//iscj+K5oL7D3KN8mVA0kDXzMoIqf0Js/tx8N2BnatMqAR55IXEE8Yl+iYjE10UyhBvFTE0X6xL9Fu9+OxbjpnmnAIz18BfjCtEjzL57Ihy15trO3j1psBTmbsOhrLs2R/+vs0Ey/Z+wsumyXgRPyzt0DNAqePgCLnekGW3smajq8GxW27Z/2fwJr9GuXP4nCeiA1LcywqvZ82SRcPxEcM4TLADU28JBsRlFxjtxqm57lPBN1ubaQj7LImCf84PAjNpYm8W3qFmIXXOs1wnFCoRjUXHfU4KF+rxypCBcY3dOr51uqAgEwQe2YZ6241Rxy9DGLTAaBAA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR0301MB2036; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2036; 20:BFLF01WjNYKwnATUsaZUlQfnB0JKWVkdpX+pGKZo0N3YBTeatKor7SLpBEAf+UinjtriwwBLPom4v6NBIaEQ3Q23FwK5VZ50Mn9YkQB3beRpsupWilt3ID+W+QOfO+CSYmgzoaqJZ/pGe0ZxHvzaGcXxNHP5HHewmanjzQFKiuDcjTPqGhzBmZdDHvNFOD7cRRp/OpFF7MwtbLfavA/naUkcw/xDlVePAAI0F7JpIMB9NrxQ6E8aTabjM8vKhshmth9osXJ0iayfRY4zSugz1Hk938h9sfDjmWb7qZ0zwTIpkiX2iXdBw5qQpLhXXWniIBMLivzFuHTTasEOYSr7lCePBDD5SXBTQW8odWCAIwxj4uc4ZoAGOs+Bo3eT89wfC5WK2gENMgEY2Ke5QH952zJ1SToYnqliXd0IY9a+ZPL8KbP43j4lbGBG53U9GbBbTtJ9E0aA9mrgSHpwGsVUutSYQisBWBrHdR6e/yObR1x0VuxGI2UP8tqZpKxnCJQ0; 4:nlDtfrkryiAbQiJbAluWZazp4krFQURcfJLvTPFL+SZEu/a44PyPuwwWSD6iluo0U4bbVCojbcQkUl5p5rngtuS+fW9gHjOeGNhkocUOom3VmbqJsfMFw+M7JMvuX60ojYRg7jALqCLiwEaVh6ctHA2ZWUhhUwONb5m0AbBB/x45eMdUxuWfMt1vs+DDjTRXYZinv/tMu3890sX+ye4LkCiMyfg3aI9YbbEWQcJUFKcjEkFXeBZ3ZzqXbhmgs/+3c7sCszKQA04irl1I3ButghLrTKB1FT9To6zjOkW0IuBgGcWX9xex+1IBC/J5MBKeGp+KZdGs/qLay7lyxDtEIWgbgnrUcJC9hA65FfHEZt+B4xV74VOnQDq1tSmP+vPf 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:BLUPR0301MB2036; BCL:0; PCL:0; RULEID:; SRVR:BLUPR0301MB2036; X-Forefront-PRVS: 08626BE3A5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(42186005)(50986999)(76176999)(189998001)(107886002)(5001960100002)(110136002)(87976001)(1096002)(36756003)(4001430100002)(47776003)(5008740100001)(2906002)(4326007)(586003)(5004730100002)(48376002)(50466002)(6116002)(50226001)(229853001)(92566002)(2351001)(40100003)(5005710100001)(122386002)(86612001)(5003940100001)(2950100001)(77096005)(10090500001)(19580405001)(19580395003)(86362001)(10290500002)(7059030); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR0301MB2036; H:baumann-desk.redmond.corp.microsoft.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0301MB2036; 23:5j/F5qijP77SLuIR1vj64JKLCUmtPd8LIbaUSx4?= =?us-ascii?Q?va+D55iJQqDvmY8gyHfJ3zOaYjADOBIgYiaWsdH9iad71yhn9bPxZprjqSmo?= =?us-ascii?Q?P9Avieyo8wHt2zXHru7Y+VXIlZrbXE/xktyfcJKw27jLJNjvETWqft/vtxJh?= =?us-ascii?Q?rkCh2ClP5Omph8WiiLd53HNreM4qDJXtl8EbkX7ykNT6yhMEm9zrrB5lfMkL?= =?us-ascii?Q?KnCNOiWVfWV8pJ8ZPGiYSBS6xKmSaPzgDSmrdEnD5yl1skqywWdnmf0iDhqQ?= =?us-ascii?Q?90WSnsAPbUKw09IArU63defTQoLWvDO2/CWLWoRPX3O4uYia4cm2kdn4ib6p?= =?us-ascii?Q?ZzDsYukVZoUDOGO6/7EczUi8JVdRZb73nBiYJEvBjEZr72oGN76QqzZ8P0dX?= =?us-ascii?Q?YGxNYT473MH6OePA3rY7XSAVtlw+6EexZkJD0toQDlm5HMIOVABxxd5fF0uj?= =?us-ascii?Q?sKw/G9IV/AlkmlzRd8+rkS2x7ahzZXmSGFgVMJfJWlNHbw4TjyU3VdCYk7pw?= =?us-ascii?Q?fOslG9wT1k+F0mjcNT8Xmt7MHF9jNyHHWoaYE8wmsLrbAXNuWdehEHpyIql0?= =?us-ascii?Q?Q3EGWf24+N4RDkYRW0Iw1eP8TToBqWG4X8A7l6Te+QmC1jkWAGH5KwvMCOwC?= =?us-ascii?Q?F+RJMuTPU/8eav0VSrJKKsERQtTZr27Z6SLgzseSo1p9XrUkbyuQV+LtKyc+?= =?us-ascii?Q?iHEib11RPtrdCg3+N/VoYDAQHh9IAKRqHnKfNIec2etnvDC1yUoo0RMNuXV0?= =?us-ascii?Q?/cACKFRFrh5m8WpsKjO3lXTHsF0r+fMzyO9E5TS92r1CjanP76sKNLubkVqG?= =?us-ascii?Q?FTVHSWGM4ygckchedL1Ac81SSRIxhvBLECSvBNjr3IaClhFtK9MiYeeZm24J?= =?us-ascii?Q?rCXDT0TQe+/4GCy7EPv2dMw89ArVfgp0QUTuNHdLKN3Nh6ti5XVTRnoLnz6U?= =?us-ascii?Q?Em5tCHLLGLEIVotxWStmikYC0f+FkNRasTSDGWaC53wltojEhlVvoRHNL2T2?= =?us-ascii?Q?l5xe9OFmB0g12Wn3VXw7TwnuCmVU60IJv4+h0R1sk9mL4c9r8sw0w5I8MiDv?= =?us-ascii?Q?sXkIwXknJ8JQQM5SsxR2mgu+rUb/R?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0301MB2036; 5:4n9yg5jb2fzz6793DzFaHKWsG+gEjRDHvwaTJfvpT4WAwzIrUCA/5dxi9YK1E6OIls7/1FPOpo7Gs8MKd88cnvdnsvsssXI6oFcQqXxPieiYpvFiA/jkKqW2jKtsb7rDCzxfVZzxm4lLs0kofLBVgA==; 24:ncudxp1qmTrKeyzTG2oTrZgok/wI63PF66UODkdrhK4122Wst7SXymDINB3Tj3aU3kdLoo1svEpw6SrIHpkf5w8zk/QHenap4RZ6cUUf/8I= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2016 22:48:10.2536 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR0301MB2036 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 207.46.100.129 Cc: Peter Maydell , Igor Mitsyanko , Andrew Baumann , Sai Pavan Boddu , Peter Crosthwaite , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v3 1/2] sdhci: Revert "add optional quirk property to disable card insertion/removal interrupts" 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=-6.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 reverts commit 723697551a7e926abe7d3c7f2966012b8075143d. This change was poorly tested on my part. It squelched card insertion interrupts on reset, but that was not necessary because sdhci_reset() clears all the registers (via the call to memset), so the subsequent sdhci_insert_eject_cb() call never sees the card insert interrupt enabled. However, not calling the insert_eject_cb results in prnsts remaining 0, when it actually needs to be updated to indicate card presence and R/O status. Signed-off-by: Andrew Baumann --- hw/sd/sdhci.c | 9 +++------ include/hw/sd/sdhci.h | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 73e7c87..f175b30 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -198,11 +198,9 @@ static void sdhci_reset(SDHCIState *s) * initialization */ memset(&s->sdmasysad, 0, (uintptr_t)&s->capareg - (uintptr_t)&s->sdmasysad); - if (!s->noeject_quirk) { - /* Reset other state based on current card insertion/readonly status */ - sdhci_set_inserted(dev, sdbus_get_inserted(&s->sdbus)); - sdhci_set_readonly(dev, sdbus_get_readonly(&s->sdbus)); - } + /* Reset other state based on current card insertion/readonly status */ + sdhci_set_inserted(dev, sdbus_get_inserted(&s->sdbus)); + sdhci_set_readonly(dev, sdbus_get_readonly(&s->sdbus)); s->data_count = 0; s->stopped_state = sdhc_not_stopped; @@ -1275,7 +1273,6 @@ 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("noeject-quirk", SDHCIState, noeject_quirk, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 607a83e..4816516 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -76,7 +76,6 @@ typedef struct SDHCIState { uint32_t buf_maxsz; uint16_t data_count; /* current element in FIFO buffer */ uint8_t stopped_state;/* Current SDHC state */ - bool noeject_quirk;/* Quirk to disable card insert/remove interrupts */ /* 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 */