Skip to content

Commit 3e0283a

Browse files
torvaldstorvalds
committed
Merge tag 'pm+acpi-4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki: "These include three regression fixes (PCI resources management, ACPI/PNP device enumeration, ACPI SBS on MacBook) and two ACPI documentation fixes related to GPIO. Specifics: - Fix for a PCI resources management regression introduced during the 4.0 cycle and related to the handling of ACPI resources' Producer/Consumer flags that turn out to be useless (Jiang Liu) - Fix for a MacBook regression related to the Smart Battery Subsystem (SBS) driver causing various problems (stalls on boot, failure to detect or report battery) to happen and introduced during the 3.18 cycle (Chris Bainbridge) - Fix for an ACPI/PNP device enumeration regression introduced during the 3.16 cycle caused by failing to include two PNP device IDs into the list of IDs that PNP device objects need to be created for (Witold Szczeponik) - Fixes for two minor mistakes in the ACPI GPIO properties documentation (Antonio Ospite, Rafael J Wysocki)" * tag 'pm+acpi-4.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / PNP: add two IDs to list for PNPACPI device enumeration ACPI / documentation: Fix ambiguity in the GPIO properties document ACPI / documentation: fix a sentence about GPIO resources ACPI / SBS: Add 5 us delay to fix SBS hangs on MacBook x86/PCI/ACPI: Make all resources except [io 0xcf8-0xcff] available on PCI bus
2 parents 68c2f35 + 9a5d931 commit 3e0283a

File tree

6 files changed

+51
-7
lines changed

6 files changed

+51
-7
lines changed

‎Documentation/acpi/enumeration.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ input driver:
253253
GPIO support
254254
~~~~~~~~~~~~
255255
ACPI 5 introduced two new resources to describe GPIO connections: GpioIo
256-
and GpioInt. These resources are used be used to pass GPIO numbers used by
256+
and GpioInt. These resources can be used to pass GPIO numbers used by
257257
the device to the driver. ACPI 5.1 extended this with _DSD (Device
258258
Specific Data) which made it possible to name the GPIOs among other things.
259259

‎Documentation/acpi/gpio-properties.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
_DSD Device Properties Related to GPIO
22
--------------------------------------
33

4-
With the release of ACPI 5.1 and the _DSD configuration objecte names
5-
can finally be given to GPIOs (and other things as well) returned by
6-
_CRS. Previously, we were only able to use an integer index to find
4+
With the release of ACPI 5.1, the _DSD configuration object finally
5+
allows names to be given to GPIOs (and other things as well) returned
6+
by _CRS. Previously, we were only able to use an integer index to find
77
the corresponding GPIO, which is pretty error prone (it depends on
88
the _CRS output ordering, for example).
99

‎arch/x86/pci/acpi.c

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,26 @@ static void release_pci_root_info(struct pci_host_bridge *bridge)
325325
kfree(info);
326326
}
327327

328+
/*
329+
* An IO port or MMIO resource assigned to a PCI host bridge may be
330+
* consumed by the host bridge itself or available to its child
331+
* bus/devices. The ACPI specification defines a bit (Producer/Consumer)
332+
* to tell whether the resource is consumed by the host bridge itself,
333+
* but firmware hasn't used that bit consistently, so we can't rely on it.
334+
*
335+
* On x86 and IA64 platforms, all IO port and MMIO resources are assumed
336+
* to be available to child bus/devices except one special case:
337+
* IO port [0xCF8-0xCFF] is consumed by the host bridge itself
338+
* to access PCI configuration space.
339+
*
340+
* So explicitly filter out PCI CFG IO ports[0xCF8-0xCFF].
341+
*/
342+
static bool resource_is_pcicfg_ioport(struct resource *res)
343+
{
344+
return (res->flags & IORESOURCE_IO) &&
345+
res->start == 0xCF8 && res->end == 0xCFF;
346+
}
347+
328348
static void probe_pci_root_info(struct pci_root_info *info,
329349
struct acpi_device *device,
330350
int busnum, int domain,
@@ -346,8 +366,8 @@ static void probe_pci_root_info(struct pci_root_info *info,
346366
"no IO and memory resources present in _CRS\n");
347367
else
348368
resource_list_for_each_entry_safe(entry, tmp, list) {
349-
if ((entry->res->flags & IORESOURCE_WINDOW) == 0 ||
350-
(entry->res->flags & IORESOURCE_DISABLED))
369+
if ((entry->res->flags & IORESOURCE_DISABLED) ||
370+
resource_is_pcicfg_ioport(entry->res))
351371
resource_list_destroy_entry(entry);
352372
else
353373
entry->res->name = info->name;

‎drivers/acpi/acpi_pnp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
304304
{"PNPb006"},
305305
/* cs423x-pnpbios */
306306
{"CSC0100"},
307+
{"CSC0103"},
308+
{"CSC0110"},
307309
{"CSC0000"},
308310
{"GIM0100"}, /* Guillemot Turtlebeach something appears to be cs4232 compatible */
309311
/* es18xx-pnpbios */

‎drivers/acpi/resource.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_resources);
573573
* @ares: Input ACPI resource object.
574574
* @types: Valid resource types of IORESOURCE_XXX
575575
*
576-
* This is a hepler function to support acpi_dev_get_resources(), which filters
576+
* This is a helper function to support acpi_dev_get_resources(), which filters
577577
* ACPI resource objects according to resource types.
578578
*/
579579
int acpi_dev_filter_resource_type(struct acpi_resource *ares,

‎drivers/acpi/sbshc.c

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/delay.h>
1515
#include <linux/module.h>
1616
#include <linux/interrupt.h>
17+
#include <linux/dmi.h>
1718
#include "sbshc.h"
1819

1920
#define PREFIX "ACPI: "
@@ -87,6 +88,8 @@ enum acpi_smb_offset {
8788
ACPI_SMB_ALARM_DATA = 0x26, /* 2 bytes alarm data */
8889
};
8990

91+
static bool macbook;
92+
9093
static inline int smb_hc_read(struct acpi_smb_hc *hc, u8 address, u8 *data)
9194
{
9295
return ec_read(hc->offset + address, data);
@@ -132,6 +135,8 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
132135
}
133136

134137
mutex_lock(&hc->lock);
138+
if (macbook)
139+
udelay(5);
135140
if (smb_hc_read(hc, ACPI_SMB_PROTOCOL, &temp))
136141
goto end;
137142
if (temp) {
@@ -257,12 +262,29 @@ extern int acpi_ec_add_query_handler(struct acpi_ec *ec, u8 query_bit,
257262
acpi_handle handle, acpi_ec_query_func func,
258263
void *data);
259264

265+
static int macbook_dmi_match(const struct dmi_system_id *d)
266+
{
267+
pr_debug("Detected MacBook, enabling workaround\n");
268+
macbook = true;
269+
return 0;
270+
}
271+
272+
static struct dmi_system_id acpi_smbus_dmi_table[] = {
273+
{ macbook_dmi_match, "Apple MacBook", {
274+
DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
275+
DMI_MATCH(DMI_PRODUCT_NAME, "MacBook") },
276+
},
277+
{ },
278+
};
279+
260280
static int acpi_smbus_hc_add(struct acpi_device *device)
261281
{
262282
int status;
263283
unsigned long long val;
264284
struct acpi_smb_hc *hc;
265285

286+
dmi_check_system(acpi_smbus_dmi_table);
287+
266288
if (!device)
267289
return -EINVAL;
268290

0 commit comments

Comments
 (0)