From patchwork Fri Sep 13 19:13:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 13803986 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C1066FA3750 for ; Fri, 13 Sep 2024 19:14:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FDE610ED7F; Fri, 13 Sep 2024 19:14:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="Ajx/l7rR"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1537110ED7F for ; Fri, 13 Sep 2024 19:14:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726254875; 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: content-transfer-encoding:content-transfer-encoding; bh=kEDaZq1JvqwS7B5a6C/b79xspKvNtOtKMLXgoPqkWiU=; b=Ajx/l7rRzrngdKqGqrTa5NNjQFC38nhfKM8yepydiE9acHXdjS6ffvWsy9f68u9Oz8cT2J vro/oux6Zr3qwfwC43MkAqCjN+QTPZQK86mKE0pB/zJh3BTxuj+7af/qdZ8bXnI3TS6hm7 Z+TD8/OO60rU7CKdycit7RLJQ39pmQI= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-G_OPUnvyNM65-bGydEkzag-1; Fri, 13 Sep 2024 15:14:35 -0400 X-MC-Unique: G_OPUnvyNM65-bGydEkzag-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-42cb22d396cso19255505e9.0 for ; Fri, 13 Sep 2024 12:14:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726254873; x=1726859673; 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=kEDaZq1JvqwS7B5a6C/b79xspKvNtOtKMLXgoPqkWiU=; b=BHzFxq41qPo6hqJxWQaZtCAkzEC30eTFhg6NiDRIysaa+IRAH2ME2+MsxWPDvQRTNS bpWYiFGeTLs9Adan57y/StGHFiR38w/KP76VlyncfdNK5YygOfzoYBgXV1OdNOYLTLE5 Hryu1fQfI3us5bxrnOVorcI3Bav2nP43k97CDE12lNOeioIwsM1G75kxWAQzs14gwj+R mrUmgk6wyPLchnNvrrS6DSzMhtLCe7yl+vwUwLMIMKQcOn2NNsoNJLwJqBueKeZAVo9Y iJ539epmURAlozC6jlew5qc2tNS0eJ+aDTUegvCkqMDg16lc01y6JtbkPo4MTweMSm9o Tyjg== X-Forwarded-Encrypted: i=1; AJvYcCWtmuIcfAJwAMIYWMXUkJiMI0LLyWYC4EpsgGz/Y7+YlW5v3FUaUBPT7fezjypX4zrEqzPIU0K1LEQ=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwkFK2y7vRzVzLslI0ui+Xmu8pafM3LdPx8xemAY3fW03ByMYMp WISaXRhSfL1eIZz9qRNMcOz4eBK09huu/6KS/i1k/mXQ6YK9SxurFGh9syxPTv3XO+Y0f0Yid46 KPizSHX22Ot7dMwZA1zOqqqQ1tkdkrBn7zHBUly/0eQv7b1MS5Ciwyw10loOY3Pigj2fS9eU3nQ == X-Received: by 2002:a05:600c:3514:b0:42c:df67:1d35 with SMTP id 5b1f17b1804b1-42cdf671f9emr58878315e9.1.1726254873462; Fri, 13 Sep 2024 12:14:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEv6ZqQqprM8k1B6dy7IN1qr0vv0mBK5M/OuTZw60w5IV+Msv048q6Y8MOMeLK+vWaPrKuugg== X-Received: by 2002:a05:600c:3514:b0:42c:df67:1d35 with SMTP id 5b1f17b1804b1-42cdf671f9emr58878005e9.1.1726254872862; Fri, 13 Sep 2024 12:14:32 -0700 (PDT) Received: from localhost (62-151-111-63.jazzfree.ya.com. [62.151.111.63]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42da22b8b49sm380015e9.2.2024.09.13.12.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Sep 2024 12:14:32 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: chrome-platform@lists.linux.dev, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Hugues Bruant , Julius Werner , Brian Norris , Thomas Zimmermann , Borislav Petkov , Javier Martinez Canillas , Tzung-Bi Shih Subject: [PATCH v2] firmware: coreboot: Don't register a pdev if screen_info data is present Date: Fri, 13 Sep 2024 21:13:59 +0200 Message-ID: <20240913191428.1539653-1-javierm@redhat.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Coreboot platforms, a system framebuffer may be provided to the Linux kernel by filling a LB_TAG_FRAMEBUFFER entry in the Coreboot table. But a Coreboot payload (e.g: SeaBIOS) could also provide its own framebuffer information to the Linux kernel. If that's the case, arch x86 boot code will fill the global screen_info data and this used by the Generic System Framebuffers (sysfb) framework, to register a platform device with pdata about the system's framebuffer. But later, the framebuffer_coreboot driver will try to do the same and attempt to register a "simple-framebuffer" platform device (using the information from the Coreboot table), which will lead to an error due a device with the same name already being registered: sysfs: cannot create duplicate filename '/bus/platform/devices/simple-framebuffer.0' ... coreboot: could not register framebuffer framebuffer coreboot8: probe with driver framebuffer failed with error -17 To prevent this issue, make the framebuffer_core driver to not register a platform device if the global struct screen_info data has been filled. Reported-by: Brian Norris Closes: https://lore.kernel.org/all/ZuCG-DggNThuF4pj@b20ea791c01f/T/#ma7fb65acbc1a56042258adac910992bb225a20d2 Suggested-by: Julius Werner Signed-off-by: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann Reviewed-by: Brian Norris Reviewed-by: Julius Werner --- Changes in v2: - Declare the struct screen_info as constant variable (Thomas Zimmermann). - Use screen_info_video_type() instead of checking the screen_info video types directly (Thomas Zimmermann). - Fix missing "device" word in a comment (Brian Norris). - Fix some mispellings in a comment (Brian Norris). - Change error code returned from -EINVAL to -ENODEV (Brian Norris). drivers/firmware/google/framebuffer-coreboot.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/google/framebuffer-coreboot.c index daadd71d8ddd..49eeb13814e4 100644 --- a/drivers/firmware/google/framebuffer-coreboot.c +++ b/drivers/firmware/google/framebuffer-coreboot.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "coreboot_table.h" @@ -27,8 +28,10 @@ static int framebuffer_probe(struct coreboot_device *dev) int i; u32 length; struct lb_framebuffer *fb = &dev->framebuffer; + const struct screen_info *si = &screen_info; struct platform_device *pdev; struct resource res; + unsigned int type; struct simplefb_platform_data pdata = { .width = fb->x_resolution, .height = fb->y_resolution, @@ -36,6 +39,20 @@ static int framebuffer_probe(struct coreboot_device *dev) .format = NULL, }; + /* + * On Coreboot systems, the advertised LB_TAG_FRAMEBUFFER entry + * in the Coreboot table should only be used if the payload did + * not pass a framebuffer information to the Linux kernel. + * + * If the global screen_info data has been filled, the Generic + * System Framebuffers (sysfb) will already register a platform + * device and pass that screen_info as platform_data to a driver + * that can scan-out using the system provided framebuffer. + */ + type = screen_info_video_type(si); + if (type) + return -ENODEV; + if (!fb->physical_address) return -ENODEV;