From patchwork Fri Nov 13 14:59:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic Poulain X-Patchwork-Id: 324328 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp1262414ils; Fri, 13 Nov 2020 06:53:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyJHYs8aNMePuZvcG7CsyaCclmfvfk2zSGilkHZie1nULU0XCEwYFQ6twPkKz5Cyc2FN61D X-Received: by 2002:a05:6402:1585:: with SMTP id c5mr2741065edv.372.1605279238537; Fri, 13 Nov 2020 06:53:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605279238; cv=none; d=google.com; s=arc-20160816; b=khS8foyIEZefUDHM/TlKpAHEGg+EFrcRew0TENaIyX5l1S5OTvYp8/tOUoe2Qhi+vT M2/yi/IowFgqGozXBIkIrIBV9zO8Cr5d6dDZKpWv0jXVQXodPG4K1LSgnm5yTCIAbTFv VYDC1dEjJjFqW0Y15aaF0MCT+OzjsDAHoTuCNIyCc+Fuff6k5TJP00EEiSutkz2O0O6q 1B+mEL77WHfPQR9Nbe2l+3DkpsaFQGcxnSfqgNQpwH4wwTB0RQeusUqmhSov8myLIq3b SxOHPjdaNem1tCj0CCy25aTSm7P7tD2XcMjNRFAZ1Jb+KiJChOOxh24nxyYp/zDk8L/H 1SPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=dQci3mBBoR0tqqcwGOSS/7KOqdTfROUDHNeFyEKodBo=; b=rswi0FXHrxNKVaibW5I5wADzy1PMXpb9GouixKlgc4wofpzUI7nnZjXEl+J8pPc7OT 9M0fKH5AAZrrhHdietgfz7ofjF3G6vH2E1T/r6gtwO5AkR5Fzi6rZAbEuYqLsSW2J0kT vkQYMpHjVP8lg5NmCwR5ML/0HGPBeVGtrs2GGRjGxsRxtyUn9Hy0fASWiZHpxfSQ6QVh /wn0Ah00X28mYu1w/E2Ch0NGib0Z5CrTMYJ+UPmuqcYDrlD0qm9zlDJS2FMbL7Sl/vay isUwFJjxnTM0kor8zt+Ye232iG15HNVJms7J57qOacnpIEaNICAEiZU8i0UJO91m6AOz wD6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzBMYQG7; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y7si5841525ejd.450.2020.11.13.06.53.58; Fri, 13 Nov 2020 06:53:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-msm-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=@linaro.org header.s=google header.b=EzBMYQG7; spf=pass (google.com: domain of linux-arm-msm-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726825AbgKMOxf (ORCPT + 15 others); Fri, 13 Nov 2020 09:53:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726267AbgKMOxe (ORCPT ); Fri, 13 Nov 2020 09:53:34 -0500 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39E97C0613D1 for ; Fri, 13 Nov 2020 06:53:34 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id w24so8769123wmi.0 for ; Fri, 13 Nov 2020 06:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dQci3mBBoR0tqqcwGOSS/7KOqdTfROUDHNeFyEKodBo=; b=EzBMYQG7dyp0ovsdy4c/1ImzpGG1M8kLZQfqSQAzXDuuxjv4jWB4Q9ebpsirmNIGR8 891kAvhEMmKFYU8YbMOwrE86nVpG2WJEGh3be5Ego8RHap0DMLboFpnwOX9FCV3lWL6Z OVmAxwOkQcqLeUgt8hLm34QkmSNPIqNuj3WkFjENCiAalsbzxrhc9QhxdhKVKGf4MsRr cmot87c9Fw2mSNTG3gixZhBJptUvoaCn7+Dk4CwU7Wp3b7QYZEbzujncURTG+NBiwIdi /3KZ9ftUyLpzD/vKdOARPsVJ2EYS4M6Y0mRnpkTnM3lxeNXMCVfx0ioCqkmPFIal/ix9 Wvrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dQci3mBBoR0tqqcwGOSS/7KOqdTfROUDHNeFyEKodBo=; b=Nb8y+CmYqdIr8cTM+Shp5bQP3fHvfd4k49kOIAE/6VgAYWw0YPBg0d8DNrPgzaaMSs NzCFSuQyzjbBmFQUsxePEKvlcj8Ecel1Bn7VJ7GAH+T+NTfF//+8Gj37dHvl5lzR9R9H A+Dwdi3b/0/DkWbKUT/0HiL9bPu6VNEzME010RcA6onu6LgXaxQRDYpdxxGe6PlcrAOG ZUH2013TpaVomA1KVzl4OgYBtvY5ZnmPnla9PF8gDeoF/C5iWqogp2H+Au3JedT6OGYH A3xr8B+MJYCHqdUpSWL+PUm/nOgqFUHPIv678fdCwItPvAKm01gbBwT/cnUzlSgh/MRM qhoA== X-Gm-Message-State: AOAM531dKqyT/vvoVRQDAt4DNC7O407UERD69ZMEJMHEPfEnM7KEVdYx 9otqy0cb6LqYrkcoARnYupkK6g== X-Received: by 2002:a1c:490b:: with SMTP id w11mr2924512wma.101.1605279212908; Fri, 13 Nov 2020 06:53:32 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:490:8730:304f:e9d4:6385:8ac5]) by smtp.gmail.com with ESMTPSA id i6sm10729341wma.42.2020.11.13.06.53.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Nov 2020 06:53:32 -0800 (PST) From: Loic Poulain To: manivannan.sadhasivam@linaro.org, hemantk@codeaurora.org Cc: linux-arm-msm@vger.kernel.org, Loic Poulain Subject: [PATCH 4/8] mhi: pci_generic: Add support for reset Date: Fri, 13 Nov 2020 15:59:58 +0100 Message-Id: <1605279602-18749-5-git-send-email-loic.poulain@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1605279602-18749-1-git-send-email-loic.poulain@linaro.org> References: <1605279602-18749-1-git-send-email-loic.poulain@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add support for resetting the device, reset can be triggered in case of error or manually via sysfs (/sys/bus/pci/devices/*/reset). Signed-off-by: Loic Poulain --- drivers/bus/mhi/pci_generic.c | 117 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 104 insertions(+), 13 deletions(-) -- 2.7.4 diff --git a/drivers/bus/mhi/pci_generic.c b/drivers/bus/mhi/pci_generic.c index 0c07cf5..b48c382 100644 --- a/drivers/bus/mhi/pci_generic.c +++ b/drivers/bus/mhi/pci_generic.c @@ -8,6 +8,7 @@ * Copyright (C) 2020 Linaro Ltd */ +#include #include #include #include @@ -179,6 +180,16 @@ static const struct pci_device_id mhi_pci_id_table[] = { }; MODULE_DEVICE_TABLE(pci, mhi_pci_id_table); +enum mhi_pci_device_status { + MHI_PCI_DEV_STARTED, +}; + +struct mhi_pci_device { + struct mhi_controller mhi_cntrl; + struct pci_saved_state *pci_state; + unsigned long status; +}; + static int mhi_pci_read_reg(struct mhi_controller *mhi_cntrl, void __iomem *addr, u32 *out) { @@ -203,6 +214,20 @@ static inline void mhi_pci_reset(struct mhi_controller *mhi_cntrl) writel(1, mhi_cntrl->regs + DEV_RESET_REG); } +static bool mhi_pci_is_alive(struct mhi_controller *mhi_cntrl) +{ + struct pci_dev *pdev = to_pci_dev(mhi_cntrl->cntrl_dev); + u16 vendor = 0; + + if (pci_read_config_word(pdev, PCI_VENDOR_ID, &vendor)) + return false; + + if (vendor == (u16) ~0 || vendor == 0) + return false; + + return true; +} + static int mhi_pci_claim(struct mhi_controller *mhi_cntrl, unsigned int bar_num, u64 dma_mask) { @@ -298,16 +323,18 @@ static int mhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { const struct mhi_pci_dev_info *info = (struct mhi_pci_dev_info *) id->driver_data; const struct mhi_controller_config *mhi_cntrl_config; + struct mhi_pci_device *mhi_pdev; struct mhi_controller *mhi_cntrl; int err; dev_dbg(&pdev->dev, "MHI PCI device found: %s\n", info->name); - mhi_cntrl = mhi_alloc_controller(); - if (!mhi_cntrl) + mhi_pdev = devm_kzalloc(&pdev->dev, sizeof(*mhi_pdev), GFP_KERNEL); + if (!mhi_pdev) return -ENOMEM; mhi_cntrl_config = info->config; + mhi_cntrl = &mhi_pdev->mhi_cntrl; mhi_cntrl->cntrl_dev = &pdev->dev; mhi_cntrl->iova_start = 0; mhi_cntrl->iova_stop = DMA_BIT_MASK(info->dma_data_width); @@ -322,17 +349,21 @@ static int mhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) err = mhi_pci_claim(mhi_cntrl, info->bar_num, DMA_BIT_MASK(info->dma_data_width)); if (err) - goto err_release; + return err; err = mhi_pci_get_irqs(mhi_cntrl, mhi_cntrl_config); if (err) - goto err_release; + return err; + + pci_set_drvdata(pdev, mhi_pdev); - pci_set_drvdata(pdev, mhi_cntrl); + /* Have stored pci confspace at hand for restore in sudden PCI error */ + pci_save_state(pdev); + mhi_pdev->pci_state = pci_store_saved_state(pdev); err = mhi_register_controller(mhi_cntrl, mhi_cntrl_config); if (err) - goto err_release; + return err; /* MHI bus does not power up the controller by default */ err = mhi_prepare_for_power_up(mhi_cntrl); @@ -347,37 +378,97 @@ static int mhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto err_unprepare; } + set_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status); + return 0; err_unprepare: mhi_unprepare_after_power_down(mhi_cntrl); err_unregister: mhi_unregister_controller(mhi_cntrl); -err_release: - mhi_free_controller(mhi_cntrl); return err; } static void mhi_pci_remove(struct pci_dev *pdev) { - struct mhi_controller *mhi_cntrl = pci_get_drvdata(pdev); + struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev); + struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl; + + if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) { + mhi_power_down(mhi_cntrl, true); + mhi_unprepare_after_power_down(mhi_cntrl); + } - mhi_power_down(mhi_cntrl, true); - mhi_unprepare_after_power_down(mhi_cntrl); mhi_unregister_controller(mhi_cntrl); /* MHI-layer reset could not be enough, always hard-reset the device */ mhi_pci_reset(mhi_cntrl); +} + +void mhi_pci_reset_prepare(struct pci_dev *pdev) +{ + struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev); + struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl; + + dev_info(&pdev->dev, "reset\n"); - mhi_free_controller(mhi_cntrl); + /* Clean up MHI state */ + if (test_and_clear_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status)) { + mhi_power_down(mhi_cntrl, false); + mhi_unprepare_after_power_down(mhi_cntrl); + } + + /* cause internal device reset */ + mhi_pci_reset(mhi_cntrl); + + /* Be sure device reset has been executed */ + msleep(500); } +void mhi_pci_reset_done(struct pci_dev *pdev) +{ + struct mhi_pci_device *mhi_pdev = pci_get_drvdata(pdev); + struct mhi_controller *mhi_cntrl = &mhi_pdev->mhi_cntrl; + int err; + + /* Restore initial known working PCI state */ + pci_load_saved_state(pdev, mhi_pdev->pci_state); + pci_restore_state(pdev); + + /* Is device status available ? */ + if (!mhi_pci_is_alive(mhi_cntrl)) { + dev_err(&pdev->dev, "reset failed\n"); + return; + } + + err = mhi_prepare_for_power_up(mhi_cntrl); + if (err) { + dev_err(&pdev->dev, "failed to prepare MHI controller\n"); + return; + } + + err = mhi_sync_power_up(mhi_cntrl); + if (err) { + dev_err(&pdev->dev, "failed to power up MHI controller\n"); + mhi_unprepare_after_power_down(mhi_cntrl); + return; + } + + set_bit(MHI_PCI_DEV_STARTED, &mhi_pdev->status); +} + +static const struct pci_error_handlers mhi_pci_err_handler = { + .reset_prepare = mhi_pci_reset_prepare, + .reset_done = mhi_pci_reset_done, +}; + static struct pci_driver mhi_pci_driver = { .name = "mhi-pci-generic", .id_table = mhi_pci_id_table, .probe = mhi_pci_probe, - .remove = mhi_pci_remove + .remove = mhi_pci_remove, + .err_handler = &mhi_pci_err_handler, }; module_pci_driver(mhi_pci_driver);