From nobody Tue Oct 28 12:37:20 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151501614597093.02076779985225; Wed, 3 Jan 2018 13:49:05 -0800 (PST) Received: from localhost ([::1]:38271 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWquH-0000ED-8J for importer@patchew.org; Wed, 03 Jan 2018 16:49:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWqYJ-0003JM-Ot for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWqYI-0000Pl-Kd for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:23 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:44080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWqYI-0000PO-F6 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 16:26:22 -0500 Received: by mail-qk0-x242.google.com with SMTP id v188so3247829qkh.11 for ; Wed, 03 Jan 2018 13:26:22 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id a19sm1104402qtj.74.2018.01.03.13.26.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 13:26:21 -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=EFCLzoa9sqzWeJnmifImjFUgn4N8+odcL9WoXEr3M+E=; b=eCOjBo+nWfoPltq/uUvSadVpeHqb878oTO/BaVgRXLE359wZ6nZNl3Y5edZz1Kgfor 34piY3diLjKBlngZrlwZjDoiOfQYWcUENjcW1hpOBvy346crvN9YwlMlBtKRUxTQ28rs QnQXJ3QSrW3YC/bN9NPJeOn8SNouRLQb34Q7uEP562mbBbw+8+46KBzCrcS41jBDDbgH lIL6KIN03WnLaWbgPrMMgTuPPEurgGoUr6Cf0iNTiaimX1a2T1LkZFO++JzO1Kzu3p2H 7H7K1QLvnAuuvz5AGgl4pabVElQ7qEBk53V6OUWIO5oq/LycsyQAaXKSbwUgy5jh5WjX ISbw== 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=EFCLzoa9sqzWeJnmifImjFUgn4N8+odcL9WoXEr3M+E=; b=qjR8qs4h9+t9VEF4TtBkn1IkajQq55AAt8zQbMZ/vwDUS1gmF6xEcqg7K7+E5UGBJL pjx4lZ/nWuWnwAQxpO5Oow2YgPLv4lPWAdJdafpcRtK3r1msNBpvLAAPozgmxpfVzz0f 9tJIQX4CvZxDyf6dxySGZVi644iyjzYyG2MML2cvE5dHKMMk/vNTGFw1BDrYFvqD5X6b YJ977qtAFZN3lrNhdLYJoopqu1WLosLO3ymj9WOb1T85xdhN/YHrlT7sL05cs0Ehbk5z WAum9QKWuP82Q6yMNa8bp2WLe6rTWH17P9XSUvUTDTCPBkMmD182Ep/MaNha1Yx9ZL+C aCaQ== X-Gm-Message-State: AKGB3mKmZ8Bh7rtSTjSxA4meZUSiSMoWYslsU+U2VIgWKhEj6hNVVPjE W5ZzZiKApFQlzdKKPB/o+mw= X-Google-Smtp-Source: ACJfBovh/vOjo20LNq99MERy1rzUUvVfdj8tOGObhX9VbgVHyVOeIJzqvKDPBr8RgzWm78OLMeTaaw== X-Received: by 10.55.76.10 with SMTP id z10mr3632898qka.346.1515014782084; Wed, 03 Jan 2018 13:26:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Igor Mitsyanko , Andrew Baumann , Olbrich , Andrzej Zaborowski Date: Wed, 3 Jan 2018 18:24:33 -0300 Message-Id: <20180103212436.15762-23-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103212436.15762-1-f4bug@amsat.org> References: <20180103212436.15762-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v2 22/25] sdcard: remove unreachable SPI commands 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" , Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paul Brook , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 we already checked in sd_do_command() with cmd_version_supported() if the command is protocol supported (returning ILLEGAL if not). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sd.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 0e4871869f..16199cd886 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1071,8 +1071,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) return sd_r1; =20 case 2: /* CMD2: ALL_SEND_CID */ - if (sd->spi) - goto bad_cmd; if (sd->state =3D=3D sd_ready_state) { sd->state =3D sd_identification_state; return sd_r2_i; @@ -1080,8 +1078,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 3: /* CMD3: SEND_RELATIVE_ADDR */ - if (sd->spi) - goto bad_cmd; switch (sd->state) { case sd_identification_state: case sd_standby_state: @@ -1095,8 +1091,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 4: /* CMD4: SEND_DSR */ - if (sd->spi) - goto bad_cmd; switch (sd->state) { case sd_standby_state: break; @@ -1110,8 +1104,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) return sd_illegal; =20 case 6: /* CMD6: SWITCH_FUNCTION */ - if (sd->spi) - goto bad_cmd; if (sd->mode =3D=3D sd_data_transfer_mode) { sd_function_switch(sd, req.arg); sd->state =3D sd_sendingdata_state; @@ -1122,8 +1114,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 7: /* CMD7: SELECT/DESELECT_CARD */ - if (sd->spi) - goto bad_cmd; switch (sd->state) { case sd_standby_state: if (sd->rca !=3D rca) @@ -1224,8 +1214,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 11: /* CMD11: READ_DAT_UNTIL_STOP */ - if (sd->spi) - goto bad_cmd; if (sd->state =3D=3D sd_transfer_state) { sd->state =3D sd_sendingdata_state; sd->data_start =3D req.arg; @@ -1264,8 +1252,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 15: /* CMD15: GO_INACTIVE_STATE */ - if (sd->spi) - goto bad_cmd; if (sd->mode =3D=3D sd_data_transfer_mode) { if (sd->rca !=3D rca) return sd_r0; @@ -1358,8 +1344,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, S= DRequest req) break; =20 case 26: /* CMD26: PROGRAM_CID */ - if (sd->spi) - goto bad_cmd; if (sd->state =3D=3D sd_transfer_state) { sd->state =3D sd_receivingdata_state; sd->data_start =3D 0; @@ -1528,9 +1512,6 @@ static sd_rsp_type_t sd_app_command(SDState *sd, SDRe= quest req) sd->card_status |=3D APP_CMD; switch (req.cmd) { case 6: /* ACMD6: SET_BUS_WIDTH */ - if (sd->spi) { - goto unimplemented_cmd; - } if (sd->state =3D=3D sd_transfer_state) { sd->sd_status[0] &=3D 0x3f; sd->sd_status[0] |=3D (req.arg & 0x03) << 6; --=20 2.15.1