From patchwork Mon Jul 19 14:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479880 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4218485jao; Mon, 19 Jul 2021 08:13:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJn0ymbESObWKDhUhCE0jV2y2qPTzyHETDC2x+X/BJlzHCGpDftz+RxfW+Kb0+oTnBL0vi X-Received: by 2002:a1c:c90c:: with SMTP id f12mr33238360wmb.80.1626707584888; Mon, 19 Jul 2021 08:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626707584; cv=none; d=google.com; s=arc-20160816; b=gARgZYChI8St57zO8MtuMUmLHFitkZFI3BVCCRkODaTnS2ve2tMnuAVsNWnqr3qK2P VaoDfkXG8JFjlvMLcy69+BbxqOjct5KGyehrxL8SNUKo6TXWnMfozK1Wh0/lRHaMkWTd bBmWp4ZT6Qlw6WEPUDKhai1KI9ai3uMDzueu+flmfO7cB+sS9cL73o1hx50586C4UB6u 4Gl48tg14r1fpAKm10v8oij2tN2joyBn/A2KidhkDYBhwcb8ZDolG/1iyN6wNtvI0kwV YeDt1uugGOiwPm1VzbrRkfgWktPWCXVOSPGldd6oLSnJ5BLeQ5Q7eIIB2kdxKFi+GLKI lMnQ== 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=zKtDGevx2Jfb+ffNsHElvUO56wGZzr9XOVqzfPx9xFU=; b=K/oKfxbfgNVRpl/cFKa1MuOCvUWRqZBwSdt2Le22Rgd4MYbmiq0W9lfPLL/h7EBNXm SFWj5WNA5jn0yc9m3f+erNwOhH1/mrdj7jjO74iWFoiRLEHwYtzFof7wx21/EI6U/RLe wmJ865/BwjxNpMivPoTuAf2mJeRTyGwRQPdRJ+pFWXsX8UU0tK5g6E3oB0oscMkyIVLB C23L9mciVJd3VYoJx99CnT+FRsp105pKygTFYcPkOVECzck8SJVA4O1dpCSLtyOYzR02 O5V1ov0FFMYqXCma2cADlDwTsDF9r4NOL87VgvPtFSvgqQdNi61zZod+ra1fpEF+NLl9 CtYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AGddbtpi; 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 d26si20449114ejc.620.2021.07.19.08.13.04; Mon, 19 Jul 2021 08:13:04 -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=AGddbtpi; 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 S245323AbhGSOcA (ORCPT + 12 others); Mon, 19 Jul 2021 10:32:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:38112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241866AbhGSO2y (ORCPT ); Mon, 19 Jul 2021 10:28:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6263261264; Mon, 19 Jul 2021 15:08:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707307; bh=PxyD3vuui0Czt6+qLbgM1PyCIZ5V3NELgEMkjmqlK9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AGddbtpinxEDKll32WRDMnRfkwZE5uWp6jDNAJtHQDq16iFflP+EgAyiIJNbHqnym 7JP0E3evuqRWcYHlinbKBcWP9dSMlGZGMiY2EFzjKX8KfjpO9zBb5i795b7rTDMe5m zgiaIL9QvCWVwJPFgZfkh6VtUulkWxAiguqhbm8U= 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.9 100/245] iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:42 +0200 Message-Id: <20210719144943.655497708@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144940.288257948@linuxfoundation.org> References: <20210719144940.288257948@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 d1bde6d2721e..2a14800e6514 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