From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DDC5C433E0 for ; Tue, 12 Jan 2021 00:44:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A801224BD for ; Tue, 12 Jan 2021 00:44:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405017AbhALAZJ (ORCPT ); Mon, 11 Jan 2021 19:25:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404190AbhAKXnX (ORCPT ); Mon, 11 Jan 2021 18:43:23 -0500 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B77EDC061795 for ; Mon, 11 Jan 2021 15:42:42 -0800 (PST) Received: by mail-oi1-x230.google.com with SMTP id q205so427708oig.13 for ; Mon, 11 Jan 2021 15:42:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=Byv4yeeKkAWUlNgWtR9WJhmRvDT7D9MJeHLwHQJ0UdU=; b=Njto5ZPxhyf0Rn1c8M8Mt78kivEYcxQakmUjN8sOSvICZYE6RS4YA43/GGBN/EHIZW jnCUFHtqH/XR1o+CbGUqoFiHBMWvt6TRa+o8T6CgLmsLxr/cRYZPZs01IotP5Y0OZbL1 Xn2QekLyRbAeex/t8xpxuKLvVOP1hi/LN7ko4zBC71PnmTW4IuBHyTdt7D7pfe0Ua9CI e78w2HY4y2DRBMrCoLlpV2BzuuuDHosNDOfGfFYnAUFIPEKyeseIWiqxORTnhYC9Wlf8 7pi+oyM8DXBszGz083g5zXIOC/tkD8g6MqFnOxSabF/+TWFlcf3qNeBI7abnUWpF9yrI isJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=Byv4yeeKkAWUlNgWtR9WJhmRvDT7D9MJeHLwHQJ0UdU=; b=tUuAlbckegoeCnSlQ1wPls4wOddLA0d9hP8NSxh9ZYb6E2kZEcoeeJkQpXkZLRY90g twnHyDFpbjGo5pwpwRux8dvK8/SfA51c/9d5Tt2pMuOkg7dMmDbDcz51IgeUi1l9d/LD dyY0k3Ku81yjoQeArQP6naHnrEWKIf5fdQWMWPRSQvd42ixr4XCONHKgYKRniR0K9Bqn nc+pwjibzfJR7gGgM12lkWfSlLb2PaZNjh4p6btzMtFIj98OjSTg8e4/dIHEkV+97gml AHw7tFhMglP3nk0Vhh0tQFOezThjbyrdR8Kl7f692tJ0ji+Vz8pVjIqFdsB0F3XS7Hdn KJNA== X-Gm-Message-State: AOAM533b856lQHJoaAKipjuJofPO/Omn2FU1wUFLkbyVyLWC0u5TeqjN G2Sgxwf74y97edNZ5UQiWEvbcA== X-Google-Smtp-Source: ABdhPJxN0FcCUJvUqpV9ny4+A645+PuCqUPRLJFm/k7zZ382PyRzeDZcjJKgwbpYX6CKhPDTVKgqlg== X-Received: by 2002:aca:cc01:: with SMTP id c1mr774890oig.18.1610408562014; Mon, 11 Jan 2021 15:42:42 -0800 (PST) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id n16sm236777oop.9.2021.01.11.15.42.40 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Mon, 11 Jan 2021 15:42:41 -0800 (PST) Date: Mon, 11 Jan 2021 15:42:27 -0800 (PST) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Saravana Kannan cc: "Rafael J. Wysocki" , Thierry Reding , Hugh Dickins , Jonathan Hunter , Greg Kroah-Hartman , Vincent Huang , "Jason A. Donenfeld" , Andrew Duggan , Lucas Stach , Linux Kernel Mailing List , Linux PM Subject: Re: 5.11-rc device reordering breaks ThinkPad rmi4 suspend In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 11 Jan 2021, Saravana Kannan wrote: > > I happen to have an X1 Carbon (different gen though) lying around and > I poked at its /sys folders. None of the devices in the rmi4_smbus are > considered the grandchildren of the i2c device. I think the real > problem is rmi_register_transport_device() [1] not setting up the > parent for any of the new devices it's adding. > > Hugh, can you try this patch? Just tried, but no, this patch does not help; but I bet you're along the right lines, and something as simple will do it. > > diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c > index 24f31a5c0e04..50a0134b6901 100644 > --- a/drivers/input/rmi4/rmi_bus.c > +++ b/drivers/input/rmi4/rmi_bus.c > @@ -90,6 +90,7 @@ int rmi_register_transport_device(struct > rmi_transport_dev *xport) > > rmi_dev->dev.bus = &rmi_bus_type; > rmi_dev->dev.type = &rmi_device_type; > + rmi_dev->dev.parent = xport->dev; > > xport->rmi_dev = rmi_dev; > > -Saravana > > [1] - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/input/rmi4/rmi_bus.c#n74