From: Alexey Kardashevskiy <aik@ozlabs.ru> To: linuxppc-dev@lists.ozlabs.org Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, Alex Williamson <alex.williamson@redhat.com>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, David Gibson <david@gibson.dropbear.id.au>, Gavin Shan <gwshan@linux.vnet.ibm.com>, Paul Mackerras <paulus@samba.org>, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH kernel v11 03/34] powerpc/powernv/ioda: Clean up IOMMU group registration Date: Fri, 29 May 2015 18:44:27 +1000 [thread overview] Message-ID: <1432889098-22924-4-git-send-email-aik@ozlabs.ru> (raw) In-Reply-To: <1432889098-22924-1-git-send-email-aik@ozlabs.ru> The existing code has 3 calls to iommu_register_group() and all 3 branches actually cover all possible cases. This replaces 3 calls with one and moves the registration earlier; the latter will make more sense when we add TCE table sharing. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/platforms/powernv/pci-ioda.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 9a77f3c..8ca7abd 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1784,6 +1784,9 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, if (WARN_ON(pe->tce32_seg >= 0)) return; + tbl = pe->tce32_table; + iommu_register_group(tbl, phb->hose->global_number, pe->pe_number); + /* Grab a 32-bit TCE table */ pe->tce32_seg = base; pe_info(pe, " Setting up 32-bit TCE table at %08x..%08x\n", @@ -1818,7 +1821,6 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, } /* Setup linux iommu table */ - tbl = pe->tce32_table; pnv_pci_setup_iommu_table(tbl, addr, TCE32_TABLE_SIZE * segs, base << 28, IOMMU_PAGE_SHIFT_4K); @@ -1840,8 +1842,6 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, iommu_init_table(tbl, phb->hose->node); if (pe->flags & PNV_IODA_PE_DEV) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); /* * Setting table base here only for carrying iommu_group * further down to let iommu_add_device() do the job. @@ -1849,14 +1849,8 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, */ set_iommu_table_base(&pe->pdev->dev, tbl); iommu_add_device(&pe->pdev->dev); - } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); + } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) pnv_ioda_setup_bus_dma(pe, pe->pbus); - } else if (pe->flags & PNV_IODA_PE_VF) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); - } return; fail: @@ -1923,6 +1917,9 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, if (WARN_ON(pe->tce32_seg >= 0)) return; + tbl = pe->tce32_table; + iommu_register_group(tbl, phb->hose->global_number, pe->pe_number); + /* The PE will reserve all possible 32-bits space */ pe->tce32_seg = 0; end = (1 << ilog2(phb->ioda.m32_pci_base)); @@ -1954,7 +1951,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, } /* Setup linux iommu table */ - tbl = pe->tce32_table; pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0, IOMMU_PAGE_SHIFT_4K); @@ -1974,8 +1970,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, iommu_init_table(tbl, phb->hose->node); if (pe->flags & PNV_IODA_PE_DEV) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); /* * Setting table base here only for carrying iommu_group * further down to let iommu_add_device() do the job. @@ -1983,14 +1977,8 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, */ set_iommu_table_base(&pe->pdev->dev, tbl); iommu_add_device(&pe->pdev->dev); - } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); + } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) pnv_ioda_setup_bus_dma(pe, pe->pbus); - } else if (pe->flags & PNV_IODA_PE_VF) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); - } /* Also create a bypass window */ if (!pnv_iommu_bypass_disabled) -- 2.4.0.rc3.8.gfb3e7d5
WARNING: multiple messages have this Message-ID (diff)
From: Alexey Kardashevskiy <aik@ozlabs.ru> To: linuxppc-dev@lists.ozlabs.org Cc: kvm@vger.kernel.org, Alexey Kardashevskiy <aik@ozlabs.ru>, Gavin Shan <gwshan@linux.vnet.ibm.com>, linux-kernel@vger.kernel.org, Alex Williamson <alex.williamson@redhat.com>, Paul Mackerras <paulus@samba.org>, David Gibson <david@gibson.dropbear.id.au> Subject: [PATCH kernel v11 03/34] powerpc/powernv/ioda: Clean up IOMMU group registration Date: Fri, 29 May 2015 18:44:27 +1000 [thread overview] Message-ID: <1432889098-22924-4-git-send-email-aik@ozlabs.ru> (raw) In-Reply-To: <1432889098-22924-1-git-send-email-aik@ozlabs.ru> The existing code has 3 calls to iommu_register_group() and all 3 branches actually cover all possible cases. This replaces 3 calls with one and moves the registration earlier; the latter will make more sense when we add TCE table sharing. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> --- arch/powerpc/platforms/powernv/pci-ioda.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 9a77f3c..8ca7abd 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1784,6 +1784,9 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, if (WARN_ON(pe->tce32_seg >= 0)) return; + tbl = pe->tce32_table; + iommu_register_group(tbl, phb->hose->global_number, pe->pe_number); + /* Grab a 32-bit TCE table */ pe->tce32_seg = base; pe_info(pe, " Setting up 32-bit TCE table at %08x..%08x\n", @@ -1818,7 +1821,6 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, } /* Setup linux iommu table */ - tbl = pe->tce32_table; pnv_pci_setup_iommu_table(tbl, addr, TCE32_TABLE_SIZE * segs, base << 28, IOMMU_PAGE_SHIFT_4K); @@ -1840,8 +1842,6 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, iommu_init_table(tbl, phb->hose->node); if (pe->flags & PNV_IODA_PE_DEV) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); /* * Setting table base here only for carrying iommu_group * further down to let iommu_add_device() do the job. @@ -1849,14 +1849,8 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb, */ set_iommu_table_base(&pe->pdev->dev, tbl); iommu_add_device(&pe->pdev->dev); - } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); + } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) pnv_ioda_setup_bus_dma(pe, pe->pbus); - } else if (pe->flags & PNV_IODA_PE_VF) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); - } return; fail: @@ -1923,6 +1917,9 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, if (WARN_ON(pe->tce32_seg >= 0)) return; + tbl = pe->tce32_table; + iommu_register_group(tbl, phb->hose->global_number, pe->pe_number); + /* The PE will reserve all possible 32-bits space */ pe->tce32_seg = 0; end = (1 << ilog2(phb->ioda.m32_pci_base)); @@ -1954,7 +1951,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, } /* Setup linux iommu table */ - tbl = pe->tce32_table; pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0, IOMMU_PAGE_SHIFT_4K); @@ -1974,8 +1970,6 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, iommu_init_table(tbl, phb->hose->node); if (pe->flags & PNV_IODA_PE_DEV) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); /* * Setting table base here only for carrying iommu_group * further down to let iommu_add_device() do the job. @@ -1983,14 +1977,8 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, */ set_iommu_table_base(&pe->pdev->dev, tbl); iommu_add_device(&pe->pdev->dev); - } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); + } else if (pe->flags & (PNV_IODA_PE_BUS | PNV_IODA_PE_BUS_ALL)) pnv_ioda_setup_bus_dma(pe, pe->pbus); - } else if (pe->flags & PNV_IODA_PE_VF) { - iommu_register_group(tbl, phb->hose->global_number, - pe->pe_number); - } /* Also create a bypass window */ if (!pnv_iommu_bypass_disabled) -- 2.4.0.rc3.8.gfb3e7d5 _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev
next prev parent reply other threads:[~2015-05-29 8:52 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-29 8:44 [PATCH kernel v11 00/34] powerpc/iommu/vfio: Enable Dynamic DMA windows Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 01/34] powerpc/eeh/ioda2: Use device::iommu_group to check IOMMU group Alexey Kardashevskiy 2015-06-01 3:40 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 02/34] powerpc/iommu/powernv: Get rid of set_iommu_table_base_and_group Alexey Kardashevskiy 2015-06-01 3:47 ` David Gibson 2015-05-29 8:44 ` Alexey Kardashevskiy [this message] 2015-05-29 8:44 ` [PATCH kernel v11 03/34] powerpc/powernv/ioda: Clean up IOMMU group registration Alexey Kardashevskiy 2015-06-01 3:55 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 04/34] powerpc/iommu: Put IOMMU group explicitly Alexey Kardashevskiy 2015-05-29 8:44 ` Alexey Kardashevskiy 2015-06-01 3:58 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 05/34] powerpc/iommu: Always release iommu_table in iommu_free_table() Alexey Kardashevskiy 2015-05-29 8:44 ` Alexey Kardashevskiy 2015-06-01 4:03 ` David Gibson 2015-06-05 0:10 ` Gavin Shan 2015-05-29 8:44 ` [PATCH kernel v11 06/34] vfio: powerpc/spapr: Move page pinning from arch code to VFIO IOMMU driver Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 07/34] vfio: powerpc/spapr: Check that IOMMU page is fully contained by system page Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 08/34] vfio: powerpc/spapr: Use it_page_size Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 09/34] vfio: powerpc/spapr: Move locked_vm accounting to helpers Alexey Kardashevskiy 2015-06-01 4:28 ` David Gibson 2015-06-03 11:11 ` Alexey Kardashevskiy 2015-06-04 1:00 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 10/34] vfio: powerpc/spapr: Disable DMA mappings on disabled container Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 11/34] vfio: powerpc/spapr: Moving pinning/unpinning to helpers Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 12/34] vfio: powerpc/spapr: Rework groups attaching Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 13/34] powerpc/powernv: Do not set "read" flag if direction==DMA_NONE Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 14/34] powerpc/iommu: Move tce_xxx callbacks from ppc_md to iommu_table Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 15/34] powerpc/powernv/ioda/ioda2: Rework TCE invalidation in tce_build()/tce_free() Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 16/34] powerpc/spapr: vfio: Replace iommu_table with iommu_table_group Alexey Kardashevskiy 2015-06-01 5:11 ` David Gibson 2015-06-05 0:19 ` Gavin Shan 2015-05-29 8:44 ` [PATCH kernel v11 17/34] powerpc/spapr: vfio: Switch from iommu_table to new iommu_table_group Alexey Kardashevskiy 2015-06-01 6:24 ` David Gibson 2015-06-04 9:14 ` Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 18/34] vfio: powerpc/spapr/iommu/powernv/ioda2: Rework IOMMU ownership control Alexey Kardashevskiy 2015-06-01 6:34 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 19/34] powerpc/iommu: Fix IOMMU ownership control functions Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 20/34] powerpc/powernv/ioda2: Move TCE kill register address to PE Alexey Kardashevskiy 2015-06-01 6:47 ` David Gibson 2015-06-05 0:22 ` Gavin Shan 2015-05-29 8:44 ` [PATCH kernel v11 21/34] powerpc/powernv/ioda2: Add TCE invalidation for all attached groups Alexey Kardashevskiy 2015-06-01 6:49 ` David Gibson 2015-06-05 0:27 ` Gavin Shan 2015-06-05 0:27 ` Gavin Shan 2015-06-05 2:54 ` Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 22/34] powerpc/powernv: Implement accessor to TCE entry Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 23/34] powerpc/iommu/powernv: Release replaced TCE Alexey Kardashevskiy 2015-06-01 7:04 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 24/34] powerpc/powernv/ioda2: Rework iommu_table creation Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 25/34] powerpc/powernv/ioda2: Introduce helpers to allocate TCE pages Alexey Kardashevskiy 2015-06-01 7:29 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 26/34] powerpc/powernv/ioda2: Introduce pnv_pci_ioda2_set_window Alexey Kardashevskiy 2015-06-01 23:30 ` David Gibson 2015-06-03 11:18 ` Alexey Kardashevskiy 2015-05-29 8:44 ` [PATCH kernel v11 27/34] powerpc/powernv: Implement multilevel TCE tables Alexey Kardashevskiy 2015-06-01 23:50 ` David Gibson 2015-06-03 11:27 ` Alexey Kardashevskiy 2015-06-04 1:16 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 28/34] vfio: powerpc/spapr: powerpc/powernv/ioda: Define and implement DMA windows API Alexey Kardashevskiy 2015-06-02 0:24 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 29/34] powerpc/powernv/ioda2: Use new helpers to do proper cleanup on PE release Alexey Kardashevskiy 2015-06-02 0:47 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 30/34] powerpc/iommu/ioda2: Add get_table_size() to calculate the size of future table Alexey Kardashevskiy 2015-06-02 0:54 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 31/34] vfio: powerpc/spapr: powerpc/powernv/ioda2: Use DMA windows API in ownership control Alexey Kardashevskiy 2015-06-02 1:09 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 32/34] powerpc/mmu: Add userspace-to-physical addresses translation cache Alexey Kardashevskiy 2015-06-02 1:40 ` David Gibson 2015-05-29 8:44 ` [PATCH kernel v11 33/34] vfio: powerpc/spapr: Register memory and define IOMMU v2 Alexey Kardashevskiy 2015-06-02 4:17 ` David Gibson 2015-06-03 11:40 ` Alexey Kardashevskiy 2015-06-04 1:20 ` David Gibson 2015-06-05 0:01 ` Gavin Shan 2015-06-05 0:01 ` Gavin Shan 2015-05-29 8:44 ` [PATCH kernel v11 34/34] vfio: powerpc/spapr: Support Dynamic DMA windows Alexey Kardashevskiy 2015-06-02 4:37 ` David Gibson
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=1432889098-22924-4-git-send-email-aik@ozlabs.ru \ --to=aik@ozlabs.ru \ --cc=alex.williamson@redhat.com \ --cc=benh@kernel.crashing.org \ --cc=david@gibson.dropbear.id.au \ --cc=gwshan@linux.vnet.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=paulus@samba.org \ /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: linkBe 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.