FAILED: patch "[PATCH] drm/amdgpu: Drop inline from" failed to apply to 5.14-stable tree

FAILED: patch "[PATCH] drm/amdgpu: Drop inline from" failed to apply to 5.14-stable tree

[gregkh]

The patch below does not apply to the 5.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 114518ff3b30a3f0611f384fb58e0a968fdf7f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Thu, 9 Sep 2021 18:56:28 +0200
Subject: [PATCH] drm/amdgpu: Drop inline from
 amdgpu_ras_eeprom_max_record_count
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was unusual; normally, inline functions are declared static as
well, and defined in a header file if used by multiple compilation
units. The latter would be more involved in this case, so just drop
the inline declaration for now.

Fixes compile failure building for ppc64le on RHEL 8:

In file included from ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h:32,
                 from ../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:33:
../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c: In function ‘amdgpu_ras_recovery_init’:
../drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h:90:17: error: inlining failed in call
 to ‘always_inline’ ‘amdgpu_ras_eeprom_max_record_count’: function body not available
   90 | inline uint32_t amdgpu_ras_eeprom_max_record_count(void);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1985:34: note: called from here
 1985 |         max_eeprom_records_len = amdgpu_ras_eeprom_max_record_count();
      |                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes: c84d46707ebb "drm/amdgpu: validate bad page threshold in ras(v3)"
Reviewed-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Michel Dänzer <mdaenzer@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
index dc44c946a244..98732518543e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
@@ -757,7 +757,7 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control,
 	return res;
 }
 
-inline uint32_t amdgpu_ras_eeprom_max_record_count(void)
+uint32_t amdgpu_ras_eeprom_max_record_count(void)
 {
 	return RAS_MAX_RECORD_COUNT;
 }
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
index f95fc61b3021..6bb00578bfbb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h
@@ -120,7 +120,7 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control,
 int amdgpu_ras_eeprom_append(struct amdgpu_ras_eeprom_control *control,
 			     struct eeprom_table_record *records, const u32 num);
 
-inline uint32_t amdgpu_ras_eeprom_max_record_count(void);
+uint32_t amdgpu_ras_eeprom_max_record_count(void);
 
 void amdgpu_ras_debugfs_set_ret_size(struct amdgpu_ras_eeprom_control *control);
 

Re: FAILED: patch "[PATCH] drm/amdgpu: Drop inline from" failed to apply to 5.14-stable tree

[Greg KH]

On Mon, Sep 20, 2021 at 10:57:34AM +0200, Michel Dänzer wrote:
> On 2021-09-20 10:52, gregkh@linuxfoundation.org wrote:
> > 
> > The patch below does not apply to the 5.14-stable tree.
> > If someone wants it applied there, or to any other stable or longterm
> > tree, then please email the backport, including the original git commit
> > id to <stable@vger.kernel.org>.
> 
> I wrote a comment above the Fixes line:
> 
> # The function is called amdgpu_ras_eeprom_get_record_max_length on
> # stable branches
> 
> 
> Looks like that got lost somewhere along the way.

Can you send a working patch for these older kernels that I can queue
up?

thanks,

greg k-h

Re: FAILED: patch "[PATCH] drm/amdgpu: Drop inline from" failed to apply to 5.14-stable tree

[Michel Dänzer]

On 2021-09-20 11:03, Greg KH wrote:
> On Mon, Sep 20, 2021 at 10:57:34AM +0200, Michel Dänzer wrote:
>> On 2021-09-20 10:52, gregkh@linuxfoundation.org wrote:
>>>
>>> The patch below does not apply to the 5.14-stable tree.
>>> If someone wants it applied there, or to any other stable or longterm
>>> tree, then please email the backport, including the original git commit
>>> id to <stable@vger.kernel.org>.
>>
>> I wrote a comment above the Fixes line:
>>
>> # The function is called amdgpu_ras_eeprom_get_record_max_length on
>> # stable branches
>>
>>
>> Looks like that got lost somewhere along the way.
> 
> Can you send a working patch for these older kernels that I can queue
> up?

Actually, it's not critical to have this on the stable branches, let's 
just drop it.


-- 
Earthling Michel Dänzer               |               https://redhat.com
Libre software enthusiast             |             Mesa and X developer

Re: FAILED: patch "[PATCH] drm/amdgpu: Drop inline from" failed to apply to 5.14-stable tree

[Greg KH]

On Mon, Sep 20, 2021 at 11:11:51AM +0200, Michel Dänzer wrote:
> On 2021-09-20 11:03, Greg KH wrote:
> > On Mon, Sep 20, 2021 at 10:57:34AM +0200, Michel Dänzer wrote:
> > > On 2021-09-20 10:52, gregkh@linuxfoundation.org wrote:
> > > > 
> > > > The patch below does not apply to the 5.14-stable tree.
> > > > If someone wants it applied there, or to any other stable or longterm
> > > > tree, then please email the backport, including the original git commit
> > > > id to <stable@vger.kernel.org>.
> > > 
> > > I wrote a comment above the Fixes line:
> > > 
> > > # The function is called amdgpu_ras_eeprom_get_record_max_length on
> > > # stable branches
> > > 
> > > 
> > > Looks like that got lost somewhere along the way.
> > 
> > Can you send a working patch for these older kernels that I can queue
> > up?
> 
> Actually, it's not critical to have this on the stable branches, let's just
> drop it.

Fine with me, thanks!

greg k-h