From patchwork Mon Jul 12 06:10:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473051 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2716465jao; Mon, 12 Jul 2021 01:14:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJycwvzTiDxnU6lZuhx2bkWJHt5niSqxjDG2hf+jH8aXPW+KhPBH/CX9DwCvG6VlQLON1yYx X-Received: by 2002:a17:906:3a19:: with SMTP id z25mr1092399eje.536.1626077685182; Mon, 12 Jul 2021 01:14:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077685; cv=none; d=google.com; s=arc-20160816; b=xAHxD/ihQQRQq0Ww8hTsHTMMBbcybFkDfMG27yMqxOTRlpwbOG7dL9MqI7HvLkIJr0 qQqTPaU8lMVSOZn9ncEDPm1pacNIxzlBzihSwoD8iXFL2iRD0azEmsxTY0TV+TndsBNr c0sSsPgaA9bb0v7DnjFyqvXvd5v/MaJHlsvunhsMqq2xCAs/L8lGgIex93Ypuzb8IBd3 5BMUEZnISh0PsTN3+LNtLbtEHSLG454wj9nP0upT8bvnc1lBVaNi83zLS2g20lcrYB4B 1RMX6Rnz6x3Xl88e7zO8wVrDixYywo7g8W3T4Wm6HuDxkOf+eTVvNp25fAzIT9YMuATR TABA== 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=CZbO9Uezs/dLZvqZEh7RK2sIvjwiQG06/QgmnMGq1Ug=; b=rozbFlxuZvgQV5o6WZIo1072nCxQ/g70k9RhyHFysu/gsmCGKryhUpa0ZaouxG9l84 Vyv70T4IOP5ycG7dMjom3LEL115itgGFmVL36O7YxaRsnzVQ0wTAUc5Kx5xx9vZdPnAK 9dj75CPuo6AN4qJpd4Ov3rsME2nnYMuHHau1bH2FSaH5xbQOAQxjVxdGvgvEZSQuOEv7 ThlblBp0SNHMp9YpiAgXbNYOpGT/xXeL1StREFJ3jtrw8nGrd+Tnu5tMUt33ZmheXaQ6 dRWp+yHg8Nh3qvOHcLEwR+236AStMBXcTV1iex+dAyfF9vqecGo8Y+l46iv34NUarIPp 47MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OuTvQCvJ; 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.14.45; Mon, 12 Jul 2021 01:14:45 -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=OuTvQCvJ; 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 S1355436AbhGLIJn (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:55948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353346AbhGLIBx (ORCPT ); Mon, 12 Jul 2021 04:01:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 97EE561983; Mon, 12 Jul 2021 07:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076478; bh=c7rXUajXHO0BaBgWHo7kqiQHDzsN14ZB+sWGLhhsqUY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OuTvQCvJgtAbBm7UWBNvibGMe8iMrvOPgoW2QLKchofN2ojhuKEwj2CJRxzvKkKK7 RRvVu2/U10KxrIte/Nx37aotTEry2sfRreSpCsH6ZCNCAhoZCZobGaWMtYz86YApkF 8KBSKlimHvIUbCTDibLvIiJn+Uu050WPnfAMULXE= 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.13 617/800] iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:40 +0200 Message-Id: <20210712061032.975037095@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 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 36fc9876dbca..0622c7936499 100644 --- a/drivers/iio/accel/bma220_spi.c +++ b/drivers/iio/accel/bma220_spi.c @@ -63,7 +63,11 @@ static const int bma220_scale_table[][2] = { 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; }; @@ -94,12 +98,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);