diff options
Diffstat (limited to 'util/inteltool')
| -rw-r--r-- | util/inteltool/ahci.c | 43 | ||||
| -rw-r--r-- | util/inteltool/inteltool.c | 16 | ||||
| -rw-r--r-- | util/inteltool/inteltool.h | 1 |
3 files changed, 43 insertions, 17 deletions
diff --git a/util/inteltool/ahci.c b/util/inteltool/ahci.c index 92b55def1c..3f1b33f4b9 100644 --- a/util/inteltool/ahci.c +++ b/util/inteltool/ahci.c @@ -2,6 +2,7 @@ * ahci.c: dump AHCI registers * * Copyright (C) 2016 Iru Cai + * Copyright (C) 2017 secunet Security Networks AG * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -19,9 +20,6 @@ #include <inttypes.h> #include "inteltool.h" -#define NUM_SATA_PORTS 6 -#define MMIO_SIZE 0x400 - static const char *ghc_regs[] = { "CAP", "GHC", "IS", "PI", "VS", "CCC_CTL", "CCC_PORTS", "EM_LOC", @@ -41,17 +39,24 @@ static const char *port_ctl_regs[] = { int print_ahci(struct pci_dev *ahci) { - uint64_t mmio_phys; + size_t mmio_size; uint8_t *mmio; uint32_t i, j; + if (!ahci) { puts("No SATA device found"); return 0; } printf("\n============= AHCI Registers ==============\n\n"); - mmio_phys = ahci->base_addr[5] & ~0x7ULL; + + if (ahci->device_id == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_SATA) + mmio_size = 0x800; + else + mmio_size = 0x400; + + const pciaddr_t mmio_phys = ahci->base_addr[5] & ~0x7ULL; printf("ABAR = 0x%08llx (MEM)\n\n", (unsigned long long)mmio_phys); - mmio = map_physical(mmio_phys, MMIO_SIZE); + mmio = map_physical(mmio_phys, mmio_size); if (mmio == NULL) { perror("Error mapping MMIO"); exit(1); @@ -63,15 +68,27 @@ int print_ahci(struct pci_dev *ahci) (i / 4 < NUM_GHC) ? ghc_regs[i / 4]:"Reserved"); } - for (i = 0; i < NUM_SATA_PORTS; i++) { - printf("\nPort %d Control Registers:\n", i); - uint8_t *mmio_port = mmio + 0x100 + i * 0x80; - for (j = 0; j < 0x80; j += 4) { - printf("0x%03x: 0x%08x (%s)\n", 0x100+i*0x80+j, *(uint32_t *)(mmio_port + j), - (j / 4 < NUM_PORTCTL) ? port_ctl_regs[j / 4]:"Reserved"); + const size_t max_ports = (mmio_size - 0x100) / 0x80; + for (i = 0; i < max_ports; i++) { + if (*(uint32_t *)(mmio + 0x0c) & 1 << i) { + printf("\nPort %d Control Registers:\n", i); + uint8_t *mmio_port = mmio + 0x100 + i * 0x80; + for (j = 0; j < 0x80; j += 4) { + printf("0x%03x: 0x%08x (%s)\n", 0x100+i*0x80+j, + *(uint32_t *)(mmio_port + j), + (j / 4 < NUM_PORTCTL) ? + port_ctl_regs[j / 4] : + "Reserved"); + } } } - unmap_physical((void *)mmio, MMIO_SIZE); + if (ahci->device_id == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_SATA) { + puts("\nOther registers:"); + for (i = 0x500; i < mmio_size; i += 4) + printf("0x%03x: 0x%08x\n", i, *(uint32_t *)(mmio + i)); + } + + unmap_physical((void *)mmio, mmio_size); return 0; } diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c index 3f55685993..ccb8facfa0 100644 --- a/util/inteltool/inteltool.c +++ b/util/inteltool/inteltool.c @@ -4,6 +4,7 @@ * Copyright (C) 2008-2010 by coresystems GmbH * written by Stefan Reinauer <stepan@coresystems.de> * Copyright (C) 2009 Carl-Daniel Hailfinger + * Copyright (C) 2017 secunet Security Networks AG * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -457,17 +458,24 @@ int main(int argc, char *argv[]) gfx = 0; } - if (sb->device_id == PCI_DEVICE_ID_INTEL_BAYTRAIL_LPC) + if (sb->device_id == PCI_DEVICE_ID_INTEL_BAYTRAIL_LPC) { ahci = pci_get_dev(pacc, 0, 0, 0x13, 0); - else + } else { ahci = pci_get_dev(pacc, 0, 0, 0x1f, 2); + if (ahci) { + pci_fill_info(ahci, PCI_FILL_CLASS); + if (ahci->device_class != PCI_CLASS_STORAGE_SATA) + ahci = pci_get_dev(pacc, 0, 0, 0x17, 0); + } + } if (ahci) { pci_fill_info(ahci, PCI_FILL_IDENT | PCI_FILL_BASES | PCI_FILL_CLASS); - if (ahci->vendor_id != PCI_VENDOR_ID_INTEL) - ahci = 0; + if (ahci->vendor_id != PCI_VENDOR_ID_INTEL || + ahci->device_class != PCI_CLASS_STORAGE_SATA) + ahci = NULL; } id = cpuid(1); diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 2ff08717fd..8fb6155898 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -136,6 +136,7 @@ static inline uint32_t inl(unsigned port) #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_BASE 0x9c45 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP_PREM 0x9cc3 #define PCI_DEVICE_ID_INTEL_WILDCATPOINT_LP 0x9cc5 +#define PCI_DEVICE_ID_INTEL_SUNRISEPOINT_SATA 0xa102 #define PCI_DEVICE_ID_INTEL_CM236 0xa150 #define PCI_DEVICE_ID_INTEL_82810 0x7120 #define PCI_DEVICE_ID_INTEL_82810_DC 0x7122 |