Commit d92800f7 authored by Rob Herring's avatar Rob Herring Committed by Wen Zhiwei
Browse files

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

stable inclusion
from stable-v6.6.70
commit 443f803b332b9f78a843c08453b33981dcde9af8
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBOHV1

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=443f803b332b9f78a843c08453b33981dcde9af8



--------------------------------

[ 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: default avatarHerve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20231026135358.3564307-2-robh@kernel.org


Signed-off-by: default avatarRob Herring <robh@kernel.org>
Stable-dep-of: 7f05e20b989a ("of: address: Preserve the flags portion on 1:1 dma-ranges mapping")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 6acab49a

drivers/of/address.c

+5 −9
Original line number Diff line number Diff line
@@ -46,7 +46,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);

};
@@ -371,7 +371,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 */
@@ -383,7 +383,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 */
@@ -394,7 +394,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 */
@@ -827,7 +827,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;
@@ -837,10 +837,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)