From: David Milburn <dmilburn@redhat.com>
To: jgarzik@pobox.com
Cc: David Milburn <dmilburn@redhat.com>,
linux-ide@vger.kernel.org, kay.sievers@vrfy.org,
coughlan@redhat.com, fengguang.wu@intel.com, gwendal@google.com
Subject: Re: [PATCH #upstream] libata: export local port number through /sys
Date: Mon, 25 Feb 2013 15:04:26 -0600 [thread overview]
Message-ID: <512BD1DA.80305@redhat.com> (raw)
In-Reply-To: <1359049929-17069-1-git-send-email-dmilburn@redhat.com>
David Milburn wrote:
> Export <global port>.<local port> format through /sys
>
> ./pci0000:00/0000:00:1f.2/ata1.1
> ./pci0000:00/0000:00:1f.2/ata1.1/link1.1/dev1.1.0/ata_device
> ./pci0000:00/0000:00:1f.2/ata1.1/link1.1/ata_link
> ./pci0000:00/0000:00:1f.2/ata1.1/ata_port
> ./pci0000:00/0000:00:1f.2/ata1.1/ata_port/ata1.1
> ./pci0000:00/0000:00:1f.2/ata2.2
> ./pci0000:00/0000:00:1f.2/ata2.2/link2.2/dev2.2.0/ata_device
> ./pci0000:00/0000:00:1f.2/ata2.2/link2.2/ata_link
> ./pci0000:00/0000:00:1f.2/ata2.2/ata_port
> ./pci0000:00/0000:00:1f.2/ata2.2/ata_port/ata2.2
> ./pci0000:00/0000:00:1f.2/ata3.3
> ./pci0000:00/0000:00:1f.2/ata3.3/link3.3/dev3.3.0/ata_device
> ./pci0000:00/0000:00:1f.2/ata3.3/link3.3/ata_link
> ./pci0000:00/0000:00:1f.2/ata3.3/ata_port
> ./pci0000:00/0000:00:1f.2/ata3.3/ata_port/ata3.3
> ./pci0000:00/0000:00:1f.2/ata4.4
> ./pci0000:00/0000:00:1f.2/ata4.4/link4.4/dev4.4.0/ata_device
> ./pci0000:00/0000:00:1f.2/ata4.4/link4.4/ata_link
> ./pci0000:00/0000:00:1f.2/ata4.4/ata_port
> ./pci0000:00/0000:00:1f.2/ata4.4/ata_port/ata4.4
> ./pci0000:00/0000:00:1f.2/ata5.5
> ./pci0000:00/0000:00:1f.2/ata5.5/link5.5/dev5.5.0/ata_device
> ./pci0000:00/0000:00:1f.2/ata5.5/link5.5/ata_link
> ./pci0000:00/0000:00:1f.2/ata5.5/ata_port
> ./pci0000:00/0000:00:1f.2/ata5.5/ata_port/ata5.5
> ./pci0000:00/0000:00:1f.2/ata6.6
> ./pci0000:00/0000:00:1f.2/ata6.6/link6.6/dev6.6.0/ata_device
> ./pci0000:00/0000:00:1f.2/ata6.6/link6.6/ata_link
> ./pci0000:00/0000:00:1f.2/ata6.6/ata_port
> ./pci0000:00/0000:00:1f.2/ata6.6/ata_port/ata6.6
>
> (2nd controller with port multiplier)
>
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.10/dev7.1.10.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.10/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.11/dev7.1.11.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.11/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.12/dev7.1.12.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.12/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.13/dev7.1.13.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.13/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.14/dev7.1.14.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.14/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1/dev7.1.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.0/dev7.1.0.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.0/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.1/dev7.1.1.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.1/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.2/dev7.1.2.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.2/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.3/dev7.1.3.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.3/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.4/dev7.1.4.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.4/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.5/dev7.1.5.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.5/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.6/dev7.1.6.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.6/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.7/dev7.1.7.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.7/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.8/dev7.1.8.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.8/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.9/dev7.1.9.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/link7.1.9/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/ata_port
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata7.1/ata_port/ata7.1
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata8.2
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata8.2/link8.2/dev8.2.0/ata_device
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata8.2/link8.2/ata_link
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata8.2/ata_port
> ./pci0000:00/0000:00:1e.0/0000:05:01.0/ata8.2/ata_port/ata8.2
>
> Signed-off-by: David Milburn <dmilburn@redhat.com>
> ---
> This could be modified to fit on top of "Insert ATA transport objects in SCSI
> sysfs topology".
>
> drivers/ata/libata-core.c | 6 ++++--
> drivers/ata/libata-transport.c | 10 +++++-----
> include/linux/libata.h | 1 +
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
> index 4b6fb48..a796482 100644
> --- a/drivers/ata/libata-core.c
> +++ b/drivers/ata/libata-core.c
> @@ -5629,6 +5629,7 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
> ap->pflags |= ATA_PFLAG_INITIALIZING | ATA_PFLAG_FROZEN;
> ap->lock = &host->lock;
> ap->print_id = -1;
> + ap->local_print_id = -1;
> ap->host = host;
> ap->dev = host->dev;
>
> @@ -6119,9 +6120,10 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
> kfree(host->ports[i]);
>
> /* give ports names and add SCSI hosts */
> - for (i = 0; i < host->n_ports; i++)
> + for (i = 0; i < host->n_ports; i++) {
> host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
> -
> + host->ports[i]->local_print_id = i + 1;
> + }
>
> /* Create associated sysfs transport objects */
> for (i = 0; i < host->n_ports; i++) {
> diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c
> index c04d393..176bed8 100644
> --- a/drivers/ata/libata-transport.c
> +++ b/drivers/ata/libata-transport.c
> @@ -284,7 +284,7 @@ int ata_tport_add(struct device *parent,
>
> dev->parent = get_device(parent);
> dev->release = ata_tport_release;
> - dev_set_name(dev, "ata%d", ap->print_id);
> + dev_set_name(dev, "ata%d.%d", ap->print_id, ap->local_print_id);
> transport_setup_device(dev);
> error = device_add(dev);
> if (error) {
> @@ -410,9 +410,9 @@ int ata_tlink_add(struct ata_link *link)
> dev->parent = get_device(&ap->tdev);
> dev->release = ata_tlink_release;
> if (ata_is_host_link(link))
> - dev_set_name(dev, "link%d", ap->print_id);
> + dev_set_name(dev, "link%d.%d", ap->print_id, ap->local_print_id);
> else
> - dev_set_name(dev, "link%d.%d", ap->print_id, link->pmp);
> + dev_set_name(dev, "link%d.%d.%d", ap->print_id, ap->local_print_id, link->pmp);
>
> transport_setup_device(dev);
>
> @@ -638,9 +638,9 @@ static int ata_tdev_add(struct ata_device *ata_dev)
> dev->parent = get_device(&link->tdev);
> dev->release = ata_tdev_release;
> if (ata_is_host_link(link))
> - dev_set_name(dev, "dev%d.%d", ap->print_id,ata_dev->devno);
> + dev_set_name(dev, "dev%d.%d.%d", ap->print_id, ap->local_print_id, ata_dev->devno);
> else
> - dev_set_name(dev, "dev%d.%d.0", ap->print_id, link->pmp);
> + dev_set_name(dev, "dev%d.%d.%d.0", ap->print_id, ap->local_print_id, link->pmp);
>
> transport_setup_device(dev);
> error = device_add(dev);
> diff --git a/include/linux/libata.h b/include/linux/libata.h
> index 91c9d10..62d5c1a 100644
> --- a/include/linux/libata.h
> +++ b/include/linux/libata.h
> @@ -745,6 +745,7 @@ struct ata_port {
> /* Flags that change dynamically, protected by ap->lock */
> unsigned int pflags; /* ATA_PFLAG_xxx */
> unsigned int print_id; /* user visible unique port ID */
> + unsigned int local_print_id; /* host local port ID */
> unsigned int port_no; /* 0 based port no. inside the host */
>
> #ifdef CONFIG_ATA_SFF
Hi Jeff, Gwendal, Kay,
Any thoughts on this patch, is this something we could consider for
3.9?
Thanks,
David
> --
> 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
next prev parent reply other threads:[~2013-02-25 21:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 17:52 [PATCH #upstream] libata: export local port number through /sys David Milburn
2013-02-25 21:04 ` David Milburn [this message]
2013-02-25 21:16 ` Jeff Garzik
2013-02-26 15:26 ` Kay Sievers
2013-03-05 15:48 ` Hannes Reinecke
2013-03-05 23:04 ` David Milburn
2013-03-06 7:10 ` Hannes Reinecke
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=512BD1DA.80305@redhat.com \
--to=dmilburn@redhat.com \
--cc=coughlan@redhat.com \
--cc=fengguang.wu@intel.com \
--cc=gwendal@google.com \
--cc=jgarzik@pobox.com \
--cc=kay.sievers@vrfy.org \
--cc=linux-ide@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.