From: Alexander Gordeev <agordeev@redhat.com>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
Jan Beulich <JBeulich@suse.com>
Subject: [PATCH] AHCI: Make distinct names for ports in /proc/interrupts
Date: Mon, 29 Apr 2013 12:12:38 +0200 [thread overview]
Message-ID: <20130429101237.GA27738@dhcp-26-207.brq.redhat.com> (raw)
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 | 6 ++++--
drivers/ata/ahci.h | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 3b9a7b1..dc5c1aa 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1146,10 +1146,12 @@ 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;
+ snprintf(pp->irq_desc, sizeof(pp->irq_desc),
+ "%s%d", dev_driver_string(host->dev), i);
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..ceb5208 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[8]; /* bus + port # */
};
struct ahci_host_priv {
--
1.7.7.6
--
Regards,
Alexander Gordeev
agordeev@redhat.com
next reply other threads:[~2013-04-29 10:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 10:12 Alexander Gordeev [this message]
2013-04-29 11:32 ` Sergei Shtylyov
2013-04-30 21:41 ` Jeff Garzik
2013-05-07 8:38 ` [PATCH v2] " Alexander Gordeev
2013-05-14 18:56 ` Tejun Heo
2013-05-14 19:41 ` Alexander Gordeev
2013-05-14 20:44 ` Tejun Heo
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=20130429101237.GA27738@dhcp-26-207.brq.redhat.com \
--to=agordeev@redhat.com \
--cc=JBeulich@suse.com \
--cc=jgarzik@pobox.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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
all inboxes | Powered by JetHome®