From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DB3B1D54D6; Wed, 19 Mar 2025 17:08:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742404132; cv=none; b=BJTeW/fZCoIVvV12ejsV+3wKyipRlzMfqMaqHUR1Lhg0k+vvPmN6BcgXQ/wsStu6gAw/CiyIEtMzwZpUv4ftidPZZthi4RCORW2lecbhegZ+PlXgfUWRyfT8owCyifnyKphRJa0KSeAoEb3Ifyumx+3OPSsEbN+bKP3ow3WFuj4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742404132; c=relaxed/simple; bh=O6TJ8nTFLxfO+EIOy74huVY72QVXAHjgorq6WvP7OZ4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=e3a/B6xLf8QiPVUJOo6TK8zW70F3zoVTGs/wmbFdYtR0CUUbUUyp5naTmsbpJZwzZmXvCmMzGPeklAQfKZsio8fI5S3sX/iziY+KfUqd+kuC0wWZCR0poSOSe28ihERo+OuFghk9GufyIkLrElqacHvXVcKMTXmQ/eZi40rORdo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G14mmUJ/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="G14mmUJ/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F66EC4CEE4; Wed, 19 Mar 2025 17:08:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742404131; bh=O6TJ8nTFLxfO+EIOy74huVY72QVXAHjgorq6WvP7OZ4=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=G14mmUJ/nChPPHKxQxEumayTysEjDK4VzLIDJwjAV8sswXcJgnv2mSv3zdLkbxPtq w+O31Fp2lZLQicQcNw3HOa4cNRBcslPyIUfSV2qEPsO1LkIwzqD/hIcUvHCEH2Cub/ /uSWP5l5YwNq7E9E+kY37RC9/P9y/TpBmOZDtcjyH3DU5+QWpfj0E1rieYXu6JMCZv XKkPi1QU+86pjawweim+MaUUgn9DyWlHXyEDD00Mjxe7QMbny6OYNNOdtLzSE5Wi8Q tEUY5JaBKSBxjDHXHEwaRj5bkycFzwWGOo7CJHf8xhmBdSXLfN1l5+5t0XNWqFnOoR sLw7U2gRuowsA== Date: Wed, 19 Mar 2025 12:08:48 -0500 From: Bjorn Helgaas To: Thomas Gleixner Cc: LKML , Marc Zyngier , Peter Zijlstra , Jonathan Cameron , Nishanth Menon , Dhruva Gole , Tero Kristo , Santosh Shilimkar , Logan Gunthorpe , Dave Jiang , Jon Mason , Allen Hubbe , ntb@lists.linux.dev, Michael Kelley , Wei Liu , Bjorn Helgaas , Haiyang Zhang , linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, Wei Huang , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Jonathan Cameron Subject: Re: [patch V4 06/14] PCI/MSI: Set pci_dev::msi_enabled late Message-ID: <20250319170848.GA1046210@bhelgaas> Precedence: bulk X-Mailing-List: linux-hyperv@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250319105506.383222333@linutronix.de> On Wed, Mar 19, 2025 at 11:56:49AM +0100, Thomas Gleixner wrote: > The comment claiming that pci_dev::msi_enabled has to be set across setup > is a leftover from ancient code versions. Nothing in the setup code > requires the flag to be set anymore. > > Set it in the success path and remove the extra goto label. > > Signed-off-by: Thomas Gleixner Acked-by: Bjorn Helgaas > --- > V4: New patch > --- > drivers/pci/msi/msi.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -359,12 +359,8 @@ static int msi_capability_init(struct pc > if (nvec > 1 && !pci_msi_domain_supports(dev, MSI_FLAG_MULTI_PCI_MSI, ALLOW_LEGACY)) > return 1; > > - /* > - * Disable MSI during setup in the hardware, but mark it enabled > - * so that setup code can evaluate it. > - */ > + /* Disable MSI during setup in the hardware to erase stale state */ > pci_msi_set_enable(dev, 0); > - dev->msi_enabled = 1; > > if (affd) > masks = irq_create_affinity_masks(nvec, affd); > @@ -372,7 +368,7 @@ static int msi_capability_init(struct pc > msi_lock_descs(&dev->dev); > ret = msi_setup_msi_desc(dev, nvec, masks); > if (ret) > - goto fail; > + goto unlock; > > /* All MSIs are unmasked by default; mask them all */ > entry = msi_first_desc(&dev->dev, MSI_DESC_ALL); > @@ -394,6 +390,7 @@ static int msi_capability_init(struct pc > goto err; > > /* Set MSI enabled bits */ > + dev->msi_enabled = 1; > pci_intx_for_msi(dev, 0); > pci_msi_set_enable(dev, 1); > > @@ -404,8 +401,6 @@ static int msi_capability_init(struct pc > err: > pci_msi_unmask(&desc, msi_multi_mask(&desc)); > pci_free_msi_irqs(dev); > -fail: > - dev->msi_enabled = 0; > unlock: > msi_unlock_descs(&dev->dev); > kfree(masks); >