AHCI: Make distinct names for ports in /proc/interrupts
cover AHCI: Make distinct names for ports in /proc/interrupts
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(-)
Signature · 7 lines
1.7.7.6 -- Regards, Alexander Gordeev [email protected]
PATCH RESEND 1/1 AHCI: Make distinct names for ports in /proc/interrupts
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.
--- drivers/ata/ahci.c | 5 +++-- drivers/ata/ahci.h | 1 + drivers/ata/libahci.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-)
drivers/ata/ahci.c +3 -2
@@ -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; }
drivers/ata/ahci.h +1 -0
@@ -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 {
drivers/ata/libahci.c +10 -0
@@ -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);
Signature · 7 lines
1.7.7.6 -- Regards, Alexander Gordeev [email protected]
PATCH 1/1 AHCI: Make distinct names for ports in /proc/interrupts /proc/interrupts
I've refreshed on top of libata/for-3.11 and applied it. If I broke something, please let me know.
Thanks a lot!
Quoted 1 line
From
b29900e62598cecd519c9ab2b8e4d03f8ebf702dMon Sep 17 00:00:00 2001
From: Alexander Gordeev <[email protected]>
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.
--- drivers/ata/ahci.c | 4 +++- drivers/ata/ahci.h | 1 + drivers/ata/libahci.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
drivers/ata/ahci.c +3 -1
@@ -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; }
drivers/ata/ahci.h +1 -0
@@ -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 {
drivers/ata/libahci.c +10 -0
@@ -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);
Signature · 1 line
1.8.1.4