From patchwork Mon Jul 12 06:10:53 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: 473041 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713868jao; Mon, 12 Jul 2021 01:11:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4vu82kGI47Qx61tXlcm7ftM2BsE0JWGGnbKHr9T3r3EK4vZo3fOP/ENbTwtOmNhQ7Fkq8 X-Received: by 2002:a05:6402:1a25:: with SMTP id be5mr28315811edb.123.1626077462629; Mon, 12 Jul 2021 01:11:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077462; cv=none; d=google.com; s=arc-20160816; b=ZhD2Whd2irfuEF+cPzSx0Fqco2ouY+4oX1f2HuDDo/Uep+6D1WQTxBJgpLPTMk3vy7 GzWtoiEu4aMqAfs3UIO1mdIKEcpcUa0+uSwyyRuq0PkdKqqkErEzFf0fgNnA0JFEuwSb 1gpAoxKNnx5/rE/yo5GNCTsapguJCERRGhVWNkTJkPNKTk/8veIrz0UfB7VbMBKKjdY+ Sy9HyOW+w9sIirzsrrxU2YJgzsjY+rV7KS2Iwim2Qbhi/O2pov9666jXLddj5YPQRQis 8kervZgNMjF8cELY5zKHQkYvaZg9KxAYzV7MWA+Fs0Iam/Wm9PuxFEJgd+NizqKpL8RS K7KA== 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=h2SOVk6fkLOyNlNWnK+TxHGE4xIjOKtzYU9FhKazK2g=; b=W6T/O4AS9G6WuCmmMW33gTC3WDCuzz4Z0SYWX5A6NlTHGkJ906xsa9k03O1W53M7hx 3PymG2NuMa6cH+K4Mm8GXVs6kUxOI+TbfVspv8PuxUlrksL9m6uClkqlM6p8nbquE48t eCH3rRvTi38JSmeVqoINvnCUawd+rSs4+09WCwehJlspq2XmHcjyovRZwXrtGKggFfa8 TTDZvxAdGqHefs1VrtJwP/mZ6fsDBHzInEnfOQhAKc7/TU7lidU7+GL8V4FXLbbMcbxQ tGMHUXr9riPR+3agoXEsWYuNqTjN7ZznTASMQsoDZG0Jp5q+mT42XhFSmi3UYaohY+UD DJbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wjc1Ma2O; 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.11.02; Mon, 12 Jul 2021 01:11:02 -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=wjc1Ma2O; 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 S1352166AbhGLIJL (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:47434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352582AbhGLH7b (ORCPT ); Mon, 12 Jul 2021 03:59:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1C7CB61941; Mon, 12 Jul 2021 07:53:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076407; bh=Ktf0grcfzbxyC5USj04FzTLhNlEuNC8SKhMXtbgkEEs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wjc1Ma2OVabSlhTCeHEhg1/E90BC6tszL49TfwsnbiZ1cvFMhuRf56E5TyyZb/6Nw RWqNMCpj4IBohLhdLmNyEPgfRH/Qr/n/3RG/gb6T8Pkxqra6guCRJLn/kh3v6kkWqA zXmwPPmXhKeXStrXGpnZE5nvFvUR8pHFpXENsVUM= 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 630/800] iio: magn: hmc5843: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:53 +0200 Message-Id: <20210712061034.219022879@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 1ef2f51e9fe424ccecca5bb0373d71b900c2cd41 ] 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 uses of iio_push_to_buffers_with_timestamp() Fixes: 7247645f6865 ("iio: hmc5843: Move hmc5843 out of staging") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-16-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/magnetometer/hmc5843.h | 8 ++++++-- drivers/iio/magnetometer/hmc5843_core.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/iio/magnetometer/hmc5843.h b/drivers/iio/magnetometer/hmc5843.h index 3f6c0b662941..242f742f2643 100644 --- a/drivers/iio/magnetometer/hmc5843.h +++ b/drivers/iio/magnetometer/hmc5843.h @@ -33,7 +33,8 @@ enum hmc5843_ids { * @lock: update and read regmap data * @regmap: hardware access register maps * @variant: describe chip variants - * @buffer: 3x 16-bit channels + padding + 64-bit timestamp + * @scan: buffer to pack data for passing to + * iio_push_to_buffers_with_timestamp() */ struct hmc5843_data { struct device *dev; @@ -41,7 +42,10 @@ struct hmc5843_data { struct regmap *regmap; const struct hmc5843_chip_info *variant; struct iio_mount_matrix orientation; - __be16 buffer[8]; + struct { + __be16 chans[3]; + s64 timestamp __aligned(8); + } scan; }; int hmc5843_common_probe(struct device *dev, struct regmap *regmap, diff --git a/drivers/iio/magnetometer/hmc5843_core.c b/drivers/iio/magnetometer/hmc5843_core.c index 780faea61d82..221563e0c18f 100644 --- a/drivers/iio/magnetometer/hmc5843_core.c +++ b/drivers/iio/magnetometer/hmc5843_core.c @@ -446,13 +446,13 @@ static irqreturn_t hmc5843_trigger_handler(int irq, void *p) } ret = regmap_bulk_read(data->regmap, HMC5843_DATA_OUT_MSB_REGS, - data->buffer, 3 * sizeof(__be16)); + data->scan.chans, sizeof(data->scan.chans)); mutex_unlock(&data->lock); if (ret < 0) goto done; - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, iio_get_time_ns(indio_dev)); done: