Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp205885iob; Mon, 2 May 2022 17:11:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzIlGN4QKtQKhhXSQ5HxSsod1sY6y2MhAm4hhQO77CO4Iwz+t9hjGZYjeOA9GdOZaVYQWiL X-Received: by 2002:a17:902:6bc4:b0:154:6b3d:a720 with SMTP id m4-20020a1709026bc400b001546b3da720mr14111443plt.104.1651536664417; Mon, 02 May 2022 17:11:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651536664; cv=none; d=google.com; s=arc-20160816; b=V7a3Kks5g9R+HL7ORCO+eeS30Kgk/EWYwxwuf8bvwZOpm+N68+jJqkhZV0Tk06MUmw +Z7G9EIKCm2VqnqT2k26RIhMG9gxwxaiZOhbgBvjUL1Z01bIAJZ48FEkJmgEuYDDfu/k vjY0bSnzR+3cUsYOMWXMxq6RHBgBJj5aK5nNzO69gTDfPkuPE5vLtHvJvPZMDfeqI6HO 9JVXgGSgmnjwFqsaTVubJ9q956OFez2MF6UocWkm3eFgTwXqhQ6SKAVU3e4iR2/2OyGA pcMF0J1Hp9MGBeF80mpINMhv6K8v9SImby0cNGvura/z9F80GgHLJg5QINQ5EdSXdvfr epzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=al6HrPakzzIDPiejQoN/pvdRHdRH2YKj+RkZBBpsla4=; b=NGfFU64/h5jn+ehwmH/2vQk1PKfsS++lyVXp0on1bSTPxEtp4OK3VkQf9CNlJnuO/+ FpBoBFjidmdLhqHOoRcmKmbiTmDQxphjU8H4wgPw5dI/SCuhWeBC21mQJtfYstFOJjat 5v5DkytRq/tqBLeG0SUxaxjLUhwahL8A6m4X1SUwZFqhA9UEBvR4+hXa/EQkeTaeSWuY wnozcictpSHTedbwcWWI4yHOCFNpXY/42WUOHPXThqTFSwLjdR5Qj2RJN37m5ju7JWur d4wDuGzXbzMfIzN2zfIWU2E/s3n4RYAPYFe0UFHfGfzDcLTIyVKscCM+D38Ss4jcofKb ngNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=marcan.st Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id k6-20020a170902ce0600b0015d284e10a2si6636234plg.150.2022.05.02.17.11.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 17:11:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 948A218374; Mon, 2 May 2022 17:09:54 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1384282AbiEBJmb (ORCPT + 99 others); Mon, 2 May 2022 05:42:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381191AbiEBJmY (ORCPT ); Mon, 2 May 2022 05:42:24 -0400 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E8CE1208E for ; Mon, 2 May 2022 02:38:55 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: hector@marcansoft.com) by mail.marcansoft.com (Postfix) with ESMTPSA id 302D5419B4; Mon, 2 May 2022 09:38:50 +0000 (UTC) From: Hector Martin To: Marc Zyngier Cc: Hector Martin , Lorenzo Pieralisi , Rob Herring , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Bjorn Helgaas , Alyssa Rosenzweig , Sven Peter , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/3] PCI: apple: GPIO handling nitfixes Date: Mon, 2 May 2022 18:38:30 +0900 Message-Id: <20220502093832.32778-2-marcan@marcan.st> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220502093832.32778-1-marcan@marcan.st> References: <20220502093832.32778-1-marcan@marcan.st> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - Use devm managed GPIO getter - GPIO ops can sleep in this context Fixes: 1e33888fbe44 ("PCI: apple: Add initial hardware bring-up") Cc: stable@vger.kernel.org Signed-off-by: Hector Martin --- drivers/pci/controller/pcie-apple.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-apple.c b/drivers/pci/controller/pcie-apple.c index a2c3c207a04b..e0c06c0ee731 100644 --- a/drivers/pci/controller/pcie-apple.c +++ b/drivers/pci/controller/pcie-apple.c @@ -516,8 +516,8 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie, u32 stat, idx; int ret, i; - reset = gpiod_get_from_of_node(np, "reset-gpios", 0, - GPIOD_OUT_LOW, "PERST#"); + reset = devm_gpiod_get_from_of_node(pcie->dev, np, "reset-gpios", 0, + GPIOD_OUT_LOW, "PERST#"); if (IS_ERR(reset)) return PTR_ERR(reset); @@ -541,7 +541,7 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie, rmw_set(PORT_APPCLK_EN, port->base + PORT_APPCLK); /* Assert PERST# before setting up the clock */ - gpiod_set_value(reset, 1); + gpiod_set_value_cansleep(reset, 1); ret = apple_pcie_setup_refclk(pcie, port); if (ret < 0) @@ -552,7 +552,7 @@ static int apple_pcie_setup_port(struct apple_pcie *pcie, /* Deassert PERST# */ rmw_set(PORT_PERST_OFF, port->base + PORT_PERST); - gpiod_set_value(reset, 0); + gpiod_set_value_cansleep(reset, 0); /* Wait for 100ms after PERST# deassertion (PCIe r5.0, 6.6.1) */ msleep(100); -- 2.35.1