From patchwork Sun Jun 7 15:53:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Cameron X-Patchwork-Id: 11591703 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D68DC913 for ; Sun, 7 Jun 2020 15:56:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B5D6A207D8 for ; Sun, 7 Jun 2020 15:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591545405; bh=Xm+MlJ2SnfPeDcxMvvfWqhIChWvopZqJRFLMYpPAjEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=V4xhc5SdYsl+r28lbl6wyMQ2F0Iz0Ig+tFW8X+SdptZd4JWEP7qJ0i8m2DbrudRpK WZfuBOex9QKSKdTmlxDIPevL0bsjGb3kXL3xA+xduYh/8HcUVwz/BicmhXb8ihWLH9 fJUmePyBll8d5WE20ibAHT67lcJd5H3u7HV9yxCo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726772AbgFGP4p (ORCPT ); Sun, 7 Jun 2020 11:56:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:57558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726703AbgFGP4o (ORCPT ); Sun, 7 Jun 2020 11:56:44 -0400 Received: from localhost.localdomain (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F654207ED; Sun, 7 Jun 2020 15:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591545404; bh=Xm+MlJ2SnfPeDcxMvvfWqhIChWvopZqJRFLMYpPAjEQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oxaKLJcS8ZkQaprZEkqBd24TEHelY3uHG3tKZHnqvygj6TmdUlfX34JSybP28gciu HBDOfLg6U4IKdvVwwKhOHfBwLTjPpXO8TgnrPbE2oT11CAu+wujzKxj1evy77daXb0 Dy7kXMrpIdyFwlxbHJiTt+n3jWxwNHg7wFMMmIX4= From: Jonathan Cameron To: linux-iio@vger.kernel.org Cc: Andy Shevchenko , Jonathan Cameron , Lars-Peter Clausen , Peter Meerwald Subject: [PATCH 22/32] iio:pressure:mpl3115 Force alignment of buffer Date: Sun, 7 Jun 2020 16:53:58 +0100 Message-Id: <20200607155408.958437-23-jic23@kernel.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200607155408.958437-1-jic23@kernel.org> References: <20200607155408.958437-1-jic23@kernel.org> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Jonathan Cameron Whilst this is another case of the issue Lars reported with an array of elements of smaller than 8 bytes being passed to iio_push_to_buffers_with_timestamp, the solution here is a bit different from the other cases and relies on __aligned working on the stack (true since 4.6?) This one is unusual. We have to do an explicit memset each time as we are reading 3 bytes into a potential 4 byte channel which may sometimes be a 2 byte channel depending on what is enabled. As such, moving the buffer to the heap in the iio_priv structure doesn't save us much. We can't use a nice explicit structure on the stack either as the data channels have different storage sizes and are all separately controlled. Fixes: cc26ad455f57 ("iio: Add Freescale MPL3115A2 pressure / temperature sensor driver") Reported-by: Lars-Peter Clausen Cc: Peter Meerwald Signed-off-by: Jonathan Cameron --- drivers/iio/pressure/mpl3115.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index ccdb0b70e48c..8a481dbe808c 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -144,7 +144,8 @@ static irqreturn_t mpl3115_trigger_handler(int irq, void *p) struct iio_poll_func *pf = p; struct iio_dev *indio_dev = pf->indio_dev; struct mpl3115_data *data = iio_priv(indio_dev); - u8 buffer[16]; /* 32-bit channel + 16-bit channel + padding + ts */ + /* 32-bit channel + 16-bit channel + padding + ts */ + u8 buffer[16] __aligned(8); int ret, pos = 0; mutex_lock(&data->lock);