linux-kernel - Re: [PATCH v5 5/6] drm/amdgpu: move hw generation check into amdgpu_doorbell

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHp75Vfq2WwMT1tGu8VWmd5ZfWc7HCjh6PxpsXtjY8a3eoXH-g@mail.gmail.com>
Date:   Fri, 9 Jun 2017 13:14:02 +0300
From:   Andy Shevchenko <andy.shevchenko@...il.com>
To:     Christian König <deathsimple@...afone.de>
Cc:     Bjorn Helgaas <helgaas@...nel.org>,
        "linux-pci@...r.kernel.org" <linux-pci@...r.kernel.org>,
        dri-devel@...ts.freedesktop.org,
        Platform Driver <platform-driver-x86@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        amd-gfx@...ts.freedesktop.org
Subject: Re: [PATCH v5 5/6] drm/amdgpu: move hw generation check into amdgpu_doorbell_init

On Fri, Jun 9, 2017 at 11:59 AM, Christian König
<deathsimple@...afone.de> wrote:
> From: Christian König <christian.koenig@....com>
>
> This way we can savely call it on SI as well.

s/savely/safely

FWIW,
Reviewed-by: Andy Shevchenko <andy.shevchenko@...il.com>

> Signed-off-by: Christian König <christian.koenig@....com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index a7d6804..99290af 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -419,6 +419,15 @@ void amdgpu_pci_config_reset(struct amdgpu_device *adev)
>   */
>  static int amdgpu_doorbell_init(struct amdgpu_device *adev)
>  {
> +       /* No doorbell on SI hardware generation */
> +       if (adev->asic_type < CHIP_BONAIRE) {
> +               adev->doorbell.base = 0;
> +               adev->doorbell.size = 0;
> +               adev->doorbell.num_doorbells = 0;
> +               adev->doorbell.ptr = NULL;
> +               return 0;
> +       }
> +
>         /* doorbell bar mapping */
>         adev->doorbell.base = pci_resource_start(adev->pdev, 2);
>         adev->doorbell.size = pci_resource_len(adev->pdev, 2);
> @@ -2136,9 +2145,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,
>         DRM_INFO("register mmio base: 0x%08X\n", (uint32_t)adev->rmmio_base);
>         DRM_INFO("register mmio size: %u\n", (unsigned)adev->rmmio_size);
>
> -       if (adev->asic_type >= CHIP_BONAIRE)
> -               /* doorbell bar mapping */
> -               amdgpu_doorbell_init(adev);
> +       /* doorbell bar mapping */
> +       amdgpu_doorbell_init(adev);
>
>         /* io port mapping */
>         for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
> @@ -2335,8 +2343,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
>         adev->rio_mem = NULL;
>         iounmap(adev->rmmio);
>         adev->rmmio = NULL;
> -       if (adev->asic_type >= CHIP_BONAIRE)
> -               amdgpu_doorbell_fini(adev);
> +       amdgpu_doorbell_fini(adev);
>         amdgpu_debugfs_regs_cleanup(adev);
>  }
>
> --
> 2.7.4
>



-- 
With Best Regards,
Andy Shevchenko