From patchwork Mon Jul 12 06:10:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472864 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2648138jao; Sun, 11 Jul 2021 23:30:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwatLD8CT/mU+z1iua9GIeeET8azoQpX7O59WKtqNyAWEjhyblbgyKUSMKCuqZFzN62z14k X-Received: by 2002:a50:f0d4:: with SMTP id a20mr10630150edm.354.1626071419133; Sun, 11 Jul 2021 23:30:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071419; cv=none; d=google.com; s=arc-20160816; b=s8QQVC7+lS2gLtgStalkVU2unQ6a5i2C30Nr/Rg6PTvt9CPu8mq+pQRQdDUKhwTYto 9V4yovGWE1lO0ABvzMu/R6z2kdGSY1heqhcVWUUy3NQR4hHz2LE8y8dSqLGR583wUn3M uDqaQGsu4iBLWAnxy4cDRaSzXn/dHXAQpHyLhKUZXnwEFLJuCkTJEFKKmoCV7pzAFczi vg0Nq1AJTPMYCgqsZY/F4EaSBR+Q92WV6PHinMI8BtpNcT8iO9CRyVhJL2H78TSq/O+U 2hZbC6qZXu+fk0aC40b5cmx8pEIJW+Xp/bFN01/cK3BuR3iV+z7+f2dfubahAUKx9XoF S36Q== 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=1QJ5CZlHqgnv4u2wKvJpJrvpsxYj0+N+DkmPsGT00tI=; b=JfIEY/K1fYKcQv6dnXqqrsZglHCogMfr/3t4EhwN/A8drRXby44d2DxmvtAgO1WbSl JKKIqrfIetCcaRCNQm/wO+Z/SFOKWQ5pOMv71EdGQ7C+EhM+QQTol3C3CMu9zGRMHLJf 85HKHP+TixS0Eh7CqJxU4wLlxrfk3ReFn5gpsW5g2h4DDqxkGTPMbZtgtmVxIA6Xjxww iXgJscmIe7jF39WeK/ilVTt6U+kvURJm823dZ90CW+YnA7v3bbdGrsVAsTCqM7eBzijJ 3VMMlUXyDSa7WDN6U7uFsMeKhw2YfIODPtsC1KXz/lzrL5zK21Z9ie+UwrqTxsRkJEZ/ VA1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mdhiKI5t; 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 bz6si16420285ejc.610.2021.07.11.23.30.18; Sun, 11 Jul 2021 23:30:19 -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=mdhiKI5t; 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 S235891AbhGLGc4 (ORCPT + 12 others); Mon, 12 Jul 2021 02:32:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:47906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235885AbhGLG3h (ORCPT ); Mon, 12 Jul 2021 02:29:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6539B61208; Mon, 12 Jul 2021 06:26:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071167; bh=uQxXNe8zyfpCo3M8r3W8p9L9exvdzsf2qfp6+bd/E8U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mdhiKI5t0KI3NcjCtTfuLoAIZgZu1mz2QCzDfLfvPkb9COOreW88sK9GS4pHYJwbg rFI/9SHaaOGo+CMazcYlqsaB59XQGa9psXHev5f/9oxHY5BmgBQx2/HiaCpDjudIbW 2aV7LIdjcQcqfmqyXuy4uQJE/HHXJ+SDXQwODZjU= 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 5.4 261/348] iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:45 +0200 Message-Id: <20210712060737.765341167@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@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 cae905039cb6..71ee42b0266d 100644 --- a/drivers/iio/accel/bma220_spi.c +++ b/drivers/iio/accel/bma220_spi.c @@ -73,7 +73,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; }; @@ -104,12 +108,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);