From patchwork Mon Jul 12 06:10:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472938 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2664432jao; Sun, 11 Jul 2021 23:56:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkX9vsFM9t+1atL9QHlJX+G4fMcJ1LFRbpG+XY1hLoIh+uAiKvcClG770mpLRa/6gsFpYb X-Received: by 2002:a17:907:7887:: with SMTP id ku7mr6542586ejc.102.1626072876719; Sun, 11 Jul 2021 23:54:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072876; cv=none; d=google.com; s=arc-20160816; b=eCEK+cUddDwMgnt4aNJfatg5m4PqJ14nc/SW+2lScu8A9HVwFjQDWD1otUE0OMe8fa +zuZuzKv34GD5wUmK0JOjo6jT4tl+d0Qo3GK5HFWQMF71pV1qzA/uLaybs7k7gBs2Yso 2v7eEY8HAx0SyT4WEoJcq1kbgj0VzJin5Y8lTkXuM3mPueVKnBS6ZuDw4IXNgoRx4LPz oOeSrzJqsoQ9blIkl8oLBBA9vwqJrf0h/Wq7AiX8pRquwPDf7FNDc6MkTxx2u6Fee+Hw HQwNfsSkVWRRXhhdTtc5b5pkctgPegtt+GTBivyyRmx/G1fiGxijEdBpxWPkgvl0O72T aAjA== 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=be1f4VqC8nGNjXUzvgAvfjDOE7KIBBwQYSA2mRb6fT8=; b=jeS4ltAcOnGuvTpLETy6lpCQeY1F2ZiiHwhR0OcYZD0ilAEseIVo1ftfuBifAcWTE6 idMivp5WViZVfg9jm52DiGPpmxP0JV0Vdv9reZTYIIkB18+g8EjjyOQuhx4urkWr6B9n PSmOKo95stJl6SbfYEkEH5niFm3PTft3iuSuyJ632t9jH7Jhultr8XiYDMNqEbX6MSxP OiU/+Uw7knbUJYdhwRJyXxJTJVDbwPhym83WcBxrb2DOxwZAhggU30QB73SNyhUdsN8t lKkWgsIoBAFbsXOjE9r2GNY9l4pb7zw0NS3zvrJPo47Houjr9d55U3PEVHoNO4yhLhSi BztA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Loq9Dymo; 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.36; Sun, 11 Jul 2021 23:54:36 -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=Loq9Dymo; 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 S240466AbhGLG4s (ORCPT + 12 others); Mon, 12 Jul 2021 02:56:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:44284 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238905AbhGLGtU (ORCPT ); Mon, 12 Jul 2021 02:49:20 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1740061242; Mon, 12 Jul 2021 06:45:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072321; bh=Of2jWWwpNrAgTAlfdFvgH+Su9iOFGIuGMDgprAdCeR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Loq9DymoyyRyxdLzfoHxiEpDCroK35hZNDVJl52wy6mQ5Qy4nJaVq2Z1Km6Ilr6mf WRJ7AtZO3WyhcR1QvwzPfZpRStnA26koh1JSP5AHhfLvrDrT1B/rVLKRPYa7s5+lVa 3B1qxJqx8bn3NSnW6EOWjqBGVl1mLqmqTy+nh+dM= 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.10 448/593] iio: accel: kxcjk-1013: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:08 +0200 Message-Id: <20210712060938.436558762@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 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 560a3373ff20..c99e90469a24 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -132,13 +132,24 @@ enum kx_acpi_type { ACPI_KIOX010A, }; +enum kxcjk1013_axis { + AXIS_X, + AXIS_Y, + AXIS_Z, + AXIS_MAX +}; + struct kxcjk1013_data { struct i2c_client *client; struct iio_trigger *dready_trig; 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; @@ -152,13 +163,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, @@ -1092,12 +1096,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);