korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

s390/pci: do not modify function handles

Browse Source 
Don't modify function handles to get a disabled handle - call
clp_disable_fh. With this change we also do no longer deconfigure
enabled functions.

Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott 2013-04-16 14:12:17 +02:00 committed by Martin Schwidefsky
parent a2ab833360
commit cb65a669f6
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/include/asm/pci.h
View File

@ -140,6 +140,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)
struct zpci_dev *zpci_alloc_device(void); struct zpci_dev *zpci_alloc_device(void);
int zpci_create_device(struct zpci_dev *); int zpci_create_device(struct zpci_dev *);
int zpci_enable_device(struct zpci_dev *); int zpci_enable_device(struct zpci_dev *);
int zpci_disable_device(struct zpci_dev *);
void zpci_stop_device(struct zpci_dev *); void zpci_stop_device(struct zpci_dev *);
void zpci_free_device(struct zpci_dev *); void zpci_free_device(struct zpci_dev *);
int zpci_scan_device(struct zpci_dev *); int zpci_scan_device(struct zpci_dev *);

7
arch/s390/pci/pci.c
View File

@ -955,6 +955,13 @@ out:
} }
EXPORT_SYMBOL_GPL(zpci_enable_device); EXPORT_SYMBOL_GPL(zpci_enable_device);
int zpci_disable_device(struct zpci_dev *zdev)
{
zpci_dma_exit_device(zdev);
return clp_disable_fh(zdev);
}
EXPORT_SYMBOL_GPL(zpci_disable_device);
int zpci_create_device(struct zpci_dev *zdev) int zpci_create_device(struct zpci_dev *zdev)
{ {
int rc; int rc;

9
drivers/pci/hotplug/s390_pci_hpc.c
View File

@ -68,17 +68,16 @@ static int disable_slot(struct hotplug_slot *hotplug_slot)
if (!zpci_fn_configured(slot->zdev->state)) if (!zpci_fn_configured(slot->zdev->state))
return -EIO; return -EIO;
rc = zpci_disable_device(slot->zdev);
if (rc)
return rc;
/* TODO: we rely on the user to unbind/remove the device, is that plausible /* TODO: we rely on the user to unbind/remove the device, is that plausible
* or do we need to trigger that here? * or do we need to trigger that here?
*/ */
rc = sclp_pci_deconfigure(slot->zdev->fid); rc = sclp_pci_deconfigure(slot->zdev->fid);
zpci_dbg(3, "deconf fid:%x, rc:%d\n", slot->zdev->fid, rc); zpci_dbg(3, "deconf fid:%x, rc:%d\n", slot->zdev->fid, rc);
if (!rc) { if (!rc)
/* Fixme: better call List-PCI to find the disabled FH
for the FID since the FH should be opaque... */
slot->zdev->fh &= 0x7fffffff;
slot->zdev->state = ZPCI_FN_STATE_STANDBY; slot->zdev->state = ZPCI_FN_STATE_STANDBY;
}
return rc; return rc;
} }