From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80098C10F00 for ; Wed, 6 Mar 2019 15:01:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4CDB820675 for ; Wed, 6 Mar 2019 15:01:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="UQVcNcbg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CDB820675 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=WxavvOKGVB1Nhlkv2GE+g9YgA49yID2EUVsE+/LPFJg=; b=UQVcNcbgkLm6FIzeXhxG+gFuo gMux5si+F0aJJU7ctZq9FNbVWQDd1pZliShNaEaVbPsGDB/S/XJjj9g4/cYOh2xM2v94MPySU0f0U moRtw6jc8mccWQhwfU3lZyoqawtA1Owktz5VBeJyYOkB2wetjB9qIAW9IWjcsoD8SCRi5162/0QTt zu1JwqsJf7xfx+lo6t9fMVclHjo65oSxEmnAV/D1rWK0yAXBBn1CoH5wRwQ4J16JdjioYr0KaujzK 3QoDWthnCW8lytGwPg9hGT2jt7+Ymw20QoSaerDqEiplfRPCVvaiQa5iFaFAsyOX58nYNFhjPojUd 5AZIZkDGQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1Y2z-0001hn-IF; Wed, 06 Mar 2019 15:01:29 +0000 Received: from mail-ed1-f66.google.com ([209.85.208.66]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h1Y2q-0001gp-Bs for linux-arm-kernel@lists.infradead.org; Wed, 06 Mar 2019 15:01:28 +0000 Received: by mail-ed1-f66.google.com with SMTP id c55so10625692edb.0 for ; Wed, 06 Mar 2019 07:01:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=iu6zXrEC1iIkCgltP78ktv6OEyjfEmIjOgUoI5Y62YI=; b=tFNcGsN6iwtsFQ0v1x2bj3vBvK5S7+L7gSImnIrfNEocygLAyli5pjapYpx3G9kFZG xTrW0Zyea3J4GTwwM4qxnu3+2MgHBZjeeCiB1VkzsQ0B/yxcP+a/btPlEkxNLWpVNNeX wQkT7J93RI2h/ZhhOpF9DPuN6qE/tHonEJadZkLF8ashBETogLbLY0tI0Ly/Eokcjr01 7VfZogS3RRV9GHowctcP56lFMFQhaY639JlZUXgFRjKdNF3GJYEjwUJHxsTt4E8qt4wy puteZd3/3vGJpM0Gc9ygJABUXmCuzMrAdAXmSnsbXRIhZta4BYbyvY+VlX5psB3h8H5s kvEQ== X-Gm-Message-State: APjAAAWk2haES+hN3ij5qbAOaErJ8ogVmQUEFTNBRIpRk7vGbPfUZJVW xoIRniH9aANcu+OQrG3Xwp72IQ== X-Google-Smtp-Source: APXvYqxQR1AIcbymZ+gcxdScFAhTelzsHn8XlUnGAC47KOm6sE3kQBSZupk/m+wkwrFID5w2YsUSag== X-Received: by 2002:a17:906:d0cb:: with SMTP id bq11mr4236027ejb.185.1551884478202; Wed, 06 Mar 2019 07:01:18 -0800 (PST) Received: from shalem.localdomain (546A5441.cm-12-3b.dynamic.ziggo.nl. [84.106.84.65]) by smtp.gmail.com with ESMTPSA id h8sm558597edk.21.2019.03.06.07.01.17 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Wed, 06 Mar 2019 07:01:17 -0800 (PST) Subject: Re: [PATCH v2 02/10] ata: ahci: Support per-port interrupts To: Miquel Raynal , Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Rob Herring , Mark Rutland , Jens Axboe , Thomas Gleixner , Marc Zyngier References: <20190306102146.13005-1-miquel.raynal@bootlin.com> <20190306102146.13005-3-miquel.raynal@bootlin.com> From: Hans de Goede Message-ID: Date: Wed, 6 Mar 2019 16:01:16 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.1 MIME-Version: 1.0 In-Reply-To: <20190306102146.13005-3-miquel.raynal@bootlin.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190306_070120_426141_B9A16EDC X-CRM114-Status: GOOD ( 30.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Baruch Siach , Antoine Tenart , Maxime Chevallier , Nadav Haklai , linux-ide@vger.kernel.org, Thomas Petazzoni , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On 06-03-19 11:21, Miquel Raynal wrote: > Right now the ATA core only allows IPs to use a single interrupt. Some > of them (for instance the Armada-CP110 one) actually has one interrupt > per port. Add some logic to support such situation. > > We consider that either there is one single interrupt declared in the > main IP node, or there are per-port interrupts, each of them being > declared in the port sub-nodes. > > Signed-off-by: Miquel Raynal > --- > drivers/ata/acard-ahci.c | 2 +- > drivers/ata/ahci.c | 8 +++- > drivers/ata/ahci.h | 3 +- > drivers/ata/libahci.c | 2 +- > drivers/ata/libahci_platform.c | 67 ++++++++++++++++++++++++++++------ > drivers/ata/sata_highbank.c | 2 +- > 6 files changed, 68 insertions(+), 16 deletions(-) > > diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c > index 583e366be7e2..9414b81e994c 100644 > --- a/drivers/ata/acard-ahci.c > +++ b/drivers/ata/acard-ahci.c > @@ -434,7 +434,7 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id > if (!hpriv) > return -ENOMEM; > > - hpriv->irq = pdev->irq; > + hpriv->irqs[0] = pdev->irq; > hpriv->flags |= (unsigned long)pi.private_data; > > if (!(hpriv->flags & AHCI_HFLAG_NO_MSI)) > diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c > index 021ce46e2e57..bc37a34fa043 100644 > --- a/drivers/ata/ahci.c > +++ b/drivers/ata/ahci.c > @@ -1817,7 +1817,13 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) > /* legacy intx interrupts */ > pci_intx(pdev, 1); > } > - hpriv->irq = pci_irq_vector(pdev, 0); > + > + hpriv->irqs = devm_kzalloc(dev, sizeof(*hpriv->irqs) * n_ports, > + GFP_KERNEL); > + if (!hpriv->irqs) > + return -ENOMEM; > + > + hpriv->irqs[0] = pci_irq_vector(pdev, 0); > > if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss) > host->flags |= ATA_HOST_PARALLEL_SCAN; > diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h > index 8810475f307a..f569f6a0d9f5 100644 > --- a/drivers/ata/ahci.h > +++ b/drivers/ata/ahci.h > @@ -363,7 +363,7 @@ struct ahci_host_priv { > struct phy **phys; > unsigned nports; /* Number of ports */ > void *plat_data; /* Other platform data */ > - unsigned int irq; /* interrupt line */ > + unsigned int *irqs; /* interrupt line(s) */ > /* > * Optional ahci_start_engine override, if not set this gets set to the > * default ahci_start_engine during ahci_save_initial_config, this can > @@ -434,6 +434,7 @@ void ahci_print_info(struct ata_host *host, const char *scc_s); > int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht); > void ahci_error_handler(struct ata_port *ap); > u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked); > +int ahci_get_per_port_irq_vector(struct ata_host *host, int port); > > static inline void __iomem *__ahci_port_base(struct ata_host *host, > unsigned int port_no) > diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c > index 66d4906a5013..25970138a65a 100644 > --- a/drivers/ata/libahci.c > +++ b/drivers/ata/libahci.c > @@ -2602,7 +2602,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, > int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht) > { > struct ahci_host_priv *hpriv = host->private_data; > - int irq = hpriv->irq; > + int irq = hpriv->irqs[0]; > int rc; > > if (hpriv->flags & AHCI_HFLAG_MULTI_MSI) { > diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c > index 81b1a3332ed6..673d355a59ab 100644 > --- a/drivers/ata/libahci_platform.c > +++ b/drivers/ata/libahci_platform.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include "ahci.h" > @@ -95,6 +96,14 @@ static void ahci_platform_disable_phys(struct ahci_host_priv *hpriv) > } > } > > +int ahci_get_per_port_irq_vector(struct ata_host *host, int port) > +{ > + struct ahci_host_priv *hpriv = host->private_data; > + > + return hpriv->irqs[port]; > +} > +EXPORT_SYMBOL_GPL(ahci_get_per_port_irq_vector); > + > /** > * ahci_platform_enable_clks - Enable platform clocks > * @hpriv: host private area to store config values > @@ -385,6 +394,7 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port, > * or for non devicetree enabled platforms a single clock > * 4) resets, if flags has AHCI_PLATFORM_GET_RESETS (optional) > * 5) phys (optional) > + * 6) interrupt(s) > * > * RETURNS: > * The allocated ahci_host_priv on success, otherwise an ERR_PTR value > @@ -396,7 +406,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, > struct ahci_host_priv *hpriv; > struct clk *clk; > struct device_node *child; > - int i, enabled_ports = 0, rc = -ENOMEM, child_nodes; > + int i, enabled_ports = 0, rc = -ENOMEM, child_nodes, ctrl_irq; > u32 mask_port_map = 0; > > if (!devres_open_group(dev, NULL, GFP_KERNEL)) > @@ -489,10 +499,30 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, > goto err_out; > } > > + hpriv->irqs = devm_kzalloc(dev, sizeof(*hpriv->irqs) * hpriv->nports, > + GFP_KERNEL); > + if (!hpriv->irqs) { > + rc = -ENOMEM; > + goto err_out; > + } > + > + ctrl_irq = platform_get_irq(pdev, 0); > + if (ctrl_irq < 0) { > + if (ctrl_irq == -EPROBE_DEFER) { > + rc = ctrl_irq; > + goto err_out; > + } > + ctrl_irq = 0; > + } > + > + if (ctrl_irq > 0) > + hpriv->irqs[0] = ctrl_irq; > + > if (child_nodes) { > for_each_child_of_node(dev->of_node, child) { > u32 port; > struct platform_device *port_dev __maybe_unused; > + int port_irq; > > if (!of_device_is_available(child)) > continue; > @@ -521,6 +551,18 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, > } > #endif > > + if (!ctrl_irq) { > + port_irq = of_irq_get(child, 0); > + if (!port_irq) > + port_irq = -EINVAL; > + if (port_irq < 0) { > + rc = port_irq; > + goto err_out; > + } > + > + hpriv->irqs[port] = port_irq; > + } > + > rc = ahci_platform_get_phy(hpriv, port, dev, child); > if (rc) > goto err_out; > @@ -548,6 +590,18 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, > if (rc == -EPROBE_DEFER) > goto err_out; > } > + > + if (!ctrl_irq && !enabled_ports) { > + dev_err(&pdev->dev, "No IRQ defined\n"); > + rc = -ENODEV; > + goto err_out; > + } > + > + if (enabled_ports > 1) { > + hpriv->flags |= AHCI_HFLAG_MULTI_MSI; > + hpriv->get_irq_vector = ahci_get_per_port_irq_vector; > + } > + I believe that the "if (enabled_ports > 1)" here needs to be: if (!ctrl_irq && enabled_ports > 1) { Otherwise existing boards which use a single irq defined at the main of_node level for the device and have defined more then 1 child-node in their DTB will now get AHCI_HFLAG_MULTI_MSI set, but they will only have hpriv->irqs[0] set to the ctrl_irq leading to returning of 0 as irq from ahci_get_per_port_irq_vector for the other ports, which is wrong. Otherwise this patch looks good to me, so with this fixed (assuming you agree) you may add my: Reviewed-by: Hans de Goede to the next version of this patch. The rest of the patches in this series are outside my area of expertise. Regards. Hans > pm_runtime_enable(dev); > pm_runtime_get_sync(dev); > hpriv->got_runtime_pm = true; > @@ -584,16 +638,7 @@ int ahci_platform_init_host(struct platform_device *pdev, > struct ata_port_info pi = *pi_template; > const struct ata_port_info *ppi[] = { &pi, NULL }; > struct ata_host *host; > - int i, irq, n_ports, rc; > - > - irq = platform_get_irq(pdev, 0); > - if (irq <= 0) { > - if (irq != -EPROBE_DEFER) > - dev_err(dev, "no irq\n"); > - return irq; > - } > - > - hpriv->irq = irq; > + int i, n_ports, rc; > > /* prepare host */ > pi.private_data = (void *)(unsigned long)hpriv->flags; > diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c > index c8fc9280d6e4..dcfdab20021b 100644 > --- a/drivers/ata/sata_highbank.c > +++ b/drivers/ata/sata_highbank.c > @@ -496,7 +496,7 @@ static int ahci_highbank_probe(struct platform_device *pdev) > return -ENOMEM; > } > > - hpriv->irq = irq; > + hpriv->irqs[0] = irq; > hpriv->flags |= (unsigned long)pi.private_data; > > hpriv->mmio = devm_ioremap(dev, mem->start, resource_size(mem)); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel