UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers fixes 

for 5.8, please pull the following:
 
 - Andy provides a fix for the Raspberry Pi firmware driver to print the
   correct time upon boot. This is a fallout from a converstion to use
   the ptT format
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl7tHhsACgkQh9CWnEQH
 BwRMJw/+JzziPy3uqhdXy6XAwNgZBly2vvya49JS82vRKHznr58RIpkpOFUB7gWO
 y8M/UscBq0AKLL7bh9upfGhlmSdOAZMabfZ3WFjzvkMmBnb3OWNmptJy7+0GUyjo
 g/Ibm5jqgInNnBZ+0xqpYHTWAp2KCLBEintRKsIGu8bf+B2uEhJvbew1gQYKi6nM
 lwrPxGj15UkthrPWlz4DBFzkPUSXljp3GlQBOe0YX0jHyXc8Emu9QGgvUPWYCPSm
 brNrhqtV5+nCzUP6Ucc6pT8Ejmyzq75KHAeWYxDQGrHZagZODN8ciLxKAuQDlL3R
 PTpX6RInwZp5RtB9alQRaohMXfgNIgcwuqkQYqwZdcd1SA/SGK25aUpKpy5SdS4g
 POT0p9bp13/I0VDEY0uwYE3GhAW8ES7Ai+HinUEiREiQAweLySb9RxWaPobnbJUC
 zKxXOyyuBSLThYI/xSAdLCeAtEOkuA0tEdjWR6qKmiL6qb69pnEXEyYcRcTD60aa
 XuCTPD5aK64aHw6wmUsHEVGOw6KMkT0aln0kHqWrkPNYjoJRumIDcBkrooAj1JPi
 D98/NTizVT/9z4xnk2ybRbaU1mA0zTyN8hacWMOUuVkEKPQF7J0VGASNSfwadqeh
 odzf+Yq1K6Qr6dnfSF5C3vKP7ye99cVsriYbbtzi6X1Zzgniqvo=
 =mIdj
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.8/drivers-fixes' of https://github.com/Broadcom/stblinux into arm/fixes

This pull request contains Broadcom ARM/ARM64/MIPS SoCs drivers fixes
for 5.8, please pull the following:

- Andy provides a fix for the Raspberry Pi firmware driver to print the
  correct time upon boot. This is a fallout from a converstion to use
  the ptT format

* tag 'arm-soc/for-5.8/drivers-fixes' of https://github.com/Broadcom/stblinux:
  ARM: bcm2835: Fix integer overflow in rpi_firmware_print_firmware_revision()

Link: https://lore.kernel.org/r/20200619202250.19029-2-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-06-28 14:48:06 +02:00
parent 6d89c73ca5 e92bc059e7
commit 2596ce4b4d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firmware/raspberrypi.c
View File

@ -181,6 +181,7 @@ EXPORT_SYMBOL_GPL(rpi_firmware_property);
static void static void
rpi_firmware_print_firmware_revision(struct rpi_firmware *fw) rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
{ {
time64_t date_and_time;
u32 packet; u32 packet;
int ret = rpi_firmware_property(fw, int ret = rpi_firmware_property(fw,
RPI_FIRMWARE_GET_FIRMWARE_REVISION, RPI_FIRMWARE_GET_FIRMWARE_REVISION,
@ -189,7 +190,9 @@ rpi_firmware_print_firmware_revision(struct rpi_firmware *fw)
if (ret) if (ret)
return; return;
dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &packet); /* This is not compatible with y2038 */
date_and_time = packet;
dev_info(fw->cl.dev, "Attached to firmware from %ptT\n", &date_and_time);
} }
static void static void