From patchwork Thu Nov 21 21:10:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raul Rangel X-Patchwork-Id: 1199135 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-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="CBqMrLJL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 47Jsg96jmTz9sR0 for ; Fri, 22 Nov 2019 08:11:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727047AbfKUVLQ (ORCPT ); Thu, 21 Nov 2019 16:11:16 -0500 Received: from mail-io1-f65.google.com ([209.85.166.65]:34472 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727071AbfKUVLN (ORCPT ); Thu, 21 Nov 2019 16:11:13 -0500 Received: by mail-io1-f65.google.com with SMTP id z193so5244979iof.1 for ; Thu, 21 Nov 2019 13:11:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yTD6DYyATeMpZ3Q+gsGQZf2Ua5xQG3BGZz03EY+kl2s=; b=CBqMrLJLOpCxWs351k7tkCrHdirvjqVbKOi/FiI2JBBRTSKd/ddT8mgeV1o2uMWjKX skcro/m+GVfIlSfXbQeX+govttLeiAROe9c/n42Oxf7Z5kQ5qOfAdwdgEmRt8M1qEWLi 0gxuVfbgLELAzaSYd0U/+FMIEJP5jbSqQ2SoI= 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=yTD6DYyATeMpZ3Q+gsGQZf2Ua5xQG3BGZz03EY+kl2s=; b=kvCLkvi8/HgRY6+RjLyVdzlb/FyAXL1c3j+ZeCkhgOXC62Skbpy/FJYxQqT+OSwuPy yFMxaFdnL9M6/j+KgvER3OTkkvZdXhDFND114rBeLt7K/LqG5EMSs5e7ucwglo4/n9Ln YJK9z+mjR6FGjrdaYSS7zhH+3v7sYdBjgzdE5dsKLkA1Z2CCAy+vtI4IFxr3/C7Emr2v Z9GyxjAnPRdPOy0arRGX/MTrKRS7nQIBusdIaFRM5mQZI33n/YoMo4UVRCoh7o9XuH55 njIkTWXLKP/x7HRt4nZDIzNI6zkJ6QsLcM2Zf7oxkzZLtytQrlHvFtZrLCmwLVLt1Hr6 JIDg== X-Gm-Message-State: APjAAAVQCp7TQfA7YvQwtVVN0VNTCCSmNfCm1gCpVKM9cYeBXLgKe+Fk NY3yfD9aKRhhuPNQYrr9tYCFeQ== X-Google-Smtp-Source: APXvYqzKVobTl/S0tsRthgsUyZ4rDtxlR9ihXlWK/MavcD9gVfR3+k+AfR+22IGf5EOtn6o/+xG4SQ== X-Received: by 2002:a05:6638:3fd:: with SMTP id s29mr5964322jaq.17.1574370670483; Thu, 21 Nov 2019 13:11:10 -0800 (PST) Received: from localhost ([2620:15c:183:0:82e0:aef8:11bc:24c4]) by smtp.gmail.com with ESMTPSA id t12sm1682648ilm.69.2019.11.21.13.11.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Nov 2019 13:11:10 -0800 (PST) From: Raul E Rangel To: enric.balletbo@collabora.com, Wolfram Sang Cc: Akshu.Agrawal@amd.com, Raul E Rangel , Akshu Agrawal , Guenter Roeck , Chanwoo Choi , linux-kernel@vger.kernel.org, Alexandre Belloni , linux-i2c@vger.kernel.org, Lee Jones , Benson Leung Subject: [PATCH 4/4] platform/chrome: i2c: i2c-cros-ec-tunnel: Convert i2c tunnel to MFD Cell Date: Thu, 21 Nov 2019 14:10:53 -0700 Message-Id: <20191121140830.4.Iddc7dd74f893297cb932e9825d413e7890633b3d@changeid> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog In-Reply-To: <20191121211053.48861-1-rrangel@chromium.org> References: <20191121211053.48861-1-rrangel@chromium.org> MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org If the i2c-cros-ec-tunnel driver is compiled into the kernel, it is possible that i2c-cros-ec-tunnel could be probed before cros_ec_XXX has finished initializing and setting the drvdata. This would cause a NULL pointer panic. Converting this driver over to an MFD solves the problem and aligns with where the cros_ec is going. Signed-off-by: Raul E Rangel --- You can now see the device node lives under the mfd device. $ find /sys/bus/platform/devices/cros-ec-dev.0.auto/cros-ec-i2c-tunnel.12.auto/ -iname firmware_node -exec ls -l '{}' \; /sys/bus/platform/devices/cros-ec-dev.0.auto/cros-ec-i2c-tunnel.12.auto/firmware_node -> ../../../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/PNP0C09:00/GOOG0004:00/GOOG0012:00 /sys/bus/platform/devices/cros-ec-dev.0.auto/cros-ec-i2c-tunnel.12.auto/i2c-9/firmware_node -> ../../../../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/PNP0C09:00/GOOG0004:00/GOOG0012:00 /sys/bus/platform/devices/cros-ec-dev.0.auto/cros-ec-i2c-tunnel.12.auto/i2c-9/i2c-10EC5682:00/firmware_node -> ../../../../../../../../LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:1c/PNP0C09:00/GOOG0004:00/GOOG0012:00/10EC5682:00 drivers/i2c/busses/i2c-cros-ec-tunnel.c | 36 +++++++++---------------- drivers/mfd/cros_ec_dev.c | 19 +++++++++++++ 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/drivers/i2c/busses/i2c-cros-ec-tunnel.c b/drivers/i2c/busses/i2c-cros-ec-tunnel.c index 5d91e33eb600..2e3217678fa3 100644 --- a/drivers/i2c/busses/i2c-cros-ec-tunnel.c +++ b/drivers/i2c/busses/i2c-cros-ec-tunnel.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -27,7 +28,6 @@ struct ec_i2c_device { struct device *dev; struct i2c_adapter adap; - struct cros_ec_device *ec; u16 remote_bus; @@ -176,6 +176,7 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[], { struct ec_i2c_device *bus = adap->algo_data; struct device *dev = bus->dev; + struct cros_ec_dev *ec = dev_get_drvdata(dev->parent); const u16 bus_num = bus->remote_bus; int request_len; int response_len; @@ -183,6 +184,16 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[], int result; struct cros_ec_command *msg; + if (!ec) { + dev_err(dev, "%s: ec is missing!\n", __func__); + return -EINVAL; + } + + if (!ec->ec_dev) { + dev_err(dev, "%s: ec->ec_dev is missing!\n", __func__); + return -EINVAL; + } + request_len = ec_i2c_count_message(i2c_msgs, num); if (request_len < 0) { dev_warn(dev, "Error constructing message %d\n", request_len); @@ -212,7 +223,7 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[], msg->outsize = request_len; msg->insize = response_len; - result = cros_ec_cmd_xfer_status(bus->ec, msg); + result = cros_ec_cmd_xfer_status(ec->ec_dev, msg); if (result < 0) { dev_err(dev, "Error transferring EC i2c message %d\n", result); goto exit; @@ -241,17 +252,11 @@ static const struct i2c_algorithm ec_i2c_algorithm = { static int ec_i2c_probe(struct platform_device *pdev) { - struct cros_ec_device *ec = dev_get_drvdata(pdev->dev.parent); struct device *dev = &pdev->dev; struct ec_i2c_device *bus = NULL; u32 remote_bus; int err; - if (!ec->cmd_xfer) { - dev_err(dev, "Missing sendrecv\n"); - return -EINVAL; - } - bus = devm_kzalloc(dev, sizeof(*bus), GFP_KERNEL); if (bus == NULL) return -ENOMEM; @@ -263,7 +268,6 @@ static int ec_i2c_probe(struct platform_device *pdev) } bus->remote_bus = remote_bus; - bus->ec = ec; bus->dev = dev; bus->adap.owner = THIS_MODULE; @@ -292,25 +296,11 @@ static int ec_i2c_remove(struct platform_device *dev) return 0; } -static const struct of_device_id cros_ec_i2c_of_match[] = { - { .compatible = "google,cros-ec-i2c-tunnel" }, - {}, -}; -MODULE_DEVICE_TABLE(of, cros_ec_i2c_of_match); - -static const struct acpi_device_id cros_ec_i2c_tunnel_acpi_id[] = { - { "GOOG0012", 0 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, cros_ec_i2c_tunnel_acpi_id); - static struct platform_driver ec_i2c_tunnel_driver = { .probe = ec_i2c_probe, .remove = ec_i2c_remove, .driver = { .name = "cros-ec-i2c-tunnel", - .acpi_match_table = ACPI_PTR(cros_ec_i2c_tunnel_acpi_id), - .of_match_table = of_match_ptr(cros_ec_i2c_of_match), }, }; diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index 1efdba18f20b..61b20e061f75 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -113,6 +113,18 @@ static const struct mfd_cell cros_ec_vbc_cells[] = { { .name = "cros-ec-vbc", } }; +static struct mfd_cell_acpi_match cros_ec_i2c_tunnel_acpi_match = { + .pnpid = "GOOG0012" +}; + +static struct mfd_cell cros_ec_fw_cells[] = { + { + .name = "cros-ec-i2c-tunnel", + .acpi_match = &cros_ec_i2c_tunnel_acpi_match, + .of_compatible = "google,cros-ec-i2c-tunnel" + }, +}; + int cros_ec_check_features(struct cros_ec_dev *ec, int feature) { struct cros_ec_command *msg; @@ -485,6 +497,13 @@ static int ec_device_probe(struct platform_device *pdev) "failed to add cros-ec platform devices: %d\n", retval); + retval = mfd_add_hotplug_devices(ec->dev, cros_ec_fw_cells, + ARRAY_SIZE(cros_ec_fw_cells)); + if (retval) + dev_warn(ec->dev, + "failed to add cros-ec fw platform devices: %d\n", + retval); + /* Check whether this EC instance has a VBC NVRAM */ node = ec->ec_dev->dev->of_node; if (of_property_read_bool(node, "google,has-vbc-nvram")) {