Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'for-5.20/parisc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller:
"One real bugfix to change the io_pgetevents_time64() syscall to use
the compat implementation when running in compat mode, otherwise the
signed int32 parameters min_nr and nr will be incorrectly handled as
unsigned int64 values.

Other than that just small cleanups:

- hardware database housekeeping and proper /proc/iomem output

- add proper function exit code if probe functions fail

- drop stale variables (pa_swapper_pg_lock)

- drop unneccessary zero-initializations

- typo fixes in comments"

* tag 'for-5.20/parisc-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
Input: gscps2 - check return value of ioremap() in gscps2_probe()
parisc: io_pgetevents_time64() needs compat syscall in 32-bit compat mode
parisc: Drop zero variable initialisations in mm/init.c
parisc: Do not initialise statics to 0
parisc: Check the return value of ioremap() in lba_driver_probe()
parisc: Drop pa_swapper_pg_lock spinlock
parisc: Fix comment typo in fault.c
parisc: Fix device names in /proc/iomem
parisc: Clean up names in hardware database

+22 -21
-3
arch/parisc/kernel/cache.c
··· 50 50 */ 51 51 DEFINE_SPINLOCK(pa_tlb_flush_lock); 52 52 53 - /* Swapper page setup lock. */ 54 - DEFINE_SPINLOCK(pa_swapper_pg_lock); 55 - 56 53 #if defined(CONFIG_64BIT) && defined(CONFIG_SMP) 57 54 int pa_serialize_tlb_flushes __ro_after_init; 58 55 #endif
+4 -5
arch/parisc/kernel/drivers.c
··· 520 520 dev->id.hversion_rev = iodc_data[1] & 0x0f; 521 521 dev->id.sversion = ((iodc_data[4] & 0x0f) << 16) | 522 522 (iodc_data[5] << 8) | iodc_data[6]; 523 - dev->hpa.name = parisc_pathname(dev); 524 523 dev->hpa.start = hpa; 525 524 /* This is awkward. The STI spec says that gfx devices may occupy 526 525 * 32MB or 64MB. Unfortunately, we don't know how to tell whether ··· 533 534 dev->hpa.end = hpa + 0xfff; 534 535 } 535 536 dev->hpa.flags = IORESOURCE_MEM; 536 - name = parisc_hardware_description(&dev->id); 537 - if (name) { 538 - strlcpy(dev->name, name, sizeof(dev->name)); 539 - } 537 + dev->hpa.name = dev->name; 538 + name = parisc_hardware_description(&dev->id) ? : "unknown"; 539 + snprintf(dev->name, sizeof(dev->name), "%s [%s]", 540 + name, parisc_pathname(dev)); 540 541 541 542 /* Silently fail things like mouse ports which are subsumed within 542 543 * the keyboard controller
+4 -7
arch/parisc/kernel/hardware.c
··· 23 23 * HP PARISC Hardware Database 24 24 * Access to this database is only possible during bootup 25 25 * so don't reference this table after starting the init process 26 - * 27 - * NOTE: Product names which are listed here and ends with a '?' 28 - * are guessed. If you know the correct name, please let us know. 29 26 */ 30 27 31 28 static struct hp_hardware hp_hardware_list[] __initdata = { ··· 209 212 {HPHW_NPROC,0x5DD,0x4,0x81,"Duet W2"}, 210 213 {HPHW_NPROC,0x5DE,0x4,0x81,"Piccolo W+"}, 211 214 {HPHW_NPROC,0x5DF,0x4,0x81,"Cantata W2"}, 212 - {HPHW_NPROC,0x5DF,0x0,0x00,"Marcato W+ (rp5470)?"}, 215 + {HPHW_NPROC,0x5DF,0x0,0x00,"Marcato W+ (rp5470)"}, 213 216 {HPHW_NPROC,0x5E0,0x4,0x91,"Cantata DC- W2"}, 214 217 {HPHW_NPROC,0x5E1,0x4,0x91,"Crescendo DC- W2"}, 215 218 {HPHW_NPROC,0x5E2,0x4,0x91,"Crescendo 650 W2"}, ··· 263 266 {HPHW_NPROC,0x888,0x4,0x91,"Storm Peak Fast DC-"}, 264 267 {HPHW_NPROC,0x889,0x4,0x91,"Storm Peak Fast"}, 265 268 {HPHW_NPROC,0x88A,0x4,0x91,"Crestone Peak Slow"}, 266 - {HPHW_NPROC,0x88B,0x4,0x91,"Crestone Peak Fast?"}, 269 + {HPHW_NPROC,0x88B,0x4,0x91,"Crestone Peak Fast"}, 267 270 {HPHW_NPROC,0x88C,0x4,0x91,"Orca Mako+"}, 268 271 {HPHW_NPROC,0x88D,0x4,0x91,"Rainier/Medel Mako+ Slow"}, 269 272 {HPHW_NPROC,0x88E,0x4,0x91,"Rainier/Medel Mako+ Fast"}, 270 - {HPHW_NPROC,0x892,0x4,0x91,"Mt. Hamilton Slow Mako+?"}, 273 + {HPHW_NPROC,0x892,0x4,0x91,"Mt. Hamilton Slow Mako+"}, 271 274 {HPHW_NPROC,0x894,0x4,0x91,"Mt. Hamilton Fast Mako+"}, 272 275 {HPHW_NPROC,0x895,0x4,0x91,"Storm Peak Slow Mako+"}, 273 276 {HPHW_NPROC,0x896,0x4,0x91,"Storm Peak Fast Mako+"}, ··· 1195 1198 {HPHW_FIO, 0x004, 0x00340, 0x0, "BARCO CX4500 VME Grphx Cnsl"}, 1196 1199 {HPHW_FIO, 0x004, 0x00360, 0x0, "Hughes TOG VME FDDI"}, 1197 1200 {HPHW_FIO, 0x076, 0x000AD, 0x0, "Crestone Peak Core RS-232"}, 1198 - {HPHW_FIO, 0x077, 0x000AD, 0x0, "Crestone Peak Fast? Core RS-232"}, 1201 + {HPHW_FIO, 0x077, 0x000AD, 0x0, "Crestone Peak Fast Core RS-232"}, 1199 1202 {HPHW_IOA, 0x185, 0x0000B, 0x00, "Java BC Summit Port"}, 1200 1203 {HPHW_IOA, 0x1FF, 0x0000B, 0x00, "Hitachi Ghostview Summit Port"}, 1201 1204 {HPHW_IOA, 0x580, 0x0000B, 0x10, "U2-IOA BC Runway Port"},
+2 -2
arch/parisc/kernel/pci-dma.c
··· 36 36 #include <asm/tlbflush.h> /* for purge_tlb_*() macros */ 37 37 38 38 static struct proc_dir_entry * proc_gsc_root __read_mostly = NULL; 39 - static unsigned long pcxl_used_bytes __read_mostly = 0; 40 - static unsigned long pcxl_used_pages __read_mostly = 0; 39 + static unsigned long pcxl_used_bytes __read_mostly; 40 + static unsigned long pcxl_used_pages __read_mostly; 41 41 42 42 extern unsigned long pcxl_dma_start; /* Start of pcxl dma mapping area */ 43 43 static DEFINE_SPINLOCK(pcxl_res_lock);
+1 -1
arch/parisc/kernel/syscalls/syscall.tbl
··· 413 413 412 32 utimensat_time64 sys_utimensat sys_utimensat 414 414 413 32 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64 415 415 414 32 ppoll_time64 sys_ppoll compat_sys_ppoll_time64 416 - 416 32 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents 416 + 416 32 io_pgetevents_time64 sys_io_pgetevents compat_sys_io_pgetevents_time64 417 417 417 32 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64 418 418 418 32 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend 419 419 419 32 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive
+1 -1
arch/parisc/mm/fault.c
··· 38 38 /* 39 39 * parisc_acctyp(unsigned int inst) -- 40 40 * Given a PA-RISC memory access instruction, determine if the 41 - * the instruction would perform a memory read or memory write 41 + * instruction would perform a memory read or memory write 42 42 * operation. 43 43 * 44 44 * This function assumes that the given instruction is a memory access
+1 -1
arch/parisc/mm/init.c
··· 722 722 static unsigned long dirty_space_id[SID_ARRAY_SIZE]; 723 723 static unsigned long space_id_index; 724 724 static unsigned long free_space_ids = NR_SPACE_IDS - 1; 725 - static unsigned long dirty_space_ids = 0; 725 + static unsigned long dirty_space_ids; 726 726 727 727 static DEFINE_SPINLOCK(sid_lock); 728 728
+4
drivers/input/serio/gscps2.c
··· 350 350 ps2port->port = serio; 351 351 ps2port->padev = dev; 352 352 ps2port->addr = ioremap(hpa, GSC_STATUS + 4); 353 + if (!ps2port->addr) { 354 + ret = -ENOMEM; 355 + goto fail_nomem; 356 + } 353 357 spin_lock_init(&ps2port->lock); 354 358 355 359 gscps2_reset(ps2port);
+5 -1
drivers/parisc/lba_pci.c
··· 1476 1476 u32 func_class; 1477 1477 void *tmp_obj; 1478 1478 char *version; 1479 - void __iomem *addr = ioremap(dev->hpa.start, 4096); 1479 + void __iomem *addr; 1480 1480 int max; 1481 + 1482 + addr = ioremap(dev->hpa.start, 4096); 1483 + if (addr == NULL) 1484 + return -ENOMEM; 1481 1485 1482 1486 /* Read HW Rev First */ 1483 1487 func_class = READ_REG32(addr + LBA_FCLASS);