From patchwork Mon Jul 12 06:10:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472927 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2663213jao; Sun, 11 Jul 2021 23:54:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr/RwrYGdAapkEjqaxLsBHduI2oZlpQrAiL3/7uvWWP8aToloK1eLVI92vx4eIQD5R91Q8 X-Received: by 2002:a17:906:3402:: with SMTP id c2mr50877606ejb.213.1626072861411; Sun, 11 Jul 2021 23:54:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072861; cv=none; d=google.com; s=arc-20160816; b=RwkDDTqJX9ZCwtSiGd9clxmmXW33e5E7lA1KAykojeV4qwRYTJp4DJJmmtsTpm481I GGEzinE0k+VIYSPL1YlmNKfD/iQJ8Md2n1dtDnnFdGBpO37H21QbLLCuVw2Bz/q3TbOW DUYOY/M9oRtOiEy8UTKWSD3jE6UrXnWHNKq2zkmlc2tYDoSKosJ3jOn3BwcagGYr0fgz TEZJVBDbnPhMIOAEEGsPVEKeKwXwxaWPGH4c8pMDgARFPg1gkfCRuWgYU7oa8XWGtrNN 0iG+KtbAcCIbABNzzEnVZJww+GVLTGQADsVw7HWwhLaM+gj1fm4dJVongfgbNznUoBFh Dg7g== 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=i2erew+8sLcng7NlqSn5+GpgvgLJK3h9QBkQQbtC/8Q=; b=ErqW0MkeDdCFykOvjJfZeRWG8LX+0flOiHsAXz3D1adY1JMwXobf+t5JRmoqFYLHiP a692jKg3iSWUe2Jv1WqhYBAjZCQnFF1Ir+9s3cAJmooxgenFUjdKSb/hTOXKfp6AX6GI kodm2EvQ9CvuoPOCOES+5rUOJcvGyHVpCmyH603i/lbGbmeq+z/yjcOUmlQrjanY2slx POIEu2vaE2OGOh2R9GaKUDRUzQersvkE6p+IeClQLbZOHDOaCklLklO5nMxqKmEfhDfj 92B1n7WvY4sJUKnx1EKF+/V1pYlGdoDNocSBsGF7NWv+F1yNfPso5X+g4e5caRTPg1gQ 0ZUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r1GkAs+v; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r25si3440466edp.437.2021.07.11.23.54.21; Sun, 11 Jul 2021 23:54:21 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r1GkAs+v; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S233279AbhGLG4d (ORCPT + 12 others); Mon, 12 Jul 2021 02:56:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:49190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239083AbhGLGt2 (ORCPT ); Mon, 12 Jul 2021 02:49:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 79DD16113E; Mon, 12 Jul 2021 06:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072352; bh=QhLqPz30Jed7704xOqGcEOG4hquarFR0I1hnTVeHNLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r1GkAs+v60MeC3k5i3LylwrbNru1FbSP4ktyiLpWUgzmgZepbMo2aJStcX84pl5KC ffMfxcZCOZdXlOwROJCJJr+gLqTmKFW3rUSUlqij68u6Co750gdfBRJqlYKlq6TCq2 m9hXeJnXjcP2/zTl6WqWQ4X/35EfYJTn6ZrZKlNE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Stephan Gerhold , Linus Walleij , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.10 460/593] iio: magn: bmc150: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:20 +0200 Message-Id: <20210712060940.126414883@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jonathan Cameron [ Upstream commit 7692088f72865c41b6b531fd09486ee99a5da930 ] To make code more readable, use a structure to express the channel layout and ensure the timestamp is 8 byte aligned. Found during an audit of all calls of uses of iio_push_to_buffers_with_timestamp() Fixes: c91746a2361d ("iio: magn: Add support for BMC150 magnetometer") Signed-off-by: Jonathan Cameron Cc: Stephan Gerhold Cc: Linus Walleij Reviewed-by: Linus Walleij Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-17-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/magnetometer/bmc150_magn.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c index fc6840f9c1fa..8042175275d0 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -136,8 +136,11 @@ struct bmc150_magn_data { struct mutex mutex; struct regmap *regmap; struct iio_mount_matrix orientation; - /* 4 x 32 bits for x, y z, 4 bytes align, 64 bits timestamp */ - s32 buffer[6]; + /* Ensure timestamp is naturally aligned */ + struct { + s32 chans[3]; + s64 timestamp __aligned(8); + } scan; struct iio_trigger *dready_trig; bool dready_trigger_on; int max_odr; @@ -673,11 +676,11 @@ static irqreturn_t bmc150_magn_trigger_handler(int irq, void *p) int ret; mutex_lock(&data->mutex); - ret = bmc150_magn_read_xyz(data, data->buffer); + ret = bmc150_magn_read_xyz(data, data->scan.chans); if (ret < 0) goto err; - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, pf->timestamp); err: