Skip to content

Commit b927546

Browse files
committed
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
2 parents 9448598 + 7f2e8e1 commit b927546

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/parisc/sba_iommu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,8 +578,8 @@ sba_io_pdir_entry(__le64 *pdir_ptr, space_t sid, phys_addr_t pba,
578578
pba &= IOVP_MASK;
579579
pba |= (ci >> PAGE_SHIFT) & 0xff; /* move CI (8 bits) into lowest byte */
580580

581-
pba |= SBA_PDIR_VALID_BIT; /* set "valid" bit */
582-
*pdir_ptr = cpu_to_le64(pba); /* swap and store into I/O Pdir */
581+
/* set "valid" bit, swap and store into I/O Pdir */
582+
*pdir_ptr = cpu_to_le64((unsigned long)pba | SBA_PDIR_VALID_BIT);
583583

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

0 commit comments

Comments
 (0)