From patchwork Mon Jul 12 06:10:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473031 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713696jao; Mon, 12 Jul 2021 01:10:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg4/IQoO4HHR57DrP32EcSbFcTzMYKSeyjK1jllX5Ivtf3UI/JYAjVznqs5vqZR4eV26OQ X-Received: by 2002:a17:906:5a6f:: with SMTP id my47mr16712293ejc.29.1626077450253; Mon, 12 Jul 2021 01:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077450; cv=none; d=google.com; s=arc-20160816; b=Y07+jR01Wu5GQGAe9ls7gmEoh8E7leXkp8uA8fruQmw6X+MuWn6YPuu5SpkCN8A2Ig WcMaZNq8HBGyjJnHSFrN2rf0C9eneuVXIrY0oT1XKfRh9mpcO7zbtTgV39NmGBfwrCYL +nPicOUouBbRb4WWhC+c1YCUHenKkC4ftPsUPx762aAQ95zjWlBmgDzpnlWpoiNY/j4U TQFerDhq1aeOVw1wwCJLuhENkogasKrHhIxTDYJMzvNN53Q5v7d7ZBtIGPW1oHSRwC4M sUwYfmQPR+IEkbWfI5cB5S8X33i+VPFqLuLBB6ZfyY8z8YldIyF2kzE6JIlJDnc92Bry iwog== 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=jqDQB/U4BlZzgS8BBxDsyw3Fk2HOxbH2SC8JhLgfWEQ=; b=yH0ElYb3cZYFjK/Lw8xchlYeOA+0rF0F0P9YQNUgr295EHY5Mzk48G6jqdcrYG5ZDe bYEXYWIx/ughYGSVo37nRparDAfRKF/X2xdVXjnmKuLWK/2Cv8odmgn5yO1J6KG/ChWx Uz7KlxNBuzwFUcikeICwlv7gmvRtZUH2t6unQ31W1ddwsxt0B30Y+PmGmziH17Nk5as2 xyYzoLOnI99SjECpjQ5a1LYUj8zYHkbUvK0Ag9OhXaCoXtO9mevXJvbfkTDumAOOimaB 8v+BaaaZxODgyyizbTVqq7TyBvw5PNDJpldSKVdKxHeQ6vEsobgRUyfxZ+9Gkrcqj399 oRYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iJWLHKTS; 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.10.50; Mon, 12 Jul 2021 01:10:50 -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=iJWLHKTS; 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 S245229AbhGLIJC (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:43404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348788AbhGLH6P (ORCPT ); Mon, 12 Jul 2021 03:58:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6945F61959; Mon, 12 Jul 2021 07:53:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076383; bh=kX5p8trkOransBl5CX10o80lTTTxAc1AXvOOCAP/yq4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJWLHKTSg4waIQTK8oOQ2AA/u3nwd56CSqBBg3SR7CNjaXHfk9EdgCpiuS8I5i8pu M1JoViar5/s0wdLXYO2GjMzMpV4nUOEh7SY5XPKh9+xndlTUe3UeRdTMe2YM/Jczpj VC+wmEYHL5coGExqeSH9dwRAFY7x4tBOnIziBlxM= 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 621/800] iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:44 +0200 Message-Id: <20210712061033.347532304@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 f40a71ffec808e7e51848f63f0c0d3c32d65081b ] 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: 95c12bba51c3 ("iio: accel: Add buffer mode for Sensortek STK8312") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-7-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/stk8312.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c index 157d8faefb9e..ba571f0f5c98 100644 --- a/drivers/iio/accel/stk8312.c +++ b/drivers/iio/accel/stk8312.c @@ -103,7 +103,11 @@ struct stk8312_data { u8 mode; struct iio_trigger *dready_trig; bool dready_trigger_on; - s8 buffer[16]; /* 3x8-bit channels + 5x8 padding + 64-bit timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + s8 chans[3]; + s64 timestamp __aligned(8); + } scan; }; static IIO_CONST_ATTR(in_accel_scale_available, STK8312_SCALE_AVAIL); @@ -438,7 +442,7 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) ret = i2c_smbus_read_i2c_block_data(data->client, STK8312_REG_XOUT, STK8312_ALL_CHANNEL_SIZE, - data->buffer); + data->scan.chans); if (ret < STK8312_ALL_CHANNEL_SIZE) { dev_err(&data->client->dev, "register read failed\n"); mutex_unlock(&data->lock); @@ -452,12 +456,12 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) mutex_unlock(&data->lock); goto err; } - data->buffer[i++] = ret; + data->scan.chans[i++] = ret; } } mutex_unlock(&data->lock); - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, pf->timestamp); err: iio_trigger_notify_done(indio_dev->trig);