Commit 4b3d6e0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata updates from Damien Le Moal:

 - Fix OF include file for ata platform drivers (Rob)

 - Simplify various ahci, sata and pata platform drivers using the
   function devm_platform_ioremap_resource() (Yangtao)

 - Cleanup libata time related argument types (e.g. timeouts values)
   (Sergey)

 - Cleanup libata code around error handling as all ata drivers now
   define a error_handler operation (Hannes and Niklas)

 - Remove functions intended for libsas that are in fact unused (Niklas)

 - Change the remove device callback of platform drivers to a null
   function (Uwe)

 - Simplify the pata_imx driver using devm_clk_get_enabled() (Li)

 - Remove old and uinused remnants of the ide code in arm, parisc,
   powerpc, sparc and m68k architectures and associated drivers
   (pata_buddha, pata_falcon and pata_gayle) (Geert)

 - Add missing MODULE_DESCRIPTION() in the sata_gemini and pata_ftide010
   drivers (me)

 - Several fixes for the pata_ep93xx and pata_falcon drivers (Nikita,
   Michael)

 - Add Elkhart Lake AHCI controller support to the ahci driver (Werner)

 - Disable NCQ trim on Micron 1100 drives (Pawel)

* tag 'ata-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata: (60 commits)
  ata: libata-core: Disable NCQ_TRIM on Micron 1100 drives
  ata: ahci: Add Elkhart Lake AHCI controller
  ata: pata_falcon: add data_swab option to byte-swap disk data
  ata: pata_falcon: fix IO base selection for Q40
  ata: pata_ep93xx: use soc_device_match for UDMA modes
  ata: pata_ep93xx: fix error return code in probe
  ata: sata_gemini: Add missing MODULE_DESCRIPTION
  ata: pata_ftide010: Add missing MODULE_DESCRIPTION
  m68k: Remove <asm/ide.h>
  ata: pata_gayle: Remove #include <asm/ide.h>
  ata: pata_falcon: Remove #include <asm/ide.h>
  ata: pata_buddha: Remove #include <asm/ide.h>
  asm-generic: Remove ide_iops.h
  sparc: Remove <asm/ide.h>
  powerpc: Remove <asm/ide.h>
  parisc: Remove <asm/ide.h>
  ARM: Remove <asm/ide.h>
  ata: pata_imx: Use helper function devm_clk_get_enabled()
  ata: sata_rcar: Convert to platform remove callback returning void
  ata: sata_mv: Convert to platform remove callback returning void
  ...
parents 77331719 27fd0710

Documentation/driver-api/libata.rst

+6 −32
Original line number Diff line number Diff line
@@ -32,22 +32,6 @@ register blocks. 
:c:type:`struct ata_port_operations <ata_port_operations>`

----------------------------------------------------------



Disable ATA port

~~~~~~~~~~~~~~~~



::



    void (*port_disable) (struct ata_port *);





Called from :c:func:`ata_bus_probe` error path, as well as when unregistering

from the SCSI module (rmmod, hot unplug). This function should do

whatever needs to be done to take the port out of use. In most cases,

:c:func:`ata_port_disable` can be used as this hook.



Called from :c:func:`ata_bus_probe` on a failed probe. Called from

:c:func:`ata_scsi_release`.



Post-IDENTIFY device configuration

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -272,14 +256,6 @@ advanced drivers implement their own ``->qc_issue``. 
Exception and probe handling (EH)

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



::



    void (*eng_timeout) (struct ata_port *ap);

    void (*phy_reset) (struct ata_port *ap);





Deprecated. Use ``->error_handler()`` instead.



::



    void (*freeze) (struct ata_port *ap);
@@ -364,8 +340,7 @@ SATA phy read/write 
                       u32 val);





Read and write standard SATA phy registers. Currently only used if

``->phy_reset`` hook called the :c:func:`sata_phy_reset` helper function.

Read and write standard SATA phy registers.

sc_reg is one of SCR_STATUS, SCR_CONTROL, SCR_ERROR, or SCR_ACTIVE.



Init and shutdown
@@ -536,13 +511,12 @@ to return without deallocating the qc. This leads us to 


:c:func:`ata_scsi_error` is the current ``transportt->eh_strategy_handler()``

for libata. As discussed above, this will be entered in two cases -

timeout and ATAPI error completion. This function calls low level libata

driver's :c:func:`eng_timeout` callback, the standard callback for which is

:c:func:`ata_eng_timeout`. It checks if a qc is active and calls

:c:func:`ata_qc_timeout` on the qc if so. Actual error handling occurs in

:c:func:`ata_qc_timeout`.

timeout and ATAPI error completion. This function will check if a qc is active

and has not failed yet. Such a qc will be marked with AC_ERR_TIMEOUT such that

EH will know to handle it later. Then it calls low level libata driver's

:c:func:`error_handler` callback.



If EH is invoked for timeout, :c:func:`ata_qc_timeout` stops BMDMA and

When the :c:func:`error_handler` callback is invoked it stops BMDMA and

completes the qc. Note that as we're currently in EH, we cannot call

scsi_done. As described in SCSI EH doc, a recovered scmd should be

either retried with :c:func:`scsi_queue_insert` or finished with

arch/arm/include/asm/ide.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  arch/arm/include/asm/ide.h

 *

 *  Copyright (C) 1994-1996  Linus Torvalds & authors

 */



/*

 *  This file contains the ARM architecture specific IDE code.

 */



#ifndef __ASMARM_IDE_H

#define __ASMARM_IDE_H



#ifdef __KERNEL__



#define __ide_mm_insw(port,addr,len)	readsw(port,addr,len)

#define __ide_mm_insl(port,addr,len)	readsl(port,addr,len)

#define __ide_mm_outsw(port,addr,len)	writesw(port,addr,len)

#define __ide_mm_outsl(port,addr,len)	writesl(port,addr,len)



#endif /* __KERNEL__ */



#endif /* __ASMARM_IDE_H */

arch/m68k/include/asm/ide.h

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  Copyright (C) 1994-1996  Linus Torvalds & authors

 */



/* Copyright(c) 1996 Kars de Jong */

/* Based on the ide driver from 1.2.13pl8 */



/*

 * Credits (alphabetical):

 *

 *  - Bjoern Brauel

 *  - Kars de Jong

 *  - Torsten Ebeling

 *  - Dwight Engen

 *  - Thorsten Floeck

 *  - Roman Hodek

 *  - Guenther Kelleter

 *  - Chris Lawrence

 *  - Michael Rausch

 *  - Christian Sauer

 *  - Michael Schmitz

 *  - Jes Soerensen

 *  - Michael Thurm

 *  - Geert Uytterhoeven

 */



#ifndef _M68K_IDE_H

#define _M68K_IDE_H



#ifdef __KERNEL__

#include <asm/setup.h>

#include <asm/io.h>

#include <asm/irq.h>



#ifdef CONFIG_MMU



/*

 * Get rid of defs from io.h - ide has its private and conflicting versions

 * Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we

 * always use the `raw' MMIO versions

 */

#undef readb

#undef readw

#undef writeb

#undef writew



#define readb				in_8

#define readw				in_be16

#define __ide_mm_insw(port, addr, n)	raw_insw((u16 *)port, addr, n)

#define __ide_mm_insl(port, addr, n)	raw_insl((u32 *)port, addr, n)

#define writeb(val, port)		out_8(port, val)

#define writew(val, port)		out_be16(port, val)

#define __ide_mm_outsw(port, addr, n)	raw_outsw((u16 *)port, addr, n)

#define __ide_mm_outsl(port, addr, n)	raw_outsl((u32 *)port, addr, n)



#else



#define __ide_mm_insw(port, addr, n)	io_insw((unsigned int)port, addr, n)

#define __ide_mm_insl(port, addr, n)	io_insl((unsigned int)port, addr, n)

#define __ide_mm_outsw(port, addr, n)	io_outsw((unsigned int)port, addr, n)

#define __ide_mm_outsl(port, addr, n)	io_outsl((unsigned int)port, addr, n)



#endif /* CONFIG_MMU */



#endif /* __KERNEL__ */

#endif /* _M68K_IDE_H */

arch/parisc/include/asm/ide.h

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  linux/include/asm-parisc/ide.h

 *

 *  Copyright (C) 1994-1996  Linus Torvalds & authors

 */



/*

 *  This file contains the PARISC architecture specific IDE code.

 */



#ifndef __ASM_PARISC_IDE_H

#define __ASM_PARISC_IDE_H



/* Generic I/O and MEMIO string operations.  */



#define __ide_insw	insw

#define __ide_insl	insl

#define __ide_outsw	outsw

#define __ide_outsl	outsl



static __inline__ void __ide_mm_insw(void __iomem *port, void *addr, u32 count)

{

	while (count--) {

		*(u16 *)addr = __raw_readw(port);

		addr += 2;

	}

}



static __inline__ void __ide_mm_insl(void __iomem *port, void *addr, u32 count)

{

	while (count--) {

		*(u32 *)addr = __raw_readl(port);

		addr += 4;

	}

}



static __inline__ void __ide_mm_outsw(void __iomem *port, void *addr, u32 count)

{

	while (count--) {

		__raw_writew(*(u16 *)addr, port);

		addr += 2;

	}

}



static __inline__ void __ide_mm_outsl(void __iomem *port, void *addr, u32 count)

{

	while (count--) {

		__raw_writel(*(u32 *)addr, port);

		addr += 4;

	}

}



#endif /* __ASM_PARISC_IDE_H */

arch/powerpc/include/asm/ide.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  Copyright (C) 1994-1996 Linus Torvalds & authors

 *

 *  This file contains the powerpc architecture specific IDE code.

 */

#ifndef _ASM_POWERPC_IDE_H

#define _ASM_POWERPC_IDE_H



#include <linux/compiler.h>

#include <asm/io.h>



#define __ide_mm_insw(p, a, c)	readsw((void __iomem *)(p), (a), (c))

#define __ide_mm_insl(p, a, c)	readsl((void __iomem *)(p), (a), (c))

#define __ide_mm_outsw(p, a, c)	writesw((void __iomem *)(p), (a), (c))

#define __ide_mm_outsl(p, a, c)	writesl((void __iomem *)(p), (a), (c))



#endif /* _ASM_POWERPC_IDE_H */