From: Bjorn Helgaas <helgaas@kernel.org>
To: Jon Derrick <jonathan.derrick@intel.com>
Cc: keith.busch@intel.com, linux-pci@vger.kernel.org
Subject: Re: [PATCHv2] VMD: Attach vmd resources to parent domain's resource tree
Date: Thu, 10 Mar 2016 14:59:05 -0600 [thread overview]
Message-ID: <20160310205905.GG14873@localhost> (raw)
In-Reply-To: <1456333597-10469-1-git-send-email-jonathan.derrick@intel.com>
On Wed, Feb 24, 2016 at 10:06:37AM -0700, Jon Derrick wrote:
> This patch attaches the new VMD domain's resources to the VMD device's
> resources. This allows /proc/iomem to display a more complete picture.
>
> Before:
> c0000000-c1ffffff : 0000:5d:05.5
> c2000000-c3ffffff : 0000:5d:05.5
> c2010000-c2013fff : nvme
> c4000000-c40fffff : 0000:5d:05.5
>
> After:
> c0000000-c1ffffff : 0000:5d:05.5
> c2000000-c3ffffff : 0000:5d:05.5
> c2000000-c3ffffff : VMD MEMBAR1
> c2000000-c22fffff : PCI Bus 10000:01
> c2000000-c200ffff : 10000:01:00.0
> c2010000-c2013fff : 10000:01:00.0
> c2010000-c2013fff : nvme
> c2300000-c24fffff : PCI Bus 10000:01
> c4000000-c40fffff : 0000:5d:05.5
> c4002000-c40fffff : VMD MEMBAR2
>
> Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Applied with Keith's Reviewed-by to pci/host-vmd for v4.6, thanks, Jon!
> ---
> v1->v2: Dropped the CFGBAR resource from the tree
> arch/x86/pci/vmd.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
> diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
> index d57e480..d0c4542 100644
> --- a/arch/x86/pci/vmd.c
> +++ b/arch/x86/pci/vmd.c
> @@ -503,6 +503,18 @@ static struct pci_ops vmd_ops = {
> .write = vmd_pci_write,
> };
>
> +static void vmd_attach_resources(struct vmd_dev *vmd)
> +{
> + vmd->dev->resource[VMD_MEMBAR1].child = &vmd->resources[1];
> + vmd->dev->resource[VMD_MEMBAR2].child = &vmd->resources[2];
> +}
> +
> +static void vmd_detach_resources(struct vmd_dev *vmd)
> +{
> + vmd->dev->resource[VMD_MEMBAR1].child = NULL;
> + vmd->dev->resource[VMD_MEMBAR2].child = NULL;
> +}
> +
> /*
> * VMD domains start at 0x1000 to not clash with ACPI _SEG domains.
> */
> @@ -542,6 +554,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd)
> .start = res->start,
> .end = res->end,
> .flags = flags,
> + .parent = res,
> };
>
> res = &vmd->dev->resource[VMD_MEMBAR2];
> @@ -554,6 +567,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd)
> .start = res->start + 0x2000,
> .end = res->end,
> .flags = flags,
> + .parent = res,
> };
>
> sd->domain = vmd_find_free_domain();
> @@ -578,6 +592,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd)
> return -ENODEV;
> }
>
> + vmd_attach_resources(vmd);
> vmd_setup_dma_ops(vmd);
> dev_set_msi_domain(&vmd->bus->dev, vmd->irq_domain);
> pci_rescan_bus(vmd->bus);
> @@ -674,6 +689,7 @@ static void vmd_remove(struct pci_dev *dev)
> {
> struct vmd_dev *vmd = pci_get_drvdata(dev);
>
> + vmd_detach_resources(vmd);
> pci_set_drvdata(dev, NULL);
> sysfs_remove_link(&vmd->dev->dev.kobj, "domain");
> pci_stop_root_bus(vmd->bus);
> --
> 1.8.3.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2016-03-10 20:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 17:06 [PATCHv2] VMD: Attach vmd resources to parent domain's resource tree Jon Derrick
2016-02-24 18:03 ` Keith Busch
2016-03-10 20:59 ` Bjorn Helgaas [this message]
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=20160310205905.GG14873@localhost \
--to=helgaas@kernel.org \
--cc=jonathan.derrick@intel.com \
--cc=keith.busch@intel.com \
--cc=linux-pci@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.