Merge tag 'libata-5.8-2020-06-19' of git://git.kernel.dk/linux-block

Pull libata fixes from Jens Axboe:
 "A few minor changes that should go into this release"

* tag 'libata-5.8-2020-06-19' of git://git.kernel.dk/linux-block:
  libata: Use per port sync for detach
  ata/libata: Fix usage of page address by page_address in ata_scsi_mode_select_xlat function
  sata_rcar: handle pm_runtime_get_sync failure cases

diff --combined include/linux/libata.h
index 8bf5e59a7859731e8c638e8930d106cc1428ee09,8a4843704d28d539d9b7e7a49b892f44bcd2ba9a..675895ffa2ddb9c041660339e2984953e954bc59
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -22,6 -22,7 +22,7 @@@
  #include <linux/acpi.h>
  #include <linux/cdrom.h>
  #include <linux/sched.h>
+ #include <linux/async.h>
  
  /*
   * Define if arch has non-standard setup.  This is a _PCI_ standard
@@@ -609,7 -610,7 +610,7 @@@ struct ata_host 
        struct task_struct      *eh_owner;
  
        struct ata_port         *simplex_claimed;       /* channel owning the DMA */
 -      struct ata_port         *ports[0];
 +      struct ata_port         *ports[];
  };
  
  struct ata_queued_cmd {
@@@ -872,6 -873,8 +873,8 @@@ struct ata_port 
        struct timer_list       fastdrain_timer;
        unsigned long           fastdrain_cnt;
  
+       async_cookie_t          cookie;
+ 
        int                     em_message_type;
        void                    *private_data;