diff mbox series

drm/amdgpu: fix printk format for size_t variable

Message ID 20220221173737.3725760-1-trix@redhat.com (mailing list archive)
State New, archived
Headers show
Series drm/amdgpu: fix printk format for size_t variable | expand

Commit Message

Tom Rix Feb. 21, 2022, 5:37 p.m. UTC
From: Tom Rix <trix@redhat.com>

On mips64 allyesconfig, there is this build break
amdgpu_discovery.c:671:35: error: format '%ld' expects
  argument of type 'long int', but argument 4 has
  type 'size_t' {aka 'unsigned int'}
  DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);

For size_t, use %zu.

Fixes: a6c40b178092 ("drm/amdgpu: Show IP discovery in sysfs")
Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Luben Tuikov Feb. 21, 2022, 7:57 p.m. UTC | #1
Hi Tom,

This was already fixed with this patch, and LKML was CC-ed. See the CC tags in the patch below,

commit 4f7d7cda90cbd7
Author: Luben Tuikov <luben.tuikov@amd.com>
Date:   Wed Feb 16 16:47:32 2022 -0500

    drm/amdgpu: Fix ARM compilation warning
    
    Fix this ARM warning:
    
    drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:664:35: warning: format '%ld'
    expects argument of type 'long int', but argument 4 has type 'size_t' {aka
    'unsigned int'} [-Wformat=]
    
    Cc: Alex Deucher <Alexander.Deucher@amd.com>
    Cc: kbuild-all@lists.01.org
    Cc: linux-kernel@vger.kernel.org
    Reported-by: kernel test robot <lkp@intel.com>
    Fixes: 7e60fbfbdc10a0 ("drm/amdgpu: Show IP discovery in sysfs")
    Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
    Acked-by: Alex Deucher <Alexander.Deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 2506bcf36c870c..6c7ec058125e1d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
                            le16_to_cpu(ip->hw_id) != ii)
                                goto next_ip;
 
-                       DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
+                       DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
 
                        /* We have a hw_id match; register the hw
                         * block if not yet registered.

Regards,
Luben

On 2022-02-21 12:37, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> On mips64 allyesconfig, there is this build break
> amdgpu_discovery.c:671:35: error: format '%ld' expects
>   argument of type 'long int', but argument 4 has
>   type 'size_t' {aka 'unsigned int'}
>   DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
> 
> For size_t, use %zu.
> 
> Fixes: a6c40b178092 ("drm/amdgpu: Show IP discovery in sysfs")
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 7c7e28fd912e..58238f67b1d3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>  			    le16_to_cpu(ip->hw_id) != ii)
>  				goto next_ip;
>  
> -			DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
> +			DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>  
>  			/* We have a hw_id match; register the hw
>  			 * block if not yet registered.

Regards,
Tom Rix Feb. 21, 2022, 8:36 p.m. UTC | #2
On 2/21/22 11:57 AM, Luben Tuikov wrote:
> Hi Tom,
>
> This was already fixed with this patch, and LKML was CC-ed. See the CC tags in the patch below,
>
> commit 4f7d7cda90cbd7
> Author: Luben Tuikov <luben.tuikov@amd.com>
> Date:   Wed Feb 16 16:47:32 2022 -0500
>
>      drm/amdgpu: Fix ARM compilation warning
>      
>      Fix this ARM warning:

I glad it wasn't just mips ;)

There have been a couple of build breaks with amdgpu recently.

Nick asked about adding clang to your ci.

Could at least one non x86_64 gcc also be added, maybe aarch64 ?

Tom

>      
>      drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:664:35: warning: format '%ld'
>      expects argument of type 'long int', but argument 4 has type 'size_t' {aka
>      'unsigned int'} [-Wformat=]
>      
>      Cc: Alex Deucher <Alexander.Deucher@amd.com>
>      Cc: kbuild-all@lists.01.org
>      Cc: linux-kernel@vger.kernel.org
>      Reported-by: kernel test robot <lkp@intel.com>
>      Fixes: 7e60fbfbdc10a0 ("drm/amdgpu: Show IP discovery in sysfs")
>      Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
>      Acked-by: Alex Deucher <Alexander.Deucher@amd.com>
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index 2506bcf36c870c..6c7ec058125e1d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>                              le16_to_cpu(ip->hw_id) != ii)
>                                  goto next_ip;
>   
> -                       DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
> +                       DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>   
>                          /* We have a hw_id match; register the hw
>                           * block if not yet registered.
>
> Regards,
> Luben
>
> On 2022-02-21 12:37, trix@redhat.com wrote:
>> From: Tom Rix <trix@redhat.com>
>>
>> On mips64 allyesconfig, there is this build break
>> amdgpu_discovery.c:671:35: error: format '%ld' expects
>>    argument of type 'long int', but argument 4 has
>>    type 'size_t' {aka 'unsigned int'}
>>    DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>>
>> For size_t, use %zu.
>>
>> Fixes: a6c40b178092 ("drm/amdgpu: Show IP discovery in sysfs")
>> Signed-off-by: Tom Rix <trix@redhat.com>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>> index 7c7e28fd912e..58238f67b1d3 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>>   			    le16_to_cpu(ip->hw_id) != ii)
>>   				goto next_ip;
>>   
>> -			DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>> +			DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>>   
>>   			/* We have a hw_id match; register the hw
>>   			 * block if not yet registered.
> Regards,
Luben Tuikov Feb. 21, 2022, 8:53 p.m. UTC | #3
On 2022-02-21 15:36, Tom Rix wrote:
> 
> On 2/21/22 11:57 AM, Luben Tuikov wrote:
>> Hi Tom,
>>
>> This was already fixed with this patch, and LKML was CC-ed. See the CC tags in the patch below,
>>
>> commit 4f7d7cda90cbd7
>> Author: Luben Tuikov <luben.tuikov@amd.com>
>> Date:   Wed Feb 16 16:47:32 2022 -0500
>>
>>      drm/amdgpu: Fix ARM compilation warning
>>      
>>      Fix this ARM warning:
> 
> I glad it wasn't just mips ;)
> 
> There have been a couple of build breaks with amdgpu recently.
> 
> Nick asked about adding clang to your ci.
> 
> Could at least one non x86_64 gcc also be added, maybe aarch64 ?

Yeah, that's a great idea. I tried the make.cross (for ARM) as per
the initial breakage report, but when I tried it, it got into a loop of
"make ARCH=arm mrproper" --> "make prepare" --> "make ARCH=arm mrproper" --> "make prepare" --> ...
and I couldn't figure out why.

I don't mind adding ARM cross compilation into my local setup.

Regards,
Luben


> 
> Tom
> 
>>      
>>      drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:664:35: warning: format '%ld'
>>      expects argument of type 'long int', but argument 4 has type 'size_t' {aka
>>      'unsigned int'} [-Wformat=]
>>      
>>      Cc: Alex Deucher <Alexander.Deucher@amd.com>
>>      Cc: kbuild-all@lists.01.org
>>      Cc: linux-kernel@vger.kernel.org
>>      Reported-by: kernel test robot <lkp@intel.com>
>>      Fixes: 7e60fbfbdc10a0 ("drm/amdgpu: Show IP discovery in sysfs")
>>      Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
>>      Acked-by: Alex Deucher <Alexander.Deucher@amd.com>
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>> index 2506bcf36c870c..6c7ec058125e1d 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>>                              le16_to_cpu(ip->hw_id) != ii)
>>                                  goto next_ip;
>>   
>> -                       DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>> +                       DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>>   
>>                          /* We have a hw_id match; register the hw
>>                           * block if not yet registered.
>>
>> Regards,
>> Luben
>>
>> On 2022-02-21 12:37, trix@redhat.com wrote:
>>> From: Tom Rix <trix@redhat.com>
>>>
>>> On mips64 allyesconfig, there is this build break
>>> amdgpu_discovery.c:671:35: error: format '%ld' expects
>>>    argument of type 'long int', but argument 4 has
>>>    type 'size_t' {aka 'unsigned int'}
>>>    DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>>>
>>> For size_t, use %zu.
>>>
>>> Fixes: a6c40b178092 ("drm/amdgpu: Show IP discovery in sysfs")
>>> Signed-off-by: Tom Rix <trix@redhat.com>
>>> ---
>>>   drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>> index 7c7e28fd912e..58238f67b1d3 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>>>   			    le16_to_cpu(ip->hw_id) != ii)
>>>   				goto next_ip;
>>>   
>>> -			DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>>> +			DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>>>   
>>>   			/* We have a hw_id match; register the hw
>>>   			 * block if not yet registered.
>> Regards,
> 

Regards,
Tom Rix Feb. 21, 2022, 9:02 p.m. UTC | #4
On 2/21/22 12:53 PM, Luben Tuikov wrote:
> On 2022-02-21 15:36, Tom Rix wrote:
>> On 2/21/22 11:57 AM, Luben Tuikov wrote:
>>> Hi Tom,
>>>
>>> This was already fixed with this patch, and LKML was CC-ed. See the CC tags in the patch below,
>>>
>>> commit 4f7d7cda90cbd7
>>> Author: Luben Tuikov <luben.tuikov@amd.com>
>>> Date:   Wed Feb 16 16:47:32 2022 -0500
>>>
>>>       drm/amdgpu: Fix ARM compilation warning
>>>       
>>>       Fix this ARM warning:
>> I glad it wasn't just mips ;)
>>
>> There have been a couple of build breaks with amdgpu recently.
>>
>> Nick asked about adding clang to your ci.
>>
>> Could at least one non x86_64 gcc also be added, maybe aarch64 ?
> Yeah, that's a great idea. I tried the make.cross (for ARM) as per
> the initial breakage report, but when I tried it, it got into a loop of
> "make ARCH=arm mrproper" --> "make prepare" --> "make ARCH=arm mrproper" --> "make prepare" --> ...
> and I couldn't figure out why.
Maybe need to set CROSS_COMPILE ?
> I don't mind adding ARM cross compilation into my local setup.

For crosses, I generate a 'make' script like

#!/bin/sh

export PATH=<path-to-cross-tools>/bin:$PATH

make ARCH=arm64 CROSS_COMPILE=aarch64-elf- $@

so workflow looks like normal, replacing make with ./make

Tom

>
> Regards,
> Luben
>
>
>> Tom
>>
>>>       
>>>       drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:664:35: warning: format '%ld'
>>>       expects argument of type 'long int', but argument 4 has type 'size_t' {aka
>>>       'unsigned int'} [-Wformat=]
>>>       
>>>       Cc: Alex Deucher <Alexander.Deucher@amd.com>
>>>       Cc: kbuild-all@lists.01.org
>>>       Cc: linux-kernel@vger.kernel.org
>>>       Reported-by: kernel test robot <lkp@intel.com>
>>>       Fixes: 7e60fbfbdc10a0 ("drm/amdgpu: Show IP discovery in sysfs")
>>>       Signed-off-by: Luben Tuikov <luben.tuikov@amd.com>
>>>       Acked-by: Alex Deucher <Alexander.Deucher@amd.com>
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>> index 2506bcf36c870c..6c7ec058125e1d 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>>>                               le16_to_cpu(ip->hw_id) != ii)
>>>                                   goto next_ip;
>>>    
>>> -                       DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>>> +                       DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>>>    
>>>                           /* We have a hw_id match; register the hw
>>>                            * block if not yet registered.
>>>
>>> Regards,
>>> Luben
>>>
>>> On 2022-02-21 12:37, trix@redhat.com wrote:
>>>> From: Tom Rix <trix@redhat.com>
>>>>
>>>> On mips64 allyesconfig, there is this build break
>>>> amdgpu_discovery.c:671:35: error: format '%ld' expects
>>>>     argument of type 'long int', but argument 4 has
>>>>     type 'size_t' {aka 'unsigned int'}
>>>>     DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>>>>
>>>> For size_t, use %zu.
>>>>
>>>> Fixes: a6c40b178092 ("drm/amdgpu: Show IP discovery in sysfs")
>>>> Signed-off-by: Tom Rix <trix@redhat.com>
>>>> ---
>>>>    drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +-
>>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>>> index 7c7e28fd912e..58238f67b1d3 100644
>>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
>>>> @@ -668,7 +668,7 @@ static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
>>>>    			    le16_to_cpu(ip->hw_id) != ii)
>>>>    				goto next_ip;
>>>>    
>>>> -			DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
>>>> +			DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
>>>>    
>>>>    			/* We have a hw_id match; register the hw
>>>>    			 * block if not yet registered.
>>> Regards,
> Regards,
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 7c7e28fd912e..58238f67b1d3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -668,7 +668,7 @@  static int amdgpu_discovery_sysfs_ips(struct amdgpu_device *adev,
 			    le16_to_cpu(ip->hw_id) != ii)
 				goto next_ip;
 
-			DRM_DEBUG("match:%d @ ip_offset:%ld", ii, ip_offset);
+			DRM_DEBUG("match:%d @ ip_offset:%zu", ii, ip_offset);
 
 			/* We have a hw_id match; register the hw
 			 * block if not yet registered.