@@ -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);
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[] = {
@@ -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)
+ hpriv->nports = 2;
+
hpriv->phys = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->phys), GFP_KERNEL);
if (!hpriv->phys) {
rc = -ENOMEM;
@@ -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 */
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 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(-)