From patchwork Mon Jun 24 06:11:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 167546 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3793105ilk; Sun, 23 Jun 2019 23:15:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqzeWEyRnCj64oXj/HnKYrZ83+Anh5byufUYMUyJ8gsOexS9t7NbJQNJCBRJzuOsDD/uR80O X-Received: by 2002:a17:90a:9281:: with SMTP id n1mr22087118pjo.25.1561356907090; Sun, 23 Jun 2019 23:15:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561356907; cv=none; d=google.com; s=arc-20160816; b=Uivhpbchj+bV5P5TcRjeQb/tKyp4IGPB+bYywIAtanQ1cee/uuy1nactyMz++dTJRK oe+NBifzQMB/Ii3i1aUaKbUaCLb3mWvSqybCR83wj9sNDHVYTNPPDozgzlrWn+9JJ/Ba juHPod04KPQAyxj2IA57zpeNy7pjtL36xtNg1C3umuUxZnffxSNw2izRYaXPjWLTuU72 v0ctQbZ69dcf+ZQRpbsCyehzDssGsupFRXvVyljl/QiNwo7bhN+Q/mNedfRoEAma9j0a A0FLiTgemFq7OvXVerGw+/YbXi8U+UPWzD+8+cSrE9A5hs/OiJUr/K9r4+0sPjDNY3cF ajcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=CUz8qGwgw/CS3M5LYVH6NdPxqDfRWqMCMUadV/qqZQ4=; b=Ck3AG7qSsXQldg/X4LyghE/KAXOuUtCrV623N5mUKKY4HdXgenEvPwaZm51BfPYXKw S0DhTO6Wu099l93rxiMp0sgJpvW5oVo/WYpd7vim32xmBlzLP4vN9pdHK/wAQFjKQpR+ TF4WW51I7jAlhjhRqzTR1/6ar4zW8uadeIml0LHpROo8gVAf03vYHRP55TqeC80//ZJF zTharOGiJESiNQiThmnCDuQ8FHz/VlXa4zV4Xw0b70fqKK6kOpURX7e0ervv52sZXwFC ibldgxiV8EIdP6hRcPBGe3dBW7oHZg1NsaVUbia1toC+4N4txAuPqV/UVSyRXgHqCc7O rSbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HFFCf1kN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r19si9267361pgl.203.2019.06.23.23.15.06; Sun, 23 Jun 2019 23:15:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HFFCf1kN; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727298AbfFXGPF (ORCPT + 30 others); Mon, 24 Jun 2019 02:15:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:53380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726472AbfFXGPE (ORCPT ); Mon, 24 Jun 2019 02:15:04 -0400 Received: from localhost.localdomain (unknown [106.201.35.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE919208CA; Mon, 24 Jun 2019 06:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561356902; bh=Fc55Mk7XY9afsOXiviXNDLXtTMvqPKTzrjGeNX7V93Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFFCf1kNLq0saxpnl8hGHJWdez9VZgfGfizrqUtIQiGjTvimQOUNE1fITzmzZhDar SQBIIrOWH3TLDfe04rzPMnRXoH1Agyo4CpZHKZK7uQyRA76mS+xlJO7TIxc5wWuVuh Qm8TC2sOD+wprhHRLm+oetB/6y0PC0p6fG6swDU4= From: Vinod Koul To: Mathias Nyman , Greg Kroah-Hartman Cc: linux-arm-msm@vger.kernel.org, Bjorn Andersson , Vinod Koul , Yoshihiro Shimoda , Christian Lamparter , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Lamparter Subject: [PATCH v3 2/4] usb: xhci: Use register defined and field names Date: Mon, 24 Jun 2019 11:41:24 +0530 Message-Id: <20190624061126.11938-3-vkoul@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190624061126.11938-1-vkoul@kernel.org> References: <20190624061126.11938-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of using register values and fields lets define them and use in the driver. Tested-by: Christian Lamparter Signed-off-by: Vinod Koul Cc: Yoshihiro Shimoda Cc: Christian Lamparter --- drivers/usb/host/xhci-pci.c | 60 ++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 17 deletions(-) -- 2.20.1 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 89ca46dd6825..3374a85574c2 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -57,6 +57,27 @@ #define PCI_DEVICE_ID_AMD_PROMONTORYA_1 0x43bc #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 +#define RENESAS_FW_VERSION 0x6C +#define RENESAS_ROM_CONFIG 0xF0 +#define RENESAS_FW_STATUS 0xF4 +#define RENESAS_FW_STATUS_MSB 0xF5 +#define RENESAS_ROM_STATUS 0xF6 +#define RENESAS_ROM_STATUS_MSB 0xF7 +#define RENESAS_DATA0 0xF8 +#define RENESAS_DATA1 0xFC + +#define RENESAS_FW_VERSION_FIELD GENMASK(23, 7) +#define RENESAS_FW_VERSION_OFFSET 8 + +#define RENESAS_FW_STATUS_DOWNLOAD_ENABLE BIT(0) +#define RENESAS_FW_STATUS_LOCK BIT(1) +#define RENESAS_FW_STATUS_RESULT GENMASK(6, 4) + #define RENESAS_FW_STATUS_INVALID 0 + #define RENESAS_FW_STATUS_SUCCESS BIT(4) + #define RENESAS_FW_STATUS_ERROR BIT(5) +#define RENESAS_FW_STATUS_SET_DATA0 BIT(8) +#define RENESAS_FW_STATUS_SET_DATA1 BIT(9) + #define RENESAS_RETRY 1000 #define RENESAS_DELAY 10 @@ -347,7 +368,8 @@ static int renesas_fw_download_image(struct pci_dev *dev, /* step+1. Read "Set DATAX" and confirm it is cleared. */ for (i = 0; i < RENESAS_RETRY; i++) { - err = pci_read_config_byte(dev, 0xF5, &fw_status); + err = pci_read_config_byte(dev, RENESAS_FW_STATUS_MSB, + &fw_status); if (err) return pcibios_err_to_errno(err); if (!(fw_status & BIT(data0_or_data1))) @@ -362,7 +384,8 @@ static int renesas_fw_download_image(struct pci_dev *dev, * step+2. Write FW data to "DATAX". * "LSB is left" => force little endian */ - err = pci_write_config_dword(dev, data0_or_data1 ? 0xFC : 0xF8, + err = pci_write_config_dword(dev, data0_or_data1 ? + RENESAS_DATA1 : RENESAS_DATA0, (__force u32)cpu_to_le32(fw[step])); if (err) return pcibios_err_to_errno(err); @@ -370,7 +393,8 @@ static int renesas_fw_download_image(struct pci_dev *dev, udelay(100); /* step+3. Set "Set DATAX". */ - err = pci_write_config_byte(dev, 0xF5, BIT(data0_or_data1)); + err = pci_write_config_byte(dev, RENESAS_FW_STATUS_MSB, + BIT(data0_or_data1)); if (err) return pcibios_err_to_errno(err); @@ -440,7 +464,7 @@ static int renesas_fw_check_running(struct pci_dev *pdev) * BIOSes will initialize the device for us. If the device is * initialized. */ - err = pci_read_config_byte(pdev, 0xF4, &fw_state); + err = pci_read_config_byte(pdev, RENESAS_FW_STATUS, &fw_state); if (err) return pcibios_err_to_errno(err); @@ -449,10 +473,10 @@ static int renesas_fw_check_running(struct pci_dev *pdev) * ready we can simply continue. If the FW is not ready, we have * to give up. */ - if (fw_state & BIT(1)) { + if (fw_state & RENESAS_FW_STATUS_LOCK) { dev_dbg(&pdev->dev, "FW Download Lock is engaged."); - if (fw_state & BIT(4)) + if (fw_state & RENESAS_FW_STATUS_SUCCESS) return 0; dev_err(&pdev->dev, @@ -465,33 +489,33 @@ static int renesas_fw_check_running(struct pci_dev *pdev) * with it and it can't be resetted, we have to give up too... and * ask for a forgiveness and a reboot. */ - if (fw_state & BIT(0)) { + if (fw_state & RENESAS_FW_STATUS_DOWNLOAD_ENABLE) { dev_err(&pdev->dev, "FW Download Enable is stale. Giving Up (poweroff/reboot needed)."); return -EIO; } /* Otherwise, Check the "Result Code" Bits (6:4) and act accordingly */ - switch ((fw_state & 0x70)) { + switch (fw_state & RENESAS_FW_STATUS_RESULT) { case 0: /* No result yet */ dev_dbg(&pdev->dev, "FW is not ready/loaded yet."); /* tell the caller, that this device needs the firmware. */ return 1; - case BIT(4): /* Success, device should be working. */ + case RENESAS_FW_STATUS_SUCCESS: /* Success, device should be working. */ dev_dbg(&pdev->dev, "FW is ready."); return 0; - case BIT(5): /* Error State */ + case RENESAS_FW_STATUS_ERROR: /* Error State */ dev_err(&pdev->dev, "hardware is in an error state. Giving up (poweroff/reboot needed)."); return -ENODEV; default: /* All other states are marked as "Reserved states" */ dev_err(&pdev->dev, - "hardware is in an invalid state %x. Giving up (poweroff/reboot needed).", - (fw_state & 0x70) >> 4); + "hardware is in an invalid state %lx. Giving up (poweroff/reboot needed).", + (fw_state & RENESAS_FW_STATUS_RESULT) >> 4); return -EINVAL; } } @@ -514,7 +538,8 @@ static int renesas_fw_download(struct pci_dev *pdev, * 0. Set "FW Download Enable" bit in the * "FW Download Control & Status Register" at 0xF4 */ - err = pci_write_config_byte(pdev, 0xF4, BIT(0)); + err = pci_write_config_byte(pdev, RENESAS_FW_STATUS, + RENESAS_FW_STATUS_DOWNLOAD_ENABLE); if (err) return pcibios_err_to_errno(err); @@ -535,7 +560,8 @@ static int renesas_fw_download(struct pci_dev *pdev, * is cleared by the hardware beforehand. */ for (i = 0; i < RENESAS_RETRY; i++) { - err = pci_read_config_byte(pdev, 0xF5, &fw_status); + err = pci_read_config_byte(pdev, RENESAS_FW_STATUS_MSB, + &fw_status); if (err) return pcibios_err_to_errno(err); if (!(fw_status & (BIT(0) | BIT(1)))) @@ -550,16 +576,16 @@ static int renesas_fw_download(struct pci_dev *pdev, * 11. After finishing writing the last data of FW, the * System Software must clear "FW Download Enable" */ - err = pci_write_config_byte(pdev, 0xF4, 0); + err = pci_write_config_byte(pdev, RENESAS_FW_STATUS, 0); if (err) return pcibios_err_to_errno(err); /* 12. Read "Result Code" and confirm it is good. */ for (i = 0; i < RENESAS_RETRY; i++) { - err = pci_read_config_byte(pdev, 0xF4, &fw_status); + err = pci_read_config_byte(pdev, RENESAS_FW_STATUS, &fw_status); if (err) return pcibios_err_to_errno(err); - if (fw_status & BIT(4)) + if (fw_status & RENESAS_FW_STATUS_SUCCESS) break; udelay(RENESAS_DELAY);