From patchwork Tue Jun 20 08:55:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Su Hui X-Patchwork-Id: 110361 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3529086vqr; Tue, 20 Jun 2023 02:12:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7xlCqLlCIUI0Nb423n69kQRguZlLDSrZNRtq0EmdeonD6zHQB4DyMvst5v3+sE2XkkNO8n X-Received: by 2002:a17:902:b604:b0:1ab:1bdd:b307 with SMTP id b4-20020a170902b60400b001ab1bddb307mr5607952pls.51.1687252363722; Tue, 20 Jun 2023 02:12:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687252363; cv=none; d=google.com; s=arc-20160816; b=XsgY046fxqWsKVBErwflqdtaPr6r4vs6UUKSI8onqLkma229pWGKe0/qV6jxdskcnw UhsZEYDoDFPsDAUcMrjYe7MIPjlVeLmrC/g/goaElxzDIGwgmzo6ONIbd1iv0lgH2hyX +JxGRzL61fvejAUs01GELW4QXD3NiMJWLkN917PDdFDw5/68GGMJTP4bXJ2ALlGdw88u yJ45TRZUt4a2zZP5R0anGq+GerVVWA898eROTZ7K28B6Q8RZy6UmnLHpotIPBCPad2ZP PrgtrgmgVjf6FyrPQct+9BLqZJcxn4B+in2h6rERhhibQht5BmnbovqldRy+JKeKnmyY RufA== 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; bh=NXi3UnaYgIu/tzUDFMW+5cjGZSxZ9N/lB8MRE6pRvbk=; b=yguQdytDKeLkrEZ27PJrhWbtYyrhaIvBmBD+GMix4KuUdbQVexmFAhXb1K8jcBIQCt Os6hMEOtMnPCMgcy3e8zeGuCwHdO67Xy7IhXWDxM3ce8go4zYlcbCIYMTAD3SLTkVByt YdXRys8l/MlGKaNCw/S92qoQlomWJH83eN2zIdQGawExV+5DBRurXaxlcTpmAtxYDo1j CYW+4GNxCIc94IlYt8BVexA8HkQd/9jyljQvG4j+nhwlBJov3zfm8eoMXwt77t9ccMod 7H12u8yacex0Uxdofp5hhC79xkMzeVNT31jrc0lvQpsKuxsdtVe0FiWf8j3KtQU8MZB8 tswA== ARC-Authentication-Results: i=1; mx.google.com; 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 h11-20020a170902f54b00b001b530ede2besi1615340plf.614.2023.06.20.02.12.30; Tue, 20 Jun 2023 02:12:43 -0700 (PDT) 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; 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 S231332AbjFTI4A (ORCPT + 99 others); Tue, 20 Jun 2023 04:56:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbjFTIz7 (ORCPT ); Tue, 20 Jun 2023 04:55:59 -0400 Received: from mail.nfschina.com (unknown [42.101.60.195]) by lindbergh.monkeyblade.net (Postfix) with SMTP id 84F9110DB; Tue, 20 Jun 2023 01:55:56 -0700 (PDT) Received: from localhost.localdomain (unknown [180.167.10.98]) by mail.nfschina.com (Maildata Gateway V2.8.8) with ESMTPA id 09F1760C12808; Tue, 20 Jun 2023 16:55:44 +0800 (CST) X-MD-Sfrom: suhui@nfschina.com X-MD-SrcIP: 180.167.10.98 From: Su Hui To: alexander.deucher@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch Cc: dan.carpenter@linaro.org, Jane.Jian@amd.com, Likun.Gao@amd.com, David.Francis@amd.com, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Su Hui Subject: [PATCH] =?utf-8?b?ZHJtL2FtZC9hbWRncHU6IFVzZSDigJxfX3BhY2tlZOKAnCBp?= =?utf-8?b?bnN0ZWFkIG9mICJwcmFnbWEgcGFjaygpIg==?= Date: Tue, 20 Jun 2023 16:55:43 +0800 Message-Id: <20230620085543.576733-1-suhui@nfschina.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,RDNS_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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?1769212334215975518?= X-GMAIL-MSGID: =?utf-8?q?1769212334215975518?= use "__packed" is clearer amd better than “pragma pack()”. Signed-off-by: Su Hui --- As Dan Carpenter mentioned: '"Mark the associated types properly packed individually, rather than use the disgusting "pragma pack()" that should never be used." https://lore.kernel.org/linux-sparse/CAHk-=wi7jGZ+bVbt-UfXOkpEQdHzF3Z2HBjkGdjh8q4dvPPGWQ@mail.gmail.com/' use "__packed" is better. the previous wrong patch's address: https://lore.kernel.org/kernel-janitors/c12c4031-52fb-25a2-b411-e668eb9baaa2@tom.com/T/#t drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h index 24d42d24e6a0..025adc950026 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h @@ -83,8 +83,6 @@ enum amd_sriov_ucode_engine_id { AMD_SRIOV_UCODE_ID__MAX }; -#pragma pack(push, 1) // PF2VF / VF2PF data areas are byte packed - union amd_sriov_msg_feature_flags { struct { uint32_t error_log_collect : 1; @@ -210,7 +208,7 @@ struct amd_sriov_msg_pf2vf_info { uint32_t pcie_atomic_ops_support_flags; /* reserved */ uint32_t reserved[256 - AMD_SRIOV_MSG_PF2VF_INFO_FILLED_SIZE]; -}; +} __packed; struct amd_sriov_msg_vf2pf_info_header { /* the total structure size in byte */ @@ -263,7 +261,7 @@ struct amd_sriov_msg_vf2pf_info { struct { uint8_t id; uint32_t version; - } ucode_info[AMD_SRIOV_MSG_RESERVE_UCODE]; + } __packed ucode_info[AMD_SRIOV_MSG_RESERVE_UCODE]; uint64_t dummy_page_addr; /* reserved */ @@ -301,8 +299,6 @@ enum amd_sriov_gpu_init_data_version { GPU_INIT_DATA_READY_V1 = 1, }; -#pragma pack(pop) // Restore previous packing option - /* checksum function between host and guest */ unsigned int amd_sriov_msg_checksum(void *obj, unsigned long obj_size, unsigned int key, unsigned int checksum);