From patchwork Mon Jul 12 06:10:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472937 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2664382jao; Sun, 11 Jul 2021 23:56:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsvV44mjBuNwcga0x95V4TPWDpfXoMpypcsCeXdUHu9tc1LRfMFSsPVJN+M6jJy+vY5JFn X-Received: by 2002:a17:906:26d3:: with SMTP id u19mr3844998ejc.172.1626072869132; Sun, 11 Jul 2021 23:54:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072869; cv=none; d=google.com; s=arc-20160816; b=01MXYas5kLtcw+Tm8BarjXfsU51RV0toYsJmr5bw8nlk42LgrWWlFBb43hAsFL6LX/ cP53T8p/ULTBaSyI7AJFic0sL0jOh9n4MoPPYzSVtJJO+3bjBiTZUjttG5ZbLCr8qTNT ogqiiSVo/zjii4G8yhGWPf1Qsh1ChbohPLkdmmn6UlA8jeG7YPb/UwV3yikaimzEnX3x iMcuVlTjGGWGoTWO8iofmvkFJU/MKo6pkmxXF8pBBEx6cBmXofyWvwfHfRs1tvL5BvDM DQ1aGjLJw0sq2cLxLXpniUUqXxhYJVW83dMIX3D4g5cP/pi4R6RLaw8fszfvSX6UNh+u 1GHA== 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=kAtFrAHyoS9K5J1wiYLqhdcYA6BOFMm3gzBFKBlvdoQ=; b=fAGO1kCfrJJxIOXYwnQAsnZDsNMr2dL1K+9RBD85UTJ5LKFfv6leFfP2RgY4ivmcWz e/B5xv+PB5jU55ctMe5Xol8G5UX5jNUQevcGQ9T7qhlfPSr1FSFkbYRmsEtxojYVhF7q VN5piQ5X/gxFTgXn4Jy/wvHy4gatLtPjdVHZhhawWxd0F1WBKsXRGs70phlTQG3nS9nC cO1uJrm55SedrJP4qCcFchJeXfz14tBvSZ8Ex0N2p9Z2bDv6sMBNoEduxajXeUa55Jvv 8dmQRFuyfQfjsY2MmeJ//KAwCpNameXKLlxZBH2O4ds8hQxRNz8bN8oi1BvbdvuFqBQy /+WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=dalb9ZSB; 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 r25si3440466edp.437.2021.07.11.23.54.28; Sun, 11 Jul 2021 23:54:29 -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=dalb9ZSB; 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 S240649AbhGLG4j (ORCPT + 12 others); Mon, 12 Jul 2021 02:56:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:44976 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239040AbhGLGt1 (ORCPT ); Mon, 12 Jul 2021 02:49:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1EBED610CC; Mon, 12 Jul 2021 06:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072328; bh=uLfCrMqsvIrxqcCzs2c8dhu0bVbzvqwRuC0fGYazn7U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dalb9ZSBB60G0A4JSHJ0KDXyJ2LxAzOOQh5rXSuzOTA67Xw2D+kXTYRztZnI+UdqH SfjPGY5ttg2RoMhLA0U9XXiuyeV745ZMFsUiu1HBBwkhz3iZ0R8tJ+GVxP7N81wbV7 wpOv1CZxCsY2dGiSJsuJ80clZxUezMu/N6J8Lbr8= 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.10 451/593] iio: accel: stk8ba50: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:11 +0200 Message-Id: <20210712060938.884578737@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 334883894bc1e145a1e0f5de1b0d1b6a1133f0e6 ] 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: db6a19b8251f ("iio: accel: Add trigger support for STK8BA50") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-8-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/stk8ba50.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c index 3ead378b02c9..e8087d7ee49f 100644 --- a/drivers/iio/accel/stk8ba50.c +++ b/drivers/iio/accel/stk8ba50.c @@ -91,12 +91,11 @@ struct stk8ba50_data { u8 sample_rate_idx; struct iio_trigger *dready_trig; bool dready_trigger_on; - /* - * 3 x 16-bit channels (10-bit data, 6-bit padding) + - * 1 x 16 padding + - * 4 x 16 64-bit timestamp - */ - s16 buffer[8]; + /* Ensure timestamp is naturally aligned */ + struct { + s16 chans[3]; + s64 timetamp __aligned(8); + } scan; }; #define STK8BA50_ACCEL_CHANNEL(index, reg, axis) { \ @@ -324,7 +323,7 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) ret = i2c_smbus_read_i2c_block_data(data->client, STK8BA50_REG_XOUT, STK8BA50_ALL_CHANNEL_SIZE, - (u8 *)data->buffer); + (u8 *)data->scan.chans); if (ret < STK8BA50_ALL_CHANNEL_SIZE) { dev_err(&data->client->dev, "register read failed\n"); goto err; @@ -337,10 +336,10 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) if (ret < 0) goto err; - data->buffer[i++] = ret; + data->scan.chans[i++] = ret; } } - 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);