From 460d6ab7646233ce4f1ddf5d371ee8c784bd2a73 Mon Sep 17 00:00:00 2001
From: PartialVolume <22084881+PartialVolume@users.noreply.github.com>
Date: Fri, 19 Dec 2025 12:02:21 +0000
Subject: [PATCH] Added AMD and Intel IOMMU, Virtio drivers. Pointed nwipe to
 current master for testing as of 19/Dec/2025

---
 board/shredos/fsoverlay/etc/shredos/version.txt |  2 +-
 board/shredos/kernel-6.6.22-defconfig.config    | 17 +++++++++--------
 configs/shredos_defconfig                       |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/board/shredos/fsoverlay/etc/shredos/version.txt b/board/shredos/fsoverlay/etc/shredos/version.txt
index 6e736ae005..d5f846665e 100644
--- a/board/shredos/fsoverlay/etc/shredos/version.txt
+++ b/board/shredos/fsoverlay/etc/shredos/version.txt
@@ -1 +1 @@
-2024.11_27.1_x86-64_0.38-dev
+2024.11_27.1_x86-64_0.40-dev
diff --git a/board/shredos/kernel-6.6.22-defconfig.config b/board/shredos/kernel-6.6.22-defconfig.config
index 877b58522f..6289a8b34d 100644
--- a/board/shredos/kernel-6.6.22-defconfig.config
+++ b/board/shredos/kernel-6.6.22-defconfig.config
@@ -77,10 +77,7 @@ CONFIG_PCI=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEAER_INJECT=y
 CONFIG_PCIE_ECRC=y
-CONFIG_PCI_MSI=y
 CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
-CONFIG_PCI_PASID=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HOTPLUG_PCI_ACPI_IBM=y
 CONFIG_HOTPLUG_PCI_CPCI=y
@@ -100,6 +97,7 @@ CONFIG_OF_UNITTEST=y
 CONFIG_OF_OVERLAY=y
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_VIRTIO_BLK=y
 CONFIG_BLK_DEV_NVME=y
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_HWMON=y
@@ -169,6 +167,7 @@ CONFIG_SCSI_WD719X=y
 CONFIG_SCSI_PMCRAID=y
 CONFIG_SCSI_PM8001=y
 CONFIG_SCSI_BFA_FC=y
+CONFIG_SCSI_VIRTIO=y
 CONFIG_SCSI_CHELSIO_FCOE=y
 CONFIG_SCSI_LOWLEVEL_PCMCIA=y
 CONFIG_PCMCIA_AHA152X=m
@@ -1152,6 +1151,7 @@ CONFIG_RTC_DRV_MSM6242=y
 CONFIG_RTC_DRV_RP5C01=y
 CONFIG_RTC_DRV_FTRTC010=y
 CONFIG_RTC_DRV_GOLDFISH=y
+CONFIG_VIRTIO_PCI=y
 CONFIG_COMEDI=y
 CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_BOND=y
@@ -1260,6 +1260,12 @@ CONFIG_DELL_WMI_AIO=y
 CONFIG_DELL_WMI_DDV=y
 CONFIG_DELL_WMI_LED=y
 CONFIG_DELL_WMI_SYSMAN=y
+CONFIG_AMD_IOMMU=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+CONFIG_IOMMUFD=y
+CONFIG_IRQ_REMAP=y
+CONFIG_VIRTIO_IOMMU=y
 CONFIG_USB_LGM_PHY=y
 CONFIG_BCM_KONA_USB2_PHY=y
 CONFIG_PHY_CADENCE_TORRENT=y
@@ -1315,8 +1321,3 @@ CONFIG_CRYPTO_PCRYPT=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_AES_NI_INTEL=y
 # CONFIG_FTRACE is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_PCI=y
diff --git a/configs/shredos_defconfig b/configs/shredos_defconfig
index 0c4c1189d1..7c8e311527 100644
--- a/configs/shredos_defconfig
+++ b/configs/shredos_defconfig
@@ -122,7 +122,7 @@ BR2_PACKAGE_LIBCAP=y
 BR2_PACKAGE_LIBSECCOMP=y
 BR2_PACKAGE_NWIPE=y
 BR2_PACKAGE_NWIPE_VERSION_GIT_REVISION=y
-BR2_PACKAGE_NWIPE_GIT_REVISION="1f68f35dc557331d8d4062f56aa41fff0e7c4565"
+BR2_PACKAGE_NWIPE_GIT_REVISION="f8f64ba7e73e76851ef0c98e99e08139716a8d82"
 BR2_PACKAGE_LIBFRIBIDI=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_UTF8PROC=y