niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Devicetree fix for 6.14, part 2:

Browse source 
- Revert reserved-memory 'alignment' property to use '#address-cells'
   instead of '#size-cells'. What's in use trumps the spec.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmfHItYACgkQ+vtdtY28
 YcN5Hg/9FGB85/x2ImoKlB988EUNdz6TZU2pubqs/mimV0LlyUU0bH9+56PfDmNX
 xlaXYbGNaUqXr7Rz50v126ofUY0PMEPBrAl1B+to+vASgwqh8uxkdCPgXNksYZzu
 5alp4APmOfbmAEuGb7nFqsFQW5JCphqKzIc/NJDvLyE+VfdPvli6imG8aXFc0HCv
 yQ6bZoUgvMKonH+i0b5+ccYL6Ibq9bhD2zd9EHnFZOU8zZO3KS9QqjnHW/CAAYys
 0A1X7i5L1zIVdwaLbZH1lGW5gFiXj8HIfjKXlDJ/YfWZ/V1DnAHZ2nBkoLa2KdiV
 ggpf3oOaEEQkdfx8jXbzChN4f6v5cR9wp52iJmM4ro4GIajsAnbRcgV0/PZ3AVnD
 KxORCz3BDVyQrPtHdp/xMqBZ2my9N1M/sNkfQsmuAdEIUSkpJYtYHSR/m5c+odIs
 qeIfIpbtH+ySRbxE0xH4Wz0rk4+RJJaZKeZQa/eany5begs+REIEQzOHt6tIWbUA
 t1CXSTLOFezCKwt4cRUckqVhAElSGBunepCPSZstB9hKjV1Rj8lMet6XZXEEYUrr
 /hYJYN5/CHPj8f/w3udkBxNEwYx02j4ezThumZtMrBXFLxccnif1s+CySUyE9yHf
 wI9Z2N8TNhj2TfYIw8dceEVVBocDP6AxTe3BjoGFuWUix7Hf8uw=
 =SJ8W
 -----END PGP SIGNATURE-----

Merge tag 'devicetree-fixes-for-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fix from Rob Herring:

 - Revert reserved-memory 'alignment' property to use '#address-cells'
   instead of '#size-cells'. What's in use trumps the spec.

* tag 'devicetree-fixes-for-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  Revert "of: reserved-memory: Fix using wrong number of cells to get property 'alignment'"
This commit is contained in:
Linus Torvalds 2025-03-04 09:04:29 -10:00
commit 48a5eed9ad
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/of/of_reserved_mem.c
View file

@ -415,12 +415,12 @@ static int __init __reserved_mem_alloc_size(unsigned long node, const char *unam
prop = of_get_flat_dt_prop(node, "alignment", &len);
if (prop) {
if (len != dt_root_size_cells * sizeof(__be32)) {
if (len != dt_root_addr_cells * sizeof(__be32)) {
pr_err("invalid alignment property in '%s' node.\n",
uname);
return -EINVAL;
}
align = dt_mem_next_cell(dt_root_size_cells, &prop);
align = dt_mem_next_cell(dt_root_addr_cells, &prop);
}
nomap = of_get_flat_dt_prop(node, "no-map", NULL) != NULL;