From patchwork Mon Oct 25 01:51:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Larson X-Patchwork-Id: 12580587 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F0EEC433F5 for ; Mon, 25 Oct 2021 01:56:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2D1AC61040 for ; Mon, 25 Oct 2021 01:56:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2D1AC61040 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pensando.io Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9y+EZ9TFFmRzT44UguwgeCppIRaRFKGc9YWphhICxfY=; b=MJ0lTZ8HJks7vX oCyBt6j8baVlocB+pXci+MOO+QWaWafXgJGWFfsoe4ThK0s5LnhBEJQZDCuLewfxOZVdOMs25voS4 i0HaxPQOXSuz7eaByyHX5v3uIsrJAvklpqyH/CauF/2xGuMMy4A0dG4IZ3737yxdF6yLw7NotLQAs 9IT/mYeT5Ma0mUEyJ8Tt1rZRQ6k8Tah66zwVMZbNl82eVh+s+IaQHzlkr7vQKRr6dkOGiactORL0y 5LQ9eABTX5p3y98v9B/cNaJYnLjOB6zax8uVGLo/v2EUuQ9Ha8N18vwqpIiNs4PvLIinldq8FwGJq 5UnXofemhWNlHy2eKyoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mepC6-00EvMd-QM; Mon, 25 Oct 2021 01:54:35 +0000 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mepA0-00EuQc-47 for linux-arm-kernel@lists.infradead.org; Mon, 25 Oct 2021 01:52:25 +0000 Received: by mail-pg1-x52b.google.com with SMTP id l186so2936460pge.7 for ; Sun, 24 Oct 2021 18:52:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pensando.io; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2IM8IILq/fLc4pskL5YAke6z8HetM8uOaIfAZ0wHh/U=; b=wY77ADfKrGBe/AUokIkKQpy9feYyQHt09nsvRbkv2Z/x/6dOc/t5/kTupgE2t0Zoaf p/xDrseKOGkJ3YrTLYJDgF8tmc0eOiS4YYPqaRbD4/jqNgi94MrJGpt0CniLxy0z1buZ yWndFbuoksQIBbJsCvIdUeOlnrAeJtSHapjAk5KTEVDpTwBFi+PtSxlpkrEL2fWjwZ/V C/JjLqesCaOHXOegETuvpzA87pwWHDaKKVsTRqLJ9JJeimMs1fdpYJqCbt5bedGoZU8a Vt+UAQIrt3MIl4d1pzPyre9QtiOXZ+ChcYLKrYetANCmZeDPXw6S08Ns2fVjihaNLnbi GJvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2IM8IILq/fLc4pskL5YAke6z8HetM8uOaIfAZ0wHh/U=; b=jLdpFMIwR7RVDFpPMIGzb54AXk+BKx6pvHjx6GcexuqucRWYzXZQVVotheucZ1lyd1 VZjEfgfMFq9WKHL8CJJWNNPqeEChxTXaPBT+LbR5pXh0Lw9zPXLfyOiGhFLZbYS37C0A BRJiA6plysogpv1OEjGLWOnkpsIoz2msifiI9JA5G24baIyiFZW+SZuAQ9gH3YdfEg8W bkeB+wwptVj36xVoE2TBbtPJqMlG4wUOLk0kgeaisvhaJdz2l9Cm9bs6jrbeGVZYmdoe rngvVsbbWv6bPCH4oHH7FdRg7GmCTTd9kG+6xNoTdUv4QHiitrqrJ4gs8awkywg1tyvf Ql9g== X-Gm-Message-State: AOAM530/7PUJO4DL46kny1gBXC2iHzuMaiOI7Yio1I9kxT5SQ4jnwMKz uCGuRlb6/OcQ78V/putsHEYIb6fHWC+D8tatsNA= X-Google-Smtp-Source: ABdhPJxAwGb35jsQ6OvhcrJ7QSWnt7HWOAHT5NiS9pZGr/o4wy0q+kFIC5W/oA2XOczaLBQainaFHQ== X-Received: by 2002:a62:7d8d:0:b0:47b:dfd7:e888 with SMTP id y135-20020a627d8d000000b0047bdfd7e888mr9934532pfc.42.1635126743028; Sun, 24 Oct 2021 18:52:23 -0700 (PDT) Received: from platform-dev1.pensando.io ([12.226.153.42]) by smtp.gmail.com with ESMTPSA id q10sm14855225pgn.31.2021.10.24.18.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Oct 2021 18:52:22 -0700 (PDT) From: Brad Larson To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@linaro.org, bgolaszewski@baylibre.com, broonie@kernel.org, fancer.lancer@gmail.com, adrian.hunter@intel.com, ulf.hansson@linaro.org, olof@lixom.net, brad@pensando.io, linux-gpio@vger.kernel.org, linux-spi@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 08/11] spi: cadence-quadspi: Add compatible for Pensando Elba SoC Date: Sun, 24 Oct 2021 18:51:53 -0700 Message-Id: <20211025015156.33133-9-brad@pensando.io> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211025015156.33133-1-brad@pensando.io> References: <20211025015156.33133-1-brad@pensando.io> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211024_185224_192691_D1E5E9D7 X-CRM114-Status: GOOD ( 16.42 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Pensando Elba SoC has the Cadence QSPI controller integrated. The quirk CQSPI_NEEDS_APB_AHB_HAZARD_WAR is added and if enabled a dummy readback from the controller is performed to ensure synchronization. Signed-off-by: Brad Larson --- drivers/spi/spi-cadence-quadspi.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/spi/spi-cadence-quadspi.c b/drivers/spi/spi-cadence-quadspi.c index 101cc71bffa7..af36514250d2 100644 --- a/drivers/spi/spi-cadence-quadspi.c +++ b/drivers/spi/spi-cadence-quadspi.c @@ -35,6 +35,7 @@ /* Quirks */ #define CQSPI_NEEDS_WR_DELAY BIT(0) #define CQSPI_DISABLE_DAC_MODE BIT(1) +#define CQSPI_NEEDS_APB_AHB_HAZARD_WAR BIT(2) /* Capabilities */ #define CQSPI_SUPPORTS_OCTAL BIT(0) @@ -74,6 +75,7 @@ struct cqspi_st { int current_cs; unsigned long master_ref_clk_hz; bool is_decoded_cs; + bool apb_ahb_hazard; u32 fifo_depth; u32 fifo_width; u32 num_chipselect; @@ -862,6 +864,13 @@ static int cqspi_indirect_write_execute(struct cqspi_flash_pdata *f_pdata, if (cqspi->wr_delay) ndelay(cqspi->wr_delay); + /* + * If a hazard exists between the APB and AHB interfaces, perform a + * dummy readback from the controller to ensure synchronization. + */ + if (cqspi->apb_ahb_hazard) + (void)readl(reg_base + CQSPI_REG_INDIRECTWR); + while (remaining > 0) { size_t write_words, mod_bytes; @@ -1548,6 +1557,8 @@ static int cqspi_probe(struct platform_device *pdev) master->mode_bits |= SPI_RX_OCTAL | SPI_TX_OCTAL; if (!(ddata->quirks & CQSPI_DISABLE_DAC_MODE)) cqspi->use_direct_mode = true; + if (ddata->quirks & CQSPI_NEEDS_APB_AHB_HAZARD_WAR) + cqspi->apb_ahb_hazard = true; } ret = devm_request_irq(dev, irq, cqspi_irq_handler, 0, @@ -1656,6 +1667,10 @@ static const struct cqspi_driver_platdata intel_lgm_qspi = { .quirks = CQSPI_DISABLE_DAC_MODE, }; +static const struct cqspi_driver_platdata pen_cdns_qspi = { + .quirks = CQSPI_NEEDS_APB_AHB_HAZARD_WAR | CQSPI_DISABLE_DAC_MODE, +}; + static const struct of_device_id cqspi_dt_ids[] = { { .compatible = "cdns,qspi-nor", @@ -1673,6 +1688,10 @@ static const struct of_device_id cqspi_dt_ids[] = { .compatible = "intel,lgm-qspi", .data = &intel_lgm_qspi, }, + { + .compatible = "pensando,elba-qspi", + .data = &pen_cdns_qspi, + }, { /* end of table */ } };