From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: Gavin Shan <gwshan@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org, Paul Mackerras <paulus@samba.org>
Subject: Re: [PATCH v2 06/18] powerpc/powernv: Use it_page_shift in TCE build
Date: Wed, 23 Jul 2014 14:04:16 +1000 [thread overview]
Message-ID: <53CF3440.6070504@ozlabs.ru> (raw)
In-Reply-To: <20140723040040.GB5531@shangw>
On 07/23/2014 02:00 PM, Gavin Shan wrote:
> On Wed, Jul 23, 2014 at 01:05:52PM +1000, Alexey Kardashevskiy wrote:
>> This makes use of iommu_table::it_page_shift instead of TCE_SHIFT and
>> TCE_RPN_SHIFT hardcoded values.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
>
> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
>
>> ---
>> arch/powerpc/platforms/powernv/pci.c | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
>> index f91a4e5..b6cb996 100644
>> --- a/arch/powerpc/platforms/powernv/pci.c
>> +++ b/arch/powerpc/platforms/powernv/pci.c
>> @@ -564,10 +564,11 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages,
>> proto_tce |= TCE_PCI_WRITE;
>>
>> tces = tcep = ((__be64 *)tbl->it_base) + index - tbl->it_offset;
>> - rpn = __pa(uaddr) >> TCE_SHIFT;
>> + rpn = __pa(uaddr) >> tbl->it_page_shift;
>>
>
> I'm not sure for 100%. It might be worthy to have some check somewhere:
>
> WARN_ON(uaddr & ((1ull << tbl->it_page_shift) - 1))
The calling code (KVM and SPAPR TCE VFIO driver) performs all these checks,
no need to repeat it here.
> The "uaddr" are required to be "0x1ull << tbl->it_page_shift" aligned :-)
>
> Thanks,
> Gavin
>
>> while (npages--)
>> - *(tcep++) = cpu_to_be64(proto_tce | (rpn++ << TCE_RPN_SHIFT));
>> + *(tcep++) = cpu_to_be64(proto_tce |
>> + (rpn++ << tbl->it_page_shift));
>>
>> /* Some implementations won't cache invalid TCEs and thus may not
>> * need that flush. We'll probably turn it_type into a bit mask
>> --
>> 2.0.0
>>
>
--
Alexey
next prev parent reply other threads:[~2014-07-23 4:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 3:05 [PATCH v2 00/18] powernv: vfio: Add Dynamic DMA windows (DDW) Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 01/18] powerpc/iommu: Fix comments with it_page_shift Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 02/18] KVM: PPC: Use RCU when adding to arch.spapr_tce_tables Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 03/18] KVM: PPC: Account TCE pages in locked_vm Alexey Kardashevskiy
2014-07-23 3:36 ` Gavin Shan
2014-07-24 5:48 ` Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 04/18] vfio: powerpc: Move locked_vm accounting to a helper Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 05/18] powerpc/powernv: Use it_page_shift for TCE invalidation Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 06/18] powerpc/powernv: Use it_page_shift in TCE build Alexey Kardashevskiy
2014-07-23 4:00 ` Gavin Shan
2014-07-23 4:04 ` Alexey Kardashevskiy [this message]
2014-07-23 3:05 ` [PATCH v2 07/18] powerpc/powernv: Add a page size parameter to pnv_pci_setup_iommu_table() Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 08/18] powerpc/powernv: Make invalidate() callback an iommu_table callback Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 09/18] powerpc/spapr: vfio: Implement spapr_tce_iommu_ops Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 10/18] powerpc/powernv: Convert/move set_bypass() callback to take_ownership() Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 11/18] powerpc/iommu: Fix IOMMU ownership control functions Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 12/18] powerpc/iommu: Fix missing permission bits in iommu_put_tce_user_mode() Alexey Kardashevskiy
2014-07-23 3:05 ` [PATCH v2 13/18] powerpc/iommu: Extend ppc_md.tce_build(_rm) to return old TCE values Alexey Kardashevskiy
2014-07-23 3:06 ` [PATCH v2 14/18] powerpc/powernv: Return non-zero TCE from pnv_tce_build Alexey Kardashevskiy
2014-07-23 3:06 ` [PATCH v2 15/18] powerpc/iommu: Implement put_page() if TCE had non-zero value Alexey Kardashevskiy
2014-07-23 3:06 ` [PATCH v2 16/18] powerpc/powernv: Implement Dynamic DMA windows (DDW) for IODA Alexey Kardashevskiy
2014-07-23 3:06 ` [PATCH v2 17/18] vfio: Use it_page_size Alexey Kardashevskiy
2014-07-23 3:06 ` [PATCH v2 18/18] vfio: powerpc: Enable Dynamic DMA windows Alexey Kardashevskiy
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=53CF3440.6070504@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=gwshan@linux.vnet.ibm.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).