iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/pci: add zpci_event_hard_deconfigured()

Browse Source 
Extract the handling of PEC 0x0304 into a function and make sure we only
attempt to disable the function if it is enabled. Also check for errors
returned by zpci_disable_device() and leave the function alone if there
are any.

Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
Niklas Schnelle 2020-09-16 10:52:35 +02:00 committed by Heiko Carstens
parent a9045c2210
commit dee60c0dbc
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arch/s390/pci/pci_event.c
View File

@ -73,10 +73,31 @@ void zpci_event_error(void *data)
__zpci_event_error(data); __zpci_event_error(data);
} }
static void zpci_event_hard_deconfigured(struct zpci_dev *zdev, u32 fh)
{
enum zpci_state state;
int rc;
zdev->fh = fh;
/* Give the driver a hint that the function is
* already unusable.
*/
zpci_remove_device(zdev, true);
if (zdev_enabled(zdev)) {
rc = zpci_disable_device(zdev);
if (rc)
return;
}
zdev->state = ZPCI_FN_STATE_STANDBY;
if (!clp_get_state(zdev->fid, &state) &&
state == ZPCI_FN_STATE_RESERVED) {
zpci_zdev_put(zdev);
}
}
static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf) static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)
{ {
struct zpci_dev *zdev = get_zdev_by_fid(ccdf->fid); struct zpci_dev *zdev = get_zdev_by_fid(ccdf->fid);
enum zpci_state state;
struct pci_dev *pdev; struct pci_dev *pdev;
int ret; int ret;
@ -134,20 +155,8 @@ static void __zpci_event_availability(struct zpci_ccdf_avail *ccdf)
break; break;
case 0x0304: /* Configured -> Standby|Reserved */ case 0x0304: /* Configured -> Standby|Reserved */
if (!zdev) if (zdev)
break; zpci_event_hard_deconfigured(zdev, ccdf->fh);
/* Give the driver a hint that the function is
* already unusable.
*/
zpci_remove_device(zdev, true);
zdev->fh = ccdf->fh;
zpci_disable_device(zdev);
zdev->state = ZPCI_FN_STATE_STANDBY;
if (!clp_get_state(ccdf->fid, &state) &&
state == ZPCI_FN_STATE_RESERVED) {
zpci_zdev_put(zdev);
}
break; break;
case 0x0306: /* 0x308 or 0x302 for multiple devices */ case 0x0306: /* 0x308 or 0x302 for multiple devices */
zpci_remove_reserved_devices(); zpci_remove_reserved_devices();