Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b09e9abd authored by Nathan Hintz's avatar Nathan Hintz Committed by John W. Linville
Browse files

bcma: add support for 1 and 2 byte extended config space access 



The sanity checks allow 1 and 2 byte reads/writes of the extended
PCI config space to proceed; however, the code only supports 4
byte reads/writes.  This patch adds support for 1 and 2 byte
reads/writes of the extended PCI config space.

Signed-off-by: default avatarNathan Hintz <nlhintz@hotmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 447d7e25

drivers/bcma/driver_pci_host.c

+8 −7
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int bcma_extpci_read_config(struct bcma_drv_pci *pc, unsigned int dev, 
		 */

		if (off >= PCI_CONFIG_SPACE_SIZE) {

			addr = (func << 12);

			addr |= (off & 0x0FFF);

			addr |= (off & 0x0FFC);

			val = bcma_pcie_read_config(pc, addr);

		} else {

			addr = BCMA_CORE_PCI_PCICFG0;
@@ -164,7 +164,11 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev, 
		/* accesses to config registers with offsets >= 256

		 * requires indirect access.

		 */

		if (off < PCI_CONFIG_SPACE_SIZE) {

		if (off >= PCI_CONFIG_SPACE_SIZE) {

			addr = (func << 12);

			addr |= (off & 0x0FFC);

			val = bcma_pcie_read_config(pc, addr);

		} else {

			addr = BCMA_CORE_PCI_PCICFG0;

			addr |= (func << 8);

			addr |= (off & 0xfc);
@@ -202,13 +206,10 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev, 
		/* accesses to config registers with offsets >= 256

		 * requires indirect access.

		 */

		if (off >= PCI_CONFIG_SPACE_SIZE) {

			addr = (func << 12);

			addr |= (off & 0x0FFF);

		if (off >= PCI_CONFIG_SPACE_SIZE)

			bcma_pcie_write_config(pc, addr, val);

		} else {

		else

			pcicore_write32(pc, addr, val);

		}

	} else {

		writel(val, mmio);