diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2017-06-20 16:56:05 +0300 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2017-06-28 08:32:13 +0300 |
| commit | 01553d9a2ba7c658bf9e9e5c65466508c1bd6db5 (patch) | |
| tree | e36c325b156531f878a7556b28ac35bd84132909 /arch/s390/pci/pci_clp.c | |
| parent | 623bd44d3f277b7bbe16e0e091bd361e75964b5d (diff) | |
| download | linux-01553d9a2ba7c658bf9e9e5c65466508c1bd6db5.tar.xz | |
s390/pci: fix handling of PEC 306
In contrast to other hotplug events PEC 0x306 isn't about a single
but multiple devices. Also there's no information on what happened
to these devices. We correctly handled hotplug that way but failed
to handle hot-unplug. This patch addresses that and implements
hot-unplug of multiple devices via PEC 306.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/pci/pci_clp.c')
| -rw-r--r-- | arch/s390/pci/pci_clp.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c index 267cdd69e6da..3a5cd84e5a3b 100644 --- a/arch/s390/pci/pci_clp.c +++ b/arch/s390/pci/pci_clp.c @@ -335,33 +335,14 @@ out: static void __clp_add(struct clp_fh_list_entry *entry, void *data) { - if (!entry->vendor_id) - return; - - clp_add_pci_device(entry->fid, entry->fh, entry->config_state); -} - -static void __clp_rescan(struct clp_fh_list_entry *entry, void *data) -{ struct zpci_dev *zdev; if (!entry->vendor_id) return; zdev = get_zdev_by_fid(entry->fid); - if (!zdev) { + if (!zdev) clp_add_pci_device(entry->fid, entry->fh, entry->config_state); - return; - } - - if (!entry->config_state) { - /* - * The handle is already disabled, that means no iota/irq freeing via - * the firmware interfaces anymore. Need to free resources manually - * (DMA memory, debug, sysfs)... - */ - zpci_stop_device(zdev); - } } static void __clp_update(struct clp_fh_list_entry *entry, void *data) @@ -398,11 +379,13 @@ int clp_rescan_pci_devices(void) struct clp_req_rsp_list_pci *rrb; int rc; + zpci_remove_reserved_devices(); + rrb = clp_alloc_block(GFP_KERNEL); if (!rrb) return -ENOMEM; - rc = clp_list_pci(rrb, NULL, __clp_rescan); + rc = clp_list_pci(rrb, NULL, __clp_add); clp_free_block(rrb); return rc; |