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

Commit cc5499c3 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Jesse Barnes
Browse files

PCI: handle 64-bit resources better on 32-bit machines 



If the kernel is configured to support 64-bit resources on a 32-bit
machine, we can support 64-bit BARs properly.  Just change the condition
to check sizeof(resource_size_t) instead of BITS_PER_LONG.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 6ac665c6

drivers/pci/probe.c

+2 −2
Original line number Diff line number Diff line
@@ -270,10 +270,10 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
		if (!sz64)

			goto fail;



		if ((BITS_PER_LONG < 64) && (sz64 > 0x100000000ULL)) {

		if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {

			dev_err(&dev->dev, "can't handle 64-bit BAR\n");

			goto fail;

		} else if ((BITS_PER_LONG < 64) && l) {

		} else if ((sizeof(resource_size_t) < 8) && l) {

			/* Address above 32-bit boundary; disable the BAR */

			pci_write_config_dword(dev, pos, 0);

			pci_write_config_dword(dev, pos + 4, 0);