* [PATCH v5 1/3] powerpc/kernel: Separate SR-IOV Calls
2017-11-09 14:00 [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
@ 2017-11-09 14:00 ` Bryant G. Ly
2017-12-12 11:39 ` [v5,1/3] " Michael Ellerman
2017-11-09 14:00 ` [PATCH v5 2/3] pseries: Add PSeries SR-IOV Machine dependent calls Bryant G. Ly
` (4 subsequent siblings)
5 siblings, 1 reply; 14+ messages in thread
From: Bryant G. Ly @ 2017-11-09 14:00 UTC (permalink / raw)
To: helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm, Bryant G. Ly, Juan J . Alvarez
SR-IOV can now be enabled in PowerNV platforms and Pseries
platforms. Therefore, the appropriate calls were moved to
machine dependent code instead of definition at compile time.
Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Signed-off-by: Juan J. Alvarez <jjalvare@us.ibm.com>
---
arch/powerpc/include/asm/machdep.h | 7 ++++++
arch/powerpc/include/asm/pci-bridge.h | 4 +---
arch/powerpc/kernel/eeh_driver.c | 4 ++--
arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
arch/powerpc/kernel/pci_dn.c | 6 -----
arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
7 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 73b92017b6d7..20f68d36af8c 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -172,11 +172,18 @@ struct machdep_calls {
/* Called after scan and before resource survey */
void (*pcibios_fixup_phb)(struct pci_controller *hose);
+ /* Called after device has been added to bus and
+ * before sysfs has been created
+ */
+ void (*pcibios_bus_add_device)(struct pci_dev *pdev);
+
resource_size_t (*pcibios_default_alignment)(void);
#ifdef CONFIG_PCI_IOV
void (*pcibios_fixup_sriov)(struct pci_dev *pdev);
resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno);
+ int (*pcibios_sriov_enable)(struct pci_dev *pdev, u16 num_vfs);
+ int (*pcibios_sriov_disable)(struct pci_dev *pdev);
#endif /* CONFIG_PCI_IOV */
/* Called to shutdown machine specific hardware not already controlled
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 0b8aa1fe2d5f..323628ca4d6d 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -203,10 +203,9 @@ struct pci_dn {
struct eeh_dev *edev; /* eeh device */
#endif
#define IODA_INVALID_PE 0xFFFFFFFF
-#ifdef CONFIG_PPC_POWERNV
unsigned int pe_number;
- int vf_index; /* VF index in the PF */
#ifdef CONFIG_PCI_IOV
+ int vf_index; /* VF index in the PF */
u16 vfs_expanded; /* number of VFs IOV BAR expanded */
u16 num_vfs; /* number of VFs enabled*/
unsigned int *pe_num_map; /* PE# for the first VF PE or array */
@@ -215,7 +214,6 @@ struct pci_dn {
int (*m64_map)[PCI_SRIOV_NUM_BARS];
#endif /* CONFIG_PCI_IOV */
int mps; /* Maximum Payload Size */
-#endif
struct list_head child_list;
struct list_head list;
};
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c
index 8b840191df59..f2d1b369974d 100644
--- a/arch/powerpc/kernel/eeh_driver.c
+++ b/arch/powerpc/kernel/eeh_driver.c
@@ -440,7 +440,7 @@ static void *eeh_add_virt_device(void *data, void *userdata)
return NULL;
}
-#ifdef CONFIG_PPC_POWERNV
+#ifdef CONFIG_PCI_IOV
pci_iov_add_virtfn(edev->physfn, pdn->vf_index, 0);
#endif
return NULL;
@@ -496,7 +496,7 @@ static void *eeh_rmv_device(void *data, void *userdata)
(*removed)++;
if (edev->physfn) {
-#ifdef CONFIG_PPC_POWERNV
+#ifdef CONFIG_PCI_IOV
struct pci_dn *pdn = eeh_dev_to_pdn(edev);
pci_iov_remove_virtfn(edev->physfn, pdn->vf_index, 0);
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 02831a396419..d45b956d2e3a 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -249,8 +249,31 @@ resource_size_t pcibios_iov_resource_alignment(struct pci_dev *pdev, int resno)
return pci_iov_resource_size(pdev, resno);
}
+
+int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
+{
+ if (ppc_md.pcibios_sriov_enable)
+ return ppc_md.pcibios_sriov_enable(pdev, num_vfs);
+
+ return 0;
+}
+
+int pcibios_sriov_disable(struct pci_dev *pdev)
+{
+ if (ppc_md.pcibios_sriov_disable)
+ return ppc_md.pcibios_sriov_disable(pdev);
+
+ return 0;
+}
+
#endif /* CONFIG_PCI_IOV */
+void pcibios_bus_add_device(struct pci_dev *pdev)
+{
+ if (ppc_md.pcibios_bus_add_device)
+ ppc_md.pcibios_bus_add_device(pdev);
+}
+
static resource_size_t pcibios_io_size(const struct pci_controller *hose)
{
#ifdef CONFIG_PPC64
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 0e395afbf0f4..ab147a1909c8 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -156,10 +156,8 @@ static struct pci_dn *add_one_dev_pci_data(struct pci_dn *parent,
pdn->parent = parent;
pdn->busno = busno;
pdn->devfn = devfn;
-#ifdef CONFIG_PPC_POWERNV
pdn->vf_index = vf_index;
pdn->pe_number = IODA_INVALID_PE;
-#endif
INIT_LIST_HEAD(&pdn->child_list);
INIT_LIST_HEAD(&pdn->list);
list_add_tail(&pdn->list, &parent->child_list);
@@ -226,9 +224,7 @@ void remove_dev_pci_data(struct pci_dev *pdev)
*/
if (pdev->is_virtfn) {
pdn = pci_get_pdn(pdev);
-#ifdef CONFIG_PPC_POWERNV
pdn->pe_number = IODA_INVALID_PE;
-#endif
return;
}
@@ -294,9 +290,7 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose,
return NULL;
dn->data = pdn;
pdn->phb = hose;
-#ifdef CONFIG_PPC_POWERNV
pdn->pe_number = IODA_INVALID_PE;
-#endif
regs = of_get_property(dn, "reg", NULL);
if (regs) {
u32 addr = of_read_number(regs, 1);
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 8864065eba22..9de55bcf484a 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -44,6 +44,22 @@
static bool pnv_eeh_nb_init = false;
static int eeh_event_irq = -EINVAL;
+void pnv_pcibios_bus_add_device(struct pci_dev *pdev)
+{
+ struct pci_dn *pdn = pci_get_pdn(pdev);
+
+ if (!pdev->is_virtfn)
+ return;
+
+ /*
+ * The following operations will fail if VF's sysfs files
+ * aren't created or its resources aren't finalized.
+ */
+ eeh_add_device_early(pdn);
+ eeh_add_device_late(pdev);
+ eeh_sysfs_add_device(pdev);
+}
+
static int pnv_eeh_init(void)
{
struct pci_controller *hose;
@@ -87,6 +103,7 @@ static int pnv_eeh_init(void)
}
eeh_set_pe_aux_size(max_diag_size);
+ ppc_md.pcibios_bus_add_device = pnv_pcibios_bus_add_device;
return 0;
}
@@ -1747,22 +1764,6 @@ static struct eeh_ops pnv_eeh_ops = {
.restore_config = pnv_eeh_restore_config
};
-void pcibios_bus_add_device(struct pci_dev *pdev)
-{
- struct pci_dn *pdn = pci_get_pdn(pdev);
-
- if (!pdev->is_virtfn)
- return;
-
- /*
- * The following operations will fail if VF's sysfs files
- * aren't created or its resources aren't finalized.
- */
- eeh_add_device_early(pdn);
- eeh_add_device_late(pdev);
- eeh_sysfs_add_device(pdev);
-}
-
#ifdef CONFIG_PCI_IOV
static void pnv_pci_fixup_vf_mps(struct pci_dev *pdev)
{
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index 57f9e55f4352..f7fed25e06ba 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1674,7 +1674,7 @@ int pnv_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
return ret;
}
-int pcibios_sriov_disable(struct pci_dev *pdev)
+int pnv_pcibios_sriov_disable(struct pci_dev *pdev)
{
pnv_pci_sriov_disable(pdev);
@@ -1683,7 +1683,7 @@ int pcibios_sriov_disable(struct pci_dev *pdev)
return 0;
}
-int pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
+int pnv_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
{
/* Allocate PCI data */
add_dev_pci_data(pdev);
@@ -4002,6 +4002,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
#ifdef CONFIG_PCI_IOV
ppc_md.pcibios_fixup_sriov = pnv_pci_ioda_fixup_iov_resources;
ppc_md.pcibios_iov_resource_alignment = pnv_pci_iov_resource_alignment;
+ ppc_md.pcibios_sriov_enable = pnv_pcibios_sriov_enable;
+ ppc_md.pcibios_sriov_disable = pnv_pcibios_sriov_disable;
#endif
pci_add_flags(PCI_REASSIGN_ALL_RSRC);
--
2.13.6 (Apple Git-96)
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [v5,1/3] powerpc/kernel: Separate SR-IOV Calls
2017-11-09 14:00 ` [PATCH v5 1/3] powerpc/kernel: Separate SR-IOV Calls Bryant G. Ly
@ 2017-12-12 11:39 ` Michael Ellerman
0 siblings, 0 replies; 14+ messages in thread
From: Michael Ellerman @ 2017-12-12 11:39 UTC (permalink / raw)
To: Bryant G. Ly, helgaas, bhelgaas, benh, paulus
Cc: jjalvare, linux-pci, saeedm, alex.williamson, seroyer,
Bryant G. Ly, eli, Juan J . Alvarez, linuxppc-dev, bodong
On Thu, 2017-11-09 at 14:00:33 UTC, "Bryant G. Ly" wrote:
> SR-IOV can now be enabled in PowerNV platforms and Pseries
> platforms. Therefore, the appropriate calls were moved to
> machine dependent code instead of definition at compile time.
>
> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
> Signed-off-by: Juan J. Alvarez <jjalvare@us.ibm.com>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/988fc3ba5653278a8c14d6ccf68737
cheers
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v5 2/3] pseries: Add PSeries SR-IOV Machine dependent calls
2017-11-09 14:00 [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
2017-11-09 14:00 ` [PATCH v5 1/3] powerpc/kernel: Separate SR-IOV Calls Bryant G. Ly
@ 2017-11-09 14:00 ` Bryant G. Ly
2017-11-09 14:00 ` [PATCH v5 3/3] PCI/IOV: Add pci_vf_drivers_autoprobe() interface Bryant G. Ly
` (3 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Bryant G. Ly @ 2017-11-09 14:00 UTC (permalink / raw)
To: helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm, Bryant G. Ly, Juan J . Alvarez
Add calls for PSeries platform to configure/deconfigure
SR-IOV.
Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Signed-off-by: Juan J. Alvarez <jjalvare@us.ibm.com>
---
arch/powerpc/platforms/pseries/eeh_pseries.c | 24 +++++++++++++++++++++++
arch/powerpc/platforms/pseries/pci.c | 29 ++++++++++++++++++++++++----
2 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c
index 6b812ad990e4..2295f117e2d3 100644
--- a/arch/powerpc/platforms/pseries/eeh_pseries.c
+++ b/arch/powerpc/platforms/pseries/eeh_pseries.c
@@ -55,6 +55,27 @@ static int ibm_get_config_addr_info;
static int ibm_get_config_addr_info2;
static int ibm_configure_pe;
+void pseries_pcibios_bus_add_device(struct pci_dev *pdev)
+{
+ struct pci_dn *pdn = pci_get_pdn(pdev);
+
+ if (!pdev->is_virtfn)
+ return;
+
+ pdn->device_id = pdev->device;
+ pdn->vendor_id = pdev->vendor;
+ pdn->class_code = pdev->class;
+
+ /*
+ * The following operations will fail if VF's sysfs files
+ * aren't created or its resources aren't finalized.
+ */
+ eeh_add_device_early(pdn);
+ eeh_add_device_late(pdev);
+ eeh_sysfs_add_device(pdev);
+
+}
+
/*
* Buffer for reporting slot-error-detail rtas calls. Its here
* in BSS, and not dynamically alloced, so that it ends up in
@@ -120,6 +141,9 @@ static int pseries_eeh_init(void)
/* Set EEH probe mode */
eeh_add_flag(EEH_PROBE_MODE_DEVTREE | EEH_ENABLE_IO_FOR_LOG);
+ /* Set EEH machine dependent code */
+ ppc_md.pcibios_bus_add_device = pseries_pcibios_bus_add_device;
+
return 0;
}
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 09eba5a9929a..14a90cf471cc 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -3,17 +3,17 @@
* Copyright (C) 2003 Anton Blanchard <anton@au.ibm.com>, IBM
*
* pSeries specific routines for PCI.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@@ -54,10 +54,26 @@ void pcibios_name_device(struct pci_dev *dev)
}
}
}
-}
+}
DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_name_device);
#endif
+#ifdef CONFIG_PCI_IOV
+int pseries_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
+{
+ /* Allocate PCI data */
+ add_dev_pci_data(pdev);
+ return 0;
+}
+
+int pseries_pcibios_sriov_disable(struct pci_dev *pdev)
+{
+ /* Release PCI data */
+ remove_dev_pci_data(pdev);
+ return 0;
+}
+#endif
+
static void __init pSeries_request_regions(void)
{
if (!isa_io_base)
@@ -76,6 +92,11 @@ void __init pSeries_final_fixup(void)
pSeries_request_regions();
eeh_addr_cache_build();
+
+#ifdef CONFIG_PCI_IOV
+ ppc_md.pcibios_sriov_enable = pseries_pcibios_sriov_enable;
+ ppc_md.pcibios_sriov_disable = pseries_pcibios_sriov_disable;
+#endif
}
/*
--
2.13.6 (Apple Git-96)
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v5 3/3] PCI/IOV: Add pci_vf_drivers_autoprobe() interface
2017-11-09 14:00 [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
2017-11-09 14:00 ` [PATCH v5 1/3] powerpc/kernel: Separate SR-IOV Calls Bryant G. Ly
2017-11-09 14:00 ` [PATCH v5 2/3] pseries: Add PSeries SR-IOV Machine dependent calls Bryant G. Ly
@ 2017-11-09 14:00 ` Bryant G. Ly
2017-11-29 16:13 ` [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
` (2 subsequent siblings)
5 siblings, 0 replies; 14+ messages in thread
From: Bryant G. Ly @ 2017-11-09 14:00 UTC (permalink / raw)
To: helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm, Bryant G. Ly
Add a pci_vf_drivers_autoprobe() interface. Setting autoprobe to false
on the PF prevents drivers from binding to VFs when they are enabled.
Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com>
Signed-off-by: Juan J. Alvarez <jjalvare@linux.vnet.ibm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/powerpc/platforms/pseries/pci.c | 2 ++
drivers/pci/iov.c | 11 +++++++++++
include/linux/pci.h | 2 ++
3 files changed, 15 insertions(+)
diff --git a/arch/powerpc/platforms/pseries/pci.c b/arch/powerpc/platforms/pseries/pci.c
index 14a90cf471cc..48d3af026f90 100644
--- a/arch/powerpc/platforms/pseries/pci.c
+++ b/arch/powerpc/platforms/pseries/pci.c
@@ -63,6 +63,7 @@ int pseries_pcibios_sriov_enable(struct pci_dev *pdev, u16 num_vfs)
{
/* Allocate PCI data */
add_dev_pci_data(pdev);
+ pci_vf_drivers_autoprobe(pdev, false);
return 0;
}
@@ -70,6 +71,7 @@ int pseries_pcibios_sriov_disable(struct pci_dev *pdev)
{
/* Release PCI data */
remove_dev_pci_data(pdev);
+ pci_vf_drivers_autoprobe(pdev, true);
return 0;
}
#endif
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index ac41c8be9200..1440e48094f4 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -634,6 +634,17 @@ void pci_restore_iov_state(struct pci_dev *dev)
}
/**
+ * pci_vf_drivers_autoprobe - set PF property drivers_autoprobe for VFs
+ * @dev: the PCI device
+ * @auto_probe: set VF drivers auto probe flag
+ */
+void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool auto_probe)
+{
+ if (dev->is_physfn)
+ dev->sriov->drivers_autoprobe = auto_probe;
+}
+
+/**
* pci_iov_bus_range - find bus range used by Virtual Function
* @bus: the PCI bus
*
diff --git a/include/linux/pci.h b/include/linux/pci.h
index f4f8ee5a7362..17a08554baa2 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1965,6 +1965,7 @@ int pci_vfs_assigned(struct pci_dev *dev);
int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
int pci_sriov_get_totalvfs(struct pci_dev *dev);
resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno);
+void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe);
#else
static inline int pci_iov_virtfn_bus(struct pci_dev *dev, int id)
{
@@ -1992,6 +1993,7 @@ static inline int pci_sriov_get_totalvfs(struct pci_dev *dev)
{ return 0; }
static inline resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)
{ return 0; }
+static inline void pci_vf_drivers_autoprobe(struct pci_dev *dev, bool probe) { }
#endif
#if defined(CONFIG_HOTPLUG_PCI) || defined(CONFIG_HOTPLUG_PCI_MODULE)
--
2.13.6 (Apple Git-96)
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-11-09 14:00 [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
` (2 preceding siblings ...)
2017-11-09 14:00 ` [PATCH v5 3/3] PCI/IOV: Add pci_vf_drivers_autoprobe() interface Bryant G. Ly
@ 2017-11-29 16:13 ` Bryant G. Ly
2017-12-01 11:48 ` Michael Ellerman
2017-12-03 1:45 ` Alexey Kardashevskiy
2017-12-04 4:48 ` Russell Currey
5 siblings, 1 reply; 14+ messages in thread
From: Bryant G. Ly @ 2017-11-29 16:13 UTC (permalink / raw)
To: helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 11/9/17 8:00 AM, Bryant G. Ly wrote:
> v1 - Initial patch
> v2 - Addressed Bjorn's comment on creating a highly platform
> dependent global exported symbol.
> v3 - Based patch off linux-ppc/master
> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
> v5 - Fixed comments and commit message
>
> Bryant G. Ly (3):
> powerpc/kernel: Separate SR-IOV Calls
> pseries: Add PSeries SR-IOV Machine dependent calls
> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>
> arch/powerpc/include/asm/machdep.h | 7 ++++++
> arch/powerpc/include/asm/pci-bridge.h | 4 +---
> arch/powerpc/kernel/eeh_driver.c | 4 ++--
> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
> arch/powerpc/kernel/pci_dn.c | 6 -----
> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
> drivers/pci/iov.c | 11 ++++++++++
> include/linux/pci.h | 2 ++
> 11 files changed, 118 insertions(+), 33 deletions(-)
>
Hi Mike,
Any updates on when this is going to get pulled? I want to submit the full SR-IOV enablement on PowerVM,
but I haven't seen this get merged into 4.15 yet.
-Bryant
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-11-29 16:13 ` [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
@ 2017-12-01 11:48 ` Michael Ellerman
0 siblings, 0 replies; 14+ messages in thread
From: Michael Ellerman @ 2017-12-01 11:48 UTC (permalink / raw)
To: Bryant G. Ly, helgaas, bhelgaas, benh, paulus
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm, aik, ruscur
"Bryant G. Ly" <bryantly@linux.vnet.ibm.com> writes:
> On 11/9/17 8:00 AM, Bryant G. Ly wrote:
>
>> v1 - Initial patch
>> v2 - Addressed Bjorn's comment on creating a highly platform
>> dependent global exported symbol.
>> v3 - Based patch off linux-ppc/master
>> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
>> v5 - Fixed comments and commit message
>>
>> Bryant G. Ly (3):
>> powerpc/kernel: Separate SR-IOV Calls
>> pseries: Add PSeries SR-IOV Machine dependent calls
>> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>>
>> arch/powerpc/include/asm/machdep.h | 7 ++++++
>> arch/powerpc/include/asm/pci-bridge.h | 4 +---
>> arch/powerpc/kernel/eeh_driver.c | 4 ++--
>> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
>> arch/powerpc/kernel/pci_dn.c | 6 -----
>> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
>> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
>> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
>> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
>> drivers/pci/iov.c | 11 ++++++++++
>> include/linux/pci.h | 2 ++
>> 11 files changed, 118 insertions(+), 33 deletions(-)
>>
> Hi Mike,
>
> Any updates on when this is going to get pulled? I want to submit the full SR-IOV enablement on PowerVM,
> but I haven't seen this get merged into 4.15 yet.
Hi Bryant,
Sorry but this was too late for 4.15.
Timing wise it will be fine for 4.16, though I still have to convince
myself that what you're doing will work for pseries on KVM.
It would be good to get an ack from Alexey and Russell (added to CC).
cheers
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-11-09 14:00 [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
` (3 preceding siblings ...)
2017-11-29 16:13 ` [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
@ 2017-12-03 1:45 ` Alexey Kardashevskiy
2017-12-04 15:08 ` Bryant G. Ly
2017-12-04 4:48 ` Russell Currey
5 siblings, 1 reply; 14+ messages in thread
From: Alexey Kardashevskiy @ 2017-12-03 1:45 UTC (permalink / raw)
To: Bryant G. Ly, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 10/11/17 01:00, Bryant G. Ly wrote:
> v1 - Initial patch
> v2 - Addressed Bjorn's comment on creating a highly platform
> dependent global exported symbol.
> v3 - Based patch off linux-ppc/master
> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
> v5 - Fixed comments and commit message
What is this made against of? I'd like to give it a try but it does not
apply to Linus'es tree or powerpc/next. Thanks.
>
> Bryant G. Ly (3):
> powerpc/kernel: Separate SR-IOV Calls
> pseries: Add PSeries SR-IOV Machine dependent calls
> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>
> arch/powerpc/include/asm/machdep.h | 7 ++++++
> arch/powerpc/include/asm/pci-bridge.h | 4 +---
> arch/powerpc/kernel/eeh_driver.c | 4 ++--
> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
> arch/powerpc/kernel/pci_dn.c | 6 -----
> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
> drivers/pci/iov.c | 11 ++++++++++
> include/linux/pci.h | 2 ++
> 11 files changed, 118 insertions(+), 33 deletions(-)
>
--
Alexey
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-12-03 1:45 ` Alexey Kardashevskiy
@ 2017-12-04 15:08 ` Bryant G. Ly
2017-12-05 1:24 ` Alexey Kardashevskiy
0 siblings, 1 reply; 14+ messages in thread
From: Bryant G. Ly @ 2017-12-04 15:08 UTC (permalink / raw)
To: Alexey Kardashevskiy, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 12/2/17 7:45 PM, Alexey Kardashevskiy wrote:
> On 10/11/17 01:00, Bryant G. Ly wrote:
>> v1 - Initial patch
>> v2 - Addressed Bjorn's comment on creating a highly platform
>> dependent global exported symbol.
>> v3 - Based patch off linux-ppc/master
>> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
>> v5 - Fixed comments and commit message
>
> What is this made against of? I'd like to give it a try but it does not
> apply to Linus'es tree or powerpc/next. Thanks.
>
This was made against powerpc/next back when it was still under 4.14-rc6.
It has been in review for awhile...
-Bryant
>> Bryant G. Ly (3):
>> powerpc/kernel: Separate SR-IOV Calls
>> pseries: Add PSeries SR-IOV Machine dependent calls
>> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>>
>> arch/powerpc/include/asm/machdep.h | 7 ++++++
>> arch/powerpc/include/asm/pci-bridge.h | 4 +---
>> arch/powerpc/kernel/eeh_driver.c | 4 ++--
>> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
>> arch/powerpc/kernel/pci_dn.c | 6 -----
>> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
>> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
>> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
>> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
>> drivers/pci/iov.c | 11 ++++++++++
>> include/linux/pci.h | 2 ++
>> 11 files changed, 118 insertions(+), 33 deletions(-)
>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-12-04 15:08 ` Bryant G. Ly
@ 2017-12-05 1:24 ` Alexey Kardashevskiy
2017-12-05 15:13 ` Bryant G. Ly
0 siblings, 1 reply; 14+ messages in thread
From: Alexey Kardashevskiy @ 2017-12-05 1:24 UTC (permalink / raw)
To: Bryant G. Ly, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 05/12/17 02:08, Bryant G. Ly wrote:
>
>
> On 12/2/17 7:45 PM, Alexey Kardashevskiy wrote:
>> On 10/11/17 01:00, Bryant G. Ly wrote:
>>> v1 - Initial patch
>>> v2 - Addressed Bjorn's comment on creating a highly platform
>>> dependent global exported symbol.
>>> v3 - Based patch off linux-ppc/master
>>> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
>>> v5 - Fixed comments and commit message
>>
>> What is this made against of? I'd like to give it a try but it does not
>> apply to Linus'es tree or powerpc/next. Thanks.
>>
> This was made against powerpc/next back when it was still under 4.14-rc6.
> It has been in review for awhile...
Sure, sha1 or github tree would be enough though to try.
>
> -Bryant
>
>>> Bryant G. Ly (3):
>>> powerpc/kernel: Separate SR-IOV Calls
>>> pseries: Add PSeries SR-IOV Machine dependent calls
>>> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>>>
>>> arch/powerpc/include/asm/machdep.h | 7 ++++++
>>> arch/powerpc/include/asm/pci-bridge.h | 4 +---
>>> arch/powerpc/kernel/eeh_driver.c | 4 ++--
>>> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
>>> arch/powerpc/kernel/pci_dn.c | 6 -----
>>> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
>>> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
>>> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
>>> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
>>> drivers/pci/iov.c | 11 ++++++++++
>>> include/linux/pci.h | 2 ++
>>> 11 files changed, 118 insertions(+), 33 deletions(-)
>>>
>>
>
--
Alexey
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-12-05 1:24 ` Alexey Kardashevskiy
@ 2017-12-05 15:13 ` Bryant G. Ly
2017-12-08 6:03 ` Alexey Kardashevskiy
0 siblings, 1 reply; 14+ messages in thread
From: Bryant G. Ly @ 2017-12-05 15:13 UTC (permalink / raw)
To: Alexey Kardashevskiy, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 12/4/17 7:24 PM, Alexey Kardashevskiy wrote:
> On 05/12/17 02:08, Bryant G. Ly wrote:
>>
>> On 12/2/17 7:45 PM, Alexey Kardashevskiy wrote:
>>> On 10/11/17 01:00, Bryant G. Ly wrote:
>>>> v1 - Initial patch
>>>> v2 - Addressed Bjorn's comment on creating a highly platform
>>>> dependent global exported symbol.
>>>> v3 - Based patch off linux-ppc/master
>>>> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
>>>> v5 - Fixed comments and commit message
>>> What is this made against of? I'd like to give it a try but it does not
>>> apply to Linus'es tree or powerpc/next. Thanks.
>>>
>> This was made against powerpc/next back when it was still under 4.14-rc6.
>> It has been in review for awhile...
> Sure, sha1 or github tree would be enough though to try.
6cff0a118f23b98c604a3604ea9de11338e24fbe
or if you want to just use the github tree its:
https://github.com/powervm/sriov-ppc/tree/upstream
>
>> -Bryant
>>
>>>> Bryant G. Ly (3):
>>>> powerpc/kernel: Separate SR-IOV Calls
>>>> pseries: Add PSeries SR-IOV Machine dependent calls
>>>> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>>>>
>>>> arch/powerpc/include/asm/machdep.h | 7 ++++++
>>>> arch/powerpc/include/asm/pci-bridge.h | 4 +---
>>>> arch/powerpc/kernel/eeh_driver.c | 4 ++--
>>>> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
>>>> arch/powerpc/kernel/pci_dn.c | 6 -----
>>>> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
>>>> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
>>>> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
>>>> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
>>>> drivers/pci/iov.c | 11 ++++++++++
>>>> include/linux/pci.h | 2 ++
>>>> 11 files changed, 118 insertions(+), 33 deletions(-)
>>>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-12-05 15:13 ` Bryant G. Ly
@ 2017-12-08 6:03 ` Alexey Kardashevskiy
2017-12-08 14:52 ` Bryant G. Ly
0 siblings, 1 reply; 14+ messages in thread
From: Alexey Kardashevskiy @ 2017-12-08 6:03 UTC (permalink / raw)
To: Bryant G. Ly, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 06/12/17 02:13, Bryant G. Ly wrote:
>
>
> On 12/4/17 7:24 PM, Alexey Kardashevskiy wrote:
>> On 05/12/17 02:08, Bryant G. Ly wrote:
>>>
>>> On 12/2/17 7:45 PM, Alexey Kardashevskiy wrote:
>>>> On 10/11/17 01:00, Bryant G. Ly wrote:
>>>>> v1 - Initial patch
>>>>> v2 - Addressed Bjorn's comment on creating a highly platform
>>>>> dependent global exported symbol.
>>>>> v3 - Based patch off linux-ppc/master
>>>>> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
>>>>> v5 - Fixed comments and commit message
>>>> What is this made against of? I'd like to give it a try but it does not
>>>> apply to Linus'es tree or powerpc/next. Thanks.
>>>>
>>> This was made against powerpc/next back when it was still under 4.14-rc6.
>>> It has been in review for awhile...
>> Sure, sha1 or github tree would be enough though to try.
>
> 6cff0a118f23b98c604a3604ea9de11338e24fbe
>
> or if you want to just use the github tree its:
>
> https://github.com/powervm/sriov-ppc/tree/upstream
Thanks! Looks good, works fine (tried MLX5 wit hpowernv - works, pseries
under KVM - prints a nice error instead of crashing),
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>
>>
>>> -Bryant
>>>
>>>>> Bryant G. Ly (3):
>>>>> powerpc/kernel: Separate SR-IOV Calls
>>>>> pseries: Add PSeries SR-IOV Machine dependent calls
>>>>> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>>>>>
>>>>> arch/powerpc/include/asm/machdep.h | 7 ++++++
>>>>> arch/powerpc/include/asm/pci-bridge.h | 4 +---
>>>>> arch/powerpc/kernel/eeh_driver.c | 4 ++--
>>>>> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
>>>>> arch/powerpc/kernel/pci_dn.c | 6 -----
>>>>> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
>>>>> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
>>>>> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
>>>>> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
>>>>> drivers/pci/iov.c | 11 ++++++++++
>>>>> include/linux/pci.h | 2 ++
>>>>> 11 files changed, 118 insertions(+), 33 deletions(-)
>>>>>
>>
>
--
Alexey
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-12-08 6:03 ` Alexey Kardashevskiy
@ 2017-12-08 14:52 ` Bryant G. Ly
0 siblings, 0 replies; 14+ messages in thread
From: Bryant G. Ly @ 2017-12-08 14:52 UTC (permalink / raw)
To: Alexey Kardashevskiy, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On 12/8/17 12:03 AM, Alexey Kardashevskiy wrote:
> On 06/12/17 02:13, Bryant G. Ly wrote:
>>
>> On 12/4/17 7:24 PM, Alexey Kardashevskiy wrote:
>>> On 05/12/17 02:08, Bryant G. Ly wrote:
>>>> On 12/2/17 7:45 PM, Alexey Kardashevskiy wrote:
>>>>> On 10/11/17 01:00, Bryant G. Ly wrote:
>>>>>> v1 - Initial patch
>>>>>> v2 - Addressed Bjorn's comment on creating a highly platform
>>>>>> dependent global exported symbol.
>>>>>> v3 - Based patch off linux-ppc/master
>>>>>> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
>>>>>> v5 - Fixed comments and commit message
>>>>> What is this made against of? I'd like to give it a try but it does not
>>>>> apply to Linus'es tree or powerpc/next. Thanks.
>>>>>
>>>> This was made against powerpc/next back when it was still under 4.14-rc6.
>>>> It has been in review for awhile...
>>> Sure, sha1 or github tree would be enough though to try.
>> 6cff0a118f23b98c604a3604ea9de11338e24fbe
>>
>> or if you want to just use the github tree its:
>>
>> https://github.com/powervm/sriov-ppc/tree/upstream
>
> Thanks! Looks good, works fine (tried MLX5 wit hpowernv - works, pseries
> under KVM - prints a nice error instead of crashing),
>
> Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>
>
Thanks for the review/testing. I will drop the full patch that enables SRIOV on PowerVM next week.
The patch will require unreleased PHYP and PFW firmware to fully function.
I will include you and Russell to those patches.
-Bryant
>
>>>> -Bryant
>>>>
>>>>>> Bryant G. Ly (3):
>>>>>> powerpc/kernel: Separate SR-IOV Calls
>>>>>> pseries: Add PSeries SR-IOV Machine dependent calls
>>>>>> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>>>>>>
>>>>>> arch/powerpc/include/asm/machdep.h | 7 ++++++
>>>>>> arch/powerpc/include/asm/pci-bridge.h | 4 +---
>>>>>> arch/powerpc/kernel/eeh_driver.c | 4 ++--
>>>>>> arch/powerpc/kernel/pci-common.c | 23 +++++++++++++++++++
>>>>>> arch/powerpc/kernel/pci_dn.c | 6 -----
>>>>>> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--------------
>>>>>> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
>>>>>> arch/powerpc/platforms/pseries/eeh_pseries.c | 24 ++++++++++++++++++++
>>>>>> arch/powerpc/platforms/pseries/pci.c | 31 ++++++++++++++++++++++----
>>>>>> drivers/pci/iov.c | 11 ++++++++++
>>>>>> include/linux/pci.h | 2 ++
>>>>>> 11 files changed, 118 insertions(+), 33 deletions(-)
>>>>>>
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement
2017-11-09 14:00 [PATCH v5 0/3] Prepartion for SR-IOV PowerVM Enablement Bryant G. Ly
` (4 preceding siblings ...)
2017-12-03 1:45 ` Alexey Kardashevskiy
@ 2017-12-04 4:48 ` Russell Currey
5 siblings, 0 replies; 14+ messages in thread
From: Russell Currey @ 2017-12-04 4:48 UTC (permalink / raw)
To: Bryant G. Ly, helgaas, bhelgaas, benh, paulus, mpe
Cc: seroyer, jjalvare, alex.williamson, linux-pci, linuxppc-dev,
bodong, eli, saeedm
On Thu, 2017-11-09 at 08:00 -0600, Bryant G. Ly wrote:
> v1 - Initial patch
> v2 - Addressed Bjorn's comment on creating a highly platform
> dependent global exported symbol.
> v3 - Based patch off linux-ppc/master
> v4 - Using the sriov-drivers_autoprobe mechanism per Bjorn's request
> v5 - Fixed comments and commit message
Looks good to me, for the whole series:
Acked-by: Russell Currey <ruscur@russell.cc>
>
> Bryant G. Ly (3):
> powerpc/kernel: Separate SR-IOV Calls
> pseries: Add PSeries SR-IOV Machine dependent calls
> PCI/IOV: Add pci_vf_drivers_autoprobe() interface
>
> arch/powerpc/include/asm/machdep.h | 7 ++++++
> arch/powerpc/include/asm/pci-bridge.h | 4 +---
> arch/powerpc/kernel/eeh_driver.c | 4 ++--
> arch/powerpc/kernel/pci-common.c | 23
> +++++++++++++++++++
> arch/powerpc/kernel/pci_dn.c | 6 -----
> arch/powerpc/platforms/powernv/eeh-powernv.c | 33 ++++++++++++++--
> ------------
> arch/powerpc/platforms/powernv/pci-ioda.c | 6 +++--
> arch/powerpc/platforms/pseries/eeh_pseries.c | 24
> ++++++++++++++++++++
> arch/powerpc/platforms/pseries/pci.c | 31
> ++++++++++++++++++++++----
> drivers/pci/iov.c | 11 ++++++++++
> include/linux/pci.h | 2 ++
> 11 files changed, 118 insertions(+), 33 deletions(-)
>
^ permalink raw reply [flat|nested] 14+ messages in thread