From patchwork Wed Nov 30 21:55:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 28025 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1174429wrr; Wed, 30 Nov 2022 14:07:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf5YVOF5zsP0n5FbgthdhCVKOz5VqbWPUgqs7Lsx0UpEuVHAExwMGwepHRWCgpxfBV14TcoL X-Received: by 2002:aa7:d34b:0:b0:46a:914c:9bc9 with SMTP id m11-20020aa7d34b000000b0046a914c9bc9mr28938157edr.418.1669846031048; Wed, 30 Nov 2022 14:07:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669846031; cv=none; d=google.com; s=arc-20160816; b=TmFYhMSY1jCG3z63WtA5QrIBDLGd92WVipNnq/M74urJLG/Ry7M52EI1/L+W1A9e8h bPiXE4DSssHQlArOMPsskquHit5EPnguc24X1HvdJ9ymAxuYakyg3IwA6kuNqNViibK1 qjf1LrGLsC72gRHExns4nxXmlDz3NWJdV9Xb5LdGd5ACyO7qLlgVYRChZhvUCSc0T7EH 3SV4aCOcScL6+QwAtJVklZMbSLBEw/S10d2gvmlnlDienKDpYuQkH0MdteUHd1yvrGwY 9AfzMO7pHJpGXqOp83bLnJASZL0hoeHD1B59R4U3nrE28+JuU4975nWmb5dURNHwpElT E5UQ== 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:dkim-signature; bh=IYRKxi+onLBFbh4zY0bg9jQRkT3TX2p808M3H7FEIdk=; b=EAFzlzEMceOYzH/sZFy8dpE+VkDyVy017JcZ4NL5tNjVDrCrR/mDgMBihjRQycB6b2 SALLJZoZOKLF2MTWz0FkvsAZGxRUr4qGuarneUz8vsbcUnSlqQtIU9RmmxZNrBg6b+cm 9eKbe8Kc2tTnSPpH5tPOpXG6yHUfnwt8VXGJTI1e6kTbkXKA1rkNmApBBZ+BmkiPbi7a 6wcLuxSsn7LVLlhEoLSRatnf7EQPsff2V1tc5yfMNgg4EmAKLwtjEN7UWTnkMnILOWiX BEN7K9YFX3CIVVAg3RNjdtGZMfi2tOsVmFOYTX9iDybbtoRTyiBPj3ks/BgL92EvvOPL 6oQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=goeggzxi; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g1-20020a50ec01000000b0046aee4c4ec5si2140972edr.109.2022.11.30.14.06.44; Wed, 30 Nov 2022 14:07:11 -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=pass header.i=@infradead.org header.s=casper.20170209 header.b=goeggzxi; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbiK3Vz7 (ORCPT + 99 others); Wed, 30 Nov 2022 16:55:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229448AbiK3Vz4 (ORCPT ); Wed, 30 Nov 2022 16:55:56 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 797407615A; Wed, 30 Nov 2022 13:55:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=IYRKxi+onLBFbh4zY0bg9jQRkT3TX2p808M3H7FEIdk=; b=goeggzxiVtspFRe1gCJYV2AjAY 3Ien6lK0K0BV9wiAGtv//wzGWz+O8fXUKPwpErcqh4Hc6va6uoVte449UkPeVtdFBUyvgfz1CBA3h WupqZvb7OgIQcJ3wjHdpYFVenXpiwYuYrQ+l9BRsQqbZjWQRJaptQaYsgH3WqLWeiWEJnPLEOBcE2 cJfLGab+Am3K/zwPuvgF/nkLtN1lnsFmdyi5fSWpGDDKkM3523z4ASMf/QcQ+tuiXzAprfodEI+Qf Ix0WXRT0AG4kIZnHJnSzyVCRWbLkmAZlngq3lZ4WCsNSzwoV9vtu2K8SizYZkDWZe/Wb0iRRc0qh2 qVUd31gA==; Received: from [2601:1c2:d80:3110::a2e7] (helo=casper.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0V3d-00FKCY-3n; Wed, 30 Nov 2022 21:55:57 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Johannes Berg , Richard Weinberger , linux-um@lists.infradead.org, Daniel Vetter , Helge Deller , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Andres Salomon , linux-geode@lists.infradead.org Subject: [PATCH 1/2] fbdev: geode: don't build on UML Date: Wed, 30 Nov 2022 13:55:44 -0800 Message-Id: <20221130215544.28497-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.38.1 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_NONE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750960471722264757?= X-GMAIL-MSGID: =?utf-8?q?1750960471722264757?= The geode fbdev driver uses struct cpuinfo fields that are not present on ARCH=um, so don't allow this driver to be built on UML. Prevents these build errors: In file included from ../arch/x86/include/asm/olpc.h:7:0, from ../drivers/mfd/cs5535-mfd.c:17: ../arch/x86/include/asm/geode.h: In function ‘is_geode_gx’: ../arch/x86/include/asm/geode.h:16:24: error: ‘struct cpuinfo_um’ has no member named ‘x86_vendor’ return ((boot_cpu_data.x86_vendor == X86_VENDOR_NSC) && ../arch/x86/include/asm/geode.h:16:39: error: ‘X86_VENDOR_NSC’ undeclared (first use in this function); did you mean ‘X86_VENDOR_ANY’? return ((boot_cpu_data.x86_vendor == X86_VENDOR_NSC) && ../arch/x86/include/asm/geode.h:17:17: error: ‘struct cpuinfo_um’ has no member named ‘x86’ (boot_cpu_data.x86 == 5) && ../arch/x86/include/asm/geode.h:18:17: error: ‘struct cpuinfo_um’ has no member named ‘x86_model’ (boot_cpu_data.x86_model == 5)); ../arch/x86/include/asm/geode.h: In function ‘is_geode_lx’: ../arch/x86/include/asm/geode.h:23:24: error: ‘struct cpuinfo_um’ has no member named ‘x86_vendor’ return ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && ../arch/x86/include/asm/geode.h:23:39: error: ‘X86_VENDOR_AMD’ undeclared (first use in this function); did you mean ‘X86_VENDOR_ANY’? return ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && ../arch/x86/include/asm/geode.h:24:17: error: ‘struct cpuinfo_um’ has no member named ‘x86’ (boot_cpu_data.x86 == 5) && ../arch/x86/include/asm/geode.h:25:17: error: ‘struct cpuinfo_um’ has no member named ‘x86_model’ (boot_cpu_data.x86_model == 10)); Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") Signed-off-by: Randy Dunlap Cc: Johannes Berg Cc: Richard Weinberger Cc: linux-um@lists.infradead.org Cc: Daniel Vetter Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: Andres Salomon Cc: linux-geode@lists.infradead.org --- drivers/video/fbdev/geode/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -- a/drivers/video/fbdev/geode/Kconfig b/drivers/video/fbdev/geode/Kconfig --- a/drivers/video/fbdev/geode/Kconfig +++ b/drivers/video/fbdev/geode/Kconfig @@ -5,6 +5,7 @@ config FB_GEODE bool "AMD Geode family framebuffer support" depends on FB && PCI && (X86_32 || (X86 && COMPILE_TEST)) + depends on !UML help Say 'Y' here to allow you to select framebuffer drivers for the AMD Geode family of processors. From patchwork Wed Nov 30 21:55:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 28026 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1176003wrr; Wed, 30 Nov 2022 14:10:48 -0800 (PST) X-Google-Smtp-Source: AA0mqf46+qQYHGWKEEgOipRfPEO7IWb+/VIMrIxe2GonNpC4E7+LlaBbTEZeGWVTqdr4q8iDQ9b9 X-Received: by 2002:a17:90a:5990:b0:20a:68f5:a986 with SMTP id l16-20020a17090a599000b0020a68f5a986mr72698305pji.166.1669846248654; Wed, 30 Nov 2022 14:10:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669846248; cv=none; d=google.com; s=arc-20160816; b=u+soEy6QAD0w9EO3VTkK4JUQqPmp1gs3ZKu5NZhrrR8z8RFnTxKMHz/iiQZmy5FtY/ 4Yh1WJOMvRI+/2piWiAXglHtsH80eY3bp8jR4GyChQ54/hS2j+xXXw12ndfTDwr5nDp4 Gi96xL/+UhKOoLAOToWyuC84vgkSH2bajsnyLcU0a8M1KrXxLP58B4AifK9Qif65iRUi 4Vth0g/43lzdfaGpEReJ8+0jGdVisuWThM+/sURCseL+IGD9aedHuyOtEzt84C3cYut8 5IcsUbWLaKEXPGz74oHj4Le3669cKa/fS27kwfMn+qEDvBT018mQH4T712YmlG9aZcCb m4dw== 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:dkim-signature; bh=9ue0uGD9yX/1sJHyqmcNOU+aIhb/LFzhG5X5H+uhnGw=; b=g2/geDjGl/ayNa35Agr13MojKXNkYdlMcLVPLV8b0snGgwQ8PnUqcIv5xLyY19Rtbs 1Fw0jUouMfM2TplO9enKikBEtq5SnBva064+XZ62bfuB1Q87cWYP1XRdYrcA1xqH8Vpk BBckecsUsQaVNgDTHJBrFvomRJ9WvByhwyFOIE60o9kBoZuKqcMa2KqnfWtupTDJMoGR QVSIlbwxyVRT8LSiTqD69To1tZ2DA2eB3gXhmBk0sGagHatRnF9FxATyUcVPMy/xJrlJ jXBdnQUkFAqPD/jshVGNiKdt649O0LlO1QBL8qDtC8bUGTqKXUFvic1L5F173lziy11s 8SuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=eYuFdnVE; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r24-20020a63e518000000b0045ff35cf428si2300079pgh.294.2022.11.30.14.10.35; Wed, 30 Nov 2022 14:10:48 -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=pass header.i=@infradead.org header.s=casper.20170209 header.b=eYuFdnVE; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229684AbiK3V4M (ORCPT + 99 others); Wed, 30 Nov 2022 16:56:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229735AbiK3V4K (ORCPT ); Wed, 30 Nov 2022 16:56:10 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A8669209D; Wed, 30 Nov 2022 13:56:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:In-Reply-To:References; bh=9ue0uGD9yX/1sJHyqmcNOU+aIhb/LFzhG5X5H+uhnGw=; b=eYuFdnVEKQN3qRV/BGXQG0Mxyd fFwZQ1O+epwDYpg5jkS8lEjMUV9QQCveIntrqBrGceCtOokWuJOQw2se3juK0d2RzfVaLpfJgu0PD 7NsUelo2lxiHlGAnjkd3/kEFelkcxhp5ddwK6gP829fPi4D1YqYB6Ev3V6hBjHb4b5ldwXLjzcWpR M8wcPUQ+bwxU2jyd/KRF6uC7yaYmuBGnOi6HMeJnKkhe2JcBV75ccO/KiDnymTY/62qqZeGZWLsGB G5IIKQxENka/H3M061749bTb0qfMQGufCDpR9NraJM9CGU+5/+zMiTSa3BXAPujRHFFsYmtQY3nks TB2gcCQA==; Received: from [2601:1c2:d80:3110::a2e7] (helo=casper.infradead.org) by casper.infradead.org with esmtpsa (Exim 4.94.2 #2 (Red Hat Linux)) id 1p0V3s-00FKDQ-Io; Wed, 30 Nov 2022 21:56:13 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , Johannes Berg , Richard Weinberger , linux-um@lists.infradead.org, Daniel Vetter , Helge Deller , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Michal Januszewski Subject: [PATCH 2/2] fbdev: uvesafb: don't build on UML Date: Wed, 30 Nov 2022 13:55:59 -0800 Message-Id: <20221130215559.28969-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.38.1 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_NONE autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750960699884099084?= X-GMAIL-MSGID: =?utf-8?q?1750960699884099084?= The uvesafb fbdev driver uses memory management information that is not available on ARCH=um, so don't allow this driver to be built on UML. Prevents these build errors: ../drivers/video/fbdev/uvesafb.c: In function ‘uvesafb_vbe_init’: ../drivers/video/fbdev/uvesafb.c:807:21: error: ‘__supported_pte_mask’ undeclared (first use in this function) 807 | if (__supported_pte_mask & _PAGE_NX) { ../drivers/video/fbdev/uvesafb.c:807:44: error: ‘_PAGE_NX’ undeclared (first use in this function) 807 | if (__supported_pte_mask & _PAGE_NX) { Fixes: 68f5d3f3b654 ("um: add PCI over virtio emulation driver") Signed-off-by: Randy Dunlap Cc: Johannes Berg Cc: Richard Weinberger Cc: linux-um@lists.infradead.org Cc: Daniel Vetter Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Cc: Michal Januszewski --- drivers/video/fbdev/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -- a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -609,6 +609,7 @@ config FB_TGA config FB_UVESA tristate "Userspace VESA VGA graphics support" depends on FB && CONNECTOR + depends on !UML select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT