* [PATCH 12/14] PCI/hotplug: pnv_php: export symbols and move struct types needed by cxl
[not found] <1467638532-9250-1-git-send-email-imunsie@au.ibm.com>
@ 2016-07-04 13:22 ` Ian Munsie
2016-07-05 0:03 ` Gavin Shan
2016-07-04 13:22 ` [PATCH 13/14] PCI/hotplug: pnv_php: handle OPAL_PCI_SLOT_OFFLINE power state Ian Munsie
1 sibling, 1 reply; 4+ messages in thread
From: Ian Munsie @ 2016-07-04 13:22 UTC (permalink / raw)
To: Michael Ellerman, Michael Neuling, Frederic Barrat,
Andrew Donnellan, linuxppc-dev, Huy Nguyen
Cc: Gavin Shan, linux-pci, Bjorn Helgaas
From: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
The cxl driver will use infrastructure from pnv_php to handle device tree
updates when switching bi-modal CAPI cards into CAPI mode.
To enable this, export pnv_php_find_slot() and
pnv_php_set_slot_power_state(), and add corresponding declarations, as well
as the definition of struct pnv_php_slot, to asm/pnv-pci.h.
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/pnv-pci.h | 28 ++++++++++++++++++++++++++++
drivers/pci/hotplug/Kconfig | 1 +
drivers/pci/hotplug/pnv_php.c | 32 +++++---------------------------
3 files changed, 34 insertions(+), 27 deletions(-)
diff --git a/arch/powerpc/include/asm/pnv-pci.h b/arch/powerpc/include/asm/pnv-pci.h
index c47097f..0cbd813 100644
--- a/arch/powerpc/include/asm/pnv-pci.h
+++ b/arch/powerpc/include/asm/pnv-pci.h
@@ -11,6 +11,7 @@
#define _ASM_PNV_PCI_H
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#include <misc/cxl-base.h>
#include <asm/opal-api.h>
@@ -47,4 +48,31 @@ void pnv_cxl_phb_set_peer_afu(struct pci_dev *dev, struct cxl_afu *afu);
#endif
+struct pnv_php_slot {
+ struct hotplug_slot slot;
+ struct hotplug_slot_info slot_info;
+ uint64_t id;
+ char *name;
+ int slot_no;
+ struct kref kref;
+#define PNV_PHP_STATE_INITIALIZED 0
+#define PNV_PHP_STATE_REGISTERED 1
+#define PNV_PHP_STATE_POPULATED 2
+#define PNV_PHP_STATE_OFFLINE 3
+ int state;
+ struct device_node *dn;
+ struct pci_dev *pdev;
+ struct pci_bus *bus;
+ bool power_state_check;
+ void *fdt;
+ void *dt;
+ struct of_changeset ocs;
+ struct pnv_php_slot *parent;
+ struct list_head children;
+ struct list_head link;
+};
+extern struct pnv_php_slot *pnv_php_find_slot(struct device_node *dn);
+extern int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
+ uint8_t state);
+
#endif
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index aadce45..b719a72 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -117,6 +117,7 @@ config HOTPLUG_PCI_POWERNV
tristate "PowerPC PowerNV PCI Hotplug driver"
depends on PPC_POWERNV && EEH
select OF_DYNAMIC
+ select HOTPLUG_PCI_POWERNV_BASE
help
Say Y here if you run PowerPC PowerNV platform that supports
PCI Hotplug
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 6086db6..2d2f704 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -22,30 +22,6 @@
#define DRIVER_AUTHOR "Gavin Shan, IBM Corporation"
#define DRIVER_DESC "PowerPC PowerNV PCI Hotplug Driver"
-struct pnv_php_slot {
- struct hotplug_slot slot;
- struct hotplug_slot_info slot_info;
- uint64_t id;
- char *name;
- int slot_no;
- struct kref kref;
-#define PNV_PHP_STATE_INITIALIZED 0
-#define PNV_PHP_STATE_REGISTERED 1
-#define PNV_PHP_STATE_POPULATED 2
-#define PNV_PHP_STATE_OFFLINE 3
- int state;
- struct device_node *dn;
- struct pci_dev *pdev;
- struct pci_bus *bus;
- bool power_state_check;
- void *fdt;
- void *dt;
- struct of_changeset ocs;
- struct pnv_php_slot *parent;
- struct list_head children;
- struct list_head link;
-};
-
static LIST_HEAD(pnv_php_slot_list);
static DEFINE_SPINLOCK(pnv_php_lock);
@@ -91,7 +67,7 @@ static struct pnv_php_slot *pnv_php_match(struct device_node *dn,
return NULL;
}
-static struct pnv_php_slot *pnv_php_find_slot(struct device_node *dn)
+struct pnv_php_slot *pnv_php_find_slot(struct device_node *dn)
{
struct pnv_php_slot *php_slot, *tmp;
unsigned long flags;
@@ -108,6 +84,7 @@ static struct pnv_php_slot *pnv_php_find_slot(struct device_node *dn)
return NULL;
}
+EXPORT_SYMBOL_GPL(pnv_php_find_slot);
/*
* Remove pdn for all children of the indicated device node.
@@ -316,8 +293,8 @@ out:
return ret;
}
-static int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
- uint8_t state)
+int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
+ uint8_t state)
{
struct pnv_php_slot *php_slot = slot->private;
struct opal_msg msg;
@@ -347,6 +324,7 @@ static int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
return ret;
}
+EXPORT_SYMBOL_GPL(pnv_php_set_slot_power_state);
static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state)
{
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 13/14] PCI/hotplug: pnv_php: handle OPAL_PCI_SLOT_OFFLINE power state
[not found] <1467638532-9250-1-git-send-email-imunsie@au.ibm.com>
2016-07-04 13:22 ` [PATCH 12/14] PCI/hotplug: pnv_php: export symbols and move struct types needed by cxl Ian Munsie
@ 2016-07-04 13:22 ` Ian Munsie
1 sibling, 0 replies; 4+ messages in thread
From: Ian Munsie @ 2016-07-04 13:22 UTC (permalink / raw)
To: Michael Ellerman, Michael Neuling, Frederic Barrat,
Andrew Donnellan, linuxppc-dev, Huy Nguyen
Cc: Gavin Shan, linux-pci, Bjorn Helgaas
From: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
When calling pnv_php_set_slot_power_state() with state ==
OPAL_PCI_SLOT_OFFLINE, remove devices from the device tree as if we're
dealing with OPAL_PCI_SLOT_POWER_OFF.
Cc: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
drivers/pci/hotplug/pnv_php.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 2d2f704..e6245b0 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -317,7 +317,7 @@ int pnv_php_set_slot_power_state(struct hotplug_slot *slot,
return ret;
}
- if (state == OPAL_PCI_SLOT_POWER_OFF)
+ if (state == OPAL_PCI_SLOT_POWER_OFF || state == OPAL_PCI_SLOT_OFFLINE)
pnv_php_rmv_devtree(php_slot);
else
ret = pnv_php_add_devtree(php_slot);
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread