From patchwork Mon Jul 12 06:10:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473058 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2717609jao; Mon, 12 Jul 2021 01:16:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZ3boaJLjk62arE9u5vi9uTzBtMIRaUWkPmemSn3NSOlSiNMhqrPgQ8hOuNPLZH1m87TpC X-Received: by 2002:a05:6402:451:: with SMTP id p17mr62489147edw.332.1626077778755; Mon, 12 Jul 2021 01:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077778; cv=none; d=google.com; s=arc-20160816; b=j+EK7rK9nwZGwMSRh8rk7RHwP+s2by3TY2pgLIcF3ShQdsMsm4Zc0sHg3+REiMCqrU 8lyMUTXawMAh0viOKSk0XvR/S2p7+5TQQ7loFck2Fz/kkp7L6lFOskj9Yl5AzHp/QvkH paRf/LwXCJnYG/Oex/dA7rzys6QiDWeGwf1FZbdB3FAFL67tcQ36sDm1nTQIu+JlptV5 5Tk+t0sCJODjlBElaoh9j0mdq7ZmpIYeKubl/MbzVrE9nCITzbcZ4LKxFvIoqdbK7enm Tgcrd1xjN6XifpvxIGO/qJOyfGRrWG/6WMDhtoyG/AO2H09Q74E/muXuIVlf9eexIMNg idSg== 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=wgLj+mNLNmml+jE7SeY2PdnSSk4Iz5/C+8fZuaSQmqo=; b=D8LD614Wh/1GoCYhrSCCcYycEyTgca7H1zy3xTyI/kIWx/9VsvkAT86k5qU+PtvQEh CIsH6gXVrhs0mtuWYglcqUwyGgwjS2UfD3cVerWQxOyNBF8dxHb39dqUYlHtQbOwYHhV QO9SD/qV8bGdml8IBXKFZ1OexWnsEL404ulFZ9ib3cwzDu08gZKaL1J9FIzg8Yyhm1+x N2MLs+0fDePUGxB/YaHXN9HJCypb7mb0wV9XFBUiaEFx804s0ONS62t5VnUVTFzs3okL Iobpd1PLx7ITUmieplbnukPXzdy+rEE9m+Rtj773WtKjY6eovIIQB017Fs1BR/TZWq1F TkqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Xyxy45DC; 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.16.18; Mon, 12 Jul 2021 01:16:18 -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=Xyxy45DC; 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 S1355429AbhGLIJn (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:55674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353315AbhGLIBu (ORCPT ); Mon, 12 Jul 2021 04:01:50 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 54C006142B; Mon, 12 Jul 2021 07:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076475; bh=YwYcErRYGUObJLPpG9M4aFOsMEa9Ui78nMJ2u9STex8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xyxy45DCfmsUHv3+OZtwg9EZ8gfKQj2PoJA50js2o3FUjWPd7gpP7XwdaXmlcAnWf eo+ltzblACqIug2N7C251PctdoA0Ur+r7bSK7lsACaWeY4M2svQ2cr1yCZJ06Wkb1S ngeDHUyzxclgTBscs3JiBSWbazuzcN0rqz9FNRkI= 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 5.13 616/800] iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:39 +0200 Message-Id: <20210712061032.882473115@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 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 a4456ab4fb9d..b8cea42fca1a 100644 --- a/drivers/iio/accel/bma180.c +++ b/drivers/iio/accel/bma180.c @@ -164,7 +164,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 { @@ -943,12 +947,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);