From patchwork Mon Jul 19 14:49:49 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: 479944 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4241261jao; Mon, 19 Jul 2021 08:39:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxHuBXnrceIa2FHzrDssI2d7UWueSpJZuWFq0Oic8NSBmx18VgGVEz1rI4Qp6qy4SQE3w3c X-Received: by 2002:a05:6e02:1354:: with SMTP id k20mr17076274ilr.169.1626709154978; Mon, 19 Jul 2021 08:39:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709154; cv=none; d=google.com; s=arc-20160816; b=y+S77xE4p9HlwKdZgcZHnAoPNJXyhtYjRswaiwEhg3JHHJ9IZmkHUsHEH2HXb5VFVG Y39qJYta7neaEbyw+oUQNRY/p/c3LEA4bpOLAaveZ3Cuzmafu0HocreK9iw9g+VbjnIc GKJKmbvX4vrn4vt2cCOyYiYBO0c/gXBgeepnggvhzIhRtTV9VfCHe980cqUl2tORpzbJ C4Mknc3ZS1jGbmgLf4AEKCRDEaDGmOIcSP9BNR6G1evU8E20OyfiorqyYdnYlzhO8Vob xpV7Jk0BPX+u2rOcQTYOMxaIiNrbDt9/1IyBBgKj0Glelk3KHaXoye3xd4uPYmbf7VWB 2fyA== 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=WGAtckzE06vqPTun+sOVD9ec+V4Ax+IJMMT1XHhCGmc=; b=ky0Q8tnF3p4qrEcsiJ4WKXRD68WVTqiWx2xeVY4WQQ1iMnHTprXHP6GxlpRWy1kB39 bQK0VrqXWOzl1VBOybfzKRcMS4zq5kVYLldFXDXeYdYkzhkloAgnGaPzEO5uxI9krgLP U4SAvAiWaCdgrMz3O9Laj5E/gy2A0IHJM+Yro6yosudY+2IDRJt/dtiAyp6lpfaG2sht EjfH6n7T/FrV2njDNwQKwFIFHBYCMO6FRTJOrkWCooljAWAiZCHfiDw8iymZwKFHiFAK P6GbcBHWTA9UqecqUmF+tV2vrHs4R4zYX5dpjIKV1Kl59L9zLfjt8/G5I1HsBhE8SG3d WXmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uGtwoSRo; 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 d24si9287321iob.3.2021.07.19.08.39.14; Mon, 19 Jul 2021 08:39: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=uGtwoSRo; 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 S244995AbhGSO6d (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:52466 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244955AbhGSO50 (ORCPT ); Mon, 19 Jul 2021 10:57:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 70ADF613BB; Mon, 19 Jul 2021 15:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708912; bh=qXYCCr7XtAY7JttqKbcjGftqUhrLplS++/byUl+aC8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uGtwoSRoLaSZDHfyTgstmgBCojiogmLu1nF4geCsTb8p5DEJke9/J35XjroI8ULjj 0SFwOdpMJmWSh07aNuCe7Wz9Z8IKX2dtzBP8OGF6/L6I+WKGQxVobemyZMfNW6eyL7 k8UBgetIm3rVpBO43kGbj2kpS8ZB+JgsQJL0Wj+4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andreas Klinger , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 178/421] iio: prox: srf08: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:49 +0200 Message-Id: <20210719144952.603668812@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 19f1a254fe4949fff1e67db386409f48cf438bd7 ] 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: 78f839029e1d ("iio: distance: srf08: add IIO driver for us ranger") Signed-off-by: Jonathan Cameron Cc: Andreas Klinger Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-13-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/proximity/srf08.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.30.2 diff --git a/drivers/iio/proximity/srf08.c b/drivers/iio/proximity/srf08.c index f2bf783f829a..5e8d3707738b 100644 --- a/drivers/iio/proximity/srf08.c +++ b/drivers/iio/proximity/srf08.c @@ -66,11 +66,11 @@ struct srf08_data { int range_mm; struct mutex lock; - /* - * triggered buffer - * 1x16-bit channel + 3x16 padding + 4x16 timestamp - */ - s16 buffer[8]; + /* Ensure timestamp is naturally aligned */ + struct { + s16 chan; + s64 timestamp __aligned(8); + } scan; /* Sensor-Type */ enum srf08_sensor_type sensor_type; @@ -193,9 +193,9 @@ static irqreturn_t srf08_trigger_handler(int irq, void *p) mutex_lock(&data->lock); - data->buffer[0] = sensor_data; + data->scan.chan = sensor_data; iio_push_to_buffers_with_timestamp(indio_dev, - data->buffer, pf->timestamp); + &data->scan, pf->timestamp); mutex_unlock(&data->lock); err: