From: Ian Munsie <imunsie@au1.ibm.com>
To: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
Cc: mikey <mikey@neuling.org>, linuxppc-dev <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH] cxl: Make vPHB device node match adapter's
Date: Thu, 16 Jun 2016 07:53:49 +1000 [thread overview]
Message-ID: <1466027386-sup-9561@x230.ozlabs.ibm.com> (raw)
In-Reply-To: <1466001736-3074-1-git-send-email-fbarrat@linux.vnet.ibm.com>
This could probably use a description in the commit message, perhaps
including output showing the before/after difference this makes to
lsvpd, but otherwise it looks fine to me.
@Mikey - this look OK to you?
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
Excerpts from Frederic Barrat's message of 2016-06-15 16:42:16 +0200:
> Tested by cxlflash on bare-metal and powerVM.
>
> Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com>
> ---
> drivers/misc/cxl/vphb.c | 21 ++++++++++-----------
> 1 file changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
> index cdc7723..012b6aa 100644
> --- a/drivers/misc/cxl/vphb.c
> +++ b/drivers/misc/cxl/vphb.c
> @@ -208,20 +208,19 @@ static struct pci_controller_ops cxl_pci_controller_ops =
>
> int cxl_pci_vphb_add(struct cxl_afu *afu)
> {
> - struct pci_dev *phys_dev;
> - struct pci_controller *phb, *phys_phb;
> + struct pci_controller *phb;
> struct device_node *vphb_dn;
> struct device *parent;
>
> - if (cpu_has_feature(CPU_FTR_HVMODE)) {
> - phys_dev = to_pci_dev(afu->adapter->dev.parent);
> - phys_phb = pci_bus_to_host(phys_dev->bus);
> - vphb_dn = phys_phb->dn;
> - parent = &phys_dev->dev;
> - } else {
> - vphb_dn = afu->adapter->dev.parent->of_node;
> - parent = afu->adapter->dev.parent;
> - }
> + /* The parent device is the adapter. Reuse the device node of
> + * the adapter.
> + * We don't seem to care what device node is used for the vPHB,
> + * but tools such as lsvpd walk up the device parents looking
> + * for a valid location code, so we might as well show devices
> + * attached to the adapter as being located on that adapter.
> + */
> + parent = afu->adapter->dev.parent;
> + vphb_dn = parent->of_node;
>
> /* Alloc and setup PHB data structure */
> phb = pcibios_alloc_controller(vphb_dn);
next prev parent reply other threads:[~2016-06-15 21:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-15 14:42 [PATCH] cxl: Make vPHB device node match adapter's Frederic Barrat
2016-06-15 19:31 ` Matthew R. Ochs
2016-06-15 21:53 ` Ian Munsie [this message]
2016-06-16 12:36 ` Frederic Barrat
2016-06-17 3:45 ` Michael Neuling
2016-06-21 0:40 ` Michael Ellerman
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=1466027386-sup-9561@x230.ozlabs.ibm.com \
--to=imunsie@au1.ibm.com \
--cc=fbarrat@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mikey@neuling.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;
as well as URLs for NNTP newsgroup(s).