PCI: Make Enhanced Allocation bitmasks more obvious
Expand bitmask #defines completely. This puts the shift in the code
instead of in the #define, but it makes it more obvious in the header file
how fields in the register are laid out.
No functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 364f98b..e8330b6 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2195,7 +2195,7 @@
int ent_size, ent_offset = offset;
resource_size_t start, end;
unsigned long flags;
- u32 dw0, base, max_offset;
+ u32 dw0, bei, base, max_offset;
u8 prop;
bool support_64 = (sizeof(resource_size_t) >= 8);
@@ -2208,20 +2208,21 @@
if (!(dw0 & PCI_EA_ENABLE)) /* Entry not enabled */
goto out;
- prop = PCI_EA_PP(dw0);
+ bei = (dw0 & PCI_EA_BEI) >> 4;
+ prop = (dw0 & PCI_EA_PP) >> 8;
+
/*
* If the Property is in the reserved range, try the Secondary
* Property instead.
*/
if (prop > PCI_EA_P_BRIDGE_IO && prop < PCI_EA_P_MEM_RESERVED)
- prop = PCI_EA_SP(dw0);
+ prop = (dw0 & PCI_EA_SP) >> 16;
if (prop > PCI_EA_P_BRIDGE_IO)
goto out;
- res = pci_ea_get_resource(dev, PCI_EA_BEI(dw0), prop);
+ res = pci_ea_get_resource(dev, bei, prop);
if (!res) {
- dev_err(&dev->dev, "Unsupported EA entry BEI: %u\n",
- PCI_EA_BEI(dw0));
+ dev_err(&dev->dev, "Unsupported EA entry BEI: %u\n", bei);
goto out;
}
@@ -2293,7 +2294,7 @@
res->end = end;
res->flags = flags;
dev_printk(KERN_DEBUG, &dev->dev, "EA - BEI %2u, Prop 0x%02x: %pR\n",
- PCI_EA_BEI(dw0), prop, res);
+ bei, prop, res);
out:
return offset + ent_size;
}