diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2014-01-10 16:00:47 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-10 16:00:47 -0500 |
commit | b340cacc1b47d8fc15051aaf9b2d44678e245ba9 (patch) | |
tree | 3e4603c5d3146077d9d8c570fbca12e3ae4d9fb2 | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
PCI: Removed unused parts of Page Request Interface support
My philosophy is unused code is dead code. And dead code is subject to bit
rot and is a likely source of bugs. Use it or lose it.
This reverts parts of c320b976d783 ("PCI: Add implementation for PRI
capability"), removing these interfaces:
pci_pri_enabled()
pci_pri_stopped()
pci_pri_status()
[bhelgaas: split to separate patch]
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Joerg Roedel <joro@8bytes.org>
-rw-r--r-- | drivers/pci/ats.c | 82 | ||||
-rw-r--r-- | include/linux/pci-ats.h | 17 |
2 files changed, 0 insertions, 99 deletions
diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c index e52d7ffa38b9..a8099d4d0c9d 100644 --- a/drivers/pci/ats.c +++ b/drivers/pci/ats.c | |||
@@ -235,27 +235,6 @@ void pci_disable_pri(struct pci_dev *pdev) | |||
235 | EXPORT_SYMBOL_GPL(pci_disable_pri); | 235 | EXPORT_SYMBOL_GPL(pci_disable_pri); |
236 | 236 | ||
237 | /** | 237 | /** |
238 | * pci_pri_enabled - Checks if PRI capability is enabled | ||
239 | * @pdev: PCI device structure | ||
240 | * | ||
241 | * Returns true if PRI is enabled on the device, false otherwise | ||
242 | */ | ||
243 | bool pci_pri_enabled(struct pci_dev *pdev) | ||
244 | { | ||
245 | u16 control; | ||
246 | int pos; | ||
247 | |||
248 | pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI); | ||
249 | if (!pos) | ||
250 | return false; | ||
251 | |||
252 | pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &control); | ||
253 | |||
254 | return (control & PCI_PRI_CTRL_ENABLE) ? true : false; | ||
255 | } | ||
256 | EXPORT_SYMBOL_GPL(pci_pri_enabled); | ||
257 | |||
258 | /** | ||
259 | * pci_reset_pri - Resets device's PRI state | 238 | * pci_reset_pri - Resets device's PRI state |
260 | * @pdev: PCI device structure | 239 | * @pdev: PCI device structure |
261 | * | 240 | * |
@@ -282,67 +261,6 @@ int pci_reset_pri(struct pci_dev *pdev) | |||
282 | return 0; | 261 | return 0; |
283 | } | 262 | } |
284 | EXPORT_SYMBOL_GPL(pci_reset_pri); | 263 | EXPORT_SYMBOL_GPL(pci_reset_pri); |
285 | |||
286 | /** | ||
287 | * pci_pri_stopped - Checks whether the PRI capability is stopped | ||
288 | * @pdev: PCI device structure | ||
289 | * | ||
290 | * Returns true if the PRI capability on the device is disabled and the | ||
291 | * device has no outstanding PRI requests, false otherwise. The device | ||
292 | * indicates this via the STOPPED bit in the status register of the | ||
293 | * capability. | ||
294 | * The device internal state can be cleared by resetting the PRI state | ||
295 | * with pci_reset_pri(). This can force the capability into the STOPPED | ||
296 | * state. | ||
297 | */ | ||
298 | bool pci_pri_stopped(struct pci_dev *pdev) | ||
299 | { | ||
300 | u16 control, status; | ||
301 | int pos; | ||
302 | |||
303 | pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI); | ||
304 | if (!pos) | ||
305 | return true; | ||
306 | |||
307 | pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &control); | ||
308 | pci_read_config_word(pdev, pos + PCI_PRI_STATUS, &status); | ||
309 | |||
310 | if (control & PCI_PRI_CTRL_ENABLE) | ||
311 | return false; | ||
312 | |||
313 | return (status & PCI_PRI_STATUS_STOPPED) ? true : false; | ||
314 | } | ||
315 | EXPORT_SYMBOL_GPL(pci_pri_stopped); | ||
316 | |||
317 | /** | ||
318 | * pci_pri_status - Request PRI status of a device | ||
319 | * @pdev: PCI device structure | ||
320 | * | ||
321 | * Returns negative value on failure, status on success. The status can | ||
322 | * be checked against status-bits. Supported bits are currently: | ||
323 | * PCI_PRI_STATUS_RF: Response failure | ||
324 | * PCI_PRI_STATUS_UPRGI: Unexpected Page Request Group Index | ||
325 | * PCI_PRI_STATUS_STOPPED: PRI has stopped | ||
326 | */ | ||
327 | int pci_pri_status(struct pci_dev *pdev) | ||
328 | { | ||
329 | u16 status, control; | ||
330 | int pos; | ||
331 | |||
332 | pos = pci_find_ext_capability(pdev, PCI_EXT_CAP_ID_PRI); | ||
333 | if (!pos) | ||
334 | return -EINVAL; | ||
335 | |||
336 | pci_read_config_word(pdev, pos + PCI_PRI_CTRL, &control); | ||
337 | pci_read_config_word(pdev, pos + PCI_PRI_STATUS, &status); | ||
338 | |||
339 | /* Stopped bit is undefined when enable == 1, so clear it */ | ||
340 | if (control & PCI_PRI_CTRL_ENABLE) | ||
341 | status &= ~PCI_PRI_STATUS_STOPPED; | ||
342 | |||
343 | return status; | ||
344 | } | ||
345 | EXPORT_SYMBOL_GPL(pci_pri_status); | ||
346 | #endif /* CONFIG_PCI_PRI */ | 264 | #endif /* CONFIG_PCI_PRI */ |
347 | 265 | ||
348 | #ifdef CONFIG_PCI_PASID | 266 | #ifdef CONFIG_PCI_PASID |
diff --git a/include/linux/pci-ats.h b/include/linux/pci-ats.h index 68bcefd7fca0..72031785fe1d 100644 --- a/include/linux/pci-ats.h +++ b/include/linux/pci-ats.h | |||
@@ -56,10 +56,7 @@ static inline int pci_ats_enabled(struct pci_dev *dev) | |||
56 | 56 | ||
57 | int pci_enable_pri(struct pci_dev *pdev, u32 reqs); | 57 | int pci_enable_pri(struct pci_dev *pdev, u32 reqs); |
58 | void pci_disable_pri(struct pci_dev *pdev); | 58 | void pci_disable_pri(struct pci_dev *pdev); |
59 | bool pci_pri_enabled(struct pci_dev *pdev); | ||
60 | int pci_reset_pri(struct pci_dev *pdev); | 59 | int pci_reset_pri(struct pci_dev *pdev); |
61 | bool pci_pri_stopped(struct pci_dev *pdev); | ||
62 | int pci_pri_status(struct pci_dev *pdev); | ||
63 | 60 | ||
64 | #else /* CONFIG_PCI_PRI */ | 61 | #else /* CONFIG_PCI_PRI */ |
65 | 62 | ||
@@ -72,25 +69,11 @@ static inline void pci_disable_pri(struct pci_dev *pdev) | |||
72 | { | 69 | { |
73 | } | 70 | } |
74 | 71 | ||
75 | static inline bool pci_pri_enabled(struct pci_dev *pdev) | ||
76 | { | ||
77 | return false; | ||
78 | } | ||
79 | |||
80 | static inline int pci_reset_pri(struct pci_dev *pdev) | 72 | static inline int pci_reset_pri(struct pci_dev *pdev) |
81 | { | 73 | { |
82 | return -ENODEV; | 74 | return -ENODEV; |
83 | } | 75 | } |
84 | 76 | ||
85 | static inline bool pci_pri_stopped(struct pci_dev *pdev) | ||
86 | { | ||
87 | return true; | ||
88 | } | ||
89 | |||
90 | static inline int pci_pri_status(struct pci_dev *pdev) | ||
91 | { | ||
92 | return -ENODEV; | ||
93 | } | ||
94 | #endif /* CONFIG_PCI_PRI */ | 77 | #endif /* CONFIG_PCI_PRI */ |
95 | 78 | ||
96 | #ifdef CONFIG_PCI_PASID | 79 | #ifdef CONFIG_PCI_PASID |