aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/powernv.h
diff options
context:
space:
mode:
authorAlistair Popple <alistair@popple.id.au>2018-04-11 16:38:55 +1000
committerMichael Ellerman <mpe@ellerman.id.au>2018-04-24 09:46:57 +1000
commita1409adac748f0db655e096521bbe6904aadeb98 (patch)
treeaa0b71b847bac835ef5bd59704f308d4b2e0998f /arch/powerpc/include/asm/powernv.h
parentpowerpc/powernv/npu: Add lock to prevent race in concurrent context init/destroy (diff)
downloadlinux-dev-a1409adac748f0db655e096521bbe6904aadeb98.tar.xz
linux-dev-a1409adac748f0db655e096521bbe6904aadeb98.zip
powerpc/powernv/npu: Prevent overwriting of pnv_npu2_init_contex() callback parameters
There is a single npu context per set of callback parameters. Callers should be prevented from overwriting existing callback values so instead return an error if different parameters are passed. Fixes: 1ab66d1fbada ("powerpc/powernv: Introduce address translation services for Nvlink2") Cc: stable@vger.kernel.org # v4.12+ Signed-off-by: Alistair Popple <alistair@popple.id.au> Reviewed-by: Mark Hairgrove <mhairgrove@nvidia.com> Tested-by: Mark Hairgrove <mhairgrove@nvidia.com> Reviewed-by: Balbir Singh <bsingharora@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm/powernv.h')
-rw-r--r--arch/powerpc/include/asm/powernv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/powernv.h b/arch/powerpc/include/asm/powernv.h
index d1c2d2e658cf..2f3ff7a27881 100644
--- a/arch/powerpc/include/asm/powernv.h
+++ b/arch/powerpc/include/asm/powernv.h
@@ -15,7 +15,7 @@
extern void powernv_set_nmmu_ptcr(unsigned long ptcr);
extern struct npu_context *pnv_npu2_init_context(struct pci_dev *gpdev,
unsigned long flags,
- struct npu_context *(*cb)(struct npu_context *, void *),
+ void (*cb)(struct npu_context *, void *),
void *priv);
extern void pnv_npu2_destroy_context(struct npu_context *context,
struct pci_dev *gpdev);