From patchwork Mon Jul 12 06:10: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: 472881 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2650092jao; Sun, 11 Jul 2021 23:33:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyyBwp+A5JhtkLJl5o6MeuIG9dgXX0egDS/gsIBmKi5+XbBlN+wcQVIzbOchf2LBo+Rnvts X-Received: by 2002:a17:906:3cc:: with SMTP id c12mr49456070eja.268.1626071474460; Sun, 11 Jul 2021 23:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626071474; cv=none; d=google.com; s=arc-20160816; b=zCwwmegho708ytr+RFwb1w7o/hfM9Nwuz0AxwJntcukIGVTznsbcqrnomNFs72uV+K 1xUhhc7jFftgrk+HTgQI+VNlM7z8vablOmaJsS58Ec6gE20F+f5d9nERhmEkTkOicyqa shbzTDxxlVgrRJ4Wh3zlmHc8vYiuikWNa08FYEqiEHGztw4XEOkwe92dOKTex7rJilSt Cu7zCovla07hubAO82yIGSVpDx4GBEPXMpSBvS1dPQvbZw7byZF/rA2ztkkK1aDBOZwi 9+VJqMyg3RBkdtq41TUmhmMBoD1bXDeLm1dCQl8p1Wp4ZflgB/AIGYoqmKqFTRw1LWqe JjKw== 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=MO+wacCZNzcK54gCvbj3isXOZKXNTmAsBG837vzpX6s=; b=I++CXVVj8BOH5V1HecF22pqmdQomEdqJZGdtFpg0uVWezbksO8hffTDHcwKAohHTsc Eao0cpNBpj5N8xw1RTQ3rIlduAP7YPy9/GZ+JxvZIYlN4zOwCYdh4f5J7U6lGFU/cMmT lGC+MOx8gITIHMWS9FV6Ph7gh5Kg8eq7+mIRRqnP+xokG5IXaBcqiH7Q6RW6yF9GA41a 7iBjcy62kuaVVPOBVpFPz/XhxxPruaqDCR5WtbYwJOmFU2FcjOkZnblRj5PG/m+8h/9R jGcBcnNzcsRZe4XnCwR2v4wuHX6WiO0+Vev4TEF/h5rI/bWGYZby13+ZBBJO4yHFbUCa cqzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="mY/0rggr"; 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 b1si16242569edx.272.2021.07.11.23.31.14; Sun, 11 Jul 2021 23:31:14 -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="mY/0rggr"; 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 S236876AbhGLGeA (ORCPT + 12 others); Mon, 12 Jul 2021 02:34:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:48084 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234792AbhGLG2b (ORCPT ); Mon, 12 Jul 2021 02:28:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 774C661182; Mon, 12 Jul 2021 06:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626071085; bh=QHC50e40NytrbP+sODv3C6N4+TQ9xDyRqUIASQ4MM+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mY/0rggrNi5YgJ8eWvQrVY5IoNgC32z3wbSR69L14BCHlUUkFBpLRrmvdX+vGhZw7 vS9XsyOp2cyZFLxFGIwjQg67lU8GBg5wUjb6wzZW43F5vJAVkG8G+x6MomZYbMyM1P KWxmpitA//hCeLEAelFDgW7tVk3BqlOhOPzx2h6o= 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 5.4 269/348] iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 12 Jul 2021 08:10:53 +0200 Message-Id: <20210712060739.244055304@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060659.886176320@linuxfoundation.org> References: <20210712060659.886176320@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 98b30475bbc6..0d29fe974d70 100644 --- a/drivers/iio/adc/vf610_adc.c +++ b/drivers/iio/adc/vf610_adc.c @@ -167,7 +167,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 }; @@ -579,9 +583,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