Commit b0c7f1d9 authored by Hans de Goede's avatar Hans de Goede
Browse files

Merge remote-tracking branch 'pdx86/fixes' into pdx86/for-next 

Merge pdx86/fixes into pdx86/for-next because there are some
pdx86 patches pending for the next release which build on top
of some of the fixes.
parents 559eed77 0848cab7

Documentation/wmi/devices/dell-wmi-ddv.rst

+2 −1
Original line number Diff line number Diff line
@@ -187,7 +187,8 @@ WMI method BatteryeRawAnalytics() 


Returns a buffer usually containg 12 blocks of analytics data.

Those blocks contain:

- block number starting with 0 (u8)



- a block number starting with 0 (u8)

- 31 bytes of unknown data



.. note::

drivers/acpi/scan.c

+1 −0
Original line number Diff line number Diff line
@@ -1714,6 +1714,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) 
		{"BSG1160", },

		{"BSG2150", },

		{"CSC3551", },

		{"CSC3556", },

		{"INT33FE", },

		{"INT3515", },

		/* Non-conforming _HID for Cirrus Logic already released */

drivers/platform/mellanox/mlxbf-tmfifo.c

+1 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ static bool mlxbf_tmfifo_virtio_notify(struct virtqueue *vq) 
			tm_vdev = fifo->vdev[VIRTIO_ID_CONSOLE];

			mlxbf_tmfifo_console_output(tm_vdev, vring);

			spin_unlock_irqrestore(&fifo->spin_lock[0], flags);

			set_bit(MLXBF_TM_TX_LWM_IRQ, &fifo->pend_events);

		} else if (test_and_set_bit(MLXBF_TM_TX_LWM_IRQ,

					    &fifo->pend_events)) {

			return true;

drivers/platform/x86/amd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# AMD x86 Platform-Specific Drivers

#



amd-pmc-y			:= pmc.o

amd-pmc-y			:= pmc.o pmc-quirks.o

obj-$(CONFIG_AMD_PMC)		+= amd-pmc.o

amd_hsmp-y			:= hsmp.o

obj-$(CONFIG_AMD_HSMP)		+= amd_hsmp.o

drivers/platform/x86/amd/pmc-quirks.c

0 → 100644
+172 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/*

 * AMD SoC Power Management Controller Driver Quirks

 *

 * Copyright (c) 2023, Advanced Micro Devices, Inc.

 * All Rights Reserved.

 *

 * Author: Mario Limonciello <mario.limonciello@amd.com>

 */



#include <linux/dmi.h>

#include <linux/io.h>

#include <linux/ioport.h>



#include "pmc.h"



struct quirk_entry {

	u32 s2idle_bug_mmio;

};



static struct quirk_entry quirk_s2idle_bug = {

	.s2idle_bug_mmio = 0xfed80380,

};



static const struct dmi_system_id fwbug_list[] = {

	{

		.ident = "L14 Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20X5"),

		}

	},

	{

		.ident = "T14s Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20XF"),

		}

	},

	{

		.ident = "X13 Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20XH"),

		}

	},

	{

		.ident = "T14 Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20XK"),

		}

	},

	{

		.ident = "T14 Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UD"),

		}

	},

	{

		.ident = "T14 Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UE"),

		}

	},

	{

		.ident = "T14s Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UH"),

		}

	},

	{

		.ident = "T14s Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20UJ"),

		}

	},

	{

		.ident = "P14s Gen1 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "20Y1"),

		}

	},

	{

		.ident = "P14s Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21A0"),

		}

	},

	{

		.ident = "P14s Gen2 AMD",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "21A1"),

		}

	},

	/* https://gitlab.freedesktop.org/drm/amd/-/issues/2684 */

	{

		.ident = "HP Laptop 15s-eq2xxx",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "HP Laptop 15s-eq2xxx"),

		}

	},

	{}

};



/*

 * Laptops that run a SMI handler during the D3->D0 transition that occurs

 * specifically when exiting suspend to idle which can cause

 * large delays during resume when the IOMMU translation layer is enabled (the default

 * behavior) for NVME devices:

 *

 * To avoid this firmware problem, skip the SMI handler on these machines before the

 * D0 transition occurs.

 */

static void amd_pmc_skip_nvme_smi_handler(u32 s2idle_bug_mmio)

{

	void __iomem *addr;

	u8 val;



	if (!request_mem_region_muxed(s2idle_bug_mmio, 1, "amd_pmc_pm80"))

		return;



	addr = ioremap(s2idle_bug_mmio, 1);

	if (!addr)

		goto cleanup_resource;



	val = ioread8(addr);

	iowrite8(val & ~BIT(0), addr);



	iounmap(addr);

cleanup_resource:

	release_mem_region(s2idle_bug_mmio, 1);

}



void amd_pmc_process_restore_quirks(struct amd_pmc_dev *dev)

{

	if (dev->quirks && dev->quirks->s2idle_bug_mmio)

		amd_pmc_skip_nvme_smi_handler(dev->quirks->s2idle_bug_mmio);

}



void amd_pmc_quirks_init(struct amd_pmc_dev *dev)

{

	const struct dmi_system_id *dmi_id;



	dmi_id = dmi_first_match(fwbug_list);

	if (!dmi_id)

		return;

	dev->quirks = dmi_id->driver_data;

	if (dev->quirks->s2idle_bug_mmio)

		pr_info("Using s2idle quirk to avoid %s platform firmware bug\n",

			dmi_id->ident);

}