Commit 1472585f authored by Koen Vandeputte's avatar Koen Vandeputte Committed by Greg Kroah-Hartman

ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment

commit 65dbb423cf28232fed1732b779249d6164c5999b upstream.

Originally, cns3xxx used its own functions for mapping, reading and
writing config registers.

Commit 802b7c06 ("ARM: cns3xxx: Convert PCI to use generic config
accessors") removed the internal PCI config write function in favor of
the generic one:

  cns3xxx_pci_write_config() --> pci_generic_config_write()

cns3xxx_pci_write_config() expected aligned addresses, being produced by
cns3xxx_pci_map_bus() while the generic one pci_generic_config_write()
actually expects the real address as both the function and hardware are
capable of byte-aligned writes.

This currently leads to pci_generic_config_write() writing to the wrong

For instance, upon ath9k module loading:

- driver ath9k gets loaded
- The driver wants to write value 0xA8 to register PCI_LATENCY_TIMER,
  located at 0x0D
- cns3xxx_pci_map_bus() aligns the address to 0x0C
- pci_generic_config_write() effectively writes 0xA8 into register 0x0C

Fix the bug by removing the alignment in the cns3xxx mapping function.

Fixes: 802b7c06 ("ARM: cns3xxx: Convert PCI to use generic config accessors")
Signed-off-by: default avatarKoen Vandeputte <>
[ updated commit log]
Signed-off-by: default avatarLorenzo Pieralisi <>
Acked-by: default avatarKrzysztof Halasa <>
Acked-by: default avatarTim Harvey <>
Acked-by: default avatarArnd Bergmann <>
CC:	# v4.0+
CC: Bjorn Helgaas <>
CC: Olof Johansson <>
CC: Robin Leblon <>
CC: Rob Herring <>
CC: Russell King <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent e31a6a9d
......@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus,
} else /* remote PCI bus */
base = cnspci->cfg1_regs + ((busno & 0xf) << 20);
return base + (where & 0xffc) + (devfn << 12);
return base + where + (devfn << 12);
static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment