From patchwork Mon Sep 16 11:00:25 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: 13805269 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 CFB1CC3ABA2 for ; Mon, 16 Sep 2024 11:01:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CBE6510E345; Mon, 16 Sep 2024 11:01:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="S6C9Ypv4"; 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 63CE310E333 for ; Mon, 16 Sep 2024 11:01:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726484460; 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: in-reply-to:in-reply-to:references:references; bh=itSh3IrUxrdCZUhjcuF+BB5F77vjj4OFkn+g9OgH098=; b=S6C9Ypv4HaSwyzSZNGn0jITP0KepnGApRc5pH853JDanCQg94ZMsqwEH8XdGLG1WUL3MQ2 KKDF1d2WhMRQUc2FxDvSAAl44mGP+acufDb+OyQQEHlXTM+acCH6SJ/Vi8QCm2a86+sYW9 tbwyNa513Empq2vpq3zGx2kkWVOHogc= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-388-441m51AJN1ehosz2aF3yEA-1; Mon, 16 Sep 2024 07:00:57 -0400 X-MC-Unique: 441m51AJN1ehosz2aF3yEA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42cacba219cso21436095e9.2 for ; Mon, 16 Sep 2024 04:00:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726484456; x=1727089256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=itSh3IrUxrdCZUhjcuF+BB5F77vjj4OFkn+g9OgH098=; b=PWkKRs9TNBkpBPgL8EL1wOGjNj4IjC3XZ0lxXL0daHB3RzTF/7j9Y/RAxI9dWa/ybt bcvcbEkc4LhNonFnj/IK0rIEyGtbCckTKxJhOFiufTXwRfhPMECybezF3EZ+ZYHP8SF2 00FO6EV/Jv7PcRnqLzCZ7zMSSQdO2vZww5iMI33CTN1hic99i2652nZJgnidCUvwUdBB sY5CfR30EC551ik1ZIEPLRW7TXyNrQg+DXMr2qRNOhT167iFbW8+8kfMk2WvqB4RYgOY 19UeEilSuvn9PSqLixN8a/wtLpJHxztsl+5610s0QSSRJAx76jwHSg2XGWWDo8I5asKK dOiw== X-Forwarded-Encrypted: i=1; AJvYcCVjfxFagj704HArYrX2ZJu4Vsw8xz5+6/D4BspYfwwa/+AlgLtnXWyLNnCKHc9nhbntjmS5tcsMfVY=@lists.freedesktop.org X-Gm-Message-State: AOJu0YyH73QwgKJFJm1yTaobJsnQzMduqVumCkPRp55WyXU+oBGg+SR2 3pc25ojRBAZF6cJAqt4viqSsVSheK7ZYv2r97U1ijyoJG9quRw3XJNPBir2OojKt49SPklLT38z 7dKo+qBel4vh6JnzTw0gtDu3eYPQj/a4wcklybNAIJYMXk0FLjJAoiJIx4MFuywXgkw== X-Received: by 2002:a05:600c:310a:b0:42b:892d:54c0 with SMTP id 5b1f17b1804b1-42d907221b4mr59983065e9.12.1726484455964; Mon, 16 Sep 2024 04:00:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsgWHRJR4aKx2ppVUW3nxaeapfH3oj46/SJkQvNinWOePbqW+Lc2YXP1lXrRnZng63+W2aKg== X-Received: by 2002:a05:600c:310a:b0:42b:892d:54c0 with SMTP id 5b1f17b1804b1-42d907221b4mr59982735e9.12.1726484455424; Mon, 16 Sep 2024 04:00:55 -0700 (PDT) Received: from localhost ([195.166.127.210]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42d9b055069sm110260975e9.6.2024.09.16.04.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2024 04:00:55 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Brian Norris , dri-devel@lists.freedesktop.org, Borislav Petkov , Julius Werner , Thomas Zimmermann , chrome-platform@lists.linux.dev, intel-gfx@lists.freedesktop.org, Hugues Bruant , Javier Martinez Canillas , Alex Deucher , Dan Carpenter , Helge Deller , Jani Nikula Subject: [PATCH v4 1/2] firmware: sysfb: Add a sysfb_handles_screen_info() helper function Date: Mon, 16 Sep 2024 13:00:25 +0200 Message-ID: <20240916110040.1688511-2-javierm@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240916110040.1688511-1-javierm@redhat.com> References: <20240916110040.1688511-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" That can be used by drivers to check if the Generic System Framebuffers (sysfb) support can handle the data contained in the global screen_info. Drivers might need this information to know if have to setup the system framebuffer, or if they have to delegate this action to sysfb instead. Suggested-by: Thomas Zimmermann Signed-off-by: Javier Martinez Canillas Reviewed-by: Thomas Zimmermann --- Changes in v4: - New patch to add sysfb_handles_screen_info() helper (Thomas Zimmermann). drivers/firmware/sysfb.c | 19 +++++++++++++++++++ include/linux/sysfb.h | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/firmware/sysfb.c b/drivers/firmware/sysfb.c index 02a07d3d0d40..770e74be14f3 100644 --- a/drivers/firmware/sysfb.c +++ b/drivers/firmware/sysfb.c @@ -77,6 +77,25 @@ void sysfb_disable(struct device *dev) } EXPORT_SYMBOL_GPL(sysfb_disable); +/** + * sysfb_handles_screen_info() - reports if sysfb handles the global screen_info + * + * Callers can use sysfb_handles_screen_info() to determine whether the Generic + * System Framebuffers (sysfb) can handle the global screen_info data structure + * or not. Drivers might need this information to know if they have to setup the + * system framebuffer, or if they have to delegate this action to sysfb instead. + * + * Returns: + * True if sysfb handles the global screen_info data structure. + */ +bool sysfb_handles_screen_info(void) +{ + const struct screen_info *si = &screen_info; + + return !!screen_info_video_type(si); +} +EXPORT_SYMBOL_GPL(sysfb_handles_screen_info); + #if defined(CONFIG_PCI) static bool sysfb_pci_dev_is_enabled(struct pci_dev *pdev) { diff --git a/include/linux/sysfb.h b/include/linux/sysfb.h index bef5f06a91de..07cbab516942 100644 --- a/include/linux/sysfb.h +++ b/include/linux/sysfb.h @@ -60,12 +60,19 @@ struct efifb_dmi_info { void sysfb_disable(struct device *dev); +bool sysfb_handles_screen_info(void); + #else /* CONFIG_SYSFB */ static inline void sysfb_disable(struct device *dev) { } +static inline bool sysfb_handles_screen_info(void) +{ + return false; +} + #endif /* CONFIG_SYSFB */ #ifdef CONFIG_EFI From patchwork Mon Sep 16 11:00:26 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: 13805268 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 4BEF1C3ABCE for ; Mon, 16 Sep 2024 11:01:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C0BC810E333; Mon, 16 Sep 2024 11:01:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="GCJ5mWtf"; dkim-atps=neutral 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 EAD3010E333 for ; Mon, 16 Sep 2024 11:01:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726484460; 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: in-reply-to:in-reply-to:references:references; bh=eEjIF7qtpeO5gdAg8m1MkAHfmOzMzhqhggl+Nd1IK9g=; b=GCJ5mWtfRtKo1pAClit0NIqOaUVeMDNB3EsCREAV4ac2PLWTCcSpVBghIn4aG5SlahoF/+ y5B5khrEXDsixrdXlkkC3Yy4HV6UT2t1yrMtlDLxC2vJEbLMl+xfImGfOez3GFqACxPATH pGIUiritaYCibbxx6TARzysIl4mPvQc= 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-357-wNr9dfwoMgCxT5ySCrgASQ-1; Mon, 16 Sep 2024 07:00:59 -0400 X-MC-Unique: wNr9dfwoMgCxT5ySCrgASQ-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-42caca7215dso27662365e9.2 for ; Mon, 16 Sep 2024 04:00:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726484458; x=1727089258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eEjIF7qtpeO5gdAg8m1MkAHfmOzMzhqhggl+Nd1IK9g=; b=O+f75E1NpZ5MgF2DVg7rpUnagOsfZhv5iTpc1088l73TCSPxlnQPEILZRq12WHob5p /+vFYYZT3ErE5DurYUUtPLvlQT1ZyRcp7sE7oUGhWePJWSxIAlo8aIoCEC1pDNzINKxF lVLHQB6o5A/Wp9WGlpmIMY9pCRW6aKE+HHlzq0335i+n7xAHbXYHHySWDmh/zP1VdHwL k1SHLPu9iSG0UvfT9KfWJv7Zr6+/q4Mt/UHIajd1PMhvd4Z9ojxiY2XTDhfOdHYwgF6L KfpA7+F0+UPPMMRjY1V/Tf29y6kQs0LZJwx4MSxIXH8+1vPxH1Y84XmkHmo+Oq+EZwT7 Pe2g== X-Forwarded-Encrypted: i=1; AJvYcCW+bnP01mpdDiIo04Laj5SMmuV2zoC0askkcQJzLLh6b+27p/n+hxo48KqV9SMpZMrcM5hpDVe9AdA=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzNaZN+SRuLH/dzt9spODEsyYlP+qs5PPIPL1is7eKzRwRVnaWB SlYssYFJgHJEmhLNZFemO6Ef2/084iBbhJ2R7kfAUTDhyRxFlXKVsLEid04OQqUUQjIRWZctRQ7 mZqT3XzXvLCL8/6+uZeyd7G6p5FfHinNQMc/zR347Y+ezEmAw1auJuIaGnEceyZoL+/HOS4irRe so X-Received: by 2002:a05:600c:21d1:b0:42c:de2f:da27 with SMTP id 5b1f17b1804b1-42cde2fdb54mr105453625e9.2.1726484457633; Mon, 16 Sep 2024 04:00:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuoN48esuPwjXdzhGeiLsvhSvLtwnfWmyh0YiWdZ01XdL7xeFl8Crpz10A2XtyhhYWXONvEQ== X-Received: by 2002:a05:600c:21d1:b0:42c:de2f:da27 with SMTP id 5b1f17b1804b1-42cde2fdb54mr105453355e9.2.1726484457174; Mon, 16 Sep 2024 04:00:57 -0700 (PDT) Received: from localhost ([195.166.127.210]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42cc137556esm200901665e9.1.2024.09.16.04.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2024 04:00:56 -0700 (PDT) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Brian Norris , dri-devel@lists.freedesktop.org, Borislav Petkov , Julius Werner , Thomas Zimmermann , chrome-platform@lists.linux.dev, intel-gfx@lists.freedesktop.org, Hugues Bruant , Javier Martinez Canillas , Tzung-Bi Shih Subject: [PATCH v4 2/2] firmware: coreboot: Don't register a pdev if screen_info data is present Date: Mon, 16 Sep 2024 13:00:26 +0200 Message-ID: <20240916110040.1688511-3-javierm@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240916110040.1688511-1-javierm@redhat.com> References: <20240916110040.1688511-1-javierm@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 v4: - Use a sysfb_handles_screen_info() helper instead of screen_info_video_type() to fix build errors on platforms that don't define a struct screen_info (Thomas Zimmermann). Changes in v3: - Fix coreboot spelling to be all in lowercase (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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/google/framebuffer-coreboot.c index daadd71d8ddd..c68c9f56370f 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" @@ -36,6 +37,19 @@ 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. + */ + if (sysfb_handles_screen_info()) + return -ENODEV; + if (!fb->physical_address) return -ENODEV;