of: address: Store number of bus flag cells rather than bool

[ Upstream commit 88696db08b7efa3b6bb722014ea7429e78f6be32 ]

It is more useful to know how many flags cells a bus has rather than
whether a bus has flags or not as ultimately the number of cells is the
information used. Replace 'has_flags' boolean with 'flag_cells' count.

Acked-by: Herve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20231026135358.3564307-2-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Stable-dep-of: 7f05e20b989a ("of: address: Preserve the flags portion on 1:1 dma-ranges mapping")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 39abcad30ddb5beb3d8a07318280bf88b0d30ae8..596381e70c0a0faf4137cb5fa38ab182ac8709c5 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -50,7 +50,7 @@ struct of_bus {
        u64             (*map)(__be32 *addr, const __be32 *range,
                                int na, int ns, int pna);
        int             (*translate)(__be32 *addr, u64 offset, int na);
-       bool    has_flags;
+       int             flag_cells;
        unsigned int    (*get_flags)(const __be32 *addr);
 };
 
@@ -361,7 +361,7 @@ static struct of_bus of_busses[] = {
                .count_cells = of_bus_pci_count_cells,
                .map = of_bus_pci_map,
                .translate = of_bus_default_flags_translate,
-               .has_flags = true,
+               .flag_cells = 1,
                .get_flags = of_bus_pci_get_flags,
        },
 #endif /* CONFIG_PCI */
@@ -373,7 +373,7 @@ static struct of_bus of_busses[] = {
                .count_cells = of_bus_isa_count_cells,
                .map = of_bus_isa_map,
                .translate = of_bus_default_flags_translate,
-               .has_flags = true,
+               .flag_cells = 1,
                .get_flags = of_bus_isa_get_flags,
        },
        /* Default with flags cell */
@@ -384,7 +384,7 @@ static struct of_bus of_busses[] = {
                .count_cells = of_bus_default_count_cells,
                .map = of_bus_default_flags_map,
                .translate = of_bus_default_flags_translate,
-               .has_flags = true,
+               .flag_cells = 1,
                .get_flags = of_bus_default_flags_get_flags,
        },
        /* Default */
@@ -753,7 +753,7 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
        int na = parser->na;
        int ns = parser->ns;
        int np = parser->pna + na + ns;
-       int busflag_na = 0;
+       int busflag_na = parser->bus->flag_cells;
 
        if (!range)
                return NULL;
@@ -763,10 +763,6 @@ struct of_pci_range *of_pci_range_parser_one(struct of_pci_range_parser *parser,
 
        range->flags = parser->bus->get_flags(parser->range);
 
-       /* A extra cell for resource flags */
-       if (parser->bus->has_flags)
-               busflag_na = 1;
-
        range->bus_addr = of_read_number(parser->range + busflag_na, na - busflag_na);
 
        if (parser->dma)