From 0ba16268e65fa32e14050ee243fb8667ec3a4591 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Aug 2026 13:44:20 +0000
Subject: [PATCH 1/4] ahci: Remove duplicate AHCI_PXCMD_ICC_DEVSLEEP define

---
 drivers/storage/ide/pciidex/ahci.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/storage/ide/pciidex/ahci.h b/drivers/storage/ide/pciidex/ahci.h
index c7684a260cd82..930bf9e7e77a8 100644
--- a/drivers/storage/ide/pciidex/ahci.h
+++ b/drivers/storage/ide/pciidex/ahci.h
@@ -176,8 +176,6 @@ typedef enum _AHCI_PORT_REGISTER
 #define AHCI_PXCMD_ICC_SLUMBER     0x60000000
 #define AHCI_PXCMD_ICC_DEVSLEEP    0x80000000
 
-#define AHCI_PXCMD_ICC_DEVSLEEP    0x80000000
-
 #define AHCI_PXCMD_CCS_SHIFT      8
 
 #define AHCI_PXCMD_CCS(Value)     (((Value) & AHCI_PXCMD_CCS_MASK) >> AHCI_PXCMD_CCS_SHIFT)

From 30f085f7a1113294a40922d48b015e6a244b813b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Aug 2026 13:44:38 +0000
Subject: [PATCH 2/4] pciidex: Fix missing status code in interrupt connection
 error message

---
 drivers/storage/ide/pciidex/pdo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/storage/ide/pciidex/pdo.c b/drivers/storage/ide/pciidex/pdo.c
index 4213d1f24ee21..df03e70db82ae 100644
--- a/drivers/storage/ide/pciidex/pdo.c
+++ b/drivers/storage/ide/pciidex/pdo.c
@@ -158,7 +158,7 @@ PciIdeXPdoStartDevice(
         Status = PciIdeConnectInterrupt(ChanData);
         if (!NT_SUCCESS(Status))
         {
-            ERR("CH %lu: Could not connect to interrupt\n", ChanData->Channel, Status);
+            ERR("CH %lu: Could not connect to interrupt %lx\n", ChanData->Channel, Status);
             return Status;
         }
 

From e69eda7a89c335ad9ab7cb664ace4fae69f19a78 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Aug 2026 13:44:51 +0000
Subject: [PATCH 3/4] ahci: Fix tautological ASSERT for zero channel count

---
 drivers/storage/ide/pciidex/chipset/ahci_generic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/storage/ide/pciidex/chipset/ahci_generic.c b/drivers/storage/ide/pciidex/chipset/ahci_generic.c
index 0318fad24785e..f1c568a3f7195 100644
--- a/drivers/storage/ide/pciidex/chipset/ahci_generic.c
+++ b/drivers/storage/ide/pciidex/chipset/ahci_generic.c
@@ -660,7 +660,7 @@ AhciGetControllerProperties(
     Controller->MaxChannels = CountSetBits(Controller->ChannelBitmap);
     if (Controller->MaxChannels == 0)
     {
-        ASSERT(Controller->MaxChannels == 0);
+        ASSERT(FALSE);
         return STATUS_DEVICE_HARDWARE_ERROR;
     }
 

From 7b8164d623ac8e30b7249e6c833581102ba6e586 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Aug 2026 13:45:06 +0000
Subject: [PATCH 4/4] ahci: Fix wrong bitwise operators in AtaAhciFbsControl

---
 drivers/storage/ide/pciidex/chipset/ahci_hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/storage/ide/pciidex/chipset/ahci_hw.c b/drivers/storage/ide/pciidex/chipset/ahci_hw.c
index bb1142e4f96d3..a3c4ca4d80253 100644
--- a/drivers/storage/ide/pciidex/chipset/ahci_hw.c
+++ b/drivers/storage/ide/pciidex/chipset/ahci_hw.c
@@ -325,7 +325,7 @@ AtaAhciFbsControl(
         ChanData->ChanInfo &= ~CHANNEL_FLAG_FBS_ENABLED;
     }
 
-    if ((FbsControl & NewFbsControl) ^ AHCI_FBS_ENABLE)
+    if ((FbsControl ^ NewFbsControl) & AHCI_FBS_ENABLE)
     {
         AHCI_PORT_WRITE(ChanData->IoBase, PxFisSwitchingControl, NewFbsControl);
     }