From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Thu, 18 Nov 2021 15:37:17 +0000 (+0100)
Subject: mvebu: kernel: enable CONFIG_BLK_DEV_NVME
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6c44b157e537fc3a3c2aa4732218a5341fd43387;p=openwrt%2Fstaging%2Fblocktrron.git

mvebu: kernel: enable CONFIG_BLK_DEV_NVME

CONFIG_BLK_DEV_NVME [1]:
- This is a kernel driver for SSD connected to PCI or PCIe bus [1].
By default, it is enabled for targets "ipq807x", "rockchip/armv8"
and "x86/64".

With miniPCIe adapter, there is a possibility to connect NVMe disk
to Turris Omnia (cortex-a9), Turris MOX (cortex-a53).

It allows to boot system from NVMe disk, because of that it can not
be kmod package as you can not access the disk to be able to boot from
it.

CONFIG_NVME_CORE [2]:
- This is selected by CONFIG_BLK_DEV_NVME
It does not need to be explicitly enabled, but it is done for "ipq807",
"x64_64" and rockchip/armv8", which has also enabled the previous config
option as well.

Kernel increase: ~28k KiB on mamba kernel

Reference:
[1] https://cateee.net/lkddb/web-lkddb/BLK_DEV_NVME.html
[2] https://cateee.net/lkddb/web-lkddb/NVME_CORE.html

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 9d530ac4bf6b9804a06dbf5df4631ee86f1304c1)
[rebased for config-5.4]
---

diff --git a/target/linux/mvebu/config-5.4 b/target/linux/mvebu/config-5.4
index ea73bafe23..742ae29e0b 100644
--- a/target/linux/mvebu/config-5.4
+++ b/target/linux/mvebu/config-5.4
@@ -75,6 +75,7 @@ CONFIG_ATAGS=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_NVME=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_SCSI_REQUEST=y
@@ -361,6 +362,10 @@ CONFIG_NLS=y
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_NR_CPUS=4
 CONFIG_NVMEM=y
+CONFIG_NVME_CORE=y
+# CONFIG_NVME_HWMON is not set
+# CONFIG_NVME_MULTIPATH is not set
+# CONFIG_NVME_TCP is not set
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y