From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93682C433F5 for ; Wed, 3 Nov 2021 23:33:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 26AD66058D for ; Wed, 3 Nov 2021 23:33:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 26AD66058D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0EB486E1E9; Wed, 3 Nov 2021 23:33:43 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 358596E47A for ; Wed, 3 Nov 2021 23:33:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635982419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7De9Gqd8CUJxMa+TanGCv6guhL3v1dqZFI8MIBYGLDY=; b=QZLa9KUPT6SfXPVw6lb5F+uVG3VVdROqyeM0YLLB9BdtTbc1X9lS+r3w1OwliC0SbpWq7M yHgAf1/s+HqIHFrgdK9abeU1j/zadmICVfQnqVNaSZhC8foqg44Lx00wfEEkKz5h9B0axm rc5fyOVS5Ss6mRUf2T6dJZGzrHblpSk= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-263-tFauqqC1MimzIqTvrLErbA-1; Wed, 03 Nov 2021 19:33:37 -0400 X-MC-Unique: tFauqqC1MimzIqTvrLErbA-1 Received: by mail-wm1-f72.google.com with SMTP id v18-20020a7bcb52000000b00322fea1d5b7so1786841wmj.9 for ; Wed, 03 Nov 2021 16:33:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7De9Gqd8CUJxMa+TanGCv6guhL3v1dqZFI8MIBYGLDY=; b=nHsYDJ7KtypBAceqbWK3Up+aiEdAdeOJx1YymGJvUxWl9JRQj/9wjE4va0wp/sNY+4 jo2wcYv1i5eBqPTdweDTflxRQf1awXMztUYcDmB7Kefe4L3o5RXQvqnWxj8g4UwRfUG8 t5f14W4OERtmIZSHFb4wHmJrJxTDbfaFCb22rRRhMXefyxAIiWKo5uaUDlGT82f9gYKg 3jBZvTvhqNQAcMXmgUetI9FsEAQg6wok+fRKNlUJBSvMTEaJFeUhk9t4oqwXXx/vJpOV gRil6anLkAsJ/eO2W/LGbEU3COFLgnKzSMixmokvAtdiOf/A3aiKuM6wt/mcj4nOFt1C pD5Q== X-Gm-Message-State: AOAM531YPT0Gbyo+0b9zktHHpoU50eccX/rl2HH4oSWt8jzcYGxt0fLf PzJWpqOoUliKz+RZbbguFdlRnT9eukSGDVPLoMc5NUFfsOd37FG4BGTrJQ1lSLh6kDpW/il53mB egbc7HCtlwcfBi5TJrWJ8yCp1WHQqawY72b+Cpht1sQ== X-Received: by 2002:adf:eb4b:: with SMTP id u11mr45872362wrn.49.1635982416132; Wed, 03 Nov 2021 16:33:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqsfgbnO5nmV+YmqNe0Y1+aMbBesCQYIeQ4yjNTSV5UP0D0DskkCEJQoOGYhf4sRFoTFZSB/+e5dySrD+tg8U= X-Received: by 2002:adf:eb4b:: with SMTP id u11mr45872342wrn.49.1635982415901; Wed, 03 Nov 2021 16:33:35 -0700 (PDT) MIME-Version: 1.0 References: <20211103011057.15344-1-skeggsb@gmail.com> In-Reply-To: From: Karol Herbst Date: Thu, 4 Nov 2021 00:33:25 +0100 Message-ID: To: Ben Skeggs Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kherbst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [Nouveau] [PATCH] ce/gf100: fix incorrect CE0 address calculation on some GPUs X-BeenThere: nouveau@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Nouveau development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nouveau , Ben Skeggs , stable@vger.kernel.org Errors-To: nouveau-bounces@lists.freedesktop.org Sender: "Nouveau" On Wed, Nov 3, 2021 at 8:51 AM Karol Herbst wrote: > > On Wed, Nov 3, 2021 at 2:11 AM Ben Skeggs wrote: > > > > From: Ben Skeggs > > > > The code which constructs the modules for each engine present on the GPU > > passes -1 for 'instance' on non-instanced engines, which affects how the > > name for a sub-device is generated. This is then stored as 'instance 0' > > in nvkm_subdev.inst, so code can potentially be shared with earlier GPUs > > that only had a single instance of an engine. > > > > However, GF100's CE constructor uses this value to calculate the address > > of its falcon before it's translated, resulting in CE0 getting the wrong > > address. > > > > This slightly modifies the approach, always passing a valid instance for > > engines that *can* have multiple copies, and having the code for earlier > > GPUs explicitly ask for non-instanced name generation. > > > > Bug: https://gitlab.freedesktop.org/drm/nouveau/-/issues/91 > > > > Fixes: 50551b15c760 ("drm/nouveau/ce: switch to instanced constructor") > > Cc: # v5.12+ > > Signed-off-by: Ben Skeggs > > --- > > drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c | 2 +- > > drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 3 +-- > > 2 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c > > index 704df0f2d1f1..09a112af2f89 100644 > > --- a/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c > > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/ce/gt215.c > > @@ -78,6 +78,6 @@ int > > gt215_ce_new(struct nvkm_device *device, enum nvkm_subdev_type type, int inst, > > struct nvkm_engine **pengine) > > { > > - return nvkm_falcon_new_(>215_ce, device, type, inst, > > + return nvkm_falcon_new_(>215_ce, device, type, -1, > > (device->chipset != 0xaf), 0x104000, pengine); > > } > > diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > > index ca75c5f6ecaf..b51d690f375f 100644 > > --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > > +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c > > @@ -3147,8 +3147,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func, > > WARN_ON(device->chip->ptr.inst & ~((1 << ARRAY_SIZE(device->ptr)) - 1)); \ > > for (j = 0; device->chip->ptr.inst && j < ARRAY_SIZE(device->ptr); j++) { \ > > if ((device->chip->ptr.inst & BIT(j)) && (subdev_mask & BIT_ULL(type))) { \ > > - int inst = (device->chip->ptr.inst == 1) ? -1 : (j); \ > > - ret = device->chip->ptr.ctor(device, (type), inst, &device->ptr[j]); \ > > + ret = device->chip->ptr.ctor(device, (type), (j), &device->ptr[j]); \ > > subdev = nvkm_device_subdev(device, (type), (j)); \ > > if (ret) { \ > > nvkm_subdev_del(&subdev); \ > > -- > > 2.31.1 > > > > Reviewed-by: Karol Herbst Tested that on a GF108, so Tested-by: Karol Herbst