Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2876834rwb; Mon, 15 Aug 2022 13:07:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR4WOYqIU5ZACXcqWMHfBR+3PYuA/BbD3A4Lx3uJBjnYnfGwVXhyXNmE18IhtTCMo9s/ATop X-Received: by 2002:a05:6402:b66:b0:441:58ec:11 with SMTP id cb6-20020a0564020b6600b0044158ec0011mr16347991edb.267.1660594058637; Mon, 15 Aug 2022 13:07:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660594058; cv=none; d=google.com; s=arc-20160816; b=TBqaoBHg+ialU19fYFQFLcZAJvkhDAs7dnxGRfFKwPNyJiyziA0CDcyX0druz8jrMO Wp32ZYZYXZ8SpbbKZgED9U8QJBcP4Xqro/FPmG5BpvbSMJpeBHn6fCIbByoprCQP5+R/ 2EMNLQBb6o71J/aAdDDz9cIMfmB0Myr1BGqDGLdGDuwGZwtGDHTjnZi3bybLChkUpXnD 8BXR0BHZ6myuF2m3VSw6j+JEc4wJ/lpPNZzgvcUkOw7jTDVRBzZnf5DkojjWj070US8m ymA54czruLoWydH6E8KWIwClIi8XtM64+Nq8IBxe4SsXl48EFRUFzeWi8o8qYPUlmuX+ UfxA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+r0Mi9UyxJe31y9sfKN8ewg/UKsIPoVq+EZaEUXNLpg=; b=nR2y0W37leFGzw9fqnKSmWR8Ja+z9qr2gMOY00KFbkJp9z4mLHM+NAqLo3Cv91nhEt m0OIDcrSNNz075qL1NriUwXYfpd880tFPFjzW+Ihp4MUJ4L0MJysXyIDSYsR2ExBCvOA Mov2yweS1cxotZ0Zsx1J3JG7JyJWEzlqTy+TVhLZMp2puMKpNiKz3R9vkhoG+ezXE5ld hXJxwgmvYLXkDMFgpVglYJ+zzdH76ARH11761Hbf8c9k1WPQ0Ec8iV2/VwL8SCt1pFA+ J5U8N8Cm9MfeZB30MQH4cxg8MhTUS/gr/LOG+YK75/PW4+eFVUfN+lkjc0F7nUox5MZl 7uLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pzPn+Dvh; 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=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t16-20020a056402241000b004436bac7e37si5061451eda.596.2022.08.15.13.07.12; Mon, 15 Aug 2022 13:07:38 -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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pzPn+Dvh; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245271AbiHOTBn (ORCPT + 99 others); Mon, 15 Aug 2022 15:01:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48212 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245169AbiHOS44 (ORCPT ); Mon, 15 Aug 2022 14:56:56 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FC6048E90; Mon, 15 Aug 2022 11:31:58 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id F26C7B8106E; Mon, 15 Aug 2022 18:31:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C172C433B5; Mon, 15 Aug 2022 18:31:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660588315; bh=aQEoMfCovPkTWLiJW3uCpiZOLirceCKWhcTPW0uKekk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pzPn+Dvh4hYkSKM9MjKaqhBoDJj7DsvM9CNcQKFfMD1GxQYcUrgSOi3JtRQ3folmQ l/HZULGJewH66U/HSHST+MVSeKs15vvKdJYXhxbkNb3lm6wcO3kP/4uAmPl/5HRr3Y I4RFmGyLEebVb7LiAX3Govw6ICSdc2ol0RhbItCE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, AngeloGioacchino Del Regno , Houlong Wei , Irui Wang , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 5.15 323/779] media: platform: mtk-mdp: Fix mdp_ipi_comm structure alignment Date: Mon, 15 Aug 2022 19:59:27 +0200 Message-Id: <20220815180351.088343494@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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,T_SCC_BODY_TEXT_LINE 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 From: AngeloGioacchino Del Regno [ Upstream commit ab14c99c035da7156a3b66fa171171295bc4b89a ] The mdp_ipi_comm structure defines a command that is either PROCESS (start processing) or DEINIT (destroy instance); we are using this one to send PROCESS or DEINIT commands from Linux to an MDP instance through a VPU write but, while the first wants us to stay 4-bytes aligned, the VPU instead requires an 8-bytes data alignment. Keeping in mind that these commands are executed immediately after sending them (hence not chained with others before the VPU/MDP "actually" start executing), it is fine to simply add a padding of 4 bytes to this structure: this keeps the same performance as before, as we're still stack-allocating it, while avoiding hackery inside of mtk-vpu to ensure alignment bringing a definitely bigger performance impact. Fixes: c8eb2d7e8202 ("[media] media: Add Mediatek MDP Driver") Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Houlong Wei Reviewed-by: Irui Wang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h index 2cb8cecb3077..b810c96695c8 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h @@ -40,12 +40,14 @@ struct mdp_ipi_init { * @ipi_id : IPI_MDP * @ap_inst : AP mtk_mdp_vpu address * @vpu_inst_addr : VPU MDP instance address + * @padding : Alignment padding */ struct mdp_ipi_comm { uint32_t msg_id; uint32_t ipi_id; uint64_t ap_inst; uint32_t vpu_inst_addr; + uint32_t padding; }; /** -- 2.35.1