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

Commit a3767e3c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-smbus', 'acpi-ec' and 'acpi-pci' 

* acpi-smbus:
  Revert "ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook"
  ACPI / SMBus: Fix boot stalls / high CPU caused by reentrant code

* acpi-ec:
  ACPI-EC: Drop unnecessary check made before calling acpi_ec_delete_query()

* acpi-pci:
  PCI: Fix OF logic in pci_dma_configure()
parents 0aba0ab8 a76032e0 4981c2b7 768acd64

drivers/acpi/ec.c

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static int acpi_ec_query(struct acpi_ec *ec, u8 *data) 
	}



err_exit:

	if (result && q)

	if (result)

		acpi_ec_delete_query(q);

	if (data)

		*data = value;

drivers/acpi/sbshc.c

+7 −41
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/delay.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/dmi.h>

#include "sbshc.h"



#define PREFIX "ACPI: "
@@ -30,6 +29,7 @@ struct acpi_smb_hc { 
	u8 query_bit;

	smbus_alarm_callback callback;

	void *context;

	bool done;

};



static int acpi_smbus_hc_add(struct acpi_device *device);
@@ -88,8 +88,6 @@ enum acpi_smb_offset { 
	ACPI_SMB_ALARM_DATA = 0x26,	/* 2 bytes alarm data */

};



static bool macbook;



static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data)

{

	return ec_read(hc->offset + address, data);
@@ -100,26 +98,10 @@ static inline int smb_hc_write(struct acpi_smb_hc *hc, u8 address, u8 data) 
	return ec_write(hc->offset + address, data);

}



static inline int smb_check_done(struct acpi_smb_hc *hc)

{

	union acpi_smb_status status = {.raw = 0};

	smb_hc_read(hc, ACPI_SMB_STATUS, &status.raw);

	return status.fields.done && (status.fields.status == SMBUS_OK);

}



static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)

{

	if (wait_event_timeout(hc->wait, smb_check_done(hc),

			       msecs_to_jiffies(timeout)))

	if (wait_event_timeout(hc->wait, hc->done, msecs_to_jiffies(timeout)))

		return 0;

	/*

	 * After the timeout happens, OS will try to check the status of SMbus.

	 * If the status is what OS expected, it will be regarded as the bogus

	 * timeout.

	 */

	if (smb_check_done(hc))

		return 0;

	else

	return -ETIME;

}
@@ -135,8 +117,7 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, 
	}



	mutex_lock(&hc->lock);

	if (macbook)

		udelay(5);

	hc->done = false;

	if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp))

		goto end;

	if (temp) {
@@ -235,8 +216,10 @@ static int smbus_alarm(void *context) 
	if (smb_hc_read(hc, ACPI_SMB_STATUS, &status.raw))

		return 0;

	/* Check if it is only a completion notify */

	if (status.fields.done)

	if (status.fields.done && status.fields.status == SMBUS_OK) {

		hc->done = true;

		wake_up(&hc->wait);

	}

	if (!status.fields.alarm)

		return 0;

	mutex_lock(&hc->lock);
@@ -262,29 +245,12 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit, 
			      acpi_handle handle, acpi_ec_query_func func,

			      void *data);



static int macbook_dmi_match(const struct dmi_system_id *d)

{

	pr_debug("Detected MacBook, enabling workaround\n");

	macbook = true;

	return 0;

}



static struct dmi_system_id acpi_smbus_dmi_table[] = {

	{ macbook_dmi_match, "Apple MacBook", {

	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),

	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") },

	},

	{ },

};



static int acpi_smbus_hc_add(struct acpi_device *device)

{

	int status;

	unsigned long long val;

	struct acpi_smb_hc *hc;



	dmi_check_system(acpi_smbus_dmi_table);



	if (!device)

		return -EINVAL;

drivers/pci/probe.c

+2 −2
Original line number Diff line number Diff line
@@ -1685,8 +1685,8 @@ static void pci_dma_configure(struct pci_dev *dev) 
{

	struct device *bridge = pci_get_host_bridge_device(dev);



	if (IS_ENABLED(CONFIG_OF) && dev->dev.of_node) {

		if (bridge->parent)

	if (IS_ENABLED(CONFIG_OF) &&

		bridge->parent && bridge->parent->of_node) {

			of_dma_configure(&dev->dev, bridge->parent->of_node);

	} else if (has_acpi_companion(bridge)) {

		struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);