[PATCH] device: return error for unknown chipsets

[PATCH] device: return error for unknown chipsets

[Karol Herbst]

Previously the code relied on device->pri to be NULL and to fail probing
later. We really should just return an error inside nvkm_device_ctor for
unsupported GPUs.

Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")

Signed-off-by: Karol Herbst <kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Cc: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
---
 drm/nouveau/nvkm/engine/device/base.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
index 9f4ac2672..68d665414 100644
--- a/drm/nouveau/nvkm/engine/device/base.c
+++ b/drm/nouveau/nvkm/engine/device/base.c
@@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
 		case 0x168: device->chip = &nv168_chipset; break;
 		default:
 			nvdev_error(device, "unknown chipset (%08x)\n", boot0);
+			ret = -ENOSYS;
 			goto done;
 		}
 
-- 
2.26.2

Re: [PATCH] device: return error for unknown chipsets

[dann frazier]

On Mon, Oct 05, 2020 at 03:52:30PM +0200, Karol Herbst wrote:
> Previously the code relied on device->pri to be NULL and to fail probing
> later. We really should just return an error inside nvkm_device_ctor for
> unsupported GPUs.
> 
> Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")
> Signed-off-by: Karol Herbst <kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> Cc: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>

Thanks Karol! Got rid of the Oops for me.

Tested-by: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>

Would it be appropriate to tag this for stable v5.8+?

  -dann

> ---
>  drm/nouveau/nvkm/engine/device/base.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
> index 9f4ac2672..68d665414 100644
> --- a/drm/nouveau/nvkm/engine/device/base.c
> +++ b/drm/nouveau/nvkm/engine/device/base.c
> @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
>  		case 0x168: device->chip = &nv168_chipset; break;
>  		default:
>  			nvdev_error(device, "unknown chipset (%08x)\n", boot0);
> +			ret = -ENOSYS;
>  			goto done;
>  		}
>  

Re: [PATCH] device: return error for unknown chipsets

[Karol Herbst]

On Tue, Oct 6, 2020 at 6:43 PM dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> wrote:
>
> On Mon, Oct 05, 2020 at 03:52:30PM +0200, Karol Herbst wrote:
> > Previously the code relied on device->pri to be NULL and to fail probing
> > later. We really should just return an error inside nvkm_device_ctor for
> > unsupported GPUs.
> >
> > Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")
> > Signed-off-by: Karol Herbst <kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > Cc: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
>
> Thanks Karol! Got rid of the Oops for me.
>
> Tested-by: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
>
> Would it be appropriate to tag this for stable v5.8+?
>

Due to the Fixes: tags it will get auto selected for stable releases
afaik. But I think an explicit send might speed it up? I think it's
fine either way.

>   -dann
>
> > ---
> >  drm/nouveau/nvkm/engine/device/base.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
> > index 9f4ac2672..68d665414 100644
> > --- a/drm/nouveau/nvkm/engine/device/base.c
> > +++ b/drm/nouveau/nvkm/engine/device/base.c
> > @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
> >               case 0x168: device->chip = &nv168_chipset; break;
> >               default:
> >                       nvdev_error(device, "unknown chipset (%08x)\n", boot0);
> > +                     ret = -ENOSYS;
> >                       goto done;
> >               }
> >
>

Re: [PATCH] device: return error for unknown chipsets

[Jeremy Cline]

On Tue, Oct 06, 2020 at 06:46:35PM +0200, Karol Herbst wrote:
> On Tue, Oct 6, 2020 at 6:43 PM dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> wrote:
> >
> > On Mon, Oct 05, 2020 at 03:52:30PM +0200, Karol Herbst wrote:
> > > Previously the code relied on device->pri to be NULL and to fail probing
> > > later. We really should just return an error inside nvkm_device_ctor for
> > > unsupported GPUs.
> > >
> > > Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")
> > > Signed-off-by: Karol Herbst <kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > > Cc: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
> >
> > Thanks Karol! Got rid of the Oops for me.
> >
> > Tested-by: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
> >
> > Would it be appropriate to tag this for stable v5.8+?
> >
> 
> Due to the Fixes: tags it will get auto selected for stable releases
> afaik. But I think an explicit send might speed it up? I think it's
> fine either way.
> 

The patch looks to only applies to the out-of-tree driver (is it normal
to send patches this way?) so it'll need adjustment if it's Cc'd to
stable, but the easiest, most reliable way to make sure it's picked up
is to add an explicit Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org tag to the commit.

Also:

Reviewed-by: Jeremy Cline <jcline-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

> >   -dann
> >
> > > ---
> > >  drm/nouveau/nvkm/engine/device/base.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
> > > index 9f4ac2672..68d665414 100644
> > > --- a/drm/nouveau/nvkm/engine/device/base.c
> > > +++ b/drm/nouveau/nvkm/engine/device/base.c
> > > @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
> > >               case 0x168: device->chip = &nv168_chipset; break;
> > >               default:
> > >                       nvdev_error(device, "unknown chipset (%08x)\n", boot0);
> > > +                     ret = -ENOSYS;
> > >                       goto done;
> > >               }
> > >
> >
> 
> _______________________________________________
> Nouveau mailing list
> Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau
> 

Re: [PATCH] device: return error for unknown chipsets

[Karol Herbst]

On Tue, Oct 6, 2020 at 7:53 PM Jeremy Cline <jcline-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>
> On Tue, Oct 06, 2020 at 06:46:35PM +0200, Karol Herbst wrote:
> > On Tue, Oct 6, 2020 at 6:43 PM dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> wrote:
> > >
> > > On Mon, Oct 05, 2020 at 03:52:30PM +0200, Karol Herbst wrote:
> > > > Previously the code relied on device->pri to be NULL and to fail probing
> > > > later. We really should just return an error inside nvkm_device_ctor for
> > > > unsupported GPUs.
> > > >
> > > > Fixes: 24d5ff40a732 ("drm/nouveau/device: rework mmio mapping code to get rid of second map")
> > > > Signed-off-by: Karol Herbst <kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > > > Cc: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
> > >
> > > Thanks Karol! Got rid of the Oops for me.
> > >
> > > Tested-by: dann frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org>
> > >
> > > Would it be appropriate to tag this for stable v5.8+?
> > >
> >
> > Due to the Fixes: tags it will get auto selected for stable releases
> > afaik. But I think an explicit send might speed it up? I think it's
> > fine either way.
> >
>
> The patch looks to only applies to the out-of-tree driver (is it normal
> to send patches this way?) so it'll need adjustment if it's Cc'd to
> stable, but the easiest, most reliable way to make sure it's picked up
> is to add an explicit Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org tag to the commit.
>

Actually.. we do have a drm-fixes thing, I think it's probably better
to go through that instead of the nouveau tree? Mhh.. we need a better
process here anyway :p

> Also:
>
> Reviewed-by: Jeremy Cline <jcline-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>
> > >   -dann
> > >
> > > > ---
> > > >  drm/nouveau/nvkm/engine/device/base.c | 1 +
> > > >  1 file changed, 1 insertion(+)
> > > >
> > > > diff --git a/drm/nouveau/nvkm/engine/device/base.c b/drm/nouveau/nvkm/engine/device/base.c
> > > > index 9f4ac2672..68d665414 100644
> > > > --- a/drm/nouveau/nvkm/engine/device/base.c
> > > > +++ b/drm/nouveau/nvkm/engine/device/base.c
> > > > @@ -3149,6 +3149,7 @@ nvkm_device_ctor(const struct nvkm_device_func *func,
> > > >               case 0x168: device->chip = &nv168_chipset; break;
> > > >               default:
> > > >                       nvdev_error(device, "unknown chipset (%08x)\n", boot0);
> > > > +                     ret = -ENOSYS;
> > > >                       goto done;
> > > >               }
> > > >
> > >
> >
> > _______________________________________________
> > Nouveau mailing list
> > Nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
> > https://lists.freedesktop.org/mailman/listinfo/nouveau
> >
>