2021-08-17 17:07:20

by Utkarsh Verma

Subject: [PATCH] serial: 8250_exar: Add missing call to pci_free_irq_vectors()

Free the pci irq vectors if the call to pci_alloc_irq_vectors() fails
or if the device is removed.

Signed-off-by: Utkarsh Verma <[email protected]>
---
drivers/tty/serial/8250/8250_exar.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index 3ffeedc29c83..38b65d6980f5 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -627,8 +627,10 @@ exar_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
pci_set_master(pcidev);

rc = pci_alloc_irq_vectors(pcidev, 1, 1, PCI_IRQ_ALL_TYPES);
- if (rc < 0)
+ if (rc < 0) {
+ pci_free_irq_vectors(pcidev);
return rc;
+ }

memset(&uart, 0, sizeof(uart));
uart.port.flags = UPF_SHARE_IRQ | UPF_EXAR_EFR | UPF_FIXED_TYPE | UPF_FIXED_PORT;
@@ -677,6 +679,7 @@ static void exar_pci_remove(struct pci_dev *pcidev)

if (priv->board->exit)
priv->board->exit(pcidev);
+ pci_free_irq_vectors(pcidev);
}

static int __maybe_unused exar_suspend(struct device *dev)
--
2.17.1

2021-08-17 17:34:03

by Andy Shevchenko

Subject: Re: [PATCH] serial: 8250_exar: Add missing call to pci_free_irq_vectors()

On Tue, Aug 17, 2021 at 8:05 PM Utkarsh Verma <[email protected]> wrote:
>
> Free the pci irq vectors if the call to pci_alloc_irq_vectors() fails
> or if the device is removed.

+Cc: Bjorn

This patch adds no value for all the code. This needs simply better
semantics on allocations (because freeing is happening here
implicitly).
Bjorn, this is an exact example why we need pcim_alloc_irq_vectors().

> Signed-off-by: Utkarsh Verma <[email protected]>
> ---
> drivers/tty/serial/8250/8250_exar.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
> index 3ffeedc29c83..38b65d6980f5 100644
> --- a/drivers/tty/serial/8250/8250_exar.c
> +++ b/drivers/tty/serial/8250/8250_exar.c
> @@ -627,8 +627,10 @@ exar_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
> pci_set_master(pcidev);
>
> rc = pci_alloc_irq_vectors(pcidev, 1, 1, PCI_IRQ_ALL_TYPES);
> - if (rc < 0)
> + if (rc < 0) {
> + pci_free_irq_vectors(pcidev);
> return rc;
> + }
>
> memset(&uart, 0, sizeof(uart));
> uart.port.flags = UPF_SHARE_IRQ | UPF_EXAR_EFR | UPF_FIXED_TYPE | UPF_FIXED_PORT;
> @@ -677,6 +679,7 @@ static void exar_pci_remove(struct pci_dev *pcidev)
>
> if (priv->board->exit)
> priv->board->exit(pcidev);
> + pci_free_irq_vectors(pcidev);
> }


--
With Best Regards,
Andy Shevchenko

2021-08-17 17:41:10

by Andy Shevchenko

Subject: Re: [PATCH] serial: 8250_exar: Add missing call to pci_free_irq_vectors()

On Tue, Aug 17, 2021 at 10:30:57PM +0530, Utkarsh Verma wrote:
> Free the pci irq vectors if the call to pci_alloc_irq_vectors() fails
> or if the device is removed.

...

> rc = pci_alloc_irq_vectors(pcidev, 1, 1, PCI_IRQ_ALL_TYPES);
> - if (rc < 0)
> + if (rc < 0) {

> + pci_free_irq_vectors(pcidev);

Why?

--
With Best Regards,
Andy Shevchenko