diff options
| author | Ben Widawsky <ben@bwidawsk.net> | 2013-04-26 14:26:48 -0700 |
|---|---|---|
| committer | Ben Widawsky <ben@bwidawsk.net> | 2013-04-26 14:34:48 -0700 |
| commit | 8be812b86c1a6d03822bf788c05f38abb531cc0d (patch) | |
| tree | ccd45d455cde910c2382bc17b4f35b417ddfab14 | |
| parent | 2facc1368d5af8417e240f68153cecdfb5dc731a (diff) | |
intel_mmio: Add intel_register_access_needs_fakewake
I screwed this up in my recent patch:
commit c7b6ec50007e2e524a208572c34faf1380eeab1b
Author: Ben Widawsky <ben@bwidawsk.net>
Date: Wed Apr 24 19:05:18 2013 -0700
clean warnings: Silence unused (or private) functions
I've clarified the functions now, and added the proper call from the
python script.
Time to get a regression tester for our tools?
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
| -rw-r--r-- | lib/intel_mmio.c | 5 | ||||
| -rw-r--r-- | tools/quick_dump/chipset.i | 4 | ||||
| -rwxr-xr-x | tools/quick_dump/reg_access.py | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/lib/intel_mmio.c b/lib/intel_mmio.c index f9e13f61..7c26a29e 100644 --- a/lib/intel_mmio.c +++ b/lib/intel_mmio.c @@ -227,6 +227,11 @@ intel_register_access_needs_wake(void) return mmio_data.key != FAKEKEY; } +int intel_register_access_needs_fakewake(void) +{ + return mmio_data.key == FAKEKEY; +} + void intel_register_access_fini(void) { diff --git a/tools/quick_dump/chipset.i b/tools/quick_dump/chipset.i index 0a15d388..69dc8df5 100644 --- a/tools/quick_dump/chipset.i +++ b/tools/quick_dump/chipset.i @@ -12,7 +12,7 @@ extern int intel_register_access_init(struct pci_device *pci_dev, int safe); extern uint32_t intel_register_read(uint32_t reg); extern uint32_t intel_register_write(uint32_t reg, uint32_t val); extern void intel_register_access_fini(); -extern int intel_register_access_needs_wake(); +extern int intel_register_access_needs_fakewake(); extern unsigned short pcidev_to_devid(struct pci_device *pci_dev); extern uint32_t intel_dpio_reg_read(uint32_t reg); %} @@ -25,6 +25,6 @@ extern int intel_register_access_init(struct pci_device *pci_dev, int safe); extern uint32_t intel_register_read(uint32_t reg); extern uint32_t intel_register_write(uint32_t reg, uint32_t val); extern void intel_register_access_fini(); -extern int intel_register_access_needs_wake(); +extern int intel_register_access_needs_fakewake(); extern unsigned short pcidev_to_devid(struct pci_device *pci_dev); extern uint32_t intel_dpio_reg_read(uint32_t reg); diff --git a/tools/quick_dump/reg_access.py b/tools/quick_dump/reg_access.py index e2a0a957..113a3cf7 100755 --- a/tools/quick_dump/reg_access.py +++ b/tools/quick_dump/reg_access.py @@ -40,7 +40,7 @@ def init(): print("Register access init failed"); return False - if chipset.intel_register_access_needs_wake(): + if chipset.intel_register_access_needs_fakewake(): print("Forcing forcewake. Don't expect your system to work after this.") get_wake() |