From patchwork Mon Jul 12 06:10:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 473038 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2713822jao; Mon, 12 Jul 2021 01:11:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyseZhCQpShRS3LVl/B7sV4h4m30sTsa0GEu9i7EJ6Om1tqFPn0iHwhQOvlSqj9EsMKtLhq X-Received: by 2002:aa7:cd5a:: with SMTP id v26mr8042304edw.287.1626077459909; Mon, 12 Jul 2021 01:10:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626077459; cv=none; d=google.com; s=arc-20160816; b=No+QNBS5ffjTJjpiLWiPEJYdMjbFcAxhDAlBnCZaP9n/AGl5l0z/q7OJtUREQC0TWQ 9PsQQyVg79p1NMMLrZV8sUKDXIo61eG6BAXFZITFkyKd9UrtawL8HdKBLTBf+4hVE29s PlY0MKW01GY+PskEl2MbidGN/WCPibzb9H059J1IRdXX2WRtnlQheOSVR4oaQ2aYEa92 XXkjIUp+h62360Mc9yQKJyuCF8AFCNmo9X0+YpwNZjb6rQlo0dUmhWhHUgcOWnUqIekK SOMwK72kmS5nCrIghnUYN6aNmMq6BQHehoQmMeL4+UJwG+O6kdqhSegURm0IglCMaqGG OESw== 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=HYTa6UCTAFDmanzvXee0dNMV4Y/UbsJUpGB8gyZ8+Iw=; b=1I830IxRsdH0tCp1BVspfp1zYCjsiYWGhY5OQv2fmaM2aWK8i3lPziRmda9cvmR6Hc PG5SQgiIUWLWPAX6vCWO4fZcDGPyscClOvn+VjgAUJjLIXQWUAtvGd8rSaacJ87KSQOa A7Er4A/OwTTguuA/XyitnxIvfhlRSv3aOknigQxvHzV+jZRhH+DU6eZxXJoQ38abgKJp g6B4nMTbiVNvNq5JevqfX7gdCXor6D2YsuC+kgrHwmz3Dw6lfNkeTUxqZJ6okvFEHAX/ wbWcOlDITFAaP2t4stuTEXiQldlKc7tdmWcyZc1kBdSWVV+eBztARGkXPoqD8gWe/8/b GHaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YPFkXUKR; 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.10.59; Mon, 12 Jul 2021 01:10:59 -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=YPFkXUKR; 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 S1347239AbhGLIJI (ORCPT + 12 others); Mon, 12 Jul 2021 04:09:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:54952 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352517AbhGLH7Z (ORCPT ); Mon, 12 Jul 2021 03:59:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 24A50619C6; Mon, 12 Jul 2021 07:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626076400; bh=I5p2o2CF+1CWKnG1I811kITf9YGmJq55t3a7Rr4VvdM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YPFkXUKRAEMWbO46HmQiPlg7cFz92qlEG+vkEdAxAJ7GGb99QS4a+lPYIwztGK+j/ ABjYF621irGPVvGgHQRIdtw+cDhySWZLksn1IzQ5qTwBOB58uXt193uKMo/f3FnR2x At1uZMafDP2IpHsXH+X1AZO+1SrRb71ujUQ7PIW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Matt Ranostay , Andy Shevchenko , Sasha Levin Subject: [PATCH 5.13 628/800] iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:51 +0200 Message-Id: <20210712061034.025954352@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 679cc377a03ff1944491eafc7355c1eb1fad4109 ] 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: cb119d535083 ("iio: proximity: add support for PulsedLight LIDAR") Signed-off-by: Jonathan Cameron Cc: Matt Ranostay Acked-by: Matt Ranostay Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-14-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c index cc206bfa09c7..d854b8d5fbba 100644 --- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c @@ -44,7 +44,11 @@ struct lidar_data { int (*xfer)(struct lidar_data *data, u8 reg, u8 *val, int len); int i2c_enabled; - u16 buffer[8]; /* 2 byte distance + 8 byte timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + u16 chan; + s64 timestamp __aligned(8); + } scan; }; static const struct iio_chan_spec lidar_channels[] = { @@ -230,9 +234,9 @@ static irqreturn_t lidar_trigger_handler(int irq, void *private) struct lidar_data *data = iio_priv(indio_dev); int ret; - ret = lidar_get_measurement(data, data->buffer); + ret = lidar_get_measurement(data, &data->scan.chan); if (!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)); } else if (ret != -EINVAL) { dev_err(&data->client->dev, "cannot read LIDAR measurement");