From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: Oliver O'Halloran <oohall@gmail.com>, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 5/5] powernv/pci: Move pnv_pci_dma_bus_setup() to pci-ioda.c
Date: Tue, 14 Jan 2020 17:34:00 +1100 [thread overview]
Message-ID: <74db8fd5-6458-96b6-c41c-fbe115999cc7@ozlabs.ru> (raw)
In-Reply-To: <20200110070207.439-6-oohall@gmail.com>
On 10/01/2020 18:02, Oliver O'Halloran wrote:
> This is only used in pci-ioda.c so move it there and rename it to match.
>
> Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Reviewed-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> arch/powerpc/platforms/powernv/pci-ioda.c | 22 +++++++++++++++++++++-
> arch/powerpc/platforms/powernv/pci.c | 20 --------------------
> arch/powerpc/platforms/powernv/pci.h | 1 -
> 3 files changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
> index e2a9440..4701621 100644
> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
> @@ -3628,9 +3628,29 @@ static void pnv_pci_ioda_shutdown(struct pci_controller *hose)
> OPAL_ASSERT_RESET);
> }
>
> +static void pnv_pci_ioda_dma_bus_setup(struct pci_bus *bus)
> +{
> + struct pci_controller *hose = bus->sysdata;
> + struct pnv_phb *phb = hose->private_data;
> + struct pnv_ioda_pe *pe;
> +
> + list_for_each_entry(pe, &phb->ioda.pe_list, list) {
> + if (!(pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)))
> + continue;
> +
> + if (!pe->pbus)
> + continue;
> +
> + if (bus->number == ((pe->rid >> 8) & 0xFF)) {
> + pe->pbus = bus;
> + break;
> + }
> + }
> +}
> +
> static const struct pci_controller_ops pnv_pci_ioda_controller_ops = {
> .dma_dev_setup = pnv_pci_ioda_dma_dev_setup,
> - .dma_bus_setup = pnv_pci_dma_bus_setup,
> + .dma_bus_setup = pnv_pci_ioda_dma_bus_setup,
> .iommu_bypass_supported = pnv_pci_ioda_iommu_bypass_supported,
> .setup_msi_irqs = pnv_setup_msi_irqs,
> .teardown_msi_irqs = pnv_teardown_msi_irqs,
> diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
> index 31f1949..a17bc1a1 100644
> --- a/arch/powerpc/platforms/powernv/pci.c
> +++ b/arch/powerpc/platforms/powernv/pci.c
> @@ -810,26 +810,6 @@ struct iommu_table *pnv_pci_table_alloc(int nid)
> return tbl;
> }
>
> -void pnv_pci_dma_bus_setup(struct pci_bus *bus)
> -{
> - struct pci_controller *hose = bus->sysdata;
> - struct pnv_phb *phb = hose->private_data;
> - struct pnv_ioda_pe *pe;
> -
> - list_for_each_entry(pe, &phb->ioda.pe_list, list) {
> - if (!(pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)))
> - continue;
> -
> - if (!pe->pbus)
> - continue;
> -
> - if (bus->number == ((pe->rid >> 8) & 0xFF)) {
> - pe->pbus = bus;
> - break;
> - }
> - }
> -}
> -
> struct device_node *pnv_pci_get_phb_node(struct pci_dev *dev)
> {
> struct pci_controller *hose = pci_bus_to_host(dev->bus);
> diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h
> index 0cdc9ba..d3bbdea 100644
> --- a/arch/powerpc/platforms/powernv/pci.h
> +++ b/arch/powerpc/platforms/powernv/pci.h
> @@ -188,7 +188,6 @@ extern void pnv_npu2_map_lpar(struct pnv_ioda_pe *gpe, unsigned long msr);
> extern void pnv_pci_reset_secondary_bus(struct pci_dev *dev);
> extern int pnv_eeh_phb_reset(struct pci_controller *hose, int option);
>
> -extern void pnv_pci_dma_bus_setup(struct pci_bus *bus);
> extern int pnv_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type);
> extern void pnv_teardown_msi_irqs(struct pci_dev *pdev);
> extern struct pnv_ioda_pe *pnv_ioda_get_pe(struct pci_dev *dev);
>
--
Alexey
prev parent reply other threads:[~2020-01-14 6:42 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 7:02 Minor PCI & DMA init cleanups Oliver O'Halloran
2020-01-10 7:02 ` [PATCH 1/5] powerpc/pci: Fold pcibios_setup_device() into pcibios_bus_add_device() Oliver O'Halloran
2020-01-14 6:33 ` Alexey Kardashevskiy
2020-01-29 5:17 ` Michael Ellerman
2020-01-10 7:02 ` [PATCH 2/5] powernv/pci: Remove dma_dev_setup() for NPU PHBs Oliver O'Halloran
2020-01-10 7:02 ` [PATCH 3/5] powerpc/iov: Move VF pdev fixup into pcibios_fixup_iov() Oliver O'Halloran
2020-01-14 6:33 ` Alexey Kardashevskiy
2020-01-10 7:02 ` [PATCH 4/5] powernv/pci: Fold pnv_pci_dma_dev_setup() into the pci-ioda.c version Oliver O'Halloran
2020-01-14 6:33 ` Alexey Kardashevskiy
2020-01-10 7:02 ` [PATCH 5/5] powernv/pci: Move pnv_pci_dma_bus_setup() to pci-ioda.c Oliver O'Halloran
2020-01-14 6:34 ` Alexey Kardashevskiy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=74db8fd5-6458-96b6-c41c-fbe115999cc7@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=oohall@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.