From patchwork Thu Jan 23 20:16:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagar Shrikant Kadam X-Patchwork-Id: 1228554 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=selector1 header.b=AYvH+b5i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 483YVL3nRpz9sPK for ; Fri, 24 Jan 2020 07:17:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9727281976; Thu, 23 Jan 2020 21:17:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.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=sifive.com header.i=@sifive.com header.b="AYvH+b5i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8A58281961; Thu, 23 Jan 2020 21:17:00 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on20605.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e88::605]) (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 5FF238180B for ; Thu, 23 Jan 2020 21:16:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sagar.kadam@sifive.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K2dU9nUdqkrmf3yDT9VJWLr4/UT3S/cIVEzDQYnNFUMOX6LqIDZiKaTxMDxTnh6V2vxIJjd8znZBi7gVu7wsFHn1L8ytpjH8NKmB/rBrTYJY7+X/lu6Cakf2ayZ75C0hKLRJQ+k/9M++zhmV3IU2Xa7LnP34UQ5sGCvApp+cZvfnkJHeltm820kkM1W5Oh4O8Uh5tdkddquUM2ZyXU5iy+LNY7c75qvMxZqVzL0D1Rmmy7PX1N/bs/wCDMT6pyctfe/W3PGdFYjy3nnH14a0MDoWOu6eXNaEkgKE/EnQ6liMO5j2pPsN8f1UNvWzWOBfJe4BmqMuBeJemYnYVEfh5Q== 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-SenderADCheck; bh=Zt+nU/iFwBFt3xLHkxcTWTnBqiWupKHpIgTPfS9PHfk=; b=gTfqggc84g5b7ObQXz12AerFtjMqgNpSABqEkA5vLaCCs7Fah1QAxPwgTRc8YQ7Vk/YbMkrZfUg2/w3yPAu2m536w7aqURYuc/RHY+MvrHt0jAT1E6BdZS5T20AhEyhfPGmDc96kud/xruFXTnlScZJ1LjvQRvUv/ueIYT/EQUP3lBVDw4CB1nC1nQmrOPsFWyRWMMiG+ifLMjjNEvaxMfC6OdASN51+NaSzQUXIbns9ZM6gsHvaOJeDes1fhj2F5JUT0xkPLGyskgJFLe7ei7LOHevcWcH22c9fFSDGj9KpkdCzoesks1BWPY4O0nuQh1v5TaYXZqPZWDIowE1vNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sifive.com; dmarc=pass action=none header.from=sifive.com; dkim=pass header.d=sifive.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Zt+nU/iFwBFt3xLHkxcTWTnBqiWupKHpIgTPfS9PHfk=; b=AYvH+b5iRR4OkunbasQzazf4gH97UOZ9r6K2v71A5t9f5UEWQV5cYamamFsQMLRX0g9z2337QsxJTttZLtb4IgOKRKCMir1jH4MC9OSsmAnlfPJQhTGACVA9PPONDtS55Jy323Sc+W6DUDQJ3sQpj48Ub+YM0n1fobQ/4DE7v5Q= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=sagar.kadam@sifive.com; Received: from DM6PR13MB2442.namprd13.prod.outlook.com (20.176.101.153) by DM6PR13MB2506.namprd13.prod.outlook.com (20.176.96.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.12; Thu, 23 Jan 2020 20:16:55 +0000 Received: from DM6PR13MB2442.namprd13.prod.outlook.com ([fe80::20cf:e8b3:b1e:c8b0]) by DM6PR13MB2442.namprd13.prod.outlook.com ([fe80::20cf:e8b3:b1e:c8b0%7]) with mapi id 15.20.2665.017; Thu, 23 Jan 2020 20:16:55 +0000 From: Sagar Shrikant Kadam To: u-boot@lists.denx.de Subject: [U-Boot Patch v1 5/7] spi: fu540: fix: use spi xfer bitlen for spi transfer Date: Thu, 23 Jan 2020 12:16:04 -0800 Message-Id: <1579810566-11675-6-git-send-email-sagar.kadam@sifive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1579810566-11675-1-git-send-email-sagar.kadam@sifive.com> References: <1579810566-11675-1-git-send-email-sagar.kadam@sifive.com> X-ClientProxiedBy: BYAPR06CA0001.namprd06.prod.outlook.com (2603:10b6:a03:d4::14) To DM6PR13MB2442.namprd13.prod.outlook.com (2603:10b6:5:cb::25) MIME-Version: 1.0 Received: from gamma07.internal.sifive.com (64.62.193.194) by BYAPR06CA0001.namprd06.prod.outlook.com (2603:10b6:a03:d4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2644.20 via Frontend Transport; Thu, 23 Jan 2020 20:16:54 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [64.62.193.194] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f42f795-2b1f-42eb-0f5d-08d7a0413111 X-MS-TrafficTypeDiagnostic: DM6PR13MB2506: X-LD-Processed: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-Forefront-PRVS: 029174C036 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39850400004)(366004)(396003)(376002)(136003)(346002)(189003)(199004)(186003)(6486002)(2906002)(2616005)(26005)(8936002)(81166006)(81156014)(956004)(16526019)(52116002)(316002)(4326008)(7696005)(107886003)(86362001)(8676002)(6916009)(6666004)(66556008)(66476007)(66946007)(478600001)(5660300002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM6PR13MB2506; H:DM6PR13MB2442.namprd13.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: sifive.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H8bN61YglosvtBUv+ermxv0apkPLIXoH/favjlQgxMtSIhf5xKaOHw1YBZ6k++ur4bG6FCo9SDIsgjLbTr+X9c1JK8mLsuT6LxzyaxndhBU41ecGKn3Prm6YBs1Z4+omccIBdTs6+mVnqSo+a0B4daYWtlu9EOk3CNcDzqAU2g9xBawYYqImJApgU8SQFZ5FHMQo9q8n2TiSW34+xquO9KUSM0GbVXyVrWW+Ahn8Vjvnrs1FScbevN1HngX/Tq5vGUB+hFBVWtUDh4sby2L+e3Wrc5Zxm1HlFN/fKq4RdJEwBzVFvN8KfVhPBhiDJOPuYvhBtYgLFbciznfNy3l5/WaHb8OYwCESAgjkzbF24ruMhsxHEPp/UnkUip8d5ElLwXcSW5OEk+N2g15KXwnDwO24zeD9cBHg3rfhShBkCG0gJyRq9VWlmVewB7El//Ft X-MS-Exchange-AntiSpam-MessageData: dtO4Fye5/URQCkBlSAlBSIfc/U4nH13ho+CQtX6Knm8m6NKpBXvf5IyMGlF0Qx9obvOFarkn4cC3SLbyPf9mbXDLQvchX4wXbjqjPz0aEB5oMiKpLIx17Yk6naRCHrG0Tg963v2iLJ8QmLu4tvUJtg== X-OriginatorOrg: sifive.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f42f795-2b1f-42eb-0f5d-08d7a0413111 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2020 20:16:55.4643 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 22f88e9d-ae0d-4ed9-b984-cdc9be1529f1 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 34rGbqYr41mMECA9NNuon4ClWaWjG3gmqz/SJp9nO7ZV0WpjqXq2zrQrm7kizpIueEqRpj/Dw4LxwOA+4s7qYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB2506 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: atish.patra@wdc.com, ick@andestech.com Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean Use bitlen passed by dm_spi_ops rather than using spi-tx/ rx-bus-width from the device tree, to set the mode bits in format register of spi controller present in FU540-C000 SoC on HiFive Unleashed board. This patch handles a case where controller mode in format register (0x40) is configured as per the width specified in the dt-node of the slave device. For instance if spi-tx- bus-width and spi-rx-bus-width in the flash device node in dt is set to 4 bit mode, the controller gets configured in QUAD mode, whereas the spi nor scan tries to read the JEDEC ID with the reg_proto set to SNOR_PROTO_1_1_1 and fails. Signed-off-by: Sagar Shrikant Kadam --- drivers/spi/spi-sifive.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index f990ad6..038fdb7 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -85,6 +85,10 @@ #define SIFIVE_SPI_IP_TXWM BIT(0) #define SIFIVE_SPI_IP_RXWM BIT(1) +#define SPI_NBITS_SINGLE BIT(0) +#define SPI_NBITS_DUAL BIT(1) +#define SPI_NBITS_QUAD BIT(2) + struct sifive_spi { void *regs; /* base address of the registers */ u32 fifo_depth; @@ -127,7 +131,7 @@ static void sifive_spi_clear_cs(struct sifive_spi *spi) } static void sifive_spi_prep_transfer(struct sifive_spi *spi, - bool is_rx_xfer, + unsigned int bitlen, bool is_rx_xfer, struct dm_spi_slave_platdata *slave) { u32 cr; @@ -146,12 +150,17 @@ static void sifive_spi_prep_transfer(struct sifive_spi *spi, /* Number of wires ? */ cr &= ~SIFIVE_SPI_FMT_PROTO_MASK; - if ((slave->mode & SPI_TX_QUAD) || (slave->mode & SPI_RX_QUAD)) + switch (bitlen) { + case SPI_NBITS_QUAD: cr |= SIFIVE_SPI_FMT_PROTO_QUAD; - else if ((slave->mode & SPI_TX_DUAL) || (slave->mode & SPI_RX_DUAL)) + break; + case SPI_NBITS_DUAL: cr |= SIFIVE_SPI_FMT_PROTO_DUAL; - else + break; + default: cr |= SIFIVE_SPI_FMT_PROTO_SINGLE; + break; + } /* SPI direction in/out ? */ cr &= ~SIFIVE_SPI_FMT_DIR; @@ -235,7 +244,7 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, return ret; } - sifive_spi_prep_transfer(spi, true, slave); + sifive_spi_prep_transfer(spi, bitlen, true, slave); remaining_len = bitlen / 8;