From patchwork Mon May 1 13:15:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 9706533 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5827A6038F for ; Mon, 1 May 2017 13:15:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48F7B223B2 for ; Mon, 1 May 2017 13:15:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DB9923B23; Mon, 1 May 2017 13:15:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A48E927C0B for ; Mon, 1 May 2017 13:15:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968698AbdEANPX (ORCPT ); Mon, 1 May 2017 09:15:23 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34260 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2993555AbdEANPR (ORCPT ); Mon, 1 May 2017 09:15:17 -0400 Received: by mail-wm0-f67.google.com with SMTP id z129so23413244wmb.1; Mon, 01 May 2017 06:15:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZJ92LAKTr/x68NfCz40Si1THT0wx/PEoRmNOloEFxKg=; b=rh7yRV8pvPn7mCJS48XsA8yTDlsEa+EgZ6wj4IXHJspuIBXxQYogGgKvuuLgDoqClI r+sxjMbQna1xxBOE9+SbY8UpG8hNIcUe6dKkM609vSvDf/WRniLbF2bvLFqz0XKql3BL bz68VPfQNBWXQ6z199hFKRF6mZU08y4YC9bVoH1k1iuZvyEJUsuwS9QYtpVESfcle9YR vWnCzgNs4S5CtO5T2RGNN0wVvZN6X52gPGbNS4Zzg1qoT7WUL8ztKPT7ckrgbUg+khDB pQmCAFDuuO126/tqaN9gRoF3aJ6wV3+npzIguEjBfJgm2uynBkC3Bb1e/nZK4QVP8rZA OC6A== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZJ92LAKTr/x68NfCz40Si1THT0wx/PEoRmNOloEFxKg=; b=VZV0gGvI2JPAANaTwfMLdEroka7FRnDbezyZJl/bhG4aGC4KXLnZ0RjX+kLd1tuiNx r63b8EaLQ2ywaINp5jeLd/hG/fN8wxhTdHmQEiVnApE9zD9yuEVeagiJhPRFbe2RHR8K bG/AF6v4n+87XM0ngxovBxXBkIcexkc1bo7XQ8IknWhD+4aGFznwSTZDwm98jHFkgFcB zkUzLaDP6uLv+36InCVnCoQkpaydLjse5TuKEa4ZX7gIoqXoWJNXhneUxp/UZu/6/Ej5 z724CpxAWNVXR6O+9BcdYZ2xyJ6puLFXy3xfDxbckv6IZNQbxc2vjYetqC8XjxvkbiqM G5qA== X-Gm-Message-State: AN3rC/6uaqqXc5AIQK6VKHC9IlcV8KfQwXdd8qoNARKy2lfIGaLCbwYa KuudnwSmcEY+Bw== X-Received: by 10.28.54.151 with SMTP id y23mr6856992wmh.90.1493644515527; Mon, 01 May 2017 06:15:15 -0700 (PDT) Received: from gmail.com (2-235-152-247.ip228.fastwebnet.it. [2.235.152.247]) by smtp.gmail.com with ESMTPSA id w136sm9820867wmd.0.2017.05.01.06.15.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 May 2017 06:15:15 -0700 (PDT) From: Paolo Pisati To: Alan Tull , Rob Herring , Mark Rutland , Moritz Fischer Cc: devicetree@vger.kernel.org, linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] fpga: lattice machxo2: Add Lattice MachXO2 support Date: Mon, 1 May 2017 15:15:12 +0200 Message-Id: <1493644512-14776-3-git-send-email-p.pisati@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493644512-14776-1-git-send-email-p.pisati@gmail.com> References: <1493644512-14776-1-git-send-email-p.pisati@gmail.com> MIME-Version: 1.0 Sender: linux-fpga-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support to the FPGA manager for programming MachXO2 device’s internal flash memory, via slave SPI. Signed-off-by: Paolo Pisati --- drivers/fpga/Kconfig | 7 ++ drivers/fpga/Makefile | 1 + drivers/fpga/machxo2-spi.c | 214 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 222 insertions(+) create mode 100644 drivers/fpga/machxo2-spi.c diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index c81cb7d..cce135b 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -26,6 +26,13 @@ config FPGA_MGR_ICE40_SPI help FPGA manager driver support for Lattice iCE40 FPGAs over SPI. +config FPGA_MGR_MACHXO2_SPI + tristate "Lattice MachXO2 SPI" + depends on SPI + help + FPGA manager driver support for Lattice MachXO2 configuration + over slave SPI interface. + config FPGA_MGR_SOCFPGA tristate "Altera SOCFPGA FPGA Manager" depends on ARCH_SOCFPGA || COMPILE_TEST diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index c6f5d74..cdab1fe 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_FPGA) += fpga-mgr.o # FPGA Manager Drivers obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o +obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-spi.o obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c new file mode 100644 index 0000000..264ef63 --- /dev/null +++ b/drivers/fpga/machxo2-spi.c @@ -0,0 +1,214 @@ +/** + * Lattice MachXO2 Slave SPI Driver + * + * Copyright (C) 2017 Paolo Pisati + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * Manage Lattice FPGA firmware that is loaded over SPI using + * the slave serial configuration interface. + */ + +#include +#include +#include +#include +#include +#include + +/* MachXO2 Programming Guide - sysCONFIG Programming Commands */ + +#define ISC_ENABLE 0x000008c6 +#define ISC_ERASE 0x0000040e +#define ISC_PROGRAMDONE 0x0000005e +#define LSC_CHECKBUSY 0x000000f0 +#define LSC_INITADDRESS 0x00000046 +#define LSC_PROGINCRNV 0x01000070 +#define LSC_REFRESH 0x00000079 + +#define BUSYFLAG 0x80 + +/* + * Max CCLK in Slave SPI mode according to 'MachXO2 Family Data + * Sheet' sysCONFIG Port Timing Specifications (3-36) + */ +#define MACHXO2_MAX_SPEED 66000000 + +#define MACHXO2_LOW_DELAY 5 /* us */ +#define MACHXO2_HIGH_DELAY 200 /* us */ + +#define MACHXO2_OP_SIZE sizeof(u32) +#define MACHXO2_PAGE_SIZE 16 +#define MACHXO2_BUF_SIZE (MACHXO2_OP_SIZE + MACHXO2_PAGE_SIZE) + +static int wait_until_not_busy(struct spi_device *spi) +{ + u8 rx; + u32 checkbusy = LSC_CHECKBUSY; + int ret; + + do { + ret = spi_write_then_read(spi, &checkbusy, MACHXO2_OP_SIZE, + &rx, sizeof(rx)); + if (ret) + return ret; + } while (rx & BUSYFLAG); + + return 0; +} + +static enum fpga_mgr_states machxo2_spi_state(struct fpga_manager *mgr) +{ + return FPGA_MGR_STATE_UNKNOWN; +} + +static int machxo2_write_init(struct fpga_manager *mgr, + struct fpga_image_info *info, + const char *buf, size_t count) +{ + struct spi_device *spi = mgr->priv; + u32 enable = ISC_ENABLE; + u32 erase = ISC_ERASE; + u32 initaddr = LSC_INITADDRESS; + int ret; + + if ((info->flags & FPGA_MGR_PARTIAL_RECONFIG)) { + dev_err(&mgr->dev, + "Partial reconfiguration is not supported\n"); + return -ENOTSUPP; + } + + ret = spi_write(spi, &enable, MACHXO2_OP_SIZE); + if (ret) + goto fail; + + udelay(MACHXO2_LOW_DELAY); + ret = spi_write(spi, &erase, MACHXO2_OP_SIZE); + if (ret) + goto fail; + + ret = wait_until_not_busy(spi); + if (ret) + goto fail; + + ret = spi_write(spi, &initaddr, MACHXO2_OP_SIZE); + if (ret) + goto fail; + + return 0; + +fail: + dev_err(&mgr->dev, "Error during FPGA init.\n"); + return ret; +} + +static int machxo2_write(struct fpga_manager *mgr, const char *buf, + size_t count) +{ + struct spi_device *spi = mgr->priv; + u32 progincr = LSC_PROGINCRNV; + u8 payload[MACHXO2_BUF_SIZE]; + int i, ret; + + if (count % MACHXO2_PAGE_SIZE != 0) { + dev_err(&mgr->dev, "Malformed payload.\n"); + return -EINVAL; + } + + memcpy(payload, &progincr, MACHXO2_OP_SIZE); + for (i = 0; i < count; i += MACHXO2_PAGE_SIZE) { + memcpy(&payload[MACHXO2_OP_SIZE], &buf[i], MACHXO2_PAGE_SIZE); + ret = spi_write(spi, payload, MACHXO2_BUF_SIZE); + if (ret) { + dev_err(&mgr->dev, "Error loading the bitstream.\n"); + return ret; + } + udelay(MACHXO2_HIGH_DELAY); + } + + return 0; +} + +static int machxo2_write_complete(struct fpga_manager *mgr, + struct fpga_image_info *info) +{ + struct spi_device *spi = mgr->priv; + u32 progdone = ISC_PROGRAMDONE; + u32 refresh = LSC_REFRESH; + int ret; + + ret = spi_write(spi, &progdone, MACHXO2_OP_SIZE); + if (ret) + goto fail; + + udelay(MACHXO2_HIGH_DELAY); + /* yep, LSC_REFRESH is 3 bytes long actually */ + ret = spi_write(spi, &refresh, MACHXO2_OP_SIZE - 1); + if (ret) + goto fail; + + return 0; + +fail: + dev_err(&mgr->dev, "Refresh failed.\n"); + return ret; +} + +static const struct fpga_manager_ops machxo2_ops = { + .state = machxo2_spi_state, + .write_init = machxo2_write_init, + .write = machxo2_write, + .write_complete = machxo2_write_complete, +}; + +static int machxo2_spi_probe(struct spi_device *spi) +{ + struct device *dev = &spi->dev; + + if (spi->max_speed_hz > MACHXO2_MAX_SPEED) { + dev_err(dev, "Speed is too high\n"); + return -EINVAL; + } + + return fpga_mgr_register(dev, "Lattice MachXO2 SPI FPGA Manager", + &machxo2_ops, spi); +} + +static int machxo2_spi_remove(struct spi_device *spi) +{ + struct device *dev = &spi->dev; + + fpga_mgr_unregister(dev); + + return 0; +} + +static const struct of_device_id of_match[] = { + { .compatible = "lattice,machxo2-slave-spi", }, + {} +}; +MODULE_DEVICE_TABLE(of, of_match); + +static const struct spi_device_id lattice_ids[] = { + { "machxo2-slave-spi", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(spi, lattice_ids); + +static struct spi_driver machxo2_spi_driver = { + .driver = { + .name = "machxo2-slave-spi", + .of_match_table = of_match_ptr(of_match), + }, + .probe = machxo2_spi_probe, + .remove = machxo2_spi_remove, + .id_table = lattice_ids, +}; + +module_spi_driver(machxo2_spi_driver) + +MODULE_AUTHOR("Paolo Pisati "); +MODULE_DESCRIPTION("Load Lattice FPGA firmware over SPI"); +MODULE_LICENSE("GPL v2");