mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-07 05:04:00 -05:00
b4d7263bc3
This patchset silences some noisy dts false warnings: [ 0.616266] OF: Bad cell count for /spi@1100d000/flash@0/partitions [ 0.622551] OF: Bad cell count for /spi@1100d000/flash@0/partitions Closes: https://github.com/openwrt/openwrt/issues/14701 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/20942 Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
From 64ee3cf096ac590e7da2ceac1c390546bff5e240 Mon Sep 17 00:00:00 2001
|
|
From: "Rob Herring (Arm)" <robh@kernel.org>
|
|
Date: Fri, 8 Nov 2024 13:35:48 -0600
|
|
Subject: [PATCH] of/address: Rework bus matching to avoid warnings
|
|
|
|
With warnings added for deprecated #address-cells/#size-cells handling,
|
|
the DT address handling code causes warnings when used on nodes with no
|
|
address. This happens frequently with calls to of_platform_populate() as
|
|
it is perfectly acceptable to have devices without a 'reg' property. The
|
|
desired behavior is to just silently return an error when retrieving an
|
|
address.
|
|
|
|
The warnings can be avoided by checking for "#address-cells" presence
|
|
first and checking for an address property before fetching
|
|
"#address-cells" and "#size-cells".
|
|
|
|
Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Reported-by: Steven Price <steven.price@arm.com>
|
|
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
|
|
Link: https://lore.kernel.org/r/20241108193547.2647986-2-robh@kernel.org
|
|
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
|
|
---
|
|
drivers/of/address.c | 14 +++++++++-----
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/of/address.c
|
|
+++ b/drivers/of/address.c
|
|
@@ -331,7 +331,11 @@ static unsigned int of_bus_isa_get_flags
|
|
|
|
static int of_bus_default_flags_match(struct device_node *np)
|
|
{
|
|
- return of_bus_n_addr_cells(np) == 3;
|
|
+ /*
|
|
+ * Check for presence first since of_bus_n_addr_cells() will warn when
|
|
+ * walking parent nodes.
|
|
+ */
|
|
+ return of_property_present(np, "#address-cells") && (of_bus_n_addr_cells(np) == 3);
|
|
}
|
|
|
|
/*
|
|
@@ -700,16 +704,16 @@ const __be32 *__of_get_address(struct de
|
|
if (strcmp(bus->name, "pci") && (bar_no >= 0))
|
|
return NULL;
|
|
|
|
- bus->count_cells(dev, &na, &ns);
|
|
- if (!OF_CHECK_ADDR_COUNT(na))
|
|
- return NULL;
|
|
-
|
|
/* Get "reg" or "assigned-addresses" property */
|
|
prop = of_get_property(dev, bus->addresses, &psize);
|
|
if (prop == NULL)
|
|
return NULL;
|
|
psize /= 4;
|
|
|
|
+ bus->count_cells(dev, &na, &ns);
|
|
+ if (!OF_CHECK_ADDR_COUNT(na))
|
|
+ return NULL;
|
|
+
|
|
onesize = na + ns;
|
|
for (i = 0; psize >= onesize; psize -= onesize, prop += onesize, i++) {
|
|
u32 val = be32_to_cpu(prop[0]);
|