From 628870146df4cc327852b1c5cf351d5bde26b61f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=A0imon=20Bo=C5=99ek?= Date: Tue, 19 Apr 2022 13:18:42 +0200 Subject: [PATCH] mpc85xx: p2020: kernel: enable CONFIG_BLK_DEV_NVME MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Enables use of NVMe storage devices with appropriate adapter in miniPCIe slots (including for boot) in Turris 1.x routers and possibly NXP P2020RDB boards (these are the only currently supported p2020 devices according to docs[^1]). Proper detection, mountability and readability was proved to be working on Turris 1.1, OpenWrt 21.02 with similar configuration. Increases gzip compressed kernel size by approximately 37 KiB (from 3 703 KiB to 3 740 KiB). Should boot from those devices be possible the driver needs to be built in. Inclusion as a module would prevent this functionality. CONFIG_BLK_DEV_NVME=y Includes NVMe driver in the kernel.[^2] CONFIG_NVME_CORE=y Selected by CONFIG_BLK_DEV_NVME.[^3] Not necessarily needed to be enabled explicitly, but included to match the form of similar functionality implementations for mvebu, x86_64 and rockchip_armv8 targets. CONFIG_NVME_MULTIPATH disabled explicitly to prevent using more space than necessary. [^1]: https://openwrt.org/docs/techref/targets/mpc85xx [^2]: https://cateee.net/lkddb/web-lkddb/BLK_DEV_NVME.html [^3]: https://cateee.net/lkddb/web-lkddb/NVME_CORE.html Signed-off-by: Šimon Bořek --- target/linux/mpc85xx/p2020/config-default | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default index d3fcce5e93..e293008d8b 100644 --- a/target/linux/mpc85xx/p2020/config-default +++ b/target/linux/mpc85xx/p2020/config-default @@ -1,3 +1,4 @@ +CONFIG_BLK_DEV_NVME=y CONFIG_CPU_RMAP=y CONFIG_DEFAULT_UIMAGE=y CONFIG_FSL_ULI1575=y @@ -19,6 +20,8 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NR_CPUS=2 +CONFIG_NVME_CORE=y +# CONFIG_NVME_MULTIPATH is not set CONFIG_PADATA=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_ARCH_FALLBACKS=y -- 2.30.2