From patchwork Fri Mar 31 14:44:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Herbrechtsmeier X-Patchwork-Id: 1763806 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-weidmueller-onmicrosoft-com header.b=IVb74aGe; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Pp33h21M3z1yYb for ; Sat, 1 Apr 2023 01:45:04 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 18F6885E80; Fri, 31 Mar 2023 16:44:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=weidmueller.onmicrosoft.com header.i=@weidmueller.onmicrosoft.com header.b="IVb74aGe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4F9B585E80; Fri, 31 Mar 2023 16:44:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eaf::60f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C6C8A85FB2 for ; Fri, 31 Mar 2023 16:44:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=weidmueller.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=stefan.herbrechtsmeier-oss@weidmueller.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gp+GtiQHEg8kXb5AbFV1X2Ws0JoU59zw/jIZf+kdO547MZ1KF581yma/7JtUuRRq17IEQ/tFvglwlfWRvFjMMq2UlxTZhLK0koSBl6Uex2aRGVxYHgyh7BrY8LIBP6SiiX5S9OZv19LJUXjABQ6Ig4yR+EzI6DDfalDh27GfqqAZiqsZzGbtPacL4JkTt8D/hoGlhjqHQeDlECl0qECihAnPCzkpvZnynmgrESl+oi+cb4obE5DX9pbDwUZLzlPr5vAAlo1uL/+Y5C42YzbcCfGQUMcSl0BgoJ0McRLzAHSpWC6ajEgC7xIolZqs+swe8/9gWDNmxBsjiTiK29xDcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yV6T60DcxR61EijdHBcn+k74l29BQyU3WmsNhMR8Moo=; b=ndz6ebAyrZuTxswdkIX88bL7X6sqASUziSliBg21EQBfCYqiiFWWQMVww5skQGAscxHCJqW35rSpVhaHFF/pJxDjO8I7FTXv9plEFCSSpBvi6h8UWmv+M+qvIhyBwH463QO5jRlxDKkSIYcbAbcpebIjjQoqR2hQMPDch5h5A4BEDlKas9nbRIKwY4Nf9C/i+EYIzcAOnrQ7QvAXp5HrXXHDTNZwhuUf1MzY/jyM6k+o9/VgBml55gQA66vWeKPBD+JNhwp5ANRh3zTm+A0mHILfqpyEImfsMAuUeAYqaw5uPSm1d328Qv92tX9CR7z02oxeKJdaHMvNdJAG2PKyRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=weidmueller.com; dmarc=pass action=none header.from=weidmueller.com; dkim=pass header.d=weidmueller.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=weidmueller.onmicrosoft.com; s=selector1-weidmueller-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yV6T60DcxR61EijdHBcn+k74l29BQyU3WmsNhMR8Moo=; b=IVb74aGerlzcLFSU0H0OahBAxw8KxFRPrXvpxPVyYtdwmHHAlS/pd3jS2YrtCUpq4jwKAsAco+C5GHLAg8Pueg0zP1hh/kL4vIcY4VCkcnVZ1h8dCDU7CipzwWkmD2+7HMIl0IEhcJbCRO0awyOV1MuaQCj24wzd6fioQVKKMr0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=weidmueller.com; Received: from PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) by DB9PR08MB9562.eurprd08.prod.outlook.com (2603:10a6:10:453::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.23; Fri, 31 Mar 2023 14:44:52 +0000 Received: from PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7789:9e19:9554:4717]) by PAXPR08MB6969.eurprd08.prod.outlook.com ([fe80::7789:9e19:9554:4717%2]) with mapi id 15.20.6254.023; Fri, 31 Mar 2023 14:44:52 +0000 From: Stefan Herbrechtsmeier To: u-boot@lists.denx.de Cc: Stefan Herbrechtsmeier , Jagan Teki , Michal Simek Subject: [PATCH] Revert "spi: zynq_qspi: Use dummy buswidth in dummy byte calculation" Date: Fri, 31 Mar 2023 16:44:40 +0200 Message-Id: <20230331144440.30575-1-stefan.herbrechtsmeier-oss@weidmueller.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: FR2P281CA0070.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::9) To PAXPR08MB6969.eurprd08.prod.outlook.com (2603:10a6:102:1d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR08MB6969:EE_|DB9PR08MB9562:EE_ X-MS-Office365-Filtering-Correlation-Id: b49f52e4-b160-4e09-a1ec-08db31f67c73 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e52xYSXwfq+fPhBqurWpl5WtvemPGflsOU3pBB9Oc0EYTqjJ/S/FCpN+OyvrmGFH8xptEvuBZqMlGeDtybSp4OQ+9AByXAevLHhxtxdTYKo+wimMbIpFDUKvnkWP6fZUyv5wAfEumfCfbjzHeHjvg74n4k5nShss7ISdQdGdexDb9Vk/JnciNA0422Frep70uMuDBQwgHwx7w8sLLaOSBu+aW4ehd6qArvEIfCzol0s3qHUati1p8zFoFYF/S+V4in84JZpRqeCFu/TuGpFtDtM3o4CTgdDomYUlXvAeZqgeDljwbBATm2biB3ai9hO3Rt7ftNZt8/AFh/ErKvFLV+4Ng5w3BsYXLmbY+pRfYEvnnKifba19yKSH1xSGiLPHV3IpNfOOK0s8tMAfUvdZDv1lR4hW2A6caUCgnhPX0V5e3W/dGGwksZVAMavE+yUzs4qbcC5s4IC7Ahl/I/ETttFvWAoQp/jgdD5PX+TAhQYDdfic7m2uKW6JfLNuS2dQqNHLszqXGvc3ik2lpcQUItiPqxCQHyiMr9wvKatqXAw/517varWW2Gm/P58F5GOQmuH/BA2YaDgW3ojk+Tbo4/vNXDEG4vNyH2NulP1/EoGOXIidjFY5IafOw++1O3f+ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR08MB6969.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(39860400002)(376002)(366004)(136003)(346002)(451199021)(41300700001)(4326008)(66476007)(6916009)(66946007)(66556008)(6666004)(1076003)(26005)(6506007)(83380400001)(54906003)(316002)(2906002)(6486002)(52116002)(38350700002)(5660300002)(8936002)(478600001)(8676002)(38100700002)(2616005)(86362001)(6512007)(186003)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z2gff2WSbBQkoJvLCTUv6/1jG3+EgTR/WXJy8zAh0Js2DrNFyiFhCAqPpufe7rNuHvb+UAlpPV2ow8T3Rp/7nBdEdxFABKlkpnwynLwMlXFLMmP/j/s9D1mWrrlvh2tHuW7pteKZKTUEizn6B8oNFpDIvY0nLK8UM62pQE43F7gXe+FLncV9y4ykmsFcgaxFUxKtH5W4vA1mVDUAphyxz8ZtBycCVUpwxxDOL3fKIaq4Nb1axbx00neB394k5S6xItsQddwuuHvOjNDfUFtnN263BL1b/vyOBUOyoWhf/yS1uoMZAo4Kwb2L96oCeVSJj9fSrN0EytS/09OUhwOJSGrIRyMKNh2D4+pdmUv/lWhVxYCDKq7QKfh0g9zgycUtPBgRP2spdVTGaSDaVzqprDIWAcJKnsWw25eDIVeLR4V31IjQ2mgui6osMJdsonaj4jd/xdxfL1ZhuajGVbhGpK4fW7Hm7km/W96K1jyGP11+EFGeKqZdCEO3GLnPOdVvNNgtNp3IBiMgn2mEPFx1yqBVtJZ4EB04L1pI7BpY0veu97LkJF1Ew9nO1rc0qJ18S8BZDvFhKt2SZciwqpia2UI/SAylcO/PdR/UMIV05+0DKWclOUhD2UESLVyvanqIw7w68oZEvcQ4bQgBz5sQdznjTAxnVz6cjyei7XHZE9fg8jEeWOI459lNL2WUtBiWqkbRpTzbXaUE/GImZmxVHoltd5L9hnxBNxkiXl/I9ZW95AbjHhlmnpSruTiOWce754e3oYBEeJSvnKI0+e4/Bp7GV7HgJpszteof3qzrxQ4P6K9Etf49YsnoL3ps8jBU2bNQRJomaIAGXzu2gJI5h/SbBGhK1IjE1mtrEjyLmC8QkAJR+UiVHTxC/bpcFDUuvwK92m3MJ0yh8S21zxLankutggIhi4Qy+xZO04nO6FySAqcVegXyIK8XCEueqTZIiSlvJSfplbYvM0d+/tzPndjzT+nTbcjXyk7xbmK8vMdBoX14gzFc6BTrDtu9dzmY2s5UnE+Z6km5tU2Si2KflFW9jf1+H4QaD7VxC0CTWQoWM+9dC+SR1V7VxGJVLg//YvW1sgXnxleF3P7/5w5IhAajOD9hjeWiyzMhZmQAUhiTYqLod8nC3Oyvu9hrP3sOSlxZfJWXR+OL2cxdcR+/S7nRZRfv3ubNnfNvS6X/fIumYzhAOYhKjRCnZ5oxknUm1FEpkji3+hXwTavL/zvq6374isCpPnviyl3Ku6xZYDIlusq0EFJEizfjkGDs5ecxYCla8p54uv+BEgGDximMth66q2PhuX+tyNOqJ6WWk870Yy8JU05RhV+j3aH9a7Z+fphsb5DsYirN4Z2SdEhkfMB+jpfpSDNIxRz7c3qSLaBdaP3r+vfMf+ezknYzxtCVpem/y2C4fm1uCfIAUQyqIsD8vV91yS/dBvK1kjZreX06bVWhSqO1O1GAt1GfgU3/8bB2JD/kzAO6C0EruDTL39gt32Vah1oVUruB9uM2zV76PPYyyghl8E/n+Lr92sz98SNcz760Fi9tAx6dg1GZsA9iWnSc/7Mv1ttqAAFBcyD0ZmheoQTgD26d0NpUxsH1XPVH8T6tKg2UzKL2iaX7NQ== X-OriginatorOrg: weidmueller.com X-MS-Exchange-CrossTenant-Network-Message-Id: b49f52e4-b160-4e09-a1ec-08db31f67c73 X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6969.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Mar 2023 14:44:52.3941 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e4289438-1c5f-4c95-a51a-ee553b8b18ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 20OGYv7XKP9r5uwO/W1hnJCfw/750bmIYtHZJaTy2K0/7V4sYXajpfpE9wwYp9oj8h2bF8xeK+KcPM1YnQlN9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB9562 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Stefan Herbrechtsmeier This reverts commit e09784728689de7949d4cdd559a9590e0bfcc702. The commit wrongly divides the dummy bytes by dummy bus width to calculate the dummy bytes. The framework already converts the dummy cycles to the number of bytes and the controller use the SPI flash command to determine the dummy cycles via the address width. Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Ashok Reddy Soma Acked-by: Ashok Reddy Soma --- drivers/spi/zynq_qspi.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -- 2.30.2 diff --git a/drivers/spi/zynq_qspi.c b/drivers/spi/zynq_qspi.c index 00e3ffcd1d..d1d4048966 100644 --- a/drivers/spi/zynq_qspi.c +++ b/drivers/spi/zynq_qspi.c @@ -676,7 +676,6 @@ static int zynq_qspi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) { int op_len, pos = 0, ret, i; - u32 dummy_bytes = 0; unsigned int flag = 0; const u8 *tx_buf = NULL; u8 *rx_buf = NULL; @@ -689,11 +688,6 @@ static int zynq_qspi_exec_op(struct spi_slave *slave, } op_len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes; - if (op->dummy.nbytes) { - op_len = op->cmd.nbytes + op->addr.nbytes + - op->dummy.nbytes / op->dummy.buswidth; - dummy_bytes = op->dummy.nbytes / op->dummy.buswidth; - } u8 op_buf[op_len]; @@ -707,8 +701,8 @@ static int zynq_qspi_exec_op(struct spi_slave *slave, pos += op->addr.nbytes; } - if (dummy_bytes) - memset(op_buf + pos, 0xff, dummy_bytes); + if (op->dummy.nbytes) + memset(op_buf + pos, 0xff, op->dummy.nbytes); /* 1st transfer: opcode + address + dummy cycles */ /* Make sure to set END bit if no tx or rx data messages follow */