Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1de1591 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "Nothing too interesting.

  Arnd's gcc-7 warning fixes that slipped through the cracks for two
  release cycles (my bad), and two minor low level driver updates"

* 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: don't ignore result code of ahci_reset_controller()
  ata_piix: Add Fujitsu-Siemens Lifebook S6120 to short cable IDs
  ata: avoid gcc-7 warning in ata_timing_quantize
parents 887c8ba7 d312fefe

drivers/ata/ahci.c

+4 −1
Original line number Diff line number Diff line
@@ -621,8 +621,11 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev, 
static int ahci_pci_reset_controller(struct ata_host *host)

{

	struct pci_dev *pdev = to_pci_dev(host->dev);

	int rc;



	ahci_reset_controller(host);

	rc = ahci_reset_controller(host);

	if (rc)

		return rc;



	if (pdev->vendor == PCI_VENDOR_ID_INTEL) {

		struct ahci_host_priv *hpriv = host->private_data;

drivers/ata/ata_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -492,6 +492,7 @@ static const struct ich_laptop ich_laptop[] = { 
	{ 0x27DF, 0x152D, 0x0778 },	/* ICH7 on unknown Intel */

	{ 0x24CA, 0x1025, 0x0061 },	/* ICH4 on ACER Aspire 2023WLMi */

	{ 0x24CA, 0x1025, 0x003d },	/* ICH4 on ACER TM290 */

	{ 0x24CA, 0x10CF, 0x11AB },	/* ICH4M on Fujitsu-Siemens Lifebook S6120 */

	{ 0x266F, 0x1025, 0x0066 },	/* ICH6 on ACER Aspire 1694WLMi */

	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */

	{ 0x27df, 0x104d, 0x900e },	/* ICH7 on Sony TZ-90 */

drivers/ata/libata-core.c

+10 −10
Original line number Diff line number Diff line
@@ -3234,19 +3234,19 @@ static const struct ata_timing ata_timing[] = { 
};



#define ENOUGH(v, unit)		(((v)-1)/(unit)+1)

#define EZ(v, unit)		((v)?ENOUGH(v, unit):0)

#define EZ(v, unit)		((v)?ENOUGH(((v) * 1000), unit):0)



static void ata_timing_quantize(const struct ata_timing *t, struct ata_timing *q, int T, int UT)

{

	q->setup	= EZ(t->setup      * 1000,  T);

	q->act8b	= EZ(t->act8b      * 1000,  T);

	q->rec8b	= EZ(t->rec8b      * 1000,  T);

	q->cyc8b	= EZ(t->cyc8b      * 1000,  T);

	q->active	= EZ(t->active     * 1000,  T);

	q->recover	= EZ(t->recover    * 1000,  T);

	q->dmack_hold	= EZ(t->dmack_hold * 1000,  T);

	q->cycle	= EZ(t->cycle      * 1000,  T);

	q->udma		= EZ(t->udma       * 1000, UT);

	q->setup	= EZ(t->setup,       T);

	q->act8b	= EZ(t->act8b,       T);

	q->rec8b	= EZ(t->rec8b,       T);

	q->cyc8b	= EZ(t->cyc8b,       T);

	q->active	= EZ(t->active,      T);

	q->recover	= EZ(t->recover,     T);

	q->dmack_hold	= EZ(t->dmack_hold,  T);

	q->cycle	= EZ(t->cycle,       T);

	q->udma		= EZ(t->udma,       UT);

}



void ata_timing_merge(const struct ata_timing *a, const struct ata_timing *b,