From patchwork Mon Jul 12 06:10:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473040 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713861jao; Mon, 12 Jul 2021 01:11:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTaWuSPxNfYC8ceOiJrmz1PCu9ZDLYML2ajb9VKobmz5Sw0wbX0/cDb23mA1fhhPBkNsLS X-Received: by 2002:a17:906:1701:: with SMTP id c1mr51290815eje.425.1626077462203; 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=mHriD3rE7jXcieFNTaQl2K6iii5Bb2s+luN1hmxjquExzIG9j12I5uA2R36Jlsw4fX gmzCzNS8xalpSIm8oE8UY8Vg7qdQYjMO982Nk6RrE0m33Pk4YoGANic0EpZzegauiMqr xHFbRc6aF/uZjgLvRPFGt5Tn8L7zxP3h+U/ohI5HCahTMK2zmO6W7adh+nYi4G5d/r72 Hd5TWV5qVWV6OQA/8yIYgK+T+lCAiDXfuG4YS2NjCrOPmw9wBnUi8bh6OcuZb+Ecp/W8 m17+sIHPY6dq3yyUmxUOyvrimdrE3MsrmCT0i+ygzmMKlAgF94rcmTKXEMkpzGz+0+kR D0IA== 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=1ESfXUArgUODw4sPXZEHuD+2lYGV12egcrgo9DsqRZs=; b=Om9aqRoaDjxz4FV3AGul6eO8gQfQ3O+iyllwBNFGBhRA/es/LCybCVwel25gHcd9aY 3/rOA+ll2HpcqgsyWiAIts3B/l0djPOWAucEef6sGIjeHuGCeG4OHjQx5sw8t1EDY0QC WEG5OG76lla1VZxWNnxM0OC62MlZpHfOg1mgVQXkuNSh10tm8BlNxq/vC7KlM2f3qoG/ 5JCEh3KaA9Fk4FaEXu5PvWTbMk1xbjLfmrMAxKbWWvIVpKta79p/sIg6GibSG6FE9OQP 2CUSet3RK5KFaTg0sTSFf5o73Zxffy8yNPlpIBUyEbhI+5g7b83lMUB4JqC3M0vc1xQV rT4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JHMg3z0u; 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=JHMg3z0u; 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 S1352895AbhGLIJP (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:55108 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352612AbhGLH7e (ORCPT ); Mon, 12 Jul 2021 03:59:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6F62A61179; Mon, 12 Jul 2021 07:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076409; bh=PWU2nR3R00QI77hwPsUT04DykDt4M+oAgY0uToP8OAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JHMg3z0uTdTLaIm/+Jym1JT3YZhdAlNq7hKUAWfKoR4Od6utCn1DLV4lYK8xuW/pG 89YLGOXw56GL/uyUcNR2F91hMhnOfo05qH9oGzJSP2dpI5+eaVAwiFSP6Tz795UXxy hUu5OUZiuKI7FBfZkRWPBjfXkGTLXsS7agE+3lJo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Stephan Gerhold , Linus Walleij , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.13 631/800] iio: magn: bmc150: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:54 +0200 Message-Id: <20210712061034.305735205@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 7692088f72865c41b6b531fd09486ee99a5da930 ] 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: c91746a2361d ("iio: magn: Add support for BMC150 magnetometer") Signed-off-by: Jonathan Cameron Cc: Stephan Gerhold Cc: Linus Walleij Reviewed-by: Linus Walleij Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-17-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/magnetometer/bmc150_magn.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c index 00f9766bad5c..d534f4f3909e 100644 --- a/drivers/iio/magnetometer/bmc150_magn.c +++ b/drivers/iio/magnetometer/bmc150_magn.c @@ -138,8 +138,11 @@ struct bmc150_magn_data { struct regmap *regmap; struct regulator_bulk_data regulators[2]; struct iio_mount_matrix orientation; - /* 4 x 32 bits for x, y z, 4 bytes align, 64 bits timestamp */ - s32 buffer[6]; + /* Ensure timestamp is naturally aligned */ + struct { + s32 chans[3]; + s64 timestamp __aligned(8); + } scan; struct iio_trigger *dready_trig; bool dready_trigger_on; int max_odr; @@ -675,11 +678,11 @@ static irqreturn_t bmc150_magn_trigger_handler(int irq, void *p) int ret; mutex_lock(&data->mutex); - ret = bmc150_magn_read_xyz(data, data->buffer); + ret = bmc150_magn_read_xyz(data, data->scan.chans); 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, pf->timestamp); err: