From 29ebc68313a8dee9b98fac1b337f9bf60b3bfb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Thu, 5 Feb 2015 16:18:17 +0200 Subject: [PATCH] tools: Remove intel_dpio_{read,write} tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit intel_dpio_{read,write} as redundant as intel_iosf_sb_{read,write} handle the same task. The difference between the tools was the opcode used to read/write the registers, but with DPIO both opcodes work just fine, so there's no need for both sets of tools. Signed-off-by: Ville Syrjälä --- tools/Makefile.sources | 2 -- tools/intel_dpio_read.c | 69 --------------------------------------- tools/intel_dpio_write.c | 70 ---------------------------------------- 3 files changed, 141 deletions(-) delete mode 100644 tools/intel_dpio_read.c delete mode 100644 tools/intel_dpio_write.c diff --git a/tools/Makefile.sources b/tools/Makefile.sources index b16af8a6..44b9e9cd 100644 --- a/tools/Makefile.sources +++ b/tools/Makefile.sources @@ -9,8 +9,6 @@ bin_PROGRAMS = \ intel_bios_dumper \ intel_bios_reader \ intel_display_poller \ - intel_dpio_read \ - intel_dpio_write \ intel_dump_decode \ intel_error_decode \ intel_forcewaked \ diff --git a/tools/intel_dpio_read.c b/tools/intel_dpio_read.c deleted file mode 100644 index 20561d2d..00000000 --- a/tools/intel_dpio_read.c +++ /dev/null @@ -1,69 +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 - * - */ - -#include -#include -#include -#include -#include -#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); - - val = intel_dpio_reg_read(reg, 0); - - printf("0x%04x : 0x%08x\n", reg, val); - - intel_register_access_fini(); - -out: - free(cmdname); - return ret; -} diff --git a/tools/intel_dpio_write.c b/tools/intel_dpio_write.c deleted file mode 100644 index 45cc95ff..00000000 --- a/tools/intel_dpio_write.c +++ /dev/null @@ -1,70 +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 - * - */ - -#include -#include -#include -#include -#include -#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] [val]\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 != 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); - - printf("Value before: 0x%08x\n", intel_dpio_reg_read(reg, 0)); - intel_dpio_reg_write(reg, val, 0); - printf("Value after: 0x%08x\n", intel_dpio_reg_read(reg, 0)); - - intel_register_access_fini(); - -out: - free(cmdname); - return ret; -}