From patchwork Sat Feb 24 12:14:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 205839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1115959dyb; Sat, 24 Feb 2024 04:15:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWoi7uUWymIGty1MFo/xJYtnAyXvGdhcC9QjvGJmGbDoKQVtKfh5BrLxHs6vJphFOL/CjNyz1AQ0uEFizxRGxoA8hMRdg== X-Google-Smtp-Source: AGHT+IEmcm9L6mIfCin/jiLPSddjN295/GFB7rTWf0UAxZfaBwjmKO7xy9rdU+HSxCAUQxLs7cUe X-Received: by 2002:a5e:830c:0:b0:7c7:98d8:a3cd with SMTP id x12-20020a5e830c000000b007c798d8a3cdmr2775814iom.16.1708776950391; Sat, 24 Feb 2024 04:15:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708776950; cv=pass; d=google.com; s=arc-20160816; b=Y4q2Sm3EnN9QOVrq/3ViQ6NSjyCKzFIOl/jgKLKwVbeWMRw2YmCC2BvaptrZE737XR v6grJHusm6esccb+nOX02+MTxUO42Y0Jb9c8W6EhXOaSejV5Loa+wAgQkhd7MknISaO5 DIYDwXVaNRvXSOZsKJH6bZmpBw74rqNgZ1Lc+Hh/3rELCcHxWRMx0IEpfu2V+3GRyt3A B+/ZCocvI7SQT5SnYzzCPCn6wWf0O8za19JRqPGDWsAs1/S5zb0pu4vmg75XAb3BuP7o 4JCDmf3WZTDyCIi7FQ/IoemYlxum3PSePbbLfoQ7lF2kbGTvsLGF6dwQ6DrhPOhtydsQ Vtsg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=DRjEENqe86blp0i8w9og/XE7mh2loQyOSTQJkig/Tu4=; fh=c3a3etaS65PU8IWZhyKENzsI54TWfb9/F2pSjAAmJuI=; b=ZgPT+9kb/VLYP+ly73R1jOGBwD7YfveNUaiEhWE7sobZzSfxc1wOJNfqdLreXNQPce 0I+UZuMO3H6kRsoOamwUGP3rj4JR51JvCj8nSFdLckacIs1S486M8zo1n5wHn74YbHTu GrKZQOnce+3DdJI+nzXBxybHF3XXb43vQ0nceDZ1ZgA7THemU1RhP/3ZaBuXQnSFZtMb sqt4YRwhGlgoWIVJ0Q1FUg5GzSLmVPk895WApoMH071wSkex6cUJ/J01iRohxCfCvGjK +pyiVLKySvnw+Sp6HD7DqF2NWjb89SLlqv3ir6wdD0gYj4l5TIGhM+5REice04aiEUxE NxDA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PRUsTOnO; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79633-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79633-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9-20020a631d09000000b005e27218564asi849217pgd.157.2024.02.24.04.15.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:15:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79633-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=PRUsTOnO; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79633-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79633-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 335BA283C5D for ; Sat, 24 Feb 2024 12:15:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 245863F9DE; Sat, 24 Feb 2024 12:15:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="PRUsTOnO" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 57EF63DB89 for ; Sat, 24 Feb 2024 12:15:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776936; cv=none; b=ZtWEOka4gr4AH4O6qFAe+CjTmrXIZVtheQLo2dLDFZ9AupllDxlLRkD28kfV/LwtiABwVrgVLMUTrvp1FUZO6UHSjg2mOi59pWZh1rldQHDJLu33VrZLygrsk2UG6KFagCCh8uu0md8oLdcOPNPD/4jTn1+TXyRZ9E3lUx1R5us= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776936; c=relaxed/simple; bh=GNq+evKLQVdJDM94sIz8nN00faZ597yvTUdvqvR4sM0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Z8dhgxW38MH27yNzvqLpHLMJs2WZ6CZ7NoqCbJmSxeBe0Z5tbtamLOBrpqxFSqq1kDnFbm+GxTRJVgCzsrpdloLjcXbv97rpSSy8NUcBsQUFIhzNVhd+e+pj/OPd5dNuDqO84Qu3NxgeYFAtqmz2THsqO6w8Ob5sMmrM7V6Si+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PRUsTOnO; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 468BBC433C7; Sat, 24 Feb 2024 12:15:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708776935; bh=GNq+evKLQVdJDM94sIz8nN00faZ597yvTUdvqvR4sM0=; h=From:To:Cc:Subject:Date:From; b=PRUsTOnOixxCx6+PhkNqgR6u7CrHGxeKdMmu0HhuiPwo8HX6cv+nHUn/nK/5AgwWZ qGWygkErblxxAjS9Znim/qclXfJGMDBUc8aQ0CNojOT6m/bU6Q2wonJlaCoD73YFOS u3l3ZiBiGeyCHT8imaBNwhyNW2oXV04YhilqCkZkfhfmNYpRIjrnveq/k53sKT7yu7 RHBRCafGsQQUcAkDy1BQY4Sm4tbyoqF1fD8XQBHXktLZoII/pogUvICy0mdH5y9jyw LKYX+yMqZeeyU1ksrLEeOBN4rBk6Rb87rM+upgv+WgowiHWxe03rKJs585KZt9iDdj WWUKYA7ZA4cWg== From: Arnd Bergmann To: Lucas De Marchi , Oded Gabbay , =?utf-8?q?Thomas_Hellstr=C3=B6m?= Cc: Arnd Bergmann , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Rodrigo Vivi , Matthew Brost , Francois Dugast , Jani Nikula , Tejas Upadhyay , Matthew Auld , Mauro Carvalho Chehab , Michal Wajdeczko , Matt Roper , Daniele Ceraolo Spurio , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] drm/xe/kunit: fix link failure with built-in xe Date: Sat, 24 Feb 2024 13:14:59 +0100 Message-Id: <20240224121528.1972719-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791782499735767411 X-GMAIL-MSGID: 1791782499735767411 From: Arnd Bergmann When the driver is built-in but the tests are in loadable modules, the helpers don't actually get put into the driver: ERROR: modpost: "xe_kunit_helper_alloc_xe_device" [drivers/gpu/drm/xe/tests/xe_test.ko] undefined! Change the Makefile to ensure they are always part of the driver even when the rest of the kunit tests are in loadable modules. The tests/xe_kunit_helpers.c file depends on DRM_KUNIT_TEST_HELPERS, so this has to always be selected by the main XE module now, rather than the actual tests. In turn, the "depends on (m || (y && KUNIT=y))" doesn't really do what it tried and can just be removed. Fixes: 5095d13d758b ("drm/xe/kunit: Define helper functions to allocate fake xe device") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/xe/Kconfig | 3 ++- drivers/gpu/drm/xe/Kconfig.debug | 1 - drivers/gpu/drm/xe/Makefile | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig index 6d4428b19a4c..2948650680e1 100644 --- a/drivers/gpu/drm/xe/Kconfig +++ b/drivers/gpu/drm/xe/Kconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config DRM_XE tristate "Intel Xe Graphics" - depends on DRM && PCI && MMU && (m || (y && KUNIT=y)) + depends on DRM && PCI && MMU depends on ACPI_VIDEO || !ACPI select INTERVAL_TREE # we need shmfs for the swappable backing store, and in particular @@ -11,6 +11,7 @@ config DRM_XE select DRM_BUDDY select DRM_EXEC select DRM_KMS_HELPER + select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n select DRM_PANEL select DRM_SUBALLOC_HELPER select DRM_DISPLAY_DP_HELPER diff --git a/drivers/gpu/drm/xe/Kconfig.debug b/drivers/gpu/drm/xe/Kconfig.debug index 549065f57a78..df02e5d17d26 100644 --- a/drivers/gpu/drm/xe/Kconfig.debug +++ b/drivers/gpu/drm/xe/Kconfig.debug @@ -76,7 +76,6 @@ config DRM_XE_KUNIT_TEST depends on DRM_XE && KUNIT && DEBUG_FS default KUNIT_ALL_TESTS select DRM_EXPORT_FOR_TESTS if m - select DRM_KUNIT_TEST_HELPERS help Choose this option to allow the driver to perform selftests under the kunit framework diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 4c6ffe4b2172..b596e4482a9b 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -158,8 +158,10 @@ xe-$(CONFIG_PCI_IOV) += \ xe_lmtt_2l.o \ xe_lmtt_ml.o -xe-$(CONFIG_DRM_XE_KUNIT_TEST) += \ - tests/xe_kunit_helpers.o +# include helpers for tests even when XE is built-in +ifdef CONFIG_DRM_XE_KUNIT_TEST +xe-y += tests/xe_kunit_helpers.o +endif # i915 Display compat #defines and #includes subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \ From patchwork Sat Feb 24 12:15:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 205840 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1116117dyb; Sat, 24 Feb 2024 04:16:13 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVdfU0Ubb76qQcZSaVgi01Q6N5LFEr9fSuDzwkGQ4MXo7D/chjOOgqBBNxVmtuImwP7CyNGTgWi8YeOLyeBXiyuQ2ynQA== X-Google-Smtp-Source: AGHT+IFY4/DtoyYJ1jrXoV8zFxSp7tD8mG4axZwcO5HYyIEvNAvbqLsghBb9TiLw2T2PHMmtAMW+ X-Received: by 2002:a17:902:ebc6:b0:1dc:83b3:99a6 with SMTP id p6-20020a170902ebc600b001dc83b399a6mr1465846plg.41.1708776973785; Sat, 24 Feb 2024 04:16:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708776973; cv=pass; d=google.com; s=arc-20160816; b=lTOqi2ts+YEyYoG13HCzqfGwYAu7r38yMXVYEF9SK1HiAKI3qcwXjIrDKpBBgULUNc V0BSGRR8oTris3My20ykD4VV+CF8913cVj1q+j6siT+z712LIhIDSE5oVk4YBSDOfy1a Q+LuKNXt/vjgxtDmrwxF6cqyZ6mD61FZMIp6zqPnJjINVXfN5hpJbcvTDTDkYCLwYyE2 38m7AvWpU52IR2Skc9LFC/qrI03jsDNBU4lDEXuoe2/FGkNxm7GUUgAlu5FXVgXsvgxi zkq53zkqyHutM5qCbpOeyjceocPE7UXtvbLJFhu2vQbhaOVMT3k9Dmpao2/6oeqRhiEl Vciw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=AAscUDbnNrUBxmOuKRMN6o7PGZVK20Rg4ZL44kRG4xw=; fh=MyVaxwer/5Lb5eRkA7Fy98q4ek2PUEG3puEBT94s7Bg=; b=J4X6nNyAGxTflFGJfm+3HDoFP7njB6ShThXG3EcofpJG3usZQT6yBlqefKwS6IUbne kCcWlGepQJuuJk30NpH46Okk2MJWaUNtq/ddaqefqO2krL6GfJ0R/NvAwNvpGksoqNYO DkPho22/lHIhPxtFeF622BQMg/1WEb/5iiVDN9EOQx4WmiT1gLu97Vp05FAJZ6eBR8m+ U3zKwWxGLnkMzkt2ZhCK8P1AVn44pZnoB2pP823RSGIBP1RSq7MoZ7Ka93SKZj1lsf3y WeClmlZY3BywHXL+fOgToLmJvoI3NT2/+WwNKDPPDAlZB3Lr1nGe/rUTxO/lhU50paDH maZQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JWj5D/Lb"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79634-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79634-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id d18-20020a170903231200b001db4210203asi768069plh.351.2024.02.24.04.16.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:16:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79634-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="JWj5D/Lb"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79634-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79634-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 48DA2B219BD for ; Sat, 24 Feb 2024 12:16:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E6DF3F9D8; Sat, 24 Feb 2024 12:15:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JWj5D/Lb" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52A623D988; Sat, 24 Feb 2024 12:15:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776953; cv=none; b=O6mtecPf9G3SOxaD4h4i+LcmY2mXYa3PYqiGbMLtgwmje8Myxsq41YdFCHkvvPXDIMHkHg70hyedixGlHeb9g1TxZ7W6dahuqpMtkgRHLjUZTJEJKbL1sh9JeLDu0N0NNgEl6g3JMjzhHZ7qMjIBWe7VEy7WtNCeQgbZdpaTSdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776953; c=relaxed/simple; bh=oP261W1pt6YMYe8qcA9fKGIH4omThSFAKhryuBOrQu8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VN0TPeWdvSwQBajmyhfevPe6wLebRd+1E5rrULM5EA9waN94Npnv6ovFkJF/l+VGz8ptHq+0cn9x0J25ZzesYsxuNuIL3XdWPZPLmNyRDQJ2xW+02wT4ghBVgz1XjOP6qIKOkMkWfRHgm83pZWyZWykOsmpI/hWlXi6xQh7Nqa0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JWj5D/Lb; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5597C433C7; Sat, 24 Feb 2024 12:15:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708776952; bh=oP261W1pt6YMYe8qcA9fKGIH4omThSFAKhryuBOrQu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JWj5D/Lbhnfny8owmLC3lczUAT9S5jtD5sU8TU8QhGT26WP/1weK5cK8AHcWA5qEr vw/Vo5aAnO5uho3XszpE2+nui1H5lIahI6iktAdCxtURW4MTgc3+FC47zrxgJpQba4 H+c9EJ9Y+tW7ixHzdCopIHFqSPERkhYJ0ftNSQwkcoUVYF6PK4IPMVYJBjyiRpwSpP T8uzMrHbYhFjn1bgKF4r1bujG3jbzogaatVPGfE2j6OOHe3x0KCtdpnIYDzWmOCT2c zYLL3n+T6eH/0CWXMh2GovCRMWz1efiHBxRG8DZFfVoPXB1NA7ZXcEeV4d/LN1vZN1 bjOt1HAejD04g== From: Arnd Bergmann To: Lucas De Marchi , Oded Gabbay , =?utf-8?q?Thomas_Hellstr=C3=B6m?= Cc: Arnd Bergmann , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Rodrigo Vivi , Matt Roper , Matthew Auld , Matthew Brost , Koby Elbaz , "Michael J. Ruhl" , Francois Dugast , Dave Airlie , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev Subject: [PATCH 2/3] drm/xe/mmio: fix build warning for BAR resize on 32-bit Date: Sat, 24 Feb 2024 13:15:00 +0100 Message-Id: <20240224121528.1972719-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240224121528.1972719-1-arnd@kernel.org> References: <20240224121528.1972719-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791782523649462844 X-GMAIL-MSGID: 1791782523649462844 From: Arnd Bergmann clang complains about a nonsensical test on builds with a 32-bit phys_addr_t, which means resizing will always fail: drivers/gpu/drm/xe/xe_mmio.c:109:23: error: result of comparison of constant 4294967296 with expression of type 'resource_size_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare] 109 | root_res->start > 0x100000000ull) | ~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~ Previously, BAR resize was always disallowed on 32-bit kernels, but this apparently changed recently. Since 32-bit machines can in theory support PAE/LPAE for large address spaces, this may end up useful, so change the driver to shut up the warning but still work when phys_addr_t/resource_size_t is 64 bit wide. Fixes: 9a6e6c14bfde ("drm/xe/mmio: Use non-atomic writeq/readq variant for 32b") Fixes: ea97a66a2218 ("drm/xe: Disable 32bits build") Signed-off-by: Arnd Bergmann Acked-by: Lucas De Marchi --- drivers/gpu/drm/xe/xe_mmio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_mmio.c b/drivers/gpu/drm/xe/xe_mmio.c index e3db3a178760..7ba2477452d7 100644 --- a/drivers/gpu/drm/xe/xe_mmio.c +++ b/drivers/gpu/drm/xe/xe_mmio.c @@ -106,7 +106,7 @@ static void xe_resize_vram_bar(struct xe_device *xe) pci_bus_for_each_resource(root, root_res, i) { if (root_res && root_res->flags & (IORESOURCE_MEM | IORESOURCE_MEM_64) && - root_res->start > 0x100000000ull) + (u64)root_res->start > 0x100000000ul) break; } From patchwork Sat Feb 24 12:15:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 205841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1116187dyb; Sat, 24 Feb 2024 04:16:27 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVoIVc7r5Jicj26nR3XgMpSxySfGOtdQDr3sUkE5Fj34IFphE0zjm/X1rz3Hkh2lQQq+Rw98TtYjVJfR1i+aC54dfzoFQ== X-Google-Smtp-Source: AGHT+IH8NUNcyIMfvih3uNFLVmUHU1b/YRFaztezz7TFvoEdxfeAMoO5FKV1qGpfxJy9gd7np2cu X-Received: by 2002:a17:902:c946:b0:1dc:4bc2:4923 with SMTP id i6-20020a170902c94600b001dc4bc24923mr2475317pla.65.1708776987099; Sat, 24 Feb 2024 04:16:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708776987; cv=pass; d=google.com; s=arc-20160816; b=nLdr/tY+RKmcDR3QVL2e+63+cr4Odu7w+oTtP+bTsYv9K1G9OYj+ctnOEUvxZl2UKG 7NGgjrZeTtHUhZtF6W/OJ9roQ5XA3A1sNhIvJ9wB5pdjfDPkiPnNLy4HlyVy3cBHFGa2 D0l35AXqSLmCPPad3p/WMjnmKrR1g3M1YfLTeUkrCrHxWUr2AH+v1bjmf2mqOwdgEm8Q aLMzKVmIyz65wIcxV6v63N7Jx8HiyYumxb5BR8zcoW15G3vDlMbyeDNxJNGzL2mxnCxw Mt4B/0prMImfOdQjnD1s6rCI/cdukK4HzYy/bHvQxfQ4vuE2rnvQUehuOXCroltWGxRu WVKQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Itlrazf/c3eDXMQ18Z9x2AwWU204yDUiHazByrlMLM0=; fh=UXQ+5Z3bRGipZXH+yEkWg+oQV4fU2ImlzuMaPyrXSOQ=; b=pr9gLSWzciET/1w8k+HqYUG9PssJU386CCY4Ff35ALmf7vWG8EZSo5Mit4wW9Wlr3H ftiP4O86eAkGiZxQ5cM/SlahEtK8xNORI0KI//AowHSt+IpNmMXEQufCquprxTPTJzmN NxCp628XqLADMWYJv9efdc97kiKHWAJnfHzcNK/WBn0Ri7XBE900+3C1lHKTXJ/7Bw72 /enYYw2b4RNccBfgzKkz2Df8wZ2L7h4PvTuG/9V8O6lG2hQvezxcxXmAdHs34RqQs6TG GvxAESRZSFMN7Rbzw0C8NiwZWCrYVpKV/j5JQnqTeOzfxazbU9kUvNt+VBH2IWFgBajL oB/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="XjL/ME58"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79635-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79635-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id im9-20020a170902bb0900b001db9170927bsi749091plb.296.2024.02.24.04.16.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Feb 2024 04:16:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79635-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="XjL/ME58"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-79635-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79635-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E3283282EA1 for ; Sat, 24 Feb 2024 12:16:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 90A833F9C6; Sat, 24 Feb 2024 12:16:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XjL/ME58" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE0B73D988 for ; Sat, 24 Feb 2024 12:16:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776972; cv=none; b=u053Gdx03//Pn+CAwXaD/8As7D5f8RbJhi9V6uZWDxMdF/llzqTgPeQaEk8b1VhF84nwvGk5XbM2OEsntGuZCONqfc1x+v274HW6V49X2/4sKY+8dimIM+zf2ORlLZnc8z3mMw0DTxaC4vOOjFmIyA/O2rxE+TN+VS12AmSJDMU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708776972; c=relaxed/simple; bh=FVqwkjBGiGZ+FrnuOmvhnP6hzKLmcnGCY/w4xZTohpY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sPS4YZx5U3/C4eZezkzkXOzPNXZZxGuYqulaUwEbB//1N8OdY088lDtCqqGKKt0MvE3qYjv4bsmK+QeTCyQDrSeAhdyURXEM5KevY4rCIc1ioW5HJqfetPuV0Mqz1AOeHQQGg4iBuCXEj5Wkf/Lekegz2RxpP0TWnfqNwS9aI1g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XjL/ME58; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6462C433F1; Sat, 24 Feb 2024 12:16:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708776971; bh=FVqwkjBGiGZ+FrnuOmvhnP6hzKLmcnGCY/w4xZTohpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XjL/ME582gBj+PnpaYTcAJdRjWCltO0ujLpFGlmYasM9RQuSkdzve0IpVw+2qvHrb 4oqTU1S+Iep91HOzIAgIb+hHbKAhsa9/b3uTFbcowMuARdI3FpC4SAwzG/DR+zo3CV aPrwkUhUDsQrdBsTyE5lAkwd3Rp5jpwNDIcIfx1X7WaWscenCVj97SVKk16zJe3L5U KF8z9/nNbY+1dQFiuJEnfp/+cJnxufDun68bUW1FNO2I8JVGO3cbkJ12p3x1s3Az1S IjrNd3LUfFkHv4PjvnnH+cDfNE5fHimeCIxJu5w8by24eFIaNEYMXmosPgkoyqsmSS MrYuj+UrUAwKQ== From: Arnd Bergmann To: Lucas De Marchi , Oded Gabbay , =?utf-8?q?Thomas_Hellstr=C3=B6m?= Cc: Arnd Bergmann , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Rodrigo Vivi , Matt Roper , Matthew Brost , Himal Prasad Ghimiray , Francois Dugast , Dave Airlie , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] drm/xe/xe2: fix 64-bit division in pte_update_size Date: Sat, 24 Feb 2024 13:15:01 +0100 Message-Id: <20240224121528.1972719-3-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240224121528.1972719-1-arnd@kernel.org> References: <20240224121528.1972719-1-arnd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791782537909580164 X-GMAIL-MSGID: 1791782537909580164 From: Arnd Bergmann This function does not build on 32-bit targets when the compiler fails to reduce DIV_ROUND_UP() into a shift: ld.lld: error: undefined symbol: __aeabi_uldivmod >>> referenced by xe_migrate.c >>> drivers/gpu/drm/xe/xe_migrate.o:(pte_update_size) in archive vmlinux.a There are two instances in this function. Change the first to use an open-coded shift with the same behavior, and the second one to a 32-bit calculation, which is sufficient here as the size is never more than 2^32 pages (16TB). Fixes: ea97a66a2218 ("drm/xe: Disable 32bits build") Signed-off-by: Arnd Bergmann --- drivers/gpu/drm/xe/xe_migrate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c index a66fdf2d2991..ee1bb938c493 100644 --- a/drivers/gpu/drm/xe/xe_migrate.c +++ b/drivers/gpu/drm/xe/xe_migrate.c @@ -462,7 +462,7 @@ static u32 pte_update_size(struct xe_migrate *m, } else { /* Clip L0 to available size */ u64 size = min(*L0, (u64)avail_pts * SZ_2M); - u64 num_4k_pages = DIV_ROUND_UP(size, XE_PAGE_SIZE); + u32 num_4k_pages = (size + XE_PAGE_SIZE - 1) >> XE_PTE_SHIFT; *L0 = size; *L0_ofs = xe_migrate_vm_addr(pt_ofs, 0);