From patchwork Sun Sep 16 23:45:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 146799 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3154583ljw; Sun, 16 Sep 2018 16:46:08 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZGa6Jd+EWYUC15MB66poHpNzCO61VoyIw8hVEyhJjiSyVzBJew623qG26jRpBuptLxsvUb X-Received: by 2002:a63:bc0a:: with SMTP id q10-v6mr21060343pge.60.1537141568619; Sun, 16 Sep 2018 16:46:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537141568; cv=none; d=google.com; s=arc-20160816; b=bLQjTZ2XQgGVw23BAwYd05SAKOvQlAsKa9sB0uGBNw7ryE6Zfaeg+VZV3jy2QvQWO/ 2gfCZCZ1+lsVLIJbKDTfC2ICJgud9h8SGCqP2TXMNOFxLMITmnQzEbEiVGLwRvbYKDja AqUCracugj7pNHxZGM+dE4yeSncFA5UrDCWmPT1oXzb2sleY1wbLsnceXoGnkmDMgvTL Ck6quXS/4ePZDCxZB/P8RQACwFs/0NjHbhmKvznQfUJ9f/WtR3dW2bawF9JeUS2jlmUT POB7wRYV51RFXDs0l5ffG5nBTfJH3z+LvthH6TMPeg1sR7fEN3m6siTuh3AJZYKbMwY8 LjmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=jDArbQdVww+YSgUKwhIereZD0KDuIxo3XfjQo0Dfyoc=; b=UtcGfq0xOEJXSik6nKsHK/VqzLwHndIiuTqLLq6f4kTL3ug895BHS4/fo2yhtR3ARf TzQ3UrDRhWKoh2csDReX/kDYCRN7mkcmeOs9322zMJCzJ8VlXzaBFl2K16wpjEe7QS07 1f1AJCzq4OFWoHsFHnCuyB1TyXrScX081BHHk+7KZRnlC5FcOZCxqflx2PgpSXQXn9gB QvnOeUIJSFVHBLlJi/HFb7i5qYU5w1hHc70s3fSWu3JbjUf5G06CEpMBA7BhSKw/jWR1 +51aA2ICXxGrx61j9weoOSsmOUoDGTDaAV2gztWmL86eNhkZN6KSIUu7LjawP2og/O/O W36Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MtSqOS63; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id f4-v6si13808546plt.346.2018.09.16.16.46.08; Sun, 16 Sep 2018 16:46:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=@linaro.org header.s=google header.b=MtSqOS63; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 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 S1728268AbeIQFKl (ORCPT + 13 others); Mon, 17 Sep 2018 01:10:41 -0400 Received: from mail-io1-f66.google.com ([209.85.166.66]:37474 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728190AbeIQFKl (ORCPT ); Mon, 17 Sep 2018 01:10:41 -0400 Received: by mail-io1-f66.google.com with SMTP id v14-v6so10076626iob.4 for ; Sun, 16 Sep 2018 16:46:00 -0700 (PDT) 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=jDArbQdVww+YSgUKwhIereZD0KDuIxo3XfjQo0Dfyoc=; b=MtSqOS63VH9yjjal86E/bgA2jgcaxL1KyQEcQ7/F7RLWZQ3Y1vZYGZoRUlLEor0FtB B6NLZCup0miL/UXfeOOAOdN/KrAPoV8JC1Nb17n08wPxnp4wjzmvxb4IvR4/BwDet5BJ dyScJ5A5M08ju3b2Si9t6v5eNJAi6WUH1Y8+0= 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=jDArbQdVww+YSgUKwhIereZD0KDuIxo3XfjQo0Dfyoc=; b=S4jG7JEfL4pqgVG0Ohn0y7vAohTUJX28iJD6ApDWI5fCuAXfWQ4dEd/eanIaElrUfr P0dQzsArJL3kkQ5hCYss6VWkunQHIsSMCJ+ayZs/vCNJ5U5f9MyY57oqHM7fnWNRaqs5 f2o+ylK8kdI1Sg8PtNqHyBYQHCsf7l9IiCkFGTH2awcmTUyzbSPtZmklDAJLmLYAEbTZ ooXirlRh9HfrsCJaAF5dqhz7k+GxMgmYExeG0gvgB7OsTO5ki6r0YZTMnXheSOmnUu/U YV4/t+akb5PLGQfuKv0dLEcwDEhWc9j2jEUTm5vI+r69/qEwFd1ZP/R0ionRys5eXkA9 wuhA== X-Gm-Message-State: APzg51BGalvQ4r1M4khYo/XBzbAjwXgBb6wvkbzF5oE5Ly7tldqc/ss5 itR0C0cGsgxdaCCEQITTE2xHMg== X-Received: by 2002:a6b:c694:: with SMTP id w142-v6mr17833891iof.142.1537141560397; Sun, 16 Sep 2018 16:46:00 -0700 (PDT) Received: from localhost.localdomain ([209.82.80.116]) by smtp.gmail.com with ESMTPSA id a11-v6sm4495177ioc.63.2018.09.16.16.45.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Sep 2018 16:45:59 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, vkoul@kernel.org, Srinivas Kandagatla Subject: [PATCH 3/7] slimbus: core: match device tree based devices correctly Date: Sun, 16 Sep 2018 16:45:42 -0700 Message-Id: <20180916234546.29661-4-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> References: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla device_id for device tree based devices come from dt compatible string, such drivers need not provide non dt style device id table. Match those device using compatible strings. Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.9.3 diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 262591f..55eda58 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -33,6 +33,10 @@ static int slim_device_match(struct device *dev, struct device_driver *drv) struct slim_device *sbdev = to_slim_device(dev); struct slim_driver *sbdrv = to_slim_driver(drv); + /* Attempt an OF style match first */ + if (of_driver_match_device(dev, drv)) + return 1; + return !!slim_match(sbdrv->id_table, sbdev); } @@ -106,7 +110,7 @@ EXPORT_SYMBOL_GPL(slimbus_bus); int __slim_driver_register(struct slim_driver *drv, struct module *owner) { /* ID table and probe are mandatory */ - if (!drv->id_table || !drv->probe) + if (!(drv->driver.of_match_table || drv->id_table) || !drv->probe) return -EINVAL; drv->driver.bus = &slimbus_bus; From patchwork Sun Sep 16 23:45:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 146800 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3154596ljw; Sun, 16 Sep 2018 16:46:09 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaeXfQHPVe6NbcQcunziPoA0NOCwnWCDfGPB+4A4/FWZpJlNI4eiqlcyfGTXqAUuxw8epFx X-Received: by 2002:a17:902:f205:: with SMTP id gn5mr22143736plb.41.1537141569346; Sun, 16 Sep 2018 16:46:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537141569; cv=none; d=google.com; s=arc-20160816; b=Z3oGxqd3u3zNLfznL7B/6HFgo1CkHJNMPUGcoDni8gUx7lpMYWMpleA9DKXiZAFA5S rjNQbhfeeWXatFT3kHl4JWv3V3qjolnQGjpkBZIOh59Z73lp2Xm1raLoWYT0db9QxpHN vyoSLmf6+gvFXrD/vuwrqnYolc/V7iA5NOnwbWjRqDzVXNb/6Yzj6ayypt046L3FLh54 c6rZwkXzAhd2mj1TbTM/oJKxxr57B25P9Fh4LoN4EHUlEYCcy9gWVPBNn0JM2GzkKRsH SS9A4bm1YK97MEl7sAGIqRCqHWnezWvrODBAy55OuzuoEiaLyeJrZkegL1EtTc4Q4p8D miTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=1bcJh9CtfJ4gAb6t6vtjisbCR0PKBNS05ea9K+ric0w=; b=DFzIDpsyBVlNc+HE6cjfiqwO9ZSVtCyZxZswtGnY7WbTNBKOyD11ZYckWELj7+o27F Rh8Kc6RBDXuVR12ojyMlMez0ApvVNtNjuaWOpn/p8j6IrVV3E70h1DP0/Bvi6K7boBsl J4aBOFuLtGfeopEMF0ysnVyzfMl+uct+ePcFOCKShakGiq6SUBgVgjryA7bwEvJ/6f6Q Vulc3BuJ2XlDPmU27iTl60gPD1NuCYDd/omzK8bAhWzNMo1G1BV5cjYVX42AYJ0I7+Zn xJOE+efubc8zIygPwIlEhwSkz8BZuh9bNl3WUPAbyhQikQ73HXzNNeFLeQoAOLS19Kzy gUdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ev+CCGgn; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id f4-v6si13808546plt.346.2018.09.16.16.46.09; Sun, 16 Sep 2018 16:46:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=@linaro.org header.s=google header.b=Ev+CCGgn; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 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 S1728284AbeIQFKn (ORCPT + 13 others); Mon, 17 Sep 2018 01:10:43 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:50868 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728273AbeIQFKm (ORCPT ); Mon, 17 Sep 2018 01:10:42 -0400 Received: by mail-it0-f65.google.com with SMTP id j81-v6so8967088ite.0 for ; Sun, 16 Sep 2018 16:46:01 -0700 (PDT) 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=1bcJh9CtfJ4gAb6t6vtjisbCR0PKBNS05ea9K+ric0w=; b=Ev+CCGgnvLIEXmiRTpQCrXBwU5Sr96o05fDv55zIg+z7zwz0OheesH3dewlX9N9eHB 6yZ876AB+oazr67VkYjG3rjV1lY8h/3RN+cfPcvaTuHkiSIpY344ClDhkeIAbxnn6YuD 5CSKr/1swr9ywRZjGSkZxa2UyiQkN3m5rEjA8= 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=1bcJh9CtfJ4gAb6t6vtjisbCR0PKBNS05ea9K+ric0w=; b=XpQmyAzqY2A/85KxVIj9YujLAEmy4vjRL+FJH3YXezn19tbutFwJg/Dr4f8BTz3vPE tfB5St6ITQ+Iccgczk8HVNQ/zgGab6c2s7Wi00rQAhi8hBw/yGXuXWLN4PgLoPHZu59D lobF+5fPEpItg39mboC9fGVv7z8PJXmOY7UcezFb/UIVkHA6PVjb6F7HoalZOgiK99QD kvQjLfGq8hUAQC9nH/V8tbU9sFmL3qgmw1Qc49mIJDV3k91y1EAIHjrjU1rkvgiz6Ela q5hzaW4p9BrEsDA/XulEdSVN4ayVKnPlnxOyaG3hP451yoDQ2Sv1aW2f8AkBdYhng43g U9Lg== X-Gm-Message-State: APzg51AG8eDOySTqyRzuB3fwmHjJ0ZjIhRajO29FLxVOmXW5gCxiMLTY UGNN0TWxBp7EnDr2YManYYWSdA== X-Received: by 2002:a24:aa08:: with SMTP id b8-v6mr10725014itf.49.1537141561414; Sun, 16 Sep 2018 16:46:01 -0700 (PDT) Received: from localhost.localdomain ([209.82.80.116]) by smtp.gmail.com with ESMTPSA id a11-v6sm4495177ioc.63.2018.09.16.16.46.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Sep 2018 16:46:01 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, vkoul@kernel.org, Srinivas Kandagatla Subject: [PATCH 4/7] slimbus: ngd: validate logical address assigned by remote Date: Sun, 16 Sep 2018 16:45:43 -0700 Message-Id: <20180916234546.29661-5-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> References: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla Validate logical address assigned by remote, in failure cases this value is all zeors. Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.9.3 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 8be4d67..b9f2e3f 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1004,6 +1004,7 @@ static int qcom_slim_ngd_get_laddr(struct slim_controller *ctrl, struct slim_eaddr *ea, u8 *laddr) { struct slim_val_inf msg = {0}; + u8 failed_ea[6] = {0, 0, 0, 0, 0, 0}; struct slim_msg_txn txn; u8 wbuf[10] = {0}; u8 rbuf[10] = {0}; @@ -1034,6 +1035,9 @@ static int qcom_slim_ngd_get_laddr(struct slim_controller *ctrl, return ret; } + if (!memcmp(rbuf, failed_ea, 6)) + return -ENXIO; + *laddr = rbuf[6]; return ret; From patchwork Sun Sep 16 23:45:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 146801 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3154604ljw; Sun, 16 Sep 2018 16:46:10 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbTQGEkBLsT9h31ysXnYqN39j7NnrZzI1Xj4deF4ZThDLsAmz59k4+pPLrSx/k3d3wB/SOT X-Received: by 2002:a65:5286:: with SMTP id y6-v6mr20216572pgp.65.1537141570031; Sun, 16 Sep 2018 16:46:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537141570; cv=none; d=google.com; s=arc-20160816; b=M5tta3J5tcBMY7jho5uL3eLj3Uiemp5Q0hrWh13wv8mTNA/mdFs+eCD8Uap1wzEg8p hyhc0NHkcl8gBVZxhty+MwC5h1Pxe5hsyJsgW9jgXp3L3QJ8JTrEUc7ZYRnOYlqtrMOv nxzYCDWthHu6o1ZFpIm5TC7/doDzPIOhEuswrL6OAkd4wU0cK2jljPlJBJ+zum3SjMWG /iYzVUrrV7aH7xZ++RTkHqve/Ze7uDiyTOtx7l4Zh2hmMVorRlgNKyoDvtPUO+ucY/A2 kxFhXZf/Yl46s4qwWZv/Y47OIoHU6C8i0QlBsRJjDZW7d0gi5yOg2s0xcuxy4ti7WmUk ihkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=4mLIm+CPnzkl6UQkh/tstY1IOawXp7bQelRcUAvyv2I=; b=Jbum1b1ometTwv9OHSoLpuYzTG/5QHJIWgwmVdthiLhUlKAABX1fN9ri+JK0Tj1KlY UoSwL+oPROoYTQXrgO4cFADZvHIkQgo3tOpQbvkZ5Cs1EbbFqM3EFADNu4GTm30kSI8u PbJLiTL9IpE1RuDZCIOocv2YGV4sIDGY5io0+TIHYYD7BGhC+cRKwJw871jfCVlB7dJk 1iKEe6a/QVh47YEvKfjoA9MaZZA4pIwmFXW+CH9vVNQobVq1yJF+HuQVwJ3Imato/x0b GYZGNnRalHRGPEp0VF6XPyr+apjiOuog3r+dqpewSrKLecI03uGmYsmyfh+Kpk4MR1FU CwRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ViIImC8M; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 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. [209.132.180.67]) by mx.google.com with ESMTP id f4-v6si13808546plt.346.2018.09.16.16.46.09; Sun, 16 Sep 2018 16:46:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-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=@linaro.org header.s=google header.b=ViIImC8M; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 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 S1726889AbeIQFKo (ORCPT + 13 others); Mon, 17 Sep 2018 01:10:44 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:36058 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728311AbeIQFKn (ORCPT ); Mon, 17 Sep 2018 01:10:43 -0400 Received: by mail-io1-f67.google.com with SMTP id q5-v6so10058869iop.3 for ; Sun, 16 Sep 2018 16:46:02 -0700 (PDT) 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=4mLIm+CPnzkl6UQkh/tstY1IOawXp7bQelRcUAvyv2I=; b=ViIImC8M62l8kYkhVQwEsX4r/wgwu8DdANBxBs04jgwnNbnAkbTwz5mpfspMX9wsJ8 Hv6XZri5hqvK8P7Sdo41iFU3IGqrJpukxmRxMXX4uvpexOLSUw5udG1JmfRNMKpJpw4y E8MKKrrmfGScUPrB99QUPsbefI8C/1Kbs8GWQ= 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=4mLIm+CPnzkl6UQkh/tstY1IOawXp7bQelRcUAvyv2I=; b=kaZDNFyycqvkba+NgzMW5NwHD4zFAKWwRbnJhCd6U1nMkSKYeW/7yNey9IORfCcQB5 6mL/LsZUXywXiUtfekSVFR02uBnHrlLa1MJ5DbAwkVAA4IfkRIqIin+0gNrXtseItgMy AMXjjldeZ8CsmtYsu1ELNkPYv/zPLfJ2q9M1YUTcgWHelCh5eLqtDmKLxxvQ2CzDde4r 39dNn9JAfy/DDFjQ0SSlUlZpOMsMIm1hTbetNw278P9Yt+2JapZqsNk070s/nYrBfyKT 08QQ0G+uQM+JJ2d+laIS7dqKGkqBSosUDhd07HQz79l8u/xuwwfNiJN6oMymCDmIQYXo 3Udg== X-Gm-Message-State: APzg51BJrKyZodehc9xrjIxzG5PEymZLG9PO5V6be2LBYPDlZXXsnUmT qfHz97LCmikKhMMNuLaFmqJqzw== X-Received: by 2002:a6b:be83:: with SMTP id o125-v6mr18643055iof.173.1537141562485; Sun, 16 Sep 2018 16:46:02 -0700 (PDT) Received: from localhost.localdomain ([209.82.80.116]) by smtp.gmail.com with ESMTPSA id a11-v6sm4495177ioc.63.2018.09.16.16.46.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Sep 2018 16:46:02 -0700 (PDT) From: srinivas.kandagatla@linaro.org To: gregkh@linuxfoundation.org Cc: broonie@kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, vkoul@kernel.org, Srinivas Kandagatla Subject: [PATCH 5/7] silmbus: ngd: register controller after power up. Date: Sun, 16 Sep 2018 16:45:44 -0700 Message-Id: <20180916234546.29661-6-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> References: <20180916234546.29661-1-srinivas.kandagatla@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org From: Srinivas Kandagatla Register slimbus controller only after finishing powerup sequnce so that we do not endup in situation where core starts sending transactions before the controller is ready. Signed-off-by: Srinivas Kandagatla --- drivers/slimbus/qcom-ngd-ctrl.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.9.3 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index b9f2e3f..0241373 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1238,8 +1238,17 @@ static int qcom_slim_ngd_enable(struct qcom_slim_ngd_ctrl *ctrl, bool enable) pm_runtime_resume(ctrl->dev); pm_runtime_mark_last_busy(ctrl->dev); pm_runtime_put(ctrl->dev); + + ret = slim_register_controller(&ctrl->ctrl); + if (ret) { + dev_err(ctrl->dev, "error adding slim controller\n"); + return ret; + } + + dev_info(ctrl->dev, "SLIM controller Registered\n"); } else { qcom_slim_qmi_exit(ctrl); + slim_unregister_controller(&ctrl->ctrl); } return 0; @@ -1361,11 +1370,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) int ret; ctrl->ctrl.dev = dev; - ret = slim_register_controller(&ctrl->ctrl); - if (ret) { - dev_err(dev, "error adding slim controller\n"); - return ret; - } pm_runtime_use_autosuspend(dev); pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND); @@ -1375,7 +1379,7 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) ret = qcom_slim_ngd_qmi_svc_event_init(ctrl); if (ret) { dev_err(&pdev->dev, "QMI service registration failed:%d", ret); - goto err; + return ret; } INIT_WORK(&ctrl->m_work, qcom_slim_ngd_master_worker); @@ -1387,8 +1391,6 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) } return 0; -err: - slim_unregister_controller(&ctrl->ctrl); wq_err: qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); if (ctrl->mwq) @@ -1460,7 +1462,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev) struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev); pm_runtime_disable(&pdev->dev); - slim_unregister_controller(&ctrl->ctrl); + qcom_slim_ngd_enable(ctrl, false); qcom_slim_ngd_exit_dma(ctrl); qcom_slim_ngd_qmi_svc_event_deinit(&ctrl->qmi); if (ctrl->mwq)