Skip to content

ahci/pciidex: Fix four bugs in AHCI driver #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 4 commits into
base: SMP/smp-bringup
Choose a base branch
from
Draft

ahci/pciidex: Fix four bugs in AHCI driver #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ba1626
ahci: Remove duplicate AHCI_PXCMD_ICC_DEVSLEEP define
Copilot Aug 3, 2026
30f085f
pciidex: Fix missing status code in interrupt connection error message
Copilot Aug 3, 2026
e69eda7
ahci: Fix tautological ASSERT for zero channel count
Copilot Aug 3, 2026
7b8164d
ahci: Fix wrong bitwise operators in AtaAhciFbsControl
Copilot Aug 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions drivers/storage/ide/pciidex/ahci.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion drivers/storage/ide/pciidex/chipset/ahci_generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/storage/ide/pciidex/chipset/ahci_hw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/storage/ide/pciidex/pdo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down