MIPS: ath79: fix broken ar724x_pci_{read,write} functions
The current ar724x_pci_{read,write} functions are broken. Due to that, pci_read_config_byte returns with bogus values, and pci_write_config_{byte,word} unconditionally clears the accessed PCI configuration registers instead of changing the value of them. The patch fixes the broken functions, thus the PCI configuration space can be accessed correctly. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3493/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
ffdce46682
commit
64adb6bb62
|
@ -22,8 +22,9 @@ static void __iomem *ar724x_pci_devcfg_base;
|
||||||
static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
int size, uint32_t *value)
|
int size, uint32_t *value)
|
||||||
{
|
{
|
||||||
unsigned long flags, addr, tval, mask;
|
unsigned long flags;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
|
u32 data;
|
||||||
|
|
||||||
if (devfn)
|
if (devfn)
|
||||||
return PCIBIOS_DEVICE_NOT_FOUND;
|
return PCIBIOS_DEVICE_NOT_FOUND;
|
||||||
|
@ -31,24 +32,22 @@ static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
base = ar724x_pci_devcfg_base;
|
base = ar724x_pci_devcfg_base;
|
||||||
|
|
||||||
spin_lock_irqsave(&ar724x_pci_lock, flags);
|
spin_lock_irqsave(&ar724x_pci_lock, flags);
|
||||||
|
data = __raw_readl(base + (where & ~3));
|
||||||
|
|
||||||
switch (size) {
|
switch (size) {
|
||||||
case 1:
|
case 1:
|
||||||
addr = where & ~3;
|
if (where & 1)
|
||||||
mask = 0xff000000 >> ((where % 4) * 8);
|
data >>= 8;
|
||||||
tval = __raw_readl(base + addr);
|
if (where & 2)
|
||||||
tval = tval & ~mask;
|
data >>= 16;
|
||||||
*value = (tval >> ((4 - (where % 4))*8));
|
data &= 0xff;
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
addr = where & ~3;
|
if (where & 2)
|
||||||
mask = 0xffff0000 >> ((where % 4)*8);
|
data >>= 16;
|
||||||
tval = __raw_readl(base + addr);
|
data &= 0xffff;
|
||||||
tval = tval & ~mask;
|
|
||||||
*value = (tval >> ((4 - (where % 4))*8));
|
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
*value = __raw_readl(base + where);
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
||||||
|
@ -57,6 +56,7 @@ static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
||||||
|
*value = data;
|
||||||
|
|
||||||
return PCIBIOS_SUCCESSFUL;
|
return PCIBIOS_SUCCESSFUL;
|
||||||
}
|
}
|
||||||
|
@ -64,8 +64,10 @@ static int ar724x_pci_read(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
static int ar724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
|
static int ar724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
int size, uint32_t value)
|
int size, uint32_t value)
|
||||||
{
|
{
|
||||||
unsigned long flags, tval, addr, mask;
|
unsigned long flags;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
|
u32 data;
|
||||||
|
int s;
|
||||||
|
|
||||||
if (devfn)
|
if (devfn)
|
||||||
return PCIBIOS_DEVICE_NOT_FOUND;
|
return PCIBIOS_DEVICE_NOT_FOUND;
|
||||||
|
@ -73,26 +75,21 @@ static int ar724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
base = ar724x_pci_devcfg_base;
|
base = ar724x_pci_devcfg_base;
|
||||||
|
|
||||||
spin_lock_irqsave(&ar724x_pci_lock, flags);
|
spin_lock_irqsave(&ar724x_pci_lock, flags);
|
||||||
|
data = __raw_readl(base + (where & ~3));
|
||||||
|
|
||||||
switch (size) {
|
switch (size) {
|
||||||
case 1:
|
case 1:
|
||||||
addr = where & ~3;
|
s = ((where & 3) * 8);
|
||||||
mask = 0xff000000 >> ((where % 4)*8);
|
data &= ~(0xff << s);
|
||||||
tval = __raw_readl(base + addr);
|
data |= ((value & 0xff) << s);
|
||||||
tval = tval & ~mask;
|
|
||||||
tval |= (value << ((4 - (where % 4))*8)) & mask;
|
|
||||||
__raw_writel(tval, base + addr);
|
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
addr = where & ~3;
|
s = ((where & 2) * 8);
|
||||||
mask = 0xffff0000 >> ((where % 4)*8);
|
data &= ~(0xffff << s);
|
||||||
tval = __raw_readl(base + addr);
|
data |= ((value & 0xffff) << s);
|
||||||
tval = tval & ~mask;
|
|
||||||
tval |= (value << ((4 - (where % 4))*8)) & mask;
|
|
||||||
__raw_writel(tval, base + addr);
|
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
__raw_writel(value, (base + where));
|
data = value;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
||||||
|
@ -100,6 +97,9 @@ static int ar724x_pci_write(struct pci_bus *bus, unsigned int devfn, int where,
|
||||||
return PCIBIOS_BAD_REGISTER_NUMBER;
|
return PCIBIOS_BAD_REGISTER_NUMBER;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
__raw_writel(data, base + (where & ~3));
|
||||||
|
/* flush write */
|
||||||
|
__raw_readl(base + (where & ~3));
|
||||||
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
spin_unlock_irqrestore(&ar724x_pci_lock, flags);
|
||||||
|
|
||||||
return PCIBIOS_SUCCESSFUL;
|
return PCIBIOS_SUCCESSFUL;
|
||||||
|
|
Loading…
Reference in New Issue