Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0D2DC4338F for ; Wed, 28 Jul 2021 12:50:30 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF55060F9C for ; Wed, 28 Jul 2021 12:50:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EF55060F9C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B67B482C54; Wed, 28 Jul 2021 14:50:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VTL8+BmS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31E8282C71; Wed, 28 Jul 2021 14:50:26 +0200 (CEST) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8724E829F8 for ; Wed, 28 Jul 2021 14:50:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-ed1-x52d.google.com with SMTP id f13so2976487edq.13 for ; Wed, 28 Jul 2021 05:50:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tyoize1QyjhEQFXC97h5bylNvK0N360dqyIzUOqEu1I=; b=VTL8+BmSIx8304GIb269ep74l/u2BETwTJB93bS81a8AgVe/UGhWDu7H8Un9cQboWp 2LGiQHK/TFfAOa/ZhFqHavPRNI0M9WABhVykK7MrQGjMKvKwNY54a/Z3WQk2ApQzZDRD bE+KRPNzCqfdaEaNWabZJlkDYv4wmKhGgo6m+oviZ99VY1i5uHvXTqUHt1ukViesKMQy F27YMZAGLk8AHLdsjMqpx4Wh5oWsEIAOhosEGdFbJG5eb6vGIs3FVqptINoOWUBT030L D/KdTpYGxR9+hAf7IsQYaT9NInF1EZ5978/d52Bu961u3f+p31KVbpxeRLw+3vFuZHiP I8XA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tyoize1QyjhEQFXC97h5bylNvK0N360dqyIzUOqEu1I=; b=joiTQJLkGW4uhKFh9+bxgBZOoF30hcXbZ+WbOJ5Npeafy5jvI5A7JnqaRuBxW0Dx8+ EjvSBHAOzjFCG4Z+HeLmXnHjUEQ8uuI62SlixlLqgVSDrtHB/2J0nMVR3+sJqBfsNkIk IPTWGxyf+zWGo76lOLJ5BUgA9Y7oq2U07M/eKTel8ztemRc3ELyZxJKO3PLMdma/8mIQ oLNXJLg20niruDk//hB1sR+fMKh/BceJpYNy5Z4kknMZNMy0r95isHMF2E8S0fqa+z5q Nch7+0o3O37G1dcZkvyqDDoqd2upgm12vg69x7xRot8/PvwVnc0ZywTiIH7qcWrfd9+D esHg== X-Gm-Message-State: AOAM530L+3lc0ai5Ax3mgcb84yZ46blh5EkUp3F83M8A1jfrJfg6JR6a QBDrXx0nEjEup7MW+UGERk4= X-Google-Smtp-Source: ABdhPJwz47nKMYcZ8dtfOdrnVenZmeF0bpM0bDJa2EiC3q9Q3FhOMyv3uO1KEXcOUzDHYnFSlPuk8w== X-Received: by 2002:a05:6402:3592:: with SMTP id y18mr14532996edc.288.1627476623278; Wed, 28 Jul 2021 05:50:23 -0700 (PDT) Received: from pek-vx-bsp2.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id n16sm2381165edt.31.2021.07.28.05.50.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 05:50:22 -0700 (PDT) From: Bin Meng To: Jagan Teki , Vignesh Raghavendra , u-boot@lists.denx.de Subject: [PATCH] spi: spi-mem-nodm: Fix read data size issue Date: Wed, 28 Jul 2021 20:50:14 +0800 Message-Id: <20210728125014.536900-1-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean When slave drivers don't set the max_read_size, the spi-mem should directly use data.nbytes and not limit to any size. But current logic will limit to the max_write_size. This commit mirrors the same changes in the dm version done in commit 535b1fdb8e5e ("spi: spi-mem: Fix read data size issue"). Signed-off-by: Bin Meng --- drivers/spi/spi-mem-nodm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c index a228c808c7..77ddb19a9f 100644 --- a/drivers/spi/spi-mem-nodm.c +++ b/drivers/spi/spi-mem-nodm.c @@ -93,12 +93,14 @@ int spi_mem_adjust_op_size(struct spi_slave *slave, if (slave->max_write_size && len > slave->max_write_size) return -EINVAL; - if (op->data.dir == SPI_MEM_DATA_IN && slave->max_read_size) - op->data.nbytes = min(op->data.nbytes, - slave->max_read_size); - else if (slave->max_write_size) + if (op->data.dir == SPI_MEM_DATA_IN) { + if (slave->max_read_size) + op->data.nbytes = min(op->data.nbytes, + slave->max_read_size); + } else if (slave->max_write_size) { op->data.nbytes = min(op->data.nbytes, slave->max_write_size - len); + } if (!op->data.nbytes) return -EINVAL; -- 2.25.1