From patchwork Mon Nov 25 12:32:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1200372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CPCHripa"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47M5yh0TsHz9sPf for ; Mon, 25 Nov 2019 23:32:28 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727617AbfKYMc0 (ORCPT ); Mon, 25 Nov 2019 07:32:26 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:39801 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727568AbfKYMc0 (ORCPT ); Mon, 25 Nov 2019 07:32:26 -0500 Received: by mail-wm1-f66.google.com with SMTP id t26so15759915wmi.4; Mon, 25 Nov 2019 04:32:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0/oaAKLiGa4/IhwzkurA0aDtjDQ0oFXesoS/Wwe9dmU=; b=CPCHripaJVxNHral/TWl+v+wVGmwC5ZwyR3Tlkob6MY9B7l54845CCqH/H8aSdypN+ BvR8cvpzlElbmXYIoMUf4dwfnEsa4RwvSvWI5QgYaPaCaSncFRMHZaTMUS3Sim0FLJ6P nd7YVCecpa6XP8g6gSRhH3q2pUQJP3sqMRnjBFx7DCrlLHXyGvXiS6S32+T+3Ata8CrQ +ULG1cmKHpnLfk3srbcx4cbkg2sJv/66TJP6LSSMBsSayFaDhw/nOI4F0HxqFo0G9VOn vXNWBWEsP37V+gdytoolhqLKB4oTfGDhirgWEUsH5TabmbU87jEaZELE8c8T+DhdLSda 3VPQ== 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:mime-version:content-transfer-encoding; bh=0/oaAKLiGa4/IhwzkurA0aDtjDQ0oFXesoS/Wwe9dmU=; b=YjYF3EumwK05skYavxTXTnLlx1NcwVQ+DzlxxDkTErGstbBf+6Imn9pQy9YgL8+PHM 1iIXV4T+eel76HkIQpmBbkvwrwI9mv8lnpAyOvNbEKBeM9VHSivN9u4bSKiNrJgBuZb9 xKaKxxSQiqQHioOHSinXpa1fdcquGbh10RjxYqfDJtmYrEIdaaYGtP8RfoJy4EdBilPG 4AwhlaRnZN8eoXd0KtIN9ZfAB5RZWEBKre/HfMmfqgny+bvohHkPi30cv9gKc8RWCrBi LfcrFCltmD68UaN5/kHfaFeAcu4GlA3MhDa5BCzg5ZCRjIXQVznC1nuyb6eLnQ4hwe6a 5CTA== X-Gm-Message-State: APjAAAWQ0kuDVs2jnB3No2jIPrJUsLfbMXo9qui/xJGdKl/g6LfS0Gl/ ciNMs2dCTZCPjS99akT3ASheTV6SWcU= X-Google-Smtp-Source: APXvYqwvdiKPUcRJUbV3tmawWig/VSQYQmkSpUd4rJTwChx0TZS/SRbHg4p1uD5KJhmkS+0z6l0uwA== X-Received: by 2002:a7b:ce11:: with SMTP id m17mr26509411wmc.123.1574685142579; Mon, 25 Nov 2019 04:32:22 -0800 (PST) Received: from localhost (pD9E518ED.dip0.t-ipconnect.de. [217.229.24.237]) by smtp.gmail.com with ESMTPSA id c15sm10255382wrx.78.2019.11.25.04.32.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Nov 2019 04:32:21 -0800 (PST) From: Thierry Reding To: Mathias Nyman , Greg Kroah-Hartman Cc: Jon Hunter , JC Kuo , Nagarjuna Kristam , Sowjanya Komatineni , linux-usb@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 05/10] usb: host: xhci-tegra: Extract firmware enable helper Date: Mon, 25 Nov 2019 13:32:05 +0100 Message-Id: <20191125123210.1564323-6-thierry.reding@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191125123210.1564323-1-thierry.reding@gmail.com> References: <20191125123210.1564323-1-thierry.reding@gmail.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org From: Thierry Reding Extract a helper that enables message generation from the firmware. This removes clutter from tegra_xusb_probe() and will also come in useful for subsequent patches that introduce suspend/resume support. Based on work by JC Kuo . Signed-off-by: Thierry Reding --- drivers/usb/host/xhci-tegra.c | 41 +++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c index 85642806fa2a..4244367d3573 100644 --- a/drivers/usb/host/xhci-tegra.c +++ b/drivers/usb/host/xhci-tegra.c @@ -997,11 +997,37 @@ static int tegra_xusb_powerdomain_init(struct device *dev, return 0; } -static int tegra_xusb_probe(struct platform_device *pdev) +static int __tegra_xusb_enable_firmware_messages(struct tegra_xusb *tegra) { struct tegra_xusb_mbox_msg msg; - struct resource *regs; + int err; + + /* Enable firmware messages from controller. */ + msg.cmd = MBOX_CMD_MSG_ENABLED; + msg.data = 0; + + err = tegra_xusb_mbox_send(tegra, &msg); + if (err < 0) + dev_err(tegra->dev, "failed to enable messages: %d\n", err); + + return err; +} + +static int tegra_xusb_enable_firmware_messages(struct tegra_xusb *tegra) +{ + int err; + + mutex_lock(&tegra->lock); + err = __tegra_xusb_enable_firmware_messages(tegra); + mutex_unlock(&tegra->lock); + + return err; +} + +static int tegra_xusb_probe(struct platform_device *pdev) +{ struct tegra_xusb *tegra; + struct resource *regs; struct xhci_hcd *xhci; unsigned int i, j, k; struct phy *phy; @@ -1281,21 +1307,12 @@ static int tegra_xusb_probe(struct platform_device *pdev) goto put_usb3; } - mutex_lock(&tegra->lock); - - /* Enable firmware messages from controller. */ - msg.cmd = MBOX_CMD_MSG_ENABLED; - msg.data = 0; - - err = tegra_xusb_mbox_send(tegra, &msg); + err = tegra_xusb_enable_firmware_messages(tegra); if (err < 0) { dev_err(&pdev->dev, "failed to enable messages: %d\n", err); - mutex_unlock(&tegra->lock); goto remove_usb3; } - mutex_unlock(&tegra->lock); - err = devm_request_threaded_irq(&pdev->dev, tegra->mbox_irq, tegra_xusb_mbox_irq, tegra_xusb_mbox_thread, 0,