Commit c8619195 authored by Bora Guvendik's avatar Bora Guvendik Committed by chrome-bot
Browse files

cnlrvp: Add NVMe controller



TEST=Boot to OS using Intel NVMe SSD Pro 6

Change-Id: I01da152eae5ef640613c2f94d176d33f24a09530
Signed-off-by: default avatarBora Guvendik <bora.guvendik@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/706106

Reviewed-by: default avatarAaron Durbin <adurbin@chromium.org>
parent 484e261f
...@@ -36,4 +36,5 @@ CONFIG_DRIVER_SOUND_SSM4567=y ...@@ -36,4 +36,5 @@ CONFIG_DRIVER_SOUND_SSM4567=y
CONFIG_DRIVER_STORAGE_MMC=y CONFIG_DRIVER_STORAGE_MMC=y
CONFIG_DRIVER_STORAGE_SDHCI_PCI=y CONFIG_DRIVER_STORAGE_SDHCI_PCI=y
CONFIG_DRIVER_AHCI=y CONFIG_DRIVER_AHCI=y
CONFIG_DRIVER_STORAGE_NVME=y
CONFIG_MOCK_TPM=y CONFIG_MOCK_TPM=y
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "drivers/power/pch.h" #include "drivers/power/pch.h"
#include "drivers/storage/blockdev.h" #include "drivers/storage/blockdev.h"
#include "drivers/storage/sdhci.h" #include "drivers/storage/sdhci.h"
#include "drivers/storage/nvme.h"
#include "drivers/tpm/lpc.h" #include "drivers/tpm/lpc.h"
#include "drivers/tpm/tpm.h" #include "drivers/tpm/tpm.h"
#include <gbb_header.h> #include <gbb_header.h>
...@@ -56,6 +57,8 @@ ...@@ -56,6 +57,8 @@
static int board_setup(void) static int board_setup(void)
{ {
uint8_t secondary_bus;
sysinfo_install_flags(NULL); sysinfo_install_flags(NULL);
/* 16MB SPI Flash */ /* 16MB SPI Flash */
...@@ -80,6 +83,12 @@ static int board_setup(void) ...@@ -80,6 +83,12 @@ static int board_setup(void)
list_insert_after(&emmc->mmc_ctrlr.ctrlr.list_node, list_insert_after(&emmc->mmc_ctrlr.ctrlr.list_node,
&fixed_block_dev_controllers); &fixed_block_dev_controllers);
/* NVME SSD */
secondary_bus = pci_read_config8(PCI_DEV(0, 0x1D, 0),
REG_SECONDARY_BUS);
NvmeCtrlr *nvme = new_nvme_ctrlr(PCI_DEV(secondary_bus, 0, 0));
list_insert_after(&nvme->ctrlr.list_node, &fixed_block_dev_controllers);
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment