From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yue1Q-0006JG-2s for qemu-devel@nongnu.org; Tue, 19 May 2015 05:41:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yue1M-0002xK-2D for qemu-devel@nongnu.org; Tue, 19 May 2015 05:41:12 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:35221) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yue1L-0002xB-QK for qemu-devel@nongnu.org; Tue, 19 May 2015 05:41:07 -0400 Received: by pacwv17 with SMTP id wv17so16893278pac.2 for ; Tue, 19 May 2015 02:41:06 -0700 (PDT) Message-ID: <555B052A.1030303@ozlabs.ru> Date: Tue, 19 May 2015 19:40:58 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1430983314-5009-1-git-send-email-nikunj@linux.vnet.ibm.com> <1430983314-5009-5-git-send-email-nikunj@linux.vnet.ibm.com> <554C68DC.4020604@ozlabs.ru> <87vbfpf9vl.fsf@abhimanyu.in.ibm.com> <555AC451.1070704@ozlabs.ru> <87pp5xf42c.fsf@abhimanyu.in.ibm.com> <555AE946.5080802@ozlabs.ru> <87h9r9f0hf.fsf@abhimanyu.in.ibm.com> In-Reply-To: <87h9r9f0hf.fsf@abhimanyu.in.ibm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 4/4] spapr_pci: populate ibm,loc-code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikunj A Dadhania , qemu-devel@nongnu.org, david@gibson.dropbear.id.au Cc: nikunj.dadhania@gmail.com, qemu-ppc@nongnu.org, agraf@suse.de, mdroth@linux.vnet.ibm.com On 05/19/2015 06:14 PM, Nikunj A Dadhania wrote: > Alexey Kardashevskiy writes: > >> On 05/19/2015 04:56 PM, Nikunj A Dadhania wrote: >>> Alexey Kardashevskiy writes: >>> >>>> On 05/19/2015 02:51 PM, Nikunj A Dadhania wrote: >>>>> Alexey Kardashevskiy writes: >>>>> >>>>>> On 05/07/2015 05:21 PM, Nikunj A Dadhania wrote: >>>>>>> Each hardware instance has a platform unique location code. The OF >>>>>>> device tree that describes a part of a hardware entity must include >>>>>>> the “ibm,loc-code” property with a value that represents the location >>>>>>> code for that hardware entity. >>>>>>> >>>>>>> Populate ibm,loc-code. >>>>>>> >>>>>>> 1) PCI passthru devices need to identify with its own ibm,loc-code >>>>>>> available on the host. In failure cases use: >>>>>>> vfio_::. >>>>>>> >>>>>>> 2) Emulated devices encode as following: >>>>>>> qemu_::. >>>>>>> >>>>>>> Signed-off-by: Nikunj A Dadhania >>>>>>> --- >>>>>>> hw/ppc/spapr_pci.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++------- >>>>>>> 1 file changed, 86 insertions(+), 12 deletions(-) >>>>>>> >>>>>>> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c >>>>>>> index 12f1b9c..d901007 100644 >>>>>>> --- a/hw/ppc/spapr_pci.c >>>>>>> +++ b/hw/ppc/spapr_pci.c >>>>>>> @@ -769,6 +769,81 @@ static uint32_t spapr_phb_get_pci_drc_index(sPAPRPHBState *phb, >>>>>>> return drck->get_index(drc); >>>>>>> } >>>>>>> >>>>>>> +static bool spapr_phb_vfio_get_devspec_value(PCIDevice *pdev, char **value) >>>>>> >>>>>> Does it have to be a separate function? >>>>> >>>>> For better readability, i would prefer it this way. >>>> >>>> This is why I asked - I was having problems understanding the difference >>>> between these two having 6 words names ;) Do not insist though. >>>> >>> >>> This is what I have now, simplified: >>> >>> +static char *spapr_phb_vfio_get_loc_code(sPAPRPHBState *sphb, PCIDevice *pdev) >>> +{ >>> + char *path = NULL, *buf = NULL; >>> + char *host = NULL; >>> + >>> + /* Get the PCI VFIO host id */ >>> + host = object_property_get_str(OBJECT(pdev), "host", NULL); >>> + if (!host) { >>> + goto err_out; >>> + } >>> + >>> + /* Construct the path of the file that will give us the DT location */ >>> + path = g_strdup_printf("/sys/bus/pci/devices/%s/devspec", host); >>> + g_free(host); >>> + if (path && !g_file_get_contents(path, &buf, NULL, NULL)) { >>> + goto err_out; >>> + } >>> + g_free(path); >>> + >>> + /* Construct and read from host device tree the loc-code */ >>> + path = g_strdup_printf("/proc/device-tree%s/ibm,loc-code", buf); >>> + g_free(buf); >>> + if (path && !g_file_get_contents(path, &buf, NULL, NULL)) { >>> + goto err_out; >>> + } >>> + return buf; >>> + >>> +err_out: >>> + g_free(path); >>> + return NULL; >>> +} >>> + >>> +static char *spapr_phb_get_loc_code(sPAPRPHBState *sphb, PCIDevice *pdev) >>> +{ >>> + if (object_dynamic_cast(OBJECT(pdev), "vfio-pci")) { >>> + char *buf = spapr_phb_vfio_get_loc_code(sphb, pdev); >>> + >>> + /* >>> + * In case of failures reading the loc-code, make it up >>> + * indicating a vfio device >>> + */ >>> + if (!buf) { >>> + buf = g_strdup_printf("vfio_%s:%02d:%02d.%1d", pdev->name, >>> + sphb->index, PCI_SLOT(pdev->devfn), >>> + PCI_FUNC(pdev->devfn)); >>> + } >>> + return buf; >>> + } else { >>> + return g_strdup_printf("qemu_%s:%02d:%02d.%1d", pdev->name, >>> + sphb->index, PCI_SLOT(pdev->devfn), >>> + PCI_FUNC(pdev->devfn)); >>> + } >>> +} >> >> >> I'd do this but I do not insist :) > > That is fine as well. > >> >> static char *spapr_phb_get_loc_code(sPAPRPHBState *sphb, PCIDevice *pdev) >> { >> char *buf; >> char *devtype = "qemu"; >> >> if (object_dynamic_cast(OBJECT(pdev), "vfio-pci")) { >> buf = spapr_phb_vfio_get_loc_code(sphb, pdev); >> if (buf) { >> return buf; >> } >> devtype = "vfio"; > > That has to be a snprintf. No it does not. g_strdup_printf() below is enough > >> } >> >> /* >> * In case of failures reading the loc-code, make it up >> * indicating a vfio device >> */ >> buf = g_strdup_printf("%s_%s:%02d:%02d.%1d", >> devtype, pdev->name, >> sphb->index, PCI_SLOT(pdev->devfn), >> PCI_FUNC(pdev->devfn)); >> return buf; >> } > > Regards > Nikunj > -- Alexey