From nobody Sun Nov 24 17:39:09 2024 Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BF941C3022; Mon, 4 Nov 2024 17:20:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.70.183.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730740814; cv=none; b=rsv9nub3IGyErC6ruwXqEZa2RGSqcOPzymbyKEp7jUjnLkQYM9ESxjdbVXKc4/HHD/WUkUDXTOWyXON846VzaQTpxikGXSH7qDZaqp/x/T1EfOyGGtfBC9q7Jqt0r2/g3QH2mmXiynGrqXRDsU5Tx+mTnaDAVZkTZ2OlOoQnXVQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730740814; c=relaxed/simple; bh=KbQcH2DUBO4XBFA/lTskG3ADO76dFxPNoXmfqDECx2E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ieRt6JPJEhUgZjrPPI42GQL6+a+yhjmKJlNHSpHz1sfIjWxh/WGTkWwCnxeKR/UEGPNAu3UfoBEGCNp/aKc9UE+tnl344CMqMuQQrNyxCWFyDMUgBMaHAwVdQmIQTOsaHY+UeVW2dYHfLm3/I8XFGd7/XD3sqKmDhkBFOnQ8wZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=YFHH0zB+; arc=none smtp.client-ip=217.70.183.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="YFHH0zB+" Received: by mail.gandi.net (Postfix) with ESMTPA id 2DF521BF20D; Mon, 4 Nov 2024 17:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1730740810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OWUWbgIcwwkYpx2sGFB36arAHxZpqg+uUR07E7hW3jI=; b=YFHH0zB+9neL9D2bKrNNSRX1QuwwiP7zTHk3eKzEEYuJbJGgwDuZrIumR3vEWyk1jW/YpX RLBLT6JeQMiWijyaAsx7PssSbT9Yxv0pIcCGL0hpruoyW+8slKDiiV5ul4BFoXx4ap/GUH s79XcApRhqPQ7fg2oAy2/85oRJr8SCvmv6cpiRSAxwgX1EupQZBQUxBSSyy0cgRAxAPQBX VH/2NtC9GxfezhZdrjDtDaHemWEuhQrMQka3XZ9eHPglGBetK2Wr0LUvMUFA7Swl/2dtH/ CVm+QSQn8M86efcmRN51O31fiblxBZlDgRn0bSMNwdYCw6iLkEBtjO6xbl8aaA== From: Herve Codina To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Rob Herring , Saravana Kannan , Bjorn Helgaas , Lizhi Hou Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-pci@vger.kernel.org, Allan Nielsen , Horatiu Vultur , Steen Hegelund , Thomas Petazzoni , Herve Codina Subject: [PATCH 3/6] PCI: of_property: Add support for NULL pdev in of_pci_set_address() Date: Mon, 4 Nov 2024 18:19:57 +0100 Message-ID: <20241104172001.165640-4-herve.codina@bootlin.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241104172001.165640-1-herve.codina@bootlin.com> References: <20241104172001.165640-1-herve.codina@bootlin.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-GND-Sasl: herve.codina@bootlin.com Content-Type: text/plain; charset="utf-8" The pdev (pointer to a struct pci_dev) parameter of of_pci_set_address() cannot be NULL. In order to reuse of_pci_set_address() when creating the PCI root bus node, this function needs to support a NULL pdev parameter. Indeed, in the case of the PCI root bus node creation, no pdev are available and of_pci_set_address() will be used with the bridge windows. Allow to call of_pci_set_address() with a NULL pdev. Signed-off-by: Herve Codina --- drivers/pci/of_property.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/pci/of_property.c b/drivers/pci/of_property.c index 5a0b98e69795..59cc5c851fc3 100644 --- a/drivers/pci/of_property.c +++ b/drivers/pci/of_property.c @@ -54,9 +54,13 @@ enum of_pci_prop_compatible { static void of_pci_set_address(struct pci_dev *pdev, u32 *prop, u64 addr, u32 reg_num, u32 flags, bool reloc) { - prop[0] =3D FIELD_PREP(OF_PCI_ADDR_FIELD_BUS, pdev->bus->number) | - FIELD_PREP(OF_PCI_ADDR_FIELD_DEV, PCI_SLOT(pdev->devfn)) | - FIELD_PREP(OF_PCI_ADDR_FIELD_FUNC, PCI_FUNC(pdev->devfn)); + if (pdev) + prop[0] =3D FIELD_PREP(OF_PCI_ADDR_FIELD_BUS, pdev->bus->number) | + FIELD_PREP(OF_PCI_ADDR_FIELD_DEV, PCI_SLOT(pdev->devfn)) | + FIELD_PREP(OF_PCI_ADDR_FIELD_FUNC, PCI_FUNC(pdev->devfn)); + else + prop[0] =3D 0; + prop[0] |=3D flags | reg_num; if (!reloc) { prop[0] |=3D OF_PCI_ADDR_FIELD_NONRELOC; --=20 2.46.2