Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3261249rwb; Mon, 15 Aug 2022 22:36:09 -0700 (PDT) X-Google-Smtp-Source: AA6agR75ncCORlSzovFeuhD1XIcJPifvw/xjbO4LI8DrAk6pBW3C1PtKNXgpGTuF9nj3LW2oYnM7 X-Received: by 2002:a17:90a:bb14:b0:1f3:5f1:6de9 with SMTP id u20-20020a17090abb1400b001f305f16de9mr22561019pjr.148.1660628168978; Mon, 15 Aug 2022 22:36:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660628168; cv=none; d=google.com; s=arc-20160816; b=xxMpc+b/B2G/02XBPNLLoE3EU9nZ1Lz7jljoewdw7V4PNRpHM28a2P0xVIS9upJu3L qKUwGZ5biORS2jHqx6TrE6gi5vdWcTFXC+n6b5H+GBbOamUmWSWgbDGWzQ/RR2Twfgc2 qa1rag1/h/7C/VjGNI3d8iv6VCXnLpmycFqTB/LYZysCB2Uq2fcX0Msz3IIvX4gOI4gV VtwV00ecyu3gvwu+jtRiqswiGC+PmhIgbZmHkcYkSkK3xRhyAHpLBt+wC66n7R/c35B/ 3BmPoGlmzTy4ZkqfUVaez9vf1lhlnoildM2GE2Q10J8RDX0UrnSqgchw6wNWIcQA7Bnd fYUw== 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=HjSX/1JsEOgWx1Hvb/HO2lQWmvPrtR7nsdnNBbd/nT8=; b=tO5eLEOn9X070aWcrnCj/A78rYtJ3yDQDpDZxWiTPKPgp4yX7I+bwV4wf1Jbbyp6I6 eUaaIGrlsZrFgpLT7xmH/0SZR/rV/2PSke3qUvUH4vsb+2it8jyppN67Rz95+RiUy1vx 7YJ9qY/BGwytYiH3JPJMijFi/kLvClRnKo7nLvzef2+KfxufpKdjB6oxrhzLgtVoAsTw ogXHVa/clMA4AXusOHUVABDK5MpbvVEGc1tHipFvOyNj0BySDucuZsStukqEis/uauH1 0M9f5DR+lhd8A0NaFUN0twh4xPZ8xHem4HJmrJXLLXvUTAK4Paz6FM+vEUGjoGKVuGIn Vw8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Vl4Zkl8g; 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 rj1-20020a17090b3e8100b001fa63199641si1057523pjb.181.2022.08.15.22.35.57; Mon, 15 Aug 2022 22:36:08 -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=Vl4Zkl8g; 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 S230452AbiHPEf6 (ORCPT + 99 others); Tue, 16 Aug 2022 00:35:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230296AbiHPEfP (ORCPT ); Tue, 16 Aug 2022 00:35:15 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F335D6173C; Mon, 15 Aug 2022 13:27:43 -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 2BF39B8119F; Mon, 15 Aug 2022 20:27:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 861D4C433D6; Mon, 15 Aug 2022 20:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660595260; bh=oKA0j2s2R5vr43XCyDlvJ2xrzIvot9ghVEQdDdyHXQI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vl4Zkl8gBIhdNLQ4rK3SSlgxVKbPVabqlPUNZNBEF6KqaeQlFAWsVpyYwidPmR0L4 FncEqbtkp1rUK1X8DUDkqvDU6OfjAZpyD5yOO71ug44rh7byQQvEhfAHJb6qYwcxTr YGKU+f7LEPXYVaMupXSQXmOqF8NONNxrWDAPTnpQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Jean-Baptiste Maneyrol , =?UTF-8?q?Nuno=20S=C3=A1?= , Sasha Levin Subject: [PATCH 5.19 0708/1157] iio: imu: mpu6050: Fix alignment for DMA safety Date: Mon, 15 Aug 2022 20:01:04 +0200 Message-Id: <20220815180507.890345241@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@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: Jonathan Cameron [ Upstream commit 54e03562bb960e78af050d2e550c28d77642ee44 ] ____cacheline_aligned is an insufficient guarantee for non-coherent DMA on platforms with 128 byte cachelines above L1. Switch to the updated IIO_DMA_MINALIGN definition. Fixes: 6b0cc5dce072 ("iio:imu:inv_mpu6050 Fix dma and ts alignment and data leak issues.") Signed-off-by: Jonathan Cameron Acked-by: Jean-Baptiste Maneyrol Acked-by: Nuno Sá Link: https://lore.kernel.org/r/20220508175712.647246-80-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h index 8e14f20b1314..94b54c501ec0 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h @@ -204,7 +204,7 @@ struct inv_mpu6050_state { s32 magn_raw_to_gauss[3]; struct iio_mount_matrix magn_orient; unsigned int suspended_sensors; - u8 data[INV_MPU6050_OUTPUT_DATA_SIZE] ____cacheline_aligned; + u8 data[INV_MPU6050_OUTPUT_DATA_SIZE] __aligned(IIO_DMA_MINALIGN); }; /*register and associated bit definition*/ -- 2.35.1