From patchwork Thu May 14 18:09:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1208 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B004F3F077 for ; Thu, 14 May 2020 20:09:54 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id b1sf2999030plm.10 for ; Thu, 14 May 2020 11:09:54 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1589479792; cv=pass; d=google.com; s=arc-20160816; b=SjKMNF8UBIOkSXCA5Hl8UZwQMfQyEx2WMl/qvTJ5ZLjDQTiLTar2FLJX+wRnu0WZ4D 1PL+c2aNiQFL/4qPCvGep4larQHaDQ4K1FynComb/RiE/mbmf/CCJxjapp/vGqMOn+et jYscCi19i2gdgy3CT0BotmRFOmweEHQ4zBt5k1KAXm1R+O35mtV5ckttnAhN/dLSpDZm mteSH8MQuY8VnUrVJP6M3x1EkUrMkcvCxuWg3jl1RVkYGJ4saj/VtE1WNumem26lVVXH E2PwiO+VdK1iSmF6HIe5lOUXMRIHmhBwtUtuIVKF79uypSwH7LS+npKZ5Pm8zAq63VFj JDqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=e4sM9JofI0gc1jVW3bgaIAmSF5R2JkPDgrc+aVXP1Bw=; b=ZEXreV0VWNrPrLztqwhSFwymxQd8E/zfLSaLHARjLxRePBWWvjr+2lg1jgdf57ttDh PBW9DBqMqNpnoAb60HgSooF2BRFaJ6t9+dG5V7cnIRsVcjGz3RKMN6mAJAlk01sRy42k 3v+/qZws5anPoD0bnxRpYQ+bC8hLk2bKiu3+gBZSD0Ekn0zCJUDOsoct527DVGBBCVAv FgRgtJbilbhvrIb32rIcFL+lAb0aNulwE1/UpingFUwNSVUB7AwO7sRMJxyB4kuIZWfc Ianu3+JBn0WZko20S/oYYUdWhDqmZBsBRJJBLGhcqHDiYd8WdpZBdfBozrIfvkQPSTAp cnHA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="GgO/Y2ug"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=e4sM9JofI0gc1jVW3bgaIAmSF5R2JkPDgrc+aVXP1Bw=; b=HCceUUD3v/fYNsFc4BjWueoYqbbbyezPDyhZCG48jeblOZsiebDo1PAWlUH+Lb/Kmt iMbbpxTzoD1dZVUOEcCYAaIVIgMZu9K3qLJWS2UrT279lSg/0h7ABJSacozo9XmvhwoF +MKcVodnKB7PZpUS7mNXWNNexGFrQLvWOf5Vo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-unsubscribe; bh=e4sM9JofI0gc1jVW3bgaIAmSF5R2JkPDgrc+aVXP1Bw=; b=iKEIDXNcmbdoMxC4fKJbBr3fvjdMtKIjV1yPZpVLXF1ter7wpZ0c2yThDwDKWVnQCm HhA3+S3CT/8rvE1bEG9kGUDSXCtPpO5IbMwW60d0CJVIN9GDWdcDfMHvJGQB22DFmCAf 67GX6oW2nJWOVma8I/06ViypQVPmZut1HWvXh+qCSBiY1WIGzAeb93IcS3NfWiwt9R52 bclvdCneDq4JNmHvDHX67UZZJpVHPkM23CA1jKMV6xln3Vhb0mM5a9ZiOey6Ml42V1vK zQz6t1e7besDyS8s5OeWhN89PflG3KS19BeG00DUI4biv2cQTHTPLa2nAXsc4E7XBYcg p8dA== X-Gm-Message-State: AOAM532PTeoGnRVUxtmCYR7CCCF3hiKV/xEwFtQKl013NvETHphWayXp +AlMoo+YAUHY1zpnamTCuf+6NB6b X-Google-Smtp-Source: ABdhPJz+Dd8X7xx/sJK0YQliVC/MbN7e8SUjxWJfggRLyF0CFMQnUstpSZ9b6q00KMjQrTpKEKagsw== X-Received: by 2002:aa7:97b2:: with SMTP id d18mr5744701pfq.89.1589479792217; Thu, 14 May 2020 11:09:52 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:1703:: with SMTP id 3ls1186229pfx.8.gmail; Thu, 14 May 2020 11:09:51 -0700 (PDT) X-Received: by 2002:a63:c308:: with SMTP id c8mr4772660pgd.398.1589479791652; Thu, 14 May 2020 11:09:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589479791; cv=none; d=google.com; s=arc-20160816; b=kc8nVp7pTcphNrVm+wAY8PAADhuvoqtDSfX+SwLALkKDbLuNRVIIQFsIQXZ9CiO/aq BaHfLJj5++ArRxkR/SlI3BwicuiU6N4M7jwwH5cFH6fBY8bhOw4sKZqsk3soJy5M6ZbY WsZy2/dCZjeAYQ9ZSMaaC62urvIMfPL2TyTWOe8crn850KG/JjLbhB3+5jyvfcRo5egz bRzOy+Mlq+pAlDL017BbQjm4HFEn2INDLwL/KKssMsQBv7sJYFWpzLgv4Pv4RkSy/hBo ml3W+h6+Jew6yuDEXEuRQO48CMyTxvm9ZYdRtPi78MBGIGoBg19rqZ28oJ6jxp1yaIIm GkzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=pGDZHmajGj0mdzbEMHMCgOSJ9o4iuwScbh1hKoIL1rI=; b=kNg5Qkr74Db+BNGzy2i5kgVONISRtD0jeEQHpfKF1yvwD4Z3UraRIG+/r35tC0O7+0 M/VWp+/57h0k3xRFtb4xiBOrObEGHCUSLuMT6mdaSjUtHqlzZ4IKOL+5FfU5vmE9eVCn v3KFR9swP3aSOHGUt5kCEvXQ2wEunQPz1nLvzZf8pCyknMfRXO5XpVE80WIWxyGtz8/E RCMlDQl/2yeiQfXmHncLfvJ59nHMTFSqdkFv2yNk8ZxF2O+uxO3uz6Dh0GmzNBq5CsO1 nk9y8wXV4vfhRqediJhppCTeZ0EioPCCAIZ8ESkr+QgUlkQ/mrsj3VB075wS3LQKoErP wjWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="GgO/Y2ug"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id f60sor29608808pje.21.2020.05.14.11.09.51 for (Google Transport Security); Thu, 14 May 2020 11:09:51 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:d0c3:: with SMTP id y3mr38433090pjw.133.1589479790530; Thu, 14 May 2020 11:09:50 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:713c:4a0a:47eb:ffcd]) by smtp.gmail.com with ESMTPSA id m63sm2904117pfb.101.2020.05.14.11.09.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2020 11:09:49 -0700 (PDT) From: Jagan Teki To: u-boot@lists.denx.de Cc: linux-amarula@amarulasolutions.com, Jagan Teki , Simon Glass , Vignesh R , Daniel Schwierzeck Subject: [PATCH 1/2] mtd: spi: Separate dm vs nodm SF code Date: Thu, 14 May 2020 23:39:40 +0530 Message-Id: <20200514180941.21542-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b="GgO/Y2ug"; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Right now, the sf have common driver to handle both dm and nodm code, where nondm has spi_flash probe and dm has U_BOOT_DRIVER for dm spi flash. Having a common code base for dm and nodm with ifdef make it difficult to extend functionalities and also difficult to read. So, keep them separate and give scope to dm code for further enhancements. Cc: Simon Glass Cc: Vignesh R Cc: Daniel Schwierzeck Signed-off-by: Jagan Teki --- drivers/mtd/spi/Makefile | 8 ++- drivers/mtd/spi/sf-nodm.c | 76 +++++++++++++++++++++ drivers/mtd/spi/sf-uclass.c | 128 ++++++++++++++++++++++++++++++++++++ 3 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 drivers/mtd/spi/sf-nodm.c diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index b5dfa300de..b3ae74dbe8 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -3,8 +3,12 @@ # (C) Copyright 2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-$(CONFIG_DM_SPI_FLASH) += sf-uclass.o -spi-nor-y := sf_probe.o spi-nor-ids.o +ifdef CONFIG_DM_SPI_FLASH +spi-nor-y += sf-uclass.o +else +spi-nor-y += sf-nodm.o +endif +spi-nor-y += spi-nor-ids.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o diff --git a/drivers/mtd/spi/sf-nodm.c b/drivers/mtd/spi/sf-nodm.c new file mode 100644 index 0000000000..b23014c2a8 --- /dev/null +++ b/drivers/mtd/spi/sf-nodm.c @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * SPI flash probing + * + * Copyright (C) 2008 Atmel Corporation + * Copyright (C) 2010 Reinhard Meyer, EMK Elektronik + * Copyright (C) 2013 Jagannadha Sutradharudu Teki, Xilinx Inc. + */ + +#include +#include +#include +#include +#include +#include + +#include "sf_internal.h" + +struct spi_flash *spi_flash_probe(unsigned int busnum, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode) +{ + struct spi_slave *bus; + struct spi_flash *flash; + int ret; + + /* Allocate space if needed (not used by sf-uclass) */ + flash = calloc(1, sizeof(*flash)); + if (!flash) { + debug("SF: Failed to allocate spi_flash\n"); + return NULL; + } + + bus = spi_setup_slave(busnum, cs, max_hz, spi_mode); + if (!bus) { + printf("SF: Failed to set up slave\n"); + goto err_free; + } + + flash->spi = bus; + + /* Claim spi bus */ + ret = spi_claim_bus(bus); + if (ret) { + debug("SF: Failed to claim SPI bus: %d\n", ret); + goto err_free_slave; + } + + ret = spi_nor_scan(flash); + if (ret) + goto err_read_id; + + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) { + ret = spi_flash_mtd_register(flash); + if (ret) + goto err_read_id; + } + + return flash; + +err_read_id: + spi_release_bus(bus); +err_free_slave: + spi_free_slave(bus); +err_free: + free(flash); + return NULL; +} + +void spi_flash_free(struct spi_flash *flash) +{ + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) + spi_flash_mtd_unregister(); + + spi_free_slave(flash->spi); + free(flash); +} diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 5a42ab83c8..97a3f5d2c7 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -95,6 +95,134 @@ static int spi_flash_post_bind(struct udevice *dev) return 0; } +static int spi_flash_std_read(struct udevice *dev, u32 offset, size_t len, + void *buf) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + struct mtd_info *mtd = &flash->mtd; + size_t retlen; + + return log_ret(mtd->_read(mtd, offset, len, &retlen, buf)); +} + +static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len, + const void *buf) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + struct mtd_info *mtd = &flash->mtd; + size_t retlen; + + return mtd->_write(mtd, offset, len, &retlen, buf); +} + +static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) +{ + struct spi_flash *flash = dev_get_uclass_priv(dev); + struct mtd_info *mtd = &flash->mtd; + struct erase_info instr; + + if (offset % mtd->erasesize || len % mtd->erasesize) { + printf("SF: Erase offset/length not multiple of erase size\n"); + return -EINVAL; + } + + memset(&instr, 0, sizeof(instr)); + instr.addr = offset; + instr.len = len; + + return mtd->_erase(mtd, &instr); +} + +int spi_flash_std_probe(struct udevice *dev) +{ + struct spi_slave *slave = dev_get_parent_priv(dev); + struct spi_flash *flash; + int ret; + + if (!slave) { + printf("SF: Failed to set up slave\n"); + return -ENODEV; + } + + flash = dev_get_uclass_priv(dev); + flash->dev = dev; + flash->spi = slave; + + /* Claim spi bus */ + ret = spi_claim_bus(slave); + if (ret) { + debug("SF: Failed to claim SPI bus: %d\n", ret); + return ret; + } + + ret = spi_nor_scan(flash); + if (ret) + goto err_read_id; + + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) + ret = spi_flash_mtd_register(flash); + +err_read_id: + spi_release_bus(slave); + return ret; +} + +static int spi_flash_std_remove(struct udevice *dev) +{ + if (CONFIG_IS_ENABLED(SPI_FLASH_MTD)) + spi_flash_mtd_unregister(); + + return 0; +} + +static const struct dm_spi_flash_ops spi_flash_std_ops = { + .read = spi_flash_std_read, + .write = spi_flash_std_write, + .erase = spi_flash_std_erase, +}; + +/* + * Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also + * need to allocate the parent_platdata since by the time this function is + * called device_bind() has already gone past that step. + */ +static int spi_flash_bind(struct udevice *dev) +{ + if (CONFIG_IS_ENABLED(OF_PLATDATA)) { + struct dm_spi_slave_platdata *plat; + struct udevice *spi; + int ret; + + ret = uclass_first_device_err(UCLASS_SPI, &spi); + if (ret) + return ret; + dev->parent = spi; + + plat = calloc(sizeof(*plat), 1); + if (!plat) + return -ENOMEM; + dev->parent_platdata = plat; + } + + return 0; +} + +static const struct udevice_id spi_flash_std_ids[] = { + { .compatible = "jedec,spi-nor" }, + { } +}; + +U_BOOT_DRIVER(spi_flash_std) = { + .name = "spi_flash_std", + .id = UCLASS_SPI_FLASH, + .of_match = spi_flash_std_ids, + .bind = spi_flash_bind, + .probe = spi_flash_std_probe, + .remove = spi_flash_std_remove, + .priv_auto_alloc_size = sizeof(struct spi_flash), + .ops = &spi_flash_std_ops, +}; + UCLASS_DRIVER(spi_flash) = { .id = UCLASS_SPI_FLASH, .name = "spi_flash",