]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
powerpc/ps3: Add dma_mask to ps3_dma_region
authorGeoff Levand <geoff@infradead.org>
Thu, 3 Jun 2021 19:17:02 +0000 (19:17 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 20 Sep 2021 13:39:53 +0000 (15:39 +0200)
commita40140bcbd40116b43b114dac982d1cf6d081167
tree451f01fd572b1968e25ce0cb9250be03252e3187
parentf8d1061503db755094562afdc915840e4214a06f
powerpc/ps3: Add dma_mask to ps3_dma_region

BugLink: https://bugs.launchpad.net/bugs/1939738
[ Upstream commit 9733862e50fdba55e7f1554e4286fcc5302ff28e ]

Commit f959dcd6ddfd29235030e8026471ac1b022ad2b0 (dma-direct: Fix
potential NULL pointer dereference) added a null check on the
dma_mask pointer of the kernel's device structure.

Add a dma_mask variable to the ps3_dma_region structure and set
the device structure's dma_mask pointer to point to this new variable.

Fixes runtime errors like these:
# WARNING: Fixes tag on line 10 doesn't match correct format
# WARNING: Fixes tag on line 10 doesn't match correct format

  ps3_system_bus_match:349: dev=8.0(sb_01), drv=8.0(ps3flash): match
  WARNING: CPU: 0 PID: 1 at kernel/dma/mapping.c:151 .dma_map_page_attrs+0x34/0x1e0
  ps3flash sb_01: ps3stor_setup:193: map DMA region failed

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/562d0c9ea0100a30c3b186bcc7adb34b0bbd2cd7.1622746428.git.geoff@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
arch/powerpc/include/asm/ps3.h
arch/powerpc/platforms/ps3/mm.c