From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp01.au.ibm.com (e23smtp01.au.ibm.com [202.81.31.143]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id E3E131A0484 for ; Wed, 23 Jul 2014 13:06:19 +1000 (EST) Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 23 Jul 2014 13:06:19 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 8A77B2CE805A for ; Wed, 23 Jul 2014 13:06:16 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s6N360cn11469218 for ; Wed, 23 Jul 2014 13:06:00 +1000 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s6N36FeX014772 for ; Wed, 23 Jul 2014 13:06:16 +1000 From: Alexey Kardashevskiy To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 14/18] powerpc/powernv: Return non-zero TCE from pnv_tce_build Date: Wed, 23 Jul 2014 13:06:00 +1000 Message-Id: <1406084764-24685-15-git-send-email-aik@ozlabs.ru> In-Reply-To: <1406084764-24685-1-git-send-email-aik@ozlabs.ru> References: <1406084764-24685-1-git-send-email-aik@ozlabs.ru> Cc: Alexey Kardashevskiy , Paul Mackerras , Gavin Shan List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This returns old TCE values to the caller if requested. The caller is expectded to call put_page() for them. Signed-off-by: Alexey Kardashevskiy --- arch/powerpc/platforms/powernv/pci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index e002c66..a9165a5 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c @@ -575,6 +575,7 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages, u64 proto_tce; __be64 *tcep, *tces; u64 rpn; + long i; proto_tce = TCE_PCI_READ; // Read allowed @@ -584,9 +585,13 @@ static int pnv_tce_build(struct iommu_table *tbl, long index, long npages, tces = tcep = ((__be64 *)tbl->it_base) + index - tbl->it_offset; rpn = __pa(uaddr) >> tbl->it_page_shift; - while (npages--) - *(tcep++) = cpu_to_be64(proto_tce | - (rpn++ << tbl->it_page_shift)); + for (i = 0; i < npages; i++) { + unsigned long oldtce = xchg(tcep, cpu_to_be64(proto_tce | + (rpn++ << tbl->it_page_shift))); + if (old_tces) + old_tces[i] = (unsigned long) __va(oldtce); + tcep++; + } pnv_tce_invalidate(tbl, tces, tcep - 1, rm); -- 2.0.0