bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ata fixes for 6.5-rc4

Browse source 
- Fix error message output in the pata_arasan_cf driver (Minjie).
 
  - Fix invalid error return in the pata_octeon_cf driver initialization
    (Yingliang).
 
  - Fix a compilation warning due to a missing static function
    declaration in the pata_ns87415 driver (Arnd).
 
  - Fix the condition evaluating when to fetch sense data for successful
    completions, which should be done only when command duration limits
    are being used (Niklas).
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQSRPv8tYSvhwAzJdzjdoc3SxdoYdgUCZMRjYwAKCRDdoc3SxdoY
 diudAP909al9o4HjzwfwP8SMUs3eoWPxK7EPlRG1p1CiamJ0OQEA/Ua78mS+eNNE
 Zu3Q3LFrrwc/jYdlaFyQBnMq2Mos8QE=
 =9Sh7
 -----END PGP SIGNATURE-----

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

Pull ata fixes from Damien Le Moal:

 - Fix error message output in the pata_arasan_cf driver (Minjie)

 - Fix invalid error return in the pata_octeon_cf driver initialization
   (Yingliang)

 - Fix a compilation warning due to a missing static function
   declaration in the pata_ns87415 driver (Arnd)

 - Fix the condition evaluating when to fetch sense data for successful
   completions, which should be done only when command duration limits
   are being used (Niklas)

* tag 'ata-6.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: libata-core: fix when to fetch sense data for successful commands
  ata: pata_ns87415: mark ns87560_tf_read static
  ata: pata_octeon_cf: fix error return code in octeon_cf_probe()
  ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer()
This commit is contained in:
Linus Torvalds 2023-07-28 18:31:18 -07:00
commit ffabf7c731
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/ata/libata-core.c
View file

@ -4938,8 +4938,8 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
if (qc->result_tf.status & ATA_SENSE && if (qc->result_tf.status & ATA_SENSE &&
((ata_is_ncq(qc->tf.protocol) && ((ata_is_ncq(qc->tf.protocol) &&
dev->flags & ATA_DFLAG_CDL_ENABLED) || dev->flags & ATA_DFLAG_CDL_ENABLED) ||
(!(ata_is_ncq(qc->tf.protocol) && (!ata_is_ncq(qc->tf.protocol) &&
ata_id_sense_reporting_enabled(dev->id))))) { ata_id_sense_reporting_enabled(dev->id)))) {
/* /*
* Tell SCSI EH to not overwrite scmd->result even if * Tell SCSI EH to not overwrite scmd->result even if
* this command is finished with result SAM_STAT_GOOD. * this command is finished with result SAM_STAT_GOOD.

3
drivers/ata/pata_arasan_cf.c
View file

@ -529,7 +529,8 @@ static void data_xfer(struct work_struct *work)
/* dma_request_channel may sleep, so calling from process context */ /* dma_request_channel may sleep, so calling from process context */
acdev->dma_chan = dma_request_chan(acdev->host->dev, "data"); acdev->dma_chan = dma_request_chan(acdev->host->dev, "data");
if (IS_ERR(acdev->dma_chan)) { if (IS_ERR(acdev->dma_chan)) {
dev_err(acdev->host->dev, "Unable to get dma_chan\n"); dev_err_probe(acdev->host->dev, PTR_ERR(acdev->dma_chan),
"Unable to get dma_chan\n");
acdev->dma_chan = NULL; acdev->dma_chan = NULL;
goto chan_request_fail; goto chan_request_fail;
} }

2
drivers/ata/pata_ns87415.c
View file

@ -260,7 +260,7 @@ static u8 ns87560_check_status(struct ata_port *ap)
* LOCKING: * LOCKING:
* Inherited from caller. * Inherited from caller.
*/ */
void ns87560_tf_read(struct ata_port *ap, struct ata_taskfile *tf) static void ns87560_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{ {
struct ata_ioports *ioaddr = &ap->ioaddr; struct ata_ioports *ioaddr = &ap->ioaddr;

6
drivers/ata/pata_octeon_cf.c
View file

@ -815,8 +815,8 @@ static int octeon_cf_probe(struct platform_device *pdev)
irq_handler_t irq_handler = NULL; irq_handler_t irq_handler = NULL;
void __iomem *base; void __iomem *base;
struct octeon_cf_port *cf_port; struct octeon_cf_port *cf_port;
int rv = -ENOMEM;
u32 bus_width; u32 bus_width;
int rv;
node = pdev->dev.of_node; node = pdev->dev.of_node;
if (node == NULL) if (node == NULL)
@ -893,12 +893,12 @@ static int octeon_cf_probe(struct platform_device *pdev)
cs0 = devm_ioremap(&pdev->dev, res_cs0->start, cs0 = devm_ioremap(&pdev->dev, res_cs0->start,
resource_size(res_cs0)); resource_size(res_cs0));
if (!cs0) if (!cs0)
return rv; return -ENOMEM;
/* allocate host */ /* allocate host */
host = ata_host_alloc(&pdev->dev, 1); host = ata_host_alloc(&pdev->dev, 1);
if (!host) if (!host)
return rv; return -ENOMEM;
ap = host->ports[0]; ap = host->ports[0];
ap->private_data = cf_port; ap->private_data = cf_port;