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

Commit 0050ae57 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cpufeature' into x86/urgent, because it's ready 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a57e456a 488ca7d7

arch/x86/include/asm/cpufeature.h

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ 
#define X86_FEATURE_AVX512PF	( 9*32+26) /* AVX-512 Prefetch */

#define X86_FEATURE_AVX512ER	( 9*32+27) /* AVX-512 Exponential and Reciprocal */

#define X86_FEATURE_AVX512CD	( 9*32+28) /* AVX-512 Conflict Detection */

#define X86_FEATURE_SHA_NI	( 9*32+29) /* SHA1/SHA256 Instruction Extensions */



/* Extended state features, CPUID level 0x0000000d:1 (eax), word 10 */

#define X86_FEATURE_XSAVEOPT	(10*32+ 0) /* XSAVEOPT */

drivers/ata/ahci_brcmstb.c

+4 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ static inline u32 brcm_sata_readreg(void __iomem *addr) 
	 * Other architectures (e.g., ARM) either do not support big endian, or

	 * else leave I/O in little endian mode.

	 */

	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))

	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))

		return __raw_readl(addr);

	else

		return readl_relaxed(addr);
@@ -101,7 +101,7 @@ static inline u32 brcm_sata_readreg(void __iomem *addr) 
static inline void brcm_sata_writereg(u32 val, void __iomem *addr)

{

	/* See brcm_sata_readreg() comments */

	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(__BIG_ENDIAN))

	if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN))

		__raw_writel(val, addr);

	else

		writel_relaxed(val, addr);
@@ -209,6 +209,7 @@ static void brcm_sata_init(struct brcm_ahci_priv *priv) 
			   priv->top_ctrl + SATA_TOP_CTRL_BUS_CTRL);

}



#ifdef CONFIG_PM_SLEEP

static int brcm_ahci_suspend(struct device *dev)

{

	struct ata_host *host = dev_get_drvdata(dev);
@@ -231,6 +232,7 @@ static int brcm_ahci_resume(struct device *dev) 
	brcm_sata_phys_enable(priv);

	return ahci_platform_resume(dev);

}

#endif



static struct scsi_host_template ahci_platform_sht = {

	AHCI_SHT(DRV_NAME),

drivers/ata/libata-core.c

+3 −21
Original line number Diff line number Diff line
@@ -694,11 +694,11 @@ static int ata_rwcmd_protocol(struct ata_taskfile *tf, struct ata_device *dev) 
 *	RETURNS:

 *	Block address read from @tf.

 */

u64 ata_tf_read_block(const struct ata_taskfile *tf, struct ata_device *dev)

u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev)

{

	u64 block = 0;



	if (!dev || tf->flags & ATA_TFLAG_LBA) {

	if (tf->flags & ATA_TFLAG_LBA) {

		if (tf->flags & ATA_TFLAG_LBA48) {

			block |= (u64)tf->hob_lbah << 40;

			block |= (u64)tf->hob_lbam << 32;
@@ -2147,24 +2147,6 @@ static int ata_dev_config_ncq(struct ata_device *dev, 
	return 0;

}



static void ata_dev_config_sense_reporting(struct ata_device *dev)

{

	unsigned int err_mask;



	if (!ata_id_has_sense_reporting(dev->id))

		return;



	if (ata_id_sense_reporting_enabled(dev->id))

		return;



	err_mask = ata_dev_set_feature(dev, SETFEATURE_SENSE_DATA, 0x1);

	if (err_mask) {

		ata_dev_dbg(dev,

			    "failed to enable Sense Data Reporting, Emask 0x%x\n",

			    err_mask);

	}

}



/**

 *	ata_dev_configure - Configure the specified ATA/ATAPI device

 *	@dev: Target device to configure
@@ -2387,7 +2369,7 @@ int ata_dev_configure(struct ata_device *dev) 
					dev->devslp_timing[i] = sata_setting[j];

				}

		}

		ata_dev_config_sense_reporting(dev);



		dev->cdb_len = 16;

	}

drivers/ata/libata-eh.c

+2 −103
Original line number Diff line number Diff line
@@ -1592,8 +1592,6 @@ static int ata_eh_read_log_10h(struct ata_device *dev, 
	tf->hob_lbah = buf[10];

	tf->nsect = buf[12];

	tf->hob_nsect = buf[13];

	if (ata_id_has_ncq_autosense(dev->id))

		tf->auxiliary = buf[14] << 16 | buf[15] << 8 | buf[16];



	return 0;

}
@@ -1629,70 +1627,6 @@ unsigned int atapi_eh_tur(struct ata_device *dev, u8 *r_sense_key) 
	return err_mask;

}



/**

 *	ata_eh_request_sense - perform REQUEST_SENSE_DATA_EXT

 *	@dev: device to perform REQUEST_SENSE_SENSE_DATA_EXT to

 *	@sense_buf: result sense data buffer (SCSI_SENSE_BUFFERSIZE bytes long)

 *	@dfl_sense_key: default sense key to use

 *

 *	Perform REQUEST_SENSE_DATA_EXT after the device reported CHECK

 *	SENSE.  This function is EH helper.

 *

 *	LOCKING:

 *	Kernel thread context (may sleep).

 *

 *	RETURNS:

 *	encoded sense data on success, 0 on failure or if sense data

 *	is not available.

 */

static u32 ata_eh_request_sense(struct ata_queued_cmd *qc,

				struct scsi_cmnd *cmd)

{

	struct ata_device *dev = qc->dev;

	struct ata_taskfile tf;

	unsigned int err_mask;



	if (!cmd)

		return 0;



	DPRINTK("ATA request sense\n");

	ata_dev_warn(dev, "request sense\n");

	if (!ata_id_sense_reporting_enabled(dev->id)) {

		ata_dev_warn(qc->dev, "sense data reporting disabled\n");

		return 0;

	}

	ata_tf_init(dev, &tf);



	tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;

	tf.flags |= ATA_TFLAG_LBA | ATA_TFLAG_LBA48;

	tf.command = ATA_CMD_REQ_SENSE_DATA;

	tf.protocol = ATA_PROT_NODATA;



	err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);

	/*

	 * ACS-4 states:

	 * The device may set the SENSE DATA AVAILABLE bit to one in the

	 * STATUS field and clear the ERROR bit to zero in the STATUS field

	 * to indicate that the command returned completion without an error

	 * and the sense data described in table 306 is available.

	 *

	 * IOW the 'ATA_SENSE' bit might not be set even though valid

	 * sense data is available.

	 * So check for both.

	 */

	if ((tf.command & ATA_SENSE) ||

		tf.lbah != 0 || tf.lbam != 0 || tf.lbal != 0) {

		ata_scsi_set_sense(cmd, tf.lbah, tf.lbam, tf.lbal);

		qc->flags |= ATA_QCFLAG_SENSE_VALID;

		ata_dev_warn(dev, "sense data %02x/%02x/%02x\n",

			     tf.lbah, tf.lbam, tf.lbal);

	} else {

		ata_dev_warn(dev, "request sense failed stat %02x emask %x\n",

			     tf.command, err_mask);

	}

	return err_mask;

}



/**

 *	atapi_eh_request_sense - perform ATAPI REQUEST_SENSE

 *	@dev: device to perform REQUEST_SENSE to
@@ -1855,19 +1789,6 @@ void ata_eh_analyze_ncq_error(struct ata_link *link) 
	memcpy(&qc->result_tf, &tf, sizeof(tf));

	qc->result_tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_LBA | ATA_TFLAG_LBA48;

	qc->err_mask |= AC_ERR_DEV | AC_ERR_NCQ;

	if (qc->result_tf.auxiliary) {

		char sense_key, asc, ascq;



		sense_key = (qc->result_tf.auxiliary >> 16) & 0xff;

		asc = (qc->result_tf.auxiliary >> 8) & 0xff;

		ascq = qc->result_tf.auxiliary & 0xff;

		ata_dev_dbg(dev, "NCQ Autosense %02x/%02x/%02x\n",

			    sense_key, asc, ascq);

		ata_scsi_set_sense(qc->scsicmd, sense_key, asc, ascq);

		ata_scsi_set_sense_information(qc->scsicmd, &qc->result_tf);

		qc->flags |= ATA_QCFLAG_SENSE_VALID;

	}



	ehc->i.err_mask &= ~AC_ERR_DEV;

}
@@ -1897,27 +1818,6 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc, 
		return ATA_EH_RESET;

	}



	/*

	 * Sense data reporting does not work if the

	 * device fault bit is set.

	 */

	if ((stat & ATA_SENSE) && !(stat & ATA_DF) &&

	    !(qc->flags & ATA_QCFLAG_SENSE_VALID)) {

		if (!(qc->ap->pflags & ATA_PFLAG_FROZEN)) {

			tmp = ata_eh_request_sense(qc, qc->scsicmd);

			if (tmp)

				qc->err_mask |= tmp;

			else

				ata_scsi_set_sense_information(qc->scsicmd, tf);

		} else {

			ata_dev_warn(qc->dev, "sense data available but port frozen\n");

		}

	}



	/* Set by NCQ autosense or request sense above */

	if (qc->flags & ATA_QCFLAG_SENSE_VALID)

		return 0;



	if (stat & (ATA_ERR | ATA_DF))

		qc->err_mask |= AC_ERR_DEV;

	else
@@ -2661,15 +2561,14 @@ static void ata_eh_link_report(struct ata_link *link) 


#ifdef CONFIG_ATA_VERBOSE_ERROR

		if (res->command & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ |

				    ATA_SENSE | ATA_ERR)) {

				    ATA_ERR)) {

			if (res->command & ATA_BUSY)

				ata_dev_err(qc->dev, "status: { Busy }\n");

			else

				ata_dev_err(qc->dev, "status: { %s%s%s%s%s}\n",

				ata_dev_err(qc->dev, "status: { %s%s%s%s}\n",

				  res->command & ATA_DRDY ? "DRDY " : "",

				  res->command & ATA_DF ? "DF " : "",

				  res->command & ATA_DRQ ? "DRQ " : "",

				  res->command & ATA_SENSE ? "SENSE " : "",

				  res->command & ATA_ERR ? "ERR " : "");

		}

drivers/ata/libata-scsi.c

+2 −19
Original line number Diff line number Diff line
@@ -270,28 +270,13 @@ DEVICE_ATTR(unload_heads, S_IRUGO | S_IWUSR, 
	    ata_scsi_park_show, ata_scsi_park_store);

EXPORT_SYMBOL_GPL(dev_attr_unload_heads);



void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq)

static void ata_scsi_set_sense(struct scsi_cmnd *cmd, u8 sk, u8 asc, u8 ascq)

{

	if (!cmd)

		return;



	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;



	scsi_build_sense_buffer(0, cmd->sense_buffer, sk, asc, ascq);

}



void ata_scsi_set_sense_information(struct scsi_cmnd *cmd,

				    const struct ata_taskfile *tf)

{

	u64 information;



	if (!cmd)

		return;



	information = ata_tf_read_block(tf, NULL);

	scsi_set_sense_information(cmd->sense_buffer, information);

}



static ssize_t

ata_scsi_em_message_store(struct device *dev, struct device_attribute *attr,

			  const char *buf, size_t count)
@@ -1792,9 +1777,7 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) 
	    ((cdb[2] & 0x20) || need_sense)) {

		ata_gen_passthru_sense(qc);

	} else {

		if (qc->flags & ATA_QCFLAG_SENSE_VALID) {

			cmd->result = SAM_STAT_CHECK_CONDITION;

		} else if (!need_sense) {

		if (!need_sense) {

			cmd->result = SAM_STAT_GOOD;

		} else {

			/* TODO: decide which descriptor format to use