From patchwork Mon Jul 12 06:10:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472906 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2660543jao; Sun, 11 Jul 2021 23:50:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztcfb+laSuniLA4FaNbgle3wFMuBzo3s3lcLH/fk3iYhj3fWAS2y98PUedWahI353j6Mq+ X-Received: by 2002:a17:906:2cc5:: with SMTP id r5mr50597107ejr.454.1626072620037; Sun, 11 Jul 2021 23:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072620; cv=none; d=google.com; s=arc-20160816; b=cwx1uQI5pR4kO83lP+6YqxYA8HMoK+cZNmr0Z9HoVqOZ0kBmXmT7FZYtEzkdlhTf4Q t0zXatbePW1SXP71AT4r2WR0oMgpe5VoAhAGqDQYC9diPBcH5psFxwKxdD0KvtNV8cZd TFc+NWSoh8JfE1EdN9URErhFHfjEWY2Zpz3Jpftx4MBXZGhZUPQkihfyaD15vxrCgpjh X1FjUc8db9zPOcffOjkHksdbvR2cQGO7qmENz9IzCZZ3Lx+D0hzBoTiXOmEThjxdE2yZ 3Uahjyta/8rVAw4E5IN70Hp69iuBbhYHhYK/hFQTuSy7NZ9v3408qMeaY4mLqq5y2enQ 4Aeg== 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=GG/3BsgDYF4i1tvuXM+ftQvfY81JPDQR/mAnA2YCtM4=; b=a9HFbtNl0ENYTsMxlEPRe4UkpaOTLxA+kYZ/Hrgp0OZ3BCqgKDnTdr3QyIAOLp7zfn bo5B4Qlz+hRxGuM6/LFa7J06jBkArSzF469p4V6s27nZ52qAt1XwSkuh8uvVzT8UvDT4 L4acXKq/vajehH6M8bTR22waQeiQkdS1/EJw6sHa8/Ql3t2AXi9hqQpzokBp1EgzYROf cleBlPBEFeuppV+Kw6XnuW2qzABaYSQ0X8+i2vvvhXpM7rbbU/0uDVH/AnvtzEaUlSpA XGD10DgOWm1v4mkzI2gSnPKKMFNA2Pdz2nEzF34JTO5dmmTaUciKHUoKGbWTogn9tZfk mqAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="nMHkF0E/"; 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.50.19; Sun, 11 Jul 2021 23:50:20 -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="nMHkF0E/"; 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 S238588AbhGLGwY (ORCPT + 12 others); Mon, 12 Jul 2021 02:52:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:48250 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239025AbhGLGt1 (ORCPT ); Mon, 12 Jul 2021 02:49:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2210C61279; Mon, 12 Jul 2021 06:45:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072335; bh=/9zMB6HSpz+E3OJuCnmtBE3XFadQ4n5q8gqS/0qPvO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nMHkF0E/KTr9jTz9RVx7XZ8rdGy6TVPBN5eim1NQosCfRWVMubU+ZEfispKjxwu7m m9cXIQMJ+C1SXAC6NIyElMPmg9k0z9iyAeJP27rAxjx65GatDNY+wtpfh1itMz80OL noWvMZnYsbXDV88okkMsN+8mX9WVaZ7nKfVONkLs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Stephan Gerhold , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.10 454/593] iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:14 +0200 Message-Id: <20210712060939.305027457@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 06778d881f3798ce93ffbbbf801234292250b598 ] 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: 13426454b649 ("iio: bmg160: Separate i2c and core driver") Signed-off-by: Jonathan Cameron Cc: Stephan Gerhold Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-11-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/gyro/bmg160_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c index 8ddda96455fc..39fe0b178592 100644 --- a/drivers/iio/gyro/bmg160_core.c +++ b/drivers/iio/gyro/bmg160_core.c @@ -96,7 +96,11 @@ struct bmg160_data { struct iio_trigger *motion_trig; struct iio_mount_matrix orientation; struct mutex mutex; - s16 buffer[8]; + /* Ensure naturally aligned timestamp */ + struct { + s16 chans[3]; + s64 timestamp __aligned(8); + } scan; u32 dps_range; int ev_enable_state; int slope_thres; @@ -880,12 +884,12 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p) mutex_lock(&data->mutex); ret = regmap_bulk_read(data->regmap, BMG160_REG_XOUT_L, - data->buffer, AXIS_MAX * 2); + data->scan.chans, AXIS_MAX * 2); mutex_unlock(&data->mutex); 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: iio_trigger_notify_done(indio_dev->trig);