From patchwork Tue Jan 17 16:58:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Michal_Such=C3=A1nek?= X-Patchwork-Id: 44750 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1874701wrn; Tue, 17 Jan 2023 09:09:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXu7uObNfW/HOTUJMR3c5PIRFiE+ZBT3q4a8cDILVtxdkNvgNMEERZ6AfNjNyWOnIS6GuW/r X-Received: by 2002:a17:906:40e:b0:873:4311:d30c with SMTP id d14-20020a170906040e00b008734311d30cmr1955090eja.13.1673975367599; Tue, 17 Jan 2023 09:09:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673975367; cv=none; d=google.com; s=arc-20160816; b=CRmlrU1xvETZeboK4P+2auoG5aPEPfnP8lpeJAfXaA1VCQY9/MHTChXz6ddCFW4rk0 wz6SQzk2DwRqKil9DFfA1eDlKUYzbJN/TyerkkKc57FxpJDH1oepXjp5pm8FrVS0Uzrg 9PM/I/ZU7c0k+So3RYQl4M/RYDgpcPtLDAOVh1jmCK65OkQqqWPbFWZgnCorvMN3ChHq IFdyzxaZC2Wc8ukm9luebWl/V23230Wz6Eg62TFPdBVXbupSarFAgT3PQiLWr8B2i9e7 ZujUqOTYQrB7/0xO2W5OKzY0KYrZ+f8IMvdaLeTWFp+Slt/D+o/mTUo9fMuVUKbG6dnh bwOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :message-id:date:subject:cc:from:dkim-signature:dkim-signature; bh=LPaYt3U/+H6P7eBulHoAyo/q+calGwfFAzTXNU5KimU=; b=lBr1wfeXmAX6YikmMOgtXF5htQDZK+y1jMaEZNZsImQikQw5QXl8clfBgTjFQSgOip IaSjaUi/XZdqm+oDw69TtNWRKiUZdtCh3TKGkEvr+s9OzWGMGen4S9D2Hg9+LIhnPveW 855eNhP/zJf4VE7qtbrOkEsk6Besk+7jrzmDLG5xRc/XN3wGhjm0dq2S+jhLOrzCXJ1L bMfTRwFdXEVqYiDovTYNuWGjnu2ThBhWWXoSaUXe2glKv/F51pr9KDG/nLQiVxJ1U5xM 0GmLDv0MAet1meTUmmMDgZmTdwYW5QOM4k5+6S42spS+SSBXG8SCQAw4VjLiuvEVWG6O KEVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@suse.de header.s=susede2_rsa header.b=JUbOFdVF; dkim=neutral (no key) header.i=@suse.de; 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=fail (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hs27-20020a1709073e9b00b0086d23c33ea5si11994853ejc.110.2023.01.17.09.09.03; Tue, 17 Jan 2023 09:09:27 -0800 (PST) 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; dkim=fail header.i=@suse.de header.s=susede2_rsa header.b=JUbOFdVF; dkim=neutral (no key) header.i=@suse.de; 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=fail (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230503AbjAQQ6U (ORCPT + 99 others); Tue, 17 Jan 2023 11:58:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233616AbjAQQ6R (ORCPT ); Tue, 17 Jan 2023 11:58:17 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CE104390A; Tue, 17 Jan 2023 08:58:16 -0800 (PST) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id C82ED1F74D; Tue, 17 Jan 2023 16:58:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1673974694; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LPaYt3U/+H6P7eBulHoAyo/q+calGwfFAzTXNU5KimU=; b=JUbOFdVFaKmrVOvq3sVHVsHhZME515FfjfYS7VHGzK5iYuLYMfMS6XuVdEFSaC0O6qpq3Q vD1FYrqYADCWjNkGT4UKaY4wFwccoT86mCEXTJmmSh2x0JjDlcR1RT2FUCgRnNlzxX170d ZcKLPiEXMhIFVsSNZKqEz0NNPOVa7Mc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1673974694; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=LPaYt3U/+H6P7eBulHoAyo/q+calGwfFAzTXNU5KimU=; b=6lqQPt2RsGNeAnbw/9nYXIXLKwIjFo1wjbBxGc33WOcfLKrlQtQ0VUgSK1Qb87xIA/hf/f nU/JiqL58TrC/9Cw== Received: from kitsune.suse.cz (kitsune.suse.cz [10.100.12.127]) by relay2.suse.de (Postfix) with ESMTP id 879F62C141; Tue, 17 Jan 2023 16:58:14 +0000 (UTC) From: Michal Suchanek Cc: Michal Suchanek , Rob Herring , Frank Rowand , Thomas Zimmermann , Javier Martinez Canillas , devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE), linux-kernel@vger.kernel.org (open list), linuxppc-dev@lists.ozlabs.org, "Erhard F ." Subject: [PATCH] of: Make of framebuffer devices unique Date: Tue, 17 Jan 2023 17:58:04 +0100 Message-Id: <20230117165804.18036-1-msuchanek@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755290395066652615?= X-GMAIL-MSGID: =?utf-8?q?1755290395066652615?= Since Linux 5.19 this error is observed: sysfs: cannot create duplicate filename '/devices/platform/of-display' This is because multiple devices with the same name 'of-display' are created on the same bus. Update the code to create numbered device names for the non-boot disaplay. cc: linuxppc-dev@lists.ozlabs.org References: https://bugzilla.kernel.org/show_bug.cgi?id=216095 Fixes: 52b1b46c39ae ("of: Create platform devices for OF framebuffers") Reported-by: Erhard F. Suggested-by: Thomas Zimmermann Signed-off-by: Michal Suchanek --- drivers/of/platform.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 81c8c227ab6b..f2a5d679a324 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -525,6 +525,7 @@ static int __init of_platform_default_populate_init(void) if (IS_ENABLED(CONFIG_PPC)) { struct device_node *boot_display = NULL; struct platform_device *dev; + int display_number = 1; int ret; /* Check if we have a MacOS display without a node spec */ @@ -561,10 +562,15 @@ static int __init of_platform_default_populate_init(void) boot_display = node; break; } + for_each_node_by_type(node, "display") { + char *buf[14]; if (!of_get_property(node, "linux,opened", NULL) || node == boot_display) continue; - of_platform_device_create(node, "of-display", NULL); + ret = snprintf(buf, "of-display-%d", display_number++); + if (ret >= sizeof(buf)) + continue; + of_platform_device_create(node, buf, NULL); } } else {