Commit b9275466 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-6.19-2025-12-22' of... 

Merge tag 'dma-mapping-6.19-2025-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Pull dma-mapping fix from Marek Szyprowski:

 - fix boot failure of parisc systems after recent rework of the DMA API
   infrastructure (Leon Romanovsky)

* tag 'dma-mapping-6.19-2025-12-22' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  parisc: Set valid bit in high byte of 64‑bit physical address
parents 9448598b 7f2e8e1d

drivers/parisc/sba_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -578,8 +578,8 @@ sba_io_pdir_entry(__le64 *pdir_ptr, space_t sid, phys_addr_t pba, 
	pba &= IOVP_MASK;

	pba |= (ci >> PAGE_SHIFT) & 0xff;  /* move CI (8 bits) into lowest byte */



	pba |= SBA_PDIR_VALID_BIT;	/* set "valid" bit */

	*pdir_ptr = cpu_to_le64(pba);	/* swap and store into I/O Pdir */

	/* set "valid" bit, swap and store into I/O Pdir */

	*pdir_ptr = cpu_to_le64((unsigned long)pba | SBA_PDIR_VALID_BIT);



	/*

	 * If the PDC_MODEL capabilities has Non-coherent IO-PDIR bit set