* Re: Patch "x86/amd_nb: Add AMD family 17h model 60h PCI IDs" has been added to the 5.7-stable tree
[not found] <20200618211421.CDE7820890@mail.kernel.org>
@ 2020-06-19 7:56 ` Alexander Monakov
2020-06-19 8:35 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Alexander Monakov @ 2020-06-19 7:56 UTC (permalink / raw)
To: Sasha Levin; +Cc: stable-commits, stable
On Thu, 18 Jun 2020, Sasha Levin wrote:
> This is a note to let you know that I've just added the patch titled
>
> x86/amd_nb: Add AMD family 17h model 60h PCI IDs
>
> to the 5.7-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
> x86-amd_nb-add-amd-family-17h-model-60h-pci-ids.patch
> and it can be found in the queue-5.7 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
It's not good to pick this patch alone into stable. Either all 3 patches
from https://lore.kernel.org/lkml/20200510204842.2603-1-amonakov@ispras.ru/
should be taken, or none of those.
In particular, the edac module will warn on load without the third patch.
Likewise for 5.4-stable (should I send a separate mail for that?)
Alexander
> commit 2adc45163a51ed6f0a0e776ee5c13639dfe22a8e
> Author: Alexander Monakov <amonakov@ispras.ru>
> Date: Sun May 10 20:48:40 2020 +0000
>
> x86/amd_nb: Add AMD family 17h model 60h PCI IDs
>
> [ Upstream commit a4e91825d7e1252f7cba005f1451e5464b23c15d ]
>
> Add PCI IDs for AMD Renoir (4000-series Ryzen CPUs). This is necessary
> to enable support for temperature sensors via the k10temp module.
>
> Signed-off-by: Alexander Monakov <amonakov@ispras.ru>
> Signed-off-by: Borislav Petkov <bp@suse.de>
> Acked-by: Yazen Ghannam <yazen.ghannam@amd.com>
> Acked-by: Guenter Roeck <linux@roeck-us.net>
> Link: https://lkml.kernel.org/r/20200510204842.2603-2-amonakov@ispras.ru
> Signed-off-by: Sasha Levin <sashal@kernel.org>
>
> diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
> index b6b3297851f3..18f6b7c4bd79 100644
> --- a/arch/x86/kernel/amd_nb.c
> +++ b/arch/x86/kernel/amd_nb.c
> @@ -18,9 +18,11 @@
> #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450
> #define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0
> #define PCI_DEVICE_ID_AMD_17H_M30H_ROOT 0x1480
> +#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT 0x1630
> #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464
> #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec
> #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494
> +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c
> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444
> #define PCI_DEVICE_ID_AMD_19H_DF_F4 0x1654
>
> @@ -33,6 +35,7 @@ static const struct pci_device_id amd_root_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_ROOT) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) },
> {}
> };
>
> @@ -50,6 +53,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },
> @@ -65,6 +69,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },
> + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },
> { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index 9a57e6717e5c..0ad57693f392 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -550,6 +550,7 @@
> #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
> #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
> #define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493
> +#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b
> #define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443
> #define PCI_DEVICE_ID_AMD_19H_DF_F3 0x1653
> #define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Patch "x86/amd_nb: Add AMD family 17h model 60h PCI IDs" has been added to the 5.7-stable tree
2020-06-19 7:56 ` Patch "x86/amd_nb: Add AMD family 17h model 60h PCI IDs" has been added to the 5.7-stable tree Alexander Monakov
@ 2020-06-19 8:35 ` Greg KH
2020-06-19 8:59 ` Alexander Monakov
0 siblings, 1 reply; 4+ messages in thread
From: Greg KH @ 2020-06-19 8:35 UTC (permalink / raw)
To: Alexander Monakov; +Cc: Sasha Levin, stable-commits, stable
On Fri, Jun 19, 2020 at 10:56:42AM +0300, Alexander Monakov wrote:
> On Thu, 18 Jun 2020, Sasha Levin wrote:
>
> > This is a note to let you know that I've just added the patch titled
> >
> > x86/amd_nb: Add AMD family 17h model 60h PCI IDs
> >
> > to the 5.7-stable tree which can be found at:
> > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> >
> > The filename of the patch is:
> > x86-amd_nb-add-amd-family-17h-model-60h-pci-ids.patch
> > and it can be found in the queue-5.7 subdirectory.
> >
> > If you, or anyone else, feels it should not be added to the stable tree,
> > please let <stable@vger.kernel.org> know about it.
>
> It's not good to pick this patch alone into stable. Either all 3 patches
> from https://lore.kernel.org/lkml/20200510204842.2603-1-amonakov@ispras.ru/
> should be taken, or none of those.
>
> In particular, the edac module will warn on load without the third patch.
>
> Likewise for 5.4-stable (should I send a separate mail for that?)
What are the git commit ids that should be applied that are not?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Patch "x86/amd_nb: Add AMD family 17h model 60h PCI IDs" has been added to the 5.7-stable tree
2020-06-19 8:35 ` Greg KH
@ 2020-06-19 8:59 ` Alexander Monakov
2020-06-19 12:15 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Alexander Monakov @ 2020-06-19 8:59 UTC (permalink / raw)
To: Greg KH; +Cc: Sasha Levin, stable-commits, stable
On Fri, 19 Jun 2020, Greg KH wrote:
> On Fri, Jun 19, 2020 at 10:56:42AM +0300, Alexander Monakov wrote:
> > On Thu, 18 Jun 2020, Sasha Levin wrote:
> >
> > > This is a note to let you know that I've just added the patch titled
> > >
> > > x86/amd_nb: Add AMD family 17h model 60h PCI IDs
> > >
> > > to the 5.7-stable tree which can be found at:
> > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> > >
> > > The filename of the patch is:
> > > x86-amd_nb-add-amd-family-17h-model-60h-pci-ids.patch
> > > and it can be found in the queue-5.7 subdirectory.
> > >
> > > If you, or anyone else, feels it should not be added to the stable tree,
> > > please let <stable@vger.kernel.org> know about it.
> >
> > It's not good to pick this patch alone into stable. Either all 3 patches
> > from https://lore.kernel.org/lkml/20200510204842.2603-1-amonakov@ispras.ru/
> > should be taken, or none of those.
> >
> > In particular, the edac module will warn on load without the third patch.
> >
> > Likewise for 5.4-stable (should I send a separate mail for that?)
>
> What are the git commit ids that should be applied that are not?
279f0b3a4b8066 ("hwmon: (k10temp) Add AMD family 17h model 60h PCI match")
b6bea24d41519e ("EDAC/amd64: Add AMD family 17h model 60h PCI IDs")
Alexander
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Patch "x86/amd_nb: Add AMD family 17h model 60h PCI IDs" has been added to the 5.7-stable tree
2020-06-19 8:59 ` Alexander Monakov
@ 2020-06-19 12:15 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2020-06-19 12:15 UTC (permalink / raw)
To: Alexander Monakov; +Cc: Sasha Levin, stable-commits, stable
On Fri, Jun 19, 2020 at 11:59:34AM +0300, Alexander Monakov wrote:
>
>
> On Fri, 19 Jun 2020, Greg KH wrote:
>
> > On Fri, Jun 19, 2020 at 10:56:42AM +0300, Alexander Monakov wrote:
> > > On Thu, 18 Jun 2020, Sasha Levin wrote:
> > >
> > > > This is a note to let you know that I've just added the patch titled
> > > >
> > > > x86/amd_nb: Add AMD family 17h model 60h PCI IDs
> > > >
> > > > to the 5.7-stable tree which can be found at:
> > > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> > > >
> > > > The filename of the patch is:
> > > > x86-amd_nb-add-amd-family-17h-model-60h-pci-ids.patch
> > > > and it can be found in the queue-5.7 subdirectory.
> > > >
> > > > If you, or anyone else, feels it should not be added to the stable tree,
> > > > please let <stable@vger.kernel.org> know about it.
> > >
> > > It's not good to pick this patch alone into stable. Either all 3 patches
> > > from https://lore.kernel.org/lkml/20200510204842.2603-1-amonakov@ispras.ru/
> > > should be taken, or none of those.
> > >
> > > In particular, the edac module will warn on load without the third patch.
> > >
> > > Likewise for 5.4-stable (should I send a separate mail for that?)
> >
> > What are the git commit ids that should be applied that are not?
>
> 279f0b3a4b8066 ("hwmon: (k10temp) Add AMD family 17h model 60h PCI match")
>
> b6bea24d41519e ("EDAC/amd64: Add AMD family 17h model 60h PCI IDs")
Thanks, all now queued up!
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-19 12:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20200618211421.CDE7820890@mail.kernel.org>
2020-06-19 7:56 ` Patch "x86/amd_nb: Add AMD family 17h model 60h PCI IDs" has been added to the 5.7-stable tree Alexander Monakov
2020-06-19 8:35 ` Greg KH
2020-06-19 8:59 ` Alexander Monakov
2020-06-19 12:15 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.