From patchwork Wed May 12 14:43:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 435627 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp5097349jao; Wed, 12 May 2021 11:58:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwm6ZmPk/mJIUWOoHJElSGtQdJFravOS8c58qTZb0BsSc5OiXe+d11LDYt6fIBoId3ASDcE X-Received: by 2002:a92:cda5:: with SMTP id g5mr134256ild.245.1620845890144; Wed, 12 May 2021 11:58:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620845890; cv=none; d=google.com; s=arc-20160816; b=ICB+E4JyWhnqDhZ5HGLUPgGjiWOb59VE85rL3Sf8254ycUOou/2MhYpXXAwE99K13Z 8KkULt62OdM9ZHjvwHJK614mZURawmiX60g7F8TEQq/GXYe46h6pAplMS4k4rAdhyCqx JXsIHbBVKCHJEE+taSg3idrG8YsZ970CvPQ3BVJx2JUa2M4MoIE9E9MW7jxrwV0C88rG iPBpz13p4DotvCjgOBO1kqGiZD+dUOVImVQB4vU/3a2wbzMHYfVqVTuktYAXmRh25Axp 4BblpDzzr5JGNyDupUuniNfrmdDORzETMSBqeUYHekgUxGr7enqOWMO/QY/7n1RK4cnl aaWw== 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=bmrnGlSaWWU4d+4E79BAs3qL/UAOxnaaYZOkddOWRRM=; b=cZTzkOA+yzOVXfPh90t43vT/5UiA6mlmpP2Hqz/+YYbE0bH+Tr67zOZV0RLD3XX+84 8dUkCH8xj2/0U/y6Y4Q55JNib85b4vINA4K3NaO5kHf213KjkjOs1HJoZ5QxzlYhhq6g 37YWEBCtBX+0E8sm6IPI2dZj1iTr1Eyx/q12z0/MVOavxH+7vEMo0rBlCOILHHLB3LHx FlcvSQylUnblOisWloFjLTsJ4c50UZjUrDbNjAtn/GFqoco1ZO0FH6TRjwFbWvzIh/ME pn5edIkvIRG5nadYSdKrBLFk5BLqyZFNMoDjSecLZOYmAxVRS+hnDbR5jZoZpcsirzrf n+2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aK3Xdwc4; 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 q8si330223ior.12.2021.05.12.11.58.09; Wed, 12 May 2021 11:58:10 -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=aK3Xdwc4; 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 S237686AbhELQia (ORCPT + 12 others); Wed, 12 May 2021 12:38:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:44850 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237307AbhELQaB (ORCPT ); Wed, 12 May 2021 12:30:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 28EED61944; Wed, 12 May 2021 15:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620835027; bh=i19GJPR1r/pomSvSMkYmq8LQivdwyNlomxYwxE0NMOs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aK3Xdwc4g/JLh/D5ExURphc2wQpEnYNjYA3g0hO8BwrNvOWvtsse79/AGRP0vHWZH HX3HB2/katdVmUeIvpPqetjTz3eoMCAADJ/wkIQS0BbGeoX4OG052N3FUaM2Dg9HHS 6UOjbAc3IwWX+FOvdRIUHxi0kTMLem2VhpfKjg10= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Pratyush Yadav , Mark Brown , Sasha Levin Subject: [PATCH 5.12 178/677] spi: rockchip: avoid objtool warning Date: Wed, 12 May 2021 16:43:44 +0200 Message-Id: <20210512144843.150082163@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512144837.204217980@linuxfoundation.org> References: <20210512144837.204217980@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit e50989527faeafb79f45a0f7529ba8e01dff1fff ] Building this file with clang leads to a an unreachable code path causing a warning from objtool: drivers/spi/spi-rockchip.o: warning: objtool: rockchip_spi_transfer_one()+0x2e0: sibling call from callable instruction with modified stack frame Change the unreachable() into an error return that can be handled if it ever happens, rather than silently crashing the kernel. Fixes: 65498c6ae241 ("spi: rockchip: support 4bit words") Signed-off-by: Arnd Bergmann Acked-by: Pratyush Yadav Link: https://lore.kernel.org/r/20210226140109.3477093-1-arnd@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-rockchip.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) -- 2.30.2 diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 936ef54e0903..0d75080da648 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -476,7 +476,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs, return 1; } -static void rockchip_spi_config(struct rockchip_spi *rs, +static int rockchip_spi_config(struct rockchip_spi *rs, struct spi_device *spi, struct spi_transfer *xfer, bool use_dma, bool slave_mode) { @@ -521,7 +521,9 @@ static void rockchip_spi_config(struct rockchip_spi *rs, * ctlr->bits_per_word_mask, so this shouldn't * happen */ - unreachable(); + dev_err(rs->dev, "unknown bits per word: %d\n", + xfer->bits_per_word); + return -EINVAL; } if (use_dma) { @@ -554,6 +556,8 @@ static void rockchip_spi_config(struct rockchip_spi *rs, */ writel_relaxed(2 * DIV_ROUND_UP(rs->freq, 2 * xfer->speed_hz), rs->regs + ROCKCHIP_SPI_BAUDR); + + return 0; } static size_t rockchip_spi_max_transfer_size(struct spi_device *spi) @@ -577,6 +581,7 @@ static int rockchip_spi_transfer_one( struct spi_transfer *xfer) { struct rockchip_spi *rs = spi_controller_get_devdata(ctlr); + int ret; bool use_dma; WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && @@ -596,7 +601,9 @@ static int rockchip_spi_transfer_one( use_dma = ctlr->can_dma ? ctlr->can_dma(ctlr, spi, xfer) : false; - rockchip_spi_config(rs, spi, xfer, use_dma, ctlr->slave); + ret = rockchip_spi_config(rs, spi, xfer, use_dma, ctlr->slave); + if (ret) + return ret; if (use_dma) return rockchip_spi_prepare_dma(rs, ctlr, xfer);