From patchwork Fri May 4 15:59:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 908829 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="U5GR38iI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cxZ24Cmfz9s35 for ; Sat, 5 May 2018 02:00:42 +1000 (AEST) Received: from localhost ([::1]:35011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEd8R-0002e2-Ss for incoming@patchwork.ozlabs.org; Fri, 04 May 2018 12:00:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEd7b-0002bI-OD for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEd7Z-0001Wu-SL for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:47 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:39864) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEd7Z-0001Wj-Nf for qemu-devel@nongnu.org; Fri, 04 May 2018 11:59:45 -0400 Received: by mail-qt0-x243.google.com with SMTP id f1-v6so27972559qtj.6 for ; Fri, 04 May 2018 08:59:45 -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=cZB3q2MGhsMr/Chp0t+dwNNsFzETEC/4z4LnWruuBf8=; b=U5GR38iIQTfwYkWrmp1aLGnw3aDJonioPHbeQ4l6fG2ZQdEDImwqgLztWYaav//DAX o0Z/5zqtn1JpQ3T8BqAkxW8RyyX/qU3BkO+WB6hSqACdFnT2hHooa/Pc2VsihExu0lXN oM1fm+ncD2zKxKKWPo48QdO3DEqRhR9wGCaPqm4JUKbgtmFUJxkc1Pj/oPMy7uo38sUO 1Qyhz1jPGXgcOxvW8QvW09PEav4mGRxM1fJM6+uMRRR9/iCxL40pGWONIIbo1nEx4dlZ 1oeci1jC0acvXqeACWX1yAdu0JViGvaiQNHOPMLHYyHk4HtUzgLwJMpCfBdJ/ogBw7pu 0Mww== 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=cZB3q2MGhsMr/Chp0t+dwNNsFzETEC/4z4LnWruuBf8=; b=jVlgCbR3iyXIVlPWANlyNrweiTdS7etl0a9/DKATkNN6pljZyAp95O1a5hFdaXGFkQ j/R6FV3YT+r01I/F6cy8ve7+7amdrWr9/c9BnczEiwV+/t/5oyemVkZbr0pkaQ6ZuGEG 0/KMKcVYIFv2WvVOgGEqEkm6p/9FBeCiwrdcM4h5/NYoGNfbQyn7cpeuKFanOzyDX4Pa sv5nEs6euWGKe1H0RiuPUmzXUQQ9oHMplP3CbGLbT7b2jnYpXmMDTEVG73qdimG6ub2W ojeAjZrfN4zQO1RchetHYeT7YPZhye8NUVbT7I+CXzplbIDDDxB8NYELSuCuv9TJ5RoF 33BQ== X-Gm-Message-State: ALQs6tCEMSgrIYeVxTsr88NkuazPfWCfRucjYzcMw5g9ZB9V4rJxA168 o6SwY7nuvyUUdDGBv//B5TbvO1nx X-Google-Smtp-Source: AB8JxZrVxSUsqAhqR/vc8fdewgO3E/eBt4AdBVuX6eHsFJ9/xMVv0EzxDBDhGoeOBwKUao1U4DRvkw== X-Received: by 2002:aed:3704:: with SMTP id i4-v6mr23646930qtb.234.1525449585151; Fri, 04 May 2018 08:59:45 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id a83sm8587066qkb.22.2018.05.04.08.59.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 08:59:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , "Edgar E . Iglesias" Date: Fri, 4 May 2018 12:59:04 -0300 Message-Id: <20180504155918.21287-7-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504155918.21287-1-f4bug@amsat.org> References: <20180504155918.21287-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 06/20] sdcard: Add a "validate-crc" property 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: Alistair Francis , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?b?RGF1ZMOp?= , qemu-devel@nongnu.org, Michael Walle , Stefan Hajnoczi , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since not all modelled controllers use the CRC verification (which is somehow expensive), let the controller have a configurable property to enable verification. So far only the Milkymist controller uses it. This silent the Coverity warning: "Code block is unreachable because of the syntactic structure of the code (CWE-561)" and fixes the following issue: - CID1005332 (hw/sd/sd.c::sd_req_crc_validate) Structurally dead code Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/milkymist-memcard.c | 1 + hw/sd/sd.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index d8cbb7b681..04babc092f 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -278,6 +278,7 @@ static void milkymist_memcard_realize(DeviceState *dev, Error **errp) blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; carddev = qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk, &err); + object_property_set_bool(OBJECT(carddev), true, "validate-crc", &err); object_property_set_bool(OBJECT(carddev), true, "realized", &err); if (err) { error_setg(errp, "failed to init SD card: %s", error_get_pretty(err)); diff --git a/hw/sd/sd.c b/hw/sd/sd.c index be75e118c0..801ddc2cb5 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -93,6 +93,7 @@ struct SDState { /* Configurable properties */ BlockBackend *blk; bool spi; + bool validate_crc; uint32_t mode; /* current card mode, one of SDCardModes */ int32_t state; /* current card state, one of SDCardStates */ @@ -496,10 +497,12 @@ static bool sd_verify_frame48_checksum(SDFrame48 *frame) return crc == frame->crc; } -static int sd_req_crc_validate(SDRequest *req) +static bool sd_req_crc_validate(SDState *sd, SDRequest *req) { - return 0; - return !sd_verify_frame48_checksum(req); /* TODO */ + if (sd->validate_crc) { + return sd_verify_frame48_checksum(req); + } + return true; } static void sd_update_frame48_checksum(SDFrame48 *frame) @@ -1685,7 +1688,7 @@ int sd_do_command(SDState *sd, SDRequest *req, return 0; } - if (sd_req_crc_validate(req)) { + if (!sd_req_crc_validate(sd, req)) { sd->card_status |= COM_CRC_ERROR; rtype = sd_illegal; goto send_response; @@ -2134,6 +2137,7 @@ static Property sd_properties[] = { * board to ensure that ssi transfers only occur when the chip select * is asserted. */ DEFINE_PROP_BOOL("spi", SDState, spi, false), + DEFINE_PROP_BOOL("validate-crc", SDState, validate_crc, false), DEFINE_PROP_END_OF_LIST() };