From patchwork Mon Jul 19 14:49:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 479933 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240849jao; Mon, 19 Jul 2021 08:38:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw59svTWNJO1B8XGSDYlmkX3VzcwwLXO0aMLMP8PNO7Iyxr4P3PW3qWHIC6/LwR3mqQ3p77 X-Received: by 2002:a02:6946:: with SMTP id e67mr22429038jac.4.1626709126054; Mon, 19 Jul 2021 08:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709126; cv=none; d=google.com; s=arc-20160816; b=uEJEZ6+a0pZU5QqlatXovgu2wmBaUzarWSgNDcuQvP+btmLz6vWzrQp/7+Pjt1DrPL LzVNtj0vaynlHJzcnZus2sXaKeWfw1Z9OEPCe69YeJdVbr0o6q4q3Ch2yinT79cCc7C+ uJMI+4Gt/2taFvuJKhWKwdF2zNEzuQ/C9i11xg4LURZ+WE+SBnHHJMaXCllG8HD80DbH jrE1PS4p8n1jeV70S0OkxlZIhpIWRhoD/ubSIl3yQIpWaURHSfSXa+8CRZ6whKiuhLwQ +rH9RdsrZj5Cel8BnNgGc/YI5zz83Oktq0+m1O7XV3KsvaaaZ6x0Mv7mz+G7MQYkAL3r /g7w== 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=+Mr9RNJR0bP7U5eeAHDlwkWWz1CAR7z0Shwkw++UTno=; b=VtVDE7GP8YVJku5yDANGrTRUcO3BbW2TfjeVgPaDvdN3/d6JdRZ0LInZL/J/6Ys7OH KmmivCo7QCYgqxjbR1NoiV/OOv1x9QPXvMzS7Aau+upC9SYW41MVSlVQRfdNNr+eZ+pU K02m0Q4w9MR8MebSyqzsUQG5TopMjWIDYfGkJvQE3f22flSekURWkXOoNKy+I1s9EUWs 62yvUFHcAC1tNStNczxvDLdAWTJDmhcO2cCEgAcH+NmHpJAOleLEXkQQRnmA190ZOWdf W+YcHFpUVs+OV/0Md/T3sMvmUngV9fR81yjxo0FQEDpsevKi/+FvBT0IQ48lwRzC5+Pg 2aPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dZPtdC4k; 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 s16si20227841jan.83.2021.07.19.08.38.45; Mon, 19 Jul 2021 08:38:46 -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=dZPtdC4k; 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 S244551AbhGSO6B (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53370 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238175AbhGSO5O (ORCPT ); Mon, 19 Jul 2021 10:57:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9FBB161222; Mon, 19 Jul 2021 15:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708886; bh=L/eOLx1f0cvUOU3lPbj6WptKC8wBqBsSkGM+LzvpIvc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZPtdC4k685d/IZzSca2Ko2WMTtn1H8np94FGyeAd/2TX3CVPwXj+TR4y7BR703Oo 15Y3HfFZK30PebDJx8FYJfGWoywsPcYZGR7V3lrLb6KkkEJFKv41cLRR+RU2NhbYxl 3z/VuTDvjNd7sn3rulKHmwLOTGn4XA4y+P4rOUFQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 169/421] iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:40 +0200 Message-Id: <20210719144952.287361298@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 151dbf0078da98206817ee0b87d499035479ef11 ] 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 this function. Fixes: 194dc4c71413 ("iio: accel: Add triggered buffer support for BMA220") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-3-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/bma220_spi.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/bma220_spi.c b/drivers/iio/accel/bma220_spi.c index e25d91c017ed..a548dc11e7c7 100644 --- a/drivers/iio/accel/bma220_spi.c +++ b/drivers/iio/accel/bma220_spi.c @@ -76,7 +76,11 @@ static const int bma220_scale_table[][4] = { struct bma220_data { struct spi_device *spi_device; struct mutex lock; - s8 buffer[16]; /* 3x8-bit channels + 5x8 padding + 8x8 timestamp */ + struct { + s8 chans[3]; + /* Ensure timestamp is naturally aligned. */ + s64 timestamp __aligned(8); + } scan; u8 tx_buf[2] ____cacheline_aligned; }; @@ -107,12 +111,12 @@ static irqreturn_t bma220_trigger_handler(int irq, void *p) mutex_lock(&data->lock); data->tx_buf[0] = BMA220_REG_ACCEL_X | BMA220_READ_MASK; - ret = spi_write_then_read(spi, data->tx_buf, 1, data->buffer, + ret = spi_write_then_read(spi, data->tx_buf, 1, &data->scan.chans, ARRAY_SIZE(bma220_channels) - 1); 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: mutex_unlock(&data->lock);