aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKrzysztof Wilczynski <kw@linux.com>2019-08-26 00:46:16 +0200
committerBjorn Helgaas <bhelgaas@google.com>2019-09-05 13:26:46 -0500
commit7f1c62c443a453deb6eb3515e3c05650ffe0dcf0 (patch)
treebcdf099bdb3fc851d73c6a5dc3d3fb3188e568bf
parentPCI/IOV: Remove group write permission from sriov_numvfs, sriov_drivers_autoprobe (diff)
downloadwireguard-linux-7f1c62c443a453deb6eb3515e3c05650ffe0dcf0.tar.xz
wireguard-linux-7f1c62c443a453deb6eb3515e3c05650ffe0dcf0.zip
PCI: Add pci_info_ratelimited() to ratelimit PCI separately
Do not use printk_ratelimit() in drivers/pci/pci.c as it shares the rate limiting state with all other callers to the printk_ratelimit(). Add pci_info_ratelimited() (similar to pci_notice_ratelimited() added in the commit a88a7b3eb076 ("vfio: Use dev_printk() when possible")) and use it instead of printk_ratelimit() + pci_info(). Link: https://lore.kernel.org/r/20190825224616.8021-1-kw@linux.com Signed-off-by: Krzysztof Wilczynski <kw@linux.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/pci.c4
-rw-r--r--include/linux/pci.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 29ed5ec1ac27..08dfb16bd084 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -890,8 +890,8 @@ static int pci_raw_set_power_state(struct pci_dev *dev, pci_power_t state)
pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK);
- if (dev->current_state != state && printk_ratelimit())
- pci_info(dev, "Refused to change power state, currently in D%d\n",
+ if (dev->current_state != state)
+ pci_info_ratelimited(dev, "Refused to change power state, currently in D%d\n",
dev->current_state);
/*
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9e700d9f9f28..f5bab312995d 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2433,4 +2433,7 @@ void pci_uevent_ers(struct pci_dev *pdev, enum pci_ers_result err_type);
#define pci_notice_ratelimited(pdev, fmt, arg...) \
dev_notice_ratelimited(&(pdev)->dev, fmt, ##arg)
+#define pci_info_ratelimited(pdev, fmt, arg...) \
+ dev_info_ratelimited(&(pdev)->dev, fmt, ##arg)
+
#endif /* LINUX_PCI_H */