From patchwork Fri Feb 17 12:46:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 58548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp874912wrn; Fri, 17 Feb 2023 05:07:56 -0800 (PST) X-Google-Smtp-Source: AK7set9Up4GMMo11Vys3o0v8ixhYaAQuRWyrYeB3gc7PlxIzm0U7x3BOUAWO/piZ5DMTh6jflu9F X-Received: by 2002:a50:fb15:0:b0:4ac:d2b3:b724 with SMTP id d21-20020a50fb15000000b004acd2b3b724mr226103edq.27.1676639276223; Fri, 17 Feb 2023 05:07:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676639276; cv=none; d=google.com; s=arc-20160816; b=YxKUrpqXWfPTlaxEgc2OAruYl0eW1yjPIReBfQw3bZEw2Jq4f7Wqx0nAGEFrr/X5l2 s84X0bYSxwAOB4sTCrPxyr2HQ1MgA3a8OP5UmuowRJH7gUdfmCFAKkS7fByBLVnLnZOH y8KSbo1iDB39j/WIeMK8gH/qRUeL97WyGuRVwYwpbW7xEqkXm9VGjKkHFN6tWvHIImoP VRbL6yR7rihlIWLAxUbLHNb/PsTlFSqJkj4wY2WqxwMNsLC0RQ7NWH/TnFm+JQPPGvXG /L3Vl8gLEIXL7AD12zThFj34DDa7iyw1LO70xlCaJDLRs+F8c3VKrmZcLZH1dnJA2sO+ XX9w== 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=vwX0SMRSz3yJd4NvpsPIpENdBxIhC1KuIoNBCi5MO8Q=; b=mDX9F/MgHO2Z73P509nCZ+zs+IfDzKJmga0XJtAUQpycBDcAgUoXkW3IKI86ggDsb/ aC3n7VMc4rWa2JIP5DACgQBWPjqe0c9389vd/8V6RrRJJbRFpgY98q2nrIy+P+sHFhfR hlU1fNP7HgQald6YjFOwQsu2g4Swv2XD2w5SutcrLRxr2eEKkWtQMx8vEAkZtetol7cV AKUFOKEeKdGg6XysvKaX3Kv4AjXs7wTFpLz5q6jlwyY9un4INFbSUv57654KHxwR0gqh VPuQMMHus67qcCT9XgyeAVdxjSItVeex0GifkFSBrmBgBcVysTlLcVCrHIk2x5A3A7Sd JUgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OuNl7GNR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c6-20020aa7df06000000b004acb59c4c25si4758268edy.542.2023.02.17.05.07.33; Fri, 17 Feb 2023 05:07:56 -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=@kernel.org header.s=k20201202 header.b=OuNl7GNR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229818AbjBQMrg (ORCPT + 99 others); Fri, 17 Feb 2023 07:47:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjBQMre (ORCPT ); Fri, 17 Feb 2023 07:47:34 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D323254D73 for ; Fri, 17 Feb 2023 04:47:33 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6CC6B61B19 for ; Fri, 17 Feb 2023 12:47:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F0D2C433D2; Fri, 17 Feb 2023 12:47:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676638052; bh=muiZ7Zdm8EKyUHP3hRfEoY7iYZimVLoMBdNf7RauiNY=; h=From:To:Cc:Subject:Date:From; b=OuNl7GNRtP2kWrnIjrnP10xasJEDvv64vRhawteuaOE56Jh4EX0+Ggq/cMuWlm6eU LuErd1jchq6pg/1ggVYA2ZA1H8WqElsFRi/gUrG270CFgNYZC5EeZvT5xMfflTX9ge TqHo2EtIhXyPP1Nvd7LbnXlzIkgQtg4gU4nymqZroYwyorcFAGN81OTqYttKoSCcT3 utcIdaw2fdb+m37CI4+bZW6sgQchu0cGHMThfTUkJNLpgZ9z7Vc+oHRet+Ol9H68p7 HwJBLll+/WZjGeq2nq8x0FRbRUmj948uCTdU0aENN70RLVwbR340B5fNcRrnCWAlEe 3+hl+zgARyDKw== From: Arnd Bergmann To: Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , David Airlie , Daniel Vetter , Matthew Brost , John Harrison , Michal Wajdeczko Cc: Arnd Bergmann , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915/guc: avoid FIELD_PREP warning Date: Fri, 17 Feb 2023 13:46:50 +0100 Message-Id: <20230217124724.1324126-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1758083705675344229?= X-GMAIL-MSGID: =?utf-8?q?1758083705675344229?= From: Arnd Bergmann With gcc-7 and earlier, there are lots of warnings like In file included from :0:0: In function '__guc_context_policy_add_priority.isra.66', inlined from '__guc_context_set_prio.isra.67' at drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3292:3, inlined from 'guc_context_set_prio' at drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:3320:2: include/linux/compiler_types.h:399:38: error: call to '__compiletime_assert_631' declared with attribute error: FIELD_PREP: mask is not constant _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ ... drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c:2422:3: note: in expansion of macro 'FIELD_PREP' FIELD_PREP(GUC_KLV_0_KEY, GUC_CONTEXT_POLICIES_KLV_ID_##id) | \ ^~~~~~~~~~ Make sure that GUC_KLV_0_KEY is an unsigned value to avoid the warning. Fixes: 77b6f79df66e ("drm/i915/guc: Update to GuC version 69.0.3") Signed-off-by: Arnd Bergmann Reviewed-by: Michal Wajdeczko --- drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h b/drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h index 58012edd4eb0..4f4f53c42a9c 100644 --- a/drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h +++ b/drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h @@ -29,9 +29,9 @@ */ #define GUC_KLV_LEN_MIN 1u -#define GUC_KLV_0_KEY (0xffff << 16) -#define GUC_KLV_0_LEN (0xffff << 0) -#define GUC_KLV_n_VALUE (0xffffffff << 0) +#define GUC_KLV_0_KEY (0xffffu << 16) +#define GUC_KLV_0_LEN (0xffffu << 0) +#define GUC_KLV_n_VALUE (0xffffffffu << 0) /** * DOC: GuC Self Config KLVs