Commit 0e9bcda5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:

 - Fix the virt_addr_valid() returning true for < PAGE_OFFSET addresses.

 - Do not blindly trust the DMA masks from ACPI/IORT.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  ACPI/IORT: Do not blindly trust DMA masks from firmware
  arm64: Fix kernel address detection of __is_lm_address()
parents c05d51c7 a1df829e

arch/arm64/include/asm/memory.h

+4 −2
Original line number Diff line number Diff line
@@ -247,9 +247,11 @@ static inline const void *__tag_set(const void *addr, u8 tag) 




/*

 * The linear kernel range starts at the bottom of the virtual address space.

 * Check whether an arbitrary address is within the linear map, which

 * lives in the [PAGE_OFFSET, PAGE_END) interval at the bottom of the

 * kernel's TTBR1 address range.

 */

#define __is_lm_address(addr)	(((u64)(addr) & ~PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET))

#define __is_lm_address(addr)	(((u64)(addr) ^ PAGE_OFFSET) < (PAGE_END - PAGE_OFFSET))



#define __lm_to_phys(addr)	(((addr) & ~PAGE_OFFSET) + PHYS_OFFSET)

#define __kimg_to_phys(addr)	((addr) - kimage_voffset)

drivers/acpi/arm64/iort.c

+12 −2
Original line number Diff line number Diff line
@@ -1107,6 +1107,11 @@ static int nc_dma_get_range(struct device *dev, u64 *size) 


	ncomp = (struct acpi_iort_named_component *)node->node_data;



	if (!ncomp->memory_address_limit) {

		pr_warn(FW_BUG "Named component missing memory address limit\n");

		return -EINVAL;

	}



	*size = ncomp->memory_address_limit >= 64 ? U64_MAX :

			1ULL<<ncomp->memory_address_limit;
@@ -1126,6 +1131,11 @@ static int rc_dma_get_range(struct device *dev, u64 *size) 


	rc = (struct acpi_iort_root_complex *)node->node_data;



	if (!rc->memory_address_limit) {

		pr_warn(FW_BUG "Root complex missing memory address limit\n");

		return -EINVAL;

	}



	*size = rc->memory_address_limit >= 64 ? U64_MAX :

			1ULL<<rc->memory_address_limit;
@@ -1173,8 +1183,8 @@ void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size) 
		end = dmaaddr + size - 1;

		mask = DMA_BIT_MASK(ilog2(end) + 1);

		dev->bus_dma_limit = end;

		dev->coherent_dma_mask = mask;

		*dev->dma_mask = mask;

		dev->coherent_dma_mask = min(dev->coherent_dma_mask, mask);

		*dev->dma_mask = min(*dev->dma_mask, mask);

	}



	*dma_addr = dmaaddr;