kernel/git/next/linux-next.git/drivers/ata, branch akpm

ata: pata_macio: Fix compilation warning

2022-06-20T11:02:21+00:00

Change the debug print format for the PIO, MWDMA and UDMA masks from long to int to match the new type used for these fields in struct ata_port_info. Fixes: f0a6d77b351c ("ata: make transfer mode masks *unsigned int*") Signed-off-by: Damien Le Moal

ata: libata-eh: fix sloppy result type of ata_internal_cmd_timeout()

2022-06-19T23:21:57+00:00

ata_internal_cmd_timeout() returns *unsigned long* timeout in ms, however ata_exec_internal_sg() passes that timeout to msecs_to_jiffies() that takes just *unsigned int*. Change ata_internal_cmd_timeout()'s result type to *unsigned int* as well, also updating the *struct* ata_eh_cmd_timeout_ent and the command timeout tables -- all timeouts fit into *unsigned int* but we have to change ULONG_MAX to UINT_MAX... Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: libata-core: fix sloppy parameter type in ata_exec_internal[_sg]()

2022-06-19T23:21:57+00:00

Make the 'timeout' parameter to ata_exec_internal_sg() *unsigned int* as msecs_to_jiffies() that it calls takes just *unsigned int* for the time in milliseconds. Then follow the suit with ata_exec_internal(), its only caller; also fix up ata_dev_set_feature(), the only ata_exec_internal()'s caller that explicitly passes *unsigned long* variable for timeout... Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: libata-eh: fix sloppy result type of ata_eh_nr_in_flight()

2022-06-19T23:16:09+00:00

ata_eh_nr_in_flight() counts the # of the active tagged commands and thus cannot return a negative value but the result type is nevertheless int. Switching it to unsigned int (along with the local variables receiving the function's result) helps avoiding the sign extension instructions when comparing with or assigning to unsigned long ata_port::fastdrain_cnt and thus results in a more compact 64-bit code. Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. [Damien] Fixed commit message. Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: libata-core: make ata_exec_internal_sg() static

2022-06-17T07:45:23+00:00

ata_exec_internal_sg() is only called by ata_exec_internal() further in the same file, so we can make it *static* and remove its prototype from drivers/ata/libata.h... Suggested-by: Damien Le Moal Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: make transfer mode masks unsigned int

2022-06-17T07:35:02+00:00

The packed transfer mode masks and also the {pio|mwdma|udma}_mask fields of *struct*s ata_device and ata_port_info are declared as *unsigned long* (which is a 64-bit type on 64-bit architectures) but actually the packed masks occupy only 20 bits (7 PIO modes, 5 MWDMA modes, and 8 UDMA modes) and the PIO/MWDMA/UDMA masks easily fit into just 8 bits each, so we can safely use (always 32-bit) *unsigned int* variables instead. This saves 745 bytes of object code in libata-core.o alone, not to mention LLDDs... Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: libata-core: get rid of else branches in ata_id_n_sectors()

2022-06-14T08:58:57+00:00

Using *else* after *return* doesn't make much sense -- getting rid of such *else* branches reduces the indentation levels and thus reduces # of LoC... Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: libata-core: fix sloppy typing in ata_id_n_sectors()

2022-06-13T02:42:58+00:00

The code multiplying the # of cylinders/heads/sectors in ata_id_n_sectors() to get a disk capacity implicitly uses the *int* type for that calculation and casting the result to 'u64' before returning ensues a sign extension. Explicitly casting the 'u16' typed multipliers to 'u32' results in avoiding a sign extension instruction and so in a more compact code... Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: pata_hpt3x2n: pass base DPLL frequency to hpt3x2n_pci_clock()

2022-06-13T02:42:58+00:00

Currently, the base DPLL frequency is hardcoded in hpt3x2n_pci_clock(). Align with the updated 'pata_hpt37x' driver, where this frequency is a parameter to hpt37x_pci_clock(). While at it, also do the following to align with the 'pata_hpt37x' driver: - fix the 'freq' local variable's type; - remove the 'iobase' local variable; - extend the comment to the inl() call; - move the 'total' local variable's declaration. Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

ata: pata_hpt37x: merge hpt374_read_freq() to hpt37x_pci_clock()

2022-06-13T02:42:58+00:00

With hpt374_read_freq() implemented as a separate function, there's some code duplication going on, not to mention that this function is named incorrectly: it returns the f_CNT register value saved by BIOS, not the PCI clock frequency. Folding hpt374_read_freq() into hpt37x_pci_clock() saves 20 bytes of object code with x86_64 gcc 10.3.1... Signed-off-by: Sergey Shtylyov Signed-off-by: Damien Le Moal

kernel/git/next/linux-next.git/drivers/ata, branch akpm

ata: pata_macio: Fix compilation warning

ata: libata-eh: fix sloppy result type of ata_internal_cmd_timeout()

ata: libata-core: fix sloppy parameter type in ata_exec_internal[_sg]()

ata: libata-eh: fix sloppy result type of ata_eh_nr_in_flight()

ata: libata-core: make ata_exec_internal_sg() *static*

ata: make transfer mode masks *unsigned int*

ata: libata-core: get rid of *else* branches in ata_id_n_sectors()

ata: libata-core: fix sloppy typing in ata_id_n_sectors()

ata: pata_hpt3x2n: pass base DPLL frequency to hpt3x2n_pci_clock()

ata: pata_hpt37x: merge hpt374_read_freq() to hpt37x_pci_clock()

ata: libata-core: make ata_exec_internal_sg() static

ata: make transfer mode masks unsigned int

ata: libata-core: get rid of else branches in ata_id_n_sectors()