linux-kernel - [PATCH 2/2] of: provide of_n_{addr,size}_cells wrappers for !CONFIG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <1454536806-3755190-2-git-send-email-arnd@arndb.de>
Date:	Wed,  3 Feb 2016 22:59:52 +0100
From:	Arnd Bergmann <arnd@...db.de>
To:	devicetree@...r.kernel.org
Cc:	linux-arm-kernel@...ts.infradead.org,
	Arnd Bergmann <arnd@...db.de>,
	Grant Likely <grant.likely@...aro.org>,
	Frank Rowand <frowand.list@...il.com>,
	Rob Herring <robh+dt@...nel.org>,
	Lucas Stach <l.stach@...gutronix.de>,
	Bjorn Helgaas <bhelgaas@...gle.com>,
	Magnus Damm <damm@...nsource.se>,
	Geert Uytterhoeven <geert@...ux-m68k.org>,
	Ben Dooks <ben.dooks@...ethink.co.uk>,
	linux-pci@...r.kernel.org, linux-sh@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [PATCH 2/2] of: provide of_n_{addr,size}_cells wrappers for !CONFIG_OF

The pci-rcar driver is enabled for compile tests, and this has
now shown that the driver cannot build without CONFIG_OF,
following the inclusion of f8f2fe7355fb "PCI: rcar: Use new OF
interrupt mapping when possible":

../drivers/pci/host/pcie-rcar.c: In function 'pci_dma_range_parser_init':
../drivers/pci/host/pcie-rcar.c:856:2: error: implicit declaration of function 'of_n_addr_cells' [-Werror=implicit-function-declaration]
  parser->pna = of_n_addr_cells(node);
  ^
As pointed out by Ben Dooks and Geert Uytterhoeven, this is actually
supposed to build fine, which we can achieve if we make the
declaration of of_irq_parse_and_map_pci conditional on CONFIG_OF
and provide an empty inline function otherwise, as we do for
a lot of other of interfaces.

This lets us build the rcar_pci driver again without CONFIG_OF
for build testing. All platforms using this driver select OF,
so this doesn't change anything for the users.

Signed-off-by: Arnd Bergmann <arnd@...db.de>
Cc: devicetree@...r.kernel.org
Cc: Rob Herring <robh+dt@...nel.org>
Cc: Grant Likely <grant.likely@...aro.org>
Cc: Lucas Stach <l.stach@...gutronix.de>
Cc: Bjorn Helgaas <bhelgaas@...gle.com>
Cc: Magnus Damm <damm@...nsource.se>
Cc: Geert Uytterhoeven <geert@...ux-m68k.org>
Cc: Ben Dooks <ben.dooks@...ethink.co.uk>
Cc: linux-pci@...r.kernel.org
Cc: linux-sh@...r.kernel.org

---
I originally sent the patch in 2014 when things initially broke
and then forgot about while it was applied in my randconfig patch
stack. It's still broken and I think this is hte correct fix.
---
 include/linux/of.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/linux/of.h b/include/linux/of.h
index f8d9b558f9bd..9c941cd3ba58 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -565,6 +565,9 @@ static inline struct device_node *of_get_cpu_node(int cpu,
 	return NULL;
 }
 
+static inline int of_n_addr_cells(struct device_node *np) { return 0; }
+static inline int of_n_size_cells(struct device_node *np) { return 0; }
+
 static inline int of_property_read_u64(const struct device_node *np,
 				       const char *propname, u64 *out_value)
 {
-- 
2.7.0