quick_dump: say something when reg init fails
PATCH 1/5 quick_dump: say something when reg init fails
--- tools/quick_dump/quick_dump.py | 1 + 1 file changed, 1 insertion(+)
tools/quick_dump/quick_dump.py +1 -0
@@ -26,6 +26,7 @@ parser.add_argument('profile', nargs='?', type=argparse.FileType('r'), default=N args = parser.parse_args() if reg.init() == False: + print("Register initialization failed") sys.exit() # Put us where the script is
Signature · 1 line
1.8.1.4
PATCH 2/5 intel_mmio: Allow mmio without debugfs
With the introduction of the forcewake dance:
commit cac8f8b52621f246a7cff412f340a7db28cb1b99
Author: Ben Widawsky <[email protected]> Date: Thu Jul 28 13:40:19 2011 -0700
forcewake: Add mmio code to do proper forcewake stuff for gen6
We lost the ability to do register access when either debugfs isn't mounted, or when the driver isn't loaded. The latter can be beneficial in debugging situations.
This patch will allow the driver to still do mmio (leaving forcewake management up to the callers) provided that the i915 driver appears to not be loaded (according to sysfs)
Requested by Jesse.
--- lib/intel_mmio.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
lib/intel_mmio.c +26 -4
@@ -43,6 +43,8 @@#include "intel_gpu_tools.h" +#define FAKEKEY 0x2468ace0 +void *mmio; static struct _mmio_data {
@@ -153,6 +155,22 @@ release_forcewake_lock(int fd)close (fd); } +/* Dumb check to see if i915 was loaded */ +static bool +i915_loaded (void ) +{ +struct stat sb; +int ret; + + ret =stat ("/sys/module/i915/" , &sb); +if (ret) { +return false; + } + +assert (S_ISDIR (sb.st_mode)); +return true; +} +/* * Initialize register access library. *
@@ -188,10 +206,14 @@ intel_register_access_init(struct pci_device *pci_dev, int safe) ret =find_debugfs_path ("/debug/dri" );if (ret) {fprintf (stderr,"Couldn't find path to dri/debugfs entry\n" ); -return ret; +if (i915_loaded ()) { +fprintf (stderr,"i915 loaded; not proceeding.\n" ); +return ret; + } } - } - mmio_data.key =get_forcewake_lock (); + mmio_data.key =FAKEKEY ; + }else + mmio_data.key =get_forcewake_lock (); done: mmio_data.inited++;
@@ -201,7 +223,7 @@ done:void intel_register_access_fini (void ) { -if (mmio_data.key) +if (mmio_data.key && mmio_data.key !=FAKEKEY )release_forcewake_lock (mmio_data.key); mmio_data.inited--; }
Signature · 1 line
1.8.1.4
Re: [PATCH 2/5] intel_mmio: Allow mmio without debugfs
Quoted 79 lines · On Thu, 21 Feb 2013 22:05:33 -0800 Ben Widawsky <[email protected]> wrote:
With the introduction of the forcewake dance:
commit
cac8f8b52621f246a7cff412f340a7db28cb1b99Author: Ben Widawsky <[email protected]> Date: Thu Jul 28 13:40:19 2011 -0700forcewake: Add mmio code to do proper forcewake stuff for gen6
We lost the ability to do register access when either debugfs isn't mounted, or when the driver isn't loaded. The latter can be beneficial in debugging situations.
This patch will allow the driver to still do mmio (leaving forcewake management up to the callers) provided that the i915 driver appears to not be loaded (according to sysfs)
Requested by Jesse.
Cc Jesse Barnes <[email protected]>Signed-off-by Ben Widawsky <[email protected]>--- lib/intel_mmio.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)lib/intel_mmio.c +25
-3@@ -43,6 +43,8 @@#include "intel_gpu_tools.h" +#define FAKEKEY 0x2468ace0 +void *mmio; static struct _mmio_data {@@ -153,6 +155,22 @@ release_forcewake_lock(int fd)close (fd); } +/* Dumb check to see if i915 was loaded */ +static bool +i915_loaded (void ) +{ +struct stat sb; +int ret; + + ret =stat ("/sys/module/i915/" , &sb); +if (ret) { +return false; + } + +assert (S_ISDIR (sb.st_mode)); +return true; +} +/* * Initialize register access library. * @@ -188,10 +206,14 @@ intel_register_access_init(struct pci_device *pci_dev, int safe) ret =find_debugfs_path ("/debug/dri" );if (ret) {fprintf (stderr,"Couldn't find path to dri/debugfs entry\n" ); -return ret; +if (i915_loaded ()) { +fprintf (stderr,"i915 loaded; not proceeding.\n" ); +return ret; + } } - } - mmio_data.key =get_forcewake_lock (); + mmio_data.key =FAKEKEY ; + }else + mmio_data.key =get_forcewake_lock (); done: mmio_data.inited++;
lib/intel_mmio.c done: · line 229
Quoted 8 lines
lib/intel_mmio.c +1
-1@@ -201,7 +223,7 @@ done:void intel_register_access_fini (void ) { -if (mmio_data.key) +if (mmio_data.key && mmio_data.key !=FAKEKEY )release_forcewake_lock (mmio_data.key); mmio_data.inited--; }
Cool thanks. So it looks like it'll bail out if you've loaded i915 but debugfs isn't mounted? I guess that's fine; in that case we really do want to do the forcewake thing...
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
PATCH 3/5 intel_mmio: a query for forcewake requirement
In reply to Ben Widawsky--- lib/intel_mmio.c | 6 ++++++ 1 file changed, 6 insertions(+)
lib/intel_mmio.c +6 -0
@@ -228,6 +228,12 @@ intel_register_access_fini(void) mmio_data.inited--; } +int +intel_register_access_needs_wake (void ) +{ +return mmio_data.key ==FAKEKEY ; +} +uint32_t intel_register_read (uint32_t reg) {
Signature · 1 line
1.8.1.4
PATCH 4/5 quick_dump: add register write
In reply to Ben WidawskySince there is no command line support, just do a pure integer version
--- tools/quick_dump/chipset.i | 2 ++ tools/quick_dump/reg_access.py | 3 +++ 2 files changed, 5 insertions(+)
tools/quick_dump/chipset.i +2 -0
@@ -10,6 +10,7 @@ extern int is_valleyview(unsigned short pciid); extern struct pci_device *intel_get_pci_device(); 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 unsigned short pcidev_to_devid(struct pci_device *pci_dev); %}
@@ -20,5 +21,6 @@ extern int is_valleyview(unsigned short pciid); extern struct pci_device *intel_get_pci_device(); 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 unsigned short pcidev_to_devid(struct pci_device *pci_dev);
tools/quick_dump/reg_access.py +3 -0
@@ -6,6 +6,9 @@ def read(reg): val = chipset.intel_register_read(reg) return val +def write(reg, val): + chipset.intel_register_write(reg, val) + def init(): pci_dev = chipset.intel_get_pci_device() ret = chipset.intel_register_access_init(pci_dev, 0)
Signature · 1 line
1.8.1.4
PATCH 5/5 reg_access: Forcewake as necessary
In reply to Ben WidawskyDon't try to be smart. Just poke all forcewake bits if it seems we need it.
--- tools/quick_dump/chipset.i | 2 ++ tools/quick_dump/reg_access.py | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+)
tools/quick_dump/chipset.i +2 -0
@@ -12,6 +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 unsigned short pcidev_to_devid(struct pci_device *pci_dev); %}
@@ -23,4 +24,5 @@ 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 unsigned short pcidev_to_devid(struct pci_device *pci_dev);
tools/quick_dump/reg_access.py +23 -0
@@ -9,12 +9,35 @@ def read(reg): def write(reg, val): chipset.intel_register_write(reg, val) +def gen6_forcewake_get(): + write(0xa18c, 0x1) + read("0xa180") + +def mt_forcewake_get(): + write(0xa188, 0x10001) + read("0xa180") + +def vlv_forcewake_get(): + write(0x1300b0, 0x10001) + read("0x1300b4") + +# don't be clever, just try all possibilities +def get_wake(): + gen6_forcewake_get() + mt_forcewake_get() + vlv_forcewake_get() + def init(): pci_dev = chipset.intel_get_pci_device() ret = chipset.intel_register_access_init(pci_dev, 0) if ret != 0: print("Register access init failed"); return False + + if chipset.intel_register_access_needs_wake(): + print("Forcing forcewake. Don't expect your system to work after this.") + get_wake() + return True if __name__ == "__main__":
Signature · 1 line
1.8.1.4