[v1] bus/fslmc: fix dpio close
Checks
Commit Message
From: Rohit Raj <rohit.raj@nxp.com>
The current state of the DPIO object should be checked
before trying to close/disable the object.
Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")
Cc: stable@dpdk.org
Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
---
drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
Comments
Acked-by: Sachin Saxena<sachin.saxena@oss.nxp.com>
On 28-Jul-20 9:54 PM, rohit.raj@nxp.com wrote:
> From: Rohit Raj <rohit.raj@nxp.com>
>
> The current state of the DPIO object should be checked
> before trying to close/disable the object.
>
> Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")
> Cc: stable@dpdk.org
>
> Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
> ---
> drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
> index 97be76116..b0055b164 100644
> --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
> +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
> @@ -528,8 +528,13 @@ dpaa2_create_dpio_device(int vdev_fd,
>
> err:
> if (dpio_dev->dpio) {
> - dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token);
> - dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token);
> + if (dpio_dev->token) {
> + dpio_disable(dpio_dev->dpio, CMD_PRI_LOW,
> + dpio_dev->token);
> + dpio_close(dpio_dev->dpio, CMD_PRI_LOW,
> + dpio_dev->token);
> + }
> +
> rte_free(dpio_dev->eqresp);
> rte_free(dpio_dev->dpio);
> }
06/08/2020 16:32, Sachin Saxena (OSS):
> On 28-Jul-20 9:54 PM, rohit.raj@nxp.com wrote:
> > From: Rohit Raj <rohit.raj@nxp.com>
> >
> > The current state of the DPIO object should be checked
> > before trying to close/disable the object.
> >
> > Fixes: 293c0ca94c36 ("bus/fslmc: support memory backed portals with QBMAN 5.0")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Rohit Raj <rohit.raj@nxp.com>
>
> Acked-by: Sachin Saxena <sachin.saxena@oss.nxp.com>
Applied, thanks
@@ -528,8 +528,13 @@ dpaa2_create_dpio_device(int vdev_fd,
err:
if (dpio_dev->dpio) {
- dpio_disable(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token);
- dpio_close(dpio_dev->dpio, CMD_PRI_LOW, dpio_dev->token);
+ if (dpio_dev->token) {
+ dpio_disable(dpio_dev->dpio, CMD_PRI_LOW,
+ dpio_dev->token);
+ dpio_close(dpio_dev->dpio, CMD_PRI_LOW,
+ dpio_dev->token);
+ }
+
rte_free(dpio_dev->eqresp);
rte_free(dpio_dev->dpio);
}