From patchwork Mon Jul 19 14:49:50 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: 479943 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4241246jao; Mon, 19 Jul 2021 08:39:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEghpeKYXuaycpP0WReZR4lqtpM1a56WwG5HFXntZNx1gus1o7lUboH/Pdu1VWk+LVrIOH X-Received: by 2002:a6b:c90f:: with SMTP id z15mr18774094iof.183.1626709153966; Mon, 19 Jul 2021 08:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709153; cv=none; d=google.com; s=arc-20160816; b=JQpjE5gUIXqYVbsE+ES/yrvGltopySTJ1dlQwcglKy6MGTW0hGc7MUjuchLCVPyCAe 0GfEiRhb5azrO6KzOHDJdtClOzzDJKuH7PeYHBT4M+4z9XKoyZWIZy/uRtfGvGW1a6Pf ZME2lD1AViBLTkdPvlXG4haP/h29UNZMlSxl7gUDm+A2FDQKOSqzyLcag/GGh6RoWa3g kMP9l+SJsvvYU8iygcfCnuWEcZMJRVXkY7FiLa1YOiQBd1M2DKzBvhhjxyTf4VH3k8uF O5Ntxv+pPb0HvKGp3abfLQX59rR/G1YRcT0ZxsJr0qgGrQr25ymCAdrAXuys8kUn7QfO nOZw== 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=GdopjBgIuO4Br1WKEUWZfTkjw2Pl7txr9/LxUKxXxYk=; b=bruXwD4eCPxEC452Ju7iBCA48DXv0jaZA1YvNJ/eQyZrd+KMMthach8NOM/eQZZvtN +VcAJu9SUr5V9cnWSCm9fjQniid1nzDw4vUJCx+wgUdOQuVZovaxrZ2voeJ+4mBLbkgb GIcv/S85lN/LBBbtRSBzXD/Ej/SuxvTmKh/jSkCGQVuK3NkgYQJSuCmazsl1HLylVH6/ kl7B+7LExwbDCbdoFQW9umOx0FZA3fJHovFxiRI4L4bkut9PHSdJkxUkgA11UooOmQa8 SsWisrRqDqaeKTlabsfuJkawpVXGdGhbEIavnpZDIqDE/IHiPVqGI6zzkPXr4kt00Cpc AeaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="cv5t0/p7"; 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.13; Mon, 19 Jul 2021 08:39:13 -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="cv5t0/p7"; 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 S245561AbhGSO63 (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:29 -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 S244947AbhGSO50 (ORCPT ); Mon, 19 Jul 2021 10:57:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id BE80C613C0; Mon, 19 Jul 2021 15:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708914; bh=I6uD/zlwTea7JWHWedfC3b4Q9Pi/wr274i0zLaQlVwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cv5t0/p7GY6srLXWiJu5kcHTygBXxch3AG85+xH34mnEeKWhl6jGdlefH5o+TXAxt P5FOGRMlHDcLNKSswYCB0B1spcD4DIEfQG7eCAtUs1PPzMv16VjkQDy0bn6d8IoWsh xZL85IrArcrFcJj1CIPGXFJXfvH11io6lvp3wTeo= 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.19 179/421] iio: prox: pulsed-light: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:50 +0200 Message-Id: <20210719144952.637367881@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 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 67f85268b63d..0c7617022407 100644 --- a/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c +++ b/drivers/iio/proximity/pulsedlight-lidar-lite-v2.c @@ -43,7 +43,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[] = { @@ -228,9 +232,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");