| Message ID | 20230710174007.2291013-1-robh@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp5210196vqx;
Mon, 10 Jul 2023 11:26:35 -0700 (PDT)
X-Google-Smtp-Source:
APBJJlHQsGtVIF0jFVU1vbyXR0IbAaE5/s39hmkWG9DNq7jbV5Une+0F+vrbx7zurqNx41vIFjmo
X-Received: by 2002:a05:6402:b26:b0:51d:9127:b61d with SMTP id
bo6-20020a0564020b2600b0051d9127b61dmr2084797edb.25.1689013594964;
Mon, 10 Jul 2023 11:26:34 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1689013594; cv=none;
d=google.com; s=arc-20160816;
b=tw/751kx7MOjzc5sOOuyFQRGUlvSRAgdaU6R6CbvcV+/WVYfRmfq7ODFxiwuEV0tGC
6MFXz5aHBNiHx+viRIDowlavkJV1r9ShiH7Ssozb7dX96Emh+6QiwmxE4CeU70nQ0LHH
xYFd0iQYI1DZC45wfw1q+ZHu14o/Pj8zxdiPCXU7lG/ICpSNVE0eMpTcZ0u49Oan/g6+
QLq7toCKcjNdMYzr32oB7anRCHsRg4aYhIRTuMMWL7/8+20pt95HL+khAJdNN2vr+Rom
hIhMKljPkmqeBgH+Piye2Xv8rmq83si+Z93/ZkG20qbPEcPCsihl9FMxOdwKBaicEUsU
k40A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from;
bh=pJ0X7LH8Y32+25vFKtVfefQZ8VxfYOg+I+aDeHwgaRg=;
fh=ndHb+O2jjA0RgTk4Jt4rgNvlUloAKCSUZdRcbcd7rnk=;
b=iIHLfDa6hub86JLjyTfQDkRgVhY80ril+CYfXmK1S8nsmcuWiue6hSou3S3+78Xndq
q3KJUUspU7+12GRXH4IEOP2pWnD1aTRH4eVfnNgCog0v97C4k4frdPAP1JCJB9ODf3W2
FsTlnat8/DrjIvuf31otofnCNkXC5Mp5ucHJDnzOTE1Wn1XgfnnMaQ82Jo91A6CqGjur
Vbc62cJKBFKTu2AIxF+ZJJ5c6WDb7/K16U0bEXFvqD7Ni3woop5dvMlXhZvaoyWlY4dU
eJkmJ9L9qCHSoIW1LPq8Cnw86HsQmdYkm2RH9X3SJRwqffqlxxpO75OvZKY6YdNsS3Ul
+/gg==
ARC-Authentication-Results: i=1; mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
f3-20020a05640214c300b0051e23edcddcsi92584edx.122.2023.07.10.11.26.11;
Mon, 10 Jul 2023 11:26:34 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S231228AbjGJRkV (ORCPT <rfc822;ybw1215001957@gmail.com>
+ 99 others); Mon, 10 Jul 2023 13:40:21 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53652 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230397AbjGJRkU (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 10 Jul 2023 13:40:20 -0400
Received: from mail-io1-f42.google.com (mail-io1-f42.google.com
[209.85.166.42])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EBA8135;
Mon, 10 Jul 2023 10:40:17 -0700 (PDT)
Received: by mail-io1-f42.google.com with SMTP id
ca18e2360f4ac-78362f57500so243177639f.3;
Mon, 10 Jul 2023 10:40:17 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1689010816; x=1691602816;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=pJ0X7LH8Y32+25vFKtVfefQZ8VxfYOg+I+aDeHwgaRg=;
b=ea8pNLA3H378zc+JylHhCzz6ZFAycmOCxxiA3R46VYh9UVYdBjav9B7keAQbvCsXbK
ynSNLKnHOMpgvb429xybA/nVdXVeu79Ok+Ln7iLybDTmtJlYIhZlDGUAl9FawZINC+8u
C+lyPZrriz/I1KEKRIkUiYBSFY1D+oZjdhClZBOnD8N+g+IbwoyAcZjl4kwBH0A9QpOV
HUIc7clL0+nBdrjGOvEUDx+0V97Z/jluph3uANqCwCs0muSCe6l9u3lwkE2CN0e5bGDN
kJQdDrffWnwo2b3XjPfzseM8ruUmxz7WrdYfGyY5B4i+anzA0jBNt04xykLEIbLfzNPd
GrlA==
X-Gm-Message-State: ABy/qLZIe+XDfVCE/NQLsr9B+A3I03tv38TKIVYSoaQJ38gkSAGpFAa5
tTByAbXOH5x8T2OnZwsETg==
X-Received: by 2002:a92:4b08:0:b0:33b:dcbf:e711 with SMTP id
m8-20020a924b08000000b0033bdcbfe711mr15060887ilg.8.1689010816389;
Mon, 10 Jul 2023 10:40:16 -0700 (PDT)
Received: from robh_at_kernel.org ([64.188.179.250])
by smtp.gmail.com with ESMTPSA id
w18-20020a029692000000b0042036f06b24sm3449146jai.163.2023.07.10.10.40.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 10 Jul 2023 10:40:15 -0700 (PDT)
Received: (nullmailer pid 2291150 invoked by uid 1000);
Mon, 10 Jul 2023 17:40:13 -0000
From: Rob Herring <robh@kernel.org>
To: Frank Rowand <frowand.list@gmail.com>,
Michal Suchanek <msuchanek@suse.de>
Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org,
stable@vger.kernel.org, Cyril Brulebois <cyril@debamax.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Helge Deller <deller@gmx.de>, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] of: Preserve "of-display" device name for compatibility
Date: Mon, 10 Jul 2023 11:40:07 -0600
Message-Id: <20230710174007.2291013-1-robh@kernel.org>
X-Mailer: git-send-email 2.40.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,
FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no
autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: INBOX
X-GMAIL-THRID: 1771059119489212941
X-GMAIL-MSGID: 1771059119489212941
|
| Series |
of: Preserve "of-display" device name for compatibility
|
|
Commit Message
Rob Herring
July 10, 2023, 5:40 p.m. UTC
Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"),
as spotted by Frédéric Bonnard, the historical "of-display" device is
gone: the updated logic creates "of-display.0" instead, then as many
"of-display.N" as required.
This means that offb no longer finds the expected device, which prevents
the Debian Installer from setting up its interface, at least on ppc64el.
Fix this by keeping "of-display" for the first device and "of-display.N"
for subsequent devices.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328
Link: https://bugs.debian.org/1033058
Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique")
Cc: stable@vger.kernel.org
Cc: Cyril Brulebois <cyril@debamax.com>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Rob Herring <robh@kernel.org>
---
drivers/of/platform.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On Mon, Jul 10, 2023 at 11:40:07AM -0600, Rob Herring wrote: > Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), > as spotted by Frédéric Bonnard, the historical "of-display" device is > gone: the updated logic creates "of-display.0" instead, then as many > "of-display.N" as required. > > This means that offb no longer finds the expected device, which prevents > the Debian Installer from setting up its interface, at least on ppc64el. > > Fix this by keeping "of-display" for the first device and "of-display.N" > for subsequent devices. > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328 > Link: https://bugs.debian.org/1033058 > Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique") > Cc: stable@vger.kernel.org > Cc: Cyril Brulebois <cyril@debamax.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Helge Deller <deller@gmx.de> > Signed-off-by: Rob Herring <robh@kernel.org> This is exclusive with the other patchset that updates the other side: https://lore.kernel.org/lkml/20230412095509.2196162-1-cyril@debamax.com/ Reviewed-by: Michal Suchánek <msuchanek@suse.de> Thanks Michal > --- > drivers/of/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index 051e29b7ad2b..0c3475e7d2ff 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void) > if (!of_get_property(node, "linux,opened", NULL) || > !of_get_property(node, "linux,boot-display", NULL)) > continue; > - dev = of_platform_device_create(node, "of-display.0", NULL); > + dev = of_platform_device_create(node, "of-display", NULL); > of_node_put(node); > if (WARN_ON(!dev)) > return -ENOMEM; > -- > 2.40.1 >
Am 10.07.23 um 19:40 schrieb Rob Herring: > Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), > as spotted by Frédéric Bonnard, the historical "of-display" device is > gone: the updated logic creates "of-display.0" instead, then as many > "of-display.N" as required. > > This means that offb no longer finds the expected device, which prevents > the Debian Installer from setting up its interface, at least on ppc64el. > > Fix this by keeping "of-display" for the first device and "of-display.N" > for subsequent devices. > > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328 > Link: https://bugs.debian.org/1033058 > Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique") > Cc: stable@vger.kernel.org > Cc: Cyril Brulebois <cyril@debamax.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Helge Deller <deller@gmx.de> > Signed-off-by: Rob Herring <robh@kernel.org> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/of/platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/of/platform.c b/drivers/of/platform.c > index 051e29b7ad2b..0c3475e7d2ff 100644 > --- a/drivers/of/platform.c > +++ b/drivers/of/platform.c > @@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void) > if (!of_get_property(node, "linux,opened", NULL) || > !of_get_property(node, "linux,boot-display", NULL)) > continue; > - dev = of_platform_device_create(node, "of-display.0", NULL); > + dev = of_platform_device_create(node, "of-display", NULL); > of_node_put(node); > if (WARN_ON(!dev)) > return -ENOMEM; -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
On 7/11/23 08:00, Thomas Zimmermann wrote: > > > Am 10.07.23 um 19:40 schrieb Rob Herring: >> Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), >> as spotted by Frédéric Bonnard, the historical "of-display" device is >> gone: the updated logic creates "of-display.0" instead, then as many >> "of-display.N" as required. >> >> This means that offb no longer finds the expected device, which prevents >> the Debian Installer from setting up its interface, at least on ppc64el. >> >> Fix this by keeping "of-display" for the first device and "of-display.N" >> for subsequent devices. >> >> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328 >> Link: https://bugs.debian.org/1033058 >> Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique") >> Cc: stable@vger.kernel.org >> Cc: Cyril Brulebois <cyril@debamax.com> >> Cc: Thomas Zimmermann <tzimmermann@suse.de> >> Cc: Helge Deller <deller@gmx.de> >> Signed-off-by: Rob Herring <robh@kernel.org> > > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Helge Deller <deller@gmx.de> Who will pick up that patch? Shall I take it via fbdev git tree? Helge > >> --- >> drivers/of/platform.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/of/platform.c b/drivers/of/platform.c >> index 051e29b7ad2b..0c3475e7d2ff 100644 >> --- a/drivers/of/platform.c >> +++ b/drivers/of/platform.c >> @@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void) >> if (!of_get_property(node, "linux,opened", NULL) || >> !of_get_property(node, "linux,boot-display", NULL)) >> continue; >> - dev = of_platform_device_create(node, "of-display.0", NULL); >> + dev = of_platform_device_create(node, "of-display", NULL); >> of_node_put(node); >> if (WARN_ON(!dev)) >> return -ENOMEM; >
On Tue, Jul 11, 2023 at 9:46 AM Helge Deller <deller@gmx.de> wrote: > > On 7/11/23 08:00, Thomas Zimmermann wrote: > > > > > > Am 10.07.23 um 19:40 schrieb Rob Herring: > >> Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), > >> as spotted by Frédéric Bonnard, the historical "of-display" device is > >> gone: the updated logic creates "of-display.0" instead, then as many > >> "of-display.N" as required. > >> > >> This means that offb no longer finds the expected device, which prevents > >> the Debian Installer from setting up its interface, at least on ppc64el. > >> > >> Fix this by keeping "of-display" for the first device and "of-display.N" > >> for subsequent devices. > >> > >> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328 > >> Link: https://bugs.debian.org/1033058 > >> Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique") > >> Cc: stable@vger.kernel.org > >> Cc: Cyril Brulebois <cyril@debamax.com> > >> Cc: Thomas Zimmermann <tzimmermann@suse.de> > >> Cc: Helge Deller <deller@gmx.de> > >> Signed-off-by: Rob Herring <robh@kernel.org> > > > > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > > Acked-by: Helge Deller <deller@gmx.de> > > Who will pick up that patch? > Shall I take it via fbdev git tree? I'll take it. I've got other fixes queued up already. Rob
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 051e29b7ad2b..0c3475e7d2ff 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void) if (!of_get_property(node, "linux,opened", NULL) || !of_get_property(node, "linux,boot-display", NULL)) continue; - dev = of_platform_device_create(node, "of-display.0", NULL); + dev = of_platform_device_create(node, "of-display", NULL); of_node_put(node); if (WARN_ON(!dev)) return -ENOMEM;