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 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 12E09C43334 for ; Thu, 9 Jun 2022 15:25:08 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 2A12C1AB2; Thu, 9 Jun 2022 17:24:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 2A12C1AB2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1654788307; bh=SOwvpVCZjkxg8KZs0RVxDzu9voSyzOt3EM4EtxcOcNc=; h=Date:Subject:To:References:From:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=qrvqRN+VGs+zwjvvrcRNTgW0tUZ8vBr70ia1z1cUkoS/Yh2T04NbR4Cup3nw2gkzl YqfSm/mUzfnr1RxBQoRlm68jYGrkNnh6tLsn1Kgpyd6m4qM5f1lpu9/fuCSxkWPTC2 j7T9Z8jJYiBn8jWDFtmvSrdNJL/JZqwyUxlFlgB0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 58A1FF80527; Thu, 9 Jun 2022 17:23:43 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D1615F804BD; Thu, 9 Jun 2022 17:23:42 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 01C40F8012F for ; Thu, 9 Jun 2022 17:23:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 01C40F8012F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FAjg+ql4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654788217; x=1686324217; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=SOwvpVCZjkxg8KZs0RVxDzu9voSyzOt3EM4EtxcOcNc=; b=FAjg+ql4S1MBPgg8kyXhWK6FwQD5qYO8h/ed97O3frkpsjfHFE27Oq0P ddKoDUE0S4RJTYcyw75fFgTP+9NMyGjojudzlFpgWZBuFIov19s1G/PTn qnU231cAJH3EnyuDnSP9+UcqLbUwQB41FUX2HHqoBpH0WHLre6dFb/08c 9fMpXmcnNXyHpqBuR2BdpSYhHcJoeQEMk4TF73xuKNimbYFifoYh0E3cK YNQ6EqtgqldHag9J0VPhRsMEMJI6430eFN7bJkukfZWxSSaQznC4DA/ZW Zb+5noaR3jQv3aIycs1DthxfW79gbLkrlCOkI92/GR+tV85gYO18Vbue1 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10373"; a="339077571" X-IronPort-AV: E=Sophos;i="5.91,287,1647327600"; d="scan'208";a="339077571" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2022 08:23:30 -0700 X-IronPort-AV: E=Sophos;i="5.91,287,1647327600"; d="scan'208";a="585630730" Received: from jeremywe-mobl3.amr.corp.intel.com (HELO [10.209.173.145]) ([10.209.173.145]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2022 08:23:28 -0700 Message-ID: <63d7f3ed-b5a9-c869-5d25-a33a1d4e63c8@linux.intel.com> Date: Thu, 9 Jun 2022 10:22:39 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.9.1 Subject: Re: [PATCH v1 14/16] soundwire: Use acpi_dev_for_each_child() Content-Language: en-US To: "Rafael J. Wysocki" , Linux ACPI References: <1843211.tdWV9SEqCh@kreacher> <5296779.Sb9uPGUboI@kreacher> From: Pierre-Louis Bossart In-Reply-To: <5296779.Sb9uPGUboI@kreacher> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: alsa-devel@alsa-project.org, Linux PM , Mika Westerberg , LKML , Hans de Goede , Vinod Koul , Sakari Ailus , Sanyog Kale , Andy Shevchenko , Bard Liao X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Thanks Rafael. This looks mostly good but I have a doubt on the error handling, see below. > +static int sdw_acpi_check_duplicate(struct acpi_device *adev, void *data) > +{ > + struct sdw_acpi_child_walk_data *cwd = data; > + struct sdw_bus *bus = cwd->bus; > + struct sdw_slave_id id; > + > + if (adev == cwd->adev) > + return 0; > + > + if (!find_slave(bus, adev, &id)) > + return 0; > + > + if (cwd->id.sdw_version != id.sdw_version || cwd->id.mfg_id != id.mfg_id || > + cwd->id.part_id != id.part_id || cwd->id.class_id != id.class_id) > + return 0; > + > + if (cwd->id.unique_id != id.unique_id) { > + dev_dbg(bus->dev, > + "Valid unique IDs 0x%x 0x%x for Slave mfg_id 0x%04x, part_id 0x%04x\n", > + cwd->id.unique_id, id.unique_id, cwd->id.mfg_id, > + cwd->id.part_id); > + cwd->ignore_unique_id = false; > + return 0; > + } > + > + dev_err(bus->dev, > + "Invalid unique IDs 0x%x 0x%x for Slave mfg_id 0x%04x, part_id 0x%04x\n", > + cwd->id.unique_id, id.unique_id, cwd->id.mfg_id, cwd->id.part_id); > + return -ENODEV; if this error happens, I would guess it's reported .... > +} > + > +static int sdw_acpi_find_one(struct acpi_device *adev, void *data) > +{ > + struct sdw_bus *bus = data; > + struct sdw_acpi_child_walk_data cwd = { > + .bus = bus, > + .adev = adev, > + .ignore_unique_id = true, > + }; > + int ret; > + > + if (!find_slave(bus, adev, &cwd.id)) > + return 0; > + > + /* Brute-force O(N^2) search for duplicates. */ > + ret = acpi_dev_for_each_child(ACPI_COMPANION(bus->dev), > + sdw_acpi_check_duplicate, &cwd); > + if (ret) > + return ret; ... here, but I don't see this being propagated further... > + > + if (cwd.ignore_unique_id) > + cwd.id.unique_id = SDW_IGNORED_UNIQUE_ID; > + > + /* Ignore errors and continue. */ > + sdw_slave_add(bus, &cwd.id, acpi_fwnode_handle(adev)); > + return 0; > +} > + > /* > * sdw_acpi_find_slaves() - Find Slave devices in Master ACPI node > * @bus: SDW bus instance > @@ -135,8 +200,7 @@ static bool find_slave(struct sdw_bus *b > */ > int sdw_acpi_find_slaves(struct sdw_bus *bus) > { > - struct acpi_device *adev, *parent; > - struct acpi_device *adev2, *parent2; > + struct acpi_device *parent; > > parent = ACPI_COMPANION(bus->dev); > if (!parent) { > @@ -144,52 +208,7 @@ int sdw_acpi_find_slaves(struct sdw_bus > return -ENODEV; > } > > - list_for_each_entry(adev, &parent->children, node) { > - struct sdw_slave_id id; > - struct sdw_slave_id id2; > - bool ignore_unique_id = true; > - > - if (!find_slave(bus, adev, &id)) > - continue; > - > - /* brute-force O(N^2) search for duplicates */ > - parent2 = parent; > - list_for_each_entry(adev2, &parent2->children, node) { > - > - if (adev == adev2) > - continue; > - > - if (!find_slave(bus, adev2, &id2)) > - continue; > - > - if (id.sdw_version != id2.sdw_version || > - id.mfg_id != id2.mfg_id || > - id.part_id != id2.part_id || > - id.class_id != id2.class_id) > - continue; > - > - if (id.unique_id != id2.unique_id) { > - dev_dbg(bus->dev, > - "Valid unique IDs 0x%x 0x%x for Slave mfg_id 0x%04x, part_id 0x%04x\n", > - id.unique_id, id2.unique_id, id.mfg_id, id.part_id); > - ignore_unique_id = false; > - } else { > - dev_err(bus->dev, > - "Invalid unique IDs 0x%x 0x%x for Slave mfg_id 0x%04x, part_id 0x%04x\n", > - id.unique_id, id2.unique_id, id.mfg_id, id.part_id); > - return -ENODEV; > - } > - } > - > - if (ignore_unique_id) > - id.unique_id = SDW_IGNORED_UNIQUE_ID; > - > - /* > - * don't error check for sdw_slave_add as we want to continue > - * adding Slaves > - */ > - sdw_slave_add(bus, &id, acpi_fwnode_handle(adev)); > - } > + acpi_dev_for_each_child(parent, sdw_acpi_find_one, bus); ... here? It looks like a change in the error handling flow where sdw_acpi_find_slaves() is now returning 0 (success) always? Shouldn't the return of sdw_acpi_find_one() be trapped, e.g. with return acpi_dev_for_each_child(parent, sdw_acpi_find_one, bus); > > return 0; > } > > >