lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 562/717] ASoC: AMD Raven/Renoir - fix the PCI probe (PCI revision)
    Date
    From: Jaroslav Kysela <perex@perex.cz>

    commit 55d8e6a85bce21f748c42eedea63681219f70523 upstream.

    The Raven and Renoir ACP can be distinguished by the PCI revision.
    Let's do the check very early, otherwise the wrong probe code
    can be run.

    Link: https://lore.kernel.org/alsa-devel/2e4587f8-f602-cf23-4845-fd27a32b1cfc@amd.com/
    Cc: <stable@kernel.org>
    Cc: Vijendar Mukunda <Vijendar.Mukunda@amd.com>
    Cc: Mark Brown <broonie@kernel.org>
    Signed-off-by: Jaroslav Kysela <perex@perex.cz>
    Link: https://lore.kernel.org/r/20201208181233.2745726-1-perex@perex.cz
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/amd/raven/pci-acp3x.c | 4 ++++
    sound/soc/amd/renoir/rn-pci-acp3x.c | 4 ++++
    2 files changed, 8 insertions(+)

    --- a/sound/soc/amd/raven/pci-acp3x.c
    +++ b/sound/soc/amd/raven/pci-acp3x.c
    @@ -118,6 +118,10 @@ static int snd_acp3x_probe(struct pci_de
    int ret, i;
    u32 addr, val;

    + /* Raven device detection */
    + if (pci->revision != 0x00)
    + return -ENODEV;
    +
    if (pci_enable_device(pci)) {
    dev_err(&pci->dev, "pci_enable_device failed\n");
    return -ENODEV;
    --- a/sound/soc/amd/renoir/rn-pci-acp3x.c
    +++ b/sound/soc/amd/renoir/rn-pci-acp3x.c
    @@ -188,6 +188,10 @@ static int snd_rn_acp_probe(struct pci_d
    int ret, index;
    u32 addr;

    + /* Renoir device check */
    + if (pci->revision != 0x01)
    + return -ENODEV;
    +
    if (pci_enable_device(pci)) {
    dev_err(&pci->dev, "pci_enable_device failed\n");
    return -ENODEV;

    \
     
     \ /
      Last update: 2020-12-28 15:27    [W:2.244 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site