From: Bjorn Helgaas <helgaas@kernel.org> To: Dexuan Cui <decui@microsoft.com> Cc: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Michael Kelley <mikelley@microsoft.com>, Sasha Levin <Alexander.Levin@microsoft.com>, Haiyang Zhang <haiyangz@microsoft.com>, KY Srinivasan <kys@microsoft.com>, Stephen Hemminger <sthemmin@microsoft.com>, olaf@aepfle.de, apw@canonical.com, jasowang@redhat.com, vkuznets@redhat.com, marcelo.cerri@canonical.com, jackm@mellanox.com, linux-pci@vger.kernel.org, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, driverdev-devel@linuxdriverproject.org, Bjorn Helgaas <bhelgaas@google.com> Subject: [PATCH 7/7] PCI/MSI: Move power state check out of pci_msi_supported() Date: Mon, 14 Oct 2019 18:00:16 -0500 [thread overview] Message-ID: <20191014230016.240912-8-helgaas@kernel.org> (raw) In-Reply-To: <20191014230016.240912-1-helgaas@kernel.org> From: Bjorn Helgaas <bhelgaas@google.com> 27e20603c54b ("PCI/MSI: Move D0 check into pci_msi_check_device()") moved the power state check into pci_msi_check_device(), which was subsequently renamed to pci_msi_supported(). This didn't change the behavior, since both callers checked the power state. However, it doesn't fit the current "pci_msi_supported()" name, which should return what the device is capable of, independent of the power state. Move the power state check back into the callers for readability. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/pci/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 0884bedcfc7a..20e9c729617c 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -861,7 +861,7 @@ static int pci_msi_supported(struct pci_dev *dev, int nvec) if (!pci_msi_enable) return 0; - if (!dev || dev->no_msi || dev->current_state != PCI_D0) + if (!dev || dev->no_msi) return 0; /* @@ -972,7 +972,7 @@ static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nr_entries; int i, j; - if (!pci_msi_supported(dev, nvec)) + if (!pci_msi_supported(dev, nvec) || dev->current_state != PCI_D0) return -EINVAL; nr_entries = pci_msix_vec_count(dev); @@ -1058,7 +1058,7 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, int nvec; int rc; - if (!pci_msi_supported(dev, minvec)) + if (!pci_msi_supported(dev, minvec) || dev->current_state != PCI_D0) return -EINVAL; /* Check whether driver already requested MSI-X IRQs */ -- 2.23.0.700.g56cf767bdb-goog
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <helgaas@kernel.org> To: Dexuan Cui <decui@microsoft.com> Cc: driverdev-devel@linuxdriverproject.org, olaf@aepfle.de, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Stephen Hemminger <sthemmin@microsoft.com>, jackm@mellanox.com, Haiyang Zhang <haiyangz@microsoft.com>, "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>, linux-hyperv@vger.kernel.org, Michael Kelley <mikelley@microsoft.com>, Sasha Levin <Alexander.Levin@microsoft.com>, marcelo.cerri@canonical.com, linux-pci@vger.kernel.org, apw@canonical.com, vkuznets@redhat.com, Bjorn Helgaas <bhelgaas@google.com>, jasowang@redhat.com, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] PCI/MSI: Move power state check out of pci_msi_supported() Date: Mon, 14 Oct 2019 18:00:16 -0500 [thread overview] Message-ID: <20191014230016.240912-8-helgaas@kernel.org> (raw) In-Reply-To: <20191014230016.240912-1-helgaas@kernel.org> From: Bjorn Helgaas <bhelgaas@google.com> 27e20603c54b ("PCI/MSI: Move D0 check into pci_msi_check_device()") moved the power state check into pci_msi_check_device(), which was subsequently renamed to pci_msi_supported(). This didn't change the behavior, since both callers checked the power state. However, it doesn't fit the current "pci_msi_supported()" name, which should return what the device is capable of, independent of the power state. Move the power state check back into the callers for readability. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/pci/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 0884bedcfc7a..20e9c729617c 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -861,7 +861,7 @@ static int pci_msi_supported(struct pci_dev *dev, int nvec) if (!pci_msi_enable) return 0; - if (!dev || dev->no_msi || dev->current_state != PCI_D0) + if (!dev || dev->no_msi) return 0; /* @@ -972,7 +972,7 @@ static int __pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nr_entries; int i, j; - if (!pci_msi_supported(dev, nvec)) + if (!pci_msi_supported(dev, nvec) || dev->current_state != PCI_D0) return -EINVAL; nr_entries = pci_msix_vec_count(dev); @@ -1058,7 +1058,7 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec, int nvec; int rc; - if (!pci_msi_supported(dev, minvec)) + if (!pci_msi_supported(dev, minvec) || dev->current_state != PCI_D0) return -EINVAL; /* Check whether driver already requested MSI-X IRQs */ -- 2.23.0.700.g56cf767bdb-goog _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2019-10-14 23:02 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-14 23:00 [PATCH v3 0/7] PCI: PM: Move to D0 before calling pci_legacy_resume_early() Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-14 23:00 ` [PATCH 1/7] PCI/PM: Always return devices to D0 when thawing Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:15 ` Rafael J. Wysocki 2019-10-15 17:15 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 2/7] PCI/PM: Correct pci_pm_thaw_noirq() documentation Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:17 ` Rafael J. Wysocki 2019-10-15 17:17 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 3/7] PCI/PM: Clear PCIe PME Status even for legacy power management Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:20 ` Rafael J. Wysocki 2019-10-15 17:20 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 4/7] PCI/PM: Run resume fixups before disabling wakeup events Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:21 ` Rafael J. Wysocki 2019-10-15 17:21 ` Rafael J. Wysocki 2019-10-14 23:00 ` [PATCH 5/7] PCI/PM: Make power management op coding style consistent Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:22 ` Rafael J. Wysocki 2019-10-15 17:22 ` Rafael J. Wysocki 2019-10-16 13:50 ` Dan Carpenter 2019-10-16 13:50 ` Dan Carpenter 2019-10-14 23:00 ` [PATCH 6/7] PCI/PM: Wrap long lines in documentation Bjorn Helgaas 2019-10-14 23:00 ` Bjorn Helgaas 2019-10-15 17:23 ` Rafael J. Wysocki 2019-10-15 17:23 ` Rafael J. Wysocki 2019-10-14 23:00 ` Bjorn Helgaas [this message] 2019-10-14 23:00 ` [PATCH 7/7] PCI/MSI: Move power state check out of pci_msi_supported() Bjorn Helgaas 2019-10-15 17:24 ` Rafael J. Wysocki 2019-10-15 17:24 ` Rafael J. Wysocki 2019-10-15 18:24 ` [PATCH v3 0/7] PCI: PM: Move to D0 before calling pci_legacy_resume_early() Dexuan Cui 2019-10-15 18:24 ` Dexuan Cui 2019-10-15 18:42 ` Bjorn Helgaas 2019-10-15 18:42 ` Bjorn Helgaas
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=20191014230016.240912-8-helgaas@kernel.org \ --to=helgaas@kernel.org \ --cc=Alexander.Levin@microsoft.com \ --cc=apw@canonical.com \ --cc=bhelgaas@google.com \ --cc=decui@microsoft.com \ --cc=driverdev-devel@linuxdriverproject.org \ --cc=haiyangz@microsoft.com \ --cc=jackm@mellanox.com \ --cc=jasowang@redhat.com \ --cc=kys@microsoft.com \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=marcelo.cerri@canonical.com \ --cc=mikelley@microsoft.com \ --cc=olaf@aepfle.de \ --cc=rafael.j.wysocki@intel.com \ --cc=sthemmin@microsoft.com \ --cc=vkuznets@redhat.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.