From patchwork Fri Oct 27 06:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 158781 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp409367vqb; Thu, 26 Oct 2023 23:58:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFoanwraNs04giAx7dEVHkKpGkOJbnAfm7RADu5CSrvgl+sXWmRPkqTjGsxK9Epex30YEH X-Received: by 2002:a81:cb07:0:b0:5a8:1ffe:eb4e with SMTP id q7-20020a81cb07000000b005a81ffeeb4emr1876922ywi.34.1698389901268; Thu, 26 Oct 2023 23:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698389901; cv=none; d=google.com; s=arc-20160816; b=KHlvqLCjmTl+KiHjj6NNn0VvtgE0OuafFt1oej03yjMlqV8FgJNWLlF8cPGL7FALdX qjIBzf4bszpNalYHAcQRH6SND4OJ+7Jz4jI9X4ekcR/r3Cud8tkh3bHO+jVwWprfguZX zxHdZodydZ5Xf+3TzfrcKe/LRjyAEUVrIHmKuoA/Xl/16ftLttvOE1Z5sUj9g80D5qte qvqnPMenTD2gV0mFhbRP+JLKjKlIpPhcYYBiuzi0ADlO3z1uxU4DTYhGeEf/jJ1rKZXe i7ww7vKykxsWVP5tH1M/d8AcNhfWN4ET3CaC+3sxU1aIxrte8NxQ6DtFGVHeVqlxwSpM pImA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=kj3Zu6WMlpxQr17sM16EXcoz5cOx2Zq8aggknXeJGWY=; fh=zhTXiDXPoir0s8iWbHwymI8V15ZnHtwX4FLH+8iMdv8=; b=eLEmj57PpKWlpX2E1TeUdWUFlA8fnfqLv0zhAtf/m0D/zMU2y6ctKJMvw3HFVFRPEh oiVAErKf4q3GAYUFL97kx/dkwqbTHcdoEH1NUpGeb0napkxde/bOclrvs9GNzQ8TarER HQwFszi7/NgkURuxIs0pFQDNNwuud/kL3ENZp+C8vhU2ERGbCCjQNbaHH2io3yyLgpnT mF2D0QrLZg0rCSVUqPn9SHaJ/pi/AG6KJwrpgAr6I3bIUdcUGTmo3mgQwRwGQZIpFnlR HRPd1UytIOR5OaZu0JOEtBnZqiSj9jy7leNi/ktYZp9IAkvhcrxQIxScKx9WWhOyGTox NiTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=JN948EZB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id n7-20020a819e47000000b00586a6910f9fsi1484638ywj.529.2023.10.26.23.58.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 23:58:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=JN948EZB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 738AF810F0C5; Thu, 26 Oct 2023 23:57:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345189AbjJ0G51 (ORCPT + 26 others); Fri, 27 Oct 2023 02:57:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230361AbjJ0G5Z (ORCPT ); Fri, 27 Oct 2023 02:57:25 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75097116 for ; Thu, 26 Oct 2023 23:57:22 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9ba081173a3so269165766b.1 for ; Thu, 26 Oct 2023 23:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1698389841; x=1698994641; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=kj3Zu6WMlpxQr17sM16EXcoz5cOx2Zq8aggknXeJGWY=; b=JN948EZBExUcOWDWNBCyXB7eXJTLvHeQgvMLPe7NICB1+aIqkhHu6x1TNOtsCaOnLB Mk1VsZcik65aIEirET+Dbu2FICYmMvkPeZqiEkZgRaxEGeBsRqPSrCe207P31kxxqPDr 7tA2Zc+dMs1FEQ6LuvYR5p02u6yUeWxFRLEGNnpMC51HEU3VcWuqnZGibuHpUpUlf4L9 dSfWQa2ccNjJHwSud8X4e/qTjYhdy6W1spdy1aCj/bzoeR7cr2AIez7kg3BsXz7xQy8j 9Z+ixaXR4OtTAwn9GFgFacH/terwG40qJs7DUWIM5HDHLSVkV1faUiZ8sUw18cWoQ66c PRGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698389841; x=1698994641; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kj3Zu6WMlpxQr17sM16EXcoz5cOx2Zq8aggknXeJGWY=; b=lo8xhdjZ5U7ROFJ4knc04M/Tme/dL0Sr+Iv58TNx+r7yMMlE8RSOOrFTh1vdNwBfYo R1vs96PUXIPUrOhafNGiNDmyVqB7eedL2SOTpL1kWbTM+O5l874oyzGach6Y6hevYJHi ky4nQKispONAcPrG1bmOHKnu8yq7fD8OlpN5lcT1izhZf0nUNoCfFtNphxMhMgVxlyRU w8wGqh0lL1TZQiiyJoWuVQSVPgxRKHhcPSELYy2WhULesci3qdwljUvGcWztD3N+Z9kD SSipghjkrV8jb24l5gk0t48ZqwN3uwWQh3uBXW1yIJYuzNoRsSwceKyFRkkHrF3yer26 g5Vw== X-Gm-Message-State: AOJu0YwvijSVgpRTEgkwDdrHpUtm9aQqtePefPENgWYHHCQq4htiAJUK MxaFLiemkrqS5p2MsORUNPuUpA== X-Received: by 2002:a17:907:9718:b0:9be:6395:6b0f with SMTP id jg24-20020a170907971800b009be63956b0fmr1436632ejc.29.1698389840852; Thu, 26 Oct 2023 23:57:20 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id rp28-20020a170906d97c00b009b296ce13a3sm731381ejb.18.2023.10.26.23.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Oct 2023 23:57:20 -0700 (PDT) From: Luca Weiss Date: Fri, 27 Oct 2023 08:57:18 +0200 Subject: [PATCH] wifi: ath11k: Defer on rproc_get failure MIME-Version: 1.0 Message-Id: <20231027-ath11k-rproc-defer-v1-1-f6b6a812cd18@fairphone.com> X-B4-Tracking: v=1; b=H4sIAE1fO2UC/x3MMQqAMAxA0atIZgNNBYteRRxKm2oQVFIRQXp3i +Mb/n8hswpnGJsXlG/JcuwV1DYQVr8vjBKrwRrbkbEO/bUSbainHgEjJ1aM1PfODckTdVDDUzn J80+nuZQPzjDaZmQAAAA= To: Kalle Valo , Jeff Johnson Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, ath11k@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Thu, 26 Oct 2023 23:57:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780890888688882227 X-GMAIL-MSGID: 1780890888688882227 If we already have gotten the rproc_handle (meaning the "qcom,rproc" property is defined in the devicetree), it's a valid state that the remoteproc module hasn't probed yet so we should defer probing instead of just failing to probe. This resolves a race condition when the ath11k driver probes and fails before the wpss remoteproc driver has probed, like the following: [ 6.232360] ath11k 17a10040.wifi: failed to get rproc [ 6.232366] ath11k 17a10040.wifi: failed to get rproc: -22 [ 6.232478] ath11k: probe of 17a10040.wifi failed with error -22 ... [ 6.252415] remoteproc remoteproc2: 8a00000.remoteproc is available [ 6.252776] remoteproc remoteproc2: powering up 8a00000.remoteproc [ 6.252781] remoteproc remoteproc2: Booting fw image qcom/qcm6490/fairphone5/wpss.mdt, size 7188 So, defer the probe if we hit that so we can retry later once the wpss remoteproc is available. Signed-off-by: Luca Weiss --- drivers/net/wireless/ath/ath11k/ahb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 2ef7141596eed0b4b45ef18b3626f428a6b0a822 change-id: 20231027-ath11k-rproc-defer-d166779fa113 Best regards, diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c index 235336ef2a7a..f8f5e653cd03 100644 --- a/drivers/net/wireless/ath/ath11k/ahb.c +++ b/drivers/net/wireless/ath/ath11k/ahb.c @@ -803,8 +803,8 @@ static int ath11k_core_get_rproc(struct ath11k_base *ab) prproc = rproc_get_by_phandle(rproc_phandle); if (!prproc) { - ath11k_err(ab, "failed to get rproc\n"); - return -EINVAL; + ath11k_dbg(ab, ATH11K_DBG_AHB, "failed to get rproc, deferring\n"); + return -EPROBE_DEFER; } ab_ahb->tgt_rproc = prproc;