Skip to content

Commit aa66ea1

Browse files
Naveenaidubjorn-helgaas
authored andcommitted
PCI/PME: Use PCI_POSSIBLE_ERROR() to check config reads
When config pci_ops.read() can detect failed PCI transactions, the data returned to the CPU is PCI_ERROR_RESPONSE (~0 or 0xffffffff). Obviously a successful PCI config read may *also* return that data if a config register happens to contain ~0, so it doesn't definitively indicate an error unless we know the register cannot contain ~0. Use PCI_POSSIBLE_ERROR() to check the response we get when we read data from hardware. This unifies PCI error response checking and makes error checks consistent and easier to find. Compile tested only. Link: https://lore.kernel.org/r/679ce049bccf10df3ca9ef4918ee2c3235afdaea.1637243717.git.naveennaidu479@gmail.com Signed-off-by: Naveen Naidu <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent 0242132 commit aa66ea1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/pci/pcie/pme.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ static void pcie_pme_work_fn(struct work_struct *work)
224224
break;
225225

226226
pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta);
227-
if (rtsta == (u32) ~0)
227+
if (PCI_POSSIBLE_ERROR(rtsta))
228228
break;
229229

230230
if (rtsta & PCI_EXP_RTSTA_PME) {
@@ -274,7 +274,7 @@ static irqreturn_t pcie_pme_irq(int irq, void *context)
274274
spin_lock_irqsave(&data->lock, flags);
275275
pcie_capability_read_dword(port, PCI_EXP_RTSTA, &rtsta);
276276

277-
if (rtsta == (u32) ~0 || !(rtsta & PCI_EXP_RTSTA_PME)) {
277+
if (PCI_POSSIBLE_ERROR(rtsta) || !(rtsta & PCI_EXP_RTSTA_PME)) {
278278
spin_unlock_irqrestore(&data->lock, flags);
279279
return IRQ_NONE;
280280
}

0 commit comments

Comments
 (0)