GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inteltool/ahci: Add Skylake support 

The SATA device moved from 0:1f.2 to 0:17.0, 0:1f.2 became PMC. We
detect that by checking the PCI device class.

The ABAR MMIO space has grown to 2KiB and up to 8 ports are supported
now. For backwards compatibility, only dump port registers of ports
that are enabled in the Ports Implemented (PI) register.

Change-Id: I8e0f07d7359d92f689882b5afefa5ffb3766ee8b
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/19584
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Nico Huber 2017-03-30 17:47:24 +02:00 committed by Stefan Reinauer
parent 0660c6c1ff
commit da94e171b5
3 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
util/inteltool/ahci.c
View File

@ -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;
}

16
util/inteltool/inteltool.c
View File

@ -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);

1
util/inteltool/inteltool.h
View File

@ -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