From patchwork Mon Jul 19 14:50:17 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: 479903 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4226250jao; Mon, 19 Jul 2021 08:22:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3aKH3a7Z+1CYLmDdHdo335eLDGFuxP/9W+MBmYwMttzkr+udolsSuNM2jTuy8CQW9CLbm X-Received: by 2002:aa7:c801:: with SMTP id a1mr35450697edt.293.1626708138207; Mon, 19 Jul 2021 08:22:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626708138; cv=none; d=google.com; s=arc-20160816; b=lFseW9Kyj7mZdeqsyT05emud9vmWV4AP5rx00u3Bv7QN6MNwo9/Vg+orYcciU+g/dD Oc7hyhYv1UTmnkV+y78TrX0Tdo8elgYOVDHcQdo68fVm8eOsVP64L1hlR8nhLEItFUEM FGU8fEal3jobrLUQXp4JhZrc0duinkTYUK0iPLe6enXveAtzA4QZLK3zz42uLFrpIUtP tfK2or11AUMGfUeuXxYQ8xnclFJdSiWOD2x6B+xosq3nEL+cNFNrtH9MwoIrN7DfpdLY AJwVq4MKWY+SRiPTtjaEa79H84QuUNu/3MGHYbGWsZqsK61quZCo1wtjE8R0e8AFJweR MFnA== 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=xqGl2IZ3E+ZfBtUPUWB7e6btRZTLEUc7+QHoBgozrVU=; b=BEdk/z3h7AB1cZTmAjJ5n5+6oj5gm4hHVmyTLkke0MxFR3jvNk0YEufkozW74j2/WS 2PYV0I8rAcAVpLOh4rvLrazVQHKYQMwuOwG24DeJHa3n3ODtoVCjQydDXZdpu5iuiCCx 7P8CUhFd67F2DVhrcpLuC3FMwg8s2H0hjp7neCnDe5S1Ky2rhwJ85AwWb9b+qoEZ1IQu wzW05FeTE2GbmIu0leKhzltxXX0TIM7WD2U9ZxOVxlrOWSvU7RFXhECFdU1hHhO+ChcR umWP2Vbp4ma8LX4iaL12XpnwcLSzFzZZXCCH9XkT4+l3udG8qrM4eKpTBpwxSFY9oDMd l6PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O2RfpKGB; 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.22.18; Mon, 19 Jul 2021 08:22:18 -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=O2RfpKGB; 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 S239498AbhGSOl1 (ORCPT + 12 others); Mon, 19 Jul 2021 10:41:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:55510 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343677AbhGSOjh (ORCPT ); Mon, 19 Jul 2021 10:39:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8DA3061375; Mon, 19 Jul 2021 15:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626707970; bh=urQ49XxHUXcgsCaVyFWB+Zp2rfaAoWf9AqY/8fZpTsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O2RfpKGBq150O/RpKrWsIMJhm0RAgRNQmRAkDWMzxUAC2/8E4CoHjMjkvkoZ02GYT CRRQOg56NK+mNiOSCgUYGTWYZEuWb6ByoA1/VX3JBG+UP4/QTWT1AF9CmcoJ208sWD RYNVaoSusJOk08b3l/C7DcAIHuH3lwnrrg+JMCZA= 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.14 128/315] iio: adc: vf610: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:50:17 +0200 Message-Id: <20210719144947.097001818@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 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 c168e0db329a..d4409366e3c6 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