From patchwork Mon Jul 19 14:50:21 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: 479895 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4225599jao; Mon, 19 Jul 2021 08:21:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxydEuGEiYDJ1BmEDfbF4GycuZ8jC9vGgprk09An56xt8ImXTFF0EoB2T5zEajKDazXyd5n X-Received: by 2002:a17:906:4886:: with SMTP id v6mr27514020ejq.45.1626708097329; Mon, 19 Jul 2021 08:21:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708097; cv=none; d=google.com; s=arc-20160816; b=BEVPHd9L0b0Aj664/3QGoAz29+830uc229XEW1I/swuEJZ6f/Cy3QxygZHplnSmHAs daKyzx9Ud6Ur4r8Q+aJprYRpXFitzAQ1kuAKNpHY0+/Me7puqY2/b+atQ73POy3nRD5x yVocR3zSjwQ8DH/yjloK+hCmhK9qykbCxbp+tPNgUYYz0bLzthNP4QyYIFLrMBSmZ7Hh V1zoG4eW52outFqKbx89gE4QfpPkwTN7StJRi0Axir0TgLq702Mc8gxZxMmbOdClA1oR JSRc1npizhlyU0P1JQzUz19wZteihydXN8A+str7a0N4mVRl0s4WfW8ho7nNARuMle/7 bw/w== 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=zRyjyHTB4zbB7uit9e2BK8GifSxVVHOSH4RMqn/qCas=; b=KR9VEdaeKb68/re0dGETfOXwawM2TfJe6AyCKKRHu0acXxIySHcSdkdgHP3ZcDgWGt O3sEe061wMJsrVHuteSQnb2Y3cenhGrkT9Lw1Xl3nOj5x1MMqmCTgk7tc6GP9NHlZTuV fYez/dQb6Ats7/JGDCKGpifqlG6yPr8JuRMyF5UpuX31ZzxNXblf1C80UAov58AXuaOY MzBJImq2uv/QrVWChslYNx8lmz509hCHWy776YNUVxkOgDUfFauhvS8w1N5gSc1+JgnR /wGgxo71fdLM9A9iwMztehRl4tLUq4uC5gnosYW7BK+Od9jLSQXYAkf10vHenSpJ8/zG zOcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UzQR++bj; 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 l3si24719878ejo.634.2021.07.19.08.21.37; Mon, 19 Jul 2021 08:21:37 -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=UzQR++bj; 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 S243293AbhGSOkl (ORCPT + 12 others); Mon, 19 Jul 2021 10:40:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:56024 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343785AbhGSOjo (ORCPT ); Mon, 19 Jul 2021 10:39:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1C89461289; Mon, 19 Jul 2021 15:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707980; bh=w1zqB7j3poWZrv9tOwB7wzLJSQ77XoYsS/ftac9nHcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UzQR++bj/IWnfR6WWPVSwG+Oc4LUjU0+Z2c9oZKOhJNnUDLcJ3JPnEGj1phqIlsq6 5lp9qHlcHKQc1rjsbaFnkv2GXhp2JgPtPpKpHftiqsnoJ8Y93bntaUDSPZtZurj8kV PmJOHQi6dEsBTPxWavYxB4VwI/KlnHagWAGo4714= 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 4.14 132/315] iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:21 +0200 Message-Id: <20210719144947.221674259@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.861561397@linuxfoundation.org> References: <20210719144942.861561397@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 c033db701bb5..07f69b47f739 100644 --- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c @@ -51,7 +51,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[] = { @@ -236,9 +240,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");