From patchwork Mon Jul 19 14:51:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 479852 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4206274jao; Mon, 19 Jul 2021 08:01:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyVIDWfQA/r72JqW2cQxu7s3xeIAwhxAKz8dK9txWD2X0KxGhcOcOTx5W0lJC2jyxA7UhR X-Received: by 2002:a05:6602:584:: with SMTP id v4mr11556367iox.181.1626706877561; Mon, 19 Jul 2021 08:01:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626706877; cv=none; d=google.com; s=arc-20160816; b=wsxSVUSFxn5EPlm9l2fJ4LcL7fGizm8No7t6QCb0N2zsTmhmXoxdNKmS6rI0U4ve95 93O+XGk5E6nedulypClBqSFm4KIaiYXh0zY+Nnjkm8xlLOWsUs9/40eAt53bF4lpocy/ U/EQyqo+Qo8zguAdJ/SmjIq+Geh1CHXodoLTfE6NeecISlPEINOu14KcD05rptcHV6MG d6DnCX1kMSZ4J6LLAiJcV2HRmcPcAwqMnkODTylF6Jnteua9nLVxunSx6uXHkAOzzehQ zzhy0QfoADUxtPemp13grQaU97AQwuhYMMtYbLnVJ8bDImvDD2UnUCui7WHdJZkdAzOQ hkyg== 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=HuXNVomseVs/honlFcz/9knmDrgMfftsit7YNAzegok=; b=BT6D5mur9R5t6UYLOOqfwurCCVN2dNZ92lrucA/hBHWtI/52AA+MLImOGltrC8pK0/ 2x9w7upEc+JfKd7x78FVvYVj75Scc/SP/C8KsNyIemHuSAX5RGxIaWyOTFi7Cd7v/BYa AXJccLMtHo1PhlptaamSNLulIC2JSB7fSKG48xpLcR4hmmxHoTzjgAE+N4ETeL69oJaq ivoyrgDfjNqXbQZs3UuoNlzWCdLdAGxp5U1icOYSVw06++AZbbrJNM4w8IYFohJyDJwz gGLN0/9UD2sdR2r+whSANlbcSWoJANXDnP+hpQ1S/y1wv8n2zE55bpPG0NdOopQMp3GB RcKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YxIQyePV; 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 o8si19257350jap.10.2021.07.19.08.01.17; Mon, 19 Jul 2021 08:01:17 -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=YxIQyePV; 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 S242467AbhGSOUf (ORCPT + 12 others); Mon, 19 Jul 2021 10:20:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:56252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241627AbhGSOTl (ORCPT ); Mon, 19 Jul 2021 10:19:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D2EA16113E; Mon, 19 Jul 2021 15:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626706820; bh=sP1SRJLephM8UWKWGiuyiLAygRoAuUUq5ITtVR1wUso=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YxIQyePV+3gLmA1nQdHufjclm/Wbmz1tgwEc7nQSXIhr8Q/WMz2x+vDVfqXLJyt84 lbMTa1zNTbWTVPWKgZh/w9cl35Wxhuywaw8tN7s+QKhHca8RYCye4O8rnidkLFHjpS 1CWEV2qZMaIqd8VzEyUqZOKOrwWRj034A/dmjKUs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.4 079/188] iio: accel: stk8312: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:51:03 +0200 Message-Id: <20210719144931.436634648@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144913.076563739@linuxfoundation.org> References: <20210719144913.076563739@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 f40a71ffec808e7e51848f63f0c0d3c32d65081b ] 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 this function. Fixes: 95c12bba51c3 ("iio: accel: Add buffer mode for Sensortek STK8312") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-7-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/stk8312.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/stk8312.c b/drivers/iio/accel/stk8312.c index 85fe7f7247c1..945c80183f35 100644 --- a/drivers/iio/accel/stk8312.c +++ b/drivers/iio/accel/stk8312.c @@ -107,7 +107,11 @@ struct stk8312_data { u8 mode; struct iio_trigger *dready_trig; bool dready_trigger_on; - s8 buffer[16]; /* 3x8-bit channels + 5x8 padding + 64-bit timestamp */ + /* Ensure timestamp is naturally aligned */ + struct { + s8 chans[3]; + s64 timestamp __aligned(8); + } scan; }; static IIO_CONST_ATTR(in_accel_scale_available, STK8312_SCALE_AVAIL); @@ -444,7 +448,7 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) ret = i2c_smbus_read_i2c_block_data(data->client, STK8312_REG_XOUT, STK8312_ALL_CHANNEL_SIZE, - data->buffer); + data->scan.chans); if (ret < STK8312_ALL_CHANNEL_SIZE) { dev_err(&data->client->dev, "register read failed\n"); mutex_unlock(&data->lock); @@ -458,12 +462,12 @@ static irqreturn_t stk8312_trigger_handler(int irq, void *p) mutex_unlock(&data->lock); goto err; } - data->buffer[i++] = ret; + data->scan.chans[i++] = ret; } } mutex_unlock(&data->lock); - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, pf->timestamp); err: iio_trigger_notify_done(indio_dev->trig);