From patchwork Mon Jul 19 14:49:47 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: 479940 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4241055jao; Mon, 19 Jul 2021 08:39:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5cwxfCwfZ/uLbZS5OR3ysKDJgZeR6ifR/ksNeWXg4164h2iPoVzHuGax67pca07bpLaR7 X-Received: by 2002:a05:6602:2245:: with SMTP id o5mr19805304ioo.20.1626709141116; Mon, 19 Jul 2021 08:39:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709141; cv=none; d=google.com; s=arc-20160816; b=icDE4YbUth707nCGKLn0P/LsTWrhyJ2FtAFmAqDXx3eU53QUfStlGHIeF2IOcIyjBM rFg4gdM1GCQ8/6z/oz49Gg1018zzFH5UrDZ9pNtUPqjoJrnq43ZYHN1zgQD6dMRheYhy DmKxyO2/CtwuFkKdMlD735oIpT0RUg3gJZ2x/0YBrD5krgNTDpnrzms7QDYPukppKMH+ fGL9Jdz3MQ8GZpygyFYcMUhc/+mpS/fB6n01F0AbofTVs4YXbCiRkklFwWUetFMq4fkm +zQxyOf5EtMbLrc6p4iydFMEQ3qR9CYyP0uGYxL74koyY2VDiWF7J68ceOiBuiZ6sHPT r8zg== 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=DkRN5bDHW+uqHdrmEJ0oPTXz+mJw5pzCdbWSTI0LoW4=; b=ultXd8eGBOdZxG7uiLgmcjWlDgCzYYegrzS347drWm6J6H5sslA6bc1VIQaLHUuSw7 KKaMvoZgMXc0Q7JFsGKH0f5VEp4sUqVgl9YQYvMYOd1LZG54pqsZqG4pv/QxTWF+y7ai yizRV1j3P5nzrTpVVZYJTATEyjJzvQSvQXvmhpJZPe0PJygGvCrErVrIMN6qG8zwPnAm Fq3ZG49effPDdWd8IG+SSD6cmiyBv+i/xwOoVny3AmWv0bERLGezeU9+CcLX7HDlGB8V +AiYQ/E4TnAmxsVc1vHWYh5zYIChU2tvwZEnPIcoVaWZ2u6fBE6kF6Li1ZVoEDRKe8HL hrGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BXWzNk+9; 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.39.00; Mon, 19 Jul 2021 08:39:01 -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=BXWzNk+9; 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 S244878AbhGSO6S (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:53808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244888AbhGSO5Z (ORCPT ); Mon, 19 Jul 2021 10:57:25 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85EE5601FD; Mon, 19 Jul 2021 15:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708907; bh=LuGfNC6k+dOEGzrl5/a1cJ8niZYjIwGAjPS75edF+IA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BXWzNk+9cYp2Awe+2jOLTPhoMlz1vi7wo0QUqWA2/YSyevXinrbddKlecBgSzstH9 2ziK/G5DlsUJSrvU5vQhpoLLGCgiABmy/40NY0BHPfVqOm+aaE3FClrIbd1f9YKnJL leb5Etpox/HbAuq3PjjsRhd/1lYPCCZ3FMx3W6GM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Stephan Gerhold , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 176/421] iio: gyro: bmg160: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:47 +0200 Message-Id: <20210719144952.542483171@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 06778d881f3798ce93ffbbbf801234292250b598 ] 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: 13426454b649 ("iio: bmg160: Separate i2c and core driver") Signed-off-by: Jonathan Cameron Cc: Stephan Gerhold Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-11-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/gyro/bmg160_core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c index 92c07ab826eb..ef8ef96201f6 100644 --- a/drivers/iio/gyro/bmg160_core.c +++ b/drivers/iio/gyro/bmg160_core.c @@ -103,7 +103,11 @@ struct bmg160_data { struct iio_trigger *dready_trig; struct iio_trigger *motion_trig; struct mutex mutex; - s16 buffer[8]; + /* Ensure naturally aligned timestamp */ + struct { + s16 chans[3]; + s64 timestamp __aligned(8); + } scan; u32 dps_range; int ev_enable_state; int slope_thres; @@ -872,12 +876,12 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p) mutex_lock(&data->mutex); ret = regmap_bulk_read(data->regmap, BMG160_REG_XOUT_L, - data->buffer, AXIS_MAX * 2); + data->scan.chans, AXIS_MAX * 2); mutex_unlock(&data->mutex); if (ret < 0) goto err; - 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);