From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752030AbcF3NWZ (ORCPT ); Thu, 30 Jun 2016 09:22:25 -0400 Received: from userp1050.oracle.com ([156.151.31.82]:20872 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751424AbcF3NWX (ORCPT ); Thu, 30 Jun 2016 09:22:23 -0400 Date: Thu, 30 Jun 2016 09:18:06 -0400 From: Konrad Rzeszutek Wilk To: Krzysztof Kozlowski Cc: Andrew Morton , linux-kernel@vger.kernel.org, hch@infradead.org, Bartlomiej Zolnierkiewicz , Boris Ostrovsky , David Vrabel , Juergen Gross , xen-devel@lists.xenproject.org Subject: Re: [PATCH v5 19/44] xen: dma-mapping: Use unsigned long for dma_attrs Message-ID: <20160630131806.GD5242@char.us.oracle.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-19-git-send-email-k.kozlowski@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1467275171-6298-19-git-send-email-k.kozlowski@samsung.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: userp1040.oracle.com [156.151.31.81] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 30, 2016 at 10:25:46AM +0200, Krzysztof Kozlowski wrote: > Split out subsystem specific changes for easier reviews. This will be > squashed with main commit. > > Signed-off-by: Krzysztof Kozlowski > [for xen] > Acked-by: David Vrabel Acked-by: Konrad Rzeszutek Wilk > --- > drivers/xen/swiotlb-xen.c | 14 +++++++------- > include/xen/swiotlb-xen.h | 12 ++++++------ > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c > index 7399782c0998..87e6035c9e81 100644 > --- a/drivers/xen/swiotlb-xen.c > +++ b/drivers/xen/swiotlb-xen.c > @@ -294,7 +294,7 @@ error: > void * > xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, > dma_addr_t *dma_handle, gfp_t flags, > - struct dma_attrs *attrs) > + unsigned long attrs) > { > void *ret; > int order = get_order(size); > @@ -346,7 +346,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_alloc_coherent); > > void > xen_swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr, > - dma_addr_t dev_addr, struct dma_attrs *attrs) > + dma_addr_t dev_addr, unsigned long attrs) > { > int order = get_order(size); > phys_addr_t phys; > @@ -378,7 +378,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_free_coherent); > dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, > unsigned long offset, size_t size, > enum dma_data_direction dir, > - struct dma_attrs *attrs) > + unsigned long attrs) > { > phys_addr_t map, phys = page_to_phys(page) + offset; > dma_addr_t dev_addr = xen_phys_to_bus(phys); > @@ -434,7 +434,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_map_page); > */ > static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr, > size_t size, enum dma_data_direction dir, > - struct dma_attrs *attrs) > + unsigned long attrs) > { > phys_addr_t paddr = xen_bus_to_phys(dev_addr); > > @@ -462,7 +462,7 @@ static void xen_unmap_single(struct device *hwdev, dma_addr_t dev_addr, > > void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, > size_t size, enum dma_data_direction dir, > - struct dma_attrs *attrs) > + unsigned long attrs) > { > xen_unmap_single(hwdev, dev_addr, size, dir, attrs); > } > @@ -538,7 +538,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_sync_single_for_device); > int > xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, > int nelems, enum dma_data_direction dir, > - struct dma_attrs *attrs) > + unsigned long attrs) > { > struct scatterlist *sg; > int i; > @@ -599,7 +599,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_map_sg_attrs); > void > xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, > int nelems, enum dma_data_direction dir, > - struct dma_attrs *attrs) > + unsigned long attrs) > { > struct scatterlist *sg; > int i; > diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h > index 8b2eb93ae8ba..7c35e279d1e3 100644 > --- a/include/xen/swiotlb-xen.h > +++ b/include/xen/swiotlb-xen.h > @@ -9,30 +9,30 @@ extern int xen_swiotlb_init(int verbose, bool early); > extern void > *xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, > dma_addr_t *dma_handle, gfp_t flags, > - struct dma_attrs *attrs); > + unsigned long attrs); > > extern void > xen_swiotlb_free_coherent(struct device *hwdev, size_t size, > void *vaddr, dma_addr_t dma_handle, > - struct dma_attrs *attrs); > + unsigned long attrs); > > extern dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, > unsigned long offset, size_t size, > enum dma_data_direction dir, > - struct dma_attrs *attrs); > + unsigned long attrs); > > extern void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, > size_t size, enum dma_data_direction dir, > - struct dma_attrs *attrs); > + unsigned long attrs); > extern int > xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, > int nelems, enum dma_data_direction dir, > - struct dma_attrs *attrs); > + unsigned long attrs); > > extern void > xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, > int nelems, enum dma_data_direction dir, > - struct dma_attrs *attrs); > + unsigned long attrs); > > extern void > xen_swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr, > -- > 1.9.1 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v5 19/44] xen: dma-mapping: Use unsigned long for dma_attrs Date: Thu, 30 Jun 2016 09:18:06 -0400 Message-ID: <20160630131806.GD5242@char.us.oracle.com> References: <1467275019-30789-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-1-git-send-email-k.kozlowski@samsung.com> <1467275171-6298-19-git-send-email-k.kozlowski@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bIbrg-0004qt-U2 for xen-devel@lists.xenproject.org; Thu, 30 Jun 2016 13:18:45 +0000 Content-Disposition: inline In-Reply-To: <1467275171-6298-19-git-send-email-k.kozlowski@samsung.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Krzysztof Kozlowski Cc: Juergen Gross , Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org, hch@infradead.org, David Vrabel , xen-devel@lists.xenproject.org, Andrew Morton , Boris Ostrovsky List-Id: xen-devel@lists.xenproject.org T24gVGh1LCBKdW4gMzAsIDIwMTYgYXQgMTA6MjU6NDZBTSArMDIwMCwgS3J6eXN6dG9mIEtvemxv d3NraSB3cm90ZToKPiBTcGxpdCBvdXQgc3Vic3lzdGVtIHNwZWNpZmljIGNoYW5nZXMgZm9yIGVh c2llciByZXZpZXdzLiBUaGlzIHdpbGwgYmUKPiBzcXVhc2hlZCB3aXRoIG1haW4gY29tbWl0Lgo+ IAo+IFNpZ25lZC1vZmYtYnk6IEtyenlzenRvZiBLb3psb3dza2kgPGsua296bG93c2tpQHNhbXN1 bmcuY29tPgo+IFtmb3IgeGVuXQo+IEFja2VkLWJ5OiBEYXZpZCBWcmFiZWwgPGRhdmlkLnZyYWJl bEBjaXRyaXguY29tPgoKQWNrZWQtYnk6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndp bGtAb3JhY2xlLmNvbT4KPiAtLS0KPiAgZHJpdmVycy94ZW4vc3dpb3RsYi14ZW4uYyB8IDE0ICsr KysrKystLS0tLS0tCj4gIGluY2x1ZGUveGVuL3N3aW90bGIteGVuLmggfCAxMiArKysrKystLS0t LS0KPiAgMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkK PiAKPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy94ZW4vc3dpb3RsYi14ZW4uYyBiL2RyaXZlcnMveGVu L3N3aW90bGIteGVuLmMKPiBpbmRleCA3Mzk5NzgyYzA5OTguLjg3ZTYwMzVjOWU4MSAxMDA2NDQK PiAtLS0gYS9kcml2ZXJzL3hlbi9zd2lvdGxiLXhlbi5jCj4gKysrIGIvZHJpdmVycy94ZW4vc3dp b3RsYi14ZW4uYwo+IEBAIC0yOTQsNyArMjk0LDcgQEAgZXJyb3I6Cj4gIHZvaWQgKgo+ICB4ZW5f c3dpb3RsYl9hbGxvY19jb2hlcmVudChzdHJ1Y3QgZGV2aWNlICpod2Rldiwgc2l6ZV90IHNpemUs Cj4gIAkJCSAgIGRtYV9hZGRyX3QgKmRtYV9oYW5kbGUsIGdmcF90IGZsYWdzLAo+IC0JCQkgICBz dHJ1Y3QgZG1hX2F0dHJzICphdHRycykKPiArCQkJICAgdW5zaWduZWQgbG9uZyBhdHRycykKPiAg ewo+ICAJdm9pZCAqcmV0Owo+ICAJaW50IG9yZGVyID0gZ2V0X29yZGVyKHNpemUpOwo+IEBAIC0z NDYsNyArMzQ2LDcgQEAgRVhQT1JUX1NZTUJPTF9HUEwoeGVuX3N3aW90bGJfYWxsb2NfY29oZXJl bnQpOwo+ICAKPiAgdm9pZAo+ICB4ZW5fc3dpb3RsYl9mcmVlX2NvaGVyZW50KHN0cnVjdCBkZXZp Y2UgKmh3ZGV2LCBzaXplX3Qgc2l6ZSwgdm9pZCAqdmFkZHIsCj4gLQkJCSAgZG1hX2FkZHJfdCBk ZXZfYWRkciwgc3RydWN0IGRtYV9hdHRycyAqYXR0cnMpCj4gKwkJCSAgZG1hX2FkZHJfdCBkZXZf YWRkciwgdW5zaWduZWQgbG9uZyBhdHRycykKPiAgewo+ICAJaW50IG9yZGVyID0gZ2V0X29yZGVy KHNpemUpOwo+ICAJcGh5c19hZGRyX3QgcGh5czsKPiBAQCAtMzc4LDcgKzM3OCw3IEBAIEVYUE9S VF9TWU1CT0xfR1BMKHhlbl9zd2lvdGxiX2ZyZWVfY29oZXJlbnQpOwo+ICBkbWFfYWRkcl90IHhl bl9zd2lvdGxiX21hcF9wYWdlKHN0cnVjdCBkZXZpY2UgKmRldiwgc3RydWN0IHBhZ2UgKnBhZ2Us Cj4gIAkJCQl1bnNpZ25lZCBsb25nIG9mZnNldCwgc2l6ZV90IHNpemUsCj4gIAkJCQllbnVtIGRt YV9kYXRhX2RpcmVjdGlvbiBkaXIsCj4gLQkJCQlzdHJ1Y3QgZG1hX2F0dHJzICphdHRycykKPiAr CQkJCXVuc2lnbmVkIGxvbmcgYXR0cnMpCj4gIHsKPiAgCXBoeXNfYWRkcl90IG1hcCwgcGh5cyA9 IHBhZ2VfdG9fcGh5cyhwYWdlKSArIG9mZnNldDsKPiAgCWRtYV9hZGRyX3QgZGV2X2FkZHIgPSB4 ZW5fcGh5c190b19idXMocGh5cyk7Cj4gQEAgLTQzNCw3ICs0MzQsNyBAQCBFWFBPUlRfU1lNQk9M X0dQTCh4ZW5fc3dpb3RsYl9tYXBfcGFnZSk7Cj4gICAqLwo+ICBzdGF0aWMgdm9pZCB4ZW5fdW5t YXBfc2luZ2xlKHN0cnVjdCBkZXZpY2UgKmh3ZGV2LCBkbWFfYWRkcl90IGRldl9hZGRyLAo+ICAJ CQkgICAgIHNpemVfdCBzaXplLCBlbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXIsCj4gLQkJCQkg c3RydWN0IGRtYV9hdHRycyAqYXR0cnMpCj4gKwkJCSAgICAgdW5zaWduZWQgbG9uZyBhdHRycykK PiAgewo+ICAJcGh5c19hZGRyX3QgcGFkZHIgPSB4ZW5fYnVzX3RvX3BoeXMoZGV2X2FkZHIpOwo+ ICAKPiBAQCAtNDYyLDcgKzQ2Miw3IEBAIHN0YXRpYyB2b2lkIHhlbl91bm1hcF9zaW5nbGUoc3Ry dWN0IGRldmljZSAqaHdkZXYsIGRtYV9hZGRyX3QgZGV2X2FkZHIsCj4gIAo+ICB2b2lkIHhlbl9z d2lvdGxiX3VubWFwX3BhZ2Uoc3RydWN0IGRldmljZSAqaHdkZXYsIGRtYV9hZGRyX3QgZGV2X2Fk ZHIsCj4gIAkJCSAgICBzaXplX3Qgc2l6ZSwgZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyLAo+ IC0JCQkgICAgc3RydWN0IGRtYV9hdHRycyAqYXR0cnMpCj4gKwkJCSAgICB1bnNpZ25lZCBsb25n IGF0dHJzKQo+ICB7Cj4gIAl4ZW5fdW5tYXBfc2luZ2xlKGh3ZGV2LCBkZXZfYWRkciwgc2l6ZSwg ZGlyLCBhdHRycyk7Cj4gIH0KPiBAQCAtNTM4LDcgKzUzOCw3IEBAIEVYUE9SVF9TWU1CT0xfR1BM KHhlbl9zd2lvdGxiX3N5bmNfc2luZ2xlX2Zvcl9kZXZpY2UpOwo+ICBpbnQKPiAgeGVuX3N3aW90 bGJfbWFwX3NnX2F0dHJzKHN0cnVjdCBkZXZpY2UgKmh3ZGV2LCBzdHJ1Y3Qgc2NhdHRlcmxpc3Qg KnNnbCwKPiAgCQkJIGludCBuZWxlbXMsIGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpciwKPiAt CQkJIHN0cnVjdCBkbWFfYXR0cnMgKmF0dHJzKQo+ICsJCQkgdW5zaWduZWQgbG9uZyBhdHRycykK PiAgewo+ICAJc3RydWN0IHNjYXR0ZXJsaXN0ICpzZzsKPiAgCWludCBpOwo+IEBAIC01OTksNyAr NTk5LDcgQEAgRVhQT1JUX1NZTUJPTF9HUEwoeGVuX3N3aW90bGJfbWFwX3NnX2F0dHJzKTsKPiAg dm9pZAo+ICB4ZW5fc3dpb3RsYl91bm1hcF9zZ19hdHRycyhzdHJ1Y3QgZGV2aWNlICpod2Rldiwg c3RydWN0IHNjYXR0ZXJsaXN0ICpzZ2wsCj4gIAkJCSAgIGludCBuZWxlbXMsIGVudW0gZG1hX2Rh dGFfZGlyZWN0aW9uIGRpciwKPiAtCQkJICAgc3RydWN0IGRtYV9hdHRycyAqYXR0cnMpCj4gKwkJ CSAgIHVuc2lnbmVkIGxvbmcgYXR0cnMpCj4gIHsKPiAgCXN0cnVjdCBzY2F0dGVybGlzdCAqc2c7 Cj4gIAlpbnQgaTsKPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS94ZW4vc3dpb3RsYi14ZW4uaCBiL2lu Y2x1ZGUveGVuL3N3aW90bGIteGVuLmgKPiBpbmRleCA4YjJlYjkzYWU4YmEuLjdjMzVlMjc5ZDFl MyAxMDA2NDQKPiAtLS0gYS9pbmNsdWRlL3hlbi9zd2lvdGxiLXhlbi5oCj4gKysrIGIvaW5jbHVk ZS94ZW4vc3dpb3RsYi14ZW4uaAo+IEBAIC05LDMwICs5LDMwIEBAIGV4dGVybiBpbnQgeGVuX3N3 aW90bGJfaW5pdChpbnQgdmVyYm9zZSwgYm9vbCBlYXJseSk7Cj4gIGV4dGVybiB2b2lkCj4gICp4 ZW5fc3dpb3RsYl9hbGxvY19jb2hlcmVudChzdHJ1Y3QgZGV2aWNlICpod2Rldiwgc2l6ZV90IHNp emUsCj4gIAkJCSAgICBkbWFfYWRkcl90ICpkbWFfaGFuZGxlLCBnZnBfdCBmbGFncywKPiAtCQkJ ICAgIHN0cnVjdCBkbWFfYXR0cnMgKmF0dHJzKTsKPiArCQkJICAgIHVuc2lnbmVkIGxvbmcgYXR0 cnMpOwo+ICAKPiAgZXh0ZXJuIHZvaWQKPiAgeGVuX3N3aW90bGJfZnJlZV9jb2hlcmVudChzdHJ1 Y3QgZGV2aWNlICpod2Rldiwgc2l6ZV90IHNpemUsCj4gIAkJCSAgdm9pZCAqdmFkZHIsIGRtYV9h ZGRyX3QgZG1hX2hhbmRsZSwKPiAtCQkJICBzdHJ1Y3QgZG1hX2F0dHJzICphdHRycyk7Cj4gKwkJ CSAgdW5zaWduZWQgbG9uZyBhdHRycyk7Cj4gIAo+ICBleHRlcm4gZG1hX2FkZHJfdCB4ZW5fc3dp b3RsYl9tYXBfcGFnZShzdHJ1Y3QgZGV2aWNlICpkZXYsIHN0cnVjdCBwYWdlICpwYWdlLAo+ICAJ CQkJICAgICAgIHVuc2lnbmVkIGxvbmcgb2Zmc2V0LCBzaXplX3Qgc2l6ZSwKPiAgCQkJCSAgICAg ICBlbnVtIGRtYV9kYXRhX2RpcmVjdGlvbiBkaXIsCj4gLQkJCQkgICAgICAgc3RydWN0IGRtYV9h dHRycyAqYXR0cnMpOwo+ICsJCQkJICAgICAgIHVuc2lnbmVkIGxvbmcgYXR0cnMpOwo+ICAKPiAg ZXh0ZXJuIHZvaWQgeGVuX3N3aW90bGJfdW5tYXBfcGFnZShzdHJ1Y3QgZGV2aWNlICpod2Rldiwg ZG1hX2FkZHJfdCBkZXZfYWRkciwKPiAgCQkJCSAgIHNpemVfdCBzaXplLCBlbnVtIGRtYV9kYXRh X2RpcmVjdGlvbiBkaXIsCj4gLQkJCQkgICBzdHJ1Y3QgZG1hX2F0dHJzICphdHRycyk7Cj4gKwkJ CQkgICB1bnNpZ25lZCBsb25nIGF0dHJzKTsKPiAgZXh0ZXJuIGludAo+ICB4ZW5fc3dpb3RsYl9t YXBfc2dfYXR0cnMoc3RydWN0IGRldmljZSAqaHdkZXYsIHN0cnVjdCBzY2F0dGVybGlzdCAqc2ds LAo+ICAJCQkgaW50IG5lbGVtcywgZW51bSBkbWFfZGF0YV9kaXJlY3Rpb24gZGlyLAo+IC0JCQkg c3RydWN0IGRtYV9hdHRycyAqYXR0cnMpOwo+ICsJCQkgdW5zaWduZWQgbG9uZyBhdHRycyk7Cj4g IAo+ICBleHRlcm4gdm9pZAo+ICB4ZW5fc3dpb3RsYl91bm1hcF9zZ19hdHRycyhzdHJ1Y3QgZGV2 aWNlICpod2Rldiwgc3RydWN0IHNjYXR0ZXJsaXN0ICpzZ2wsCj4gIAkJCSAgIGludCBuZWxlbXMs IGVudW0gZG1hX2RhdGFfZGlyZWN0aW9uIGRpciwKPiAtCQkJICAgc3RydWN0IGRtYV9hdHRycyAq YXR0cnMpOwo+ICsJCQkgICB1bnNpZ25lZCBsb25nIGF0dHJzKTsKPiAgCj4gIGV4dGVybiB2b2lk Cj4gIHhlbl9zd2lvdGxiX3N5bmNfc2luZ2xlX2Zvcl9jcHUoc3RydWN0IGRldmljZSAqaHdkZXYs IGRtYV9hZGRyX3QgZGV2X2FkZHIsCj4gLS0gCj4gMS45LjEKPiAKCl9fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVu LWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cDovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==