Patchwork AHCI: Make distinct names for ports in /proc/interrupts

login
register
mail settings
Submitter Alexander Gordeev
Date April 29, 2013, 10:12 a.m.
Message ID <20130429101237.GA27738@dhcp-26-207.brq.redhat.com>
Download mbox | patch
Permalink /patch/240352/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Alexander Gordeev - April 29, 2013, 10:12 a.m.
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(-)
Sergei Shtylyov - April 29, 2013, 11:32 a.m.
Hello.

On 29-04-2013 14:12, Alexander Gordeev wrote:

> 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;

    Empty line wouldn't hurt here, after declaration.

> +			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;
>   		}

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik - April 30, 2013, 9:41 p.m.
On 04/29/2013 06:12 AM, Alexander Gordeev wrote:
> 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 # */

Would prefer to initialize irq_desc when the struct of ahci_port_priv is 
initialized, rather than at irq request time.

	Jeff




--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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 {