From patchwork Mon Jul 12 06:10:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 472902 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2660463jao; Sun, 11 Jul 2021 23:50:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9Nd5k7UDNwh1+wCnbGkDuBtoVi7qNeZyODVk+54aTIuKwzUHePpNdhxyJnz8+XrSe7ocV X-Received: by 2002:a17:906:aac8:: with SMTP id kt8mr14508202ejb.246.1626072614039; Sun, 11 Jul 2021 23:50:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626072614; cv=none; d=google.com; s=arc-20160816; b=AvLh0Ri1IHmrBHiv7YTLuqlATqrrQxQAV3r+HaL9xG14QmM058Z9UqzjFSwpd+W2L1 6MS3HFVrPIexkd6NQIb9vjWyr/HVjee7pqMeTSoILh66dD8Bos1acXZMDJOv6/kA1Hmr t/bVzvaLWBnhGdGvXjjMSduT7n3V5kmZroow2Ib5RgjLRXrrYVw1OH6Ekucp6JB/mcKS B9KYxuvyA1d54IC4LjMySUcdy5jZJElFXPVGvKFeZ+mQkkLZJq2CIMAG20UJZG8/qz2O x4/dgeK8ysaOSvwqRSJ+uEy8C1lS1LLfz4jKu7F1Vwy05MEEUb/RjwQ2YpXL5YN06JoN kaGw== 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=5TJaD3xii3bDBwtsm65wXoG+sjLfu9GFT1OyUQO1Xxo=; b=uVQf89rVINzntw5J1jU2pqTcclFhPZUXh8Mjyzgq3hsP0RKNUQpWPhEPsyhlO6dOH4 gFrKuL7TJ5yKVm5oz+RYQyYn0EJAy7GytxVlaA5gVqz7j30TWbbkTan4rv8N/908CPs9 z4OtYypRneMmqaaozZW1wzro2O6yTTcmEA7jqOs/COCtwMG+yB8y5ct/jmjwhuGdpK+5 euggEZX4Fg9TPZ1rxA/AgjrXOj4z5veLRplzO0VDnxfc6kUDWRsLNllvGIN4iWcB/RFg Yh0YMbM/XATCqYu7dQaYQBg/4dSE7drS2qu+fhyCmATUicz9d0EZaf4kD+ct++tqZ+3y RTSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kWzXL3zK; 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 r25si3440466edp.437.2021.07.11.23.50.13; Sun, 11 Jul 2021 23:50:14 -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=kWzXL3zK; 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 S237053AbhGLGwU (ORCPT + 12 others); Mon, 12 Jul 2021 02:52:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:48266 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238720AbhGLGtP (ORCPT ); Mon, 12 Jul 2021 02:49:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id ADF0561208; Mon, 12 Jul 2021 06:45:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626072312; bh=DUaKgKu5pIGNyRSdMOAvwoAjyDMFvJrYVonQ4ehYsm8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWzXL3zK19Yk8qj8Z5FtgakQ519a+9H9H8P5rxwR9xW8Q3/C+wC5dKqVybtP+LdiK 34Ai8SHlLnoF1As1Jz0RpKFj8CJAVGTyv7gE1DODBgJFRDeVz+lK3iak/cNfU3uCT+ BE/S37yCMJwwvrKkdAjRovX/n4yrKnS9WV3dRsAw= 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.10 445/593] iio: accel: bma180: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:05 +0200 Message-Id: <20210712060937.972502398@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060843.180606720@linuxfoundation.org> References: <20210712060843.180606720@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 2309bdd00a31..da56488182d0 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);