|
@@ -82,14 +82,16 @@ static inline struct pcie_port *sys_to_pcie(struct pci_sys_data *sys)
|
|
|
|
|
|
int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val)
|
|
int dw_pcie_cfg_read(void __iomem *addr, int where, int size, u32 *val)
|
|
{
|
|
{
|
|
- *val = readl(addr);
|
|
|
|
-
|
|
|
|
- if (size == 1)
|
|
|
|
- *val = (*val >> (8 * (where & 3))) & 0xff;
|
|
|
|
|
|
+ if (size == 4)
|
|
|
|
+ *val = readl(addr);
|
|
else if (size == 2)
|
|
else if (size == 2)
|
|
- *val = (*val >> (8 * (where & 3))) & 0xffff;
|
|
|
|
- else if (size != 4)
|
|
|
|
|
|
+ *val = readw(addr + (where & 2));
|
|
|
|
+ else if (size == 1)
|
|
|
|
+ *val = readb(addr + (where & 1));
|
|
|
|
+ else {
|
|
|
|
+ *val = 0;
|
|
return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
return PCIBIOS_BAD_REGISTER_NUMBER;
|
|
|
|
+ }
|
|
|
|
|
|
return PCIBIOS_SUCCESSFUL;
|
|
return PCIBIOS_SUCCESSFUL;
|
|
}
|
|
}
|