From patchwork Mon Jul 12 06:10:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473036 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713765jao; Mon, 12 Jul 2021 01:10:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyflU9Kf7cnPcE02uAbqt82nbuIvVSsPBtnNhRJ6K6OcVtdfu5P75sb+kAY/9h0WkNT6d3w X-Received: by 2002:a05:6402:5170:: with SMTP id d16mr31781071ede.300.1626077455040; Mon, 12 Jul 2021 01:10:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077455; cv=none; d=google.com; s=arc-20160816; b=UidwPatgx+l40N/WpHAzAG3MyIVslr3hpOS1mVqIgC1gQypv/14aoM268/si6l+rJy iyT4QcEgOQj3kw/DHXhJzt8+1voouQBrvaxz1flE4NlxI95Z3d23tPnnsXq4Q3Ujvbm4 5ZjYercyfIqVTU6i0KcFVgWZ8jme4u4wbupadIE66JbP9QX9N8gLcP7irM12DIvTAqrm +2AtDnzQeHTp1xrCTdpR/RtQVhzAK/3YZ/sImUhwNtbFgtWPt1NYLAy3BxPWBiKhkRYJ DObrG+7Avv+PbbWcqmnenGdEm+2L28EH/HACcrSeT1xcMNGBIGAbmxZ7C8RxkHZMlBy/ 8prw== 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=05/KBxCtGl+hBZ0o6sYO/zJf/1UpxRcJUao275Cw0zg=; b=R+oesAG/qefUi1sjWSLQnlMJyDHVZejbTWPqI6ALIhX8LX9XUdR3nlQ7Cvhh9y2Mbo r5PwzYc7URapLSYEUohvT+57SqE0I3jCU1V15nTiLp3jXXzIohzjCHsvweSxScvMV3cW 636nle6C+hrTd3hV0aNKB+LLkMxb2U1d5v7J+ez8QU6VrY8uZWSSJgByZu8Ns25/0oOm wBAcWAqF4T3GQFXKRO/rH/4YefmvWyUNyrxxrjFQvCmXf+WQphzd1GTFW84bPSIZM4fA EN5wEdksr2tn3do6fYHQyJloAKqkkx2oM3YyWpqqFMeJtAfq0sXPu5RfyE4oIrLQ7xRp xdbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WSO5GTcF; 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 n21si13642925eda.13.2021.07.12.01.10.54; Mon, 12 Jul 2021 01:10:55 -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=WSO5GTcF; 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 S1344697AbhGLIJG (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:54816 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352429AbhGLH7R (ORCPT ); Mon, 12 Jul 2021 03:59:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AFF6E613D6; Mon, 12 Jul 2021 07:53:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076393; bh=HJtyBbowZ8yR61CU1kIwhtfWAHhQF0Ef5X+1SRF6nR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WSO5GTcFM08X0a3EcQBoq7oqSksrOMmzNC7C9lI327ujcL/Kvz33ansxKOSK8e70c IA+RlpNFMFDeML9IRDxLbgW5BonTDzF/nNtCrwpcMzXLEE7HrbXEsNw301cXtnBcXT fvKTBuCKqVYBRh/sMoLHDNNDDuk6OE+588mJ74a0= 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.13 625/800] iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:48 +0200 Message-Id: <20210712061033.735195814@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@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 b11ebd9bb7a4..7bc13ff2c3ac 100644 --- a/drivers/iio/gyro/bmg160_core.c +++ b/drivers/iio/gyro/bmg160_core.c @@ -98,7 +98,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; @@ -882,12 +886,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);