From patchwork Mon Jul 19 14:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479872 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4217827jao; Mon, 19 Jul 2021 08:12:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIQgii/Vhk3TswjtkXFedPP47VSHhW67PUs/Wukujf41mUb8Y5iEeMuVXlMZvX3ijJ5NZd X-Received: by 2002:a05:6402:298:: with SMTP id l24mr34769386edv.125.1626707542649; Mon, 19 Jul 2021 08:12:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707542; cv=none; d=google.com; s=arc-20160816; b=KcAKZHz/VIAU+pXxERa2Z49ZErN7T6lpUqFbge01m+miZOBcejb7Th4lWS6ubeDN4x v4IPGz0OI4TSgUQbmh2YbJnGMp4dSBx1g1Ntb7oGrXzLLQfoXWiHb0jZo48OgPGGEjxY bHqXsvDd9Tn1UF6Dpd18yJFDd6FswI9+kZKJNXiVPgLEP9C7upOdCnR6T9jzHzFyJ0hX 8h0r5LIZjdXPpdhW7H5Se7eHiXUB5jU8CaW4eVA0QwKdbF2j0DbLYudyUG+G7oNALiB1 BKBJrYOZlSrxlXUzjefcWuDqnYl+PWYmXuTgd4+57WdSFNsEz3nV+YfB1TQNCCkTg2nl SDkQ== 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=dYyH1jb++1XgpB6ggCu4pi5PVTcAe2b6UxEd2Tkpw9I=; b=MnUbWb+IrSofpfBWcN3wuGc/iokT5lz7sIJhLLL164/vR61bx1dazR5oDJb3Ynxiss 4wV+tem86W5EOzZP/KdD/lYmQ+rGFABVIomKjSIpkB/hHQoMXNa+gb+UXe1RW52LDukx KIDyEv5I1SQB8OL3TbXbmWIYMXaXofBnGS4lNTeEA7Nrt6rnb5nkJ8RphElVrJVSBq8Q HdiQl/6p84biNNrErvytd9snWL72TjDQS/qAZkqcUT8M/UliycbglQ1N2rIRj4rfwKTz MOy8WQkdALo554Z9LlcztqAUrhkETs2dPCuNyWltHqdshSoAb5FafGp/fUy9Ra1bYIy5 tANw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0BiJ1WLE; 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 d26si20449114ejc.620.2021.07.19.08.12.22; Mon, 19 Jul 2021 08:12:22 -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=0BiJ1WLE; 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 S243024AbhGSObQ (ORCPT + 12 others); Mon, 19 Jul 2021 10:31:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:40420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243028AbhGSO2A (ORCPT ); Mon, 19 Jul 2021 10:28:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 108456008E; Mon, 19 Jul 2021 15:07:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707278; bh=wv0LDD+qxEZBezU6yT5sICcU8IDI9B89j4+nuL1tHMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0BiJ1WLEFpeqAku0tg8FI/nB8dZMTqPNZ1+aHZO/5POjtuiFhvnvddTRXsK+bwPlB jXRFFPTZSuCjAio37Xn5t6C8noULR0D69ABXOXcGQeuQvCmRCyHzQs8IwzlI2hjEJc 0SP3k/lqgJH/KJNWoUbOxSDsDzSVO6RjEGJil8Bc= 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.9 095/245] iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:37 +0200 Message-Id: <20210719144943.482414851@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@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 5099f295dd37..a96f2d530ae3 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);