lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH kernel v11 26/34] powerpc/powernv/ioda2: Introduce pnv_pci_ioda2_set_window
    On 06/02/2015 09:30 AM, David Gibson wrote:
    > On Fri, May 29, 2015 at 06:44:50PM +1000, Alexey Kardashevskiy wrote:
    >> This is a part of moving DMA window programming to an iommu_ops
    >> callback. pnv_pci_ioda2_set_window() takes an iommu_table_group as
    >> a first parameter (not pnv_ioda_pe) as it is going to be used as
    >> a callback for VFIO DDW code.
    >>
    >> This adds pnv_pci_ioda2_tvt_invalidate() to invalidate TVT as it is
    >
    > I'm assuming that's what's now called pnv_pci_ioda2_invalidate_entire()?


    Yes, my bad... And the patch is not adding it at all...


    >
    >> a good thing to do. It does not have immediate effect now as the table
    >> is never recreated after reboot but it will in the following patches.
    >>
    >> This should cause no behavioural change.
    >>
    >> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
    >> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
    >> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
    >> ---
    >> Changes:
    >> v11:
    >> * replaced some 1<<it_page_shift with IOMMU_PAGE_SIZE() macro
    >>
    >> v9:
    >> * initialize pe->table_group.tables[0] at the very end when
    >> tbl is fully initialized
    >> * moved pnv_pci_ioda2_tvt_invalidate() from earlier patch
    >> ---
    >> arch/powerpc/platforms/powernv/pci-ioda.c | 47 +++++++++++++++++++++++++------
    >> 1 file changed, 38 insertions(+), 9 deletions(-)
    >>
    >> diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
    >> index 3d29fe3..fda01c1 100644
    >> --- a/arch/powerpc/platforms/powernv/pci-ioda.c
    >> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
    >> @@ -1968,6 +1968,43 @@ static void pnv_pci_ioda_setup_dma_pe(struct pnv_phb *phb,
    >> }
    >> }
    >>
    >> +static long pnv_pci_ioda2_set_window(struct iommu_table_group *table_group,
    >> + int num, struct iommu_table *tbl)
    >> +{
    >> + struct pnv_ioda_pe *pe = container_of(table_group, struct pnv_ioda_pe,
    >> + table_group);
    >> + struct pnv_phb *phb = pe->phb;
    >> + int64_t rc;
    >> + const __u64 start_addr = tbl->it_offset << tbl->it_page_shift;
    >> + const __u64 win_size = tbl->it_size << tbl->it_page_shift;
    >> +
    >> + pe_info(pe, "Setting up window %llx..%llx pg=%x\n",
    >> + start_addr, start_addr + win_size - 1,
    >> + IOMMU_PAGE_SIZE(tbl));
    >> +
    >> + /*
    >> + * Map TCE table through TVT. The TVE index is the PE number
    >> + * shifted by 1 bit for 32-bits DMA space.
    >> + */
    >> + rc = opal_pci_map_pe_dma_window(phb->opal_id,
    >> + pe->pe_number,
    >> + pe->pe_number << 1,
    >> + 1,
    >> + __pa(tbl->it_base),
    >> + tbl->it_size << 3,
    >> + IOMMU_PAGE_SIZE(tbl));
    >> + if (rc) {
    >> + pe_err(pe, "Failed to configure TCE table, err %ld\n", rc);
    >> + return rc;
    >> + }
    >> +
    >> + pnv_pci_link_table_and_group(phb->hose->node, num,
    >> + tbl, &pe->table_group);
    >> + pnv_pci_ioda2_tce_invalidate_entire(pe);
    >> +
    >> + return 0;
    >> +}
    >> +
    >> static void pnv_pci_ioda2_set_bypass(struct pnv_ioda_pe *pe, bool enable)
    >> {
    >> uint16_t window_id = (pe->pe_number << 1 ) + 1;
    >> @@ -2123,21 +2160,13 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb,
    >> pe->table_group.ops = &pnv_pci_ioda2_ops;
    >> #endif
    >>
    >> - /*
    >> - * Map TCE table through TVT. The TVE index is the PE number
    >> - * shifted by 1 bit for 32-bits DMA space.
    >> - */
    >> - rc = opal_pci_map_pe_dma_window(phb->opal_id, pe->pe_number,
    >> - pe->pe_number << 1, 1, __pa(tbl->it_base),
    >> - tbl->it_size << 3, 1ULL << tbl->it_page_shift);
    >> + rc = pnv_pci_ioda2_set_window(&pe->table_group, 0, tbl);
    >> if (rc) {
    >> pe_err(pe, "Failed to configure 32-bit TCE table,"
    >> " err %ld\n", rc);
    >> goto fail;
    >> }
    >>
    >> - pnv_pci_ioda2_tce_invalidate_entire(pe);
    >> -
    >> /* OPAL variant of PHB3 invalidated TCEs */
    >> if (phb->ioda.tce_inval_reg)
    >> tbl->it_type |= (TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE);
    >


    --
    Alexey


    \
     
     \ /
      Last update: 2015-06-03 14:01    [W:6.152 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site