Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump requests from 2.31.0 to 2.32.0 in /drivers/gpu/drm/ci/xfails #2

Open
wants to merge 26 commits into
base: intel-sst
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ef08f4d
tools/arch/x86/intel_sdsi: Fix maximum meter bundle length
debox1 Apr 11, 2024
fe76d52
tools/arch/x86/intel_sdsi: Fix meter_show display
debox1 Apr 11, 2024
0d0d6ea
tools/arch/x86/intel_sdsi: Fix meter_certificate decoding
debox1 Apr 11, 2024
89f40fa
tools/arch/x86/intel_sdsi: Simplify ascii printing
debox1 Apr 11, 2024
cc6add3
tools/arch/x86/intel_sdsi: Add current meter support
debox1 Apr 11, 2024
84eeabf
platform/x86: think-lmi: Convert container_of() macros to static inline
ij-intel Apr 12, 2024
8346bb7
platform/x86/intel/ifs: Classify error scenarios correctly
jithu83 Apr 12, 2024
d8248a1
platform/x86/intel/ifs: trace: display batch num in hex
jithu83 Apr 12, 2024
0aae4c4
platform/x86/intel/ifs: Disable irq during one load stage
jithu83 Apr 12, 2024
36dc58c
platform/x86/amd/pmc: Fix implicit declaration error on i386
Apr 16, 2024
1046fb5
platform/x86/intel-uncore-freq: Don't present root domain on error
spandruvada Apr 15, 2024
37c8514
platform/x86/amd: Don't allow HSMP to be loaded on non-server hardware
superm1 Apr 16, 2024
fe3baf8
platform/x86/intel/pmc: Fix PCH names in comments
ColinIanKing Apr 18, 2024
a3ce355
platform/x86: thinkpad_acpi: change sprintf() to sysfs_emit()
Apr 17, 2024
9522f63
platform/x86: msi-laptop: Use sysfs_emit() to replace sprintf()
Apr 19, 2024
4f733d8
platform/x86: samsung-laptop: Use sysfs_emit() to replace the old int…
Apr 19, 2024
0084b1e
platform/x86: asus-laptop: Use sysfs_emit() and sysfs_emit_at() to re…
Apr 22, 2024
1094483
tools/power/x86/intel-speed-select: Increase die count
spandruvada Mar 7, 2024
57047f8
tools/power/x86/intel-speed-select: Support multiple dies
spandruvada Mar 7, 2024
6b09252
tools/power/x86/intel-speed-select: Fix display for unsupported levels
spandruvada Mar 9, 2024
f731c94
tools/power/x86/intel-speed-select: Present all TRL levels for turbo-…
spandruvada Mar 9, 2024
cf07a45
tools/power/x86/intel-speed-select: Increase number of CPUs displayed
spandruvada Mar 25, 2024
a17b753
tools/power/x86/intel-speed-select: SST BF/TF support per level
spandruvada Mar 26, 2024
5c49b8f
tools/power/x86/intel-speed-select: Display CPU as None for -1
spandruvada Apr 26, 2024
af243b7
tools/power/x86/intel-speed-select: v1.19 release
spandruvada Apr 26, 2024
f21f83a
---
dependabot[bot] May 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/gpu/drm/ci/xfails/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ charset-normalizer==3.2.0
idna==3.4
pip==23.3
python-gitlab==3.15.0
requests==2.31.0
requests==2.32.0
requests-toolbelt==1.0.0
ruamel.yaml==0.17.32
ruamel.yaml.clib==0.2.7
Expand Down
16 changes: 16 additions & 0 deletions drivers/platform/x86/amd/hsmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,17 @@ static int hsmp_plat_dev_register(void)
return ret;
}

static bool hsmp_supported_profile(void)
{
switch (acpi_gbl_FADT.preferred_profile) {
case PM_ENTERPRISE_SERVER:
case PM_SOHO_SERVER:
case PM_PERFORMANCE_SERVER:
return true;
}
return false;
}

static int __init hsmp_plt_init(void)
{
int ret = -ENODEV;
Expand All @@ -917,6 +928,11 @@ static int __init hsmp_plt_init(void)
return ret;
}

if (!hsmp_supported_profile()) {
pr_err("HSMP is only supported on servers");
return ret;
}

/*
* amd_nb_num() returns number of SMN/DF interfaces present in the system
* if we have N SMN/DF interfaces that ideally means N sockets
Expand Down
1 change: 1 addition & 0 deletions drivers/platform/x86/amd/pmc/mp2_stb.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <linux/debugfs.h>
#include <linux/device.h>
#include <linux/io.h>
#include <linux/io-64-nonatomic-lo-hi.h>
#include <linux/iopoll.h>
#include <linux/pci.h>
#include <linux/sizes.h>
Expand Down
44 changes: 22 additions & 22 deletions drivers/platform/x86/asus-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -852,8 +852,8 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr,
* so we don't set eof to 1
*/

len += sprintf(page, ASUS_LAPTOP_NAME " " ASUS_LAPTOP_VERSION "\n");
len += sprintf(page + len, "Model reference : %s\n", asus->name);
len += sysfs_emit_at(page, len, ASUS_LAPTOP_NAME " " ASUS_LAPTOP_VERSION "\n");
len += sysfs_emit_at(page, len, "Model reference : %s\n", asus->name);
/*
* The SFUN method probably allows the original driver to get the list
* of features supported by a given model. For now, 0x0100 or 0x0800
Expand All @@ -862,7 +862,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr,
*/
rv = acpi_evaluate_integer(asus->handle, "SFUN", NULL, &temp);
if (ACPI_SUCCESS(rv))
len += sprintf(page + len, "SFUN value : %#x\n",
len += sysfs_emit_at(page, len, "SFUN value : %#x\n",
(uint) temp);
/*
* The HWRS method return informations about the hardware.
Expand All @@ -874,7 +874,7 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr,
*/
rv = acpi_evaluate_integer(asus->handle, "HWRS", NULL, &temp);
if (ACPI_SUCCESS(rv))
len += sprintf(page + len, "HWRS value : %#x\n",
len += sysfs_emit_at(page, len, "HWRS value : %#x\n",
(uint) temp);
/*
* Another value for userspace: the ASYM method returns 0x02 for
Expand All @@ -885,25 +885,25 @@ static ssize_t infos_show(struct device *dev, struct device_attribute *attr,
*/
rv = acpi_evaluate_integer(asus->handle, "ASYM", NULL, &temp);
if (ACPI_SUCCESS(rv))
len += sprintf(page + len, "ASYM value : %#x\n",
len += sysfs_emit_at(page, len, "ASYM value : %#x\n",
(uint) temp);
if (asus->dsdt_info) {
snprintf(buf, 16, "%d", asus->dsdt_info->length);
len += sprintf(page + len, "DSDT length : %s\n", buf);
len += sysfs_emit_at(page, len, "DSDT length : %s\n", buf);
snprintf(buf, 16, "%d", asus->dsdt_info->checksum);
len += sprintf(page + len, "DSDT checksum : %s\n", buf);
len += sysfs_emit_at(page, len, "DSDT checksum : %s\n", buf);
snprintf(buf, 16, "%d", asus->dsdt_info->revision);
len += sprintf(page + len, "DSDT revision : %s\n", buf);
len += sysfs_emit_at(page, len, "DSDT revision : %s\n", buf);
snprintf(buf, 7, "%s", asus->dsdt_info->oem_id);
len += sprintf(page + len, "OEM id : %s\n", buf);
len += sysfs_emit_at(page, len, "OEM id : %s\n", buf);
snprintf(buf, 9, "%s", asus->dsdt_info->oem_table_id);
len += sprintf(page + len, "OEM table id : %s\n", buf);
len += sysfs_emit_at(page, len, "OEM table id : %s\n", buf);
snprintf(buf, 16, "%x", asus->dsdt_info->oem_revision);
len += sprintf(page + len, "OEM revision : 0x%s\n", buf);
len += sysfs_emit_at(page, len, "OEM revision : 0x%s\n", buf);
snprintf(buf, 5, "%s", asus->dsdt_info->asl_compiler_id);
len += sprintf(page + len, "ASL comp vendor id : %s\n", buf);
len += sysfs_emit_at(page, len, "ASL comp vendor id : %s\n", buf);
snprintf(buf, 16, "%x", asus->dsdt_info->asl_compiler_revision);
len += sprintf(page + len, "ASL comp revision : 0x%s\n", buf);
len += sysfs_emit_at(page, len, "ASL comp revision : 0x%s\n", buf);
}

return len;
Expand Down Expand Up @@ -933,7 +933,7 @@ static ssize_t ledd_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "0x%08x\n", asus->ledd_status);
return sysfs_emit(buf, "0x%08x\n", asus->ledd_status);
}

static ssize_t ledd_store(struct device *dev, struct device_attribute *attr,
Expand Down Expand Up @@ -993,7 +993,7 @@ static ssize_t wlan_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus_wireless_status(asus, WL_RSTS));
return sysfs_emit(buf, "%d\n", asus_wireless_status(asus, WL_RSTS));
}

static ssize_t wlan_store(struct device *dev, struct device_attribute *attr,
Expand Down Expand Up @@ -1022,7 +1022,7 @@ static ssize_t bluetooth_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus_wireless_status(asus, BT_RSTS));
return sysfs_emit(buf, "%d\n", asus_wireless_status(asus, BT_RSTS));
}

static ssize_t bluetooth_store(struct device *dev,
Expand Down Expand Up @@ -1052,7 +1052,7 @@ static ssize_t wimax_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus_wireless_status(asus, WM_RSTS));
return sysfs_emit(buf, "%d\n", asus_wireless_status(asus, WM_RSTS));
}

static ssize_t wimax_store(struct device *dev, struct device_attribute *attr,
Expand Down Expand Up @@ -1081,7 +1081,7 @@ static ssize_t wwan_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus_wireless_status(asus, WW_RSTS));
return sysfs_emit(buf, "%d\n", asus_wireless_status(asus, WW_RSTS));
}

static ssize_t wwan_store(struct device *dev, struct device_attribute *attr,
Expand Down Expand Up @@ -1151,7 +1151,7 @@ static ssize_t ls_switch_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus->light_switch);
return sysfs_emit(buf, "%d\n", asus->light_switch);
}

static ssize_t ls_switch_store(struct device *dev,
Expand Down Expand Up @@ -1182,7 +1182,7 @@ static ssize_t ls_level_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus->light_level);
return sysfs_emit(buf, "%d\n", asus->light_level);
}

static ssize_t ls_level_store(struct device *dev, struct device_attribute *attr,
Expand Down Expand Up @@ -1228,7 +1228,7 @@ static ssize_t ls_value_show(struct device *dev, struct device_attribute *attr,
if (!err)
err = pega_int_read(asus, PEGA_READ_ALS_L, &lo);
if (!err)
return sprintf(buf, "%d\n", 10 * hi + lo);
return sysfs_emit(buf, "%d\n", 10 * hi + lo);
return err;
}
static DEVICE_ATTR_RO(ls_value);
Expand Down Expand Up @@ -1264,7 +1264,7 @@ static ssize_t gps_show(struct device *dev, struct device_attribute *attr,
{
struct asus_laptop *asus = dev_get_drvdata(dev);

return sprintf(buf, "%d\n", asus_gps_status(asus));
return sysfs_emit(buf, "%d\n", asus_gps_status(asus));
}

static ssize_t gps_store(struct device *dev, struct device_attribute *attr,
Expand Down
2 changes: 2 additions & 0 deletions drivers/platform/x86/intel/ifs/load.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ static int copy_hashes_authenticate_chunks_gen2(struct device *dev)
chunk_table[0] = starting_chunk_nr + i;
chunk_table[1] = linear_addr;
do {
local_irq_disable();
wrmsrl(MSR_AUTHENTICATE_AND_COPY_CHUNK, (u64)chunk_table);
local_irq_enable();
rdmsrl(MSR_CHUNKS_AUTHENTICATION_STATUS, chunk_status.data);
err_code = chunk_status.error_code;
} while (err_code == AUTH_INTERRUPTED_ERROR && --retry_count);
Expand Down
27 changes: 15 additions & 12 deletions drivers/platform/x86/intel/ifs/runtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@ static const char * const scan_test_status[] = {

static void message_not_tested(struct device *dev, int cpu, union ifs_status status)
{
struct ifs_data *ifsd = ifs_get_data(dev);

/*
* control_error is set when the microcode runs into a problem
* loading the image from the reserved BIOS memory, or it has
* been corrupted. Reloading the image may fix this issue.
*/
if (status.control_error) {
dev_warn(dev, "CPU(s) %*pbl: Scan controller error. Batch: %02x version: 0x%x\n",
cpumask_pr_args(cpu_smt_mask(cpu)), ifsd->cur_batch, ifsd->loaded_version);
return;
}

if (status.error_code < ARRAY_SIZE(scan_test_status)) {
dev_info(dev, "CPU(s) %*pbl: SCAN operation did not start. %s\n",
cpumask_pr_args(cpu_smt_mask(cpu)),
Expand All @@ -90,16 +103,6 @@ static void message_fail(struct device *dev, int cpu, union ifs_status status)
{
struct ifs_data *ifsd = ifs_get_data(dev);

/*
* control_error is set when the microcode runs into a problem
* loading the image from the reserved BIOS memory, or it has
* been corrupted. Reloading the image may fix this issue.
*/
if (status.control_error) {
dev_err(dev, "CPU(s) %*pbl: could not execute from loaded scan image. Batch: %02x version: 0x%x\n",
cpumask_pr_args(cpu_smt_mask(cpu)), ifsd->cur_batch, ifsd->loaded_version);
}

/*
* signature_error is set when the output from the scan chains does not
* match the expected signature. This might be a transient problem (e.g.
Expand Down Expand Up @@ -285,10 +288,10 @@ static void ifs_test_core(int cpu, struct device *dev)
/* Update status for this core */
ifsd->scan_details = status.data;

if (status.control_error || status.signature_error) {
if (status.signature_error) {
ifsd->status = SCAN_TEST_FAIL;
message_fail(dev, cpu, status);
} else if (status.error_code) {
} else if (status.control_error || status.error_code) {
ifsd->status = SCAN_NOT_TESTED;
message_not_tested(dev, cpu, status);
} else {
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel/pmc/arl.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/*
* This file contains platform specific structure definitions
* and init function used by Meteor Lake PCH.
* and init function used by Arrow Lake PCH.
*
* Copyright (c) 2022, Intel Corporation.
* All Rights Reserved.
Expand Down
2 changes: 1 addition & 1 deletion drivers/platform/x86/intel/pmc/lnl.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/*
* This file contains platform specific structure definitions
* and init function used by Meteor Lake PCH.
* and init function used by Lunar Lake PCH.
*
* Copyright (c) 2022, Intel Corporation.
* All Rights Reserved.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_
bool read_blocked = 0, write_blocked = 0;
struct intel_tpmi_plat_info *plat_info;
struct tpmi_uncore_struct *tpmi_uncore;
bool uncore_sysfs_added = false;
int ret, i, pkg = 0;
int num_resources;

Expand Down Expand Up @@ -384,9 +385,15 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_
}
/* Point to next cluster offset */
cluster_offset >>= UNCORE_MAX_CLUSTER_PER_DOMAIN;
uncore_sysfs_added = true;
}
}

if (!uncore_sysfs_added) {
ret = -ENODEV;
goto remove_clusters;
}

auxiliary_set_drvdata(auxdev, tpmi_uncore);

tpmi_uncore->root_cluster.root_domain = true;
Expand Down
20 changes: 10 additions & 10 deletions drivers/platform/x86/msi-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static ssize_t show_wlan(struct device *dev,
if (ret < 0)
return ret;

return sprintf(buf, "%i\n", enabled);
return sysfs_emit(buf, "%i\n", enabled);
}

static ssize_t store_wlan(struct device *dev,
Expand All @@ -341,7 +341,7 @@ static ssize_t show_bluetooth(struct device *dev,
if (ret < 0)
return ret;

return sprintf(buf, "%i\n", enabled);
return sysfs_emit(buf, "%i\n", enabled);
}

static ssize_t store_bluetooth(struct device *dev,
Expand All @@ -364,7 +364,7 @@ static ssize_t show_threeg(struct device *dev,
if (ret < 0)
return ret;

return sprintf(buf, "%i\n", threeg_s);
return sysfs_emit(buf, "%i\n", threeg_s);
}

static ssize_t store_threeg(struct device *dev,
Expand All @@ -383,7 +383,7 @@ static ssize_t show_lcd_level(struct device *dev,
if (ret < 0)
return ret;

return sprintf(buf, "%i\n", ret);
return sysfs_emit(buf, "%i\n", ret);
}

static ssize_t store_lcd_level(struct device *dev,
Expand Down Expand Up @@ -413,7 +413,7 @@ static ssize_t show_auto_brightness(struct device *dev,
if (ret < 0)
return ret;

return sprintf(buf, "%i\n", ret);
return sysfs_emit(buf, "%i\n", ret);
}

static ssize_t store_auto_brightness(struct device *dev,
Expand Down Expand Up @@ -443,7 +443,7 @@ static ssize_t show_touchpad(struct device *dev,
if (result < 0)
return result;

return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK));
return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TOUCHPAD_MASK));
}

static ssize_t show_turbo(struct device *dev,
Expand All @@ -457,7 +457,7 @@ static ssize_t show_turbo(struct device *dev,
if (result < 0)
return result;

return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK));
return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_TURBO_MASK));
}

static ssize_t show_eco(struct device *dev,
Expand All @@ -471,7 +471,7 @@ static ssize_t show_eco(struct device *dev,
if (result < 0)
return result;

return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK));
return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_ECO_MASK));
}

static ssize_t show_turbo_cooldown(struct device *dev,
Expand All @@ -485,7 +485,7 @@ static ssize_t show_turbo_cooldown(struct device *dev,
if (result < 0)
return result;

return sprintf(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) |
return sysfs_emit(buf, "%i\n", (!!(rdata & MSI_STANDARD_EC_TURBO_MASK)) |
(!!(rdata & MSI_STANDARD_EC_TURBO_COOLDOWN_MASK) << 1));
}

Expand All @@ -500,7 +500,7 @@ static ssize_t show_auto_fan(struct device *dev,
if (result < 0)
return result;

return sprintf(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK));
return sysfs_emit(buf, "%i\n", !!(rdata & MSI_STANDARD_EC_AUTOFAN_MASK));
}

static ssize_t store_auto_fan(struct device *dev,
Expand Down
Loading