From patchwork Mon Jul 19 14:49:39 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: 479931 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240812jao; Mon, 19 Jul 2021 08:38:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNIThACQMdkSvPLwzg1lye2tzFZr7SXGWCtQreWxF/q/ibqTZ9sbt6KfzaAg6pAnyCk2G7 X-Received: by 2002:a92:d10:: with SMTP id 16mr17317718iln.189.1626709123144; Mon, 19 Jul 2021 08:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709123; cv=none; d=google.com; s=arc-20160816; b=q2IS4OVXtAgg2EYS6vRrx9sbJYKxUr2P6KRrI33wIyCl02Hv8RI90RczBSFz3rJsHD 0/iIawlolJxGK5Xw1S/lDcDJNH+szK5X4Z9QlljrZo2gPNcxo2Inx3iiqNyBBrXQtVRW 0ZDNg/xVtfdbyKSdab7UqNH5HHGW9AewI91x378tqaax+xjfzyP/eOSuPBma3H7hJh6w efbrtCzBengMtBvV7eFEGtaM+Y6u8fNC0SbmohttmVmfQQxBZeoiH8cAOvhGywbBr9XI ocXdqwJszM1/OjdANwe6UnzVLrn/C8G20BRAJKuVYcwWGj964XNpmYovzA3MH2E7kSoi tMBQ== 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=ggcrEZfDs35rH4IkP5k+F3XOS9trkAyCdKisuUMGT+E=; b=S8llxJ1Hx1L+Gy2SKdwamPfVs69EgxngKWigGU1OetPuNH0WJH195cf7msBPnnqsfQ O0veeXECEP1Qa05cNAOOz5/Nd0N5ZeSOfw7lVbh8R4NFDjAnKnff53yip9ROOxHhZYBL 0lS4JBxq10LZGSHZ3o0gsgt03moYPqvY1LPI0kuIKRS6cmj7duwzsKx5GsL4WkFYDqMi a+AgMtJjR1+hazu8+InuGhqooPaSQ40jvy1hn/PoW7TR1HbakzOGkyaqKmPyGlfMJkPU w7ua/O3u/2iZblIaR4+cE1myMl5LWImi5F7rVhzsWWabw6G+OUQ42wwOr1LUKHaNLkr2 SnxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=B0Ppc8hw; 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 s16si20227841jan.83.2021.07.19.08.38.42; Mon, 19 Jul 2021 08:38:43 -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=B0Ppc8hw; 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 S245272AbhGSO6A (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:53314 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244635AbhGSO5N (ORCPT ); Mon, 19 Jul 2021 10:57:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6CAE661221; Mon, 19 Jul 2021 15:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708883; bh=LVxbLgvPfoshSZMKTivsFqOZMmxSUVUZeZwlEswZEkM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B0Ppc8hwKgfYfLfSuBXzHsKbnyxVYCsuXb3dE8ENC0xaSwZotIH6/SFesldNw2oU8 +iKbaAcjvSvgCW6kMUATnLwANpMItf8JjKy6TGADm8f0m7Xd/rPV5wA3VtvBTGnDO1 kyCKSnMVnwMLxN3zpq50BiCKhrJCHsKX3yiptPxA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Peter Meerwald , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 168/421] iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:39 +0200 Message-Id: <20210719144952.257082441@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144946.310399455@linuxfoundation.org> References: <20210719144946.310399455@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 fc36da3131a747a9367a05caf06de19be1bcc972 ] 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: b9a6a237ffc9 ("iio:bma180: Drop _update_scan_mode()") Signed-off-by: Jonathan Cameron Cc: Peter Meerwald Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-2-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/bma180.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/bma180.c b/drivers/iio/accel/bma180.c index cb9765a3de60..4bedf48d662a 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -121,7 +121,11 @@ struct bma180_data { int scale; int bw; bool pmode; - u8 buff[16]; /* 3x 16-bit + 8-bit + padding + timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + s16 chan[4]; + s64 timestamp __aligned(8); + } scan; }; enum bma180_chan { @@ -667,12 +671,12 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p) mutex_unlock(&data->mutex); goto err; } - ((s16 *)data->buff)[i++] = ret; + data->scan.chan[i++] = ret; } mutex_unlock(&data->mutex); - iio_push_to_buffers_with_timestamp(indio_dev, data->buff, time_ns); + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, time_ns); err: iio_trigger_notify_done(indio_dev->trig);