xhci: tegra: Parameterize mailbox register addresses

Tegra194 XUSB host controller has rearranged mailbox registers. This
commit makes mailbox registers address a part of "soc" data so that
xhci-tegra driver can be used for Tegra194.

Signed-off-by: JC Kuo <jckuo@nvidia.com>
Link: https://lore.kernel.org/r/20191004162906.4818-2-jckuo@nvidia.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c
index 111a16376087060110bae9f7e9bb529326858b66..9e78d8120a8c0f6ab833e577470a2cf94f8aa93d 100644 (file)
--- a/drivers/usb/host/xhci-tegra.c
+++ b/drivers/usb/host/xhci-tegra.c
@@ -42,19 +42,18 @@
 #define XUSB_CFG_CSB_BASE_ADDR                 0x800
 
 /* FPCI mailbox registers */
-#define XUSB_CFG_ARU_MBOX_CMD                  0x0e4
+/* XUSB_CFG_ARU_MBOX_CMD */
 #define  MBOX_DEST_FALC                                BIT(27)
 #define  MBOX_DEST_PME                         BIT(28)
 #define  MBOX_DEST_SMI                         BIT(29)
 #define  MBOX_DEST_XHCI                                BIT(30)
 #define  MBOX_INT_EN                           BIT(31)
-#define XUSB_CFG_ARU_MBOX_DATA_IN              0x0e8
+/* XUSB_CFG_ARU_MBOX_DATA_IN and XUSB_CFG_ARU_MBOX_DATA_OUT */
 #define  CMD_DATA_SHIFT                                0
 #define  CMD_DATA_MASK                         0xffffff
 #define  CMD_TYPE_SHIFT                                24
 #define  CMD_TYPE_MASK                         0xff
-#define XUSB_CFG_ARU_MBOX_DATA_OUT             0x0ec
-#define XUSB_CFG_ARU_MBOX_OWNER                        0x0f0
+/* XUSB_CFG_ARU_MBOX_OWNER */
 #define  MBOX_OWNER_NONE                       0
 #define  MBOX_OWNER_FW                         1
 #define  MBOX_OWNER_SW                         2
@@ -146,6 +145,13 @@ struct tegra_xusb_phy_type {
        unsigned int num;
 };
 
+struct tega_xusb_mbox_regs {
+       u16 cmd;
+       u16 data_in;
+       u16 data_out;
+       u16 owner;
+};
+
 struct tegra_xusb_soc {
        const char *firmware;
        const char * const *supply_names;
@@ -160,6 +166,8 @@ struct tegra_xusb_soc {
                } usb2, ulpi, hsic, usb3;
        } ports;
 
+       struct tega_xusb_mbox_regs mbox;
+
        bool scale_ss_clock;
        bool has_ipfs;
 };
@@ -395,15 +403,15 @@ static int tegra_xusb_mbox_send(struct tegra_xusb *tegra,
         * ACK/NAK messages.
         */
        if (!(msg->cmd == MBOX_CMD_ACK || msg->cmd == MBOX_CMD_NAK)) {
-               value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+               value = fpci_readl(tegra, tegra->soc->mbox.owner);
                if (value != MBOX_OWNER_NONE) {
                        dev_err(tegra->dev, "mailbox is busy\n");
                        return -EBUSY;
                }
 
-               fpci_writel(tegra, MBOX_OWNER_SW, XUSB_CFG_ARU_MBOX_OWNER);
+               fpci_writel(tegra, MBOX_OWNER_SW, tegra->soc->mbox.owner);
 
-               value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+               value = fpci_readl(tegra, tegra->soc->mbox.owner);
                if (value != MBOX_OWNER_SW) {
                        dev_err(tegra->dev, "failed to acquire mailbox\n");
                        return -EBUSY;
@@ -413,17 +421,17 @@ static int tegra_xusb_mbox_send(struct tegra_xusb *tegra,
        }
 
        value = tegra_xusb_mbox_pack(msg);
-       fpci_writel(tegra, value, XUSB_CFG_ARU_MBOX_DATA_IN);
+       fpci_writel(tegra, value, tegra->soc->mbox.data_in);
 
-       value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_CMD);
+       value = fpci_readl(tegra, tegra->soc->mbox.cmd);
        value |= MBOX_INT_EN | MBOX_DEST_FALC;
-       fpci_writel(tegra, value, XUSB_CFG_ARU_MBOX_CMD);
+       fpci_writel(tegra, value, tegra->soc->mbox.cmd);
 
        if (wait_for_idle) {
                unsigned long timeout = jiffies + msecs_to_jiffies(250);
 
                while (time_before(jiffies, timeout)) {
-                       value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+                       value = fpci_readl(tegra, tegra->soc->mbox.owner);
                        if (value == MBOX_OWNER_NONE)
                                break;
 
@@ -431,7 +439,7 @@ static int tegra_xusb_mbox_send(struct tegra_xusb *tegra,
                }
 
                if (time_after(jiffies, timeout))
-                       value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_OWNER);
+                       value = fpci_readl(tegra, tegra->soc->mbox.owner);
 
                if (value != MBOX_OWNER_NONE)
                        return -ETIMEDOUT;
@@ -598,16 +606,16 @@ static irqreturn_t tegra_xusb_mbox_thread(int irq, void *data)
 
        mutex_lock(&tegra->lock);
 
-       value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_DATA_OUT);
+       value = fpci_readl(tegra, tegra->soc->mbox.data_out);
        tegra_xusb_mbox_unpack(&msg, value);
 
-       value = fpci_readl(tegra, XUSB_CFG_ARU_MBOX_CMD);
+       value = fpci_readl(tegra, tegra->soc->mbox.cmd);
        value &= ~MBOX_DEST_SMI;
-       fpci_writel(tegra, value, XUSB_CFG_ARU_MBOX_CMD);
+       fpci_writel(tegra, value, tegra->soc->mbox.cmd);
 
        /* clear mailbox owner if no ACK/NAK is required */
        if (!tegra_xusb_mbox_cmd_requires_ack(msg.cmd))
-               fpci_writel(tegra, MBOX_OWNER_NONE, XUSB_CFG_ARU_MBOX_OWNER);
+               fpci_writel(tegra, MBOX_OWNER_NONE, tegra->soc->mbox.owner);
 
        tegra_xusb_mbox_handle(tegra, &msg);
 
@@ -1374,6 +1382,12 @@ static const struct tegra_xusb_soc tegra124_soc = {
        },
        .scale_ss_clock = true,
        .has_ipfs = true,
+       .mbox = {
+               .cmd = 0xe4,
+               .data_in = 0xe8,
+               .data_out = 0xec,
+               .owner = 0xf0,
+       },
 };
 MODULE_FIRMWARE("nvidia/tegra124/xusb.bin");
 
@@ -1406,6 +1420,12 @@ static const struct tegra_xusb_soc tegra210_soc = {
        },
        .scale_ss_clock = false,
        .has_ipfs = true,
+       .mbox = {
+               .cmd = 0xe4,
+               .data_in = 0xe8,
+               .data_out = 0xec,
+               .owner = 0xf0,
+       },
 };
 MODULE_FIRMWARE("nvidia/tegra210/xusb.bin");
 
@@ -1431,6 +1451,12 @@ static const struct tegra_xusb_soc tegra186_soc = {
        },
        .scale_ss_clock = false,
        .has_ipfs = false,
+       .mbox = {
+               .cmd = 0xe4,
+               .data_in = 0xe8,
+               .data_out = 0xec,
+               .owner = 0xf0,
+       },
 };
 
 static const struct of_device_id tegra_xusb_of_match[] = {