[PATCH v2 2/4] PCI: Convert pci.c to pci_power_t helpers

From: Habil Eren Türker

Date: Thu Nov 19 2026 - 09:36:12 EST


Convert PCI core code to use the pci_power_t helper functions
when accessing the Power Management Control/Status register.

Keep comparisons between values already typed as pci_power_t
as direct typed comparisons.

Signed-off-by: Habil Eren Türker <habilerenturker@xxxxxxxxxxx>
---
drivers/pci/pci.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 7c6f2aba8144..1902b7c858fd 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1171,7 +1171,7 @@ void pci_update_current_state(struct pci_dev *dev, pci_power_t state)
dev->current_state = PCI_D3cold;
return;
}
- dev->current_state = pmcsr & PCI_PM_CTRL_STATE_MASK;
+ dev->current_state = pci_power_t_get(pmcsr);
} else {
dev->current_state = state;
}
@@ -1368,12 +1368,11 @@ int pci_power_up(struct pci_dev *dev)
return -EIO;
}

- state = pmcsr & PCI_PM_CTRL_STATE_MASK;
-
- need_restore = (state == PCI_D3hot || dev->current_state >= PCI_D3hot) &&
+ need_restore = (pci_power_eq(pmcsr, PCI_D3hot) ||
+ dev->current_state >= PCI_D3hot) &&
!(pmcsr & PCI_PM_CTRL_NO_SOFT_RESET);

- if (state == PCI_D0)
+ if (pci_power_eq(pmcsr, PCI_D0))
goto end;

/*
@@ -1383,7 +1382,7 @@ int pci_power_up(struct pci_dev *dev)
pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, 0);

/* Mandatory transition delays; see PCI PM 1.2. */
- if (state == PCI_D3hot) {
+ if (pci_power_eq(pmcsr, PCI_D3hot)) {
pci_dev_d3_sleep(dev);
if (!(pmcsr & PCI_PM_CTRL_NO_SOFT_RESET)) {
ret = pci_dev_wait(dev, "power up D3hot->D0uninitialized",
@@ -1393,7 +1392,7 @@ int pci_power_up(struct pci_dev *dev)
return -EIO;
}
}
- } else if (state == PCI_D2) {
+ } else if (pci_power_eq(pmcsr, PCI_D2)) {
udelay(PCI_PM_D2_DELAY);
}

@@ -1432,7 +1431,7 @@ static int pci_set_full_power_state(struct pci_dev *dev, bool locked)
}

pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
- dev->current_state = pmcsr & PCI_PM_CTRL_STATE_MASK;
+ dev->current_state = pci_power_t_get(pmcsr);
if (dev->current_state != PCI_D0) {
pci_info_ratelimited(dev, "Refused to change power state from %s to D0\n",
pci_power_name(dev->current_state));
@@ -1546,8 +1545,7 @@ static int pci_set_low_power_state(struct pci_dev *dev, pci_power_t state, bool
return -EIO;
}

- pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
- pmcsr |= state;
+ pci_power_t_set(&pmcsr, state);

/* Enter specified state */
pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, pmcsr);
@@ -1559,7 +1557,7 @@ static int pci_set_low_power_state(struct pci_dev *dev, pci_power_t state, bool
udelay(PCI_PM_D2_DELAY);

pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr);
- dev->current_state = pmcsr & PCI_PM_CTRL_STATE_MASK;
+ dev->current_state = pci_power_t_get(pmcsr);
if (dev->current_state != state)
pci_info_ratelimited(dev, "Refused to change power state from %s to %s\n",
pci_power_name(dev->current_state),
@@ -4590,13 +4588,11 @@ static int pci_pm_reset(struct pci_dev *dev, bool probe)
return ret;
}

- csr &= ~PCI_PM_CTRL_STATE_MASK;
- csr |= PCI_D3hot;
+ pci_power_t_set(&csr, PCI_D3hot);
pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr);
pci_dev_d3_sleep(dev);

- csr &= ~PCI_PM_CTRL_STATE_MASK;
- csr |= PCI_D0;
+ pci_power_t_set(&csr, PCI_D0);
pci_write_config_word(dev, dev->pm_cap + PCI_PM_CTRL, csr);
pci_dev_d3_sleep(dev);

--
2.47.3