From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.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 442AF224EA for ; Sat, 11 Jan 2025 11:21:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736594471; cv=none; b=dPekr8oYl0aHvB213UqPbz93D1wHqtvGhAgZxTub4clOsozd77i56fupIU7lgyFa1DbXIExNOKPOjhVNq3oNRoqrQkms4Ik4Qs0R3bcm3kEf2KNH5FVetWCwOQfBrj6PmRpAmF/6TaPyf+l6TSpGK28GtCo2lzAayABO11DQpRo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736594471; c=relaxed/simple; bh=nZ3UgaKdv+vkvxw16qHZs/6umABIhry598e5zOPULEo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=HtTK6sUneiQdZ3/urjTrTp/r46QZDldz9Jbxm0ax6o7n+p5zeEz54sgd32CKfMVB0lRG3dcmEMJoR0lWu9bHv0bboYz+//X6Rm01PN1Nc8jXZrb7VXycj0lqhDIeENDh2vnPzOIivhOoXMVsbepPgudptIe6KnCkQTSl9YI4xjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=IPVBd7gx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="IPVBd7gx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 083BEC4CED2; Sat, 11 Jan 2025 11:21:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1736594470; bh=nZ3UgaKdv+vkvxw16qHZs/6umABIhry598e5zOPULEo=; h=From:Date:Subject:To:Cc:From; b=IPVBd7gxgh5LvV1tQlmbxCPPCs+Hlr0PuljW4wRl0CKl4L4zTJh662R0fkofZt5fN SgNcsNtNPUmqSOxeSEBiok2ehCGncMzRRiUsm61AMIH5m9d0UayDXhxYIXtQAJqP6F w+HuMz0JI//QNOESp3P5KmhCk49S+UZi+eHl6zRDtnva9kE3shgY1ou8APZlGQA2S6 5Ic+FSBgS/suRQsMzTyNfNOrXU0s4NPwqM920ozPBprl52S/tA0wlJxOEUYv1+uf6A 7IF5zkzVQvXyK6QEl+X9QJ06gP4tMCMacXYqxqkntM6I+DIvrWFa3yZFvYTB9oLS+Y U/zKAC5ABX/pA== From: Konrad Dybcio Date: Sat, 11 Jan 2025 12:21:00 +0100 Subject: [PATCH] spmi: Fix controller->node != parent->node breakage Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250111-topic-spmi_node_breakage-v1-1-3f60111a1d19@oss.qualcomm.com> X-B4-Tracking: v=1; b=H4sIABtUgmcC/x2MQQqAIBAAvxJ7TmiNivpKRJittUQqGhFIf086D sxMgkiBKcJQJAh0c2RnM2BZgN6V3UjwmhlkJZsKEcXlPGsR/cmzdSvNSyB1qOyZtqulVL1GWiD nPpDh51+P0/t+1k6rImoAAAA= X-Change-ID: 20250111-topic-spmi_node_breakage-f67322a9c1eb To: Mauro Carvalho Chehab , Stephen Boyd , Joe Hattori Cc: Marijn Suijten , linux-kernel@vger.kernel.org, Bjorn Andersson , Abel Vesa , Johan Hovold , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1736594467; l=5765; i=konrad.dybcio@oss.qualcomm.com; s=20230215; h=from:subject:message-id; bh=pAKVRMn3GTfOhuseeMKYozCJmTEEvrR5W677RE+IT1A=; b=IOB+FMBfp3IwRvD25fNztuzJ2aBXFyryXl+XG7PRkKxQxAbjOLUY6VxDvVvAyEQoPL+CY5w33 W2sD2MO+E1wD6u/sCuJ/Q/uOV1l5IMidljg+Ewx8DIyuT0rg39/8r11 X-Developer-Key: i=konrad.dybcio@oss.qualcomm.com; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= From: Konrad Dybcio On some platforms, like recent Qualcomm SoCs with multi-bus SPMI arbiters, controller->node must be assigned to the individual buses' subnodes, as the slave devices are children of these, like so: arbiter@c400000 spmi@c42d000 pmic@0 spmi@c432000 pmic@0 The commit referenced in Fixes changed that assignment, such that spmi_controller_alloc() always assumes the PMICs come directly under the arbiter node (which is true when there's only a single bus per controller). Make controller->node specifiable to both benefit from Joe's refcount improvements and un-break the aforementioned platforms. Fixes: 821b07853e32 ("spmi: hisi-spmi-controller: manage the OF node reference in device initialization and cleanup") Signed-off-by: Konrad Dybcio --- drivers/spmi/hisi-spmi-controller.c | 4 +++- drivers/spmi/spmi-devres.c | 6 ++++-- drivers/spmi/spmi-pmic-arb.c | 2 +- drivers/spmi/spmi.c | 4 +++- include/linux/spmi.h | 5 ++++- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/spmi/hisi-spmi-controller.c b/drivers/spmi/hisi-spmi-controller.c index dd21c5d1ca8301d508b85dfaf61ddfabed17aca9..7cb056bb5529708d37aeda9f6fa2058d4c7a536a 100644 --- a/drivers/spmi/hisi-spmi-controller.c +++ b/drivers/spmi/hisi-spmi-controller.c @@ -267,7 +267,9 @@ static int spmi_controller_probe(struct platform_device *pdev) struct resource *iores; int ret; - ctrl = devm_spmi_controller_alloc(&pdev->dev, sizeof(*spmi_controller)); + ctrl = devm_spmi_controller_alloc(&pdev->dev, + pdev->dev.of_node + sizeof(*spmi_controller)); if (IS_ERR(ctrl)) { dev_err(&pdev->dev, "can not allocate spmi_controller data\n"); return PTR_ERR(ctrl); diff --git a/drivers/spmi/spmi-devres.c b/drivers/spmi/spmi-devres.c index 62c4b3f24d0656eea9b6da489b7716b9965bedbe..e84af711714d1892a5781111dc538747f5a5e835 100644 --- a/drivers/spmi/spmi-devres.c +++ b/drivers/spmi/spmi-devres.c @@ -11,7 +11,9 @@ static void devm_spmi_controller_release(struct device *parent, void *res) spmi_controller_put(*(struct spmi_controller **)res); } -struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, size_t size) +struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, + struct device_node *node, + size_t size) { struct spmi_controller **ptr, *ctrl; @@ -19,7 +21,7 @@ struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, size_t if (!ptr) return ERR_PTR(-ENOMEM); - ctrl = spmi_controller_alloc(parent, size); + ctrl = spmi_controller_alloc(parent, node, size); if (IS_ERR(ctrl)) { devres_free(ptr); return ctrl; diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index 73f2f19737f8cec266a051a956ce2123661a714e..226f51d94a70328c6322664d2d05a8b64645674a 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -1674,7 +1674,7 @@ static int spmi_pmic_arb_bus_init(struct platform_device *pdev, int index, ret; int irq; - ctrl = devm_spmi_controller_alloc(dev, sizeof(*bus)); + ctrl = devm_spmi_controller_alloc(dev, node, sizeof(*bus)); if (IS_ERR(ctrl)) return PTR_ERR(ctrl); diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c index 166beb2083a3f801435d8ffd843310582911e3ab..c1a03da55a265c9294f6a16bc285310cebd00726 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c @@ -435,6 +435,7 @@ EXPORT_SYMBOL_GPL(spmi_device_alloc); /** * spmi_controller_alloc() - Allocate a new SPMI controller * @parent: parent device + * @node: device node to associate with the controller (usually parent->of_node) * @size: size of private data * * Caller is responsible for either calling spmi_controller_add() to add the @@ -443,6 +444,7 @@ EXPORT_SYMBOL_GPL(spmi_device_alloc); * spmi_controller_get_drvdata() */ struct spmi_controller *spmi_controller_alloc(struct device *parent, + struct device_node *node, size_t size) { struct spmi_controller *ctrl; @@ -459,7 +461,7 @@ struct spmi_controller *spmi_controller_alloc(struct device *parent, ctrl->dev.type = &spmi_ctrl_type; ctrl->dev.bus = &spmi_bus_type; ctrl->dev.parent = parent; - device_set_node(&ctrl->dev, of_fwnode_handle(of_node_get(parent->of_node))); + device_set_node(&ctrl->dev, of_fwnode_handle(of_node_get(node))); spmi_controller_set_drvdata(ctrl, &ctrl[1]); id = ida_alloc(&ctrl_ida, GFP_KERNEL); diff --git a/include/linux/spmi.h b/include/linux/spmi.h index 28e8c8bd39441fa6451be3364006fb3b47a47dc9..9de74000911456800237a3244d5e8158fadf8317 100644 --- a/include/linux/spmi.h +++ b/include/linux/spmi.h @@ -105,6 +105,7 @@ static inline void spmi_controller_set_drvdata(struct spmi_controller *ctrl, } struct spmi_controller *spmi_controller_alloc(struct device *parent, + struct device_node *node, size_t size); /** @@ -120,7 +121,9 @@ static inline void spmi_controller_put(struct spmi_controller *ctrl) int spmi_controller_add(struct spmi_controller *ctrl); void spmi_controller_remove(struct spmi_controller *ctrl); -struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, size_t size); +struct spmi_controller *devm_spmi_controller_alloc(struct device *parent, + struct device_node *node, + size_t size); int devm_spmi_controller_add(struct device *parent, struct spmi_controller *ctrl); /** --- base-commit: 2b88851f583d3c4e40bcd40cfe1965241ec229dd change-id: 20250111-topic-spmi_node_breakage-f67322a9c1eb Best regards, -- Konrad Dybcio