From: Marc Zyngier <marc.zyngier@arm.com>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Gregory Clement <gregory.clement@bootlin.com>,
Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Jens Axboe <axboe@kernel.dk>,
Hans de Goede <hdegoede@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: devicetree@vger.kernel.org, Baruch Siach <baruch@tkos.co.il>,
Antoine Tenart <antoine.tenart@bootlin.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Nadav Haklai <nadavh@marvell.com>,
linux-ide@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v4 08/10] ata: ahci: mvebu: Add support for A8k legacy DT bindings
Date: Tue, 21 May 2019 16:46:01 +0100 [thread overview]
Message-ID: <04cd3174-6857-4552-293d-5f25caa189a7@arm.com> (raw)
In-Reply-To: <20190521143023.31810-9-miquel.raynal@bootlin.com>
On 21/05/2019 15:30, Miquel Raynal wrote:
> The CP110 SATA unit has 2 ports, and a dedicated ICU entry per
> port. In the past, the AHCI SATA driver only supported one interrupt
> per SATA unit. To solve this conflict, the 2 SATA wired interrupts in
> the South-Bridge got configured as 1 GIC interrupt in the
> North-Bridge, regardless of the number of SATA ports actually
> enabled/in use, and the DT bindings only referenced the interrupt of
> one port.
>
> Since then, this limitation has been addressed and this patch ensures
> backward compatibility with old DTs not describing SATA ports
> correctly directly from the AHCI MVEBU driver. This way, we will be
> able to drop the hack from the ICU driver. IOW, when the A8k
> compatible string is used and there is no sub-nodes in the DT, we
> fake the creation and mapping of the second (missing) interrupt.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
> ---
> drivers/ata/ahci_mvebu.c | 29 ++++++++++++++++++++++++++++-
> drivers/ata/libahci_platform.c | 3 +++
> include/linux/ahci_platform.h | 1 +
> 3 files changed, 32 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c
> index 8671aa8179fa..8c981b8d6e4d 100644
> --- a/drivers/ata/ahci_mvebu.c
> +++ b/drivers/ata/ahci_mvebu.c
> @@ -16,6 +16,7 @@
> #include <linux/mbus.h>
> #include <linux/module.h>
> #include <linux/of_device.h>
> +#include <linux/of_irq.h>
> #include <linux/platform_device.h>
> #include "ahci.h"
>
> @@ -28,9 +29,13 @@
> #define AHCI_WINDOW_BASE(win) (0x64 + ((win) << 4))
> #define AHCI_WINDOW_SIZE(win) (0x68 + ((win) << 4))
>
> +#define ICU_SATA0_ICU_ID 109
> +#define ICU_SATA1_ICU_ID 107
> +
> struct ahci_mvebu_plat_data {
> int (*plat_config)(struct ahci_host_priv *hpriv, struct device *dev);
> unsigned int host_flags;
> + unsigned int resource_flags;
> };
>
> static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv,
> @@ -101,6 +106,27 @@ static int ahci_mvebu_armada_3700_config(struct ahci_host_priv *hpriv,
> static int ahci_mvebu_armada_8k_config(struct ahci_host_priv *hpriv,
> struct device *dev)
> {
> + struct device_node *np = of_irq_find_parent(dev->of_node);
> + struct irq_data *irqd = irq_get_irq_data(hpriv->irqs[0]);
> + int host_irq = irqd ? irqd_to_hwirq(irqd) : 0;
> + int missing_irq = (host_irq == ICU_SATA1_ICU_ID) ?
> + ICU_SATA0_ICU_ID : ICU_SATA1_ICU_ID;
> + struct irq_fwspec fwspec = {
> + .fwnode = of_node_to_fwnode(np),
> + .param_count = 2,
> + .param = {missing_irq, IRQ_TYPE_LEVEL_HIGH},
> + };
> +
> + if (of_get_child_count(dev->of_node))
> + return 0;
> +
> + hpriv->irqs[1] = irq_create_fwspec_mapping(&fwspec);
> + if (hpriv->irqs[1]) {
> + hpriv->flags |= AHCI_HFLAG_MULTI_MSI;
> + hpriv->get_irq_vector = ahci_get_per_port_irq_vector;
> + hpriv->mask_port_map = GENMASK(1, 0);
> + }
> +
> return 0;
> }
>
> @@ -200,7 +226,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev)
> if (!pdata)
> return -EINVAL;
>
> - hpriv = ahci_platform_get_resources(pdev, 0);
> + hpriv = ahci_platform_get_resources(pdev, pdata->resource_flags);
This seems to be the only use of resource_flags in the whole series. Why
can't you just pass AHCI_PLATFORM_A8K_QUIRK as a parameter and not
allocate an extra field in the platform data structure?
> if (IS_ERR(hpriv))
> return PTR_ERR(hpriv);
>
> @@ -240,6 +266,7 @@ static const struct ahci_mvebu_plat_data ahci_mvebu_armada_3700_plat_data = {
>
> static const struct ahci_mvebu_plat_data ahci_mvebu_armada_8k_plat_data = {
> .plat_config = ahci_mvebu_armada_8k_config,
> + .resource_flags = AHCI_PLATFORM_A8K_QUIRK,
> };
>
> static const struct of_device_id ahci_mvebu_of_match[] = {
> diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
> index 347ff14aedd2..620e5f27fdd7 100644
> --- a/drivers/ata/libahci_platform.c
> +++ b/drivers/ata/libahci_platform.c
> @@ -484,6 +484,9 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,
> if (!child_nodes)
> hpriv->nports = 1;
>
> + if (!child_nodes && flags & AHCI_PLATFORM_A8K_QUIRK)
Consider using braces around the bitwise operators.
> + hpriv->nports = 2;
> +
> hpriv->phys = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->phys), GFP_KERNEL);
> if (!hpriv->phys) {
> rc = -ENOMEM;
> diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
> index eaedca5fe6fc..57465ba6bb15 100644
> --- a/include/linux/ahci_platform.h
> +++ b/include/linux/ahci_platform.h
> @@ -44,5 +44,6 @@ int ahci_platform_suspend(struct device *dev);
> int ahci_platform_resume(struct device *dev);
>
> #define AHCI_PLATFORM_GET_RESETS 0x01
> +#define AHCI_PLATFORM_A8K_QUIRK 0x02
>
> #endif /* _AHCI_PLATFORM_H */
>
Thanks,
M.
--
Jazz is not dead. It just smells funny...
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-21 15:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-21 14:30 [PATCH v4 00/10] Enable per-port SATA interrupts and drop a hack in the IRQ subsystem Miquel Raynal
2019-05-21 14:30 ` [PATCH v4 01/10] ata: libahci: Ensure the host interrupt status bits are cleared Miquel Raynal
2019-05-23 3:11 ` raymond pang
2019-05-23 9:26 ` Marc Zyngier
2019-05-29 10:08 ` Miquel Raynal
2019-05-29 10:37 ` Marc Zyngier
2019-05-29 12:13 ` Miquel Raynal
2019-05-29 13:33 ` Marc Zyngier
2019-05-21 14:30 ` [PATCH v4 02/10] ata: ahci: Support per-port interrupts Miquel Raynal
2019-05-23 9:36 ` Christoph Hellwig
2019-05-21 14:30 ` [PATCH v4 03/10] dt-bindings: ata: Update ahci bindings with possible " Miquel Raynal
2019-05-21 14:30 ` [PATCH v4 04/10] ata: ahci: mvebu: Rename a platform data flag Miquel Raynal
2019-05-22 8:58 ` Marc Zyngier
2019-05-21 14:30 ` [PATCH v4 05/10] ata: ahci: mvebu: Add a parameter to a platform data callback Miquel Raynal
2019-05-21 14:30 ` [PATCH v4 06/10] dt-bindings: ata: Update ahci_mvebu bindings Miquel Raynal
2019-05-21 14:30 ` [PATCH v4 07/10] ata: ahci: mvebu: Support A8k compatible Miquel Raynal
2019-05-21 14:30 ` [PATCH v4 08/10] ata: ahci: mvebu: Add support for A8k legacy DT bindings Miquel Raynal
2019-05-21 15:46 ` Marc Zyngier [this message]
2019-05-29 10:10 ` Miquel Raynal
2019-05-21 14:30 ` [PATCH v4 09/10] irqchip/irq-mvebu-icu: Remove the double SATA ports interrupt hack Miquel Raynal
2019-05-21 15:51 ` Marc Zyngier
2019-05-21 14:30 ` [PATCH v4 10/10] arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=04cd3174-6857-4552-293d-5f25caa189a7@arm.com \
--to=marc.zyngier@arm.com \
--cc=andrew@lunn.ch \
--cc=antoine.tenart@bootlin.com \
--cc=axboe@kernel.dk \
--cc=baruch@tkos.co.il \
--cc=devicetree@vger.kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=hdegoede@redhat.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ide@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.chevallier@bootlin.com \
--cc=miquel.raynal@bootlin.com \
--cc=nadavh@marvell.com \
--cc=robh+dt@kernel.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=tglx@linutronix.de \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).