Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3017089rwb; Mon, 15 Aug 2022 16:13:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR5T1CqUp8U6pTQQaBqoktaItWkYJ2gjT5cwngaZdOegf9DXvgYA4Imrtl1zejNYQ19o9eXR X-Received: by 2002:a05:6402:4282:b0:43e:612c:fcf7 with SMTP id g2-20020a056402428200b0043e612cfcf7mr15927947edc.242.1660605220192; Mon, 15 Aug 2022 16:13:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660605220; cv=none; d=google.com; s=arc-20160816; b=UdR7rg2idcn1LtP5bGiFqbj3Zh4tTbTyT/1BH2ac+YavHgG0nakPNKNAovcvRYI+UF uvDQ5/e207eayzAVN5foS7+hzpfRVvYKmUFAnyLQBW978aEGND+4Axfy9iOuJ9eCGdpD GYhwmE4/k/fBSomltZlc5kGOD6vQ0hXGj2w/WF2apkIV0PbZKYAk+TxruUI7wG4uEmws bxX2xX0J2grQNf9fdB5F5+imU4bAGfRgwZ2m9TrPJEbM3fXmF8evOn331eFtwX8Qp2iG KW8kRM3yh8goon38HngR/owrqpaGil0D9GFh6902jv1D8BUNHmDWY3tnMZ2RxnuCTiTM 9F/A== 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=xSTh3F9lZ3Fv9dUaczGxlcienCDWQwbFLBvtN3dcblA=; b=XutPAYqTCJId4QGdLUrNgrWj1p74d3kS6LL8fL3nBvWvU3qdSDpVNhVJ7TaNXAF5ps 3isBLL8Gl/HmaKgdtw21dH2OTJdhOIsZPImZLpgrh22u+AoYLdA2OJqTsquHRqpYkp7K nkXhhF6BYiGG7pLbI4LZIfiP2Zo5P0qeX20WRHrDRhNTh7KwKVjES4K+TbNe/pAdfp0P 4T1N3Rgp1dwxfDXnUIhbK0mWf/xujdVSDRxTLPYYDHADQLbN760mcmcNxrXFPPGK4gGe NTbJJaDCNZ5o0TXnqteekmUZ5dH++fN3AxHQ/zHU8yERt48IDslUgSYfDluPD9LXqrVt S7Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=gmc+L8GQ; 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 hg2-20020a1709072cc200b0072642bbc8cfsi7267587ejc.914.2022.08.15.16.13.14; Mon, 15 Aug 2022 16:13:40 -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=gmc+L8GQ; 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 S1349741AbiHOVuX (ORCPT + 99 others); Mon, 15 Aug 2022 17:50:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350161AbiHOVrT (ORCPT ); Mon, 15 Aug 2022 17:47:19 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A6AF103C54; Mon, 15 Aug 2022 12:31:09 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 90D1F60FB9; Mon, 15 Aug 2022 19:31:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94510C433D6; Mon, 15 Aug 2022 19:31:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660591868; bh=FS07t58lqjdERCAoZlhJ5qAq56XF3WKvzZZl34Am4A0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gmc+L8GQl/EGdt8PUxPY6jCjmTSFwEPf9rIfOyl5tEZ6eZRvZDwLHUFdLhvv+VX6y s+jtMX4JPEiONOfE4pntZIvSe4ijB+FSh3MPAxmGecdgGwvRWAfKQIWCchhcKaW6bv Cr9IPttkbu9cSt9c8RcGhODnGtlbpFBu2TkT/R4g= 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.18 0663/1095] iio: imu: mpu6050: Fix alignment for DMA safety Date: Mon, 15 Aug 2022 20:01:02 +0200 Message-Id: <20220815180456.824283011@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@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 c6aa36ee966a..32b58b797d57 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h @@ -203,7 +203,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