From patchwork Fri Mar 12 12:00:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 398599 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp1132940jai; Fri, 12 Mar 2021 04:01:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRzh1p7faPXsgSD5gla3u3jKDYcGTp/FBTwZ11by+81UVlnxjKuiKO3klLZ9k/sQyWUEBf X-Received: by 2002:a17:906:3b41:: with SMTP id h1mr7783150ejf.506.1615550480829; Fri, 12 Mar 2021 04:01:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615550480; cv=none; d=google.com; s=arc-20160816; b=KIky2qLL0AmSEVYGL2hHngSNtxQ216rscEpDApHzHP3vX2fC8VIY9XDCGO/j3zoOcc jpEu1We2Ia6SdaclS1n4l66+mcQtAuVsEYaAvlwjBmnDT2TWh/nhHHWN9sOZinHLajEk 12z+CqRmaW2liLMGq11YwdLLa0DTcBCf3d3XlK1DlifylthBSJPQsVQo9wYVzZL+8lwX NLEraRdSttBjlIDT4qMjxXTEXrdFqSYR3iontGX/eho+zsQfJruuwr7wUQKWgLnP01WK dBBHDH2XFw9N1hoEFc0hFUyX4nVPnf2zjlYSQsh7E9O16pL5HpBSBOZ9Vp4c+h6jxBN2 gF8w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=McMRGa+k2wYhi+9vmCrUwcgebhPfYzfC04NyJL/Hc1k=; b=gaoFS0et/7u2FKKtKfz8YunBicCkRoMQGH7zz8BcrqvwkHAB3tUSX19gCFxfxFytYM Wl0xIZWxoC9V/FBWYuH7AQUKFaBEJDOEq5K6MDaQ+pkFeSXorTjqHwd8R6SyRKlrZ4Hh r/fCCbrRd8C2Mn8W0/k9+b4T7Yuu7Q8gQIeUaR7QAPVYBEtWogApYdZtsJDjoxeXO+4G GFl+u1Im+sbdem8Q+keXuEwW95n0RzHum0FMW4dWTuvWr6vhWjJrfnT0w3spb9qz+iuc dCRiyHM/j2KZce52famddiF7PGPFCY+fz9Qt/s/KziKhGQhY4HZSJmuC4YbgeWKmZCE5 ousA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=n9tFVto6; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 n20si3843636ejx.104.2021.03.12.04.01.20; Fri, 12 Mar 2021 04:01:20 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-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=n9tFVto6; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S231458AbhCLMAx (ORCPT + 6 others); Fri, 12 Mar 2021 07:00:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231439AbhCLMAd (ORCPT ); Fri, 12 Mar 2021 07:00:33 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BB39C061574 for ; Fri, 12 Mar 2021 04:00:33 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id l12so4664181wry.2 for ; Fri, 12 Mar 2021 04:00:33 -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 :mime-version:content-transfer-encoding; bh=McMRGa+k2wYhi+9vmCrUwcgebhPfYzfC04NyJL/Hc1k=; b=n9tFVto6RRq8v6s1Rub2Qm0ophWbFgmh9Ud/YccjDR3kMoMIcuXtN4PuH9bDyb4Ez5 z92NLQrilIoMeI++fWg+xbzTYOL+3dtmXjnr17qt748thtz1RIHlaWCcchsjBtDUUndh QRTzZ1ABy9K8LFdZzwGcZJ/aQ9l7l26zg3R5KR8XZN8GGvihSP4N3TUILQo6ffOQKiiF dA2MQRu5KGVbreOncoqYELOWlS565l8lO0LOEnNazdq9eVFwccXEXXE+gCl/OLL+jC7X cYNFR3w4oz6xh5f700LqhTXiZSGSav+0lJMIEiN5Tj8v4ssaKTo7vs3Y/emepHljblnA mHLw== 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=McMRGa+k2wYhi+9vmCrUwcgebhPfYzfC04NyJL/Hc1k=; b=CSVDckzpE+iZbnERNlq6xSwSETCEMs39RJKdlnaaeMeLjfTHsPlXbFbUPMJvWN5Vkp 9aDXiAdlKqJwb7L/k3dIJBVWThGeaB0RdTwDVyPB6/I94NyyyMN/xtTLKaOwSFAfPSdd UcA7Y9ABDM/KfQFm7u2QOG0mNdV5Dfm6Cl1aMSmZfXhVkoSMufF1vUT+vL6m93C7JN3Y W6VE8Bw3RFNaOoNbbvj2ZBeW1bot6a1axRP6F0/jCplqIaejqZssX+GEP4wpTYnRuicr CM+RZvnpiohoPoic5sGZ75Y9xY6bV5idO+9PPXXm5uTh2bd5Zzhk3A6vfU35JZ0858Dd wYXA== X-Gm-Message-State: AOAM532BQCudrO1SD6hX7O4ueAeOYBp6+ggXvk5XEeKGJ5c2hsWXGK7z BLwEXawjCWuIrwZ77VyFnMiujA== X-Received: by 2002:a5d:4485:: with SMTP id j5mr13343571wrq.339.1615550431803; Fri, 12 Mar 2021 04:00:31 -0800 (PST) Received: from srini-hackbox.lan (cpc86377-aztw32-2-0-cust226.18-1.cable.virginm.net. [92.233.226.227]) by smtp.gmail.com with ESMTPSA id h25sm2268315wml.32.2021.03.12.04.00.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 04:00:31 -0800 (PST) From: Srinivas Kandagatla To: vkoul@kernel.org Cc: yung-chuan.liao@linux.intel.com, pierre-louis.bossart@linux.intel.com, sanyog.r.kale@intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, robh@kernel.org, devicetree@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH v4 8/9] soundwire: qcom: add auto enumeration support Date: Fri, 12 Mar 2021 12:00:08 +0000 Message-Id: <20210312120009.22386-9-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20210312120009.22386-1-srinivas.kandagatla@linaro.org> References: <20210312120009.22386-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Qualcomm SoundWire controller supports Auto Enumeration of the devices within the IP. This patch enables support for this feature. Signed-off-by: Srinivas Kandagatla --- drivers/soundwire/qcom.c | 86 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 81 insertions(+), 5 deletions(-) -- 2.21.0 Reported-by: kernel test robot diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 6a563fb52444..c6c923329b15 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -57,6 +57,8 @@ #define SWRM_CMD_FIFO_RD_FIFO_ADDR 0x318 #define SWRM_RD_FIFO_CMD_ID_MASK GENMASK(11, 8) #define SWRM_ENUMERATOR_CFG_ADDR 0x500 +#define SWRM_ENUMERATOR_SLAVE_DEV_ID_1(m) (0x530 + 0x8 * (m)) +#define SWRM_ENUMERATOR_SLAVE_DEV_ID_2(m) (0x534 + 0x8 * (m)) #define SWRM_MCP_FRAME_CTRL_BANK_ADDR(m) (0x101C + 0x40 * (m)) #define SWRM_MCP_FRAME_CTRL_BANK_COL_CTRL_BMSK GENMASK(2, 0) #define SWRM_MCP_FRAME_CTRL_BANK_ROW_CTRL_BMSK GENMASK(7, 3) @@ -143,6 +145,7 @@ struct qcom_swrm_ctrl { enum sdw_slave_status status[SDW_MAX_DEVICES]; int (*reg_read)(struct qcom_swrm_ctrl *ctrl, int reg, u32 *val); int (*reg_write)(struct qcom_swrm_ctrl *ctrl, int reg, int val); + u32 slave_status; }; struct qcom_swrm_data { @@ -342,6 +345,7 @@ static void qcom_swrm_get_device_status(struct qcom_swrm_ctrl *ctrl) int i; ctrl->reg_read(ctrl, SWRM_MCP_SLV_STATUS, &val); + ctrl->slave_status = val; for (i = 0; i < SDW_MAX_DEVICES; i++) { u32 s; @@ -352,10 +356,74 @@ static void qcom_swrm_get_device_status(struct qcom_swrm_ctrl *ctrl) } } +static void qcom_swrm_set_slave_dev_num(struct sdw_bus *bus, + struct sdw_slave *slave, int devnum) +{ + struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus); + u32 status; + + ctrl->reg_read(ctrl, SWRM_MCP_SLV_STATUS, &status); + status = (status >> (devnum * SWRM_MCP_SLV_STATUS_SZ)); + status &= SWRM_MCP_SLV_STATUS_MASK; + + if (status == SDW_SLAVE_ATTACHED) { + if (slave) + slave->dev_num = devnum; + mutex_lock(&bus->bus_lock); + set_bit(devnum, bus->assigned); + mutex_unlock(&bus->bus_lock); + } +} + +static int qcom_swrm_enumerate(struct sdw_bus *bus) +{ + struct qcom_swrm_ctrl *ctrl = to_qcom_sdw(bus); + struct sdw_slave *slave, *_s; + struct sdw_slave_id id; + u32 val1, val2; + bool found; + u64 addr; + int i; + char *buf1 = (char *)&val1, *buf2 = (char *)&val2; + + for (i = 1; i <= SDW_MAX_DEVICES; i++) { + /*SCP_Devid5 - Devid 4*/ + ctrl->reg_read(ctrl, SWRM_ENUMERATOR_SLAVE_DEV_ID_1(i), &val1); + + /*SCP_Devid3 - DevId 2 Devid 1 Devid 0*/ + ctrl->reg_read(ctrl, SWRM_ENUMERATOR_SLAVE_DEV_ID_2(i), &val2); + + if (!val1 && !val2) + break; + + addr = buf2[1] | (buf2[0] << 8) | (buf1[3] << 16) | + ((u64)buf1[2] << 24) | ((u64)buf1[1] << 32) | + ((u64)buf1[0] << 40); + + sdw_extract_slave_id(bus, addr, &id); + found = false; + /* Now compare with entries */ + list_for_each_entry_safe(slave, _s, &bus->slaves, node) { + if (sdw_compare_devid(slave, id) == 0) { + qcom_swrm_set_slave_dev_num(bus, slave, i); + found = true; + break; + } + } + + if (!found) { + qcom_swrm_set_slave_dev_num(bus, NULL, i); + sdw_slave_add(bus, &id, NULL); + } + } + + return 0; +} + static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) { struct qcom_swrm_ctrl *swrm = dev_id; - u32 value, intr_sts, intr_sts_masked; + u32 value, intr_sts, intr_sts_masked, slave_status; u32 i; u8 devnum = 0; int ret = IRQ_HANDLED; @@ -384,8 +452,15 @@ static irqreturn_t qcom_swrm_irq_handler(int irq, void *dev_id) case SWRM_INTERRUPT_STATUS_CHANGE_ENUM_SLAVE_STATUS: dev_err_ratelimited(swrm->dev, "%s: SWR new slave attached\n", __func__); - qcom_swrm_get_device_status(swrm); - sdw_handle_slave_status(&swrm->bus, swrm->status); + swrm->reg_read(swrm, SWRM_MCP_SLV_STATUS, &slave_status); + if (swrm->slave_status == slave_status) { + dev_err(swrm->dev, "Slave status not changed %x\n", + slave_status); + } else { + qcom_swrm_get_device_status(swrm); + qcom_swrm_enumerate(&swrm->bus); + sdw_handle_slave_status(&swrm->bus, swrm->status); + } break; case SWRM_INTERRUPT_STATUS_MASTER_CLASH_DET: dev_err_ratelimited(swrm->dev, @@ -472,8 +547,8 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) ctrl->reg_write(ctrl, SWRM_MCP_FRAME_CTRL_BANK_ADDR(0), val); - /* Disable Auto enumeration */ - ctrl->reg_write(ctrl, SWRM_ENUMERATOR_CFG_ADDR, 0); + /* Enable Auto enumeration */ + ctrl->reg_write(ctrl, SWRM_ENUMERATOR_CFG_ADDR, 1); ctrl->intr_mask = SWRM_INTERRUPT_STATUS_RMSK; /* Mask soundwire interrupts */ @@ -507,6 +582,7 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl) ctrl->reg_write(ctrl, SWRM_INTERRUPT_CPU_EN, SWRM_INTERRUPT_STATUS_RMSK); } + ctrl->slave_status = 0; return 0; }