From patchwork Mon Jul 19 14:51:02 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: 479851 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4206253jao; Mon, 19 Jul 2021 08:01:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzDiJyW8wv0jvY4dTcre6FKnxnzkQeKYKKUUm/PDYEr0J96W2DcXFQvi95UqeAHYiyXAQ2A X-Received: by 2002:a05:6638:338f:: with SMTP id h15mr22194911jav.135.1626706876851; Mon, 19 Jul 2021 08:01:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626706876; cv=none; d=google.com; s=arc-20160816; b=gFB0EExlB777qZs2kol+pjLOUurBxL+kcfbxvKSGGR6VLlL1QSLayKYbssqLNWgVhP TvkYgFgPu1efjMWcaW0cyJzJcGuabuveHdA2XpMEkiF4qeBq89pGcv23JhC82DBtTJC2 oNpNkpUYq3N1/DNBCsSAohrgPN5q3VjK/pPT5lDnRqQftiXaP+gAeSep9gdQghINVg5O 1NE6Y6sdvhMX8rJMljQDkPXjBq1YcPV03KV3LbxlrmPv9yWC9isZfLwa0NrQJS9gPINK UNMcj4q9e69VMdeCUEqI02/R2coOG5Hm9d4J8ckvIqF/49zJwwVLzp2dCFHPl5b09PFK M6RA== 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=buSSHqkSYJ2oRJHNC2HrYF+4QXN8qQBN3QB180/vZN0=; b=vpBmC09qpMkdgeotiWoD9rVO+PVeEjOx3ZvZUnFuxi9UdBMTqj3u94TTNjLXNB3b/9 H6L8enzKTO0hsh4g+gwhz0YCHxPbowjUhoA1H1M4/JOoNR0jpK+quhzNPrsuVqQu+kMm SXBgcFnBHoiSLetq1Te4DHatjBetK/vTHpUAtUWUteUuqoboIwoLQxW4lg4UZ9Wq8/wS GRBRTcZQYnKpWozG3nwUca+HGXxSBi32LBgnkNyIkHAmRgzOlgG4K6zMDwBE3Y7EgH37 bwZ1EUSmRDcFN/owjL92J83if5blfv+BaGm2W7uhI6qmCQP5czeSMck+U1hXngarMZrw tKDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BW2QfnIV; 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 o8si19257350jap.10.2021.07.19.08.01.16; Mon, 19 Jul 2021 08:01:16 -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=BW2QfnIV; 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 S242715AbhGSOUf (ORCPT + 12 others); Mon, 19 Jul 2021 10:20:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:56152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242216AbhGSOTi (ORCPT ); Mon, 19 Jul 2021 10:19:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A3B666113A; Mon, 19 Jul 2021 15:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626706818; bh=SQAnv+E4QWEwI4QmMR7dSgYpZ/DWy0QnN+8spBuXf0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BW2QfnIVdhqewC9B3utZiA5W6W0F/A6OhKP4H05DpIWQVO7U785Mrr0Z2RUgG5w4C FpLOGwnwd3RVTY1SFLi5KRHUawC7EziliWFs0CU+N9NCNKdw5/maLDFsx/gMafaC0q GzuMcG8k7ZN4pmN3JEPmkXJVj36yUXT2EAh+x7+Q= 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.4 078/188] iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:51:02 +0200 Message-Id: <20210719144931.243560738@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@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 f04b88406995..68c9e5478fec 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -120,7 +120,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 { @@ -666,12 +670,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);