Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp439708pxb; Wed, 3 Mar 2021 07:06:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzFdKORlJ6FXNjdnLlBTXVpELMORaVduZ+gaBZnD//k75Etm+8ePPzkg7x6KjRHXWb7cG8h X-Received: by 2002:a17:906:828e:: with SMTP id h14mr26426472ejx.529.1614783970418; Wed, 03 Mar 2021 07:06:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614783970; cv=none; d=google.com; s=arc-20160816; b=tp1YX+qD2c0+NLBmGiL7oTaZWmQjRw90c3h0rfHQcLdzYIIv6UZP7iD8ZRwjA+D6lD ONpFmd9S92fOYj/BVlzuK9yghCmHhlUWX/hqynWI0GOgovEDUvTNeENvxfdBAy4v0Y/g AVt/tLZ7eP1TRQbFKHuI8p+s3Tl/JEEaGDYrFBWJ1QvQIMTPfjTVuM1/4+GwDgQlUqAa g2iRoUdfJR7qklKsgBiqyNDCYQI6mJ+r9wD6nRLlPSNAs+c8rZbypE/aRd/Up2rVWmde QQgtTFO9MIpRbQYxPRVX12ndxkmvySdm9yBMJqmJR+L5WFwCoSWfJB9aIS3pSOD0F6sX 1FIA== 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=LJmVVo3z8AuJlGrFSdnFqGZOTdqxzL0dsmiyUOODcMk=; b=ZURaELll1zeiFd3906HemYSPkQWtKsFVUXKTW4MjJv5awY7M6216/qXkYf0Teniwdc xMRlSGry6nJTA/GMSx6ANSgkMxxQjNVhkbS+GPtrNAs0va8guz9Azia6YM3nFz0upUc6 Wjpw57mkDoIeyKuLpj7+fxXogaNDwwVoy760E0yh2mboKm0giNULHtSf5yJDtpBGw18P UkIQxwPUx5PY60zHTS7yxblAy/cH6C5TmDr9hQfpdiJ3k5D9b5EGnTmGFQVitZ6F+Gph G4ez8/FWPbCakD/Fhf/9vD0YmdU33sOiUJoA1VM3JeY7cTT2t8B8vIbQUH2lrV/93Sxn 6oNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P9o39M84; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 i8si15824598ejj.286.2021.03.03.07.05.16; Wed, 03 Mar 2021 07:06:10 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=P9o39M84; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S245479AbhCAWfP (ORCPT + 99 others); Mon, 1 Mar 2021 17:35:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:60208 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238305AbhCARh4 (ORCPT ); Mon, 1 Mar 2021 12:37:56 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C8B7664F4F; Mon, 1 Mar 2021 16:55:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614617717; bh=67F6Z+EYQup/ZTmYK6f2TtgK6GC6OnOFQmdTxlXvVyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P9o39M84IY4HPR1aUXj7OUPZQHUXP5EMX/vV9KbE75s3unxJ8y+nOO8Ej1PzNoIg7 nCN3ufOhAhUgNqY/fZ9VA/0a+MFebVFgEAIt1l4gk6gnIhO2RbQHM1njTDyMrFKEkp 2RHvH2mdDjaUz8IpUWLaoNb0ZF77jKfJ2QbdejNo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Roja Rani Yarubandi , Akash Asthana , Wolfram Sang , Sasha Levin Subject: [PATCH 5.4 172/340] i2c: i2c-qcom-geni: Add shutdown callback for i2c Date: Mon, 1 Mar 2021 17:11:56 +0100 Message-Id: <20210301161056.768569798@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210301161048.294656001@linuxfoundation.org> References: <20210301161048.294656001@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Roja Rani Yarubandi [ Upstream commit e0371298ddc51761be257698554ea507ac8bf831 ] If the hardware is still accessing memory after SMMU translation is disabled (as part of smmu shutdown callback), then the IOVAs (I/O virtual address) which it was using will go on the bus as the physical addresses which will result in unknown crashes like NoC/interconnect errors. So, implement shutdown callback to i2c driver to stop on-going transfer and unmap DMA mappings during system "reboot" or "shutdown". Fixes: 37692de5d523 ("i2c: i2c-qcom-geni: Add bus driver for the Qualcomm GENI I2C controller") Signed-off-by: Roja Rani Yarubandi Reviewed-by: Akash Asthana Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/busses/i2c-qcom-geni.c | 34 ++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index b56a427fb928f..2262bf295286c 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -377,6 +377,32 @@ static void geni_i2c_tx_msg_cleanup(struct geni_i2c_dev *gi2c, } } +static void geni_i2c_stop_xfer(struct geni_i2c_dev *gi2c) +{ + int ret; + u32 geni_status; + struct i2c_msg *cur; + + /* Resume device, as runtime suspend can happen anytime during transfer */ + ret = pm_runtime_get_sync(gi2c->se.dev); + if (ret < 0) { + dev_err(gi2c->se.dev, "Failed to resume device: %d\n", ret); + return; + } + + geni_status = readl_relaxed(gi2c->se.base + SE_GENI_STATUS); + if (geni_status & M_GENI_CMD_ACTIVE) { + cur = gi2c->cur; + geni_i2c_abort_xfer(gi2c); + if (cur->flags & I2C_M_RD) + geni_i2c_rx_msg_cleanup(gi2c, cur); + else + geni_i2c_tx_msg_cleanup(gi2c, cur); + } + + pm_runtime_put_sync_suspend(gi2c->se.dev); +} + static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, u32 m_param) { @@ -641,6 +667,13 @@ static int geni_i2c_remove(struct platform_device *pdev) return 0; } +static void geni_i2c_shutdown(struct platform_device *pdev) +{ + struct geni_i2c_dev *gi2c = platform_get_drvdata(pdev); + + geni_i2c_stop_xfer(gi2c); +} + static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev) { int ret; @@ -701,6 +734,7 @@ MODULE_DEVICE_TABLE(of, geni_i2c_dt_match); static struct platform_driver geni_i2c_driver = { .probe = geni_i2c_probe, .remove = geni_i2c_remove, + .shutdown = geni_i2c_shutdown, .driver = { .name = "geni_i2c", .pm = &geni_i2c_pm_ops, -- 2.27.0