From patchwork Fri Jan 28 18:33:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 12728928 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 EF065C433EF for ; Fri, 28 Jan 2022 18:32:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7891310EB05; Fri, 28 Jan 2022 18:32:22 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id E1FD710EB05 for ; Fri, 28 Jan 2022 18:32:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643394740; x=1674930740; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EyUshJ7N9AmNjju/AthEoz9EsBeM3A7baLYVxSWJtd4=; b=L2I3UcQf0J5tQCpAY9wgIeIOpET3nnT6jKKxInl2Oz6S7tV3dXsjyXBX N1NAXK4Ug3VkOexWCYEiujl9GMhsQ1XsFjfncPy1dCyAaRh2R8cFhTINo 1UU/iD4gbv+bnf7VBaiW7/tZStJ/8X1iqiQpB49jvhtUKqglZmBlGpeN9 rz1rksgJ/T8CPbc2UNh3sWEc6juor1cmhdXjIx5pzVI4XpZAC95K9nc0m owRx+8CrXK8fkvmhJFe3Xtfvv5jojeChnGM/6eO61hgClhUn/OiQJ7Ma5 5qIylhol67KElcfKqTxfQxcFEGHiT8yMdHRaCc//T2riohpklk7NW9ZFK A==; X-IronPort-AV: E=McAfee;i="6200,9189,10240"; a="244774579" X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="244774579" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 10:32:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="480828089" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.202]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 10:32:19 -0800 From: Lucas De Marchi To: gfx-internal-devel@eclists.intel.com, dri-devel@lists.freedesktop.org Subject: [PATCH v2 1/3] drm: Stop spamming log with drm_cache message Date: Fri, 28 Jan 2022 10:33:03 -0800 Message-Id: <20220128183305.3072999-2-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220128183305.3072999-1-lucas.demarchi@intel.com> References: <20220128183305.3072999-1-lucas.demarchi@intel.com> MIME-Version: 1.0 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: , Cc: David Airlie , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Only x86 and in some cases PPC have support added in drm_cache.c for the clflush class of functions. However warning once is sufficient to taint the log instead of spamming it with "Architecture has no drm_cache.c support" every few millisecond. Switch to WARN_ONCE() so we still get the log message, but only once, together with the warning. E.g: ------------[ cut here ]------------ Architecture has no drm_cache.c support WARNING: CPU: 80 PID: 888 at drivers/gpu/drm/drm_cache.c:139 drm_clflush_sg+0x40/0x50 [drm] ... v2 (Jani): use WARN_ONCE() and keep the message previously on pr_err() Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Daniel Vetter Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/drm_cache.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c index f19d9acbe959..2c3fa5677f7e 100644 --- a/drivers/gpu/drm/drm_cache.c +++ b/drivers/gpu/drm/drm_cache.c @@ -112,8 +112,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) kunmap_atomic(page_virtual); } #else - pr_err("Architecture has no drm_cache.c support\n"); - WARN_ON_ONCE(1); + WARN_ONCE(1, "Architecture has no drm_cache.c support\n"); #endif } EXPORT_SYMBOL(drm_clflush_pages); @@ -143,8 +142,7 @@ drm_clflush_sg(struct sg_table *st) if (wbinvd_on_all_cpus()) pr_err("Timed out waiting for cache flush\n"); #else - pr_err("Architecture has no drm_cache.c support\n"); - WARN_ON_ONCE(1); + WARN_ONCE(1, "Architecture has no drm_cache.c support\n"); #endif } EXPORT_SYMBOL(drm_clflush_sg); @@ -177,8 +175,7 @@ drm_clflush_virt_range(void *addr, unsigned long length) if (wbinvd_on_all_cpus()) pr_err("Timed out waiting for cache flush\n"); #else - pr_err("Architecture has no drm_cache.c support\n"); - WARN_ON_ONCE(1); + WARN_ONCE(1, "Architecture has no drm_cache.c support\n"); #endif } EXPORT_SYMBOL(drm_clflush_virt_range); From patchwork Fri Jan 28 18:33:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 12728929 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 3195DC433F5 for ; Fri, 28 Jan 2022 18:32:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B256410EB15; Fri, 28 Jan 2022 18:32:22 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A79710EAFE for ; Fri, 28 Jan 2022 18:32:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643394741; x=1674930741; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f+rERBu/ZkpwJ1Der+AaWEZd4RDtVZo9KmOt92emduU=; b=GXIJKHZb0vEu1/r7E9C4XEjtVJyXecPJHv7KmAneMe4dBu5w8AatFV9F oidXjB2jT3XcAODe+7xLPGCzqVUWIjTyOBwCBTdnZfiLm/ihlPrLDSEvq 6thGIPlzmAKTKfM+jmoMOi1dK7tvKOJr0U1dNUgYk9gi67U2YcxKLC0eO QEff0xTeph8abADKL/qfGdMjCDIfeIdst0EY8RLLUO5RiW9pKqemqztW/ rezgoEha0V6hy37ZcJ5L/cVi9etBcG8uaAbzvLAiT8FE+Ih7aF4RRBnip PiHUjMmhab9dcFjujrNniqlhZjnO6zmezl1qkx6T7frJcE+cvjRmPF6vh g==; X-IronPort-AV: E=McAfee;i="6200,9189,10240"; a="244774580" X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="244774580" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 10:32:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="480828092" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.202]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 10:32:19 -0800 From: Lucas De Marchi To: gfx-internal-devel@eclists.intel.com, dri-devel@lists.freedesktop.org Subject: [PATCH v2 2/3] drm/i915: Fix header test for !CONFIG_X86 Date: Fri, 28 Jan 2022 10:33:04 -0800 Message-Id: <20220128183305.3072999-3-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220128183305.3072999-1-lucas.demarchi@intel.com> References: <20220128183305.3072999-1-lucas.demarchi@intel.com> MIME-Version: 1.0 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: , Cc: Siva Mullati Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Architectures others than x86 have a stub implementation calling WARN_ON_ONCE(). The appropriate headers need to be included, otherwise the header-test target will fail with: HDRTEST drivers/gpu/drm/i915/i915_mm.h In file included from : ./drivers/gpu/drm/i915/i915_mm.h: In function ‘remap_io_mapping’: ./drivers/gpu/drm/i915/i915_mm.h:26:2: error: implicit declaration of function ‘WARN_ON_ONCE’ [-Werror=implicit-function-declaration] 26 | WARN_ON_ONCE(1); | ^~~~~~~~~~~~ v2: Do not include since call to pr_err() has been removed Fixes: 67c430bbaae1 ("drm/i915: Skip remap_io_mapping() for non-x86 platforms") Cc: Siva Mullati Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/i915/i915_mm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/i915/i915_mm.h b/drivers/gpu/drm/i915/i915_mm.h index 76f1d53bdf34..3ad22bbe80eb 100644 --- a/drivers/gpu/drm/i915/i915_mm.h +++ b/drivers/gpu/drm/i915/i915_mm.h @@ -6,6 +6,7 @@ #ifndef __I915_MM_H__ #define __I915_MM_H__ +#include #include struct vm_area_struct; From patchwork Fri Jan 28 18:33:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas De Marchi X-Patchwork-Id: 12728930 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 9CE31C433F5 for ; Fri, 28 Jan 2022 18:32:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 667CA10EB3B; Fri, 28 Jan 2022 18:32:23 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3BF5A10EB05 for ; Fri, 28 Jan 2022 18:32:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643394741; x=1674930741; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=H7/9vIFzCjh3W9BUNa7eaJPZ0CVcoZjzFcX2zutSRBw=; b=kRFzk+UpNAzxRE7paFCQ47iJehVdoogmRQqaRQHZGWCikhPClxEY/Qwh d/35sMweFVdsmF79l7eqS2JC+jSVfVeXpgfeAhwzUwJ5EQXtforAyGReg UDjXsBI324TUtIn12tg82TUnfJkkcZsJGpiEBMWN+tkSAif2hS0JFWMjU beI4G6A9YJC7twIT/MwAwGEzyoEYWC8hyCPLoRXaCk0sJraFN4YSy7cP9 bYzwA8G6qU+/J6LN1OvVTdpB2rMj5i2vtKpxH3go0LH9UcXWT+5RZke/9 iJfoI3anWdf5ilEP87LZX7X7lo1OH0MPRXyco6dcQyCmUTA4TQ4C21uvm A==; X-IronPort-AV: E=McAfee;i="6200,9189,10240"; a="244774581" X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="244774581" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 10:32:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,324,1635231600"; d="scan'208";a="480828095" Received: from lucas-s2600cw.jf.intel.com ([10.165.21.202]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jan 2022 10:32:19 -0800 From: Lucas De Marchi To: gfx-internal-devel@eclists.intel.com, dri-devel@lists.freedesktop.org Subject: [PATCH v2 3/3] drm/i915: Do not spam log with missing arch support Date: Fri, 28 Jan 2022 10:33:05 -0800 Message-Id: <20220128183305.3072999-4-lucas.demarchi@intel.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220128183305.3072999-1-lucas.demarchi@intel.com> References: <20220128183305.3072999-1-lucas.demarchi@intel.com> MIME-Version: 1.0 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" Following what was done in drm_cache.c, when the stub for remap_io_mapping() was added in commit 67c430bbaae1 ("drm/i915: Skip remap_io_mapping() for non-x86 platforms"), it included a log message with pr_err(). However just the warning is already enough and switching to WARN_ONCE() allows us to keep the log message while avoiding log spam. Signed-off-by: Lucas De Marchi --- drivers/gpu/drm/i915/i915_mm.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_mm.h b/drivers/gpu/drm/i915/i915_mm.h index 3ad22bbe80eb..04c8974d822b 100644 --- a/drivers/gpu/drm/i915/i915_mm.h +++ b/drivers/gpu/drm/i915/i915_mm.h @@ -23,8 +23,7 @@ int remap_io_mapping(struct vm_area_struct *vma, unsigned long addr, unsigned long pfn, unsigned long size, struct io_mapping *iomap) { - pr_err("Architecture has no %s() and shouldn't be calling this function\n", __func__); - WARN_ON_ONCE(1); + WARN_ONCE(1, "Architecture has no drm_cache.c support\n"); return 0; } #endif