]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
powerpc/powernv: Move npu struct from pnv_phb to pci_controller
authorAlexey Kardashevskiy <aik@ozlabs.ru>
Thu, 14 Mar 2019 17:56:46 +0000 (14:56 -0300)
committerStefan Bader <stefan.bader@canonical.com>
Mon, 1 Apr 2019 12:37:29 +0000 (14:37 +0200)
commitdda28cc4a1f67c498126c5a5c003b0ca9d782d30
treec01b1f327f13e7e4104fc60bfe16c8045118a927
parentb33cce22499fb247c826954e909a4b4a230b9547
powerpc/powernv: Move npu struct from pnv_phb to pci_controller

BugLink: https://bugs.launchpad.net/bugs/1819989
The powernv PCI code stores NPU data in the pnv_phb struct. The latter
is referenced by pci_controller::private_data. We are going to have NPU2
support in the pseries platform as well but it does not store any
private_data in in the pci_controller struct; and even if it did,
it would be a different data structure.

This makes npu a pointer and stores it one level higher in
the pci_controller struct.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
(backported from commit 46a1449d9e39478a35d35d9d9025776f6cee24fb)
Signed-off-by: Jose Ricardo Ziviani <joserz@linux.ibm.com>
Acked-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Kleber Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/powerpc/include/asm/pci-bridge.h
arch/powerpc/platforms/powernv/npu-dma.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.h