From patchwork Mon Jul 12 06:10:16 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: 472967 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2682836jao; Mon, 12 Jul 2021 00:23:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCzn0XSy8YKLtWH+ug+e61ROJ8rSTXXSpTE2ekcPgSizqd8M+xmzo0aEhCPZzN33kTtrC6 X-Received: by 2002:a17:906:d20b:: with SMTP id w11mr51880705ejz.242.1626074598241; Mon, 12 Jul 2021 00:23:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626074598; cv=none; d=google.com; s=arc-20160816; b=WuYQ0gSt12bAYQX3137kuAYvCWB1JusRrq9WfBIVOR8lANWEGOXUscFyquK7D+HCgK HdnHop/fFzF7N8EicRYVK5Z1KXnRnfi9ATmYHimlIuW/vYqjR2Pp/JQAzm/MiFqQdSmE Dqx6bwjqeWY60sqjZpeiskU6IMX5fS9JIIRs9lNI7Ift8TUF+MHVLuWWSx/H7J7fdc1K 9M1GNqlOKCq123jkLbkhAs/eiWbDo/knNM8Q1cF3ksi2xHHz41qYfeb9G8aoyBVimNHH BtUmy0py22uN372QN+5erSDkirIieEP6KmQgP2ucwsg5LEv/oUA7rVxZCJo6LhnPrBuJ 2ijg== 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=t0fhFmnJ0+tnMbD7d09nQuMBTFHz7BADVLAxlvTKp3U=; b=wuSaOfdgLI1P4YhhgtRu1iChY9eYR19nTHkP5buIt02FlKuwr+5Qe1oL63OzaNAOVo 2nqQv74DP23GviZboW/v6ELxfIBrNenMY20IuMLPfx9DA08oOz1WMhbpjNtIDI0Or+XB vWi8Xygc8l/Dze12HYLOVHJGjqEwky9mVEDOxS51m18btM+CKLRnI6kRoHtkJ3D3YSSc MV/y09AMwZjdpH64tAfH8U9Uq3ZERF7zLA2Ln0+uiqFs3hldjyoPyne3/0o6KC9/VE2f H44HYW7d4nwVUbPhXkJueNpKs0UgvBxhnLbnn7F3tDFd/BSa9rNX4zg30DmjyIQBV8oO iGRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="D/eVjM9n"; 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 d9si16909677edq.169.2021.07.12.00.23.17; Mon, 12 Jul 2021 00:23:18 -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="D/eVjM9n"; 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 S243081AbhGLHXc (ORCPT + 12 others); Mon, 12 Jul 2021 03:23:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:60258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240794AbhGLHV6 (ORCPT ); Mon, 12 Jul 2021 03:21:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5AB1B6147E; Mon, 12 Jul 2021 07:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626074349; bh=+lfO5Mra7CXAT9kFyiufjx760HDX/3j3Uo37TVVnrak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D/eVjM9niAJRWbJxVLUxRotmxW+66ujLE7oBrcvadTXKtff5t/jfh3nJ50GhxqlQT ndCDR9ppMxlOWr8NEZidbftPiMp7BWK/9hLwTwzkH5Z/kDxQ3xdAVDoj8bnAWAtL4C /4awANomvaEpDOywruqRC7av5LQHvLjIoSxc/M4g= 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.12 533/700] iio: accel: bma220: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:16 +0200 Message-Id: <20210712061033.164608831@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060924.797321836@linuxfoundation.org> References: <20210712060924.797321836@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 3c9b0c6954e6..e8a9db1a82ad 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);