From patchwork Mon Jul 19 14:49:53 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: 479951 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4243276jao; Mon, 19 Jul 2021 08:41:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjEcPtJMFRRcds8bKRrxv41CpTnCX7oKxWylo88MKkHX7t4NRw6WOS35izNbXeApRlqhKC X-Received: by 2002:a02:8521:: with SMTP id g30mr22347086jai.113.1626709295903; Mon, 19 Jul 2021 08:41:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709295; cv=none; d=google.com; s=arc-20160816; b=HrSAM52MZDbKmvRDhNRWWYgaKJG9rfxeMPMIQmgU8dnWaDLTsqKn23dicp3MniUye/ TEA/iSW1f25XXIc59V1+RcASKZQdx1s+BCbB/uccajhEAKgZKrAGBnOUPuaCAFT5rcJP 5lGn4ExB50WGO37GMa/6KHiz4OYxDVkuFLmiuXZ5WskWFHm7Rz26dHKQy3YJTokw7RL4 grb6S9JH9XkskTsTXre49rk7EkWDWzFA0xTUEnOjEYsnRYrstY/Xg5ZfEcv0T6zgS13i Gp8urne69KLp54RGfFPxVhhxC86560vqKxu2wLxjhZFFIdz7A7mMcwIdPEsVfhslgkK4 DbJw== 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=eilgqwA7akwQ2ewKlnPnre9CXOibRmGo2G/VnUqAC0Y=; b=hIm7kZKZZtgRnMVX6Erss9ma1NMOcwF7cMbtG/rKElARWbcu0A3AaU3SZvIWSqrban oJzE3S95Ipsuc9+UWApdVqM9/wq5dsyl9vhpEzQlzR0LEnoyoTb5hx1GXkHkJ8+VNoKv FFDOZF2L7WhhEDe8IzLPQxF/qPSCyyTnFhDTRdOUKwF79zLgMDwBfHjPHY39f2hsb5P4 dpdYs+K6pP6yCpfl6ZdSX9P+ecRgfR1Ps18ZMslc5rEcT+vbZJ3S5hLGDg+izCBNN1Pj H6BMWnI08QSxUjY1SYWFifBqpD1ld3ugVWzZIe2YHqEJ2EG7CI3Rh+EwyVxf/Dss8nm1 8bmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2WtcAuGB; 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 ay16si21406520jab.96.2021.07.19.08.41.35; Mon, 19 Jul 2021 08:41:35 -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=2WtcAuGB; 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 S243718AbhGSPAk (ORCPT + 12 others); Mon, 19 Jul 2021 11:00:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:52468 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244661AbhGSO63 (ORCPT ); Mon, 19 Jul 2021 10:58:29 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4E21A61073; Mon, 19 Jul 2021 15:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708962; bh=e3UiD8zQPyfg6ZSBdn2TWMGmZ4mt2ttSBOp7Q22+uPs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2WtcAuGBKl2Jy9Ad8VyEQh2wnXbFATbU0b9ui1AQehEjVDCxFlq9dDwdlikKSZqbm M5CxasasPzlpEQYE/w1nBGSQo+1Y6VvxECGx+1ufmRIVDrxopUqSSJ9Sl1M1ZTxja6 pA/2toSyYM6KvmvCkOiRcUlx4mJhDbXIhK+4xWIU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 182/421] iio: light: tcs3414: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:53 +0200 Message-Id: <20210719144952.738554117@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 ff08fbc22ab32ccc6690c21b0e5e1d402dcc076f ] 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: a244e7b57f0f ("iio: Add driver for AMS/TAOS tcs3414 digital color sensor") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-19-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/light/tcs3414.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c index 205e5659ce6b..c525420e7c62 100644 --- a/drivers/iio/light/tcs3414.c +++ b/drivers/iio/light/tcs3414.c @@ -56,7 +56,11 @@ struct tcs3414_data { u8 control; u8 gain; u8 timing; - u16 buffer[8]; /* 4x 16-bit + 8 bytes timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + u16 chans[4]; + s64 timestamp __aligned(8); + } scan; }; #define TCS3414_CHANNEL(_color, _si, _addr) { \ @@ -212,10 +216,10 @@ static irqreturn_t tcs3414_trigger_handler(int irq, void *p) if (ret < 0) goto done; - data->buffer[j++] = ret; + data->scan.chans[j++] = ret; } - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, iio_get_time_ns(indio_dev)); done: