lkml.org 
[lkml]   [2021]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v10 08/17] virtio_config: Add a return value to reset function
    Date
    This adds a return value to reset function so that we can
    handle the reset failure later. No functional changes.

    Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
    ---
    arch/um/drivers/virtio_uml.c | 4 +++-
    drivers/platform/mellanox/mlxbf-tmfifo.c | 4 +++-
    drivers/remoteproc/remoteproc_virtio.c | 4 +++-
    drivers/s390/virtio/virtio_ccw.c | 6 ++++--
    drivers/virtio/virtio_mmio.c | 4 +++-
    drivers/virtio/virtio_pci_legacy.c | 4 +++-
    drivers/virtio/virtio_pci_modern.c | 4 +++-
    drivers/virtio/virtio_vdpa.c | 4 +++-
    include/linux/virtio_config.h | 3 ++-
    9 files changed, 27 insertions(+), 10 deletions(-)

    diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
    index 4412d6febade..ca02deaf9b32 100644
    --- a/arch/um/drivers/virtio_uml.c
    +++ b/arch/um/drivers/virtio_uml.c
    @@ -828,11 +828,13 @@ static void vu_set_status(struct virtio_device *vdev, u8 status)
    vu_dev->status = status;
    }

    -static void vu_reset(struct virtio_device *vdev)
    +static int vu_reset(struct virtio_device *vdev)
    {
    struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev);

    vu_dev->status = 0;
    +
    + return 0;
    }

    static void vu_del_vq(struct virtqueue *vq)
    diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
    index 38800e86ed8a..e3c513c2d4fa 100644
    --- a/drivers/platform/mellanox/mlxbf-tmfifo.c
    +++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
    @@ -989,11 +989,13 @@ static void mlxbf_tmfifo_virtio_set_status(struct virtio_device *vdev,
    }

    /* Reset the device. Not much here for now. */
    -static void mlxbf_tmfifo_virtio_reset(struct virtio_device *vdev)
    +static int mlxbf_tmfifo_virtio_reset(struct virtio_device *vdev)
    {
    struct mlxbf_tmfifo_vdev *tm_vdev = mlxbf_vdev_to_tmfifo(vdev);

    tm_vdev->status = 0;
    +
    + return 0;
    }

    /* Read the value of a configuration field. */
    diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
    index cf4d54e98e6a..975c845b3187 100644
    --- a/drivers/remoteproc/remoteproc_virtio.c
    +++ b/drivers/remoteproc/remoteproc_virtio.c
    @@ -191,7 +191,7 @@ static void rproc_virtio_set_status(struct virtio_device *vdev, u8 status)
    dev_dbg(&vdev->dev, "status: %d\n", status);
    }

    -static void rproc_virtio_reset(struct virtio_device *vdev)
    +static int rproc_virtio_reset(struct virtio_device *vdev)
    {
    struct rproc_vdev *rvdev = vdev_to_rvdev(vdev);
    struct fw_rsc_vdev *rsc;
    @@ -200,6 +200,8 @@ static void rproc_virtio_reset(struct virtio_device *vdev)

    rsc->status = 0;
    dev_dbg(&vdev->dev, "reset !\n");
    +
    + return 0;
    }

    /* provide the vdev features as retrieved from the firmware */
    diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
    index d35e7a3f7067..5221cdad531d 100644
    --- a/drivers/s390/virtio/virtio_ccw.c
    +++ b/drivers/s390/virtio/virtio_ccw.c
    @@ -710,14 +710,14 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
    return ret;
    }

    -static void virtio_ccw_reset(struct virtio_device *vdev)
    +static int virtio_ccw_reset(struct virtio_device *vdev)
    {
    struct virtio_ccw_device *vcdev = to_vc_device(vdev);
    struct ccw1 *ccw;

    ccw = ccw_device_dma_zalloc(vcdev->cdev, sizeof(*ccw));
    if (!ccw)
    - return;
    + return -ENOMEM;

    /* Zero status bits. */
    vcdev->dma_area->status = 0;
    @@ -729,6 +729,8 @@ static void virtio_ccw_reset(struct virtio_device *vdev)
    ccw->cda = 0;
    ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_RESET);
    ccw_device_dma_free(vcdev->cdev, ccw, sizeof(*ccw));
    +
    + return 0;
    }

    static u64 virtio_ccw_get_features(struct virtio_device *vdev)
    diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
    index 56128b9c46eb..c0a65efa4a65 100644
    --- a/drivers/virtio/virtio_mmio.c
    +++ b/drivers/virtio/virtio_mmio.c
    @@ -256,12 +256,14 @@ static void vm_set_status(struct virtio_device *vdev, u8 status)
    writel(status, vm_dev->base + VIRTIO_MMIO_STATUS);
    }

    -static void vm_reset(struct virtio_device *vdev)
    +static int vm_reset(struct virtio_device *vdev)
    {
    struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);

    /* 0 status means a reset. */
    writel(0, vm_dev->base + VIRTIO_MMIO_STATUS);
    +
    + return 0;
    }


    diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
    index d62e9835aeec..0b5d95e3efa1 100644
    --- a/drivers/virtio/virtio_pci_legacy.c
    +++ b/drivers/virtio/virtio_pci_legacy.c
    @@ -89,7 +89,7 @@ static void vp_set_status(struct virtio_device *vdev, u8 status)
    iowrite8(status, vp_dev->ioaddr + VIRTIO_PCI_STATUS);
    }

    -static void vp_reset(struct virtio_device *vdev)
    +static int vp_reset(struct virtio_device *vdev)
    {
    struct virtio_pci_device *vp_dev = to_vp_device(vdev);
    /* 0 status means a reset. */
    @@ -99,6 +99,8 @@ static void vp_reset(struct virtio_device *vdev)
    ioread8(vp_dev->ioaddr + VIRTIO_PCI_STATUS);
    /* Flush pending VQ/configuration callbacks. */
    vp_synchronize_vectors(vdev);
    +
    + return 0;
    }

    static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector)
    diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
    index 30654d3a0b41..b0cde3b2f0ff 100644
    --- a/drivers/virtio/virtio_pci_modern.c
    +++ b/drivers/virtio/virtio_pci_modern.c
    @@ -158,7 +158,7 @@ static void vp_set_status(struct virtio_device *vdev, u8 status)
    vp_modern_set_status(&vp_dev->mdev, status);
    }

    -static void vp_reset(struct virtio_device *vdev)
    +static int vp_reset(struct virtio_device *vdev)
    {
    struct virtio_pci_device *vp_dev = to_vp_device(vdev);
    struct virtio_pci_modern_device *mdev = &vp_dev->mdev;
    @@ -174,6 +174,8 @@ static void vp_reset(struct virtio_device *vdev)
    msleep(1);
    /* Flush pending VQ/configuration callbacks. */
    vp_synchronize_vectors(vdev);
    +
    + return 0;
    }

    static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector)
    diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
    index ff43f9b62b2f..3e666f70e829 100644
    --- a/drivers/virtio/virtio_vdpa.c
    +++ b/drivers/virtio/virtio_vdpa.c
    @@ -97,11 +97,13 @@ static void virtio_vdpa_set_status(struct virtio_device *vdev, u8 status)
    return ops->set_status(vdpa, status);
    }

    -static void virtio_vdpa_reset(struct virtio_device *vdev)
    +static int virtio_vdpa_reset(struct virtio_device *vdev)
    {
    struct vdpa_device *vdpa = vd_get_vdpa(vdev);

    vdpa_reset(vdpa);
    +
    + return 0;
    }

    static bool virtio_vdpa_notify(struct virtqueue *vq)
    diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
    index 8519b3ae5d52..203407992c30 100644
    --- a/include/linux/virtio_config.h
    +++ b/include/linux/virtio_config.h
    @@ -47,6 +47,7 @@ struct virtio_shm_region {
    * After this, status and feature negotiation must be done again
    * Device must not be reset from its vq/config callbacks, or in
    * parallel with being added/removed.
    + * Returns 0 on success or error status
    * @find_vqs: find virtqueues and instantiate them.
    * vdev: the virtio_device
    * nvqs: the number of virtqueues to find
    @@ -82,7 +83,7 @@ struct virtio_config_ops {
    u32 (*generation)(struct virtio_device *vdev);
    u8 (*get_status)(struct virtio_device *vdev);
    void (*set_status)(struct virtio_device *vdev, u8 status);
    - void (*reset)(struct virtio_device *vdev);
    + int (*reset)(struct virtio_device *vdev);
    int (*find_vqs)(struct virtio_device *, unsigned nvqs,
    struct virtqueue *vqs[], vq_callback_t *callbacks[],
    const char * const names[], const bool *ctx,
    --
    2.11.0
    \
     
     \ /
      Last update: 2021-07-29 09:37    [W:4.054 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site