Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <3b711d73-ac46-7a37-e835-f9dadeb96dd3@kernel.org>
Date:   Thu, 20 Apr 2023 17:23:02 +0900
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.9.1
Subject: Re: [PATCH] PCI: vmd: Fix two issues reported by Smatch
Content-Language: en-US
To:     korantwork@gmail.com, helgaas@kernel.org,
        nirmal.patel@linux.intel.com, kbusch@kernel.org,
        jonathan.derrick@linux.dev, lpieralisi@kernel.org
Cc:     linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
        Xinghui Li <korantli@tencent.com>,
        Dan Carpenter <error27@gmail.com>
References: <20230420081957.1440423-1-korantwork@gmail.com>
From:   Damien Le Moal <dlemoal@kernel.org>
Organization: Western Digital Research
In-Reply-To: <20230420081957.1440423-1-korantwork@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 4/20/23 17:19, korantwork@gmail.com wrote:
> From: Xinghui Li <korantli@tencent.com>
> 
> There is one uninitialized symbol error reported by smatch:
> "drivers/pci/controller/vmd.c:931 vmd_enable_domain()
> error: uninitialized symbol 'ret'."
> 
> Fix it by assigning ret with pci_reset_bus return.

This is a bug so clearly needs a fixes tag.

> 
> And one inconsistent indenting warning:
> "drivers/pci/controller/vmd.c:1058 vmd_resume()
> warn: inconsistent indenting"
> 
> Fix it by formating its indenting.

But this is cosmetic and does not need backporting/fixes tag in my opinion. So
better split this into 2 different patches.

> 
> Fixes: 0a584655ef89 ("PCI: vmd: Fix secondary bus reset for Intel bridges")
> Fixes: d899aa668498 ("PCI: vmd: Disable MSI remapping after suspend")
> Reported-by: Dan Carpenter <error27@gmail.com>
> Signed-off-by: Xinghui Li <korantli@tencent.com>
> ---
>  drivers/pci/controller/vmd.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/pci/controller/vmd.c b/drivers/pci/controller/vmd.c
> index 7e1fd959e00d..0a7c1fdfeec0 100644
> --- a/drivers/pci/controller/vmd.c
> +++ b/drivers/pci/controller/vmd.c
> @@ -943,7 +943,8 @@ static int vmd_enable_domain(struct vmd_dev *vmd, unsigned long features)
>  		if (!list_empty(&child->devices)) {
>  			dev = list_first_entry(&child->devices,
>  					       struct pci_dev, bus_list);
> -			if (pci_reset_bus(dev))
> +			ret = pci_reset_bus(dev);
> +			if (ret)
>  				pci_warn(dev, "can't reset device: %d\n", ret);
>  
>  			break;
> @@ -1084,10 +1085,10 @@ static int vmd_resume(struct device *dev)
>  	struct vmd_dev *vmd = pci_get_drvdata(pdev);
>  	int err, i;
>  
> -       if (vmd->irq_domain)
> -               vmd_set_msi_remapping(vmd, true);
> -       else
> -               vmd_set_msi_remapping(vmd, false);
> +	if (vmd->irq_domain)
> +		vmd_set_msi_remapping(vmd, true);
> +	else
> +		vmd_set_msi_remapping(vmd, false);
>  
>  	for (i = 0; i < vmd->msix_count; i++) {
>  		err = devm_request_irq(dev, vmd->irqs[i].virq,