lkml.org 
[lkml]   [2018]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 024/110] x86/amd_nb: Add support for Raven Ridge CPUs
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Guenter Roeck <linux@roeck-us.net>

    commit f9bc6b2dd9cf025f827f471769e1d88b527bfb91 upstream.

    Add Raven Ridge root bridge and data fabric PCI IDs.
    This is required for amd_pci_dev_to_node_id() and amd_smn_read().

    Cc: stable@vger.kernel.org # v4.16+
    Tested-by: Gabriel Craciunescu <nix.or.die@gmail.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/amd_nb.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/arch/x86/kernel/amd_nb.c
    +++ b/arch/x86/kernel/amd_nb.c
    @@ -14,8 +14,11 @@
    #include <asm/amd_nb.h>

    #define PCI_DEVICE_ID_AMD_17H_ROOT 0x1450
    +#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT 0x15d0
    #define PCI_DEVICE_ID_AMD_17H_DF_F3 0x1463
    #define PCI_DEVICE_ID_AMD_17H_DF_F4 0x1464
    +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb
    +#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec

    /* Protect the PCI config register pairs used for SMN and DF indirect access. */
    static DEFINE_MUTEX(smn_mutex);
    @@ -24,6 +27,7 @@ static u32 *flush_words;

    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) },
    {}
    };

    @@ -39,6 +43,7 @@ const struct pci_device_id amd_nb_misc_i
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },
    { 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_CNB17H_F3) },
    {}
    };
    @@ -51,6 +56,7 @@ static const struct pci_device_id amd_nb
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
    { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F4) },
    { 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_CNB17H_F4) },
    {}
    };

    \
     
     \ /
      Last update: 2018-05-21 23:51    [W:3.625 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site