From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 739D4CF11F8 for ; Thu, 10 Oct 2024 13:51:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE5E66B0083; Thu, 10 Oct 2024 09:51:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B955C6B0085; Thu, 10 Oct 2024 09:51:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A5D026B0088; Thu, 10 Oct 2024 09:51:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 88B4D6B0083 for ; Thu, 10 Oct 2024 09:51:55 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7C423C01A0 for ; Thu, 10 Oct 2024 13:51:51 +0000 (UTC) X-FDA: 82657830990.07.E838C93 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf24.hostedemail.com (Postfix) with ESMTP id 7403618000D for ; Thu, 10 Oct 2024 13:51:52 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; spf=pass (imf24.hostedemail.com: domain of vincenzo.frascino@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=vincenzo.frascino@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728568243; a=rsa-sha256; cv=none; b=gUh7zI4q9OzxN7HojZaI3P8i8EIL5tMqVTVSf3wiiXLcKsqppNn1RnupMUTbCQ1MgZlILU rQMIkhMGKY1/Ur61bPxxqj48NACtO7SejSoUZniSHo1G247xeeVe8QIROZoMELDY33K2HT Z2AWMe8wQPimFy02XzaDuD7/qSMwSK4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; spf=pass (imf24.hostedemail.com: domain of vincenzo.frascino@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=vincenzo.frascino@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728568243; h=from:from:sender: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=HcJfj44K336t7K5c8FPK1UPGnbt91PBb4RqKvJwpimc=; b=Il+OvXPBifJfr3QwM1oLvcL95WfyxnuwlKAy/e/dIC1eFTW6zvRaVO9gd+apHu9pCcekx+ baA19oAU671e6Cs/muYYpiZcdZJnAvPsSdzyFCC/+iUDjF71TKLNfPTs+zpjdt85YT20DW Ij2/pczTFlTqAEnAVt50vWyOQRTSh6Q= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 27408DA7; Thu, 10 Oct 2024 06:52:22 -0700 (PDT) Received: from e119884-lin.cambridge.arm.com (e119884-lin.cambridge.arm.com [10.1.196.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7FC053F64C; Thu, 10 Oct 2024 06:51:51 -0700 (PDT) From: Vincenzo Frascino To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org Cc: Vincenzo Frascino , Arnd Bergmann , Andy Lutomirski , Thomas Gleixner , "Jason A . Donenfeld" Subject: [PATCH v4 1/2] drm: i915: Change fault type to unsigned long Date: Thu, 10 Oct 2024 14:51:45 +0100 Message-Id: <20241010135146.181175-2-vincenzo.frascino@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241010135146.181175-1-vincenzo.frascino@arm.com> References: <20241010135146.181175-1-vincenzo.frascino@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: uoh684i1p61idhqfcxsatk53f8jujqxo X-Rspamd-Queue-Id: 7403618000D X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1728568312-515637 X-HE-Meta: U2FsdGVkX1/LqjPpqEtteX11CpupjywSrDuntI8jO1l95MjBpjWQVptgb0287d+vDk+zTSNf4b8Qmt/sAzLtKG0TIfhwpZiuctXJ2+HVpDM4fSBs5y0D6xsxSwKyyQtcZha8M/eZcH8ax2lUkzKdFD4gxsJ9C0zmyLONHwy9aHBLsSEUuTDTzUFGzP6ek9zFK/vaCb25IKIzK656TkYDwMnmsC3rCnJjX9T/XnCSdPGz/RnbC9SHFildvYfPsFi40tQbvLgljBKnzeL4hCmjsle6s9XzcCn3J9ilz3JXkn4QUyDu8kptB3ATOQRdNAlF+zdcytmQPvaXRSMT6YqSYAJQeVfXeEtKp+PmHBvWJIIi8FJBiSmTw15ACfHdKEWn5zfTDtvnKBYrFfd0jsm6x93Uz4bgiYrW9nMycYZuL7ioO1FI1zNV1IITFjbxUvluuA2S+mTCTIfTtbQlZJCPWVX2VxEyN67p13eiZ4Hc/NEq5urRp5RVthwkuZcmZPXLHtzxbgYcgwgWonn2PajyEs/Dbv05htoR29X3ugoSl+4fRWk6HM4oT05lVDcGIVM7CZ29Zi6U+XYadoXgd9gGDIGQAFtAG9Ymfmu8EX3sVU1ZVTaMtzabfzVVu7M6f9hKy4+IFsFMGQ5m2MEk6sNW7DLSafUUXTD0C2DsddxaYzcJtXAz7VDOzdlQ3RAPUJe1Swn7VJ636/+EteVudfPVydtW1mjaXI8666Dk7ugLB1jvNYWjCoYvVgoKmmDeLDH0ZTOBamdPZPByTxiGWO/529EdDAM2dgD/m1v9/iyuybKJYxnr3YZ/WE4UYx1rodP+GrjbRbZvCOlbafkM9aLEvRoBQl25hRSgQHZ2ci5VNZh30Z5/kuaGR7xRJgJGlK8MgF08zvauTzftvfP/x1W0WVkOla2VvUKvfAiU2QhRM7GrQHsoRK84ssZdKHpuptDoh2dBFc5lcifJHIRx1p9 1X0uJX9s MfQACbHjSdIUcG0F/1j2elMB0TOnsFXhSQcH6lHwXeoSBd0NiE/G4potk4JRRJtpZT8gtSK+gkCCkErSBEIT23zfaV/Bo9VpWLvt7X8vD92wXzwRnLMQkciGcKbIZ75PrqqwTwaNdexKy4u2mPWtai9gzYUzkIic5qv1lad8hgoyvu2yVbsqAeJCA7xerTi0rhcVb8+PjOVeTCOQFjciZUBHcOd2foxqDam6qYs1aRKqw2H7OyvxOAp/fyzNXuKXW8PTgo7xigNPQbmE= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Fault is currently of type u32 and with the introduction of the generalized vdso/page.h we trigger the error below: drivers/gpu/drm/i915/gt/intel_gt_print.h:29:36: error: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 6 has type ‘u32’ {aka ‘unsigned int’} [-Werror=format=] 29 | drm_dbg(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, | ^~~~~~~~ include/drm/drm_print.h:424:39: note: in definition of macro ‘drm_dev_dbg’ 424 | __drm_dev_dbg(NULL, dev, cat, fmt, ##__VA_ARGS__) | ^~~ include/drm/drm_print.h:524:33: note: in expansion of macro ‘drm_dbg_driver’ 524 | #define drm_dbg(drm, fmt, ...) drm_dbg_driver(drm, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~ linux/drivers/gpu/drm/i915/gt/intel_gt_print.h:29:9: note: in expansion of macro ‘drm_dbg’ 29 | drm_dbg(&(_gt)->i915->drm, "GT%u: " _fmt, (_gt)->info.id, | ^~~~~~~ drivers/gpu/drm/i915/gt/intel_gt.c:310:25: note: in expansion of macro ‘gt_dbg’ 310 | gt_dbg(gt, "Unexpected fault\n" | ^~~~~~ This happens because the type of PAGE_MASK depends on the architecture. Prevent the compilation error changing the 'fault' type to unsigned long. Cc: Arnd Bergmann Cc: Andy Lutomirski Cc: Thomas Gleixner Cc: Jason A. Donenfeld Reviewed-by: Arnd Bergmann Signed-off-by: Vincenzo Frascino --- drivers/gpu/drm/i915/gt/intel_gt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index a6c69a706fd7..bb29f361110e 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -302,7 +302,7 @@ static void gen6_check_faults(struct intel_gt *gt) { struct intel_engine_cs *engine; enum intel_engine_id id; - u32 fault; + unsigned long fault; for_each_engine(engine, gt, id) { fault = GEN6_RING_FAULT_REG_READ(engine); @@ -310,8 +310,8 @@ static void gen6_check_faults(struct intel_gt *gt) gt_dbg(gt, "Unexpected fault\n" "\tAddr: 0x%08lx\n" "\tAddress space: %s\n" - "\tSource ID: %d\n" - "\tType: %d\n", + "\tSource ID: %ld\n" + "\tType: %ld\n", fault & PAGE_MASK, fault & RING_FAULT_GTTSEL_MASK ? "GGTT" : "PPGTT", -- 2.34.1