From patchwork Mon Jul 12 06:10:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 473030 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713691jao; Mon, 12 Jul 2021 01:10:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxUj/XqhTN5oUcjPmVFSRuFwEMfVhHsVDY/YxuuNyPyExpgBspzlNQuhGF3MpRu30oQ7fM+ X-Received: by 2002:a17:906:8310:: with SMTP id j16mr27813254ejx.79.1626077449545; Mon, 12 Jul 2021 01:10:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077449; cv=none; d=google.com; s=arc-20160816; b=Lp/TJF0DZSsIhB1oNh3qacyhBiCiLlgyt+g/EJSmV5ZjALZTFtOv4OSxFPq2yXBug6 /rqtpGScoqlV4Iuta+zzs3XDa9M+I5w6t0h24Qq0tpEKsxB2I8p29zl+AiUXsYycFRQ+ s6RYF8V1J7A3+HPa6WqTB7ovC+B4vM4R5o2M0GF2+WaAcpEPrS3Kiixw7fECbIRnIlrl oyw0TeVQqygzJw9TewemV+NpA1UPZptaqLnS8aIpseZTLgKFq/9XWcuVfzT2Aeem+2SK FGf4RoeyK/Ceq4mlrBUzkBVgzzKYwJH6s1k22ZZDeNKixVOvkBhE1UnIbMZUJA3ig3HR 6+xQ== 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=mA1/WDWHFPhjTUvWj0axpgXDjH+f3MXaLE81zaxzdSY=; b=ym8YlWqEGX9Kb7etFTFHdeggL+ttL3JrDrXrDoLOWCORmCHRZackQwUJVvtNRiEJHS da2/lSCmjnApUYHohMOBPrNnE7GC4y51brzQZACHbqsu/Q4ZkGPnUDwspEj/O6XrduEu ZDvvUZB++tMrAQkdqiSHDUC+YyrHW/ZgabBtILnkkEi92xur6wq2Jz045SPQYVPr6ZTr eGSS6pM+vaUxnqqp177Cmz3AdhVtgwxGpDrwQm4HYtD+hglag89VYwKTW/7+rhituDux WQLO2PmpKc6ElOHopXald3ehkj7/2lYNn9rMzXnRRmABiw7EgBrnp4BjyFq62naQzRX4 Qe0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=R4sa9+RT; 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.49; Mon, 12 Jul 2021 01:10:49 -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=R4sa9+RT; 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 S243904AbhGLIJC (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:41928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348756AbhGLH6I (ORCPT ); Mon, 12 Jul 2021 03:58:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C1A6B6194D; Mon, 12 Jul 2021 07:52:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076379; bh=bm1pnfmDPDJnVPwrSCwKjgo8fbbJlg/tOCZ0bstIWe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R4sa9+RT7FzC6UB1rsk9DOo8VxYkHXOT1XD2kXIx9zSdur08jrhIn87aNi1/FRber jtVUa0+9xhGm0mkq6n0QAjAlq8oVoMjg2d35eklBPiDXv6M1cW7pocZSevZ/jrJQDY CNliYLVeYJ6maR0HP6wQ7GnVLp1uK9qQDK7H+Pzw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Srinivas Pandruvada , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.13 619/800] iio: accel: kxcjk-1013: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:42 +0200 Message-Id: <20210712061033.149720112@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 3ab3aa2e7bd57497f9a7c6275c00dce237d2c9ba ] 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: 1a4fbf6a9286 ("iio: accel: kxcjk1013 3-axis accelerometer driver") Signed-off-by: Jonathan Cameron Cc: Srinivas Pandruvada Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-5-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/kxcjk-1013.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index ff724bc17a45..f6720dbba0aa 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -133,6 +133,13 @@ enum kx_acpi_type { ACPI_KIOX010A, }; +enum kxcjk1013_axis { + AXIS_X, + AXIS_Y, + AXIS_Z, + AXIS_MAX +}; + struct kxcjk1013_data { struct regulator_bulk_data regulators[2]; struct i2c_client *client; @@ -140,7 +147,11 @@ struct kxcjk1013_data { struct iio_trigger *motion_trig; struct iio_mount_matrix orientation; struct mutex mutex; - s16 buffer[8]; + /* Ensure timestamp naturally aligned */ + struct { + s16 chans[AXIS_MAX]; + s64 timestamp __aligned(8); + } scan; u8 odr_bits; u8 range; int wake_thres; @@ -154,13 +165,6 @@ struct kxcjk1013_data { enum kx_acpi_type acpi_type; }; -enum kxcjk1013_axis { - AXIS_X, - AXIS_Y, - AXIS_Z, - AXIS_MAX, -}; - enum kxcjk1013_mode { STANDBY, OPERATION, @@ -1094,12 +1098,12 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) ret = i2c_smbus_read_i2c_block_data_or_emulated(data->client, KXCJK1013_REG_XOUT_L, AXIS_MAX * 2, - (u8 *)data->buffer); + (u8 *)data->scan.chans); mutex_unlock(&data->mutex); 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, data->timestamp); err: iio_trigger_notify_done(indio_dev->trig);