Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core
driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs.
Cc: Srinivas Pandruvada <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: David Box <[email protected]>
Acked-by: Rajneesh Bhardwaj <[email protected]>
Acked-by: Hans de Goede <[email protected]>
Signed-off-by: Gayatri Kammela <[email protected]>
---
Changes since v1:
1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 :
"x86/cpu: Add new Raptor Lake CPU model number".
2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and
Rajneesh.
drivers/platform/x86/intel/pmc/core.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
index a1fe1e0dcf4a..17ec5825d13d 100644
--- a/drivers/platform/x86/intel/pmc/core.c
+++ b/drivers/platform/x86/intel/pmc/core.c
@@ -1914,6 +1914,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &tgl_reg_map),
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_reg_map),
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &tgl_reg_map),
+ X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_reg_map),
+ X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_reg_map),
{}
};
--
2.25.1
Hk,
On 9/13/22 00:33, Gayatri Kammela wrote:
> Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core
> driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs.
>
> Cc: Srinivas Pandruvada <[email protected]>
> Cc: Andy Shevchenko <[email protected]>
> Cc: David Box <[email protected]>
> Acked-by: Rajneesh Bhardwaj <[email protected]>
> Acked-by: Hans de Goede <[email protected]>
> Signed-off-by: Gayatri Kammela <[email protected]>
> ---
> Changes since v1:
> 1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 :
> "x86/cpu: Add new Raptor Lake CPU model number".
> 2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and
> Rajneesh.
I still cannot take this, since patch 1/2 is *already merged* through
another tree, so me cherry-picking it leads to potential conflicts.
As I have already explained twice you need to submit this upstream
throuh the same tree which has the original merge of patch 1/2.
You can tell the maintainer of that tree that I'm ok with merging this
through that maintainers tree and that that is what my Ack is for.
Regards,
Hans
>
> drivers/platform/x86/intel/pmc/core.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
> index a1fe1e0dcf4a..17ec5825d13d 100644
> --- a/drivers/platform/x86/intel/pmc/core.c
> +++ b/drivers/platform/x86/intel/pmc/core.c
> @@ -1914,6 +1914,8 @@ static const struct x86_cpu_id intel_pmc_core_ids[] = {
> X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_N, &tgl_reg_map),
> X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, &adl_reg_map),
> X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, &tgl_reg_map),
> + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, &adl_reg_map),
> + X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, &adl_reg_map),
> {}
> };
>
On 19. 09. 22, 13:41, Hans de Goede wrote:
> On 9/13/22 00:33, Gayatri Kammela wrote:
>> Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core
>> driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs.
>>
>> Cc: Srinivas Pandruvada <[email protected]>
>> Cc: Andy Shevchenko <[email protected]>
>> Cc: David Box <[email protected]>
>> Acked-by: Rajneesh Bhardwaj <[email protected]>
>> Acked-by: Hans de Goede <[email protected]>
>> Signed-off-by: Gayatri Kammela <[email protected]>
>> ---
>> Changes since v1:
>> 1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 :
>> "x86/cpu: Add new Raptor Lake CPU model number".
>> 2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and
>> Rajneesh.
>
> I still cannot take this, since patch 1/2 is *already merged* through
> another tree, so me cherry-picking it leads to potential conflicts.
>
> As I have already explained twice you need to submit this upstream
> throuh the same tree which has the original merge of patch 1/2.
Hi, friendly ping: has this ever happened, Gayatri?
thanks,
--
js
suse labs
Hi,
On 10/14/22 09:50, Jiri Slaby wrote:
> On 19. 09. 22, 13:41, Hans de Goede wrote:
>
>> On 9/13/22 00:33, Gayatri Kammela wrote:
>>> Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core
>>> driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs.
>>>
>>> Cc: Srinivas Pandruvada <[email protected]>
>>> Cc: Andy Shevchenko <[email protected]>
>>> Cc: David Box <[email protected]>
>>> Acked-by: Rajneesh Bhardwaj <[email protected]>
>>> Acked-by: Hans de Goede <[email protected]>
>>> Signed-off-by: Gayatri Kammela <[email protected]>
>>> ---
>>> Changes since v1:
>>> 1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 :
>>> "x86/cpu: Add new Raptor Lake CPU model number".
>>> 2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and
>>> Rajneesh.
>>
>> I still cannot take this, since patch 1/2 is *already merged* through
>> another tree, so me cherry-picking it leads to potential conflicts.
>>
>> As I have already explained twice you need to submit this upstream
>> throuh the same tree which has the original merge of patch 1/2.
>
> Hi, friendly ping: has this ever happened, Gayatri?
If not, 6.1-rc1 will be out soon. If this gets resend after 6.1-rc1
is out I can take it and I can add it to 6.1-rc# as a fix in my
next pull-req to Linus.
Regards,
Hans
Hi,
On 10/14/22 09:50, Jiri Slaby wrote:
> On 19. 09. 22, 13:41, Hans de Goede wrote:
>
>> On 9/13/22 00:33, Gayatri Kammela wrote:
>>> Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core
>>> driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs.
>>>
>>> Cc: Srinivas Pandruvada <[email protected]>
>>> Cc: Andy Shevchenko <[email protected]>
>>> Cc: David Box <[email protected]>
>>> Acked-by: Rajneesh Bhardwaj <[email protected]>
>>> Acked-by: Hans de Goede <[email protected]>
>>> Signed-off-by: Gayatri Kammela <[email protected]>
>>> ---
>>> Changes since v1:
>>> 1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 :
>>> "x86/cpu: Add new Raptor Lake CPU model number".
>>> 2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and
>>> Rajneesh.
>>
>> I still cannot take this, since patch 1/2 is *already merged* through
>> another tree, so me cherry-picking it leads to potential conflicts.
>>
>> As I have already explained twice you need to submit this upstream
>> throuh the same tree which has the original merge of patch 1/2.
>
> Hi, friendly ping: has this ever happened, Gayatri?
Since the necessary change are in 6.1-rc1 now, I have merged this
patch now and I'll include this in the pdx86 fixes pull-req which
I'm preparing for 6.1-rc3:
Thank you for your patch, I've applied this patch to my review-hans
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
On 10/24/2022 2:46 AM, Hans de Goede wrote:
> Hi,
>
> On 10/14/22 09:50, Jiri Slaby wrote:
>> On 19. 09. 22, 13:41, Hans de Goede wrote:
>>
>>> On 9/13/22 00:33, Gayatri Kammela wrote:
>>>> Add Raptor Lake client parts (both RPL and RPL_S) support to pmc core
>>>> driver. Raptor Lake client parts reuse all the Alder Lake PCH IPs.
>>>>
>>>> Cc: Srinivas Pandruvada <[email protected]>
>>>> Cc: Andy Shevchenko <[email protected]>
>>>> Cc: David Box <[email protected]>
>>>> Acked-by: Rajneesh Bhardwaj <[email protected]>
>>>> Acked-by: Hans de Goede <[email protected]>
>>>> Signed-off-by: Gayatri Kammela <[email protected]>
>>>> ---
>>>> Changes since v1:
>>>> 1) Added a dependency patch- ea902bcc1943f7539200ec464de3f54335588774 :
>>>> "x86/cpu: Add new Raptor Lake CPU model number".
>>>> 2) Rebased the above patch on v6.0-rc1 with "Acked-by" from Hans and
>>>> Rajneesh.
>>> I still cannot take this, since patch 1/2 is *already merged* through
>>> another tree, so me cherry-picking it leads to potential conflicts.
>>>
>>> As I have already explained twice you need to submit this upstream
>>> throuh the same tree which has the original merge of patch 1/2.
>> Hi, friendly ping: has this ever happened, Gayatri?
> Since the necessary change are in 6.1-rc1 now, I have merged this
> patch now and I'll include this in the pdx86 fixes pull-req which
> I'm preparing for 6.1-rc3:
>
> Thank you for your patch, I've applied this patch to my review-hans
> branch:
> https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
>
> Note it will show up in my review-hans branch once I've pushed my
> local branch there, which might take a while.
>
> Once I've run some tests on this branch the patches there will be
> added to the platform-drivers-x86/for-next branch and eventually
> will be included in the pdx86 pull-request to Linus for the next
> merge-window.
>
> Regards,
>
> Hans
hi Hans,
Thank you for merging this patch. I was planning on sending this patch
to combine with other series as this could be dependency. Apologies for
my late reply. Thank you!
>