From patchwork Tue Feb 6 19:14:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 127082 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3208833ljc; Tue, 6 Feb 2018 11:24:13 -0800 (PST) X-Google-Smtp-Source: AH8x226kBKA7ONvWSuChZr84s1PZzxDj6ix1UgmsfVbbiTFlENvPwNM8LxjULsRHNDcmA0LlubWK X-Received: by 10.13.250.70 with SMTP id k67mr2235509ywf.79.1517945053705; Tue, 06 Feb 2018 11:24:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517945053; cv=none; d=google.com; s=arc-20160816; b=mcyNF9OE9UyzjETaBYvSK1627B3tUoEPoV8Qfwik2monlvIsq0Wlrg4YwNJluFu+5P j/55RQAbSop52mTveYR/ixe3h6lzRIRmVaYJ0ZSOEAOElsvtx0VMUGuR40bcLVnNc2ec ohB+gqV01LDJITOW716HBrryEUTWzZdG9ARmTymhNyTbX3C36toBMBiKbcqIfOxQqzGz OmAI5+PYSuQucx9B/gvgs67spE66U8Idm7Mw2yPwweRSFawT7fjnTaYTWJCpF5+1U5ha uBs93bg2qJKzS8BiE61/jtzXJ9qvTPBsDxsd0DXNEB9d42D+bJy2bUSjd2d4QRuJYrlk 77vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:message-id:mime-version:references :in-reply-to:date:to:from:arc-authentication-results; bh=g300N1vNDs0tfPIzJLomU3KXynx6mHBO79k5qHlP5AE=; b=xXeVeiSyfrbPz/jkYcb/u37MV6fOtzqqnxwGs4ybbG37ziJQ3hPi5c+CTWMiSwJ6vi hJ3Zo2GrmbIfB8ni1aN77a3yzYZRMvSseZZfF/HmCsvhwEikxptI21es4gksxRUqrPDI fyuUwhaQOmWEl0BVYiZJs4VbuH/9syRjONgrcgyC+16PIh/RhwbCbdbRu7kQj7+JzkLe BjmJHomrqXtij+rx2kN/8WuCZgWQkc3i85BZH23AB9FyjC1y4O4ryNuXBosufBlltRFx aJussetQfQj4cnY+LkjGoP2ImHYOEcPExUVH1K5uLu3IV3tGU0c7w7oltV4P+rvlqQXb BUqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g14si1987581ybk.206.2018.02.06.11.24.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 06 Feb 2018 11:24:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from localhost ([::1]:53369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ej8qj-0003Uh-23 for patch@linaro.org; Tue, 06 Feb 2018 14:24:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43762) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ej8id-00059v-PB for qemu-devel@nongnu.org; Tue, 06 Feb 2018 14:15:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ej8ia-0007sn-0o for qemu-devel@nongnu.org; Tue, 06 Feb 2018 14:15:51 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:43790 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ej8iZ-0007s9-R3 for qemu-devel@nongnu.org; Tue, 06 Feb 2018 14:15:47 -0500 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w16JEKow078915 for ; Tue, 6 Feb 2018 14:15:45 -0500 Received: from e15.ny.us.ibm.com (e15.ny.us.ibm.com [129.33.205.205]) by mx0a-001b2d01.pphosted.com with ESMTP id 2fyj92099x-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 06 Feb 2018 14:15:44 -0500 Received: from localhost by e15.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Feb 2018 14:15:43 -0500 Received: from b01cxnp23032.gho.pok.ibm.com (9.57.198.27) by e15.ny.us.ibm.com (146.89.104.202) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 6 Feb 2018 14:15:40 -0500 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w16JFeFa43188452; Tue, 6 Feb 2018 19:15:40 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B3690AC03A; Tue, 6 Feb 2018 14:17:00 -0500 (EST) Received: from localhost (unknown [9.80.97.150]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP id 75343AC03F; Tue, 6 Feb 2018 14:17:00 -0500 (EST) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 6 Feb 2018 13:14:36 -0600 X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180206191515.25830-1-mdroth@linux.vnet.ibm.com> References: <20180206191515.25830-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 18020619-0036-0000-0000-000002BA0ABF X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008485; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000248; SDB=6.00985885; UDB=6.00500282; IPR=6.00765253; BA=6.00005813; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00019407; XFM=3.00000015; UTC=2018-02-06 19:15:42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18020619-0037-0000-0000-0000433F8132 Message-Id: <20180206191515.25830-16-mdroth@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-02-06_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802060241 X-MIME-Autoconverted: from 8bit to quoted-printable by mx0a-001b2d01.pphosted.com id w16JEKow078915 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 15/54] hw/sd/pl181: Reset SD card on controller reset 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: Peter Maydell , qemu-stable@nongnu.org, christian.ehrhardt@canonical.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Since pl181 is still using the legacy SD card API, the SD card created by sd_init() is not plugged into any bus. This means that the controller has to reset it manually. Failing to do this mostly didn't affect the guest since the guest typically does a programmed SD card reset as part of its SD controller driver initialization, but meant that migration failed because it's only in sd_reset() that we set up the wpgrps_size field. Cc: qemu-stable@nongnu.org Fixes: https://bugs.launchpad.net/qemu/+bug/1739378 Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-id: 1515506513-31961-2-git-send-email-peter.maydell@linaro.org (cherry picked from commit 0cb57cc701839e7358918d5f2922ccbc04d28d17) Signed-off-by: Michael Roth --- hw/sd/pl181.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.11.0 diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c index 55c8098ecd..3ba1f7dd23 100644 --- a/hw/sd/pl181.c +++ b/hw/sd/pl181.c @@ -480,6 +480,10 @@ static void pl181_reset(DeviceState *d) /* 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)