27 Mar, 2020
26 commits
-
Add ATA_FORCE config option (visible only if EXPERT config
option is enabled) and make "libata.force" kernel parameter
optional.Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
w/ CONFIG_ATA_FORCE=y:
31983 572 40 32595 7f53 drivers/ata/libata-core.o
w/ CONFIG_ATA_FROCE=n:
28958 316 32 29306 727a drivers/ata/libata-core.oSuggested-by: Christoph Hellwig
Reviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move ata_eh_analyze_ncq_error() and ata_eh_read_log_10h() to
libata-sata.c* add static inline for ata_eh_analyze_ncq_error() for
CONFIG_SATA_HOST=n case (link->sactive is non-zero only if
NCQ commands are actually queued so empty function body is
sufficient)Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
16164 18 0 16182 3f36 drivers/ata/libata-eh.o
after:
15446 18 0 15464 3c68 drivers/ata/libata-eh.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Start separating SATA specific code from libata-eh.c:
* move sata_async_notification() to libata-sata.c:
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
16243 18 0 16261 3f85 drivers/ata/libata-eh.o
after:
16164 18 0 16182 3f36 drivers/ata/libata-eh.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* un-inline:
- ata_scsi_dump_cdb()
- __ata_scsi_queuecmd()* un-static:
- ata_scsi_sdev_config()
- ata_scsi_dev_config()
- ata_scsi_dump_cdb()
- __ata_scsi_queuecmd()* move ata_sas_*() to libata-sata.c:
* add static inlines for CONFIG_SATA_HOST=n case for
ata_sas_{allocate,free}_tag()Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
19137 23 576 19736 4d18 drivers/ata/libata-scsi.o
after:
18330 23 576 18929 49f1 drivers/ata/libata-scsi.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Start separating SATA specific code from libata-scsi.c:
* un-static ata_scsi_find_dev()
* move following code to libata-sata.c:
- SATA only sysfs device attributes handling
- __ata_change_queue_depth()
- ata_scsi_change_queue_depth()* cover with CONFIG_SATA_HOST ifdef SATA only sysfs device
attributes handling code and ATA_SHT_NCQ() macro in
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
20702 105 576 21383 5387 drivers/ata/libata-scsi.o
after:
19137 23 576 19736 4d18 drivers/ata/libata-scsi.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move sata_deb_timing_*() to libata-sata.c
* add static inline for sata_ehc_deb_timing() for
CONFIG_SATA_HOST=n caseCode size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
32158 572 40 32770 8002 drivers/ata/libata-core.o
after:
32015 572 40 32627 7f73 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move ata_qc_complete_multiple() to libata-sata.c
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
32559 572 40 33171 8193 drivers/ata/libata-core.o
after:
32162 572 40 32774 8006 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move sata_link_hardreset() to libata-sata.c
* add static inline for CONFIG_SATA_HOST=n case
* make sata_set_spd_needed() static
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
32724 572 40 33336 8238 drivers/ata/libata-core.o
after:
32559 572 40 33171 8193 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move sata_link_{debounce,resume}() to libata-sata.c
* add static inline for CONFIG_SATA_HOST=n case (only one,
for sata_link_resume() is needed)Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
32816 572 40 33428 8294 drivers/ata/libata-core.o
after:
32724 572 40 33336 8238 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move *sata_set_spd*() to libata-sata.c
* add static inlines for CONFIG_SATA_HOST=n case
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
32842 572 40 33458 82ae drivers/ata/libata-core.o
after:
32812 572 40 33428 8290 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* move sata_scr_*() to libata-sata.c
* add static inlines for CONFIG_SATA_HOST=n case
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
35642 572 40 36254 8d9e drivers/ata/libata-core.o
16607 18 0 16625 40f1 drivers/ata/libata-eh.o
after:
32846 572 40 33458 82b2 drivers/ata/libata-core.o
16243 18 0 16261 3f85 drivers/ata/libata-eh.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Start separating SATA specific code from libata-core.c:
* move following functions to libata-sata.c:
- ata_tf_to_fis()
- ata_tf_from_fis()
- sata_link_scr_lpm()
- ata_slave_link_init()
- sata_lpm_ignore_phy_events()* group above functions together in
* include libata-sata.c in the build when CONFIG_SATA_HOST=y
Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
37582 572 40 38194 9532 drivers/ata/libata-core.o
after:
36762 572 40 37374 91fe drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Add !IS_ENABLED(CONFIG_SATA_HOST) to ata_eh_set_lpm() to allow
compiler to optimize out the function for non-SATA configs (for
PATA hosts "ap && !ap->ops->set_lpm" condition is always true so
it's sufficient for the function to return zero).Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
17353 18 0 17371 43db drivers/ata/libata-eh.o
after:
16607 18 0 16625 40f1 drivers/ata/libata-eh.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Add !IS_ENABLED(CONFIG_SATA_HOST) to ata_dev_config_ncq() to allow
compiler to optimize out the function for non-SATA configs.Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
37582 572 40 38194 9532 drivers/ata/libata-core.o
after:
36462 572 40 37074 90d2 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Separate PATA timings code from libata-core.c:
* add PATA_TIMINGS config option and make corresponding PATA
host drivers (and ATA ACPI code) select it* move following PATA timings code to libata-pata-timings.c:
- ata_timing_quantize()
- ata_timing_merge()
- ata_timing_find_mode()
- ata_timing_compute()* group above functions together in
* include libata-pata-timings.c in the build when PATA_TIMINGS
config option is enabled* cover ata_timing_cycle2mode() with CONFIG_ATA_ACPI ifdef (it
depends on code from libata-core.c and libata-pata-timings.c
while its only user is ATA ACPI)Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
39688 573 40 40301 9d6d drivers/ata/libata-core.o
after:
37820 572 40 38432 9620 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
* fix the overly long line in ata_timing_quantize()
* use standard kernel CodingStyle in ata_timing_merge()
* do not use assignment in if condition in ata_timing_compute()
* fix non-standard comment style in ata_timing_compute()
Reviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Remove EXPORT_SYMBOL_GPL()s for functions used only by
the core libata code.Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
39838 573 40 40451 9e03 drivers/ata/libata-core.o
21071 105 576 21752 54f8 drivers/ata/libata-scsi.o
17519 18 0 17537 4481 drivers/ata/libata-eh.o
after:
39688 573 40 40301 9d6d drivers/ata/libata-core.o
21040 105 576 21721 54d9 drivers/ata/libata-scsi.o
17405 18 0 17423 440f drivers/ata/libata-eh.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Move EXPORT_SYMBOL_GPL()s close to exported code like it is
done in other kernel subsystems. As a nice side effect this
results in the removal of few ifdefs.Reviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Currently the maximum required size of the ata_scsi_rbuf[] is
576 bytes in ata_scsiop_inq_89() so modify ATA_SCSI_RBUF_SIZE
define accordingly.Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
20782 105 4096 24983 6197 drivers/ata/libata-scsi.o
after:
20782 105 576 21463 53d7 drivers/ata/libata-scsi.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Optimize struct ata_force_param size by:
- using u8 for cbl and spd_limit fields
- using u16 for lflags fieldCode size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
41064 573 40 41677 a2cd drivers/ata/libata-core.o
after:
40654 573 40 41267 a133 drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Use COMMAND_LINE_SIZE instead PAGE_SIZE for ata_force_param_buf[]
size as libata parameters buffer doesn't need to be bigger than
the command line buffer.For many architectures this results in decreased libata-core.o
size (COMMAND_LINE_SIZE varies from 256 to 4096 while the minimum
PAGE_SIZE is 4096).Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
41064 4413 40 45517 b1cd drivers/ata/libata-core.o
after:
41064 573 40 41677 a2cd drivers/ata/libata-core.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Initialize rbuf[] directly instead of using ata_tf_to_fis(). This
results in simpler and smaller code. It also allows separating
ata_tf_to_fis() into SATA specific libata part in the future.Code size savings on m68k arch using (modified) atari_defconfig:
text data bss dec hex filename
before:
20824 105 4096 25025 61c1 drivers/ata/libata-scsi.o
after:
20782 105 4096 24983 6197 drivers/ata/libata-scsi.oReviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
Use core helper instead of open-coding it.
Reviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
There is no reason to expose SATA_PMP config option when no SATA
host drivers are enabled. To fix it add SATA_HOST config option,
make all SATA host drivers select it and finally make SATA_PMP
config options depend on it.This also serves as preparation for the future changes which
optimize libata core code size on PATA only setups.CC: "James E.J. Bottomley"
Reviewed-by: Martin K. Petersen # for SCSI bits
Reviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
There is no point in exposing ncq_enable_prio sysfs attribute for
devices on PATA and non-NCQ capable SATA hosts so:* remove dev_attr_ncq_prio_enable from ata_common_sdev_attrs[]
* add ata_ncq_sdev_attrs[]
* update ATA_NCQ_SHT() macro to use ata_ncq_sdev_attrs[]
Reviewed-by: Christoph Hellwig
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe -
In commit 7634ccd2da97 ("libata: maintainership update") from 2018
Jens has officially taken over libata maintainership from Tejun so
remove stale information from core libata code.Acked-by: Tejun Heo
Signed-off-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Jens Axboe
26 Mar, 2020
5 commits
-
Add Intel Comet Lake PCH-V PCI ID to the list of supported controllers.
Signed-off-by: Mika Westerberg
Signed-off-by: Jens Axboe -
Add Intel Comet Lake PCH-H PCI ID to the list of supported controllers.
Signed-off-by: Mika Westerberg
Signed-off-by: Jens Axboe -
When we spawn a SCSI device from an ATA device in libata-scsi
the SCSI device had no relation to the device tree.The DT binding allows us to define port nodes under a
PATA (IDE) or SATA host controller, so we can have proper device
nodes for these devices.If OF is enabled, walk the children of the host controller node
to see if there is a valid device tree node to assign. The reg
is used to match to ID 0 for the master device and ID 1 for the
slave device.The corresponding device tree bindings have been accepted by
the device tree maintainers.Cc: Chris Healy
Cc: Martin K. Petersen
Cc: Bart Van Assche
Reviewed-by: Guenter Roeck
Signed-off-by: Linus Walleij
Signed-off-by: Jens Axboe -
If the call to scsi_add_host_with_dma() in ata_scsi_add_hosts() fails,
then we may get use-after-free KASAN warns:==================================================================
BUG: KASAN: use-after-free in kobject_put+0x24/0x180
Read of size 1 at addr ffff0026b8c80364 by task swapper/0/1
CPU: 1 PID: 1 Comm: swapper/0 Tainted: G W 5.6.0-rc3-00004-g5a71b206ea82-dirty #1765
Hardware name: Huawei TaiShan 200 (Model 2280)/BC82AMDD, BIOS 2280-V2 CS V3.B160.01 02/24/2020
Call trace:
dump_backtrace+0x0/0x298
show_stack+0x14/0x20
dump_stack+0x118/0x190
print_address_description.isra.9+0x6c/0x3b8
__kasan_report+0x134/0x23c
kasan_report+0xc/0x18
__asan_load1+0x5c/0x68
kobject_put+0x24/0x180
put_device+0x10/0x20
scsi_host_put+0x10/0x18
ata_devres_release+0x74/0xb0
release_nodes+0x2d0/0x470
devres_release_all+0x50/0x78
really_probe+0x2d4/0x560
driver_probe_device+0x7c/0x148
device_driver_attach+0x94/0xa0
__driver_attach+0xa8/0x110
bus_for_each_dev+0xe8/0x158
driver_attach+0x30/0x40
bus_add_driver+0x220/0x2e0
driver_register+0xbc/0x1d0
__pci_register_driver+0xbc/0xd0
ahci_pci_driver_init+0x20/0x28
do_one_initcall+0xf0/0x608
kernel_init_freeable+0x31c/0x384
kernel_init+0x10/0x118
ret_from_fork+0x10/0x18Allocated by task 5:
save_stack+0x28/0xc8
__kasan_kmalloc.isra.8+0xbc/0xd8
kasan_kmalloc+0xc/0x18
__kmalloc+0x1a8/0x280
scsi_host_alloc+0x44/0x678
ata_scsi_add_hosts+0x74/0x268
ata_host_register+0x228/0x488
ahci_host_activate+0x1c4/0x2a8
ahci_init_one+0xd18/0x1298
local_pci_probe+0x74/0xf0
work_for_cpu_fn+0x2c/0x48
process_one_work+0x488/0xc08
worker_thread+0x330/0x5d0
kthread+0x1c8/0x1d0
ret_from_fork+0x10/0x18Freed by task 5:
save_stack+0x28/0xc8
__kasan_slab_free+0x118/0x180
kasan_slab_free+0x10/0x18
slab_free_freelist_hook+0xa4/0x1a0
kfree+0xd4/0x3a0
scsi_host_dev_release+0x100/0x148
device_release+0x7c/0xe0
kobject_put+0xb0/0x180
put_device+0x10/0x20
scsi_host_put+0x10/0x18
ata_scsi_add_hosts+0x210/0x268
ata_host_register+0x228/0x488
ahci_host_activate+0x1c4/0x2a8
ahci_init_one+0xd18/0x1298
local_pci_probe+0x74/0xf0
work_for_cpu_fn+0x2c/0x48
process_one_work+0x488/0xc08
worker_thread+0x330/0x5d0
kthread+0x1c8/0x1d0
ret_from_fork+0x10/0x18There is also refcount issue, as well:
WARNING: CPU: 1 PID: 1 at lib/refcount.c:28 refcount_warn_saturate+0xf8/0x170The issue is that we make an erroneous extra call to scsi_host_put()
for that host:So in ahci_init_one()->ata_host_alloc_pinfo()->ata_host_alloc(), we setup
a device release method - ata_devres_release() - which intends to release
the SCSI hosts:static void ata_devres_release(struct device *gendev, void *res)
{
...
for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];if (!ap)
continue;if (ap->scsi_host)
scsi_host_put(ap->scsi_host);}
...
}However in the ata_scsi_add_hosts() error path, we also call
scsi_host_put() for the SCSI hosts.Fix by removing the the scsi_host_put() calls in ata_scsi_add_hosts() and
leave this to ata_devres_release().Fixes: f31871951b38 ("libata: separate out ata_host_alloc() and ata_host_register()")
Signed-off-by: John Garry
Signed-off-by: Jens Axboe -
Add the PCI ID to the driver list to support this new device.
Cc: stable@vger.kernel.org
Signed-off-by: Kai-Heng Feng
Signed-off-by: Jens Axboe
12 Mar, 2020
2 commits
-
Loongson 7A1000 SATA controller uses BAR0 as the base address register.
Signed-off-by: Tiezhu Yang
Signed-off-by: Jens Axboe -
Since snprintf() returns the would-be-output size instead of the
actual output size, the succeeding calls may go beyond the given
buffer limit. Fix it by replacing with scnprintf().Signed-off-by: Takashi Iwai
Signed-off-by: Jens Axboe
06 Feb, 2020
1 commit
-
Pull libata updates from Jens Axboe:
- Add a Sandisk CF card to supported pata_pcmcia list (Christian)
- Move pata_arasan_cf away from legacy API (Peter)
- Ensure ahci DMA/ints are shut down on shutdown (Prabhakar)
* tag 'libata-5.6-2020-02-05' of git://git.kernel.dk/linux-block:
ata: pata_arasan_cf: Use dma_request_chan() instead dma_request_slave_channel()
ata: ahci: Add shutdown to freeze hardware resources of ahci
pata_pcmia: add SanDisk High (>8G) CF card to supported list
30 Jan, 2020
4 commits
-
dma_request_slave_channel() is a wrapper on top of dma_request_chan()
eating up the error code.The dma_request_chan() is the standard API to request slave channel,
clients should be moved away from the legacy API to allow us to retire
them.Acked-by: Viresh Kumar
Acked-by: Bartlomiej Zolnierkiewicz
Signed-off-by: Peter Ujfalusi
Signed-off-by: Jens Axboe -
device_shutdown() called from reboot or power_shutdown expect
all devices to be shutdown. Same is true for even ahci pci driver.
As no ahci shutdown function is implemented, the ata subsystem
always remains alive with DMA & interrupt support. File system
related calls should not be honored after device_shutdown().So defining ahci pci driver shutdown to freeze hardware (mask
interrupt, stop DMA engine and free DMA resources).Signed-off-by: Prabhakar Kushwaha
Signed-off-by: Jens Axboe -
Add new SanDisk High (>8G) CF cards to the pata_pcmcia driver.
Signed-off-by: Christian Zigotzky
Signed-off-by: Jens Axboe -
Pull SCSI updates from James Bottomley:
"This series is slightly unusual because it includes Arnd's compat
ioctl tree here:1c46a2cf2dbd Merge tag 'block-ioctl-cleanup-5.6' into 5.6/scsi-queue
Excluding Arnd's changes, this is mostly an update of the usual
drivers: megaraid_sas, mpt3sas, qla2xxx, ufs, lpfc, hisi_sas.There are a couple of core and base updates around error propagation
and atomicity in the attribute container base we use for the SCSI
transport classes.The rest is minor changes and updates"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (149 commits)
scsi: hisi_sas: Rename hisi_sas_cq.pci_irq_mask
scsi: hisi_sas: Add prints for v3 hw interrupt converge and automatic affinity
scsi: hisi_sas: Modify the file permissions of trigger_dump to write only
scsi: hisi_sas: Replace magic number when handle channel interrupt
scsi: hisi_sas: replace spin_lock_irqsave/spin_unlock_restore with spin_lock/spin_unlock
scsi: hisi_sas: use threaded irq to process CQ interrupts
scsi: ufs: Use UFS device indicated maximum LU number
scsi: ufs: Add max_lu_supported in struct ufs_dev_info
scsi: ufs: Delete is_init_prefetch from struct ufs_hba
scsi: ufs: Inline two functions into their callers
scsi: ufs: Move ufshcd_get_max_pwr_mode() to ufshcd_device_params_init()
scsi: ufs: Split ufshcd_probe_hba() based on its called flow
scsi: ufs: Delete struct ufs_dev_desc
scsi: ufs: Fix ufshcd_probe_hba() reture value in case ufshcd_scsi_add_wlus() fails
scsi: ufs-mediatek: enable low-power mode for hibern8 state
scsi: ufs: export some functions for vendor usage
scsi: ufs-mediatek: add dbg_register_dump implementation
scsi: qla2xxx: Fix a NULL pointer dereference in an error path
scsi: qla1280: Make checking for 64bit support consistent
scsi: megaraid_sas: Update driver version to 07.713.01.00-rc1
...
28 Jan, 2020
1 commit
-
Pull ioremap updates from Christoph Hellwig:
"Remove the ioremap_nocache API (plus wrappers) that are always
identical to ioremap"* tag 'ioremap-5.6' of git://git.infradead.org/users/hch/ioremap:
remove ioremap_nocache and devm_ioremap_nocache
MIPS: define ioremap_nocache to ioremap
23 Jan, 2020
1 commit
-
No one care the varible acard_ahci in func acard_ahci_qc_prep.
better to remove it.Signed-off-by: Alex Shi
Cc: Jens Axboe
Cc: linux-ide@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Jens Axboe
