phase out CONFIG_VIRT_TO_BUS
Subsystems (16)
v3 cover phase out CONFIG_VIRT_TO_BUS
From: Arnd Bergmann <[email protected]>
The virt_to_bus/bus_to_virt interface has been deprecated for decades. After Jakub Kicinski put a lot of work into cleaning out the network drivers using them, there are only a couple of other drivers left, which can all be removed or otherwise cleaned up, to remove the old interface for good.
Any out of tree drivers using virt_to_bus() should be converted to using the dma-mapping interfaces, typically dma_alloc_coherent() or dma_map_single()).
There are a few m68k and ppc32 specific drivers that keep using the interfaces, but these are all guarded with architecture-specific Kconfig dependencies, and are not actually broken. It might be helpful as a follow-up to replace them with platform specific helpers for amiga, m68k-vme and powermac.
There are still a number of drivers that are using virt_to_phys() and phys_to_virt() in place of dma-mapping operations, and these are often broken, but they are out of scope for this series.
If there are no more issues identified with this series, I'll merge it through the asm-generic tree. The SCSI patches can also get merged separately through the SCSI maintainers' tree if they prefer.
Arnd
---
Changes since v2:
- Drop the dpt_i2o driver completely rather than fixing it
- fix mistake in BusLogic patch
Changes since v1:
- dropped VME patches that are already in staging-next
- dropped media patch that gets merged independently
- added a networking patch and dropped it again after it got merged
- replace BusLogic removal with a workaround
Arnd Bergmann (3):
scsi: BusLogic remove bus_to_virt
scsi: dpt_i2o: remove obsolete driver
arch/*/: remove CONFIG_VIRT_TO_BUS
.../core-api/bus-virt-phys-mapping.rst | 220 - Documentation/core-api/dma-api-howto.rst | 14 - Documentation/core-api/index.rst | 1 - .../translations/zh_CN/core-api/index.rst | 1 - .../userspace-api/ioctl/ioctl-number.rst | 2 +- MAINTAINERS | 8 - arch/alpha/Kconfig | 1 - arch/alpha/include/asm/floppy.h | 2 +- arch/alpha/include/asm/io.h | 8 +- arch/ia64/Kconfig | 1 - arch/ia64/include/asm/io.h | 8 - arch/m68k/Kconfig | 1 - arch/m68k/include/asm/virtconvert.h | 4 +- arch/microblaze/Kconfig | 1 - arch/microblaze/include/asm/io.h | 2 - arch/mips/Kconfig | 1 - arch/mips/include/asm/io.h | 9 - arch/parisc/Kconfig | 1 - arch/parisc/include/asm/floppy.h | 4 +- arch/parisc/include/asm/io.h | 2 - arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/io.h | 2 - arch/riscv/include/asm/page.h | 1 - arch/x86/Kconfig | 1 - arch/x86/include/asm/io.h | 9 - arch/xtensa/Kconfig | 1 - arch/xtensa/include/asm/io.h | 3 - drivers/scsi/BusLogic.c | 35 +- drivers/scsi/Kconfig | 13 +- drivers/scsi/Makefile | 1 - drivers/scsi/dpt/dpti_i2o.h | 441 -- drivers/scsi/dpt/dpti_ioctl.h | 136 - drivers/scsi/dpt/dptsig.h | 336 -- drivers/scsi/dpt/osd_defs.h | 79 - drivers/scsi/dpt/osd_util.h | 358 -- drivers/scsi/dpt/sys_info.h | 417 -- drivers/scsi/dpt_i2o.c | 3546 ----------------- drivers/scsi/dpti.h | 331 -- include/asm-generic/io.h | 14 - mm/Kconfig | 8 - 40 files changed, 35 insertions(+), 5989 deletions(-) delete mode 100644 Documentation/core-api/bus-virt-phys-mapping.rst delete mode 100644 drivers/scsi/dpt/dpti_i2o.h delete mode 100644 drivers/scsi/dpt/dpti_ioctl.h delete mode 100644 drivers/scsi/dpt/dptsig.h delete mode 100644 drivers/scsi/dpt/osd_defs.h delete mode 100644 drivers/scsi/dpt/osd_util.h delete mode 100644 drivers/scsi/dpt/sys_info.h delete mode 100644 drivers/scsi/dpt_i2o.c delete mode 100644 drivers/scsi/dpti.h
Signature · 1 line
2.29.2
PATCH v3 1/3 scsi: BusLogic remove bus_to_virt
From: Arnd Bergmann <[email protected]>
The BusLogic driver is the last remaining driver that relies on the deprecated bus_to_virt() function, which in turn only works on a few architectures, and is incompatible with both swiotlb and iommu support.
Before commit 391e2f25601e ("[SCSI] BusLogic: Port driver to 64-bit."), the driver had a dependency on x86-32, presumably because of this problem. However, the change introduced another bug that made it still impossible to use the driver on any 64-bit machine.
This was in turn fixed in commit 56f396146af2 ("scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic"), 8 years later, which shows that there are not a lot of users.
Maciej is still using the driver on 32-bit hardware, and Khalid mentioned that the driver works with the device emulation used in VirtualBox and VMware. Both of those only emulate it for Windows 2000 and older operating systems that did not ship with the better LSI logic driver.
Do a minimum fix that searches through the list of descriptors to find one that matches the bus address. This is clearly as inefficient as was indicated in the code comment about the lack of a bus_to_virt() replacement. A better fix would likely involve changing out the entire descriptor allocation for a simpler one, but that would be much more invasive.
---
v3: Address issues pointed out by Khalid Aziz
v2: Attempt to fix the driver instead of removing it
--- drivers/scsi/BusLogic.c | 35 +++++++++++++++++++++++------------ drivers/scsi/Kconfig | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-)
drivers/scsi/BusLogic.c +23 -12
@@ -2515,12 +2515,26 @@ static int blogic_resultcode(struct blogic_adapter *adapter,return (hoststatus <<16 ) | tgt_status; } +/* +* turn the dma address from an inbox into a ccb pointer +* This is rather inefficient. +*/ +static struct blogic_ccb * +blogic_inbox_to_ccb (struct blogic_adapter *adapter,struct blogic_inbox *inbox) +{ +struct blogic_ccb *ccb; + +for (ccb = adapter->all_ccbs; ccb; ccb = ccb->next_all) +if (inbox->ccb == ccb->dma_handle) +break ; + +return ccb; +}/* blogic_scan_inbox scans the Incoming Mailboxes saving any Incoming Mailbox entries for completion processing. */ -static void blogic_scan_inbox (struct blogic_adapter *adapter) {/*
@@ -2540,17 +2554,14 @@ static void blogic_scan_inbox(struct blogic_adapter *adapter)enum blogic_cmplt_code comp_code;while ((comp_code = next_inbox->comp_code) !=BLOGIC_INBOX_FREE ) { -/* -We are only allowed to do this because we limit our -architectures we run on to machines where bus_to_virt( -actually works. There *needs* to be a dma_addr_to_virt() -in the new PCI DMA mapping interface to replace -bus_to_virt() or else this code is going to become very -innefficient. -*/ -struct blogic_ccb *ccb = - (struct blogic_ccb *)bus_to_virt (next_inbox->ccb); -if (comp_code !=BLOGIC_CMD_NOTFOUND ) { +struct blogic_ccb *ccb =blogic_inbox_to_ccb (adapter, next_inbox); +if (!ccb) { +/* +* This should never happen, unless the CCB list is +* corrupted in memory. +*/ +blogic_warn ("Could not find CCB for dma address %x\n" , adapter, next_inbox->ccb); + }else if (comp_code !=BLOGIC_CMD_NOTFOUND ) {if (ccb->status ==BLOGIC_CCB_ACTIVE || ccb->status ==BLOGIC_CCB_RESET ) {/*
drivers/scsi/Kconfig +1 -1
@@ -514,7 +514,7 @@ config SCSI_HPTIOP config SCSI_BUSLOGIC tristate "BusLogic SCSI support" - depends on PCI && SCSI && VIRT_TO_BUS + depends on PCI && SCSI help This is support for BusLogic MultiMaster and FlashPoint SCSI Host Adapters. Consult the SCSI-HOWTO, available from
Signature · 1 line
2.29.2
PATCH v3 2/3 scsi: dpt_i2o: remove obsolete driver
In reply to a message not in the archiveFrom: Arnd Bergmann <[email protected]>
The dpt_i2o driver was fixed to stop using virt_to_bus() in 2008, but it still has a stale reference in an error handling code path that could never work. I submitted a patch to fix this reference earlier, but Hannes Reinecke suggested that removing the driver may be just as good here.
The i2o driver layer was removed in 2015 with commit 4a72a7af462d ("staging: remove i2o subsystem"), but the even older dpt_i2o scsi driver stayed around.
The last non-cleanup patches I could find were from Miquel van Smoorenburg and Mark Salyzyn back in 2008, they might know if there is any chance of the hardware still being used anywhere.
---
v3: remove driver instead of fixing it
--- .../userspace-api/ioctl/ioctl-number.rst | 2 +- MAINTAINERS | 8 - drivers/scsi/Kconfig | 11 - drivers/scsi/Makefile | 1 - drivers/scsi/dpt/dpti_i2o.h | 441 -- drivers/scsi/dpt/dpti_ioctl.h | 136 - drivers/scsi/dpt/dptsig.h | 336 -- drivers/scsi/dpt/osd_defs.h | 79 - drivers/scsi/dpt/osd_util.h | 358 -- drivers/scsi/dpt/sys_info.h | 417 -- drivers/scsi/dpt_i2o.c | 3546 ----------------- drivers/scsi/dpti.h | 331 -- 12 files changed, 1 insertion(+), 5665 deletions(-) delete mode 100644 drivers/scsi/dpt/dpti_i2o.h delete mode 100644 drivers/scsi/dpt/dpti_ioctl.h delete mode 100644 drivers/scsi/dpt/dptsig.h delete mode 100644 drivers/scsi/dpt/osd_defs.h delete mode 100644 drivers/scsi/dpt/osd_util.h delete mode 100644 drivers/scsi/dpt/sys_info.h delete mode 100644 drivers/scsi/dpt_i2o.c delete mode 100644 drivers/scsi/dpti.h
Documentation/userspace-api/ioctl/ioctl-number.rst +1 -1
@@ -120,7 +120,7 @@ Code Seq# Include File Comments 'C' 01-2F linux/capi.h conflict! 'C' F0-FF drivers/net/wan/cosa.h conflict! 'D' all arch/s390/include/asm/dasd.h -'D' 40-5F drivers/scsi/dpt/dtpi_ioctl.h +'D' 40-5F drivers/scsi/dpt/dtpi_ioctl.h Dead since 2022 'D' 05 drivers/scsi/pmcraid.h 'E' all linux/input.h conflict! 'E' 00-0F xen/evtchn.h conflict!
MAINTAINERS +0 -8
@@ -6062,14 +6062,6 @@ F: Documentation/networking/device_drivers/ethernet/freescale/dpaa2/switch-drive F: drivers/net/ethernet/freescale/dpaa2/dpaa2-switch* F: drivers/net/ethernet/freescale/dpaa2/dpsw* -DPT_I2O SCSI RAID DRIVER -M: Adaptec OEM Raid Solutions <aacraid-dzo6w/[email protected]> -L: [email protected] -S: Maintained -W: http://www.adaptec.com/ -F: drivers/scsi/dpt* -F: drivers/scsi/dpt/ - DRBD DRIVER M: Philipp Reisner <[email protected]> M: Lars Ellenberg <[email protected]>
drivers/scsi/Kconfig +0 -11
@@ -458,17 +458,6 @@ config SCSI_MVUMI To compile this driver as a module, choose M here: the module will be called mvumi. -config SCSI_DPT_I2O - tristate "Adaptec I2O RAID support " - depends on SCSI && PCI && VIRT_TO_BUS - help - This driver supports all of Adaptec's I2O based RAID controllers as - well as the DPT SmartRaid V cards. This is an Adaptec maintained - driver by Deanna Bonds. See <file:Documentation/scsi/dpti.rst>. - - To compile this driver as a module, choose M here: the - module will be called dpt_i2o. - config SCSI_ADVANSYS tristate "AdvanSys SCSI support" depends on SCSI
drivers/scsi/Makefile +0 -1
@@ -63,7 +63,6 @@ obj-$(CONFIG_BVME6000_SCSI) += 53c700.o bvme6000_scsi.o obj-$(CONFIG_SCSI_SIM710) += 53c700.o sim710.o obj-$(CONFIG_SCSI_ADVANSYS) += advansys.o obj-$(CONFIG_SCSI_BUSLOGIC) += BusLogic.o -obj-$(CONFIG_SCSI_DPT_I2O) += dpt_i2o.o obj-$(CONFIG_SCSI_ARCMSR) += arcmsr/ obj-$(CONFIG_SCSI_AHA152X) += aha152x.o obj-$(CONFIG_SCSI_AHA1542) += aha1542.o
drivers/scsi/dpt/dpti_i2o.h deleted +0 -441
441 lines not on this page · raw message
drivers/scsi/dpt/dpti_ioctl.h deleted +0 -136
136 lines not on this page · raw message
drivers/scsi/dpt/dptsig.h deleted +0 -336
336 lines not on this page · raw message
drivers/scsi/dpt/osd_defs.h deleted +0 -79
79 lines not on this page · raw message
drivers/scsi/dpt/osd_util.h deleted +0 -358
358 lines not on this page · raw message
drivers/scsi/dpt/sys_info.h deleted +0 -417
417 lines not on this page · raw message
drivers/scsi/dpt_i2o.c deleted +0 -3546
1,187 lines not on this page · raw message
drivers/scsi/dpti.h deleted +0 -331
331 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.29.2
Part of the diff is not shown here. View the raw message.
PATCH v3 3/3 arch/*/: remove CONFIG_VIRT_TO_BUS
In reply to a message not in the archiveFrom: Arnd Bergmann <[email protected]>
All architecture-independent users of virt_to_bus() and bus_to_virt() have been fixed to use the dma mapping interfaces or have been removed now. This means the definitions on most architectures, and the CONFIG_VIRT_TO_BUS symbol are now obsolete and can be removed.
The only exceptions to this are a few network and scsi drivers for m68k Amiga and VME machines and ppc32 Macintosh. These drivers work correctly with the old interfaces and are probably not worth changing.
On alpha and parisc, virt_to_bus() were still used in asm/floppy.h. alpha can use isa_virt_to_bus() like x86 does, and parisc can just open-code the virt_to_phys() here, as this is architecture specific code.
I tried updating the bus-virt-phys-mapping.rst documentation, which started as an email from Linus to explain some details of the Linux-2.0 driver interfaces. The bits about virt_to_bus() were declared obsolete backin 2000, and the rest is not all that relevant any more, so in the end I just decided to remove the file completely.
--- .../core-api/bus-virt-phys-mapping.rst | 220 ------------------ Documentation/core-api/dma-api-howto.rst | 14 -- Documentation/core-api/index.rst | 1 - .../translations/zh_CN/core-api/index.rst | 1 - arch/alpha/Kconfig | 1 - arch/alpha/include/asm/floppy.h | 2 +- arch/alpha/include/asm/io.h | 8 +- arch/ia64/Kconfig | 1 - arch/ia64/include/asm/io.h | 8 - arch/m68k/Kconfig | 1 - arch/m68k/include/asm/virtconvert.h | 4 +- arch/microblaze/Kconfig | 1 - arch/microblaze/include/asm/io.h | 2 - arch/mips/Kconfig | 1 - arch/mips/include/asm/io.h | 9 - arch/parisc/Kconfig | 1 - arch/parisc/include/asm/floppy.h | 4 +- arch/parisc/include/asm/io.h | 2 - arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/io.h | 2 - arch/riscv/include/asm/page.h | 1 - arch/x86/Kconfig | 1 - arch/x86/include/asm/io.h | 9 - arch/xtensa/Kconfig | 1 - arch/xtensa/include/asm/io.h | 3 - include/asm-generic/io.h | 14 -- mm/Kconfig | 8 - 27 files changed, 10 insertions(+), 311 deletions(-) delete mode 100644 Documentation/core-api/bus-virt-phys-mapping.rst
Documentation/core-api/bus-virt-phys-mapping.rst deleted +0 -220
@@ -1,220 +0,0 @@ -========================================================== -How to access I/O mapped memory from within device drivers -========================================================== - -:Author: Linus - -.. warning:: - - The virt_to_bus() and bus_to_virt() functions have been - superseded by the functionality provided by the PCI DMA interface - (see Documentation/core-api/dma-api-howto.rst). They continue - to be documented below for historical purposes, but new code - must not use them. --davidm 00/12/12 - -:: - - [ This is a mail message in response to a query on IO mapping, thus the - strange format for a "document" ] - -The AHA-1542 is a bus-master device, and your patch makes the driver give the -controller the physical address of the buffers, which is correct on x86 -(because all bus master devices see the physical memory mappings directly). - -However, on many setups, there are actually **three** different ways of looking -at memory addresses, and in this case we actually want the third, the -so-called "bus address". - -Essentially, the three ways of addressing memory are (this is "real memory", -that is, normal RAM--see later about other details): - - - CPU untranslated. This is the "physical" address. Physical address - 0 is what the CPU sees when it drives zeroes on the memory bus. - - - CPU translated address. This is the "virtual" address, and is - completely internal to the CPU itself with the CPU doing the appropriate - translations into "CPU untranslated". - - - bus address. This is the address of memory as seen by OTHER devices, - not the CPU. Now, in theory there could be many different bus - addresses, with each device seeing memory in some device-specific way, but - happily most hardware designers aren't actually actively trying to make - things any more complex than necessary, so you can assume that all - external hardware sees the memory the same way. - -Now, on normal PCs the bus address is exactly the same as the physical -address, and things are very simple indeed. However, they are that simple -because the memory and the devices share the same address space, and that is -not generally necessarily true on other PCI/ISA setups. - -Now, just as an example, on the PReP (PowerPC Reference Platform), the -CPU sees a memory map something like this (this is from memory):: - - 0-2 GB "real memory" - 2 GB-3 GB "system IO" (inb/out and similar accesses on x86) - 3 GB-4 GB "IO memory" (shared memory over the IO bus) - -Now, that looks simple enough. However, when you look at the same thing from -the viewpoint of the devices, you have the reverse, and the physical memory -address 0 actually shows up as address 2 GB for any IO master. - -So when the CPU wants any bus master to write to physical memory 0, it -has to give the master address 0x80000000 as the memory address. - -So, for example, depending on how the kernel is actually mapped on the -PPC, you can end up with a setup like this:: - - physical address: 0 - virtual address: 0xC0000000 - bus address: 0x80000000 - -where all the addresses actually point to the same thing. It's just seen -through different translations.. - -Similarly, on the Alpha, the normal translation is:: - - physical address: 0 - virtual address: 0xfffffc0000000000 - bus address: 0x40000000 - -(but there are also Alphas where the physical address and the bus address -are the same). - -Anyway, the way to look up all these translations, you do:: - - #include <asm/io.h> - - phys_addr = virt_to_phys(virt_addr); - virt_addr = phys_to_virt(phys_addr); - bus_addr = virt_to_bus(virt_addr); - virt_addr = bus_to_virt(bus_addr); - -Now, when do you need these? - -You want the **virtual** address when you are actually going to access that -pointer from the kernel. So you can have something like this:: - - /* - * this is the hardware "mailbox" we use to communicate with - * the controller. The controller sees this directly. - */ - struct mailbox { - __u32 status; - __u32 bufstart; - __u32 buflen; - .. - } mbox; - - unsigned char * retbuffer; - - /* get the address from the controller */ - retbuffer = bus_to_virt(mbox.bufstart); - switch (retbuffer[0]) { - case STATUS_OK: - ... - -on the other hand, you want the bus address when you have a buffer that -you want to give to the controller:: - - /* ask the controller to read the sense status into "sense_buffer" */ - mbox.bufstart = virt_to_bus(&sense_buffer); - mbox.buflen = sizeof(sense_buffer); - mbox.status = 0; - notify_controller(&mbox); - -And you generally **never** want to use the physical address, because you can't -use that from the CPU (the CPU only uses translated virtual addresses), and -you can't use it from the bus master. - -So why do we care about the physical address at all? We do need the physical -address in some cases, it's just not very often in normal code. The physical -address is needed if you use memory mappings, for example, because the -"remap_pfn_range()" mm function wants the physical address of the memory to -be remapped as measured in units of pages, a.k.a. the pfn (the memory -management layer doesn't know about devices outside the CPU, so it -shouldn't need to know about "bus addresses" etc). - -.. note:: - - The above is only one part of the whole equation. The above - only talks about "real memory", that is, CPU memory (RAM). - -There is a completely different type of memory too, and that's the "shared -memory" on the PCI or ISA bus. That's generally not RAM (although in the case -of a video graphics card it can be normal DRAM that is just used for a frame -buffer), but can be things like a packet buffer in a network card etc. - -This memory is called "PCI memory" or "shared memory" or "IO memory" or -whatever, and there is only one way to access it: the readb/writeb and -related functions. You should never take the address of such memory, because -there is really nothing you can do with such an address: it's not -conceptually in the same memory space as "real memory" at all, so you cannot -just dereference a pointer. (Sadly, on x86 it **is** in the same memory space, -so on x86 it actually works to just deference a pointer, but it's not -portable). - -For such memory, you can do things like: - - - reading:: - - /* - * read first 32 bits from ISA memory at 0xC0000, aka - * C000:0000 in DOS terms - */ - unsigned int signature = isa_readl(0xC0000); - - - remapping and writing:: - - /* - * remap framebuffer PCI memory area at 0xFC000000, - * size 1MB, so that we can access it: We can directly - * access only the 640k-1MB area, so anything else - * has to be remapped. - */ - void __iomem *baseptr = ioremap(0xFC000000, 1024*1024); - - /* write a 'A' to the offset 10 of the area */ - writeb('A',baseptr+10); - - /* unmap when we unload the driver */ - iounmap(baseptr); - - - copying and clearing:: - - /* get the 6-byte Ethernet address at ISA address E000:0040 */ - memcpy_fromio(kernel_buffer, 0xE0040, 6); - /* write a packet to the driver */ - memcpy_toio(0xE1000, skb->data, skb->len); - /* clear the frame buffer */ - memset_io(0xA0000, 0, 0x10000); - -OK, that just about covers the basics of accessing IO portably. Questions? -Comments? You may think that all the above is overly complex, but one day you -might find yourself with a 500 MHz Alpha in front of you, and then you'll be -happy that your driver works ;) - -Note that kernel versions 2.0.x (and earlier) mistakenly called the -ioremap() function "vremap()". ioremap() is the proper name, but I -didn't think straight when I wrote it originally. People who have to -support both can do something like:: - - /* support old naming silliness */ - #if LINUX_VERSION_CODE < 0x020100 - #define ioremap vremap - #define iounmap vfree - #endif - -at the top of their source files, and then they can use the right names -even on 2.0.x systems. - -And the above sounds worse than it really is. Most real drivers really -don't do all that complex things (or rather: the complexity is not so -much in the actual IO accesses as in error handling and timeouts etc). -It's generally not hard to fix drivers, and in many cases the code -actually looks better afterwards:: - - unsigned long signature = *(unsigned int *) 0xC0000; - vs - unsigned long signature = readl(0xC0000); - -I think the second version actually is more readable, no?
Documentation/core-api/dma-api-howto.rst +0 -14
@@ -707,20 +707,6 @@ to use the dma_sync_*() interfaces:: } } -Drivers converted fully to this interface should not use virt_to_bus() any -longer, nor should they use bus_to_virt(). Some drivers have to be changed a -little bit, because there is no longer an equivalent to bus_to_virt() in the -dynamic DMA mapping scheme - you have to always store the DMA addresses -returned by the dma_alloc_coherent(), dma_pool_alloc(), and dma_map_single() -calls (dma_map_sg() stores them in the scatterlist itself if the platform -supports dynamic DMA mapping in hardware) in your driver structures and/or -in the card registers. - -All drivers should be using these interfaces with no exceptions. It -is planned to completely remove virt_to_bus() and bus_to_virt() as -they are entirely deprecated. Some ports already do not provide these -as it is impossible to correctly support them. - Handling Errors ===============
Documentation/core-api/index.rst +0 -1
@@ -39,7 +39,6 @@ Library functionality that is used throughout the kernel. rbtree generic-radix-tree packing - bus-virt-phys-mapping this_cpu_ops timekeeping errseq
Documentation/translations/zh_CN/core-api/index.rst +0 -1
@@ -52,7 +52,6 @@ Todolist: circular-buffers generic-radix-tree packing - bus-virt-phys-mapping this_cpu_ops timekeeping errseq
arch/alpha/Kconfig +0 -1
@@ -17,7 +17,6 @@ config ALPHA select HAVE_PERF_EVENTS select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH - select VIRT_TO_BUS select GENERIC_IRQ_PROBE select GENERIC_PCI_IOMAP select AUTO_IRQ_AFFINITY if SMP
arch/alpha/include/asm/floppy.h +1 -1
@@ -20,7 +20,7 @@#define fd_free_dma () free_dma(FLOPPY_DMA)#define fd_clear_dma_ff () clear_dma_ff(FLOPPY_DMA)#define fd_set_dma_mode (mode) set_dma_mode(FLOPPY_DMA,mode) -#define fd_set_dma_addr (addr) set_dma_addr(FLOPPY_DMA,virt_to_bus(addr)) +#define fd_set_dma_addr (addr) set_dma_addr(FLOPPY_DMA,isa_virt_to_bus(addr))#define fd_set_dma_count (count) set_dma_count(FLOPPY_DMA,count)#define fd_enable_irq () enable_irq(FLOPPY_IRQ)#define fd_disable_irq () disable_irq(FLOPPY_IRQ)
arch/alpha/include/asm/io.h +4 -4
@@ -106,15 +106,15 @@ static inline void * phys_to_virt(unsigned long address)extern unsigned long __direct_map_base;extern unsigned long __direct_map_size; -static inline unsigned long __deprecated virt_to_bus (volatile void *address) +static inline unsigned long __deprecated isa_virt_to_bus (volatile void *address) {unsigned long phys =virt_to_phys (address);unsigned long bus = phys + __direct_map_base;return phys <= __direct_map_size ? bus :0 ; } -#define isa_virt_to_bus virt_to_bus +#define isa_virt_to_bus isa_virt_to_bus -static inline void *__deprecated bus_to_virt (unsigned long address) +static inline void *__deprecated isa_bus_to_virt (unsigned long address) {void *virt;
@@ -125,7 +125,7 @@ static inline void * __deprecated bus_to_virt(unsigned long address) virt =phys_to_virt (address);return (long )address <=0 ?NULL : virt; } -#define isa_bus_to_virt bus_to_virt +#define isa_bus_to_virt isa_bus_to_virt/* * There are different chipsets to interface the Alpha CPUs to the world.
arch/ia64/Kconfig +0 -1
@@ -39,7 +39,6 @@ config IA64 select HAVE_FUNCTION_DESCRIPTORS select HAVE_VIRT_CPU_ACCOUNTING select HUGETLB_PAGE_SIZE_VARIABLE if HUGETLB_PAGE - select VIRT_TO_BUS select GENERIC_IRQ_PROBE select GENERIC_PENDING_IRQ if SMP select GENERIC_IRQ_SHOW
arch/ia64/include/asm/io.h +0 -8
@@ -96,14 +96,6 @@ extern u64 kern_mem_attribute (unsigned long phys_addr, unsigned long size);extern int valid_phys_addr_range (phys_addr_t addr,size_t count);/* efi.c */ extern int valid_mmap_phys_addr_range (unsigned long pfn,size_t count); -/* -* The following two macros are deprecated and scheduled for removal. -* Please use the PCI-DMA interface defined in <asm/pci.h> instead. -*/ -#define bus_to_virt phys_to_virt -#define virt_to_bus virt_to_phys -#define page_to_bus page_to_phys -# endif /* KERNEL */ /*
arch/m68k/Kconfig +0 -1
@@ -30,7 +30,6 @@ config M68K select OLD_SIGACTION select OLD_SIGSUSPEND3 select UACCESS_MEMCPY if !MMU - select VIRT_TO_BUS select ZONE_DMA config CPU_BIG_ENDIAN
arch/m68k/include/asm/virtconvert.h +3 -1
@@ -33,9 +33,11 @@ static inline void *phys_to_virt(unsigned long address)/* * IO bus memory addresses are 1:1 with the physical address, +* deprecated globally but still used on two machines. */ +#if defined(CONFIG_AMIGA ) || defined(CONFIG_VME )#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt +#endif #endif #endif
arch/microblaze/Kconfig +0 -1
@@ -38,7 +38,6 @@ config MICROBLAZE select OF_EARLY_FLATTREE select PCI_DOMAINS_GENERIC if PCI select PCI_SYSCALL if PCI - select VIRT_TO_BUS select CPU_NO_EFFICIENT_FFS select MMU_GATHER_NO_RANGE select SPARSE_IRQ
arch/microblaze/include/asm/io.h +0 -2
@@ -30,8 +30,6 @@ extern resource_size_t isa_mem_base;#define PCI_IOBASE ((void __iomem *)_IO_BASE)#define IO_SPACE_LIMIT (0xFFFFFFFF) -#define page_to_bus (page) (page_to_phys(page)) -extern void iounmap (volatile void __iomem *addr);extern void __iomem *ioremap (phys_addr_t address,unsigned long size);
arch/mips/Kconfig +0 -1
@@ -100,7 +100,6 @@ config MIPS select RTC_LIB select SYSCTL_EXCEPTION_TRACE select TRACE_IRQFLAGS_SUPPORT - select VIRT_TO_BUS select ARCH_HAS_ELFCORE_COMPAT select HAVE_ARCH_KCSAN if 64BIT
arch/mips/include/asm/io.h +0 -9
@@ -147,15 +147,6 @@ static inline void *isa_bus_to_virt(unsigned long address)return phys_to_virt (address); } -/* -* However PCI ones are not necessarily 1:1 and therefore these interfaces -* are forbidden in portable PCI drivers. -* -* Allow them for x86 for legacy drivers, though. -*/ -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt -/* * Change "struct page" to physical address. */
arch/parisc/Kconfig +0 -1
@@ -43,7 +43,6 @@ config PARISC select SYSCTL_ARCH_UNALIGN_ALLOW select SYSCTL_EXCEPTION_TRACE select HAVE_MOD_ARCH_SPECIFIC - select VIRT_TO_BUS select MODULES_USE_ELF_RELA select CLONE_BACKWARDS select TTY # Needed for pdc_cons.c
arch/parisc/include/asm/floppy.h +2 -2
@@ -179,7 +179,7 @@ static void _fd_chose_dma_mode(char *addr, unsigned long size) {if (can_use_virtual_dma ==2 ) {if ((unsigned int ) addr >= (unsigned int ) high_memory || -virt_to_bus (addr) >=0x1000000 || +virt_to_phys (addr) >=0x1000000 ||_CROSS_64KB (addr, size,0 )) use_virtual_dma =1 ;else
@@ -215,7 +215,7 @@ static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) doing_pdma =0 ;clear_dma_ff (FLOPPY_DMA );set_dma_mode (FLOPPY_DMA ,mode); -set_dma_addr (FLOPPY_DMA ,virt_to_bus (addr)); +set_dma_addr (FLOPPY_DMA ,virt_to_phys (addr));set_dma_count (FLOPPY_DMA ,size);enable_dma (FLOPPY_DMA );return 0 ;
arch/parisc/include/asm/io.h +0 -2
@@ -7,8 +7,6 @@#define virt_to_phys (a) ((unsigned long)__pa(a))#define phys_to_virt (a) __va(a) -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virtstatic inline unsigned long isa_bus_to_virt (unsigned long addr) {BUG ();
arch/powerpc/Kconfig +0 -1
@@ -272,7 +272,6 @@ config PPC select SYSCTL_EXCEPTION_TRACE select THREAD_INFO_IN_TASK select TRACE_IRQFLAGS_SUPPORT - select VIRT_TO_BUS if !PPC64 # # Please keep this list sorted alphabetically. #
arch/powerpc/include/asm/io.h +0 -2
@@ -987,8 +987,6 @@ static inline void * bus_to_virt(unsigned long address) }#define bus_to_virt bus_to_virt -#define page_to_bus (page) (page_to_phys(page) + PCI_DRAM_OFFSET) -#endif /* CONFIG_PPC32 */ /* access ports */
arch/riscv/include/asm/page.h +0 -1
@@ -167,7 +167,6 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x);#define page_to_virt (page) (pfn_to_virt(page_to_pfn(page)))#define page_to_phys (page) (pfn_to_phys(page_to_pfn(page))) -#define page_to_bus (page) (page_to_phys(page))#define phys_to_page (paddr) (pfn_to_page(phys_to_pfn(paddr)))#define sym_to_pfn (x) __phys_to_pfn(__pa_symbol(x))
arch/x86/Kconfig +0 -1
@@ -273,7 +273,6 @@ config X86 select THREAD_INFO_IN_TASK select TRACE_IRQFLAGS_SUPPORT select USER_STACKTRACE_SUPPORT - select VIRT_TO_BUS select HAVE_ARCH_KCSAN if X86_64 select X86_FEATURE_NAMES if PROC_FS select PROC_PID_ARCH_STATUS if PROC_FS
arch/x86/include/asm/io.h +0 -9
@@ -168,15 +168,6 @@ static inline unsigned int isa_virt_to_bus(volatile void *address) }#define isa_bus_to_virt phys_to_virt -/* -* However PCI ones are not necessarily 1:1 and therefore these interfaces -* are forbidden in portable PCI drivers. -* -* Allow them on x86 for legacy drivers, though. -*/ -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt -/* * The default ioremap() behavior is non-cached; if you need something * else, you probably want one of the following.
arch/xtensa/Kconfig +0 -1
@@ -46,7 +46,6 @@ config XTENSA select MODULES_USE_ELF_RELA select PERF_USE_VMALLOC select TRACE_IRQFLAGS_SUPPORT - select VIRT_TO_BUS help Xtensa processors are 32-bit RISC machines designed by Tensilica primarily for embedded systems. These processors are both
arch/xtensa/include/asm/io.h +0 -3
@@ -63,9 +63,6 @@ static inline void iounmap(volatile void __iomem *addr) xtensa_iounmap(addr); } -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt -#endif /* CONFIG_MMU */ #include <asm-generic/io.h>
include/asm-generic/io.h +0 -14
@@ -1059,20 +1059,6 @@ static inline void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr) }#endif -#ifdef CONFIG_VIRT_TO_BUS -#ifndef virt_to_bus -static inline unsigned long virt_to_bus (void *address) -{ -return (unsigned long )address; -} - -static inline void *bus_to_virt (unsigned long address) -{ -return (void *)address; -} -#endif -#endif -#ifndef memset_io#define memset_io memset_io/**
mm/Kconfig +0 -8
@@ -283,14 +283,6 @@ config BOUNCE memory available to the CPU. Enabled by default when HIGHMEM is selected, but you may say n to override this. -config VIRT_TO_BUS - bool - help - An architecture should select this if it implements the - deprecated interface virt_to_bus(). All new architectures - should probably not select this. - - config MMU_NOTIFIER bool select SRCU
Signature · 1 line
2.29.2
Re: [PATCH v3 1/3] scsi: BusLogic remove bus_to_virt
In reply to Arnd BergmannQuoted 33 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The BusLogic driver is the last remaining driver that relies on the deprecated
bus_to_virt()function, which in turn only works on a few architectures, and is incompatible with both swiotlb and iommu support.Before commit
391e2f25601e("[SCSI] BusLogic: Port driver to 64-bit."), the driver had a dependency on x86-32, presumably because of this problem. However, the change introduced another bug that made it still impossible to use the driver on any 64-bit machine.This was in turn fixed in commit
56f396146af2("scsi: BusLogic: Fix 64-bit system enumeration error for Buslogic"), 8 years later, which shows that there are not a lot of users.Maciej is still using the driver on 32-bit hardware, and Khalid mentioned that the driver works with the device emulation used in VirtualBox and VMware. Both of those only emulate it for Windows 2000 and older operating systems that did not ship with the better LSI logic driver.
Do a minimum fix that searches through the list of descriptors to find one that matches the bus address. This is clearly as inefficient as was indicated in the code comment about the lack of a
bus_to_virt()replacement. A better fix would likely involve changing out the entire descriptor allocation for a simpler one, but that would be much more invasive.Cc Maciej W. Rozycki <[email protected]>Cc Matt Wang <[email protected]>Tested-by Khalid Aziz <[email protected]>Reviewed-by Robin Murphy <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Quoted 8 lines
---
v3: Address issues pointed out by Khalid Aziz
v2: Attempt to fix the driver instead of removing it--- drivers/scsi/BusLogic.c | 35 +++++++++++++++++++++++------------ drivers/scsi/Kconfig | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-)
This looks good.
Quoted 71 lines
drivers/scsi/BusLogic.c +23
-12@@ -2515,12 +2515,26 @@ static int blogic_resultcode(struct blogic_adapter *adapter,return (hoststatus <<16 ) | tgt_status; } +/* +* turn the dma address from an inbox into a ccb pointer +* This is rather inefficient. +*/ +static struct blogic_ccb * +blogic_inbox_to_ccb (struct blogic_adapter *adapter,struct blogic_inbox *inbox) +{ +struct blogic_ccb *ccb; + +for (ccb = adapter->all_ccbs; ccb; ccb = ccb->next_all) +if (inbox->ccb == ccb->dma_handle) +break ; + +return ccb; +}/* blogic_scan_inbox scans the Incoming Mailboxes saving any Incoming Mailbox entries for completion processing. */ -static void blogic_scan_inbox (struct blogic_adapter *adapter) {/* @@ -2540,17 +2554,14 @@ static void blogic_scan_inbox(struct blogic_adapter *adapter)enum blogic_cmplt_code comp_code;while ((comp_code = next_inbox->comp_code) !=BLOGIC_INBOX_FREE ) { -/* -We are only allowed to do this because we limit our -architectures we run on to machines where bus_to_virt( -actually works. There *needs* to be a dma_addr_to_virt() -in the new PCI DMA mapping interface to replace -bus_to_virt() or else this code is going to become very -innefficient. -*/ -struct blogic_ccb *ccb = - (struct blogic_ccb *)bus_to_virt (next_inbox->ccb); -if (comp_code !=BLOGIC_CMD_NOTFOUND ) { +struct blogic_ccb *ccb =blogic_inbox_to_ccb (adapter, next_inbox); +if (!ccb) { +/* +* This should never happen, unless the CCB list is +* corrupted in memory. +*/ +blogic_warn ("Could not find CCB for dma address %x\n" , adapter, next_inbox->ccb); + }else if (comp_code !=BLOGIC_CMD_NOTFOUND ) {if (ccb->status ==BLOGIC_CCB_ACTIVE || ccb->status ==BLOGIC_CCB_RESET ) {/* drivers/scsi/Kconfig +1
-1@@ -514,7 +514,7 @@ config SCSI_HPTIOP config SCSI_BUSLOGIC tristate "BusLogic SCSI support" - depends on PCI && SCSI && VIRT_TO_BUS + depends on PCI && SCSI help This is support for BusLogic MultiMaster and FlashPoint SCSI Host Adapters. Consult the SCSI-HOWTO, available from
Arnd Bergmann
maintainerQuoted 3 lines · Arnd Bergmann
Arnd Bergmann (3):
scsi: BusLogic removebus_to_virt
scsi:dpt_i2o: remove obsolete driver
The dpt_i2o removal is overly large and got dropped by some of the mailing lists,
if anyone wants to see the full patch, it did make it through to the linux-scsi list at least:
https://lore.kernel.org/all/[email protected]/
Arnd
Re: [PATCH v3 3/3] arch/*/: remove CONFIG_VIRT_TO_BUS
In reply to Arnd BergmannQuoted 22 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
All architecture-independent users of
virt_to_bus()andbus_to_virt()have been fixed to use the dma mapping interfaces or have been removed now. This means the definitions on most architectures, and theCONFIG_VIRT_TO_BUSsymbol are now obsolete and can be removed.The only exceptions to this are a few network and scsi drivers for m68k Amiga and VME machines and ppc32 Macintosh. These drivers work correctly with the old interfaces and are probably not worth changing.
On alpha and parisc,
virt_to_bus()were still used inasm/floppy.h. alpha can useisa_virt_to_bus()like x86 does, and parisc can just open-code thevirt_to_phys()here, as this is architecture specific code.I tried updating the
bus-virt-phys-mapping.rstdocumentation, which started as an email from Linus to explain some details of the Linux-2.0 driver interfaces. The bits aboutvirt_to_bus()were declared obsolete backin 2000, and the rest is not all that relevant any more, so in the end I just decided to remove the file completely.
Quoted 4 lines
Reviewed-by Geert Uytterhoeven <[email protected]>Signed-off-by Arnd Bergmann <[email protected]>
Thanks for this cleanup!
You may add:
Helge
Quoted 30 lines
--- .../core-api/bus-virt-phys-mapping.rst | 220 ------------------ Documentation/core-api/dma-api-howto.rst | 14 -- Documentation/core-api/index.rst | 1 - .../translations/zh_CN/core-api/index.rst | 1 - arch/alpha/Kconfig | 1 - arch/alpha/include/asm/floppy.h | 2 +- arch/alpha/include/asm/io.h | 8 +- arch/ia64/Kconfig | 1 - arch/ia64/include/asm/io.h | 8 - arch/m68k/Kconfig | 1 - arch/m68k/include/asm/virtconvert.h | 4 +- arch/microblaze/Kconfig | 1 - arch/microblaze/include/asm/io.h | 2 - arch/mips/Kconfig | 1 - arch/mips/include/asm/io.h | 9 - arch/parisc/Kconfig | 1 - arch/parisc/include/asm/floppy.h | 4 +- arch/parisc/include/asm/io.h | 2 - arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/io.h | 2 - arch/riscv/include/asm/page.h | 1 - arch/x86/Kconfig | 1 - arch/x86/include/asm/io.h | 9 - arch/xtensa/Kconfig | 1 - arch/xtensa/include/asm/io.h | 3 - include/asm-generic/io.h | 14 -- mm/Kconfig | 8 - 27 files changed, 10 insertions(+), 311 deletions(-) delete mode 100644 Documentation/core-api/bus-virt-phys-mapping.rst
Hi Arnd!
Quoted 3 lines
If there are no more issues identified with this series, I'll merge it through the asm-generic tree. The SCSI patches can also get merged separately through the SCSI maintainers' tree if they prefer.
I put patches 1 and 2 in scsi-staging to see if anything breaks...
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 7 lines · Martin K. Petersen
Hi Arnd!
Quoted 3 lines
If there are no more issues identified with this series, I'll merge it through the asm-generic tree. The SCSI patches can also get merged separately through the SCSI maintainers' tree if they prefer.
I put patches 1 and 2 in scsi-staging to see if anything breaks...
Ok, thanks!
I have just the third patch in the asm-generic tree now. As long as it all make it into the merge window, this should work out fine without build issues, though there is a small bisection window during which the buslogic driver becomes hidden. I think that's ok here.
Arnd
Martin K. Petersen
AppliedQuoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The virt_to_bus/bus_to_virt interface has been deprecated for decades. After Jakub Kicinski put a lot of work into cleaning out the network drivers using them, there are only a couple of other drivers left, which can all be removed or otherwise cleaned up, to remove the old interface for good.
[...]
Applied to 5.20/scsi-queue, thanks!
[1/3] scsi: BusLogic remove bus_to_virt
https://git.kernel.org/mkp/scsi/c/9f7c2232e131 [2/3] scsi: dpt_i2o: remove obsolete driver https://git.kernel.org/mkp/scsi/c/b04e75a4a8a8
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering