[PATCHv3 0/5] Support for Marvell AHCI interface on Armada 38x

[PATCHv3 0/5] Support for Marvell AHCI interface on Armada 38x

[Thomas Petazzoni]

Hello,

The Marvell Armada 38x ARM processors use an AHCI compatible interface
for SATA (in replacement of the Marvell-specific SATA interface,
handled by the sata_mv driver). However, like all DMA-capable Marvell
interfaces, some specific MBus window configuration must be done, so a
small specific glue layer is needed, which relies on the recently
introduced libahci_platform.c.

Changes since v2:

 * Added Acked-by from Andrew Lunn <andrew@lunn.ch> on the first
   patch.

 * Added comment in the code to explain why we don't have
   suspend/resume support for now. Suggested by Bartlomiej
   Zolnierkiewicz.

 * Added a ahci_mvebu_regret_option() function which enables the
   vendor-specific regret bit, which allows to solve a potential
   deadlock situation in the AHCI interface.

Changes since v1:

 * Rebased on top of v3.15-rc1

 * Added a preliminary patch that orders alphabetically the list of
   compatible strings in the DT binding document
   ahci-platform.txt. Suggested by Andrew Lunn.

 * Made the availability of MBus DRAM window informations
   mandatory. Suggested by Andrew Lunn.

 * Fixed the module alias name. Suggested by Bartlomiej
   Zolnierkiewicz.

Details of the patches:

 * The first patch is a DT binding documentation cleanup. I believe it
   should be taken by the ATA maintainer, because the second patch
   (driver patch) depends on it.

 * The second patch of this series contains the driver itself, which
   is fairly straight-forward. It should be taken by Tejun Heo as the
   ATA maintainer.

 * The last three patches add the Device Tree and defconfig
   changes. They should be taken by the respective ARM maintainers
   (mvebu maintainers for the DT and mvebu_v7_defconfig, and arm-soc
   maintainers for the multi_v7_defconfig change).

Thanks!

Thomas

Thomas Petazzoni (5):
  Documentation: dt-bindings: reformat and order list of ahci-platform
    compatibles
  ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces
  ARM: mvebu: add Device Tree description of AHCI interfaces on Armada
    38x
  ARM: configs: add ahci_mvebu to mvebu_v7_defconfig
  ARM: configs: add ahci_mvebu to multi_v7_defconfig

 .../devicetree/bindings/ata/ahci-platform.txt      |  13 ++-
 arch/arm/boot/dts/armada-385-db.dts                |   8 ++
 arch/arm/boot/dts/armada-38x.dtsi                  |  16 +++
 arch/arm/configs/multi_v7_defconfig                |   1 +
 arch/arm/configs/mvebu_v7_defconfig                |   1 +
 drivers/ata/Kconfig                                |   9 ++
 drivers/ata/Makefile                               |   1 +
 drivers/ata/ahci_mvebu.c                           | 127 +++++++++++++++++++++
 8 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 drivers/ata/ahci_mvebu.c

-- 
1.9.2

[PATCHv3 1/5] Documentation: dt-bindings: reformat and order list of ahci-platform compatibles

[Thomas Petazzoni]

The ahci-platform.txt Device Tree binding documentation is gaining a
growing number of compatible strings, and it will gain one more with
the addition of the Marvell Armada 380 AHCI support. It is therefore
time to reformat this list into a proper bullet list, and more
importantly order it alphabetically;

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
---
 Documentation/devicetree/bindings/ata/ahci-platform.txt | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
index 48b285f..5598862 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@ -4,10 +4,14 @@ SATA nodes are defined to describe on-chip Serial ATA controllers.
 Each SATA controller should have its own node.
 
 Required properties:
-- compatible        : compatible list, one of "snps,spear-ahci",
-                      "snps,exynos5440-ahci", "ibm,476gtr-ahci",
-                      "allwinner,sun4i-a10-ahci", "fsl,imx53-ahci"
-                      "fsl,imx6q-ahci" or "snps,dwc-ahci"
+- compatible        : compatible string, one of:
+  - "allwinner,sun4i-a10-ahci"
+  - "fsl,imx53-ahci"
+  - "fsl,imx6q-ahci"
+  - "ibm,476gtr-ahci"
+  - "snps,dwc-ahci"
+  - "snps,exynos5440-ahci"
+  - "snps,spear-ahci"
 - interrupts        : <interrupt mapping for SATA IRQ>
 - reg               : <registers mapping>
 
-- 
1.9.2

[PATCHv3 1/5] Documentation: dt-bindings: reformat and order list of ahci-platform compatibles

[Jason Cooper]

Rob,

Tue, Apr 15, 2014 at 05:00:02PM +0200, Thomas Petazzoni wrote:
> The ahci-platform.txt Device Tree binding documentation is gaining a
> growing number of compatible strings, and it will gain one more with
> the addition of the Marvell Armada 380 AHCI support. It is therefore
> time to reformat this list into a proper bullet list, and more
> importantly order it alphabetically;
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Acked-by: Andrew Lunn <andrew@lunn.ch>

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

[PATCHv3 1/5] Documentation: dt-bindings: reformat and order list of ahci-platform compatibles

[Tejun Heo]

On Tue, Apr 15, 2014 at 05:00:02PM +0200, Thomas Petazzoni wrote:
> The ahci-platform.txt Device Tree binding documentation is gaining a
> growing number of compatible strings, and it will gain one more with
> the addition of the Marvell Armada 380 AHCI support. It is therefore
> time to reformat this list into a proper bullet list, and more
> importantly order it alphabetically;
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Acked-by: Andrew Lunn <andrew@lunn.ch>

Applied to libata/for-3.16.

Thanks.

-- 
tejun

[PATCHv3 2/5] ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces

[Thomas Petazzoni]

The Marvell Armada 380 SoC includes two AHCI compatible
interfaces. However, like all DMA-capable Marvell interface, they
require special handling to configure MBus windows. Therefore, this
commit adds a new ahci_mvebu driver, which relies on the
libahci_platform.c code recently introduced.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 .../devicetree/bindings/ata/ahci-platform.txt      |   1 +
 drivers/ata/Kconfig                                |   9 ++
 drivers/ata/Makefile                               |   1 +
 drivers/ata/ahci_mvebu.c                           | 127 +++++++++++++++++++++
 4 files changed, 138 insertions(+)
 create mode 100644 drivers/ata/ahci_mvebu.c

diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
index 5598862..d6b07e8 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@ -9,6 +9,7 @@ Required properties:
   - "fsl,imx53-ahci"
   - "fsl,imx6q-ahci"
   - "ibm,476gtr-ahci"
+  - "marvell,armada-380-ahci"
   - "snps,dwc-ahci"
   - "snps,exynos5440-ahci"
   - "snps,spear-ahci"
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 20e03a7..58d04cb 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -123,6 +123,15 @@ config AHCI_IMX
 
 	  If unsure, say N.
 
+config AHCI_MVEBU
+	tristate "Marvell EBU AHCI SATA support"
+	depends on ARCH_MVEBU
+	help
+	  This option enables support for the Marvebu EBU SoC's
+	  onboard AHCI SATA.
+
+	  If unsure, say N.
+
 config AHCI_SUNXI
 	tristate "Allwinner sunxi AHCI SATA support"
 	depends on ARCH_SUNXI
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 44c8016..5a02aee 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SATA_DWC)		+= sata_dwc_460ex.o
 obj-$(CONFIG_SATA_HIGHBANK)	+= sata_highbank.o libahci.o
 obj-$(CONFIG_AHCI_DA850)	+= ahci_da850.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_IMX)		+= ahci_imx.o libahci.o libahci_platform.o
+obj-$(CONFIG_AHCI_MVEBU)	+= ahci_mvebu.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_SUNXI)	+= ahci_sunxi.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_ST)		+= ahci_st.o libahci.o libahci_platform.o
 obj-$(CONFIG_AHCI_XGENE)	+= ahci_xgene.o libahci.o libahci_platform.o
diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
new file mode 100644
index 0000000..1df8630
--- /dev/null
+++ b/drivers/ata/ahci_mvebu.c
@@ -0,0 +1,127 @@
+/*
+ * AHCI glue platform driver for Marvell EBU SOCs
+ *
+ * Copyright (C) 2014 Marvell
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ * Marcin Wojtas <mw@semihalf.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/ahci_platform.h>
+#include <linux/kernel.h>
+#include <linux/mbus.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include "ahci.h"
+
+#define AHCI_VENDOR_SPECIFIC_0_ADDR  0xa0
+#define AHCI_VENDOR_SPECIFIC_0_DATA  0xa4
+
+#define AHCI_WINDOW_CTRL(win)	(0x60 + ((win) << 4))
+#define AHCI_WINDOW_BASE(win)	(0x64 + ((win) << 4))
+#define AHCI_WINDOW_SIZE(win)	(0x68 + ((win) << 4))
+
+static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv,
+				   const struct mbus_dram_target_info *dram)
+{
+	int i;
+
+	for (i = 0; i < 4; i++) {
+		writel(0, hpriv->mmio + AHCI_WINDOW_CTRL(i));
+		writel(0, hpriv->mmio + AHCI_WINDOW_BASE(i));
+		writel(0, hpriv->mmio + AHCI_WINDOW_SIZE(i));
+	}
+
+	for (i = 0; i < dram->num_cs; i++) {
+		const struct mbus_dram_window *cs = dram->cs + i;
+
+		writel((cs->mbus_attr << 8) |
+		       (dram->mbus_dram_target_id << 4) | 1,
+		       hpriv->mmio + AHCI_WINDOW_CTRL(i));
+		writel(cs->base, hpriv->mmio + AHCI_WINDOW_BASE(i));
+		writel(((cs->size - 1) & 0xffff0000),
+		       hpriv->mmio + AHCI_WINDOW_SIZE(i));
+	}
+}
+
+static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv)
+{
+	/*
+	 * Enable the regret bit to allow the SATA unit to regret a
+	 * request that didn't receive an acknowlegde and avoid a
+	 * deadlock
+	 */
+	writel(0x4, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_ADDR);
+	writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA);
+}
+
+static const struct ata_port_info ahci_mvebu_port_info = {
+	.flags	   = AHCI_FLAG_COMMON,
+	.pio_mask  = ATA_PIO4,
+	.udma_mask = ATA_UDMA6,
+	.port_ops  = &ahci_platform_ops,
+};
+
+static int ahci_mvebu_probe(struct platform_device *pdev)
+{
+	struct ahci_host_priv *hpriv;
+	const struct mbus_dram_target_info *dram;
+	int rc;
+
+	hpriv = ahci_platform_get_resources(pdev);
+	if (IS_ERR(hpriv))
+		return PTR_ERR(hpriv);
+
+	rc = ahci_platform_enable_resources(hpriv);
+	if (rc)
+		return rc;
+
+	dram = mv_mbus_dram_info();
+	if (!dram)
+		return -ENODEV;
+
+	ahci_mvebu_mbus_config(hpriv, dram);
+	ahci_mvebu_regret_option(hpriv);
+
+	rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, 0, 0);
+	if (rc)
+		goto disable_resources;
+
+	return 0;
+
+disable_resources:
+	ahci_platform_disable_resources(hpriv);
+	return rc;
+}
+
+static const struct of_device_id ahci_mvebu_of_match[] = {
+	{ .compatible = "marvell,armada-380-ahci", },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match);
+
+/*
+ * We currently don't provide power management related operations,
+ * since there is no suspend/resume support at the platform level for
+ * Armada 38x for the moment.
+ */
+static struct platform_driver ahci_mvebu_driver = {
+	.probe = ahci_mvebu_probe,
+	.remove = ata_platform_remove_one,
+	.driver = {
+		.name = "ahci-mvebu",
+		.owner = THIS_MODULE,
+		.of_match_table = ahci_mvebu_of_match,
+	},
+};
+module_platform_driver(ahci_mvebu_driver);
+
+MODULE_DESCRIPTION("Marvell EBU AHCI SATA driver");
+MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Marcin Wojtas <mw@semihalf.com>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ahci_mvebu");
-- 
1.9.2

[PATCHv3 2/5] ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces

[Jason Cooper]

Tejun,

On Tue, Apr 15, 2014 at 05:00:03PM +0200, Thomas Petazzoni wrote:
> The Marvell Armada 380 SoC includes two AHCI compatible
> interfaces. However, like all DMA-capable Marvell interface, they
> require special handling to configure MBus windows. Therefore, this
> commit adds a new ahci_mvebu driver, which relies on the
> libahci_platform.c code recently introduced.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

[PATCHv3 2/5] ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces

[Tejun Heo]

On Tue, Apr 15, 2014 at 05:00:03PM +0200, Thomas Petazzoni wrote:
> The Marvell Armada 380 SoC includes two AHCI compatible
> interfaces. However, like all DMA-capable Marvell interface, they
> require special handling to configure MBus windows. Therefore, this
> commit adds a new ahci_mvebu driver, which relies on the
> libahci_platform.c code recently introduced.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

How should this be routed?  Can I pick up just this one and apply it
to libata/for-3.16?

Thanks.

-- 
tejun

[PATCHv3 2/5] ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces

[Thomas Petazzoni]

Dear Tejun Heo,

On Fri, 2 May 2014 11:22:37 -0400, Tejun Heo wrote:
> On Tue, Apr 15, 2014 at 05:00:03PM +0200, Thomas Petazzoni wrote:
> > The Marvell Armada 380 SoC includes two AHCI compatible
> > interfaces. However, like all DMA-capable Marvell interface, they
> > require special handling to configure MBus windows. Therefore, this
> > commit adds a new ahci_mvebu driver, which relies on the
> > libahci_platform.c code recently introduced.
> > 
> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> 
> How should this be routed?  Can I pick up just this one and apply it
> to libata/for-3.16?

Yes. And I believe you should also take PATCH 1 in the series, which
updates the Device Tree binding documentation for the AHCI driver. Both
patches have received a Acked-by from Jason Cooper, the maintainer of
the mvebu platforms.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCHv3 2/5] ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces

[Tejun Heo]

On Tue, Apr 15, 2014 at 05:00:03PM +0200, Thomas Petazzoni wrote:
> The Marvell Armada 380 SoC includes two AHCI compatible
> interfaces. However, like all DMA-capable Marvell interface, they
> require special handling to configure MBus windows. Therefore, this
> commit adds a new ahci_mvebu driver, which relies on the
> libahci_platform.c code recently introduced.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Applied to libata/for-3.16.

Thanks.

-- 
tejun

[PATCHv3 3/5] ARM: mvebu: add Device Tree description of AHCI interfaces on Armada 38x

[Thomas Petazzoni]

The Marvell Armada 38x processors contain two AHCI compatible
interfaces. This commit adds the Device Tree description of those
interfaces at the SoC level, and also enables them on the Armada 385
DB platform, which allows access to both interfaces through SATA
ports.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/boot/dts/armada-385-db.dts |  8 ++++++++
 arch/arm/boot/dts/armada-38x.dtsi   | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/arch/arm/boot/dts/armada-385-db.dts b/arch/arm/boot/dts/armada-385-db.dts
index 6828d77..bdde8ff 100644
--- a/arch/arm/boot/dts/armada-385-db.dts
+++ b/arch/arm/boot/dts/armada-385-db.dts
@@ -81,6 +81,14 @@
 				};
 			};
 
+			sata at a8000 {
+				status = "okay";
+			};
+
+			sata at e0000 {
+				status = "okay";
+			};
+
 			flash at d0000 {
 				status = "okay";
 				num-cs = <1>;
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index a064f59..634a020 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -338,6 +338,22 @@
 				reg = <0x72004 0x4>;
 			};
 
+			sata at a8000 {
+				compatible = "marvell,armada-380-ahci";
+				reg = <0xa8000 0x2000>;
+				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gateclk 15>;
+				status = "disabled";
+			};
+
+			sata at e0000 {
+				compatible = "marvell,armada-380-ahci";
+				reg = <0xe0000 0x2000>;
+				interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&gateclk 30>;
+				status = "disabled";
+			};
+
 			coredivclk: clock at e4250 {
 				compatible = "marvell,armada-380-corediv-clock";
 				reg = <0xe4250 0xc>;
-- 
1.9.2

[PATCHv3 3/5] ARM: mvebu: add Device Tree description of AHCI interfaces on Armada 38x

[Jason Cooper]

On Tue, Apr 15, 2014 at 05:00:04PM +0200, Thomas Petazzoni wrote:
> The Marvell Armada 38x processors contain two AHCI compatible
> interfaces. This commit adds the Device Tree description of those
> interfaces at the SoC level, and also enables them on the Armada 385
> DB platform, which allows access to both interfaces through SATA
> ports.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/boot/dts/armada-385-db.dts |  8 ++++++++
>  arch/arm/boot/dts/armada-38x.dtsi   | 16 ++++++++++++++++
>  2 files changed, 24 insertions(+)

Applied to mvebu/dt

thx,

Jason.

[PATCHv3 4/5] ARM: configs: add ahci_mvebu to mvebu_v7_defconfig

[Thomas Petazzoni]

The Marvell Armada 38x platform needs the ahci_mvebu driver enabled
for the AHCI interfaces, so this commit enables the corresponding
Kconfig option in mvebu_v7_defconfig.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/configs/mvebu_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index a34713d..aaa625a 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -36,6 +36,7 @@ CONFIG_CFG80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
+CONFIG_AHCI_MVEBU=y
 CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
 CONFIG_MVNETA=y
-- 
1.9.2

[PATCHv3 4/5] ARM: configs: add ahci_mvebu to mvebu_v7_defconfig

[Jason Cooper]

On Tue, Apr 15, 2014 at 05:00:05PM +0200, Thomas Petazzoni wrote:
> The Marvell Armada 38x platform needs the ahci_mvebu driver enabled
> for the AHCI interfaces, so this commit enables the corresponding
> Kconfig option in mvebu_v7_defconfig.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/configs/mvebu_v7_defconfig | 1 +
>  1 file changed, 1 insertion(+)

Applied to mvebu/defconfig

thx,

Jason.

[PATCHv3 5/5] ARM: configs: add ahci_mvebu to multi_v7_defconfig

[Thomas Petazzoni]

The Marvell Armada 38x platform needs the ahci_mvebu driver enabled
for the AHCI interfaces, so this commit enables the corresponding
Kconfig option in multi_v7_defconfig.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 arch/arm/configs/multi_v7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index d4e8a47..59f7ede 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -116,6 +116,7 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_ATA=y
+CONFIG_AHCI_MVEBU=y
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_HIGHBANK=y
 CONFIG_SATA_MV=y
-- 
1.9.2

[PATCHv3 5/5] ARM: configs: add ahci_mvebu to multi_v7_defconfig

[Jason Cooper]

Arnd, Olof, Kevin,

On Tue, Apr 15, 2014 at 05:00:06PM +0200, Thomas Petazzoni wrote:
> The Marvell Armada 38x platform needs the ahci_mvebu driver enabled
> for the AHCI interfaces, so this commit enables the corresponding
> Kconfig option in multi_v7_defconfig.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  arch/arm/configs/multi_v7_defconfig | 1 +
>  1 file changed, 1 insertion(+)

Conflict-ridden file, please take directly.

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

[PATCHv3 5/5] ARM: configs: add ahci_mvebu to multi_v7_defconfig

[Olof Johansson]

On Fri, Apr 25, 2014 at 08:25:18PM -0400, Jason Cooper wrote:
> Arnd, Olof, Kevin,
> 
> On Tue, Apr 15, 2014 at 05:00:06PM +0200, Thomas Petazzoni wrote:
> > The Marvell Armada 38x platform needs the ahci_mvebu driver enabled
> > for the AHCI interfaces, so this commit enables the corresponding
> > Kconfig option in multi_v7_defconfig.
> > 
> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > ---
> >  arch/arm/configs/multi_v7_defconfig | 1 +
> >  1 file changed, 1 insertion(+)
> 
> Conflict-ridden file, please take directly.
> 
> Acked-by: Jason Cooper <jason@lakedaemon.net>

Just like many other maintainers, just getting added on cc on the ack doesn't
fit our work flows very well.

When I get one of these, I have to go hunting for the original patch on
whatever list it was posted on, verifying that it's indeed the right one,
and then apply it, and then add your ack.

It's much easier if we get the patch remailed to us, or resubmitted with the
ack and sent to us. It's how others (like Greg) tend to prefer to get patches
as well.

So, Thomas, care to resend us (arm at kernel.org) the patch with the ack
appended?  Thanks!


-Olof

[PATCHv3 5/5] ARM: configs: add ahci_mvebu to multi_v7_defconfig

[Thomas Petazzoni]

Dear Olof Johansson,

On Mon, 5 May 2014 14:51:21 -0700, Olof Johansson wrote:

> It's much easier if we get the patch remailed to us, or resubmitted with the
> ack and sent to us. It's how others (like Greg) tend to prefer to get patches
> as well.
> 
> So, Thomas, care to resend us (arm at kernel.org) the patch with the ack
> appended?  Thanks!

Sure, will do, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[PATCHv3 5/5] ARM: configs: add ahci_mvebu to multi_v7_defconfig

[Jason Cooper]

On Mon, May 05, 2014 at 02:51:21PM -0700, Olof Johansson wrote:
> On Fri, Apr 25, 2014 at 08:25:18PM -0400, Jason Cooper wrote:
> > Arnd, Olof, Kevin,
> > 
> > On Tue, Apr 15, 2014 at 05:00:06PM +0200, Thomas Petazzoni wrote:
> > > The Marvell Armada 38x platform needs the ahci_mvebu driver enabled
> > > for the AHCI interfaces, so this commit enables the corresponding
> > > Kconfig option in multi_v7_defconfig.
> > > 
> > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > > ---
> > >  arch/arm/configs/multi_v7_defconfig | 1 +
> > >  1 file changed, 1 insertion(+)
> > 
> > Conflict-ridden file, please take directly.
> > 
> > Acked-by: Jason Cooper <jason@lakedaemon.net>
> 
> Just like many other maintainers, just getting added on cc on the ack doesn't
> fit our work flows very well.

gah, yes of course.  I was being lazy.  I'll bounce or resend in the
future.

thx,

Jason.