From mboxrd@z Thu Jan 1 00:00:00 1970 From: vincent.abriou@st.com (Vincent ABRIOU) Date: Fri, 26 Feb 2016 09:18:58 +0100 Subject: [PATCH, RESEND] drm/sti: use u32 to store DMA addresses In-Reply-To: <1456434711-48393-1-git-send-email-arnd@arndb.de> References: <1456434711-48393-1-git-send-email-arnd@arndb.de> Message-ID: <56D00A72.10007@st.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Arnd, Your patch will be part of the next pull request for the STI driver that will be done by the end of next week. Reviewed-by: Vincent Abriou On 02/25/2016 10:11 PM, Arnd Bergmann wrote: > The STi drm driver correctly warns about invalid format strings > when built with 64-bit dma_addr_t: > > sti_hqvdp.c: In function 'sti_hqvdp_vtg_cb': > sti_hqvdp.c:605:119: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] > sti_hqvdp.c: In function 'sti_hqvdp_atomic_update': > sti_hqvdp.c:931:118: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] > > This could be changed to using the %pad format string, but that > does not work when printing an rvalue, so instead I'm changing > the type in the sti_hqvdp structure to u32, which is what gets > written into the registers anyway. > > Signed-off-by: Arnd Bergmann > --- > drivers/gpu/drm/sti/sti_hqvdp.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > I originally submitted this on Tue, 08 Dec 2015, but got no reply, > so resending the same patch now. > > diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c > index 1d3c3d029603..7818d47bea43 100644 > --- a/drivers/gpu/drm/sti/sti_hqvdp.c > +++ b/drivers/gpu/drm/sti/sti_hqvdp.c > @@ -349,7 +349,7 @@ struct sti_hqvdp { > unsigned int curr_field_count; > unsigned int last_field_count; > void *hqvdp_cmd; > - dma_addr_t hqvdp_cmd_paddr; > + u32 hqvdp_cmd_paddr; > struct sti_vtg *vtg; > bool xp70_initialized; > }; > @@ -372,8 +372,8 @@ static const uint32_t hqvdp_supported_formats[] = { > */ > static int sti_hqvdp_get_free_cmd(struct sti_hqvdp *hqvdp) > { > - int curr_cmd, next_cmd; > - dma_addr_t cmd = hqvdp->hqvdp_cmd_paddr; > + u32 curr_cmd, next_cmd; > + u32 cmd = hqvdp->hqvdp_cmd_paddr; > int i; > > curr_cmd = readl(hqvdp->regs + HQVDP_MBX_CURRENT_CMD); > @@ -400,8 +400,8 @@ static int sti_hqvdp_get_free_cmd(struct sti_hqvdp *hqvdp) > */ > static int sti_hqvdp_get_curr_cmd(struct sti_hqvdp *hqvdp) > { > - int curr_cmd; > - dma_addr_t cmd = hqvdp->hqvdp_cmd_paddr; > + u32 curr_cmd; > + u32 cmd = hqvdp->hqvdp_cmd_paddr; > unsigned int i; > > curr_cmd = readl(hqvdp->regs + HQVDP_MBX_CURRENT_CMD); > @@ -612,19 +612,21 @@ int sti_hqvdp_vtg_cb(struct notifier_block *nb, unsigned long evt, void *data) > static void sti_hqvdp_init(struct sti_hqvdp *hqvdp) > { > int size; > + dma_addr_t dma_addr; > > hqvdp->vtg_nb.notifier_call = sti_hqvdp_vtg_cb; > > /* Allocate memory for the VDP commands */ > size = NB_VDP_CMD * sizeof(struct sti_hqvdp_cmd); > hqvdp->hqvdp_cmd = dma_alloc_wc(hqvdp->dev, size, > - &hqvdp->hqvdp_cmd_paddr, > + &dma_addr, > GFP_KERNEL | GFP_DMA); > if (!hqvdp->hqvdp_cmd) { > DRM_ERROR("Failed to allocate memory for VDP cmd\n"); > return; > } > > + hqvdp->hqvdp_cmd_paddr = (u32)dma_addr; > memset(hqvdp->hqvdp_cmd, 0, size); > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent ABRIOU Subject: Re: [PATCH, RESEND] drm/sti: use u32 to store DMA addresses Date: Fri, 26 Feb 2016 09:18:58 +0100 Message-ID: <56D00A72.10007@st.com> References: <1456434711-48393-1-git-send-email-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [62.209.51.94]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA09A6EA29 for ; Fri, 26 Feb 2016 08:19:10 +0000 (UTC) In-Reply-To: <1456434711-48393-1-git-send-email-arnd@arndb.de> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Arnd Bergmann , David Airlie Cc: "dri-devel@lists.freedesktop.org" , Benjamin Gaignard , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" List-Id: dri-devel@lists.freedesktop.org SGkgQXJuZCwKCgpZb3VyIHBhdGNoIHdpbGwgYmUgcGFydCBvZiB0aGUgbmV4dCBwdWxsIHJlcXVl c3QgZm9yIHRoZSBTVEkgZHJpdmVyIHRoYXQgCndpbGwgYmUgZG9uZSBieSB0aGUgZW5kIG9mIG5l eHQgd2Vlay4KClJldmlld2VkLWJ5OiBWaW5jZW50IEFicmlvdSA8dmluY2VudC5hYnJpb3VAc3Qu Y29tPgoKT24gMDIvMjUvMjAxNiAxMDoxMSBQTSwgQXJuZCBCZXJnbWFubiB3cm90ZToKPiBUaGUg U1RpIGRybSBkcml2ZXIgY29ycmVjdGx5IHdhcm5zIGFib3V0IGludmFsaWQgZm9ybWF0IHN0cmlu Z3MKPiB3aGVuIGJ1aWx0IHdpdGggNjQtYml0IGRtYV9hZGRyX3Q6Cj4KPiBzdGlfaHF2ZHAuYzog SW4gZnVuY3Rpb24gJ3N0aV9ocXZkcF92dGdfY2InOgo+IHN0aV9ocXZkcC5jOjYwNToxMTk6IHdh cm5pbmc6IGZvcm1hdCAnJXgnIGV4cGVjdHMgYXJndW1lbnQgb2YgdHlwZSAndW5zaWduZWQgaW50 JywgYnV0IGFyZ3VtZW50IDUgaGFzIHR5cGUgJ2RtYV9hZGRyX3Qge2FrYSBsb25nIGxvbmcgdW5z aWduZWQgaW50fScgWy1XZm9ybWF0PV0KPiBzdGlfaHF2ZHAuYzogSW4gZnVuY3Rpb24gJ3N0aV9o cXZkcF9hdG9taWNfdXBkYXRlJzoKPiBzdGlfaHF2ZHAuYzo5MzE6MTE4OiB3YXJuaW5nOiBmb3Jt YXQgJyV4JyBleHBlY3RzIGFyZ3VtZW50IG9mIHR5cGUgJ3Vuc2lnbmVkIGludCcsIGJ1dCBhcmd1 bWVudCA1IGhhcyB0eXBlICdkbWFfYWRkcl90IHtha2EgbG9uZyBsb25nIHVuc2lnbmVkIGludH0n IFstV2Zvcm1hdD1dCj4KPiBUaGlzIGNvdWxkIGJlIGNoYW5nZWQgdG8gdXNpbmcgdGhlICVwYWQg Zm9ybWF0IHN0cmluZywgYnV0IHRoYXQKPiBkb2VzIG5vdCB3b3JrIHdoZW4gcHJpbnRpbmcgYW4g cnZhbHVlLCBzbyBpbnN0ZWFkIEknbSBjaGFuZ2luZwo+IHRoZSB0eXBlIGluIHRoZSBzdGlfaHF2 ZHAgc3RydWN0dXJlIHRvIHUzMiwgd2hpY2ggaXMgd2hhdCBnZXRzCj4gd3JpdHRlbiBpbnRvIHRo ZSByZWdpc3RlcnMgYW55d2F5Lgo+Cj4gU2lnbmVkLW9mZi1ieTogQXJuZCBCZXJnbWFubiA8YXJu ZEBhcm5kYi5kZT4KPiAtLS0KPiAgIGRyaXZlcnMvZ3B1L2RybS9zdGkvc3RpX2hxdmRwLmMgfCAx NCArKysrKysrKy0tLS0tLQo+ICAgMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNiBk ZWxldGlvbnMoLSkKPgo+IEkgb3JpZ2luYWxseSBzdWJtaXR0ZWQgdGhpcyBvbiBUdWUsIDA4IERl YyAyMDE1LCBidXQgZ290IG5vIHJlcGx5LAo+IHNvIHJlc2VuZGluZyB0aGUgc2FtZSBwYXRjaCBu b3cuCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3N0aS9zdGlfaHF2ZHAuYyBiL2Ry aXZlcnMvZ3B1L2RybS9zdGkvc3RpX2hxdmRwLmMKPiBpbmRleCAxZDNjM2QwMjk2MDMuLjc4MThk NDdiZWE0MyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vc3RpL3N0aV9ocXZkcC5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL3N0aS9zdGlfaHF2ZHAuYwo+IEBAIC0zNDksNyArMzQ5LDcg QEAgc3RydWN0IHN0aV9ocXZkcCB7Cj4gICAJdW5zaWduZWQgaW50IGN1cnJfZmllbGRfY291bnQ7 Cj4gICAJdW5zaWduZWQgaW50IGxhc3RfZmllbGRfY291bnQ7Cj4gICAJdm9pZCAqaHF2ZHBfY21k Owo+IC0JZG1hX2FkZHJfdCBocXZkcF9jbWRfcGFkZHI7Cj4gKwl1MzIgaHF2ZHBfY21kX3BhZGRy Owo+ICAgCXN0cnVjdCBzdGlfdnRnICp2dGc7Cj4gICAJYm9vbCB4cDcwX2luaXRpYWxpemVkOwo+ ICAgfTsKPiBAQCAtMzcyLDggKzM3Miw4IEBAIHN0YXRpYyBjb25zdCB1aW50MzJfdCBocXZkcF9z dXBwb3J0ZWRfZm9ybWF0c1tdID0gewo+ICAgICovCj4gICBzdGF0aWMgaW50IHN0aV9ocXZkcF9n ZXRfZnJlZV9jbWQoc3RydWN0IHN0aV9ocXZkcCAqaHF2ZHApCj4gICB7Cj4gLQlpbnQgY3Vycl9j bWQsIG5leHRfY21kOwo+IC0JZG1hX2FkZHJfdCBjbWQgPSBocXZkcC0+aHF2ZHBfY21kX3BhZGRy Owo+ICsJdTMyIGN1cnJfY21kLCBuZXh0X2NtZDsKPiArCXUzMiBjbWQgPSBocXZkcC0+aHF2ZHBf Y21kX3BhZGRyOwo+ICAgCWludCBpOwo+Cj4gICAJY3Vycl9jbWQgPSByZWFkbChocXZkcC0+cmVn cyArIEhRVkRQX01CWF9DVVJSRU5UX0NNRCk7Cj4gQEAgLTQwMCw4ICs0MDAsOCBAQCBzdGF0aWMg aW50IHN0aV9ocXZkcF9nZXRfZnJlZV9jbWQoc3RydWN0IHN0aV9ocXZkcCAqaHF2ZHApCj4gICAg Ki8KPiAgIHN0YXRpYyBpbnQgc3RpX2hxdmRwX2dldF9jdXJyX2NtZChzdHJ1Y3Qgc3RpX2hxdmRw ICpocXZkcCkKPiAgIHsKPiAtCWludCBjdXJyX2NtZDsKPiAtCWRtYV9hZGRyX3QgY21kID0gaHF2 ZHAtPmhxdmRwX2NtZF9wYWRkcjsKPiArCXUzMiBjdXJyX2NtZDsKPiArCXUzMiBjbWQgPSBocXZk cC0+aHF2ZHBfY21kX3BhZGRyOwo+ICAgCXVuc2lnbmVkIGludCBpOwo+Cj4gICAJY3Vycl9jbWQg PSByZWFkbChocXZkcC0+cmVncyArIEhRVkRQX01CWF9DVVJSRU5UX0NNRCk7Cj4gQEAgLTYxMiwx OSArNjEyLDIxIEBAIGludCBzdGlfaHF2ZHBfdnRnX2NiKHN0cnVjdCBub3RpZmllcl9ibG9jayAq bmIsIHVuc2lnbmVkIGxvbmcgZXZ0LCB2b2lkICpkYXRhKQo+ICAgc3RhdGljIHZvaWQgc3RpX2hx dmRwX2luaXQoc3RydWN0IHN0aV9ocXZkcCAqaHF2ZHApCj4gICB7Cj4gICAJaW50IHNpemU7Cj4g KwlkbWFfYWRkcl90IGRtYV9hZGRyOwo+Cj4gICAJaHF2ZHAtPnZ0Z19uYi5ub3RpZmllcl9jYWxs ID0gc3RpX2hxdmRwX3Z0Z19jYjsKPgo+ICAgCS8qIEFsbG9jYXRlIG1lbW9yeSBmb3IgdGhlIFZE UCBjb21tYW5kcyAqLwo+ICAgCXNpemUgPSBOQl9WRFBfQ01EICogc2l6ZW9mKHN0cnVjdCBzdGlf aHF2ZHBfY21kKTsKPiAgIAlocXZkcC0+aHF2ZHBfY21kID0gZG1hX2FsbG9jX3djKGhxdmRwLT5k ZXYsIHNpemUsCj4gLQkJCQkJJmhxdmRwLT5ocXZkcF9jbWRfcGFkZHIsCj4gKwkJCQkJJmRtYV9h ZGRyLAo+ICAgCQkJCQlHRlBfS0VSTkVMIHwgR0ZQX0RNQSk7Cj4gICAJaWYgKCFocXZkcC0+aHF2 ZHBfY21kKSB7Cj4gICAJCURSTV9FUlJPUigiRmFpbGVkIHRvIGFsbG9jYXRlIG1lbW9yeSBmb3Ig VkRQIGNtZFxuIik7Cj4gICAJCXJldHVybjsKPiAgIAl9Cj4KPiArCWhxdmRwLT5ocXZkcF9jbWRf cGFkZHIgPSAodTMyKWRtYV9hZGRyOwo+ICAgCW1lbXNldChocXZkcC0+aHF2ZHBfY21kLCAwLCBz aXplKTsKPiAgIH0KPgo+Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1k ZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753641AbcBZITj (ORCPT ); Fri, 26 Feb 2016 03:19:39 -0500 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:27423 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751870AbcBZITh convert rfc822-to-8bit (ORCPT ); Fri, 26 Feb 2016 03:19:37 -0500 From: Vincent ABRIOU To: Arnd Bergmann , David Airlie CC: "linux-arm-kernel@lists.infradead.org" , Benjamin Gaignard , "dri-devel@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" Date: Fri, 26 Feb 2016 09:18:58 +0100 Subject: Re: [PATCH, RESEND] drm/sti: use u32 to store DMA addresses Thread-Topic: [PATCH, RESEND] drm/sti: use u32 to store DMA addresses Thread-Index: AdFwblhcS3oLaT/lQruCUKrHeXYVXg== Message-ID: <56D00A72.10007@st.com> References: <1456434711-48393-1-git-send-email-arnd@arndb.de> In-Reply-To: <1456434711-48393-1-git-send-email-arnd@arndb.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 acceptlanguage: en-US Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-02-26_07:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Arnd, Your patch will be part of the next pull request for the STI driver that will be done by the end of next week. Reviewed-by: Vincent Abriou On 02/25/2016 10:11 PM, Arnd Bergmann wrote: > The STi drm driver correctly warns about invalid format strings > when built with 64-bit dma_addr_t: > > sti_hqvdp.c: In function 'sti_hqvdp_vtg_cb': > sti_hqvdp.c:605:119: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] > sti_hqvdp.c: In function 'sti_hqvdp_atomic_update': > sti_hqvdp.c:931:118: warning: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Wformat=] > > This could be changed to using the %pad format string, but that > does not work when printing an rvalue, so instead I'm changing > the type in the sti_hqvdp structure to u32, which is what gets > written into the registers anyway. > > Signed-off-by: Arnd Bergmann > --- > drivers/gpu/drm/sti/sti_hqvdp.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > I originally submitted this on Tue, 08 Dec 2015, but got no reply, > so resending the same patch now. > > diff --git a/drivers/gpu/drm/sti/sti_hqvdp.c b/drivers/gpu/drm/sti/sti_hqvdp.c > index 1d3c3d029603..7818d47bea43 100644 > --- a/drivers/gpu/drm/sti/sti_hqvdp.c > +++ b/drivers/gpu/drm/sti/sti_hqvdp.c > @@ -349,7 +349,7 @@ struct sti_hqvdp { > unsigned int curr_field_count; > unsigned int last_field_count; > void *hqvdp_cmd; > - dma_addr_t hqvdp_cmd_paddr; > + u32 hqvdp_cmd_paddr; > struct sti_vtg *vtg; > bool xp70_initialized; > }; > @@ -372,8 +372,8 @@ static const uint32_t hqvdp_supported_formats[] = { > */ > static int sti_hqvdp_get_free_cmd(struct sti_hqvdp *hqvdp) > { > - int curr_cmd, next_cmd; > - dma_addr_t cmd = hqvdp->hqvdp_cmd_paddr; > + u32 curr_cmd, next_cmd; > + u32 cmd = hqvdp->hqvdp_cmd_paddr; > int i; > > curr_cmd = readl(hqvdp->regs + HQVDP_MBX_CURRENT_CMD); > @@ -400,8 +400,8 @@ static int sti_hqvdp_get_free_cmd(struct sti_hqvdp *hqvdp) > */ > static int sti_hqvdp_get_curr_cmd(struct sti_hqvdp *hqvdp) > { > - int curr_cmd; > - dma_addr_t cmd = hqvdp->hqvdp_cmd_paddr; > + u32 curr_cmd; > + u32 cmd = hqvdp->hqvdp_cmd_paddr; > unsigned int i; > > curr_cmd = readl(hqvdp->regs + HQVDP_MBX_CURRENT_CMD); > @@ -612,19 +612,21 @@ int sti_hqvdp_vtg_cb(struct notifier_block *nb, unsigned long evt, void *data) > static void sti_hqvdp_init(struct sti_hqvdp *hqvdp) > { > int size; > + dma_addr_t dma_addr; > > hqvdp->vtg_nb.notifier_call = sti_hqvdp_vtg_cb; > > /* Allocate memory for the VDP commands */ > size = NB_VDP_CMD * sizeof(struct sti_hqvdp_cmd); > hqvdp->hqvdp_cmd = dma_alloc_wc(hqvdp->dev, size, > - &hqvdp->hqvdp_cmd_paddr, > + &dma_addr, > GFP_KERNEL | GFP_DMA); > if (!hqvdp->hqvdp_cmd) { > DRM_ERROR("Failed to allocate memory for VDP cmd\n"); > return; > } > > + hqvdp->hqvdp_cmd_paddr = (u32)dma_addr; > memset(hqvdp->hqvdp_cmd, 0, size); > } > >