* [PATCH RESEND 0/1] AHCI: Make distinct names for ports in /proc/interrupts @ 2013-05-21 19:03 Alexander Gordeev 2013-05-21 19:03 ` [PATCH RESEND 1/1] " Alexander Gordeev 0 siblings, 1 reply; 3+ messages in thread From: Alexander Gordeev @ 2013-05-21 19:03 UTC (permalink / raw) To: Tejun Heo; +Cc: linux-kernel, linux-ide, Jeff Garzik, Jan Beulich Tejun, This patch is applied on top of previously (re)sent patch "AHCI: Optimize interrupt processing". Should the latter refused, I will post a new version. Alexander Gordeev (1): AHCI: Make distinct names for ports in /proc/interrupts drivers/ata/ahci.c | 5 +++-- drivers/ata/ahci.h | 1 + drivers/ata/libahci.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) -- 1.7.7.6 -- Regards, Alexander Gordeev agordeev@redhat.com ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH RESEND 1/1] AHCI: Make distinct names for ports in /proc/interrupts 2013-05-21 19:03 [PATCH RESEND 0/1] AHCI: Make distinct names for ports in /proc/interrupts Alexander Gordeev @ 2013-05-21 19:03 ` Alexander Gordeev 2013-05-21 23:55 ` [PATCH] AHCI: Make distinct names for ports in /proc/interrupts /proc/interrupts Tejun Heo 0 siblings, 1 reply; 3+ messages in thread From: Alexander Gordeev @ 2013-05-21 19:03 UTC (permalink / raw) To: Tejun Heo; +Cc: linux-kernel, linux-ide, Jeff Garzik, Jan Beulich Currently all interrupts assigned to AHCI ports show up in '/proc/interrupts' as 'ahci'. This fix adds port numbers as suffixes and hence makes the descriptions distinct. Reported-by: Jan Beulich <JBeulich@suse.com> Signed-off-by: Alexander Gordeev <agordeev@redhat.com> --- drivers/ata/ahci.c | 5 +++-- drivers/ata/ahci.h | 1 + drivers/ata/libahci.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index e4d915f..32dd3e2 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1148,10 +1148,11 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis, return -EINVAL; for (i = 0; i < n_irqs; i++) { + struct ahci_port_priv *pp = host->ports[i]->private_data; + rc = devm_request_threaded_irq(host->dev, irq + i, ahci_multi_irqs_intr, ahci_port_thread_fn, - IRQF_SHARED, dev_driver_string(host->dev), - host->ports[i]); + IRQF_SHARED, pp->irq_desc, host->ports[i]); if (rc) goto out_free_irqs; } diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index ed1fbc8..7386dfd 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -305,6 +305,7 @@ struct ahci_port_priv { int fbs_last_dev; /* save FBS.DEV of last FIS */ /* enclosure management info per PM slot */ struct ahci_em_priv em_priv[EM_MAX_SLOTS]; + char *irq_desc; /* desc in /proc/interrupts */ }; struct ahci_host_priv { diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 68b3bdd..2b56769 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2251,6 +2251,16 @@ static int ahci_port_start(struct ata_port *ap) if (!pp) return -ENOMEM; + if (ap->host->n_ports > 1) { + pp->irq_desc = devm_kzalloc(dev, 8, GFP_KERNEL); + if (!pp->irq_desc) { + devm_kfree(dev, pp); + return -ENOMEM; + } + snprintf(pp->irq_desc, 8, + "%s%d", dev_driver_string(dev), ap->port_no); + } + /* check FBS capability */ if ((hpriv->cap & HOST_CAP_FBS) && sata_pmp_supported(ap)) { void __iomem *port_mmio = ahci_port_base(ap); -- 1.7.7.6 -- Regards, Alexander Gordeev agordeev@redhat.com ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] AHCI: Make distinct names for ports in /proc/interrupts /proc/interrupts 2013-05-21 19:03 ` [PATCH RESEND 1/1] " Alexander Gordeev @ 2013-05-21 23:55 ` Tejun Heo 0 siblings, 0 replies; 3+ messages in thread From: Tejun Heo @ 2013-05-21 23:55 UTC (permalink / raw) To: Alexander Gordeev; +Cc: linux-kernel, linux-ide, Jeff Garzik, Jan Beulich I've refreshed on top of libata/for-3.11 and applied it. If I broke something, please let me know. Thanks a lot! >From b29900e62598cecd519c9ab2b8e4d03f8ebf702d Mon Sep 17 00:00:00 2001 From: Alexander Gordeev <agordeev@redhat.com> Date: Wed, 22 May 2013 08:53:48 +0900 Currently all interrupts assigned to AHCI ports show up in '/proc/interrupts' as 'ahci'. This fix adds port numbers as suffixes and hence makes the descriptions distinct. Reported-by: Jan Beulich <JBeulich@suse.com> Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Signed-off-by: Tejun Heo <tj@kernel.org> --- drivers/ata/ahci.c | 4 +++- drivers/ata/ahci.h | 1 + drivers/ata/libahci.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 251e57d..4d1c672 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -1142,9 +1142,11 @@ int ahci_host_activate(struct ata_host *host, int irq, unsigned int n_msis) return rc; for (i = 0; i < host->n_ports; i++) { + struct ahci_port_priv *pp = host->ports[i]->private_data; + rc = devm_request_threaded_irq(host->dev, irq + i, ahci_hw_interrupt, ahci_thread_fn, IRQF_SHARED, - dev_driver_string(host->dev), host->ports[i]); + pp->irq_desc, host->ports[i]); if (rc) goto out_free_irqs; } diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index b830e6c..05adf29 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -306,6 +306,7 @@ struct ahci_port_priv { int fbs_last_dev; /* save FBS.DEV of last FIS */ /* enclosure management info per PM slot */ struct ahci_em_priv em_priv[EM_MAX_SLOTS]; + char *irq_desc; /* desc in /proc/interrupts */ }; struct ahci_host_priv { diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 34c8216..3797a7b 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -2234,6 +2234,16 @@ static int ahci_port_start(struct ata_port *ap) if (!pp) return -ENOMEM; + if (ap->host->n_ports > 1) { + pp->irq_desc = devm_kzalloc(dev, 8, GFP_KERNEL); + if (!pp->irq_desc) { + devm_kfree(dev, pp); + return -ENOMEM; + } + snprintf(pp->irq_desc, 8, + "%s%d", dev_driver_string(dev), ap->port_no); + } + /* check FBS capability */ if ((hpriv->cap & HOST_CAP_FBS) && sata_pmp_supported(ap)) { void __iomem *port_mmio = ahci_port_base(ap); -- 1.8.1.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-21 23:55 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-05-21 19:03 [PATCH RESEND 0/1] AHCI: Make distinct names for ports in /proc/interrupts Alexander Gordeev 2013-05-21 19:03 ` [PATCH RESEND 1/1] " Alexander Gordeev 2013-05-21 23:55 ` [PATCH] AHCI: Make distinct names for ports in /proc/interrupts /proc/interrupts Tejun Heo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox