kernel/linux.git/drivers/nubus, branch v6.6.132

nubus: Don't list slot resources by default

2023-05-22T11:51:56+00:00

Some Nubus card ROMs contain many slot resources. A single Radius video card produced well over a thousand entries under /proc/bus/nubus/. Populating /proc/bus/nubus/ on a slow machine with several such cards installed takes long enough that the user may think that the system is wedged. All those procfs entries also consume significant RAM though they are not normally needed (except by developers). Omit these resources from /proc/bus/nubus/ by default and add a kernel parameter to enable them when needed. On the test machine, this saved 300 kB and 10 seconds. Cc: Brad Boyer Reviewed-by: Brad Boyer Tested-by: Stan Johnson Signed-off-by: Finn Thain Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/71ed7fb234a5f7381a50253b0d841a656d53e64c.1684200125.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven

nubus: Remove proc entries before adding them

2023-05-22T11:51:48+00:00

The config ROMs on some Nubus cards contain mistakes such as resource duplication. This results in a warning from proc_register(): NuBus: Scanning NuBus slots. ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/proc/generic.c:376 proc_register+0xbc/0xda proc_dir_entry '24/5' already registered Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 6.1.0-5-m68k #1 Debian 6.1.12-1 Stack from 00829d18: 00829d18 00451507 00451507 00000000 00000009 0038c57c 00451507 00386bae 00442945 0045f062 00000178 00868580 00868f50 00386c42 0045f062 00000178 00166fc8 00000009 00000000 00829d78 008685e4 0037f9ec 00000025 00248808 0045f0df 00829d94 00166fc8 0045f062 00000178 00000009 0045f0df 008689e4 008685e4 fafe3a20 00868980 00829df3 00829e32 00000024 00829dc0 00167332 00868980 00868580 00829e40 00248d36 00829df3 00008124 00868980 00248b0c Call Trace: [<0038c57c>] dump_stack+0xc/0x10 [<00386bae>] __warn+0x70/0xbc [<00386c42>] warn_slowpath_fmt+0x48/0x66 [<00166fc8>] proc_register+0xbc/0xda [<0037f9ec>] memcmp+0x0/0x56 [<00248808>] nubus_get_rsrc_str+0x0/0x5e [<00166fc8>] proc_register+0xbc/0xda [<00167332>] proc_create_single_data+0x40/0x48 [<00248d36>] nubus_proc_add_rsrc_mem+0x68/0xa4 [<00008124>] amiga_mksound+0xb8/0xc8 [<00248b0c>] nubus_proc_rsrc_show+0x0/0xa4 [<00386180>] memset+0x0/0x94 [<0024864a>] nubus_readdir+0x0/0x66 [<00560f35>] nubus_get_vendorinfo.isra.0+0x87/0x10e [<00560fb4>] nubus_get_vendorinfo.isra.0+0x106/0x10e [<00248d72>] nubus_proc_add_rsrc+0x0/0x8e [<001f6f50>] __dynamic_pr_debug+0x0/0x96 [<0038741e>] _printk+0x0/0x18 [<0016fafe>] kernfs_link_sibling+0x9a/0xaa [<00561cb0>] nubus_init+0x660/0x79c [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<00561650>] nubus_init+0x0/0x79c [<00010000>] frc1_dst+0xe/0x14 [<00002172>] do_one_initcall+0x6e/0x184 [<0037f7c6>] strcpy+0x0/0x1c [<0003f58c>] parse_args+0x0/0x308 [<00002104>] do_one_initcall+0x0/0x184 [<0054b25c>] kernel_init_freeable+0x192/0x19c [<00561650>] nubus_init+0x0/0x79c [<0038c6c4>] kernel_init+0x0/0xec [<0038c6d8>] kernel_init+0x14/0xec [<0038c6c4>] kernel_init+0x0/0xec [<0000297c>] ret_from_kernel_thread+0xc/0x14 ---[ end trace 0000000000000000 ]--- This particular card (a Radius video card) contains a duplicated resource hence the /proc/bus/nubus/a/1/24/5 entry got registered twice. (A date resource has ID 5, the vendor info directory has ID 24) The solution for this is to remove a potentially pre-existing entry before adding the procfs entry for the resource. Reported-and-tested-by: Stan Johnson Signed-off-by: Finn Thain Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/dd1b560bbe426b351cdbb3bbf89414753c3d0117.1679446472.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven

nubus: Partially revert proc_create_single_data() conversion

2023-05-22T11:51:47+00:00

The conversion to proc_create_single_data() introduced a regression whereby reading a file in /proc/bus/nubus results in a seg fault: # grep -r . /proc/bus/nubus/e/ Data read fault at 0x00000020 in Super Data (pc=0x1074c2) BAD KERNEL BUSERR Oops: 00000000 Modules linked in: PC: [<001074c2>] PDE_DATA+0xc/0x16 SR: 2010 SP: 38284958 a2: 01152370 d0: 00000001 d1: 01013000 d2: 01002790 d3: 00000000 d4: 00000001 d5: 0008ce2e a0: 00000000 a1: 00222a40 Process grep (pid: 45, task=142f8727) Frame format=B ssw=074d isc=2008 isb=4e5e daddr=00000020 dobuf=01199e70 baddr=001074c8 dibuf=ffffffff ver=f Stack from 01199e48: 01199e70 00222a58 01002790 00000000 011a3000 01199eb0 015000c0 00000000 00000000 01199ec0 01199ec0 000d551a 011a3000 00000001 00000000 00018000 d003f000 00000003 00000001 0002800d 01052840 01199fa8 c01f8000 00000000 00000029 0b532b80 00000000 00000000 00000029 0b532b80 01199ee4 00103640 011198c0 d003f000 00018000 01199fa8 00000000 011198c0 00000000 01199f4c 000b3344 011198c0 d003f000 00018000 01199fa8 00000000 00018000 011198c0 Call Trace: [<00222a58>] nubus_proc_rsrc_show+0x18/0xa0 [<000d551a>] seq_read+0xc4/0x510 [<00018000>] fp_fcos+0x2/0x82 [<0002800d>] __sys_setreuid+0x115/0x1c6 [<00103640>] proc_reg_read+0x5c/0xb0 [<00018000>] fp_fcos+0x2/0x82 [<000b3344>] __vfs_read+0x2c/0x13c [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b8aa2>] sys_statx+0x60/0x7e [<000b34b6>] vfs_read+0x62/0x12a [<00018000>] fp_fcos+0x2/0x82 [<00018000>] fp_fcos+0x2/0x82 [<000b39c2>] ksys_read+0x48/0xbe [<00018000>] fp_fcos+0x2/0x82 [<000b3a4e>] sys_read+0x16/0x1a [<00018000>] fp_fcos+0x2/0x82 [<00002b84>] syscall+0x8/0xc [<00018000>] fp_fcos+0x2/0x82 [<0000c016>] not_ext+0xa/0x18 Code: 4e5e 4e75 4e56 0000 206e 0008 2068 ffe8 <2068> 0020 2008 4e5e 4e75 4e56 0000 2f0b 206e 0008 2068 0004 2668 0020 206b ffe8 Disabling lock debugging due to kernel taint Segmentation fault The proc_create_single_data() conversion does not work because single_open(file, nubus_proc_rsrc_show, PDE_DATA(inode)) is not equivalent to the original code. Fixes: 3f3942aca6da ("proc: introduce proc_create_single{,_data}") Cc: Christoph Hellwig Cc: stable@vger.kernel.org # 5.6+ Signed-off-by: Finn Thain Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/d4e2a586e793cc8d9442595684ab8a077c0fe726.1678783919.git.fthain@linux-m68k.org Signed-off-by: Geert Uytterhoeven

nubus: Drop noop match function

2023-03-20T14:39:14+00:00

nubus_bus_match() returned 1 unconditionally. This is equivalent to no match function at all. (See driver_match_device() which does: return drv->bus->match ? drv->bus->match(dev, drv) : 1; .) Signed-off-by: Uwe Kleine-König Acked-by: Finn Thain Reviewed-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20230313180848.2770504-1-u.kleine-koenig@pengutronix.de Signed-off-by: Geert Uytterhoeven

proc: remove PDE_DATA() completely

2022-01-22T06:33:37+00:00

Remove PDE_DATA() completely and replace it with pde_data(). [akpm@linux-foundation.org: fix naming clash in drivers/nubus/proc.c] [akpm@linux-foundation.org: now fix it properly] Link: https://lkml.kernel.org/r/20211124081956.87711-2-songmuchun@bytedance.com Signed-off-by: Muchun Song Acked-by: Christian Brauner Cc: Alexey Dobriyan Cc: Alexey Gladkov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

nubus: Simplify check in remove callback

2021-08-05T12:37:03+00:00

The driver core only calls a remove callback when the device was successfully bound (aka probed) before. So dev->driver is never NULL and the respective check can just be dropped. Acked-by: Finn Thain Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20210730191035.1455248-2-u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman

bus: Make remove callback return void

2021-07-21T09:53:42+00:00

The driver core ignores the return value of this callback because there is only little it can do when a device disappears. This is the final bit of a long lasting cleanup quest where several buses were converted to also return void from their remove callback. Additionally some resource leaks were fixed that were caused by drivers returning an error code in the expectation that the driver won't go away. With struct bus_type::remove returning void it's prevented that newly implemented buses return an ignored error code and so don't anticipate wrong expectations for driver authors. Reviewed-by: Tom Rix (For fpga) Reviewed-by: Mathieu Poirier Reviewed-by: Cornelia Huck (For drivers/s390 and drivers/vfio) Acked-by: Russell King (Oracle) (For ARM, Amba and related parts) Acked-by: Mark Brown Acked-by: Chen-Yu Tsai (for sunxi-rsb) Acked-by: Pali Rohár Acked-by: Mauro Carvalho Chehab (for media) Acked-by: Hans de Goede (For drivers/platform) Acked-by: Alexandre Belloni Acked-By: Vinod Koul Acked-by: Juergen Gross (For xen) Acked-by: Lee Jones (For mfd) Acked-by: Johannes Thumshirn (For mcb) Acked-by: Johan Hovold Acked-by: Srinivas Kandagatla (For slimbus) Acked-by: Kirti Wankhede (For vfio) Acked-by: Maximilian Luz Acked-by: Heikki Krogerus (For ulpi and typec) Acked-by: Samuel Iglesias Gonsálvez (For ipack) Acked-by: Geoff Levand (For ps3) Acked-by: Yehezkel Bernat (For thunderbolt) Acked-by: Alexander Shishkin (For intel_th) Acked-by: Dominik Brodowski (For pcmcia) Acked-by: Rafael J. Wysocki (For ACPI) Acked-by: Bjorn Andersson (rpmsg and apr) Acked-by: Srinivas Pandruvada (For intel-ish-hid) Acked-by: Dan Williams (For CXL, DAX, and NVDIMM) Acked-by: William Breathitt Gray (For isa) Acked-by: Stefan Richter (For firewire) Acked-by: Benjamin Tissoires (For hid) Acked-by: Thorsten Scherer (For siox) Acked-by: Sven Van Asbroeck (For anybuss) Acked-by: Ulf Hansson (For MMC) Acked-by: Wolfram Sang # for I2C Acked-by: Sudeep Holla Acked-by: Geert Uytterhoeven Acked-by: Dmitry Torokhov Acked-by: Finn Thain Signed-off-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20210713193522.1770306-6-u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman

nubus: Remove cast to void pointer

2019-10-21T07:08:15+00:00

Casting void pointers to other pointer types is unnecessary. Signed-off-by: Himanshu Jha Link: https://lore.kernel.org/r/1503819148-11676-1-git-send-email-himanshujha199640@gmail.com Signed-off-by: Geert Uytterhoeven

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21T08:50:46+00:00

Add SPDX license identifiers to all Make/Kconfig files which: - Have no license information of any form These files fall under the project license, GPL v2 only. The resulting SPDX license identifier is: GPL-2.0-only Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman

nubus: Set default dma mask for nubus_board devices

2018-07-23T13:07:12+00:00

A 32-bit mask is used by default because a NuBus slot has 32 address/data lines and a NuBus board is free to use all of them. Cc: Greg Kroah-Hartman Tested-by: Stan Johnson Signed-off-by: Finn Thain Reviewed-by: Christoph Hellwig Signed-off-by: Geert Uytterhoeven