mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Yang Yingliang <yangyingliang@huawei.com>
To: Oded Gabbay <ogabbay@kernel.org>
Cc: "Linux-Kernel@Vger. Kernel. Org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -next] habanalabs/gaudi2: fix free irq in error path in gaudi2_enable_msix()
Date: Tue, 13 Sep 2022 10:23:32 +0800	[thread overview]
Message-ID: <6fef3c68-fea2-b5ee-5110-35648b32fe8b@huawei.com> (raw)
In-Reply-To: <CAFCwf13WoDk6y435zmG5VQa1kRqDo1TA26ZhT5=bTp6qtQr8XQ@mail.gmail.com>


On 2022/8/29 18:14, Oded Gabbay wrote:
> On Thu, Aug 25, 2022 at 4:23 PM Yang Yingliang <yangyingliang@huawei.com> wrote:
>> Add two variables to store completion irq and event queue irq. And add
>> a new lable to free event queue irq in error path in gaudi2_enable_msix().
>>
>> Fixes: d7bb1ac89b2f ("habanalabs: add gaudi2 asic-specific code")
>> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
>> ---
>>   drivers/misc/habanalabs/gaudi2/gaudi2.c | 21 +++++++++++++--------
>>   1 file changed, 13 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2.c b/drivers/misc/habanalabs/gaudi2/gaudi2.c
>> index 98336a1a84b0..54eca19b270b 100644
>> --- a/drivers/misc/habanalabs/gaudi2/gaudi2.c
>> +++ b/drivers/misc/habanalabs/gaudi2/gaudi2.c
>> @@ -3518,6 +3518,7 @@ static int gaudi2_enable_msix(struct hl_device *hdev)
>>          struct asic_fixed_properties *prop = &hdev->asic_prop;
>>          struct gaudi2_device *gaudi2 = hdev->asic_specific;
>>          int rc, irq, i, j, user_irq_init_cnt;
>> +       int completion_irq, event_queue_irq;
>>          irq_handler_t irq_handler;
>>          struct hl_cq *cq;
>>
>> @@ -3532,17 +3533,19 @@ static int gaudi2_enable_msix(struct hl_device *hdev)
>>                  return rc;
>>          }
>>
>> -       irq = pci_irq_vector(hdev->pdev, GAUDI2_IRQ_NUM_COMPLETION);
>> +       completion_irq = pci_irq_vector(hdev->pdev, GAUDI2_IRQ_NUM_COMPLETION);
>>          cq = &hdev->completion_queue[GAUDI2_RESERVED_CQ_CS_COMPLETION];
>> -       rc = request_irq(irq, hl_irq_handler_cq, 0, gaudi2_irq_name(GAUDI2_IRQ_NUM_COMPLETION), cq);
>> +       rc = request_irq(completion_irq, hl_irq_handler_cq, 0,
>> +                        gaudi2_irq_name(GAUDI2_IRQ_NUM_COMPLETION), cq);
>>          if (rc) {
>>                  dev_err(hdev->dev, "Failed to request IRQ %d", irq);
> Please fix the error prints to print the correct irq.
OK.
> And I think you should remove the "irq" local variable completely.
'irq' will be used later, it can not be removed.

Thanks,
Yang
>
> Oded
>

      reply	other threads:[~2022-09-13  2:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-25 13:31 Yang Yingliang
2022-08-29 10:14 ` Oded Gabbay
2022-09-13  2:23   ` Yang Yingliang [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=6fef3c68-fea2-b5ee-5110-35648b32fe8b@huawei.com \
    --to=yangyingliang@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ogabbay@kernel.org \
    /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

all inboxes | Powered by JetHome®