From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> intel_iosf_sb_{read,write} provide the same functionality. intel_dpio_{read,write} are still left in place since they use a different opcode to do the register access. Need to verify if both opcodes work. Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> --- tools/Makefile.sources | 4 --- tools/intel_nc_read.c | 71 ------------------------------------------- tools/intel_nc_write.c | 76 ----------------------------------------------- tools/intel_punit_read.c | 71 ------------------------------------------- tools/intel_punit_write.c | 76 ----------------------------------------------- 5 files changed, 298 deletions(-) delete mode 100644 tools/intel_nc_read.c delete mode 100644 tools/intel_nc_write.c delete mode 100644 tools/intel_punit_read.c delete mode 100644 tools/intel_punit_write.c diff --git a/tools/Makefile.sources b/tools/Makefile.sources index aa2df93..6a73fa0 100644 --- a/tools/Makefile.sources +++ b/tools/Makefile.sources @@ -23,10 +23,6 @@ bin_PROGRAMS = \ intel_dpio_read \ intel_dpio_write \ intel_l3_parity \ - intel_punit_read \ - intel_punit_write \ - intel_nc_write \ - intel_nc_read \ intel_vga_read \ intel_vga_write \ intel_dump_decode \ diff --git a/tools/intel_nc_read.c b/tools/intel_nc_read.c deleted file mode 100644 index 721274f..0000000 --- a/tools/intel_nc_read.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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: - * Vijay Purushothaman <vijay.a.purushothaman@xxxxxxxxx> - * - */ - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <err.h> -#include <string.h> -#include "intel_io.h" -#include "intel_chipset.h" - -static void usage(char *cmdname) -{ - printf("Warning : This program will work only on Valleyview\n"); - printf("Usage: %s [addr]\n", cmdname); - printf("\t addr : in 0xXXXX format\n"); -} - -int main(int argc, char** argv) -{ - int ret = 0; - uint32_t reg, val; - char *cmdname = strdup(argv[0]); - struct pci_device *dev = intel_get_pci_device(); - - if (argc != 2 || !(IS_VALLEYVIEW(dev->device_id) || IS_CHERRYVIEW(dev->device_id))) { - usage(cmdname); - ret = 1; - goto out; - } - - sscanf(argv[1], "0x%x", ®); - - intel_register_access_init(dev, 0); - - ret = intel_nc_read(reg, &val); - if (ret) - fprintf(stderr, "iosf read failed: %d\n", ret); - - printf("Read IOSF register: 0x%x - Value : 0x%x\n", reg, val); - - intel_register_access_fini(); - -out: - free(cmdname); - return ret; -} diff --git a/tools/intel_nc_write.c b/tools/intel_nc_write.c deleted file mode 100644 index 9015ec1..0000000 --- a/tools/intel_nc_write.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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: - * Vijay Purushothaman <vijay.a.purushothaman@xxxxxxxxx> - * - */ - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <err.h> -#include <string.h> -#include "intel_io.h" -#include "intel_chipset.h" - -static void usage(char *cmdname) -{ - printf("Warning : This program will work only on Valleyview\n"); - printf("Usage: %s addr value\n", cmdname); - printf("\t addr : in 0xXXXX format\n"); -} - -int main(int argc, char** argv) -{ - int ret = 0; - uint32_t reg, val, tmp; - char *cmdname = strdup(argv[0]); - struct pci_device *dev = intel_get_pci_device(); - - if (argc != 3 || !(IS_VALLEYVIEW(dev->device_id) || IS_CHERRYVIEW(dev->device_id))) { - usage(cmdname); - ret = 1; - goto out; - } - - sscanf(argv[1], "0x%x", ®); - sscanf(argv[2], "0x%x", &val); - - intel_register_access_init(dev, 0); - - intel_nc_read(reg, &tmp); - printf("Value before: 0x%X\n", tmp); - - ret = intel_nc_write(reg, val); - if (ret) - fprintf(stderr, "Nc write failed: %d\n", ret); - - intel_nc_read(reg, &tmp); - printf("Value after: 0x%X\n", tmp); - - intel_register_access_fini(); - -out: - free(cmdname); - return ret; -} diff --git a/tools/intel_punit_read.c b/tools/intel_punit_read.c deleted file mode 100644 index 5b90fab..0000000 --- a/tools/intel_punit_read.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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: - * Vijay Purushothaman <vijay.a.purushothaman@xxxxxxxxx> - * - */ - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <err.h> -#include <string.h> -#include "intel_io.h" -#include "intel_chipset.h" - -static void usage(char *cmdname) -{ - printf("Warning : This program will work only on Valleyview\n"); - printf("Usage: %s [addr]\n", cmdname); - printf("\t addr : in 0xXXXX format\n"); -} - -int main(int argc, char** argv) -{ - int ret = 0; - uint32_t reg, val; - char *cmdname = strdup(argv[0]); - struct pci_device *dev = intel_get_pci_device(); - - if (argc != 2 || !(IS_VALLEYVIEW(dev->device_id) || IS_CHERRYVIEW(dev->device_id))) { - usage(cmdname); - ret = 1; - goto out; - } - - sscanf(argv[1], "0x%x", ®); - - intel_register_access_init(dev, 0); - - ret = intel_punit_read(reg, &val); - if (ret) - fprintf(stderr, "iosf read failed: %d\n", ret); - - printf("Read IOSF register: 0x%x - Value : 0x%x\n", reg, val); - - intel_register_access_fini(); - -out: - free(cmdname); - return ret; -} diff --git a/tools/intel_punit_write.c b/tools/intel_punit_write.c deleted file mode 100644 index ca99161..0000000 --- a/tools/intel_punit_write.c +++ /dev/null @@ -1,76 +0,0 @@ -/* - * 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: - * Vijay Purushothaman <vijay.a.purushothaman@xxxxxxxxx> - * - */ - -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <err.h> -#include <string.h> -#include "intel_io.h" -#include "intel_chipset.h" - -static void usage(char *cmdname) -{ - printf("Warning : This program will work only on Valleyview\n"); - printf("Usage: %s addr value\n", cmdname); - printf("\t addr : in 0xXXXX format\n"); -} - -int main(int argc, char** argv) -{ - int ret = 0; - uint32_t reg, val, tmp; - char *cmdname = strdup(argv[0]); - struct pci_device *dev = intel_get_pci_device(); - - if (argc != 3 || !(IS_VALLEYVIEW(dev->device_id) || IS_CHERRYVIEW(dev->device_id))) { - usage(cmdname); - ret = 1; - goto out; - } - - sscanf(argv[1], "0x%x", ®); - sscanf(argv[2], "0x%x", &val); - - intel_register_access_init(dev, 0); - - intel_punit_read(reg, &tmp); - printf("Value before: 0x%X\n", tmp); - - ret = intel_punit_write(reg, val); - if (ret) - fprintf(stderr, "Punit write failed: %d\n", ret); - - intel_punit_read(reg, &tmp); - printf("Value after: 0x%X\n", tmp); - - intel_register_access_fini(); - -out: - free(cmdname); - return ret; -} -- 1.8.5.5 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx