From: Jerin Jacob <jerinjacobk@gmail.com>
To: pbhagavatula@marvell.com
Cc: jerinj@marvell.com, Nithin Dabilpuram <ndabilpuram@marvell.com>,
Kiran Kumar K <kirankumark@marvell.com>,
Sunil Kumar Kori <skori@marvell.com>,
Satha Rao <skoteshwar@marvell.com>,
Harman Kalra <hkalra@marvell.com>,
dev@dpdk.org
Subject: Re: [PATCH v2] common/cnxk: unregister IRQ before reconfigure
Date: Mon, 23 Sep 2024 21:17:23 +0530 [thread overview]
Message-ID: <CALBAE1NTJH0RchAtzM-xserxu5QHXzT56aJT=d9PVx9QfYPbCg@mail.gmail.com> (raw)
In-Reply-To: <20240919180243.1255-1-pbhagavatula@marvell.com>
On Thu, Sep 19, 2024 at 11:33 PM <pbhagavatula@marvell.com> wrote:
>
> From: Pavan Nikhilesh <pbhagavatula@marvell.com>
>
> Unregister SSO device and NPA IRQs before resizing
> them.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
# Add fixes: tag
# Change commit message to common/cnxk: fix...
> ---
> v2 Changes:
> - Reorder npa interrupt un-registration.
>
> drivers/common/cnxk/roc_dev.c | 16 +++++++---------
> drivers/common/cnxk/roc_dev_priv.h | 2 ++
> drivers/common/cnxk/roc_sso.c | 7 +++++++
> 3 files changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/common/cnxk/roc_dev.c b/drivers/common/cnxk/roc_dev.c
> index daf7684d8e..4a5787e7f9 100644
> --- a/drivers/common/cnxk/roc_dev.c
> +++ b/drivers/common/cnxk/roc_dev.c
> @@ -1017,8 +1017,8 @@ mbox_unregister_vf_irq(struct plt_pci_device *pci_dev, struct dev *dev)
> RVU_VF_INT_VEC_MBOX);
> }
>
> -static void
> -mbox_unregister_irq(struct plt_pci_device *pci_dev, struct dev *dev)
> +void
> +dev_mbox_unregister_irq(struct plt_pci_device *pci_dev, struct dev *dev)
> {
> if (dev_is_vf(dev))
> mbox_unregister_vf_irq(pci_dev, dev);
> @@ -1096,8 +1096,8 @@ roc_pf_vf_flr_irq(void *param)
> }
> }
>
> -static int
> -vf_flr_unregister_irqs(struct plt_pci_device *pci_dev, struct dev *dev)
> +void
> +dev_vf_flr_unregister_irqs(struct plt_pci_device *pci_dev, struct dev *dev)
> {
> struct plt_intr_handle *intr_handle = pci_dev->intr_handle;
> int i;
> @@ -1113,8 +1113,6 @@ vf_flr_unregister_irqs(struct plt_pci_device *pci_dev, struct dev *dev)
>
> dev_irq_unregister(intr_handle, roc_pf_vf_flr_irq, dev,
> RVU_PF_INT_VEC_VFFLR1);
> -
> - return 0;
> }
>
> int
> @@ -1600,7 +1598,7 @@ dev_init(struct dev *dev, struct plt_pci_device *pci_dev)
> iounmap:
> dev_vf_mbase_put(pci_dev, vf_mbase);
> mbox_unregister:
> - mbox_unregister_irq(pci_dev, dev);
> + dev_mbox_unregister_irq(pci_dev, dev);
> if (dev->ops)
> plt_free(dev->ops);
> mbox_fini:
> @@ -1636,10 +1634,10 @@ dev_fini(struct dev *dev, struct plt_pci_device *pci_dev)
> if (dev->lmt_mz)
> plt_memzone_free(dev->lmt_mz);
>
> - mbox_unregister_irq(pci_dev, dev);
> + dev_mbox_unregister_irq(pci_dev, dev);
>
> if (!dev_is_vf(dev))
> - vf_flr_unregister_irqs(pci_dev, dev);
> + dev_vf_flr_unregister_irqs(pci_dev, dev);
> /* Release PF - VF */
> mbox = &dev->mbox_vfpf;
> if (mbox->hwbase && mbox->dev)
> diff --git a/drivers/common/cnxk/roc_dev_priv.h b/drivers/common/cnxk/roc_dev_priv.h
> index 50e12cbf17..df7dc222ed 100644
> --- a/drivers/common/cnxk/roc_dev_priv.h
> +++ b/drivers/common/cnxk/roc_dev_priv.h
> @@ -131,6 +131,8 @@ int dev_irqs_disable(struct plt_intr_handle *intr_handle);
> int dev_irq_reconfigure(struct plt_intr_handle *intr_handle, uint16_t max_intr);
>
> int dev_mbox_register_irq(struct plt_pci_device *pci_dev, struct dev *dev);
> +void dev_mbox_unregister_irq(struct plt_pci_device *pci_dev, struct dev *dev);
> int dev_vf_flr_register_irqs(struct plt_pci_device *pci_dev, struct dev *dev);
> +void dev_vf_flr_unregister_irqs(struct plt_pci_device *pci_dev, struct dev *dev);
>
> #endif /* _ROC_DEV_PRIV_H */
> diff --git a/drivers/common/cnxk/roc_sso.c b/drivers/common/cnxk/roc_sso.c
> index 293b0c81a1..7d45b06dda 100644
> --- a/drivers/common/cnxk/roc_sso.c
> +++ b/drivers/common/cnxk/roc_sso.c
> @@ -842,7 +842,14 @@ sso_update_msix_vec_count(struct roc_sso *roc_sso, uint16_t sso_vec_cnt)
> return dev_irq_reconfigure(pci_dev->intr_handle, mbox_vec_cnt + npa_vec_cnt);
> }
>
> + /* Before re-configuring unregister irqs */
> npa_vec_cnt = (dev->npa.pci_dev == pci_dev) ? NPA_LF_INT_VEC_POISON + 1 : 0;
> + if (npa_vec_cnt)
> + npa_unregister_irqs(&dev->npa);
> +
> + dev_mbox_unregister_irq(pci_dev, dev);
> + if (!dev_is_vf(dev))
> + dev_vf_flr_unregister_irqs(pci_dev, dev);
>
> /* Re-configure to include SSO vectors */
> rc = dev_irq_reconfigure(pci_dev->intr_handle, mbox_vec_cnt + npa_vec_cnt + sso_vec_cnt);
> --
> 2.25.1
>
prev parent reply other threads:[~2024-09-23 15:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 14:25 [PATCH] " pbhagavatula
2024-09-19 18:02 ` [PATCH v2] " pbhagavatula
2024-09-23 15:47 ` Jerin Jacob [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALBAE1NTJH0RchAtzM-xserxu5QHXzT56aJT=d9PVx9QfYPbCg@mail.gmail.com' \
--to=jerinjacobk@gmail.com \
--cc=dev@dpdk.org \
--cc=hkalra@marvell.com \
--cc=jerinj@marvell.com \
--cc=kirankumark@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=pbhagavatula@marvell.com \
--cc=skori@marvell.com \
--cc=skoteshwar@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).