Message ID | 1342051680-32560-1-git-send-email-ben@bwidawsk.net (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Jul 11, 2012 at 05:08:00PM -0700, Ben Widawsky wrote: > This will need to get modified when the ioctl expands, and so is only > here for reference/to make Daniel happy. > > Signed-off-by: Ben Widawsky <ben@bwidawsk.net> If you go with the (offset, size) table to check things, I think you should add a test to read a valid reg offset, but with the wrong size. Otherwise this looks good. -Daniel > --- > tests/drm_reg_read.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 86 insertions(+) > create mode 100644 tests/drm_reg_read.c > > diff --git a/tests/drm_reg_read.c b/tests/drm_reg_read.c > new file mode 100644 > index 0000000..d28039b > --- /dev/null > +++ b/tests/drm_reg_read.c > @@ -0,0 +1,86 @@ > +/* > + * Copyright © 2012 Intel Corporation > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice (including the next > + * paragraph) shall be included in all copies or substantial portions of the > + * Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS > + * IN THE SOFTWARE. > + * > + * Authors: > + * Ben Widawsky <ben@bwidawsk.net> > + * > + */ > + > +#include <stdio.h> > +#include <string.h> > +#include "i915_drm.h" > +#include "drmtest.h" > + > +struct local_drm_i915_reg_read { > + __u64 offset; > + __u32 size; > + __u64 val; /* Return value */ > + __u32 pad; > +}; > + > + > +#define REG_READ_IOCTL DRM_IOWR(DRM_COMMAND_BASE + 0x30, struct local_drm_i915_reg_read) > + > +static void handle_bad(int ret, int lerrno, int expected, const char *desc) > +{ > + if (ret != 0 && lerrno != expected) { > + fprintf(stderr, "%s - errno was %d, but should have been %d\n", > + desc, lerrno, expected); > + exit(EXIT_FAILURE); > + } else if (ret == 0) { > + fprintf(stderr, "%s - Command succeeded, but should have failed\n", > + desc); > + exit(EXIT_FAILURE); > + } > +} > + > +int main(int argc, char *argv[]) > +{ > + struct local_drm_i915_reg_read read; > + int ret, fd; > + > + read.offset = 0x2358; > + read.size = 4; > + > + fd = drm_open_any(); > + > + ret = drmIoctl(fd, REG_READ_IOCTL, &read); > + if (ret) { > + perror("positive test case failed\n"); > + exit(EXIT_FAILURE); > + } > + > + /* bad reg */ > + read.offset = 0x12345678; > + ret = drmIoctl(fd, REG_READ_IOCTL, &read); > + handle_bad(ret, errno, ENXIO, "bad register"); > + > + /* bad size */ > + read.offset = 0x2358; > + read.size = 5; > + ret = drmIoctl(fd, REG_READ_IOCTL, &read); > + handle_bad(ret, errno, EINVAL, "bad size"); > + > + close(fd); > + > + exit(EXIT_SUCCESS); > +} > -- > 1.7.11.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/tests/drm_reg_read.c b/tests/drm_reg_read.c new file mode 100644 index 0000000..d28039b --- /dev/null +++ b/tests/drm_reg_read.c @@ -0,0 +1,86 @@ +/* + * Copyright © 2012 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Ben Widawsky <ben@bwidawsk.net> + * + */ + +#include <stdio.h> +#include <string.h> +#include "i915_drm.h" +#include "drmtest.h" + +struct local_drm_i915_reg_read { + __u64 offset; + __u32 size; + __u64 val; /* Return value */ + __u32 pad; +}; + + +#define REG_READ_IOCTL DRM_IOWR(DRM_COMMAND_BASE + 0x30, struct local_drm_i915_reg_read) + +static void handle_bad(int ret, int lerrno, int expected, const char *desc) +{ + if (ret != 0 && lerrno != expected) { + fprintf(stderr, "%s - errno was %d, but should have been %d\n", + desc, lerrno, expected); + exit(EXIT_FAILURE); + } else if (ret == 0) { + fprintf(stderr, "%s - Command succeeded, but should have failed\n", + desc); + exit(EXIT_FAILURE); + } +} + +int main(int argc, char *argv[]) +{ + struct local_drm_i915_reg_read read; + int ret, fd; + + read.offset = 0x2358; + read.size = 4; + + fd = drm_open_any(); + + ret = drmIoctl(fd, REG_READ_IOCTL, &read); + if (ret) { + perror("positive test case failed\n"); + exit(EXIT_FAILURE); + } + + /* bad reg */ + read.offset = 0x12345678; + ret = drmIoctl(fd, REG_READ_IOCTL, &read); + handle_bad(ret, errno, ENXIO, "bad register"); + + /* bad size */ + read.offset = 0x2358; + read.size = 5; + ret = drmIoctl(fd, REG_READ_IOCTL, &read); + handle_bad(ret, errno, EINVAL, "bad size"); + + close(fd); + + exit(EXIT_SUCCESS); +}
This will need to get modified when the ioctl expands, and so is only here for reference/to make Daniel happy. Signed-off-by: Ben Widawsky <ben@bwidawsk.net> --- tests/drm_reg_read.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 tests/drm_reg_read.c