From patchwork Mon Jul 19 14:49:46 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: 479937 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240995jao; Mon, 19 Jul 2021 08:38:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztQbJOAIkm/s5Pew4BhP1V8piLRAFZbtGlUsENRzU54194x0izfCWmuSm9vHZcH1Ggm7LL X-Received: by 2002:a6b:f707:: with SMTP id k7mr19470322iog.125.1626709137569; Mon, 19 Jul 2021 08:38:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709137; cv=none; d=google.com; s=arc-20160816; b=HAwrtRc9kghJYau/umF/+TiB9qLKrRtsONsbxui29ZA4h49NVhjlWZgU9CElaOX1R2 Nc51U+CbpToLRTKqpzSxZE3pQpJx5Dq1kZTQNHZa+NRVzmOM1GobdP/O+vcNNcRz1gd3 YEqmpmisyKmz6NNag2OsezUSexBishZD1OXza/9Fq1voGoWPyrpGQ7wiUUuDx1yNfVEi 4FQuCv9Pi2cxX6u+nSgWjKsFKiAuisiYhaj7x/dS99HcGCwb930lbsIAyW8JGR6OZnCq YVSgSzveBSW5fKgvkjGDai1oc1YK8Ni9kn+OIf5Kl3/CnZoQlKa4nLgI1QrzwNsezfcJ 9nxg== 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=gDDAydRDrLiL2tbW8xrK/lbObLEZtbUyae2FhZ9XgR4=; b=wnkt5JPti+jZtA5h5+npm5EG1CDdGoMlqZlHkm4cnIVJzz972KYGRulmGD4bIkeRZx AjqK9LRzQ1lGuqIzZbrNlApJlYogqW3I8xQMKRgUsSwqp5kBpOXxcnVV7gpKeUowF4ez +uIrT09EB/EJiloS6R5bzE/sBuXOGKPPMroDhGt9pGM0LvPeYhM3AnGkZ445k0X4Ku6i l0BGmzBQhBQeUTMYRYqXrGiaeZc+M4m6VWeOihFHzWt+QO9WuO+IYVW2KOy4GVjUgCAC ce2+V7LsA1ErJ7ycyikq+UILKbX9KmoAVQSGFmJrEx/UdI3AY0nRE4soNUQiqqjT2Xvs t5zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=by2qgPEt; 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 s9si26098276iow.87.2021.07.19.08.38.57; Mon, 19 Jul 2021 08:38:57 -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=by2qgPEt; 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 S245316AbhGSO6O (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:53806 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244795AbhGSO5Y (ORCPT ); Mon, 19 Jul 2021 10:57:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F27F8613D8; Mon, 19 Jul 2021 15:35:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708904; bh=U2TLxhbuCwfcwPmXTc093UkfLKjvPeLwVOtO6biEJC0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=by2qgPEtYQkrkCoMBqeYSpx01sD8qlVRB/tllDPBStuUJjeAZdwujsIR//neB/TPA /iLpZ2IRdOXDGiz8Q7Ptn7wOBYtIDvvLRks6KCBcm1PBybMvBQxAF4n6dX/ySAmIjh vJ9NkYXKq07qdnX76mWx21hHg1bbrU03IkQIyRx0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Stefan-Gabriel Mirea , Sanchayan Maity , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 175/421] iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:46 +0200 Message-Id: <20210719144952.510645806@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 7765dfaa22ea08abf0c175e7553826ba2a939632 ] 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: 0010d6b44406 ("iio: adc: vf610: Add IIO buffer support for Vybrid ADC") Signed-off-by: Jonathan Cameron Cc: Stefan-Gabriel Mirea Cc: Sanchayan Maity Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-10-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/adc/vf610_adc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c index bbcb7a4d7edf..3e480244ad9a 100644 --- a/drivers/iio/adc/vf610_adc.c +++ b/drivers/iio/adc/vf610_adc.c @@ -180,7 +180,11 @@ struct vf610_adc { u32 sample_freq_avail[5]; struct completion completion; - u16 buffer[8]; + /* Ensure the timestamp is naturally aligned */ + struct { + u16 chan; + s64 timestamp __aligned(8); + } scan; }; static const u32 vf610_hw_avgs[] = { 1, 4, 8, 16, 32 }; @@ -592,9 +596,9 @@ static irqreturn_t vf610_adc_isr(int irq, void *dev_id) if (coco & VF610_ADC_HS_COCO0) { info->value = vf610_adc_read_data(info); if (iio_buffer_enabled(indio_dev)) { - info->buffer[0] = info->value; + info->scan.chan = info->value; iio_push_to_buffers_with_timestamp(indio_dev, - info->buffer, + &info->scan, iio_get_time_ns(indio_dev)); iio_trigger_notify_done(indio_dev->trig); } else