iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parisc: Fix device names in /proc/iomem

Browse Source 
Fix the output of /proc/iomem to show the real hardware device name
including the pa_pathname, e.g. "Merlin 160 Core Centronics [8:16:0]".
Up to now only the pa_pathname ("[8:16.0]") was shown.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v4.9+
This commit is contained in:
Helge Deller 2022-07-18 17:06:47 +02:00
parent b383d94ad7
commit cab56b51ec
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/parisc/kernel/drivers.c
View File

@ -520,7 +520,6 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
dev->id.hversion_rev = iodc_data[1] & 0x0f; dev->id.hversion_rev = iodc_data[1] & 0x0f;
dev->id.sversion = ((iodc_data[4] & 0x0f) << 16) | dev->id.sversion = ((iodc_data[4] & 0x0f) << 16) |
(iodc_data[5] << 8) | iodc_data[6]; (iodc_data[5] << 8) | iodc_data[6];
dev->hpa.name = parisc_pathname(dev);
dev->hpa.start = hpa; dev->hpa.start = hpa;
/* This is awkward. The STI spec says that gfx devices may occupy /* This is awkward. The STI spec says that gfx devices may occupy
* 32MB or 64MB. Unfortunately, we don't know how to tell whether * 32MB or 64MB. Unfortunately, we don't know how to tell whether
@ -534,10 +533,10 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path)
dev->hpa.end = hpa + 0xfff; dev->hpa.end = hpa + 0xfff;
} }
dev->hpa.flags = IORESOURCE_MEM; dev->hpa.flags = IORESOURCE_MEM;
name = parisc_hardware_description(&dev->id); dev->hpa.name = dev->name;
if (name) { name = parisc_hardware_description(&dev->id) ? : "unknown";
strlcpy(dev->name, name, sizeof(dev->name)); snprintf(dev->name, sizeof(dev->name), "%s [%s]",
} name, parisc_pathname(dev));
/* Silently fail things like mouse ports which are subsumed within /* Silently fail things like mouse ports which are subsumed within
* the keyboard controller * the keyboard controller