From patchwork Mon Jul 19 14:49:44 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: 479939 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4241029jao; Mon, 19 Jul 2021 08:38:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0lN/RrE6VN60R0ykzIpz49zKw70sNAaMpX9UrbrKcOQma+pa0xKN1G2Sggea7cJF3xoAg X-Received: by 2002:a92:c083:: with SMTP id h3mr18059227ile.73.1626709139822; Mon, 19 Jul 2021 08:38:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709139; cv=none; d=google.com; s=arc-20160816; b=c7b4K42JCylphRL869d9dOzPwnap2aCoT6Z8tlxbO+KpJOaGs5Yn6hNu0Qhy67ppGN wBj6hcVNhvMQn1TwuaFFbszpcPOmpxfAkmUnFm2n+BOtskflPHeOvQiybJ1ua8IxyxF6 PzBsl6PFeA/zE+7Tw1uC6F49+OOUf72EygEGKOHc90MLnJUpbYSGK5vzpzWP8I/6gARe jtu0OPHVev+dFwakSE0JPuZW7mh/xqJd6C0j8+NWBvACEwY6L/YvSxyStQ+4dQmm1rhw nb9FaaMK6AuPg2q7QKdg6UXg4o9kr247Fs7ZSLbxCasnG1vCrn3Me6gLHJHNn81bFFCn 68Mw== 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=ybnINWpEU1Pl7VzymOvzfSXSRM1my1+2yVXTIWyz+DA=; b=EMBnCpi20cuEq/cUjbf3yz8JwAbGECYYOkLlNTzsZ7A4Ljy8IKCtaVQUvxuDVVbIUx ywlb0kKo0wbSznJeYouZ0xzxNXm7uwskvHM5ZBDbjnQ9sb5vi4ve1uiWSzg9ai2wJSee I7Maa+1N/Vm0vlTIXY+drSpfnIN+nfDLVmtx5j5S5VRhHuWdpluiQD7GjXrwLdDF7lfe em1Nxdg0zIOXq2xHlIaUIE9/uRezUIjt8ZbyBKiSr071UlyNlhUqmPR8k+UNd3tfmsDU +a/h6HaJoT1sqR9o6lLjljXteE09/+Lr624NVpRR7xuTjE0Brjz/lN5eSY4Bhr7CBkau TNAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=vvOfDkpK; 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.59; Mon, 19 Jul 2021 08:38:59 -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=vvOfDkpK; 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 S244864AbhGSO6R (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:53792 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244797AbhGSO5Y (ORCPT ); Mon, 19 Jul 2021 10:57:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D27FB613D4; Mon, 19 Jul 2021 15:34:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708896; bh=faE2+86gcb4+FxX4do6dEFdDev8aUHCNKjQXO5EZM6w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vvOfDkpK6HJfrMzCF3bB3X4fYO+8Qm/2yQTDymgeMJI088mcjKHdvPWG0Av93ts9Y bhU5R+JzyVfdShdlSakmeXbvHIfKk6q43c6hQBnugGKkTYcKs6S0/vXK87FYvqDb4q SxtaXSoSlnRh1vAg+xFTZ+x2Hbb331P8tru+c2MA= 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.19 173/421] iio: accel: stk8ba50: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:44 +0200 Message-Id: <20210719144952.421501670@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 334883894bc1e145a1e0f5de1b0d1b6a1133f0e6 ] 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: db6a19b8251f ("iio: accel: Add trigger support for STK8BA50") Signed-off-by: Jonathan Cameron Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-8-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/stk8ba50.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/stk8ba50.c b/drivers/iio/accel/stk8ba50.c index 576b6b140f08..0d9067d3ccc4 100644 --- a/drivers/iio/accel/stk8ba50.c +++ b/drivers/iio/accel/stk8ba50.c @@ -94,12 +94,11 @@ struct stk8ba50_data { u8 sample_rate_idx; struct iio_trigger *dready_trig; bool dready_trigger_on; - /* - * 3 x 16-bit channels (10-bit data, 6-bit padding) + - * 1 x 16 padding + - * 4 x 16 64-bit timestamp - */ - s16 buffer[8]; + /* Ensure timestamp is naturally aligned */ + struct { + s16 chans[3]; + s64 timetamp __aligned(8); + } scan; }; #define STK8BA50_ACCEL_CHANNEL(index, reg, axis) { \ @@ -327,7 +326,7 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) ret = i2c_smbus_read_i2c_block_data(data->client, STK8BA50_REG_XOUT, STK8BA50_ALL_CHANNEL_SIZE, - (u8 *)data->buffer); + (u8 *)data->scan.chans); if (ret < STK8BA50_ALL_CHANNEL_SIZE) { dev_err(&data->client->dev, "register read failed\n"); goto err; @@ -340,10 +339,10 @@ static irqreturn_t stk8ba50_trigger_handler(int irq, void *p) if (ret < 0) goto err; - data->buffer[i++] = ret; + data->scan.chans[i++] = ret; } } - iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, + iio_push_to_buffers_with_timestamp(indio_dev, &data->scan, pf->timestamp); err: mutex_unlock(&data->lock);