kgpe-d16 linux configs: generalize nvme support

tlaurion · tlaurion · commit 211aeabf3523 · 2024-07-29T11:36:58.000-04:00
Repro applying patch of past commit on other linux configs of kgpe-d16:
git diff osresearch/master &gt; patch
find config/linux-kgpe* | while read config; do sudo patch $config patch; done
git status | grep modified | awk -F ":" {'print $2'}| xargs git add
git commit --signoff -m "kgpe-d16 linux configs: generalize nvme support"

Signed-off-by: Thierry Laurion &lt;insurgo@riseup.net&gt;
diff --git a/config/linux-kgpe-d16_server-whiptail.config b/config/linux-kgpe-d16_server-whiptail.config
@@ -960,8 +960,12 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 #
 # NVME Support
 #
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # end of NVME Support
 
 #
@@ -2280,7 +2284,6 @@ CONFIG_RTC_DRV_CMOS=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set
diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config
@@ -960,8 +960,12 @@ CONFIG_BLK_DEV_RAM_SIZE=65536
 #
 # NVME Support
 #
-# CONFIG_BLK_DEV_NVME is not set
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_HWMON=y
 # CONFIG_NVME_FC is not set
+# CONFIG_NVME_TCP is not set
 # end of NVME Support
 
 #
@@ -2280,7 +2284,6 @@ CONFIG_RTC_DRV_CMOS=y
 #
 CONFIG_SYNC_FILE=y
 # CONFIG_SW_SYNC is not set
-# CONFIG_UDMABUF is not set
 # CONFIG_DMABUF_MOVE_NOTIFY is not set
 # CONFIG_DMABUF_SELFTESTS is not set
 # CONFIG_DMABUF_HEAPS is not set

Original file line number	Diff line number	Diff line change
`@@ -960,8 +960,12 @@ CONFIG_BLK_DEV_RAM_SIZE=65536`
`960`	`960`	`#`
`961`	`961`	`# NVME Support`
`962`	`962`	`#`
`963`		`-# CONFIG_BLK_DEV_NVME is not set`
	`963`	`+CONFIG_NVME_CORE=y`
	`964`	`+CONFIG_BLK_DEV_NVME=y`
	`965`	`+CONFIG_NVME_MULTIPATH=y`
	`966`	`+CONFIG_NVME_HWMON=y`
`964`	`967`	`# CONFIG_NVME_FC is not set`
	`968`	`+# CONFIG_NVME_TCP is not set`
`965`	`969`	`# end of NVME Support`
`966`	`970`
`967`	`971`	`#`
`@@ -2280,7 +2284,6 @@ CONFIG_RTC_DRV_CMOS=y`
`2280`	`2284`	`#`
`2281`	`2285`	`CONFIG_SYNC_FILE=y`
`2282`	`2286`	`# CONFIG_SW_SYNC is not set`
`2283`		`-# CONFIG_UDMABUF is not set`
`2284`	`2287`	`# CONFIG_DMABUF_MOVE_NOTIFY is not set`
`2285`	`2288`	`# CONFIG_DMABUF_SELFTESTS is not set`
`2286`	`2289`	`# CONFIG_DMABUF_HEAPS is not set`