Skip to content

Commit

Permalink
staging: unisys: visorbus: add error handling for chipset_device_create
Browse files Browse the repository at this point in the history
Adds error handling to the chipset_device_create message. If it returns
a failure, it is assumed it has not signaled the s-Par firmware of the
failure and the caller must do that.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
David Kershner authored and Greg Kroah-Hartman committed Mar 29, 2017
1 parent 0315657 commit 3f49a21
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 13 deletions.
22 changes: 13 additions & 9 deletions drivers/staging/unisys/visorbus/visorbus_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1118,25 +1118,29 @@ chipset_bus_destroy(struct visor_device *dev)
bus_destroy_response(dev, 0);
}

void
int
chipset_device_create(struct visor_device *dev_info)
{
int rc;
int err;
u32 bus_no = dev_info->chipset_bus_no;
u32 dev_no = dev_info->chipset_dev_no;

POSTCODE_LINUX(DEVICE_CREATE_ENTRY_PC, dev_no, bus_no,
DIAG_SEVERITY_PRINT);

rc = create_visor_device(dev_info);
device_create_response(dev_info, rc);

if (rc < 0)
err = create_visor_device(dev_info);
if (err < 0) {
POSTCODE_LINUX(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
DIAG_SEVERITY_ERR);
else
POSTCODE_LINUX(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
DIAG_SEVERITY_PRINT);
return err;
}

POSTCODE_LINUX(DEVICE_CREATE_SUCCESS_PC, dev_no, bus_no,
DIAG_SEVERITY_PRINT);

device_create_response(dev_info, err);

return 0;
}

void
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/unisys/visorbus/visorbus_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

int chipset_bus_create(struct visor_device *bus_info);
void chipset_bus_destroy(struct visor_device *bus_info);
void chipset_device_create(struct visor_device *dev_info);
int chipset_device_create(struct visor_device *dev_info);
void chipset_device_destroy(struct visor_device *dev_info);
void chipset_device_pause(struct visor_device *dev_info);
void chipset_device_resume(struct visor_device *dev_info);
Expand Down
12 changes: 9 additions & 3 deletions drivers/staging/unisys/visorbus/visorchipset.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,26 +853,32 @@ my_device_create(struct controlvm_message *inmsg)
spar_vhba_channel_protocol_uuid) == 0) {
err = save_crash_message(inmsg, CRASH_DEV);
if (err)
goto err_free_dev_info;
goto err_destroy_visorchannel;
}

if (inmsg->hdr.flags.response_expected == 1) {
pmsg_hdr = kzalloc(sizeof(*pmsg_hdr), GFP_KERNEL);
if (!pmsg_hdr) {
err = -ENOMEM;
goto err_free_dev_info;
goto err_destroy_visorchannel;
}

memcpy(pmsg_hdr, &inmsg->hdr,
sizeof(struct controlvm_message_header));
dev_info->pending_msg_hdr = pmsg_hdr;
}
/* Chipset_device_create will send response */
chipset_device_create(dev_info);
err = chipset_device_create(dev_info);
if (err)
goto err_destroy_visorchannel;

POSTCODE_LINUX(DEVICE_CREATE_EXIT_PC, dev_no, bus_no,
DIAG_SEVERITY_PRINT);
return 0;

err_destroy_visorchannel:
visorchannel_destroy(visorchannel);

err_free_dev_info:
kfree(dev_info);

Expand Down

0 comments on commit 3f49a21

Please sign in to comment.