From patchwork Mon Jul 19 14:49:42 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: 479934 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp4240855jao; Mon, 19 Jul 2021 08:38:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF7GPJiulRlvi4e+Qqr3EextItqVHDTRkfvMg+wXbdPsayxqZLaFQOLskN9Ak0RuyTNY/T X-Received: by 2002:a6b:14ca:: with SMTP id 193mr194618iou.206.1626709126755; Mon, 19 Jul 2021 08:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626709126; cv=none; d=google.com; s=arc-20160816; b=f7fGbwklHylrafuYqDV7hd3WmzIxMdq/hvmvdnin4smMaqWrDpzqITWYCepf/qdG59 rYAo5cT0T71MtLvr7wIP1NMMBQZ3THKcc9iitvB2Tkh3jzlm0I1ihoTkroexbuDihElP C3RILEGGWwRfG+xiC1v53a4p9zfyJJD1BgpxIUZBu6lNcUAcAZQl6HqOVgZSDVMkrJHO juXyW/stsRMD0+9RvB8eeiLYoXtNXFDCDzQobfZg3YW4PwAi4AkJV8Il0u/enykTm2os faxErwxgaT6HhP6pC9Ffhm376qkP0CzbI8IDrdTy2Tskyb741+sN/JmdVaCLFFjhBLud XIvg== 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=rb2KlfGLpWWpD+lBqQBYMOaWPGEvH5Epd76vQOz4IV4=; b=CO+ZcJUhjZVpppl7UJgY81h04ir9VmI3gzlpnvUJDxgaj6+Ze7DXPoobGc/xTOvpgC iDDYQ3fQMDX9nImR4VzMEf8Py/lgMzT6Jk7fTOZKmO8KK0VihMDSO6gWy8uNOpteTDgh ik8ydV2Zy9VM9tPUuRE6coKNikI6qoyshIHw49P3k5UGfzCBIyxu0DQl8T1fH9jqxfGW NEtTjo/2G1RT5a1AVHuFVjiLvc+w7Df4lLVWJfAtMcsCTQ1EvS+quZNsUKs5LsDoQjwx 50qJkhOfiBnE+QUgQnvScoLJHEKT8Dm/XE7HPid1kyy9l5QQPDtqbC3zHOi1iSd9mqV0 hXOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VXrs7NE5; 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 s16si20227841jan.83.2021.07.19.08.38.46; Mon, 19 Jul 2021 08:38:46 -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=VXrs7NE5; 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 S239091AbhGSO6B (ORCPT + 12 others); Mon, 19 Jul 2021 10:58:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:53516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239482AbhGSO5P (ORCPT ); Mon, 19 Jul 2021 10:57:15 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 786BB613C3; Mon, 19 Jul 2021 15:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626708892; bh=zq2+svXrcExRH7BARF/5ueg0aatNBr7cHb+UGRqO274=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VXrs7NE56taxdPgm1I2teCCjJCBsAMUxmJBDOM52x3z3pp/vc1BQOKPnmOtB4dr4U 8tHSsIFFLNSAcCZcb28YnpVySWvMjY+Pw/fDU0LNYgIM/EOPkvI2PRKBL5fGnZK0lL XpgnC9O2mGJHCiE/7EB+4Rd+nHDELLxiSo1Tmjn4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Cameron , Srinivas Pandruvada , Andy Shevchenko , Sasha Levin Subject: [PATCH 4.19 171/421] iio: accel: kxcjk-1013: Fix buffer alignment in iio_push_to_buffers_with_timestamp() Date: Mon, 19 Jul 2021 16:49:42 +0200 Message-Id: <20210719144952.358681664@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 3ab3aa2e7bd57497f9a7c6275c00dce237d2c9ba ] 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: 1a4fbf6a9286 ("iio: accel: kxcjk1013 3-axis accelerometer driver") Signed-off-by: Jonathan Cameron Cc: Srinivas Pandruvada Reviewed-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210501170121.512209-5-jic23@kernel.org Signed-off-by: Sasha Levin --- drivers/iio/accel/kxcjk-1013.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) -- 2.30.2 diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c index c22afc979206..0ca6f9de5192 100644 --- a/drivers/iio/accel/kxcjk-1013.c +++ b/drivers/iio/accel/kxcjk-1013.c @@ -140,12 +140,23 @@ enum kx_acpi_type { ACPI_KIOX010A, }; +enum kxcjk1013_axis { + AXIS_X, + AXIS_Y, + AXIS_Z, + AXIS_MAX +}; + struct kxcjk1013_data { struct i2c_client *client; struct iio_trigger *dready_trig; struct iio_trigger *motion_trig; struct mutex mutex; - s16 buffer[8]; + /* Ensure timestamp naturally aligned */ + struct { + s16 chans[AXIS_MAX]; + s64 timestamp __aligned(8); + } scan; u8 odr_bits; u8 range; int wake_thres; @@ -159,13 +170,6 @@ struct kxcjk1013_data { enum kx_acpi_type acpi_type; }; -enum kxcjk1013_axis { - AXIS_X, - AXIS_Y, - AXIS_Z, - AXIS_MAX, -}; - enum kxcjk1013_mode { STANDBY, OPERATION, @@ -1086,12 +1090,12 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) ret = i2c_smbus_read_i2c_block_data_or_emulated(data->client, KXCJK1013_REG_XOUT_L, AXIS_MAX * 2, - (u8 *)data->buffer); + (u8 *)data->scan.chans); 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, data->timestamp); err: iio_trigger_notify_done(indio_dev->trig);