* [PATCH libata/for-4.12-fixes] libata: fix error checking in in ata_parse_force_one()
From: Tejun Heo @ 2017-05-31 18:31 UTC (permalink / raw)
To: Petru Mihancea; +Cc: linux-ide
In-Reply-To: <CAKHFTdOvzO7W_NsDhqHVTN=FQCpuT61zXFjNRQ8y0YfTx1CY6Q@mail.gmail.com>
>From f7cf69ae171592d133c69b9adaa5de7cfb6038ea Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 31 May 2017 14:26:26 -0400
ata_parse_force_one() was incorrectly comparing @p to @endp when it
should have been comparing @id. The only consequence is that it may
end up using an invalid port number in "libata.force" module param
instead of rejecting it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Petru-Florin Mihancea <petrum@gmail.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=195785
---
Applied to libata/for-4.12-fixes. Thanks.
drivers/ata/libata-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 2d83b8c75965..e157a0e44419 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6800,7 +6800,7 @@ static int __init ata_parse_force_one(char **cur,
}
force_ent->port = simple_strtoul(id, &endp, 10);
- if (p == endp || *endp != '\0') {
+ if (id == endp || *endp != '\0') {
*reason = "invalid port/link";
return -EINVAL;
}
--
2.13.0
^ permalink raw reply related
* "Redirecting" a bug report to the relevant list
From: Petru Mihancea @ 2017-05-31 11:07 UTC (permalink / raw)
To: linux-ide
Hi,
I misclassified the bug report at the following link. Since I do not
want to introduce duplications, I thought it might be better to send
an email to the list that looks relevant.
https://bugzilla.kernel.org/show_bug.cgi?id=195785
Thank you,
Petru Mihancea
^ permalink raw reply
* Re: [PATCH] Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
From: Linus Walleij @ 2017-05-30 23:53 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Tejun Heo, Bartlomiej Zolnierkiewicz, linux-ide, stable
In-Reply-To: <1496152548.28981.25.camel@linux.intel.com>
On Tue, May 30, 2017 at 3:55 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> On Tue, 2017-05-30 at 15:52 +0200, Linus Walleij wrote:
>> This reverts commit 368e5fbdfc60732643f34f538823ed4bc8829827.
>>
>> My NAS stopped to mount root when I went from some v4.10-rc1
>> to v4.12-rc3. Investigation of the bootlog yields this:
>>
>> sata_mv f1080000.sata: can't request region for resource [mem
>> 0xf1080000-0xf1084fff]
>> sata_mv: probe of f1080000.sata failed with error -16
>>
>> Reverting this offending patch makes the sata_mv probe and
>> my SATA drive can mount root again, hooray!
>
> It's already in upstream (ata tree).
OK!
Only two patches for the same issue? Today for the GPIO
tree I got four (4!) patches fixing the same issue :D
Yours,
Linus Walleij
^ permalink raw reply
* Re: [PATCH] libata: Fix devres handling
From: Tejun Heo @ 2017-05-30 17:59 UTC (permalink / raw)
To: Linus Walleij; +Cc: Bartlomiej Zolnierkiewicz, linux-ide, stable
In-Reply-To: <CACRpkdY696hTcdDwoCg6GPi_VG7Q=iC8yt8iJQMQ5FYQ_S3fqw@mail.gmail.com>
Hello, Linus.
On Tue, May 30, 2017 at 11:21:24AM +0200, Linus Walleij wrote:
> This is because my driver issues platform_set_drvdata(pdev)
> on the same struct device * overwriting the data with
> its own. That function is just an alias for dev_set_drvdata().
I see.
> Amazingly, libata survives this until release.
That is surprising given that libata does depend on that drvdata quite
a bit.
> Maybe we should print a warning if dev_get_drvdata()
> and res differ? It's a sign that something is wrong because
> someone screwed with the drvdata behind the back of
> libata.
Please feel free to submit a patch to add WARN_ON there.
> I guess I will simply make a cleanup series for these,
> making sure they use host->private_data instead and do not
> double-write the drvdata.
Great.
Thanks for working on this!
--
tejun
^ permalink raw reply
* Re: [PATCH 1/6] ata: bf54x: cut drvdata assignment
From: Tejun Heo @ 2017-05-30 15:55 UTC (permalink / raw)
To: Linus Walleij; +Cc: Bartlomiej Zolnierkiewicz, linux-ide
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
On Tue, May 30, 2017 at 11:46:39AM +0200, Linus Walleij wrote:
> ata_host_alloc_pinfo() assigns the host pointer to the
> struct device * drvdata, do not assign it a second time.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Applied 1-6 to libata/for-4.13.
Thanks.
--
tejun
^ permalink raw reply
* Re: [PATCH 3/4 v3] ata: Add driver for Faraday Technology FTIDE010
From: Bartlomiej Zolnierkiewicz @ 2017-05-30 14:31 UTC (permalink / raw)
To: Linus Walleij
Cc: Tejun Heo, linux-ide, Janos Laube, Paulius Zaleckas,
linux-arm-kernel, Hans Ulli Kroll, Florian Fainelli,
John Feng-Hsin Chiang, Greentime Hu
In-Reply-To: <20170530113402.20450-3-linus.walleij@linaro.org>
Hi,
On Tuesday, May 30, 2017 01:34:01 PM Linus Walleij wrote:
> This adds a driver for the Faraday Technology FTIDE010
> PATA IP block.
>
> When used with the Storlink/Storm/Cortina Systems Gemini
> SoC, the PATA interface is accompanied by a PATA<->SATA
> bridge, so while the device appear as a PATA controller,
> it attaches physically to SATA disks, and also has a
> designated memory area with registers to set up the bridge.
>
> The Gemini SATA bridge is separated into its own driver
> file to make things modular and make it possible to reuse
> the PATA driver as stand-alone on other systems than the
> Gemini.
Overall it looks fine, some review comments below.
> dmesg excerpt from the D-Link DIR-685 storage router:
> gemini-sata-bridge 46000000.sata: SATA ID 00000e00, PHY ID: 01000100
> gemini-sata-bridge 46000000.sata: set up the Gemini IDE/SATA nexus
> ftide010 63000000.ata: set up Gemini PATA0
> ftide010 63000000.ata: device ID 00000500, irq 26, io base 0x63000000
> ftide010 63000000.ata: SATA0 (master) start
> gemini-sata-bridge 46000000.sata: SATA0 PHY ready
> scsi host0: pata-ftide010
> ata1: PATA max UDMA/133 irq 26
> ata1.00: ATA-8: INTEL SSDSA2CW120G3, 4PC10302, max UDMA/133
> ata1.00: 234441648 sectors, multi 1: LBA48 NCQ (depth 0/32)
> ata1.00: configured for UDMA/133
> scsi 0:0:0:0: Direct-Access ATA INTEL SSDSA2CW12 0302 PQ: 0 ANSI: 5
> ata1.00: Enabling discard_zeroes_data
> sd 0:0:0:0: [sda] 234441648 512-byte logical blocks: (120 GB/112 GiB)
> sd 0:0:0:0: [sda] Write Protect is off
> sd 0:0:0:0: [sda] Write cache: enabled, read cache:
> enabled, doesn't support DPO or FUA
> ata1.00: Enabling discard_zeroes_data
> ata1.00: Enabling discard_zeroes_data
> sd 0:0:0:0: [sda] Attached SCSI disk
>
> After this I can flawlessly mount and read/write copy etc files
> from /dev/sda[n].
>
> Cc: John Feng-Hsin Chiang <john453@faraday-tech.com>
> Cc: Greentime Hu <green.hu@gmail.com>
> Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ChangeLog v2->v3:
> - Remove the call to platform_set_drvdata() which was
> overwriting the host pointer. Rely instead on
> host->private_data like everyone else.
> ChangeLog v1->v2:
> - Drop the parsing of timings from the device tree, instead
> keeping it in the driver, copying over the documentation
> from the device tree and the nice structure so that
> it's easy to modify for other SoCs.
> - Some fixes to bail out from .port_start() if there is no
> drive connected to the bridge, without us having to wait
> for a timeout.
> - Fix up the inclusion guard in the header file to be an
> inclusion guard and not #ifdef CONFIG_FOO (which will anyways
> not work for things compiled as module).
> ---
> MAINTAINERS | 9 +
> drivers/ata/Kconfig | 21 ++
> drivers/ata/Makefile | 2 +
> drivers/ata/pata_ftide010.c | 552 ++++++++++++++++++++++++++++++++++++++++++++
> drivers/ata/sata_gemini.c | 419 +++++++++++++++++++++++++++++++++
> drivers/ata/sata_gemini.h | 21 ++
> 6 files changed, 1024 insertions(+)
> create mode 100644 drivers/ata/pata_ftide010.c
> create mode 100644 drivers/ata/sata_gemini.c
> create mode 100644 drivers/ata/sata_gemini.h
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index f7d568b8f133..96753be12026 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -7531,6 +7531,15 @@ S: Maintained
> F: drivers/ata/pata_*.c
> F: drivers/ata/ata_generic.c
>
> +LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
> +M: Linus Walleij <linus.walleij@linaro.org>
> +L: linux-ide@vger.kernel.org
> +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
> +S: Maintained
> +F: drivers/ata/pata_ftide010.c
> +F: drivers/ata/sata_gemini.c
> +F: drivers/ata/sata_gemini.h
> +
> LIBATA SATA AHCI PLATFORM devices support
> M: Hans de Goede <hdegoede@redhat.com>
> M: Tejun Heo <tj@kernel.org>
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index de3eaf051697..948fc86980a1 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -213,6 +213,16 @@ config SATA_FSL
>
> If unsure, say N.
>
> +config SATA_GEMINI
> + tristate "Gemini SATA bridge support"
> + depends on PATA_FTIDE010
> + default ARCH_GEMINI
> + help
> + This enabled support for the FTIDE010 to SATA bridge
> + found in Cortina Systems Gemini platform.
> +
> + If unsure, say N.
> +
> config SATA_AHCI_SEATTLE
> tristate "AMD Seattle 6.0Gbps AHCI SATA host controller support"
> depends on ARCH_SEATTLE
> @@ -599,6 +609,17 @@ config PATA_EP93XX
>
> If unsure, say N.
>
> +config PATA_FTIDE010
> + tristate "Faraday Technology FTIDE010 PATA support"
> + depends on OF
> + depends on ARM
> + default ARCH_GEMINI
> + help
> + This option enables support for the Faraday FTIDE010
> + PATA controller found in the Cortina Gemini SoCs.
> +
> + If unsure, say N.
> +
> config PATA_HPT366
> tristate "HPT 366/368 PATA support"
> depends on PCI
> diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
> index cd931a5eba92..a26ef5a93919 100644
> --- a/drivers/ata/Makefile
> +++ b/drivers/ata/Makefile
> @@ -7,6 +7,7 @@ obj-$(CONFIG_SATA_ACARD_AHCI) += acard-ahci.o libahci.o
> obj-$(CONFIG_SATA_AHCI_SEATTLE) += ahci_seattle.o libahci.o libahci_platform.o
> obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o libahci_platform.o
> obj-$(CONFIG_SATA_FSL) += sata_fsl.o
> +obj-$(CONFIG_SATA_GEMINI) += sata_gemini.o
> obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o
> obj-$(CONFIG_SATA_SIL24) += sata_sil24.o
> obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o
> @@ -60,6 +61,7 @@ obj-$(CONFIG_PATA_CS5536) += pata_cs5536.o
> obj-$(CONFIG_PATA_CYPRESS) += pata_cypress.o
> obj-$(CONFIG_PATA_EFAR) += pata_efar.o
> obj-$(CONFIG_PATA_EP93XX) += pata_ep93xx.o
> +obj-$(CONFIG_PATA_FTIDE010) += pata_ftide010.o
> obj-$(CONFIG_PATA_HPT366) += pata_hpt366.o
> obj-$(CONFIG_PATA_HPT37X) += pata_hpt37x.o
> obj-$(CONFIG_PATA_HPT3X2N) += pata_hpt3x2n.o
> diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c
> new file mode 100644
> index 000000000000..d3acf72039e2
> --- /dev/null
> +++ b/drivers/ata/pata_ftide010.c
> @@ -0,0 +1,552 @@
> +/*
> + * Faraday Technology FTIDE010 driver
> + * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
> + *
> + * Includes portions of the SL2312/SL3516/Gemini PATA driver
> + * Copyright (C) 2003 StorLine, Inc <jason@storlink.com.tw>
> + * Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
> + * Copyright (C) 2010 Frederic Pecourt <opengemini@free.fr>
> + * Copyright (C) 2011 Tobias Waldvogel <tobias.waldvogel@gmail.com>
> + */
> +
> +#include <linux/platform_device.h>
> +#include <linux/module.h>
> +#include <linux/libata.h>
> +#include <linux/bitops.h>
> +#include <linux/of_address.h>
> +#include <linux/of_device.h>
> +#include <linux/clk.h>
> +#include "sata_gemini.h"
> +
> +/**
> + * struct ftide010 - state container for the Faraday FTIDE010
> + * @dev: pointer back to the device representing this controller
> + * @base: remapped I/O space address
> + * @pclk: peripheral clock for the IDE block
> + * @host: pointer to the ATA host for this device
> + * @pio_timings: combined active/recovery values to be written to
> + * the PIO timing register for modes 0, 1, 2, 3 and 4.
> + * @mwdma_50_timings: combined active/recovery values to be written
> + * to the multiword DMA mode timing register for modes 0, 1 and 2
> + * at 50MHz speed
> + * @mwdma_66_timings: same as @mwdma_50_timings but for 66MHz
> + * @udma_50_timings: combined setup/hold values to be written
> + * to the ultra DMA mode timing register for modes 0-5 at 50MHz
> + * speed
> + * @udma_66_timings: combined setup/hold values to be written
> + * to the ultra DMA mode timing register for modes 0-6 at 66MHz
> + * speed
> + * @master_cbl: master cable type
> + * @slave_cbl: slave cable type
> + * @sg: Gemini SATA bridge pointer, if running on the Gemini
master_to_sata0, slave_to_sata0, master_to_sata1 and slave_to_sata1
fields are undocumented
> + */
> +struct ftide010 {
> + struct device *dev;
> + void __iomem *base;
> + struct clk *pclk;
> + struct ata_host *host;
> + u8 pio_timings[5];
> + u8 mwdma_50_timings[3];
> + u8 mwdma_66_timings[3];
> + u8 udma_50_timings[6];
> + u8 udma_66_timings[7];
> + unsigned int master_cbl;
> + unsigned int slave_cbl;
> + /* Gemini-specific properties */
> + struct sata_gemini *sg;
> + bool master_to_sata0;
> + bool slave_to_sata0;
> + bool master_to_sata1;
> + bool slave_to_sata1;
> +};
> +
> +#define DMA_REG 0x00
> +#define DMA_STATUS 0x02
> +#define IDE_BMDTPR 0x04
> +#define IDE_DEVICE_ID 0x08
> +#define PIO_TIMING_REG 0x10
> +#define MWDMA_TIMING_REG 0x11
> +#define UDMA_TIMING0_REG 0x12 /* Master */
> +#define UDMA_TIMING1_REG 0x13 /* Slave */
> +#define CLK_MOD_REG 0x14
> +/* These registers are mapped directly to the IDE registers */
> +#define CMD_DATA_REG 0x20
> +#define ERROR_FEATURES_REG 0x21
> +#define NSECT_REG 0x22
> +#define LBAL_REG 0x23
> +#define LBAM_REG 0x24
> +#define LBAH_REG 0x25
> +#define DEVICE_REG 0x26
> +#define STATUS_COMMAND_REG 0x27
> +#define ALTSTAT_CTRL_REG 0x36
How's about prefixing these defines with FTIDE010_?
> +/* Set this bit for UDMA mode 5 and 6 */
> +#define UDMA_TIMING_MODE_56 BIT(7)
> +
> +/* 0 = 50 MHz, 1 = 66 MHz */
> +#define CLK_MOD_DEV0_CLK_SEL BIT(0)
> +#define CLK_MOD_DEV1_CLK_SEL BIT(1)
> +/* Enable UDMA on a device */
> +#define CLK_MOD_DEV0_UDMA_EN BIT(4)
> +#define CLK_MOD_DEV1_UDMA_EN BIT(5)
ditto
> +static struct scsi_host_template pata_ftide010_sht = {
> + ATA_BMDMA_SHT("pata-ftide010"),
ATA_BMDMA_SHT(DRV_NAME),
and please define DRV_NAME to "pata_ftide010"
> +};
> +
> +/*
> + * We set 66 MHz for all MWDMA modes
> + */
> +static const bool set_mdma_66_mhz[] = { true, true, true, true };
50 MHz MWDMA timings are never used by the driver and can be removed..
> +/*
> + * We set 66 MHz for UDMA modes 3, 4 and 6 and no others
> + */
> +static const bool set_udma_66_mhz[] = { false, false, false, true, true, false, true };
> +
> +static void ftide010_set_dmamode(struct ata_port *ap, struct ata_device *adev)
> +{
> + struct ftide010 *ftide = ap->host->private_data;
> + unsigned short speed = adev->dma_mode;
u8 speed
> + u8 devno = adev->devno & 1;
> + u8 udma_en_mask;
> + u8 f66m_en_mask;
> + u8 clkreg;
> + u8 timreg;
> + unsigned int i;
u8
> + /* Target device 0 (master) or 1 (slave) */
> + if (!devno) {
> + udma_en_mask = CLK_MOD_DEV0_UDMA_EN;
> + f66m_en_mask = CLK_MOD_DEV0_CLK_SEL;
> + } else {
> + udma_en_mask = CLK_MOD_DEV1_UDMA_EN;
> + f66m_en_mask = CLK_MOD_DEV1_CLK_SEL;
> + }
> +
> + clkreg = ioread8(ftide->base + CLK_MOD_REG);
Please use readb() for consistency.
> + clkreg &= ~udma_en_mask;
> + clkreg &= ~f66m_en_mask;
> +
> + if (speed & XFER_UDMA_0) {
> + i = speed & ~XFER_UDMA_0;
> + dev_dbg(ftide->dev, "set UDMA mode %02x, index %d\n",
> + speed, i);
> +
> + clkreg |= udma_en_mask;
> + if (set_udma_66_mhz[i]) {
> + clkreg |= f66m_en_mask;
> + timreg = ftide->udma_66_timings[i];
> + } else {
> + timreg = ftide->udma_50_timings[i];
> + }
> +
> + /* A special bit needs to be set for modes 5 and 6 */
> + if (i >= 5)
> + timreg |= UDMA_TIMING_MODE_56;
> +
> + dev_dbg(ftide->dev, "UDMA write clkreg = %02x, timreg = %02x\n",
> + clkreg, timreg);
> +
> + writeb(clkreg, ftide->base + CLK_MOD_REG);
CLK_MOD_REG is shared between master and slave so the driver needs to
make sure that right clock is used if master and slave devices require
different clocks (i.e. master is using UDMA5 and slave is using UDMA6).
> + writeb(timreg, ftide->base + UDMA_TIMING0_REG + devno);
> + } else {
> + i = speed & ~XFER_MW_DMA_0;
> + dev_dbg(ftide->dev, "set MWDMA mode %02x, index %d\n",
> + speed, i);
> +
> + if (set_mdma_66_mhz[i]) {
> + clkreg |= f66m_en_mask;
> + timreg = ftide->mwdma_66_timings[i];
> + } else {
> + timreg = ftide->mwdma_50_timings[i];
> + }
> + dev_dbg(ftide->dev,
> + "MWDMA write clkreg = %02x, timreg = %02x\n",
> + clkreg, timreg);
> + /* This will affect all devices */
> + writeb(clkreg, ftide->base + CLK_MOD_REG);
ditto
> + writeb(timreg, ftide->base + MWDMA_TIMING_REG);
Moreover MWDMA_TIMING_REG is also shared between devices.
->qc_issue method can be used to program the right tuning values, i.e.
static unsigned int ftide010_qc_issue(struct ata_queued_cmd *qc)
{
struct ata_port *ap = qc->ap;
struct ata_device *adev = qc->dev;
if (adev != ap->private_data && ata_dma_enabled(adev))
ftide010_set_dmamode(ap, adev);
return ata_bmdma_qc_issue(qc);
}
[ set ap->private_data to adev at the end of ftide010_set_dmamode() ]
> + }
> +
> + return;
> +}
> +
> +static void ftide010_set_piomode(struct ata_port *ap, struct ata_device *adev)
> +{
> + struct ftide010 *ftide = ap->host->private_data;
> + unsigned int pio = adev->pio_mode - XFER_PIO_0;
u8 pio
> + dev_dbg(ftide->dev, "set PIO mode %02x, index %d\n",
> + adev->pio_mode, pio);
> + writeb(ftide->pio_timings[pio], ftide->base + PIO_TIMING_REG);
> +}
> +
> +static struct ata_port_operations pata_ftide010_port_ops = {
> + .inherits = &ata_bmdma_port_ops,
> + .set_dmamode = ftide010_set_dmamode,
> + .set_piomode = ftide010_set_piomode,
> +};
> +
> +static struct ata_port_info ftide010_port_info[] = {
> + {
> + .flags = ATA_FLAG_SLAVE_POSS,
> + .mwdma_mask = ATA_MWDMA2,
> + .udma_mask = ATA_UDMA6,
> + .pio_mask = ATA_PIO4,
> + .port_ops = &pata_ftide010_port_ops,
> + },
> +};
> +
> +#if IS_ENABLED(CONFIG_SATA_GEMINI)
> +
> +static int pata_ftide010_gemini_port_start(struct ata_port *ap)
> +{
> + struct ftide010 *ftide = ap->host->private_data;
> + struct device *dev = ftide->dev;
> + struct sata_gemini *sg = ftide->sg;
> + int bridges = 0;
> + int ret;
> +
> + ret = ata_bmdma_port_start(ap);
> + if (ret)
> + return ret;
> +
> + if (ftide->master_to_sata0) {
> + dev_info(dev, "SATA0 (master) start\n");
> + ret = gemini_sata_start_bridge(sg, 0);
> + if (!ret)
> + bridges++;
> + }
> + if (ftide->master_to_sata1) {
> + dev_info(dev, "SATA1 (master) start\n");
> + ret = gemini_sata_start_bridge(sg, 1);
> + if (!ret)
> + bridges++;
> + }
> + /* Avoid double-starting */
> + if (ftide->slave_to_sata0 && !ftide->master_to_sata0) {
> + dev_info(dev, "SATA0 (slave) start\n");
> + ret = gemini_sata_start_bridge(sg, 0);
> + if (!ret)
> + bridges++;
> + }
> + /* Avoid double-starting */
> + if (ftide->slave_to_sata1 && !ftide->master_to_sata1) {
> + dev_info(dev, "SATA1 (slave) start\n");
> + ret = gemini_sata_start_bridge(sg, 1);
> + if (!ret)
> + bridges++;
> + }
> +
> + dev_info(dev, "brought %d bridges online\n", bridges);
> + return (bridges > 0) ? 0 : -EINVAL; // -ENODEV;
> +}
> +
> +static void pata_ftide010_gemini_port_stop(struct ata_port *ap)
> +{
> + struct ftide010 *ftide = ap->host->private_data;
> + struct device *dev = ftide->dev;
> + struct sata_gemini *sg = ftide->sg;
> +
> + if (ftide->master_to_sata0) {
> + dev_info(dev, "SATA0 (master) stop\n");
> + gemini_sata_stop_bridge(sg, 0);
> + }
> + if (ftide->master_to_sata1) {
> + dev_info(dev, "SATA1 (master) stop\n");
> + gemini_sata_stop_bridge(sg, 1);
> + }
> + /* Avoid double-stopping */
> + if (ftide->slave_to_sata0 && !ftide->master_to_sata0) {
> + dev_info(dev, "SATA0 (slave) stop\n");
> + gemini_sata_stop_bridge(sg, 0);
> + }
> + /* Avoid double-stopping */
> + if (ftide->slave_to_sata1 && !ftide->master_to_sata1) {
> + dev_info(dev, "SATA1 (slave) stop\n");
> + gemini_sata_stop_bridge(sg, 1);
> + }
> +}
> +
> +static int pata_ftide010_gemini_cable_detect(struct ata_port *ap)
> +{
> + struct ftide010 *ftide = ap->host->private_data;
> +
> + /*
> + * Return the master cable, I have no clue how to return a different
> + * cable for the slave than for the master.
> + */
Seems like ->cable_detect needs to operate on ata_device * now?
Tejun?
> + return ftide->master_cbl;
> +}
> +
> +static int pata_ftide010_gemini_init(struct ftide010 *ftide,
> + bool is_ata1)
> +{
> + struct device *dev = ftide->dev;
> + struct sata_gemini *sg;
> + enum gemini_muxmode muxmode;
> +
> + /* Look up SATA bridge */
> + sg = gemini_sata_bridge_get();
> + if (IS_ERR(sg))
> + return PTR_ERR(sg);
> + ftide->sg = sg;
> +
> + muxmode = gemini_sata_get_muxmode(sg);
> +
> + /* Special ops */
> + pata_ftide010_port_ops.port_start =
> + pata_ftide010_gemini_port_start;
> + pata_ftide010_port_ops.port_stop =
> + pata_ftide010_gemini_port_stop;
> + pata_ftide010_port_ops.cable_detect =
> + pata_ftide010_gemini_cable_detect;
> +
> + /* Flag port as SATA-capable */
> + if (gemini_sata_bridge_enabled(sg, is_ata1))
> + ftide010_port_info[0].flags |= ATA_FLAG_SATA;
> +
> + if (!is_ata1) {
> + switch (muxmode) {
> + case GEMINI_MUXMODE_0:
> + ftide->master_cbl = ATA_CBL_SATA;
> + ftide->slave_cbl = ATA_CBL_PATA40;
> + ftide->master_to_sata0 = true;
> + break;
> + case GEMINI_MUXMODE_1:
> + ftide->master_cbl = ATA_CBL_SATA;
> + ftide->slave_cbl = ATA_CBL_NONE;
> + ftide->master_to_sata0 = true;
> + break;
> + case GEMINI_MUXMODE_2:
> + ftide->master_cbl = ATA_CBL_PATA40;
> + ftide->slave_cbl = ATA_CBL_PATA40;
> + break;
> + case GEMINI_MUXMODE_3:
> + ftide->master_cbl = ATA_CBL_SATA;
> + ftide->slave_cbl = ATA_CBL_SATA;
> + ftide->master_to_sata0 = true;
> + ftide->slave_to_sata1 = true;
> + break;
> + }
> + } else {
> + switch (muxmode) {
> + case GEMINI_MUXMODE_0:
> + ftide->master_cbl = ATA_CBL_SATA;
> + ftide->slave_cbl = ATA_CBL_NONE;
> + ftide->master_to_sata1 = true;
> + break;
> + case GEMINI_MUXMODE_1:
> + ftide->master_cbl = ATA_CBL_SATA;
> + ftide->slave_cbl = ATA_CBL_PATA40;
> + ftide->master_to_sata1 = true;
> + break;
> + case GEMINI_MUXMODE_2:
> + ftide->master_cbl = ATA_CBL_SATA;
> + ftide->slave_cbl = ATA_CBL_SATA;
> + ftide->slave_to_sata0 = true;
> + ftide->master_to_sata1 = true;
> + break;
> + case GEMINI_MUXMODE_3:
> + ftide->master_cbl = ATA_CBL_PATA40;
> + ftide->slave_cbl = ATA_CBL_PATA40;
> + break;
> + }
It seems that for PATA devices 80-wires cable will be never
used, is this correct?
> + }
> + dev_info(dev, "set up Gemini PATA%d\n", is_ata1);
> +
> + return 0;
> +}
> +#else
> +static int pata_ftide010_gemini_init(struct ftide010 *ftide,
> + bool is_ata1)
> +{
> + return -ENOTSUPP;
> +}
> +#endif
> +
> +/*
> + * Bus timings
> + *
> + * The unit of the below required timings is two clock periods of the ATA
> + * reference clock which is 30 nanoseconds per unit at 66MHz and 20
> + * nanoseconds per unit at 50 MHz. The PIO timings assume 33MHz speed for
> + * PIO.
> + *
> + * pio_active_time: array of 5 elements for T2 timing for Mode 0,
> + * 1, 2, 3 and 4. Range 0..15.
> + * pio_recovery_time: array of 5 elements for T2l timing for Mode 0,
> + * 1, 2, 3 and 4. Range 0..15.
> + * mdma_50_active_time: array of 4 elements for Td timing for multi
> + * word DMA, Mode 0, 1, and 2 at 50 MHz. Range 0..15.
> + * mdma_50_recovery_time: array of 4 elements for Tk timing for
> + * multi word DMA, Mode 0, 1 and 2 at 50 MHz. Range 0..15.
> + * mdma_66_active_time: array of 4 elements for Td timing for multi
> + * word DMA, Mode 0, 1 and 2 at 66 MHz. Range 0..15.
> + * mdma_66_recovery_time: array of 4 elements for Tk timing for
> + * multi word DMA, Mode 0, 1 and 2 at 66 MHz. Range 0..15.
> + * udma_50_setup_time: array of 4 elements for Tvds timing for ultra
> + * DMA, Mode 0, 1, 2, 3, 4 and 5 at 50 MHz. Range 0..7.
> + * udma_50_hold_time: array of 4 elements for Tdvh timing for
> + * multi word DMA, Mode 0, 1, 2, 3, 4 and 5 at 50 MHz, Range 0..7.
> + * udma_66_setup_time: array of 4 elements for Tvds timing for multi
> + * word DMA, Mode 0, 1, 2, 3, 4, 5 and 6 at 66 MHz. Range 0..7.
> + * udma_66_hold_time: array of 4 elements for Tdvh timing for
> + * multi word DMA, Mode 0, 1, 2, 3, 4, 5 and 6 at 66 MHz. Range 0..7.
> + */
> +static const u8 pio_active_time[5] = {10, 10, 10, 3, 3};
> +static const u8 pio_recovery_time[5] = {10, 3, 1, 3, 1};
> +static const u8 mwdma_50_active_time[3] = {6, 2, 2};
> +static const u8 mwdma_50_recovery_time[3] = {6, 2, 1};
> +static const u8 mwdma_66_active_time[3] = {8, 3, 3};
> +static const u8 mwdma_66_recovery_time[3] = {8, 2, 1};
> +static const u8 udma_50_setup_time[6] = {3, 3, 2, 2, 1, 1};
> +static const u8 udma_50_hold_time[6] = {3, 1, 1, 1, 1, 1};
> +static const u8 udma_66_setup_time[7] = {4, 4, 3, 2, };
> +static const u8 udma_66_hold_time[7] = {};
> +
> +static int pata_ftide010_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct device_node *np = dev->of_node;
> + const struct ata_port_info pi = ftide010_port_info[0];
> + const struct ata_port_info *ppi[] = { &pi, NULL };
> + struct ftide010 *ftide;
> + struct resource *res;
> + int irq;
> + int ret;
> + int i;
> +
> + ftide = devm_kzalloc(dev, sizeof(*ftide), GFP_KERNEL);
> + if (!ftide)
> + return -ENOMEM;
> + ftide->dev = dev;
> +
> + irq = platform_get_irq(pdev, 0);
> + if (irq < 0)
> + return irq;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!res)
> + return -ENODEV;
> +
> + ftide->base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(ftide->base))
> + return PTR_ERR(ftide->base);
> +
> + ftide->pclk = devm_clk_get(dev, "PCLK");
> + if (!IS_ERR(ftide->pclk)) {
> + ret = clk_prepare_enable(ftide->pclk);
> + if (ret) {
> + dev_err(dev, "failed to enable PCLK\n");
> + return ret;
> + }
> + }
> +
> + /*
> + * Assign default timings, this can be augmented for different
> + * compatible-strings in the future.
> + */
> + for (i = 0; i < sizeof(ftide->pio_timings); i++) {
> + ftide->pio_timings[i] = (pio_active_time[i] << 4) |
> + pio_recovery_time[i];
> + }
> + for (i = 0; i < sizeof(ftide->mwdma_50_timings); i++) {
> + ftide->mwdma_50_timings[i] = (mwdma_50_active_time[i] << 4) |
> + mwdma_50_recovery_time[i];
> + ftide->mwdma_66_timings[i] = (mwdma_66_active_time[i] << 4) |
> + mwdma_66_recovery_time[i];
> + }
> + for (i = 0; i < sizeof(ftide->udma_50_timings); i++) {
> + ftide->udma_50_timings[i] = (udma_50_setup_time[6] << 4) |
> + udma_50_hold_time[i];
> + ftide->udma_66_timings[i] = (udma_66_setup_time[6] << 4) |
> + udma_66_hold_time[i];
> + }
The timings should not be embedded in ftide structure as they never
change. Please just move corresponding static const tables inside
->set_piomode and ->set_dmamode methods and do actual timings
calculations there (like many other ATA drivers do).
> + /* Some special Cortina Gemini init, if needed */
> + if (of_device_is_compatible(np, "cortina,gemini-pata")) {
> + /*
> + * We need to know which instance is probing (the
> + * Gemini has two instances of FTIDE010) and we do
> + * this simply by looking at the physical base
> + * address, which is 0x63400000 for ATA1, else we
> + * are ATA0. This will also set up the cable types.
> + */
> + ret = pata_ftide010_gemini_init(ftide,
> + (res->start == 0x63400000));
> + if (ret)
> + goto err_dis_clk;
> + } else {
> + /* Else assume we are connected using PATA40 */
> + ftide->master_cbl = ATA_CBL_PATA40;
> + ftide->slave_cbl = ATA_CBL_PATA40;
> + }
> +
> + ftide->host = ata_host_alloc_pinfo(dev, ppi, 1);
> + if (!ftide->host) {
> + ret = -ENOMEM;
> + goto err_dis_clk;
> + }
> + ftide->host->private_data = ftide;
> +
> + for (i = 0; i < ftide->host->n_ports; i++) {
> + struct ata_port *ap = ftide->host->ports[i];
> + struct ata_ioports *ioaddr = &ap->ioaddr;
> +
> + ioaddr->bmdma_addr = ftide->base + DMA_REG;
> + ioaddr->cmd_addr = ftide->base + CMD_DATA_REG;
> + ioaddr->ctl_addr = ftide->base + ALTSTAT_CTRL_REG;
> + ioaddr->altstatus_addr = ftide->base + ALTSTAT_CTRL_REG;
> + ata_sff_std_ports(ioaddr);
> + }
> +
> + dev_info(dev, "device ID %08x, irq %d, io base 0x%08x\n",
> + readl(ftide->base + IDE_DEVICE_ID), irq, res->start);
> +
> + ret = ata_host_activate(ftide->host, irq, ata_bmdma_interrupt,
> + 0, &pata_ftide010_sht);
> + if (ret)
> + goto err_dis_clk;
> +
> + return 0;
> +
> +err_dis_clk:
> + if (!IS_ERR(ftide->pclk))
> + clk_disable_unprepare(ftide->pclk);
> + return ret;
> +}
> +
> +static int pata_ftide010_remove(struct platform_device *pdev)
> +{
> + struct ata_host *host = platform_get_drvdata(pdev);
> + struct ftide010 *ftide = host->private_data;
> +
> + ata_host_detach(ftide->host);
> + if (!IS_ERR(ftide->pclk))
> + clk_disable_unprepare(ftide->pclk);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id pata_ftide010_of_match[] = {
> + {
> + .compatible = "faraday,ftide010",
> + },
> + {},
> +};
> +
> +static struct platform_driver pata_ftide010_driver = {
> + .driver = {
> + .name = "ftide010",
Please use DRV_NAME here.
> + .of_match_table = of_match_ptr(pata_ftide010_of_match),
> + },
> + .probe = pata_ftide010_probe,
> + .remove = pata_ftide010_remove,
> +};
> +module_platform_driver(pata_ftide010_driver);
> +
> +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:pata-ftide010");
MODULE_ALIAS("platform:pata_ftide010");
> diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
> new file mode 100644
> index 000000000000..2618dbf5fc44
> --- /dev/null
> +++ b/drivers/ata/sata_gemini.c
> @@ -0,0 +1,419 @@
> +/*
> + * Cortina Systems Gemini SATA bridge add-on to Faraday FTIDE010
> + * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
> + */
> +
> +#include <linux/init.h>
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/bitops.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/regmap.h>
> +#include <linux/delay.h>
> +#include <linux/reset.h>
> +#include <linux/of_address.h>
> +#include <linux/of_device.h>
> +#include <linux/clk.h>
> +#include <linux/io.h>
> +#include "sata_gemini.h"
> +
> +/**
> + * struct sata_gemini - a state container for a Gemini SATA bridge
> + * @dev: the containing device
> + * @base: remapped I/O memory base
> + * @muxmode: the current muxing mode
> + * @ide_pins: if the device is using the plain IDE interface pins
> + * @sata_bridge: if the device enables the SATA bridge
> + * @sata0_reset: SATA0 reset handler
> + * @sata1_reset: SATA1 reset handler
> + * @sata0_pclk: SATA0 PCLK handler
> + * @sata1_pclk: SATA1 PCLK handler
> + */
> +struct sata_gemini {
> + struct device *dev;
> + void __iomem *base;
> + enum gemini_muxmode muxmode;
> + bool ide_pins;
> + bool sata_bridge;
> + struct reset_control *sata0_reset;
> + struct reset_control *sata1_reset;
> + struct clk *sata0_pclk;
> + struct clk *sata1_pclk;
> +};
> +
> +/* Global IDE PAD Skew Control Register */
> +#define GLOBAL_IDE_SKEW_CTRL 0x18
> +#define IDE1_HOST_STROBE_DELAY_SHIFT 28
> +#define IDE1_DEVICE_STROBE_DELAY_SHIFT 24
> +#define IDE1_OUTPUT_IO_SKEW_SHIFT 20
> +#define IDE1_INPUT_IO_SKEW_SHIFT 16
> +#define IDE0_HOST_STROBE_DELAY_SHIFT 12
> +#define IDE0_DEVICE_STROBE_DELAY_SHIFT 8
> +#define IDE0_OUTPUT_IO_SKEW_SHIFT 4
> +#define IDE0_INPUT_IO_SKEW_SHIFT 0
How's about using GEMINI_ prefix for these defines?
> +/* Miscellaneous Control Register */
> +#define GLOBAL_MISC_CTRL 0x30
> +/*
> + * Values of IDE IOMUX bits in the misc control register
> + *
> + * Bits 26:24 are "IDE IO Select", which decides what SATA
> + * adapters are connected to which of the two IDE/ATA
> + * controllers in the Gemini. We can connect the two IDE blocks
> + * to one SATA adapter each, both acting as master, or one IDE
> + * blocks to two SATA adapters so the IDE block can act in a
> + * master/slave configuration.
> + *
> + * We also bring out different blocks on the actual IDE
> + * pins (not SATA pins) if (and only if) these are muxed in.
> + *
> + * 111-100 - Reserved
> + * Mode 0: 000 - ata0 master <-> sata0
> + * ata1 master <-> sata1
> + * ata0 slave interface brought out on IDE pads
> + * Mode 1: 001 - ata0 master <-> sata0
> + * ata1 master <-> sata1
> + * ata1 slave interface brought out on IDE pads
> + * Mode 2: 010 - ata1 master <-> sata1
> + * ata1 slave <-> sata0
> + * ata0 master and slave interfaces brought out
> + * on IDE pads
> + * Mode 3: 011 - ata0 master <-> sata0
> + * ata1 slave <-> sata1
> + * ata1 master and slave interfaces brought out
> + * on IDE pads
> + */
> +#define IDE_IOMUX_MASK (7 << 24)
> +#define IDE_IOMUX_MODE0 (0 << 24)
> +#define IDE_IOMUX_MODE1 (1 << 24)
> +#define IDE_IOMUX_MODE2 (2 << 24)
> +#define IDE_IOMUX_MODE3 (3 << 24)
> +#define IDE_IOMUX_SHIFT (24)
> +#define IDE_PADS_ENABLE BIT(4)
> +#define PFLASH_PADS_DISABLE BIT(1)
ditto
> +/*
> + * Registers directly controlling the PATA<->SATA adapters
> + */
> +#define SATA_ID 0x00
> +#define SATA_PHY_ID 0x04
> +#define SATA0_STATUS 0x08
> +#define SATA1_STATUS 0x0c
> +#define SATA0_CTRL 0x18
> +#define SATA1_CTRL 0x1c
> +
> +#define SATA_STATUS_BIST_DONE BIT(5)
> +#define SATA_STATUS_BIST_OK BIT(4)
> +#define SATA_STATUS_PHY_READY BIT(0)
> +
> +#define SATA_CTRL_PHY_BIST_EN BIT(14)
> +#define SATA_CTRL_PHY_FORCE_IDLE BIT(13)
> +#define SATA_CTRL_PHY_FORCE_READY BIT(12)
> +#define SATA_CTRL_PHY_AFE_LOOP_EN BIT(10)
> +#define SATA_CTRL_PHY_DIG_LOOP_EN BIT(9)
> +#define SATA_CTRL_HOTPLUG_DETECT_EN BIT(4)
> +#define SATA_CTRL_ATAPI_EN BIT(3)
> +#define SATA_CTRL_BUS_WITH_20 BIT(2)
> +#define SATA_CTRL_SLAVE_EN BIT(1)
> +#define SATA_CTRL_EN BIT(0)
ditto
> +/*
> + * There is only ever one instance of this bridge on a system,
> + * so create a singleton so that the FTIDE010 instances can grab
> + * a reference to it.
> + */
> +static struct sata_gemini *sg_singleton;
> +
> +struct sata_gemini *gemini_sata_bridge_get(void)
> +{
> + if (sg_singleton)
> + return sg_singleton;
> + return ERR_PTR(-EPROBE_DEFER);
> +}
> +EXPORT_SYMBOL(gemini_sata_bridge_get);
> +
> +bool gemini_sata_bridge_enabled(struct sata_gemini *sg, bool is_ata1)
> +{
> + if (!sg->sata_bridge)
> + return false;
> + /*
> + * In muxmode 2 and 3 one of the ATA controllers is
> + * actually not connected to any SATA bridge.
> + */
> + if ((sg->muxmode == GEMINI_MUXMODE_2) &&
> + !is_ata1)
> + return false;
> + if ((sg->muxmode == GEMINI_MUXMODE_3) &&
> + is_ata1)
> + return false;
> +
> + return true;
> +}
> +EXPORT_SYMBOL(gemini_sata_bridge_enabled);
> +
> +enum gemini_muxmode gemini_sata_get_muxmode(struct sata_gemini *sg)
> +{
> + return sg->muxmode;
> +}
> +EXPORT_SYMBOL(gemini_sata_get_muxmode);
> +
> +static int gemini_sata_setup_bridge(struct sata_gemini *sg,
> + unsigned int bridge)
> +{
> + unsigned long timeout = jiffies + (HZ * 1);
> + bool bridge_online;
> + u32 val;
> +
> + if (bridge == 0) {
> + val = SATA_CTRL_HOTPLUG_DETECT_EN | SATA_CTRL_EN;
> + /* SATA0 slave mode is only used in muxmode 2 */
> + if (sg->muxmode == GEMINI_MUXMODE_2)
> + val |= SATA_CTRL_SLAVE_EN;
> + writel(val, sg->base + SATA0_CTRL);
> + } else {
> + val = SATA_CTRL_HOTPLUG_DETECT_EN | SATA_CTRL_EN;
> + /* SATA1 slave mode is only used in muxmode 3 */
> + if (sg->muxmode == GEMINI_MUXMODE_3)
> + val |= SATA_CTRL_SLAVE_EN;
> + writel(val, sg->base + SATA1_CTRL);
> + }
> +
> + /* Vendor code waits 10 ms here */
> + msleep(10);
> +
> + /* Wait for PHY to become ready */
> + do {
> + msleep(100);
> +
> + if (bridge == 0)
> + val = readl(sg->base + SATA0_STATUS);
> + else
> + val = readl(sg->base + SATA1_STATUS);
> + if (val & SATA_STATUS_PHY_READY)
> + break;
> + } while (time_before(jiffies, timeout));
> +
> + bridge_online = !!(val & SATA_STATUS_PHY_READY);
> +
> + dev_info(sg->dev, "SATA%d PHY %s\n", bridge,
> + bridge_online ? "ready" : "not ready");
> +
> + return bridge_online ? 0: -ENODEV;
> +}
> +
> +int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge)
> +{
> + struct clk *pclk;
> + int ret;
> +
> + if (bridge == 0)
> + pclk = sg->sata0_pclk;
> + else
> + pclk = sg->sata1_pclk;
> + clk_enable(pclk);
> + msleep(10);
> +
> + /* Do not keep clocking a bridge that is not online */
> + ret = gemini_sata_setup_bridge(sg, bridge);
> + if (ret)
> + clk_disable(pclk);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL(gemini_sata_start_bridge);
> +
> +void gemini_sata_stop_bridge(struct sata_gemini *sg, unsigned int bridge)
> +{
> + if (bridge == 0)
> + clk_disable(sg->sata0_pclk);
> + else if (bridge == 1)
> + clk_disable(sg->sata1_pclk);
> +}
> +EXPORT_SYMBOL(gemini_sata_stop_bridge);
> +
> +int gemini_sata_reset_bridge(struct sata_gemini *sg,
> + unsigned int bridge)
> +{
> + if (bridge == 0)
> + reset_control_reset(sg->sata0_reset);
> + else
> + reset_control_reset(sg->sata1_reset);
> + msleep(10);
> + return gemini_sata_setup_bridge(sg, bridge);
> +}
> +EXPORT_SYMBOL(gemini_sata_reset_bridge);
> +
> +static int gemini_sata_bridge_init(struct sata_gemini *sg)
> +{
> + struct device *dev = sg->dev;
> + u32 sata_id, sata_phy_id;
> + int ret;
> +
> + sg->sata0_pclk = devm_clk_get(dev, "SATA0_PCLK");
> + if (IS_ERR(sg->sata0_pclk)) {
> + dev_err(dev, "no SATA0 PCLK");
> + return -ENODEV;
> + }
> + sg->sata1_pclk = devm_clk_get(dev, "SATA1_PCLK");
> + if (IS_ERR(sg->sata1_pclk)) {
> + dev_err(dev, "no SATA1 PCLK");
> + return -ENODEV;
> + }
> +
> + ret = clk_prepare_enable(sg->sata0_pclk);
> + if (ret) {
> + pr_err("failed to enable SATA0 PCLK\n");
> + return ret;
> + }
> + ret = clk_prepare_enable(sg->sata1_pclk);
> + if (ret) {
clk_disable_unprepare(sg->sata0_pclk);
> + pr_err("failed to enable SATA1 PCLK\n");
> + return ret;
> + }
> +
> + sg->sata0_reset = devm_reset_control_get(dev, "sata0");
> + if (IS_ERR(sg->sata0_reset)) {
clk_disable_unprepare(sg->sata1_pclk);
clk_disable_unprepare(sg->sata0_pclk);
> + dev_err(dev, "no SATA0 reset controller\n");
> + return PTR_ERR(sg->sata0_reset);
> + }
> + sg->sata1_reset = devm_reset_control_get(dev, "sata1");
> + if (IS_ERR(sg->sata1_reset)) {
ditto
> + dev_err(dev, "no SATA1 reset controller\n");
> + return PTR_ERR(sg->sata1_reset);
> + }
> +
> + sata_id = readl(sg->base + SATA_ID);
> + sata_phy_id = readl(sg->base + SATA_PHY_ID);
> + sg->sata_bridge = true;
> + clk_disable(sg->sata0_pclk);
> + clk_disable(sg->sata1_pclk);
> +
> + dev_info(dev, "SATA ID %08x, PHY ID: %08x\n", sata_id, sata_phy_id);
> +
> + return 0;
> +}
> +
> +static int gemini_sata_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct device_node *np = dev->of_node;
> + struct sata_gemini *sg;
> + static struct regmap *map;
> + struct resource *res;
> + enum gemini_muxmode muxmode;
> + u32 gmode;
> + u32 gmask;
> + u32 val;
> + int ret;
> +
> + sg = devm_kzalloc(dev, sizeof(*sg), GFP_KERNEL);
> + if (!sg)
> + return -ENOMEM;
> + sg->dev = dev;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!res)
> + return -ENODEV;
> +
> + sg->base = devm_ioremap_resource(dev, res);
> + if (IS_ERR(sg->base))
> + return PTR_ERR(sg->base);
> +
> + map = syscon_regmap_lookup_by_phandle(np, "syscon");
> + if (IS_ERR(map)) {
> + dev_err(dev, "no global syscon\n");
> + return PTR_ERR(map);
> + }
> +
> + /* Set up the SATA bridge if need be */
> + if (of_property_read_bool(np, "cortina,gemini-enable-sata-bridge")) {
> + ret = gemini_sata_bridge_init(sg);
> + if (ret)
> + return ret;
> + }
> +
> + if (of_property_read_bool(np, "cortina,gemini-enable-ide-pins"))
> + sg->ide_pins = true;
> +
> + if (!sg->sata_bridge && !sg->ide_pins) {
ditto
> + dev_err(dev, "neither SATA bridge or IDE output enabled\n");
> + return -EINVAL;
> + }
> +
> + ret = of_property_read_u32(np, "cortina,gemini-ata-muxmode", &muxmode);
> + if (ret) {
ditto
> + dev_err(dev, "could not parse ATA muxmode\n");
> + return ret;
> + }
> + if (muxmode > GEMINI_MUXMODE_3) {
ditto
> + dev_err(dev, "illegal muxmode %d\n", muxmode);
> + return -EINVAL;
> + }
> + sg->muxmode = muxmode;
> + gmask = IDE_IOMUX_MASK;
> + gmode = (muxmode << IDE_IOMUX_SHIFT);
> +
> + /*
> + * If we mux out the IDE, parallel flash must be disabled.
> + * SATA0 and SATA1 have dedicated pins and may coexist with
> + * parallel flash.
> + */
> + if (sg->ide_pins)
> + gmode |= IDE_PADS_ENABLE | PFLASH_PADS_DISABLE;
> + else
> + gmask |= IDE_PADS_ENABLE;
> +
> + ret = regmap_update_bits(map, GLOBAL_MISC_CTRL, gmask, gmode);
> + if (ret) {
ditto
> + dev_err(dev, "unable to set up IDE muxing\n");
> + return -ENODEV;
> + }
> +
> + /* FIXME: add more elaborate IDE skew control handling */
> + if (sg->ide_pins) {
> + ret = regmap_read(map, GLOBAL_IDE_SKEW_CTRL, &val);
> + if (ret) {
ditto
> + dev_err(dev, "cannot read IDE skew control register\n");
> + return ret;
> + }
> + dev_info(dev, "IDE skew control: %08x\n", val);
> + }
> +
> + dev_info(dev, "set up the Gemini IDE/SATA nexus\n");
> + platform_set_drvdata(pdev, sg);
> + sg_singleton = sg;
> +
> + return 0;
> +}
> +
> +static int gemini_sata_remove(struct platform_device *pdev)
> +{
> + struct sata_gemini *sg = platform_get_drvdata(pdev);
> +
> + clk_unprepare(sg->sata0_pclk);
> + clk_unprepare(sg->sata1_pclk);
> + sg_singleton = NULL;
The ordering should be reversed for consistency.
> + return 0;
> +}
> +
> +static const struct of_device_id gemini_sata_of_match[] = {
> + {
> + .compatible = "cortina,gemini-sata-bridge",
> + },
> + {},
> +};
> +
> +static struct platform_driver gemini_sata_driver = {
> + .driver = {
> + .name = "gemini-sata-bridge",
"gemini_sata_bridge" and please use DRV_NAME
> + .of_match_table = of_match_ptr(gemini_sata_of_match),
> + },
> + .probe = gemini_sata_probe,
> + .remove = gemini_sata_remove,
> +};
> +module_platform_driver(gemini_sata_driver);
> +
> +MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:gemini-sata-bridge");
MODULE_ALIAS("platform:gemini_sata_bridge");
> diff --git a/drivers/ata/sata_gemini.h b/drivers/ata/sata_gemini.h
> new file mode 100644
> index 000000000000..ca1837a394c8
> --- /dev/null
> +++ b/drivers/ata/sata_gemini.h
> @@ -0,0 +1,21 @@
> +/* Header for the Gemini SATA bridge */
> +#ifndef SATA_GEMINI_H
> +#define SATA_GEMINI_H
> +
> +struct sata_gemini;
> +
> +enum gemini_muxmode {
> + GEMINI_MUXMODE_0 = 0,
> + GEMINI_MUXMODE_1,
> + GEMINI_MUXMODE_2,
> + GEMINI_MUXMODE_3,
> +};
> +
> +struct sata_gemini *gemini_sata_bridge_get(void);
> +bool gemini_sata_bridge_enabled(struct sata_gemini *sg, bool is_ata1);
> +enum gemini_muxmode gemini_sata_get_muxmode(struct sata_gemini *sg);
> +int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge);
> +void gemini_sata_stop_bridge(struct sata_gemini *sg, unsigned int bridge);
> +int gemini_sata_reset_bridge(struct sata_gemini *sg, unsigned int bridge);
> +
> +#endif
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
^ permalink raw reply
* Re: [PATCH] Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
From: Andy Shevchenko @ 2017-05-30 13:55 UTC (permalink / raw)
To: Linus Walleij, Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, stable
In-Reply-To: <20170530135256.9966-1-linus.walleij@linaro.org>
On Tue, 2017-05-30 at 15:52 +0200, Linus Walleij wrote:
> This reverts commit 368e5fbdfc60732643f34f538823ed4bc8829827.
>
> My NAS stopped to mount root when I went from some v4.10-rc1
> to v4.12-rc3. Investigation of the bootlog yields this:
>
> sata_mv f1080000.sata: can't request region for resource [mem
> 0xf1080000-0xf1084fff]
> sata_mv: probe of f1080000.sata failed with error -16
>
> Reverting this offending patch makes the sata_mv probe and
> my SATA drive can mount root again, hooray!
It's already in upstream (ata tree).
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply
* [PATCH] Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
From: Linus Walleij @ 2017-05-30 13:52 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz
Cc: linux-ide, Linus Walleij, stable, Andy Shevchenko
This reverts commit 368e5fbdfc60732643f34f538823ed4bc8829827.
My NAS stopped to mount root when I went from some v4.10-rc1
to v4.12-rc3. Investigation of the bootlog yields this:
sata_mv f1080000.sata: can't request region for resource [mem 0xf1080000-0xf1084fff]
sata_mv: probe of f1080000.sata failed with error -16
Reverting this offending patch makes the sata_mv probe and
my SATA drive can mount root again, hooray!
Cc: stable@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
The problem is probably caused by overlapping resources in
the device tree, for which ioremap() and ioremap_resource()
have different semantics: the former allows it, the latter
does not.
A proper fix probably includes amending the device tree to
not have overlapping resources.
---
drivers/ata/sata_mv.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index b66bcda88320..3b2246dded74 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4067,7 +4067,6 @@ static int mv_platform_probe(struct platform_device *pdev)
struct ata_host *host;
struct mv_host_priv *hpriv;
struct resource *res;
- void __iomem *mmio;
int n_ports = 0, irq = 0;
int rc;
int port;
@@ -4086,9 +4085,8 @@ static int mv_platform_probe(struct platform_device *pdev)
* Get the register base first
*/
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- mmio = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(mmio))
- return PTR_ERR(mmio);
+ if (res == NULL)
+ return -EINVAL;
/* allocate host */
if (pdev->dev.of_node) {
@@ -4132,7 +4130,12 @@ static int mv_platform_probe(struct platform_device *pdev)
hpriv->board_idx = chip_soc;
host->iomap = NULL;
- hpriv->base = mmio - SATAHC0_REG_BASE;
+ hpriv->base = devm_ioremap(&pdev->dev, res->start,
+ resource_size(res));
+ if (!hpriv->base)
+ return -ENOMEM;
+
+ hpriv->base -= SATAHC0_REG_BASE;
hpriv->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(hpriv->clk))
--
2.9.4
^ permalink raw reply related
* Re: [PATCH 1/6] ata: bf54x: cut drvdata assignment
From: Sergei Shtylyov @ 2017-05-30 12:22 UTC (permalink / raw)
To: Linus Walleij, Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
Hello!
On 05/30/2017 12:46 PM, Linus Walleij wrote:
> ata_host_alloc_pinfo() assigns the host pointer to the
> struct device * drvdata, do not assign it a second time.
It's actually driver_data, not drvdata.
Personally, I now prefer expressing the *struct* fields the C++ way:
device::driver_data. :-)
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
MBR, Sergei
^ permalink raw reply
* [PATCH 4/4 v3] ARM: dts: add Gemini PATA/SATA support
From: Linus Walleij @ 2017-05-30 11:34 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz, linux-ide
Cc: Janos Laube, Paulius Zaleckas, linux-arm-kernel, Hans Ulli Kroll,
Florian Fainelli, Linus Walleij, John Feng-Hsin Chiang,
Greentime Hu
In-Reply-To: <20170530113402.20450-1-linus.walleij@linaro.org>
The NAS4229B and SQ201 Gemini systems have a PATA controller
which is linked to a SATA bridge in the SoC. Enable both
platforms to use the PATA/SATA devices.
Cc: John Feng-Hsin Chiang <john453@faraday-tech.com>
Cc: Greentime Hu <green.hu@gmail.com>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- No changes, just resending to keep the patch set together.
- Cut the timings also from the second device instance.
ChangeLog v1->v2:
- Cut the timings - we open code these in the driver instead.
- Reference syscon node for clocks and resets as requested by
the devicetree reviewers.
- Use reset line #defines from the new header file.
PATA maintainers: this file will be applied by me through the ARM
SoC git tree. It is provided for reference only so you see how
it will be used.
---
arch/arm/boot/dts/gemini-nas4220b.dts | 10 ++++++++++
arch/arm/boot/dts/gemini-sq201.dts | 10 ++++++++++
arch/arm/boot/dts/gemini.dtsi | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+)
diff --git a/arch/arm/boot/dts/gemini-nas4220b.dts b/arch/arm/boot/dts/gemini-nas4220b.dts
index 7668ba52158e..55f6a4f1f801 100644
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -98,5 +98,15 @@
read-only;
};
};
+
+ sata: sata@46000000 {
+ cortina,gemini-ata-muxmode = <0>;
+ cortina,gemini-enable-sata-bridge;
+ status = "okay";
+ };
+
+ ata@63000000 {
+ status = "okay";
+ };
};
};
diff --git a/arch/arm/boot/dts/gemini-sq201.dts b/arch/arm/boot/dts/gemini-sq201.dts
index 46309e79cc7b..4d200f0bcd45 100644
--- a/arch/arm/boot/dts/gemini-sq201.dts
+++ b/arch/arm/boot/dts/gemini-sq201.dts
@@ -93,6 +93,12 @@
};
};
+ sata: sata@46000000 {
+ cortina,gemini-ata-muxmode = <0>;
+ cortina,gemini-enable-sata-bridge;
+ status = "okay";
+ };
+
pci@50000000 {
status = "okay";
interrupt-map-mask = <0xf800 0 0 7>;
@@ -114,5 +120,9 @@
<0x6000 0 0 3 &pci_intc 1>,
<0x6000 0 0 4 &pci_intc 2>;
};
+
+ ata@63000000 {
+ status = "okay";
+ };
};
};
diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi
index 8e833744e855..49cce9e9d51f 100644
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -83,6 +83,19 @@
clock-names = "PCLK", "EXTCLK";
};
+ sata: sata@46000000 {
+ compatible = "cortina,gemini-sata-bridge";
+ reg = <0x46000000 0x100>;
+ resets = <&syscon GEMINI_RESET_SATA0>,
+ <&syscon GEMINI_RESET_SATA1>;
+ reset-names = "sata0", "sata1";
+ clocks = <&syscon GEMINI_CLK_GATE_SATA0>,
+ <&syscon GEMINI_CLK_GATE_SATA1>;
+ clock-names = "SATA0_PCLK", "SATA1_PCLK";
+ syscon = <&syscon>;
+ status = "disabled";
+ };
+
intcon: interrupt-controller@48000000 {
compatible = "faraday,ftintc010";
reg = <0x48000000 0x1000>;
@@ -178,6 +191,28 @@
};
};
+ ata@63000000 {
+ compatible = "cortina,gemini-pata", "faraday,ftide010";
+ reg = <0x63000000 0x1000>;
+ interrupts = <4 IRQ_TYPE_EDGE_RISING>;
+ resets = <&syscon GEMINI_RESET_IDE>;
+ clocks = <&syscon GEMINI_CLK_GATE_IDE>;
+ clock-names = "PCLK";
+ sata = <&sata>;
+ status = "disabled";
+ };
+
+ ata@63400000 {
+ compatible = "cortina,gemini-pata", "faraday,ftide010";
+ reg = <0x63400000 0x1000>;
+ interrupts = <5 IRQ_TYPE_EDGE_RISING>;
+ resets = <&syscon GEMINI_RESET_IDE>;
+ clocks = <&syscon GEMINI_CLK_GATE_IDE>;
+ clock-names = "PCLK";
+ sata = <&sata>;
+ status = "disabled";
+ };
+
dma-controller@67000000 {
compatible = "faraday,ftdma020", "arm,pl080", "arm,primecell";
/* Faraday Technology FTDMAC020 variant */
--
2.9.4
^ permalink raw reply related
* [PATCH 3/4 v3] ata: Add driver for Faraday Technology FTIDE010
From: Linus Walleij @ 2017-05-30 11:34 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz, linux-ide
Cc: Janos Laube, Paulius Zaleckas, linux-arm-kernel, Hans Ulli Kroll,
Florian Fainelli, Linus Walleij, John Feng-Hsin Chiang,
Greentime Hu
In-Reply-To: <20170530113402.20450-1-linus.walleij@linaro.org>
This adds a driver for the Faraday Technology FTIDE010
PATA IP block.
When used with the Storlink/Storm/Cortina Systems Gemini
SoC, the PATA interface is accompanied by a PATA<->SATA
bridge, so while the device appear as a PATA controller,
it attaches physically to SATA disks, and also has a
designated memory area with registers to set up the bridge.
The Gemini SATA bridge is separated into its own driver
file to make things modular and make it possible to reuse
the PATA driver as stand-alone on other systems than the
Gemini.
dmesg excerpt from the D-Link DIR-685 storage router:
gemini-sata-bridge 46000000.sata: SATA ID 00000e00, PHY ID: 01000100
gemini-sata-bridge 46000000.sata: set up the Gemini IDE/SATA nexus
ftide010 63000000.ata: set up Gemini PATA0
ftide010 63000000.ata: device ID 00000500, irq 26, io base 0x63000000
ftide010 63000000.ata: SATA0 (master) start
gemini-sata-bridge 46000000.sata: SATA0 PHY ready
scsi host0: pata-ftide010
ata1: PATA max UDMA/133 irq 26
ata1.00: ATA-8: INTEL SSDSA2CW120G3, 4PC10302, max UDMA/133
ata1.00: 234441648 sectors, multi 1: LBA48 NCQ (depth 0/32)
ata1.00: configured for UDMA/133
scsi 0:0:0:0: Direct-Access ATA INTEL SSDSA2CW12 0302 PQ: 0 ANSI: 5
ata1.00: Enabling discard_zeroes_data
sd 0:0:0:0: [sda] 234441648 512-byte logical blocks: (120 GB/112 GiB)
sd 0:0:0:0: [sda] Write Protect is off
sd 0:0:0:0: [sda] Write cache: enabled, read cache:
enabled, doesn't support DPO or FUA
ata1.00: Enabling discard_zeroes_data
ata1.00: Enabling discard_zeroes_data
sd 0:0:0:0: [sda] Attached SCSI disk
After this I can flawlessly mount and read/write copy etc files
from /dev/sda[n].
Cc: John Feng-Hsin Chiang <john453@faraday-tech.com>
Cc: Greentime Hu <green.hu@gmail.com>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Remove the call to platform_set_drvdata() which was
overwriting the host pointer. Rely instead on
host->private_data like everyone else.
ChangeLog v1->v2:
- Drop the parsing of timings from the device tree, instead
keeping it in the driver, copying over the documentation
from the device tree and the nice structure so that
it's easy to modify for other SoCs.
- Some fixes to bail out from .port_start() if there is no
drive connected to the bridge, without us having to wait
for a timeout.
- Fix up the inclusion guard in the header file to be an
inclusion guard and not #ifdef CONFIG_FOO (which will anyways
not work for things compiled as module).
---
MAINTAINERS | 9 +
drivers/ata/Kconfig | 21 ++
drivers/ata/Makefile | 2 +
drivers/ata/pata_ftide010.c | 552 ++++++++++++++++++++++++++++++++++++++++++++
drivers/ata/sata_gemini.c | 419 +++++++++++++++++++++++++++++++++
drivers/ata/sata_gemini.h | 21 ++
6 files changed, 1024 insertions(+)
create mode 100644 drivers/ata/pata_ftide010.c
create mode 100644 drivers/ata/sata_gemini.c
create mode 100644 drivers/ata/sata_gemini.h
diff --git a/MAINTAINERS b/MAINTAINERS
index f7d568b8f133..96753be12026 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7531,6 +7531,15 @@ S: Maintained
F: drivers/ata/pata_*.c
F: drivers/ata/ata_generic.c
+LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
+M: Linus Walleij <linus.walleij@linaro.org>
+L: linux-ide@vger.kernel.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S: Maintained
+F: drivers/ata/pata_ftide010.c
+F: drivers/ata/sata_gemini.c
+F: drivers/ata/sata_gemini.h
+
LIBATA SATA AHCI PLATFORM devices support
M: Hans de Goede <hdegoede@redhat.com>
M: Tejun Heo <tj@kernel.org>
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index de3eaf051697..948fc86980a1 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -213,6 +213,16 @@ config SATA_FSL
If unsure, say N.
+config SATA_GEMINI
+ tristate "Gemini SATA bridge support"
+ depends on PATA_FTIDE010
+ default ARCH_GEMINI
+ help
+ This enabled support for the FTIDE010 to SATA bridge
+ found in Cortina Systems Gemini platform.
+
+ If unsure, say N.
+
config SATA_AHCI_SEATTLE
tristate "AMD Seattle 6.0Gbps AHCI SATA host controller support"
depends on ARCH_SEATTLE
@@ -599,6 +609,17 @@ config PATA_EP93XX
If unsure, say N.
+config PATA_FTIDE010
+ tristate "Faraday Technology FTIDE010 PATA support"
+ depends on OF
+ depends on ARM
+ default ARCH_GEMINI
+ help
+ This option enables support for the Faraday FTIDE010
+ PATA controller found in the Cortina Gemini SoCs.
+
+ If unsure, say N.
+
config PATA_HPT366
tristate "HPT 366/368 PATA support"
depends on PCI
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index cd931a5eba92..a26ef5a93919 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_SATA_ACARD_AHCI) += acard-ahci.o libahci.o
obj-$(CONFIG_SATA_AHCI_SEATTLE) += ahci_seattle.o libahci.o libahci_platform.o
obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o libahci_platform.o
obj-$(CONFIG_SATA_FSL) += sata_fsl.o
+obj-$(CONFIG_SATA_GEMINI) += sata_gemini.o
obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o
obj-$(CONFIG_SATA_SIL24) += sata_sil24.o
obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o
@@ -60,6 +61,7 @@ obj-$(CONFIG_PATA_CS5536) += pata_cs5536.o
obj-$(CONFIG_PATA_CYPRESS) += pata_cypress.o
obj-$(CONFIG_PATA_EFAR) += pata_efar.o
obj-$(CONFIG_PATA_EP93XX) += pata_ep93xx.o
+obj-$(CONFIG_PATA_FTIDE010) += pata_ftide010.o
obj-$(CONFIG_PATA_HPT366) += pata_hpt366.o
obj-$(CONFIG_PATA_HPT37X) += pata_hpt37x.o
obj-$(CONFIG_PATA_HPT3X2N) += pata_hpt3x2n.o
diff --git a/drivers/ata/pata_ftide010.c b/drivers/ata/pata_ftide010.c
new file mode 100644
index 000000000000..d3acf72039e2
--- /dev/null
+++ b/drivers/ata/pata_ftide010.c
@@ -0,0 +1,552 @@
+/*
+ * Faraday Technology FTIDE010 driver
+ * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
+ *
+ * Includes portions of the SL2312/SL3516/Gemini PATA driver
+ * Copyright (C) 2003 StorLine, Inc <jason@storlink.com.tw>
+ * Copyright (C) 2009 Janos Laube <janos.dev@gmail.com>
+ * Copyright (C) 2010 Frederic Pecourt <opengemini@free.fr>
+ * Copyright (C) 2011 Tobias Waldvogel <tobias.waldvogel@gmail.com>
+ */
+
+#include <linux/platform_device.h>
+#include <linux/module.h>
+#include <linux/libata.h>
+#include <linux/bitops.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/clk.h>
+#include "sata_gemini.h"
+
+/**
+ * struct ftide010 - state container for the Faraday FTIDE010
+ * @dev: pointer back to the device representing this controller
+ * @base: remapped I/O space address
+ * @pclk: peripheral clock for the IDE block
+ * @host: pointer to the ATA host for this device
+ * @pio_timings: combined active/recovery values to be written to
+ * the PIO timing register for modes 0, 1, 2, 3 and 4.
+ * @mwdma_50_timings: combined active/recovery values to be written
+ * to the multiword DMA mode timing register for modes 0, 1 and 2
+ * at 50MHz speed
+ * @mwdma_66_timings: same as @mwdma_50_timings but for 66MHz
+ * @udma_50_timings: combined setup/hold values to be written
+ * to the ultra DMA mode timing register for modes 0-5 at 50MHz
+ * speed
+ * @udma_66_timings: combined setup/hold values to be written
+ * to the ultra DMA mode timing register for modes 0-6 at 66MHz
+ * speed
+ * @master_cbl: master cable type
+ * @slave_cbl: slave cable type
+ * @sg: Gemini SATA bridge pointer, if running on the Gemini
+ */
+struct ftide010 {
+ struct device *dev;
+ void __iomem *base;
+ struct clk *pclk;
+ struct ata_host *host;
+ u8 pio_timings[5];
+ u8 mwdma_50_timings[3];
+ u8 mwdma_66_timings[3];
+ u8 udma_50_timings[6];
+ u8 udma_66_timings[7];
+ unsigned int master_cbl;
+ unsigned int slave_cbl;
+ /* Gemini-specific properties */
+ struct sata_gemini *sg;
+ bool master_to_sata0;
+ bool slave_to_sata0;
+ bool master_to_sata1;
+ bool slave_to_sata1;
+};
+
+#define DMA_REG 0x00
+#define DMA_STATUS 0x02
+#define IDE_BMDTPR 0x04
+#define IDE_DEVICE_ID 0x08
+#define PIO_TIMING_REG 0x10
+#define MWDMA_TIMING_REG 0x11
+#define UDMA_TIMING0_REG 0x12 /* Master */
+#define UDMA_TIMING1_REG 0x13 /* Slave */
+#define CLK_MOD_REG 0x14
+/* These registers are mapped directly to the IDE registers */
+#define CMD_DATA_REG 0x20
+#define ERROR_FEATURES_REG 0x21
+#define NSECT_REG 0x22
+#define LBAL_REG 0x23
+#define LBAM_REG 0x24
+#define LBAH_REG 0x25
+#define DEVICE_REG 0x26
+#define STATUS_COMMAND_REG 0x27
+#define ALTSTAT_CTRL_REG 0x36
+
+/* Set this bit for UDMA mode 5 and 6 */
+#define UDMA_TIMING_MODE_56 BIT(7)
+
+/* 0 = 50 MHz, 1 = 66 MHz */
+#define CLK_MOD_DEV0_CLK_SEL BIT(0)
+#define CLK_MOD_DEV1_CLK_SEL BIT(1)
+/* Enable UDMA on a device */
+#define CLK_MOD_DEV0_UDMA_EN BIT(4)
+#define CLK_MOD_DEV1_UDMA_EN BIT(5)
+
+static struct scsi_host_template pata_ftide010_sht = {
+ ATA_BMDMA_SHT("pata-ftide010"),
+};
+
+/*
+ * We set 66 MHz for all MWDMA modes
+ */
+static const bool set_mdma_66_mhz[] = { true, true, true, true };
+
+/*
+ * We set 66 MHz for UDMA modes 3, 4 and 6 and no others
+ */
+static const bool set_udma_66_mhz[] = { false, false, false, true, true, false, true };
+
+static void ftide010_set_dmamode(struct ata_port *ap, struct ata_device *adev)
+{
+ struct ftide010 *ftide = ap->host->private_data;
+ unsigned short speed = adev->dma_mode;
+ u8 devno = adev->devno & 1;
+ u8 udma_en_mask;
+ u8 f66m_en_mask;
+ u8 clkreg;
+ u8 timreg;
+ unsigned int i;
+
+ /* Target device 0 (master) or 1 (slave) */
+ if (!devno) {
+ udma_en_mask = CLK_MOD_DEV0_UDMA_EN;
+ f66m_en_mask = CLK_MOD_DEV0_CLK_SEL;
+ } else {
+ udma_en_mask = CLK_MOD_DEV1_UDMA_EN;
+ f66m_en_mask = CLK_MOD_DEV1_CLK_SEL;
+ }
+
+ clkreg = ioread8(ftide->base + CLK_MOD_REG);
+ clkreg &= ~udma_en_mask;
+ clkreg &= ~f66m_en_mask;
+
+ if (speed & XFER_UDMA_0) {
+ i = speed & ~XFER_UDMA_0;
+ dev_dbg(ftide->dev, "set UDMA mode %02x, index %d\n",
+ speed, i);
+
+ clkreg |= udma_en_mask;
+ if (set_udma_66_mhz[i]) {
+ clkreg |= f66m_en_mask;
+ timreg = ftide->udma_66_timings[i];
+ } else {
+ timreg = ftide->udma_50_timings[i];
+ }
+
+ /* A special bit needs to be set for modes 5 and 6 */
+ if (i >= 5)
+ timreg |= UDMA_TIMING_MODE_56;
+
+ dev_dbg(ftide->dev, "UDMA write clkreg = %02x, timreg = %02x\n",
+ clkreg, timreg);
+
+ writeb(clkreg, ftide->base + CLK_MOD_REG);
+ writeb(timreg, ftide->base + UDMA_TIMING0_REG + devno);
+ } else {
+ i = speed & ~XFER_MW_DMA_0;
+ dev_dbg(ftide->dev, "set MWDMA mode %02x, index %d\n",
+ speed, i);
+
+ if (set_mdma_66_mhz[i]) {
+ clkreg |= f66m_en_mask;
+ timreg = ftide->mwdma_66_timings[i];
+ } else {
+ timreg = ftide->mwdma_50_timings[i];
+ }
+ dev_dbg(ftide->dev,
+ "MWDMA write clkreg = %02x, timreg = %02x\n",
+ clkreg, timreg);
+ /* This will affect all devices */
+ writeb(clkreg, ftide->base + CLK_MOD_REG);
+ writeb(timreg, ftide->base + MWDMA_TIMING_REG);
+ }
+
+ return;
+}
+
+static void ftide010_set_piomode(struct ata_port *ap, struct ata_device *adev)
+{
+ struct ftide010 *ftide = ap->host->private_data;
+ unsigned int pio = adev->pio_mode - XFER_PIO_0;
+
+ dev_dbg(ftide->dev, "set PIO mode %02x, index %d\n",
+ adev->pio_mode, pio);
+ writeb(ftide->pio_timings[pio], ftide->base + PIO_TIMING_REG);
+}
+
+static struct ata_port_operations pata_ftide010_port_ops = {
+ .inherits = &ata_bmdma_port_ops,
+ .set_dmamode = ftide010_set_dmamode,
+ .set_piomode = ftide010_set_piomode,
+};
+
+static struct ata_port_info ftide010_port_info[] = {
+ {
+ .flags = ATA_FLAG_SLAVE_POSS,
+ .mwdma_mask = ATA_MWDMA2,
+ .udma_mask = ATA_UDMA6,
+ .pio_mask = ATA_PIO4,
+ .port_ops = &pata_ftide010_port_ops,
+ },
+};
+
+#if IS_ENABLED(CONFIG_SATA_GEMINI)
+
+static int pata_ftide010_gemini_port_start(struct ata_port *ap)
+{
+ struct ftide010 *ftide = ap->host->private_data;
+ struct device *dev = ftide->dev;
+ struct sata_gemini *sg = ftide->sg;
+ int bridges = 0;
+ int ret;
+
+ ret = ata_bmdma_port_start(ap);
+ if (ret)
+ return ret;
+
+ if (ftide->master_to_sata0) {
+ dev_info(dev, "SATA0 (master) start\n");
+ ret = gemini_sata_start_bridge(sg, 0);
+ if (!ret)
+ bridges++;
+ }
+ if (ftide->master_to_sata1) {
+ dev_info(dev, "SATA1 (master) start\n");
+ ret = gemini_sata_start_bridge(sg, 1);
+ if (!ret)
+ bridges++;
+ }
+ /* Avoid double-starting */
+ if (ftide->slave_to_sata0 && !ftide->master_to_sata0) {
+ dev_info(dev, "SATA0 (slave) start\n");
+ ret = gemini_sata_start_bridge(sg, 0);
+ if (!ret)
+ bridges++;
+ }
+ /* Avoid double-starting */
+ if (ftide->slave_to_sata1 && !ftide->master_to_sata1) {
+ dev_info(dev, "SATA1 (slave) start\n");
+ ret = gemini_sata_start_bridge(sg, 1);
+ if (!ret)
+ bridges++;
+ }
+
+ dev_info(dev, "brought %d bridges online\n", bridges);
+ return (bridges > 0) ? 0 : -EINVAL; // -ENODEV;
+}
+
+static void pata_ftide010_gemini_port_stop(struct ata_port *ap)
+{
+ struct ftide010 *ftide = ap->host->private_data;
+ struct device *dev = ftide->dev;
+ struct sata_gemini *sg = ftide->sg;
+
+ if (ftide->master_to_sata0) {
+ dev_info(dev, "SATA0 (master) stop\n");
+ gemini_sata_stop_bridge(sg, 0);
+ }
+ if (ftide->master_to_sata1) {
+ dev_info(dev, "SATA1 (master) stop\n");
+ gemini_sata_stop_bridge(sg, 1);
+ }
+ /* Avoid double-stopping */
+ if (ftide->slave_to_sata0 && !ftide->master_to_sata0) {
+ dev_info(dev, "SATA0 (slave) stop\n");
+ gemini_sata_stop_bridge(sg, 0);
+ }
+ /* Avoid double-stopping */
+ if (ftide->slave_to_sata1 && !ftide->master_to_sata1) {
+ dev_info(dev, "SATA1 (slave) stop\n");
+ gemini_sata_stop_bridge(sg, 1);
+ }
+}
+
+static int pata_ftide010_gemini_cable_detect(struct ata_port *ap)
+{
+ struct ftide010 *ftide = ap->host->private_data;
+
+ /*
+ * Return the master cable, I have no clue how to return a different
+ * cable for the slave than for the master.
+ */
+ return ftide->master_cbl;
+}
+
+static int pata_ftide010_gemini_init(struct ftide010 *ftide,
+ bool is_ata1)
+{
+ struct device *dev = ftide->dev;
+ struct sata_gemini *sg;
+ enum gemini_muxmode muxmode;
+
+ /* Look up SATA bridge */
+ sg = gemini_sata_bridge_get();
+ if (IS_ERR(sg))
+ return PTR_ERR(sg);
+ ftide->sg = sg;
+
+ muxmode = gemini_sata_get_muxmode(sg);
+
+ /* Special ops */
+ pata_ftide010_port_ops.port_start =
+ pata_ftide010_gemini_port_start;
+ pata_ftide010_port_ops.port_stop =
+ pata_ftide010_gemini_port_stop;
+ pata_ftide010_port_ops.cable_detect =
+ pata_ftide010_gemini_cable_detect;
+
+ /* Flag port as SATA-capable */
+ if (gemini_sata_bridge_enabled(sg, is_ata1))
+ ftide010_port_info[0].flags |= ATA_FLAG_SATA;
+
+ if (!is_ata1) {
+ switch (muxmode) {
+ case GEMINI_MUXMODE_0:
+ ftide->master_cbl = ATA_CBL_SATA;
+ ftide->slave_cbl = ATA_CBL_PATA40;
+ ftide->master_to_sata0 = true;
+ break;
+ case GEMINI_MUXMODE_1:
+ ftide->master_cbl = ATA_CBL_SATA;
+ ftide->slave_cbl = ATA_CBL_NONE;
+ ftide->master_to_sata0 = true;
+ break;
+ case GEMINI_MUXMODE_2:
+ ftide->master_cbl = ATA_CBL_PATA40;
+ ftide->slave_cbl = ATA_CBL_PATA40;
+ break;
+ case GEMINI_MUXMODE_3:
+ ftide->master_cbl = ATA_CBL_SATA;
+ ftide->slave_cbl = ATA_CBL_SATA;
+ ftide->master_to_sata0 = true;
+ ftide->slave_to_sata1 = true;
+ break;
+ }
+ } else {
+ switch (muxmode) {
+ case GEMINI_MUXMODE_0:
+ ftide->master_cbl = ATA_CBL_SATA;
+ ftide->slave_cbl = ATA_CBL_NONE;
+ ftide->master_to_sata1 = true;
+ break;
+ case GEMINI_MUXMODE_1:
+ ftide->master_cbl = ATA_CBL_SATA;
+ ftide->slave_cbl = ATA_CBL_PATA40;
+ ftide->master_to_sata1 = true;
+ break;
+ case GEMINI_MUXMODE_2:
+ ftide->master_cbl = ATA_CBL_SATA;
+ ftide->slave_cbl = ATA_CBL_SATA;
+ ftide->slave_to_sata0 = true;
+ ftide->master_to_sata1 = true;
+ break;
+ case GEMINI_MUXMODE_3:
+ ftide->master_cbl = ATA_CBL_PATA40;
+ ftide->slave_cbl = ATA_CBL_PATA40;
+ break;
+ }
+ }
+ dev_info(dev, "set up Gemini PATA%d\n", is_ata1);
+
+ return 0;
+}
+#else
+static int pata_ftide010_gemini_init(struct ftide010 *ftide,
+ bool is_ata1)
+{
+ return -ENOTSUPP;
+}
+#endif
+
+/*
+ * Bus timings
+ *
+ * The unit of the below required timings is two clock periods of the ATA
+ * reference clock which is 30 nanoseconds per unit at 66MHz and 20
+ * nanoseconds per unit at 50 MHz. The PIO timings assume 33MHz speed for
+ * PIO.
+ *
+ * pio_active_time: array of 5 elements for T2 timing for Mode 0,
+ * 1, 2, 3 and 4. Range 0..15.
+ * pio_recovery_time: array of 5 elements for T2l timing for Mode 0,
+ * 1, 2, 3 and 4. Range 0..15.
+ * mdma_50_active_time: array of 4 elements for Td timing for multi
+ * word DMA, Mode 0, 1, and 2 at 50 MHz. Range 0..15.
+ * mdma_50_recovery_time: array of 4 elements for Tk timing for
+ * multi word DMA, Mode 0, 1 and 2 at 50 MHz. Range 0..15.
+ * mdma_66_active_time: array of 4 elements for Td timing for multi
+ * word DMA, Mode 0, 1 and 2 at 66 MHz. Range 0..15.
+ * mdma_66_recovery_time: array of 4 elements for Tk timing for
+ * multi word DMA, Mode 0, 1 and 2 at 66 MHz. Range 0..15.
+ * udma_50_setup_time: array of 4 elements for Tvds timing for ultra
+ * DMA, Mode 0, 1, 2, 3, 4 and 5 at 50 MHz. Range 0..7.
+ * udma_50_hold_time: array of 4 elements for Tdvh timing for
+ * multi word DMA, Mode 0, 1, 2, 3, 4 and 5 at 50 MHz, Range 0..7.
+ * udma_66_setup_time: array of 4 elements for Tvds timing for multi
+ * word DMA, Mode 0, 1, 2, 3, 4, 5 and 6 at 66 MHz. Range 0..7.
+ * udma_66_hold_time: array of 4 elements for Tdvh timing for
+ * multi word DMA, Mode 0, 1, 2, 3, 4, 5 and 6 at 66 MHz. Range 0..7.
+ */
+static const u8 pio_active_time[5] = {10, 10, 10, 3, 3};
+static const u8 pio_recovery_time[5] = {10, 3, 1, 3, 1};
+static const u8 mwdma_50_active_time[3] = {6, 2, 2};
+static const u8 mwdma_50_recovery_time[3] = {6, 2, 1};
+static const u8 mwdma_66_active_time[3] = {8, 3, 3};
+static const u8 mwdma_66_recovery_time[3] = {8, 2, 1};
+static const u8 udma_50_setup_time[6] = {3, 3, 2, 2, 1, 1};
+static const u8 udma_50_hold_time[6] = {3, 1, 1, 1, 1, 1};
+static const u8 udma_66_setup_time[7] = {4, 4, 3, 2, };
+static const u8 udma_66_hold_time[7] = {};
+
+static int pata_ftide010_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *np = dev->of_node;
+ const struct ata_port_info pi = ftide010_port_info[0];
+ const struct ata_port_info *ppi[] = { &pi, NULL };
+ struct ftide010 *ftide;
+ struct resource *res;
+ int irq;
+ int ret;
+ int i;
+
+ ftide = devm_kzalloc(dev, sizeof(*ftide), GFP_KERNEL);
+ if (!ftide)
+ return -ENOMEM;
+ ftide->dev = dev;
+
+ irq = platform_get_irq(pdev, 0);
+ if (irq < 0)
+ return irq;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
+
+ ftide->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(ftide->base))
+ return PTR_ERR(ftide->base);
+
+ ftide->pclk = devm_clk_get(dev, "PCLK");
+ if (!IS_ERR(ftide->pclk)) {
+ ret = clk_prepare_enable(ftide->pclk);
+ if (ret) {
+ dev_err(dev, "failed to enable PCLK\n");
+ return ret;
+ }
+ }
+
+ /*
+ * Assign default timings, this can be augmented for different
+ * compatible-strings in the future.
+ */
+ for (i = 0; i < sizeof(ftide->pio_timings); i++) {
+ ftide->pio_timings[i] = (pio_active_time[i] << 4) |
+ pio_recovery_time[i];
+ }
+ for (i = 0; i < sizeof(ftide->mwdma_50_timings); i++) {
+ ftide->mwdma_50_timings[i] = (mwdma_50_active_time[i] << 4) |
+ mwdma_50_recovery_time[i];
+ ftide->mwdma_66_timings[i] = (mwdma_66_active_time[i] << 4) |
+ mwdma_66_recovery_time[i];
+ }
+ for (i = 0; i < sizeof(ftide->udma_50_timings); i++) {
+ ftide->udma_50_timings[i] = (udma_50_setup_time[6] << 4) |
+ udma_50_hold_time[i];
+ ftide->udma_66_timings[i] = (udma_66_setup_time[6] << 4) |
+ udma_66_hold_time[i];
+ }
+
+ /* Some special Cortina Gemini init, if needed */
+ if (of_device_is_compatible(np, "cortina,gemini-pata")) {
+ /*
+ * We need to know which instance is probing (the
+ * Gemini has two instances of FTIDE010) and we do
+ * this simply by looking at the physical base
+ * address, which is 0x63400000 for ATA1, else we
+ * are ATA0. This will also set up the cable types.
+ */
+ ret = pata_ftide010_gemini_init(ftide,
+ (res->start == 0x63400000));
+ if (ret)
+ goto err_dis_clk;
+ } else {
+ /* Else assume we are connected using PATA40 */
+ ftide->master_cbl = ATA_CBL_PATA40;
+ ftide->slave_cbl = ATA_CBL_PATA40;
+ }
+
+ ftide->host = ata_host_alloc_pinfo(dev, ppi, 1);
+ if (!ftide->host) {
+ ret = -ENOMEM;
+ goto err_dis_clk;
+ }
+ ftide->host->private_data = ftide;
+
+ for (i = 0; i < ftide->host->n_ports; i++) {
+ struct ata_port *ap = ftide->host->ports[i];
+ struct ata_ioports *ioaddr = &ap->ioaddr;
+
+ ioaddr->bmdma_addr = ftide->base + DMA_REG;
+ ioaddr->cmd_addr = ftide->base + CMD_DATA_REG;
+ ioaddr->ctl_addr = ftide->base + ALTSTAT_CTRL_REG;
+ ioaddr->altstatus_addr = ftide->base + ALTSTAT_CTRL_REG;
+ ata_sff_std_ports(ioaddr);
+ }
+
+ dev_info(dev, "device ID %08x, irq %d, io base 0x%08x\n",
+ readl(ftide->base + IDE_DEVICE_ID), irq, res->start);
+
+ ret = ata_host_activate(ftide->host, irq, ata_bmdma_interrupt,
+ 0, &pata_ftide010_sht);
+ if (ret)
+ goto err_dis_clk;
+
+ return 0;
+
+err_dis_clk:
+ if (!IS_ERR(ftide->pclk))
+ clk_disable_unprepare(ftide->pclk);
+ return ret;
+}
+
+static int pata_ftide010_remove(struct platform_device *pdev)
+{
+ struct ata_host *host = platform_get_drvdata(pdev);
+ struct ftide010 *ftide = host->private_data;
+
+ ata_host_detach(ftide->host);
+ if (!IS_ERR(ftide->pclk))
+ clk_disable_unprepare(ftide->pclk);
+
+ return 0;
+}
+
+static const struct of_device_id pata_ftide010_of_match[] = {
+ {
+ .compatible = "faraday,ftide010",
+ },
+ {},
+};
+
+static struct platform_driver pata_ftide010_driver = {
+ .driver = {
+ .name = "ftide010",
+ .of_match_table = of_match_ptr(pata_ftide010_of_match),
+ },
+ .probe = pata_ftide010_probe,
+ .remove = pata_ftide010_remove,
+};
+module_platform_driver(pata_ftide010_driver);
+
+MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pata-ftide010");
diff --git a/drivers/ata/sata_gemini.c b/drivers/ata/sata_gemini.c
new file mode 100644
index 000000000000..2618dbf5fc44
--- /dev/null
+++ b/drivers/ata/sata_gemini.c
@@ -0,0 +1,419 @@
+/*
+ * Cortina Systems Gemini SATA bridge add-on to Faraday FTIDE010
+ * Copyright (C) 2017 Linus Walleij <linus.walleij@linaro.org>
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/bitops.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+#include <linux/delay.h>
+#include <linux/reset.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/clk.h>
+#include <linux/io.h>
+#include "sata_gemini.h"
+
+/**
+ * struct sata_gemini - a state container for a Gemini SATA bridge
+ * @dev: the containing device
+ * @base: remapped I/O memory base
+ * @muxmode: the current muxing mode
+ * @ide_pins: if the device is using the plain IDE interface pins
+ * @sata_bridge: if the device enables the SATA bridge
+ * @sata0_reset: SATA0 reset handler
+ * @sata1_reset: SATA1 reset handler
+ * @sata0_pclk: SATA0 PCLK handler
+ * @sata1_pclk: SATA1 PCLK handler
+ */
+struct sata_gemini {
+ struct device *dev;
+ void __iomem *base;
+ enum gemini_muxmode muxmode;
+ bool ide_pins;
+ bool sata_bridge;
+ struct reset_control *sata0_reset;
+ struct reset_control *sata1_reset;
+ struct clk *sata0_pclk;
+ struct clk *sata1_pclk;
+};
+
+/* Global IDE PAD Skew Control Register */
+#define GLOBAL_IDE_SKEW_CTRL 0x18
+#define IDE1_HOST_STROBE_DELAY_SHIFT 28
+#define IDE1_DEVICE_STROBE_DELAY_SHIFT 24
+#define IDE1_OUTPUT_IO_SKEW_SHIFT 20
+#define IDE1_INPUT_IO_SKEW_SHIFT 16
+#define IDE0_HOST_STROBE_DELAY_SHIFT 12
+#define IDE0_DEVICE_STROBE_DELAY_SHIFT 8
+#define IDE0_OUTPUT_IO_SKEW_SHIFT 4
+#define IDE0_INPUT_IO_SKEW_SHIFT 0
+
+/* Miscellaneous Control Register */
+#define GLOBAL_MISC_CTRL 0x30
+/*
+ * Values of IDE IOMUX bits in the misc control register
+ *
+ * Bits 26:24 are "IDE IO Select", which decides what SATA
+ * adapters are connected to which of the two IDE/ATA
+ * controllers in the Gemini. We can connect the two IDE blocks
+ * to one SATA adapter each, both acting as master, or one IDE
+ * blocks to two SATA adapters so the IDE block can act in a
+ * master/slave configuration.
+ *
+ * We also bring out different blocks on the actual IDE
+ * pins (not SATA pins) if (and only if) these are muxed in.
+ *
+ * 111-100 - Reserved
+ * Mode 0: 000 - ata0 master <-> sata0
+ * ata1 master <-> sata1
+ * ata0 slave interface brought out on IDE pads
+ * Mode 1: 001 - ata0 master <-> sata0
+ * ata1 master <-> sata1
+ * ata1 slave interface brought out on IDE pads
+ * Mode 2: 010 - ata1 master <-> sata1
+ * ata1 slave <-> sata0
+ * ata0 master and slave interfaces brought out
+ * on IDE pads
+ * Mode 3: 011 - ata0 master <-> sata0
+ * ata1 slave <-> sata1
+ * ata1 master and slave interfaces brought out
+ * on IDE pads
+ */
+#define IDE_IOMUX_MASK (7 << 24)
+#define IDE_IOMUX_MODE0 (0 << 24)
+#define IDE_IOMUX_MODE1 (1 << 24)
+#define IDE_IOMUX_MODE2 (2 << 24)
+#define IDE_IOMUX_MODE3 (3 << 24)
+#define IDE_IOMUX_SHIFT (24)
+#define IDE_PADS_ENABLE BIT(4)
+#define PFLASH_PADS_DISABLE BIT(1)
+
+/*
+ * Registers directly controlling the PATA<->SATA adapters
+ */
+#define SATA_ID 0x00
+#define SATA_PHY_ID 0x04
+#define SATA0_STATUS 0x08
+#define SATA1_STATUS 0x0c
+#define SATA0_CTRL 0x18
+#define SATA1_CTRL 0x1c
+
+#define SATA_STATUS_BIST_DONE BIT(5)
+#define SATA_STATUS_BIST_OK BIT(4)
+#define SATA_STATUS_PHY_READY BIT(0)
+
+#define SATA_CTRL_PHY_BIST_EN BIT(14)
+#define SATA_CTRL_PHY_FORCE_IDLE BIT(13)
+#define SATA_CTRL_PHY_FORCE_READY BIT(12)
+#define SATA_CTRL_PHY_AFE_LOOP_EN BIT(10)
+#define SATA_CTRL_PHY_DIG_LOOP_EN BIT(9)
+#define SATA_CTRL_HOTPLUG_DETECT_EN BIT(4)
+#define SATA_CTRL_ATAPI_EN BIT(3)
+#define SATA_CTRL_BUS_WITH_20 BIT(2)
+#define SATA_CTRL_SLAVE_EN BIT(1)
+#define SATA_CTRL_EN BIT(0)
+
+/*
+ * There is only ever one instance of this bridge on a system,
+ * so create a singleton so that the FTIDE010 instances can grab
+ * a reference to it.
+ */
+static struct sata_gemini *sg_singleton;
+
+struct sata_gemini *gemini_sata_bridge_get(void)
+{
+ if (sg_singleton)
+ return sg_singleton;
+ return ERR_PTR(-EPROBE_DEFER);
+}
+EXPORT_SYMBOL(gemini_sata_bridge_get);
+
+bool gemini_sata_bridge_enabled(struct sata_gemini *sg, bool is_ata1)
+{
+ if (!sg->sata_bridge)
+ return false;
+ /*
+ * In muxmode 2 and 3 one of the ATA controllers is
+ * actually not connected to any SATA bridge.
+ */
+ if ((sg->muxmode == GEMINI_MUXMODE_2) &&
+ !is_ata1)
+ return false;
+ if ((sg->muxmode == GEMINI_MUXMODE_3) &&
+ is_ata1)
+ return false;
+
+ return true;
+}
+EXPORT_SYMBOL(gemini_sata_bridge_enabled);
+
+enum gemini_muxmode gemini_sata_get_muxmode(struct sata_gemini *sg)
+{
+ return sg->muxmode;
+}
+EXPORT_SYMBOL(gemini_sata_get_muxmode);
+
+static int gemini_sata_setup_bridge(struct sata_gemini *sg,
+ unsigned int bridge)
+{
+ unsigned long timeout = jiffies + (HZ * 1);
+ bool bridge_online;
+ u32 val;
+
+ if (bridge == 0) {
+ val = SATA_CTRL_HOTPLUG_DETECT_EN | SATA_CTRL_EN;
+ /* SATA0 slave mode is only used in muxmode 2 */
+ if (sg->muxmode == GEMINI_MUXMODE_2)
+ val |= SATA_CTRL_SLAVE_EN;
+ writel(val, sg->base + SATA0_CTRL);
+ } else {
+ val = SATA_CTRL_HOTPLUG_DETECT_EN | SATA_CTRL_EN;
+ /* SATA1 slave mode is only used in muxmode 3 */
+ if (sg->muxmode == GEMINI_MUXMODE_3)
+ val |= SATA_CTRL_SLAVE_EN;
+ writel(val, sg->base + SATA1_CTRL);
+ }
+
+ /* Vendor code waits 10 ms here */
+ msleep(10);
+
+ /* Wait for PHY to become ready */
+ do {
+ msleep(100);
+
+ if (bridge == 0)
+ val = readl(sg->base + SATA0_STATUS);
+ else
+ val = readl(sg->base + SATA1_STATUS);
+ if (val & SATA_STATUS_PHY_READY)
+ break;
+ } while (time_before(jiffies, timeout));
+
+ bridge_online = !!(val & SATA_STATUS_PHY_READY);
+
+ dev_info(sg->dev, "SATA%d PHY %s\n", bridge,
+ bridge_online ? "ready" : "not ready");
+
+ return bridge_online ? 0: -ENODEV;
+}
+
+int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge)
+{
+ struct clk *pclk;
+ int ret;
+
+ if (bridge == 0)
+ pclk = sg->sata0_pclk;
+ else
+ pclk = sg->sata1_pclk;
+ clk_enable(pclk);
+ msleep(10);
+
+ /* Do not keep clocking a bridge that is not online */
+ ret = gemini_sata_setup_bridge(sg, bridge);
+ if (ret)
+ clk_disable(pclk);
+
+ return ret;
+}
+EXPORT_SYMBOL(gemini_sata_start_bridge);
+
+void gemini_sata_stop_bridge(struct sata_gemini *sg, unsigned int bridge)
+{
+ if (bridge == 0)
+ clk_disable(sg->sata0_pclk);
+ else if (bridge == 1)
+ clk_disable(sg->sata1_pclk);
+}
+EXPORT_SYMBOL(gemini_sata_stop_bridge);
+
+int gemini_sata_reset_bridge(struct sata_gemini *sg,
+ unsigned int bridge)
+{
+ if (bridge == 0)
+ reset_control_reset(sg->sata0_reset);
+ else
+ reset_control_reset(sg->sata1_reset);
+ msleep(10);
+ return gemini_sata_setup_bridge(sg, bridge);
+}
+EXPORT_SYMBOL(gemini_sata_reset_bridge);
+
+static int gemini_sata_bridge_init(struct sata_gemini *sg)
+{
+ struct device *dev = sg->dev;
+ u32 sata_id, sata_phy_id;
+ int ret;
+
+ sg->sata0_pclk = devm_clk_get(dev, "SATA0_PCLK");
+ if (IS_ERR(sg->sata0_pclk)) {
+ dev_err(dev, "no SATA0 PCLK");
+ return -ENODEV;
+ }
+ sg->sata1_pclk = devm_clk_get(dev, "SATA1_PCLK");
+ if (IS_ERR(sg->sata1_pclk)) {
+ dev_err(dev, "no SATA1 PCLK");
+ return -ENODEV;
+ }
+
+ ret = clk_prepare_enable(sg->sata0_pclk);
+ if (ret) {
+ pr_err("failed to enable SATA0 PCLK\n");
+ return ret;
+ }
+ ret = clk_prepare_enable(sg->sata1_pclk);
+ if (ret) {
+ pr_err("failed to enable SATA1 PCLK\n");
+ return ret;
+ }
+
+ sg->sata0_reset = devm_reset_control_get(dev, "sata0");
+ if (IS_ERR(sg->sata0_reset)) {
+ dev_err(dev, "no SATA0 reset controller\n");
+ return PTR_ERR(sg->sata0_reset);
+ }
+ sg->sata1_reset = devm_reset_control_get(dev, "sata1");
+ if (IS_ERR(sg->sata1_reset)) {
+ dev_err(dev, "no SATA1 reset controller\n");
+ return PTR_ERR(sg->sata1_reset);
+ }
+
+ sata_id = readl(sg->base + SATA_ID);
+ sata_phy_id = readl(sg->base + SATA_PHY_ID);
+ sg->sata_bridge = true;
+ clk_disable(sg->sata0_pclk);
+ clk_disable(sg->sata1_pclk);
+
+ dev_info(dev, "SATA ID %08x, PHY ID: %08x\n", sata_id, sata_phy_id);
+
+ return 0;
+}
+
+static int gemini_sata_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct device_node *np = dev->of_node;
+ struct sata_gemini *sg;
+ static struct regmap *map;
+ struct resource *res;
+ enum gemini_muxmode muxmode;
+ u32 gmode;
+ u32 gmask;
+ u32 val;
+ int ret;
+
+ sg = devm_kzalloc(dev, sizeof(*sg), GFP_KERNEL);
+ if (!sg)
+ return -ENOMEM;
+ sg->dev = dev;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENODEV;
+
+ sg->base = devm_ioremap_resource(dev, res);
+ if (IS_ERR(sg->base))
+ return PTR_ERR(sg->base);
+
+ map = syscon_regmap_lookup_by_phandle(np, "syscon");
+ if (IS_ERR(map)) {
+ dev_err(dev, "no global syscon\n");
+ return PTR_ERR(map);
+ }
+
+ /* Set up the SATA bridge if need be */
+ if (of_property_read_bool(np, "cortina,gemini-enable-sata-bridge")) {
+ ret = gemini_sata_bridge_init(sg);
+ if (ret)
+ return ret;
+ }
+
+ if (of_property_read_bool(np, "cortina,gemini-enable-ide-pins"))
+ sg->ide_pins = true;
+
+ if (!sg->sata_bridge && !sg->ide_pins) {
+ dev_err(dev, "neither SATA bridge or IDE output enabled\n");
+ return -EINVAL;
+ }
+
+ ret = of_property_read_u32(np, "cortina,gemini-ata-muxmode", &muxmode);
+ if (ret) {
+ dev_err(dev, "could not parse ATA muxmode\n");
+ return ret;
+ }
+ if (muxmode > GEMINI_MUXMODE_3) {
+ dev_err(dev, "illegal muxmode %d\n", muxmode);
+ return -EINVAL;
+ }
+ sg->muxmode = muxmode;
+ gmask = IDE_IOMUX_MASK;
+ gmode = (muxmode << IDE_IOMUX_SHIFT);
+
+ /*
+ * If we mux out the IDE, parallel flash must be disabled.
+ * SATA0 and SATA1 have dedicated pins and may coexist with
+ * parallel flash.
+ */
+ if (sg->ide_pins)
+ gmode |= IDE_PADS_ENABLE | PFLASH_PADS_DISABLE;
+ else
+ gmask |= IDE_PADS_ENABLE;
+
+ ret = regmap_update_bits(map, GLOBAL_MISC_CTRL, gmask, gmode);
+ if (ret) {
+ dev_err(dev, "unable to set up IDE muxing\n");
+ return -ENODEV;
+ }
+
+ /* FIXME: add more elaborate IDE skew control handling */
+ if (sg->ide_pins) {
+ ret = regmap_read(map, GLOBAL_IDE_SKEW_CTRL, &val);
+ if (ret) {
+ dev_err(dev, "cannot read IDE skew control register\n");
+ return ret;
+ }
+ dev_info(dev, "IDE skew control: %08x\n", val);
+ }
+
+ dev_info(dev, "set up the Gemini IDE/SATA nexus\n");
+ platform_set_drvdata(pdev, sg);
+ sg_singleton = sg;
+
+ return 0;
+}
+
+static int gemini_sata_remove(struct platform_device *pdev)
+{
+ struct sata_gemini *sg = platform_get_drvdata(pdev);
+
+ clk_unprepare(sg->sata0_pclk);
+ clk_unprepare(sg->sata1_pclk);
+ sg_singleton = NULL;
+
+ return 0;
+}
+
+static const struct of_device_id gemini_sata_of_match[] = {
+ {
+ .compatible = "cortina,gemini-sata-bridge",
+ },
+ {},
+};
+
+static struct platform_driver gemini_sata_driver = {
+ .driver = {
+ .name = "gemini-sata-bridge",
+ .of_match_table = of_match_ptr(gemini_sata_of_match),
+ },
+ .probe = gemini_sata_probe,
+ .remove = gemini_sata_remove,
+};
+module_platform_driver(gemini_sata_driver);
+
+MODULE_AUTHOR("Linus Walleij <linus.walleij@linaro.org>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:gemini-sata-bridge");
diff --git a/drivers/ata/sata_gemini.h b/drivers/ata/sata_gemini.h
new file mode 100644
index 000000000000..ca1837a394c8
--- /dev/null
+++ b/drivers/ata/sata_gemini.h
@@ -0,0 +1,21 @@
+/* Header for the Gemini SATA bridge */
+#ifndef SATA_GEMINI_H
+#define SATA_GEMINI_H
+
+struct sata_gemini;
+
+enum gemini_muxmode {
+ GEMINI_MUXMODE_0 = 0,
+ GEMINI_MUXMODE_1,
+ GEMINI_MUXMODE_2,
+ GEMINI_MUXMODE_3,
+};
+
+struct sata_gemini *gemini_sata_bridge_get(void);
+bool gemini_sata_bridge_enabled(struct sata_gemini *sg, bool is_ata1);
+enum gemini_muxmode gemini_sata_get_muxmode(struct sata_gemini *sg);
+int gemini_sata_start_bridge(struct sata_gemini *sg, unsigned int bridge);
+void gemini_sata_stop_bridge(struct sata_gemini *sg, unsigned int bridge);
+int gemini_sata_reset_bridge(struct sata_gemini *sg, unsigned int bridge);
+
+#endif
--
2.9.4
^ permalink raw reply related
* [PATCH 1/4 v3] ata: Add DT bindings for Faraday Technology FTIDE010
From: Linus Walleij @ 2017-05-30 11:33 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz, linux-ide
Cc: Janos Laube, Paulius Zaleckas, linux-arm-kernel, Hans Ulli Kroll,
Florian Fainelli, Linus Walleij, devicetree,
John Feng-Hsin Chiang, Greentime Hu
This adds device tree bindings for the Faraday Technology
FTIDE010 found in the Storlink/Storm/Cortina Systems Gemini SoC.
I am not 100% sure that this part is from Faraday Technology but
a lot points in that direction:
- A later IDE interface called FTIDE020 exist and share some
properties.
- The SATA bridge has the same Built In Self Test (BIST) that the
Faraday FTSATA100 seems to have, and it has version number 0100
in the device ID register, so this is very likely a FTSATA100
bundled with the FTIDE010.
Cc: devicetree@vger.kernel.org
Cc: John Feng-Hsin Chiang <john453@faraday-tech.com>
Cc: Greentime Hu <green.hu@gmail.com>
Acked-by: Hans Ulli Kroll <ulli.kroll@googlemail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- No changes, just resending to keep the patch set together.
ChangeLog v1->v2:
- Cut the timings defintions from the device tree. Hard-code
it in the driver instead, keeping the nice layout and
configurability by making it easy to tweak the timings
in the code.
- Fix up some confused references to 50 MHz in 66 MHz
properties.
---
.../devicetree/bindings/ata/faraday,ftide010.txt | 38 ++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 Documentation/devicetree/bindings/ata/faraday,ftide010.txt
diff --git a/Documentation/devicetree/bindings/ata/faraday,ftide010.txt b/Documentation/devicetree/bindings/ata/faraday,ftide010.txt
new file mode 100644
index 000000000000..a0c64a29104d
--- /dev/null
+++ b/Documentation/devicetree/bindings/ata/faraday,ftide010.txt
@@ -0,0 +1,38 @@
+* Faraday Technology FTIDE010 PATA controller
+
+This controller is the first Faraday IDE interface block, used in the
+StorLink SL2312 and SL3516, later known as the Cortina Systems Gemini
+platform. The controller can do PIO modes 0 through 4, Multi-word DMA
+(MWDM)modes 0 through 2 and Ultra DMA modes 0 through 6.
+
+On the Gemini platform, this PATA block is accompanied by a PATA to
+SATA bridge in order to support SATA. This is why a phandle to that
+controller is compulsory on that platform.
+
+The timing properties are unique per-SoC, not per-board.
+
+Required properties:
+- compatible: should be one of
+ "cortina,gemini-pata", "faraday,ftide010"
+ "faraday,ftide010"
+- interrupts: interrupt for the block
+- reg: registers and size for the block
+
+Optional properties:
+- clocks: a SoC clock running the peripheral.
+- clock-names: should be set to "PCLK" for the peripheral clock.
+
+Required properties for "cortina,gemini-pata" compatible:
+- sata: a phande to the Gemini PATA to SATA bridge, see
+ cortina,gemini-sata-bridge.txt for details.
+
+Example:
+
+ata@63000000 {
+ compatible = "cortina,gemini-pata", "faraday,ftide010";
+ reg = <0x63000000 0x100>;
+ interrupts = <4 IRQ_TYPE_EDGE_RISING>;
+ clocks = <&gcc GEMINI_CLK_GATE_IDE>;
+ clock-names = "PCLK";
+ sata = <&sata>;
+};
--
2.9.4
^ permalink raw reply related
* [PATCH 2/4 v3] ata: Add DT bindings for the Gemini SATA bridge
From: Linus Walleij @ 2017-05-30 11:34 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz,
linux-ide-u79uwXL29TY76Z2rM5mHXA
Cc: Janos Laube, Paulius Zaleckas,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Hans Ulli Kroll, Florian Fainelli, Linus Walleij,
devicetree-u79uwXL29TY76Z2rM5mHXA, John Feng-Hsin Chiang,
Greentime Hu
In-Reply-To: <20170530113402.20450-1-linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
This adds device tree bindings for the Cortina Systems Gemini
PATA to SATA bridge.
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: John Feng-Hsin Chiang <john453-w0jeGXs5+AWXmMXjJBpWqg@public.gmane.org>
Cc: Greentime Hu <green.hu-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Acked-by: Hans Ulli Kroll <ulli.kroll-gM/Ye1E23mwN+BqQ9rBEUg@public.gmane.org>
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
ChangeLog v2->v3:
- No changes, just resending to keep the patch set together.
ChangeLog v1->v2:
- Fix ata0 misspelled as ata1 in one place.
---
.../bindings/ata/cortina,gemini-sata-bridge.txt | 55 ++++++++++++++++++++++
1 file changed, 55 insertions(+)
create mode 100644 Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt
diff --git a/Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt b/Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt
new file mode 100644
index 000000000000..1c3d3cc70051
--- /dev/null
+++ b/Documentation/devicetree/bindings/ata/cortina,gemini-sata-bridge.txt
@@ -0,0 +1,55 @@
+* Cortina Systems Gemini SATA Bridge
+
+The Gemini SATA bridge in a SoC-internal PATA to SATA bridge that
+takes two Faraday Technology FTIDE010 PATA controllers and bridges
+them in different configurations to two SATA ports.
+
+Required properties:
+- compatible: should be
+ "cortina,gemini-sata-bridge"
+- reg: registers and size for the block
+- resets: phandles to the reset lines for both SATA bridges
+- reset-names: must be "sata0", "sata1"
+- clocks: phandles to the compulsory peripheral clocks
+- clock-names: must be "SATA0_PCLK", "SATA1_PCLK"
+- syscon: a phandle to the global Gemini system controller
+- cortina,gemini-ata-muxmode: tell the desired multiplexing mode for
+ the ATA controller and SATA bridges. Values 0..3:
+ Mode 0: ata0 master <-> sata0
+ ata1 master <-> sata1
+ ata0 slave interface brought out on IDE pads
+ Mode 1: ata0 master <-> sata0
+ ata1 master <-> sata1
+ ata1 slave interface brought out on IDE pads
+ Mode 2: ata1 master <-> sata1
+ ata1 slave <-> sata0
+ ata0 master and slave interfaces brought out
+ on IDE pads
+ Mode 3: ata0 master <-> sata0
+ ata0 slave <-> sata1
+ ata1 master and slave interfaces brought out
+ on IDE pads
+
+Optional boolean properties:
+- cortina,gemini-enable-ide-pins: enables the PATA to IDE connection.
+ The muxmode setting decides whether ATA0 or ATA1 is brought out,
+ and whether master, slave or both interfaces get brought out.
+- cortina,gemini-enable-sata-bridge: enables the PATA to SATA bridge
+ inside the Gemnini SoC. The Muxmode decides what PATA blocks will
+ be muxed out and how.
+
+Example:
+
+sata: sata@46000000 {
+ compatible = "cortina,gemini-sata-bridge";
+ reg = <0x46000000 0x100>;
+ resets = <&rcon 26>, <&rcon 27>;
+ reset-names = "sata0", "sata1";
+ clocks = <&gcc GEMINI_CLK_GATE_SATA0>,
+ <&gcc GEMINI_CLK_GATE_SATA1>;
+ clock-names = "SATA0_PCLK", "SATA1_PCLK";
+ syscon = <&syscon>;
+ cortina,gemini-ata-muxmode = <3>;
+ cortina,gemini-enable-ide-pins;
+ cortina,gemini-enable-sata-bridge;
+};
--
2.9.4
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related
* Re: [PATCH 3/4 v2] ata: Add driver for Faraday Technology FTIDE010
From: Linus Walleij @ 2017-05-30 11:28 UTC (permalink / raw)
To: Tejun Heo
Cc: Bartlomiej Zolnierkiewicz, linux-ide, Janos Laube,
Paulius Zaleckas, linux-arm-kernel@lists.infradead.org,
Hans Ulli Kroll, Florian Fainelli, John Feng-Hsin Chiang,
Greentime Hu
In-Reply-To: <20170523212556.GK13222@htj.duckdns.org>
On Tue, May 23, 2017 at 11:25 PM, Tejun Heo <tj@kernel.org> wrote:
> Heh, that's a lot of driver. Looks okay to me but, Bart, can you
> please review and ack this one?
I will send a very lightly modified v3, fixing the issue I was seeing
with the drvdata.
Yours,
Linus Walleij
^ permalink raw reply
* [PATCH 6/6] ata: sata_fsl: cut drvdata assignment
From: Linus Walleij @ 2017-05-30 9:46 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Linus Walleij
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
ata_host_alloc_pinfo() assigns the host pointer to the
struct device * drvdata, do not assign it a second time.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/ata/sata_fsl.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 01734d54c69c..95bf3abda6f6 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1523,8 +1523,6 @@ static int sata_fsl_probe(struct platform_device *ofdev)
ata_host_activate(host, irq, sata_fsl_interrupt, SATA_FSL_IRQ_FLAG,
&sata_fsl_sht);
- platform_set_drvdata(ofdev, host);
-
host_priv->intr_coalescing.show = fsl_sata_intr_coalescing_show;
host_priv->intr_coalescing.store = fsl_sata_intr_coalescing_store;
sysfs_attr_init(&host_priv->intr_coalescing.attr);
--
2.9.4
^ permalink raw reply related
* [PATCH 5/6] ata: samsung_cf: cut drvdata assignment
From: Linus Walleij @ 2017-05-30 9:46 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Linus Walleij
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
ata_host_alloc_pinfo() assigns the host pointer to the
struct device * drvdata, do not assign it a second time.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/ata/pata_samsung_cf.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index 431c7de30ce6..50801c40b029 100644
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -582,8 +582,6 @@ static int __init pata_s3c_probe(struct platform_device *pdev)
/* Set endianness and enable the interface */
pata_s3c_hwinit(info, pdata);
- platform_set_drvdata(pdev, host);
-
ret = ata_host_activate(host, info->irq,
info->irq ? pata_s3c_irq : NULL,
0, &pata_s3c_sht);
--
2.9.4
^ permalink raw reply related
* [PATCH 4/6] ata: rb532_cf: cut drvdata assignment
From: Linus Walleij @ 2017-05-30 9:46 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Linus Walleij
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
ata_host_alloc_pinfo() assigns the host pointer to the
struct device * drvdata, do not assign it a second time.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/ata/pata_rb532_cf.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
index c8b6a780a290..653b9a0bf727 100644
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -148,8 +148,6 @@ static int rb532_pata_driver_probe(struct platform_device *pdev)
if (!ah)
return -ENOMEM;
- platform_set_drvdata(pdev, ah);
-
info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
if (!info)
return -ENOMEM;
--
2.9.4
^ permalink raw reply related
* [PATCH 3/6] ata: dwc_460ex: cut drvdata assignment
From: Linus Walleij @ 2017-05-30 9:46 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Linus Walleij
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
ata_host_alloc_pinfo() assigns the host pointer to the
struct device * drvdata, do not assign it a second time.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/ata/sata_dwc_460ex.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
index e0939bd5ea73..ce128d5a6ded 100644
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
@@ -1285,7 +1285,6 @@ static int sata_dwc_probe(struct platform_device *ofdev)
if (err)
dev_err(&ofdev->dev, "failed to activate host");
- dev_set_drvdata(&ofdev->dev, host);
return 0;
error_out:
--
2.9.4
^ permalink raw reply related
* [PATCH 2/6] ata: ep93xx: cut drvdata assignment
From: Linus Walleij @ 2017-05-30 9:46 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Linus Walleij
In-Reply-To: <20170530094644.15566-1-linus.walleij@linaro.org>
ata_host_alloc_pinfo() assigns the host pointer to the
struct device * drvdata, do not assign drv_data like this.
Since ata_host_alloc_pinfo() is called after this site, the
correct value is set eventually, but this assignment is just
plain pointless.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/ata/pata_ep93xx.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index bf1b910c5d69..0a550190955a 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -944,7 +944,6 @@ static int ep93xx_pata_probe(struct platform_device *pdev)
goto err_rel_gpio;
}
- platform_set_drvdata(pdev, drv_data);
drv_data->pdev = pdev;
drv_data->ide_base = ide_base;
drv_data->udma_in_phys = mem_res->start + IDEUDMADATAIN;
--
2.9.4
^ permalink raw reply related
* [PATCH 1/6] ata: bf54x: cut drvdata assignment
From: Linus Walleij @ 2017-05-30 9:46 UTC (permalink / raw)
To: Tejun Heo, Bartlomiej Zolnierkiewicz; +Cc: linux-ide, Linus Walleij
ata_host_alloc_pinfo() assigns the host pointer to the
struct device * drvdata, do not assign it a second time.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/ata/pata_bf54x.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 9c5780a7e1b9..0e55a8da2748 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1597,8 +1597,6 @@ static int bfin_atapi_probe(struct platform_device *pdev)
return -ENODEV;
}
- platform_set_drvdata(pdev, host);
-
return 0;
}
--
2.9.4
^ permalink raw reply related
* Re: [PATCH] libata: Fix devres handling
From: Linus Walleij @ 2017-05-30 9:21 UTC (permalink / raw)
To: Tejun Heo; +Cc: Bartlomiej Zolnierkiewicz, linux-ide, stable
In-Reply-To: <20170523211608.GJ13222@htj.duckdns.org>
On Tue, May 23, 2017 at 11:16 PM, Tejun Heo <tj@kernel.org> wrote:
>> The ATA hosts are allocated using devres with:
>> host = devres_alloc(ata_host_release, sz, GFP_KERNEL);
>> However in the ata_host_release() function the host is retrieved
>> using dev_get_drvdata() which is not what other devres handlers
>> do, instead we should probably use the passed resource.
>>
>> Before this my kernel crashes badly when I fail to start a host
>> in ata_host_start() and need to bail out, because dev_get_drvdata()
>> gets the wrong-but-almost-correct pointer (so on some systems it
>> may by chance be the right pointer what do I know).
>>
>> On ARMv4 Gemini it is not:
(...)
> This is really weird. The two can't be different, well, at least
> shouldn't.
I found the problem.
This is because my driver issues platform_set_drvdata(pdev)
on the same struct device * overwriting the data with
its own. That function is just an alias for dev_set_drvdata().
Amazingly, libata survives this until release.
Maybe we should print a warning if dev_get_drvdata()
and res differ? It's a sign that something is wrong because
someone screwed with the drvdata behind the back of
libata.
It appears further that I am in bad company: there are a few
drivers in drivers/ata that have broken errorpath because
they do exactly this or variants of this. So it turns up in my
driver too because of copypaste.
Device drivers assume that they "own" drvdata inside the
device, but with libata they do not, as shown above.
It is used more as a rule than an exception to pass a
state container from probe() over to remove().
It is a common pattern to overwrite drvdata, the following
drivers now have this bug in one way or another:
pata_bf54x.c: platform_set_drvdata(pdev, host);
pata_ep93xx.c: platform_set_drvdata(pdev, drv_data);
sata_dwc_460ex.c: dev_set_drvdata(&ofdev->dev, host);
These drivers:
pata_rb532_cf.c: platform_set_drvdata(pdev, ah);
pata_samsung_cf.c: platform_set_drvdata(pdev, host);
sata_fsl.c: platform_set_drvdata(ofdev, host);
They set the ATA host as drvdata, essentially overwriting
the drvdata pointer with the same value.
I guess I will simply make a cleanup series for these,
making sure they use host->private_data instead and do not
double-write the drvdata.
Yours,
Linus Walleij
^ permalink raw reply
* Re: [PATCH] ide: avoid warning for timings calculation
From: Andy Shevchenko @ 2017-05-27 20:22 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: David S. Miller, linux-ide, linux-kernel@vger.kernel.org
In-Reply-To: <20170511125214.278638-1-arnd@arndb.de>
On Thu, May 11, 2017 at 3:52 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> gcc-7 warns about the result of a constant multiplication used as
> a boolean:
>
> drivers/ide/ide-timings.c: In function 'ide_timing_quantize':
> drivers/ide/ide-timings.c:112:24: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
> q->setup = EZ(t->setup * 1000, T);
>
> This slightly rearranges the macro to simplify the code and avoid
> the warning at the same time.
> #define ENOUGH(v, unit) (((v) - 1) / (unit) + 1)
> -#define EZ(v, unit) ((v) ? ENOUGH(v, unit) : 0)
> +#define EZ(v, unit) ((v) ? ENOUGH(v * 1000, unit) : 0)
Perhaps
v -> (v) in the multiplication.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply
* Re: [PATCH] Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
From: Andy Shevchenko @ 2017-05-25 13:34 UTC (permalink / raw)
To: Andrew Lunn; +Cc: Gregory CLEMENT, Tejun Heo, Jason Cooper, linux-ide
In-Reply-To: <20170525132639.GK1788@lunn.ch>
On Thu, 2017-05-25 at 15:26 +0200, Andrew Lunn wrote:
> > > What issue? You are allowed to have overlapping memory resources.
> >
> > Exactly, and then the question why did you do a revert?
>
> Because we are at -rc2.
No, my point is that (repeating myself) revert just *hides* the actual
issue.
Yes, I understand that it's a quick fix, and it should not be considered
as best solution.
> We need a quick fix now, so that my NAS box
> disks start spinning again. You can then spend some time to consider a
> better fix, and get it merged in the 4.13 merge window.
>
> Please feel free to Cc: me and the other Marvell maintainers on
> patches, so we can test them.
I'm not going to do that since I have no such issue, no possibility to
test and actually choose best strategy with your hardware.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply
* Re: [PATCH] Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
From: Andrew Lunn @ 2017-05-25 13:26 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Gregory CLEMENT, Tejun Heo, Jason Cooper, linux-ide
In-Reply-To: <1495716820.6967.111.camel@linux.intel.com>
> > What issue? You are allowed to have overlapping memory resources.
>
> Exactly, and then the question why did you do a revert?
Because we are at -rc2. We need a quick fix now, so that my NAS box
disks start spinning again. You can then spend some time to consider a
better fix, and get it merged in the 4.13 merge window.
Please feel free to Cc: me and the other Marvell maintainers on
patches, so we can test them.
Andrew
^ permalink raw reply
* Re: [PATCH] Revert "ata: sata_mv: Convert to devm_ioremap_resource()"
From: Andy Shevchenko @ 2017-05-25 12:53 UTC (permalink / raw)
To: Andrew Lunn; +Cc: Gregory CLEMENT, Tejun Heo, Jason Cooper, linux-ide
In-Reply-To: <20170524142956.GE26577@lunn.ch>
On Wed, 2017-05-24 at 16:29 +0200, Andrew Lunn wrote:
> On Wed, May 24, 2017 at 05:00:04PM +0300, Andy Shevchenko wrote:
> > On Wed, 2017-05-24 at 15:41 +0200, Andrew Lunn wrote:
> > > > I'm wondering where exactly first resource acquiring is
> > > > happening.
> > >
> > > drivers/phy/phy-mvebu-sata.c
> > >
> >
> > In which tree? I have nothing like this in linux-next.
>
> git log drivers/phy/phy-mvebu-sata.c
>
> It has been there since Tue Dec 17 21:21:50 2013.
>
> > I'm on the side that revert just hides the real issue back.
>
> What issue? You are allowed to have overlapping memory resources.
Exactly, and then the question why did you do a revert?
AFAIU the problem is that platform core tries to reserve the resource
and you can't do it twice for overlapping region (see insert_resource()
call implementation).
Since it's allowed and we have more devices which requires that
(basically that ones that have phy embedded in common address space) we
might reconsider the policy used in platform core.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox