2019-05-27 09:55:06 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2014-11-13 03:59:38 +03:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2014 Linaro Ltd.
|
|
|
|
* Author: Ashwin Chaugule <ashwin.chaugule@linaro.org>
|
|
|
|
*
|
|
|
|
* PCC (Platform Communication Channel) is defined in the ACPI 5.0+
|
|
|
|
* specification. It is a mailbox like mechanism to allow clients
|
|
|
|
* such as CPPC (Collaborative Processor Performance Control), RAS
|
|
|
|
* (Reliability, Availability and Serviceability) and MPST (Memory
|
|
|
|
* Node Power State Table) to talk to the platform (e.g. BMC) through
|
|
|
|
* shared memory regions as defined in the PCC table entries. The PCC
|
|
|
|
* specification supports a Doorbell mechanism for the PCC clients
|
|
|
|
* to notify the platform about new data. This Doorbell information
|
2015-01-28 00:03:57 +03:00
|
|
|
* is also specified in each PCC table entry.
|
2014-11-13 03:59:38 +03:00
|
|
|
*
|
2015-01-28 00:03:57 +03:00
|
|
|
* Typical high level flow of operation is:
|
|
|
|
*
|
|
|
|
* PCC Reads:
|
|
|
|
* * Client tries to acquire a channel lock.
|
|
|
|
* * After it is acquired it writes READ cmd in communication region cmd
|
|
|
|
* address.
|
|
|
|
* * Client issues mbox_send_message() which rings the PCC doorbell
|
|
|
|
* for its PCC channel.
|
|
|
|
* * If command completes, then client has control over channel and
|
|
|
|
* it can proceed with its reads.
|
|
|
|
* * Client releases lock.
|
|
|
|
*
|
|
|
|
* PCC Writes:
|
|
|
|
* * Client tries to acquire channel lock.
|
|
|
|
* * Client writes to its communication region after it acquires a
|
|
|
|
* channel lock.
|
|
|
|
* * Client writes WRITE cmd in communication region cmd address.
|
|
|
|
* * Client issues mbox_send_message() which rings the PCC doorbell
|
|
|
|
* for its PCC channel.
|
|
|
|
* * If command completes, then writes have succeded and it can release
|
|
|
|
* the channel lock.
|
|
|
|
*
|
|
|
|
* There is a Nominal latency defined for each channel which indicates
|
|
|
|
* how long to wait until a command completes. If command is not complete
|
|
|
|
* the client needs to retry or assume failure.
|
|
|
|
*
|
|
|
|
* For more details about PCC, please see the ACPI specification from
|
2014-11-13 03:59:38 +03:00
|
|
|
* http://www.uefi.org/ACPIv5.1 Section 14.
|
|
|
|
*
|
|
|
|
* This file implements PCC as a Mailbox controller and allows for PCC
|
|
|
|
* clients to be implemented as its Mailbox Client Channels.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
#include <linux/delay.h>
|
|
|
|
#include <linux/io.h>
|
|
|
|
#include <linux/init.h>
|
2016-08-16 03:14:05 +03:00
|
|
|
#include <linux/interrupt.h>
|
2014-11-13 03:59:38 +03:00
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <linux/mailbox_controller.h>
|
|
|
|
#include <linux/mailbox_client.h>
|
2016-02-17 23:21:01 +03:00
|
|
|
#include <linux/io-64-nonatomic-lo-hi.h>
|
2016-11-14 22:19:02 +03:00
|
|
|
#include <acpi/pcc.h>
|
2014-11-13 03:59:38 +03:00
|
|
|
|
|
|
|
#include "mailbox.h"
|
|
|
|
|
2016-08-16 03:14:05 +03:00
|
|
|
#define MBOX_IRQ_NAME "pcc-mbox"
|
2014-11-13 03:59:38 +03:00
|
|
|
|
|
|
|
static struct mbox_chan *pcc_mbox_channels;
|
|
|
|
|
2016-02-17 23:21:01 +03:00
|
|
|
/* Array of cached virtual address for doorbell registers */
|
|
|
|
static void __iomem **pcc_doorbell_vaddr;
|
2016-08-16 03:14:05 +03:00
|
|
|
/* Array of cached virtual address for doorbell ack registers */
|
|
|
|
static void __iomem **pcc_doorbell_ack_vaddr;
|
|
|
|
/* Array of doorbell interrupts */
|
|
|
|
static int *pcc_doorbell_irq;
|
2016-02-17 23:21:01 +03:00
|
|
|
|
2014-11-13 03:59:38 +03:00
|
|
|
static struct mbox_controller pcc_mbox_ctrl = {};
|
|
|
|
/**
|
|
|
|
* get_pcc_channel - Given a PCC subspace idx, get
|
|
|
|
* the respective mbox_channel.
|
|
|
|
* @id: PCC subspace index.
|
|
|
|
*
|
|
|
|
* Return: ERR_PTR(errno) if error, else pointer
|
|
|
|
* to mbox channel.
|
|
|
|
*/
|
|
|
|
static struct mbox_chan *get_pcc_channel(int id)
|
|
|
|
{
|
2017-07-22 01:09:29 +03:00
|
|
|
if (id < 0 || id >= pcc_mbox_ctrl.num_chans)
|
2014-11-13 03:59:38 +03:00
|
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
|
2015-12-10 20:28:37 +03:00
|
|
|
return &pcc_mbox_channels[id];
|
2014-11-13 03:59:38 +03:00
|
|
|
}
|
|
|
|
|
2016-08-16 03:14:05 +03:00
|
|
|
/*
|
|
|
|
* PCC can be used with perf critical drivers such as CPPC
|
|
|
|
* So it makes sense to locally cache the virtual address and
|
|
|
|
* use it to read/write to PCC registers such as doorbell register
|
|
|
|
*
|
|
|
|
* The below read_register and write_registers are used to read and
|
|
|
|
* write from perf critical registers such as PCC doorbell register
|
|
|
|
*/
|
|
|
|
static int read_register(void __iomem *vaddr, u64 *val, unsigned int bit_width)
|
|
|
|
{
|
|
|
|
int ret_val = 0;
|
|
|
|
|
|
|
|
switch (bit_width) {
|
|
|
|
case 8:
|
|
|
|
*val = readb(vaddr);
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
*val = readw(vaddr);
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
*val = readl(vaddr);
|
|
|
|
break;
|
|
|
|
case 64:
|
|
|
|
*val = readq(vaddr);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
pr_debug("Error: Cannot read register of %u bit width",
|
|
|
|
bit_width);
|
|
|
|
ret_val = -EFAULT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int write_register(void __iomem *vaddr, u64 val, unsigned int bit_width)
|
|
|
|
{
|
|
|
|
int ret_val = 0;
|
|
|
|
|
|
|
|
switch (bit_width) {
|
|
|
|
case 8:
|
|
|
|
writeb(val, vaddr);
|
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
writew(val, vaddr);
|
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
writel(val, vaddr);
|
|
|
|
break;
|
|
|
|
case 64:
|
|
|
|
writeq(val, vaddr);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
pr_debug("Error: Cannot write register of %u bit width",
|
|
|
|
bit_width);
|
|
|
|
ret_val = -EFAULT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return ret_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pcc_map_interrupt - Map a PCC subspace GSI to a linux IRQ number
|
|
|
|
* @interrupt: GSI number.
|
|
|
|
* @flags: interrupt flags
|
|
|
|
*
|
|
|
|
* Returns: a valid linux IRQ number on success
|
|
|
|
* 0 or -EINVAL on failure
|
|
|
|
*/
|
|
|
|
static int pcc_map_interrupt(u32 interrupt, u32 flags)
|
|
|
|
{
|
|
|
|
int trigger, polarity;
|
|
|
|
|
|
|
|
if (!interrupt)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
trigger = (flags & ACPI_PCCT_INTERRUPT_MODE) ? ACPI_EDGE_SENSITIVE
|
|
|
|
: ACPI_LEVEL_SENSITIVE;
|
|
|
|
|
|
|
|
polarity = (flags & ACPI_PCCT_INTERRUPT_POLARITY) ? ACPI_ACTIVE_LOW
|
|
|
|
: ACPI_ACTIVE_HIGH;
|
|
|
|
|
|
|
|
return acpi_register_gsi(NULL, interrupt, trigger, polarity);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pcc_mbox_irq - PCC mailbox interrupt handler
|
|
|
|
*/
|
|
|
|
static irqreturn_t pcc_mbox_irq(int irq, void *p)
|
|
|
|
{
|
|
|
|
struct acpi_generic_address *doorbell_ack;
|
|
|
|
struct acpi_pcct_hw_reduced *pcct_ss;
|
|
|
|
struct mbox_chan *chan = p;
|
|
|
|
u64 doorbell_ack_preserve;
|
|
|
|
u64 doorbell_ack_write;
|
|
|
|
u64 doorbell_ack_val;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
pcct_ss = chan->con_priv;
|
|
|
|
|
|
|
|
mbox_chan_received_data(chan, NULL);
|
|
|
|
|
|
|
|
if (pcct_ss->header.type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {
|
|
|
|
struct acpi_pcct_hw_reduced_type2 *pcct2_ss = chan->con_priv;
|
|
|
|
u32 id = chan - pcc_mbox_channels;
|
|
|
|
|
2017-06-05 11:39:08 +03:00
|
|
|
doorbell_ack = &pcct2_ss->platform_ack_register;
|
2016-08-16 03:14:05 +03:00
|
|
|
doorbell_ack_preserve = pcct2_ss->ack_preserve_mask;
|
|
|
|
doorbell_ack_write = pcct2_ss->ack_write_mask;
|
|
|
|
|
|
|
|
ret = read_register(pcc_doorbell_ack_vaddr[id],
|
|
|
|
&doorbell_ack_val,
|
|
|
|
doorbell_ack->bit_width);
|
|
|
|
if (ret)
|
|
|
|
return IRQ_NONE;
|
|
|
|
|
|
|
|
ret = write_register(pcc_doorbell_ack_vaddr[id],
|
|
|
|
(doorbell_ack_val & doorbell_ack_preserve)
|
|
|
|
| doorbell_ack_write,
|
|
|
|
doorbell_ack->bit_width);
|
|
|
|
if (ret)
|
|
|
|
return IRQ_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return IRQ_HANDLED;
|
|
|
|
}
|
|
|
|
|
2014-11-13 03:59:38 +03:00
|
|
|
/**
|
|
|
|
* pcc_mbox_request_channel - PCC clients call this function to
|
|
|
|
* request a pointer to their PCC subspace, from which they
|
|
|
|
* can get the details of communicating with the remote.
|
|
|
|
* @cl: Pointer to Mailbox client, so we know where to bind the
|
|
|
|
* Channel.
|
|
|
|
* @subspace_id: The PCC Subspace index as parsed in the PCC client
|
|
|
|
* ACPI package. This is used to lookup the array of PCC
|
|
|
|
* subspaces as parsed by the PCC Mailbox controller.
|
|
|
|
*
|
|
|
|
* Return: Pointer to the Mailbox Channel if successful or
|
|
|
|
* ERR_PTR.
|
|
|
|
*/
|
|
|
|
struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
|
|
|
|
int subspace_id)
|
|
|
|
{
|
|
|
|
struct device *dev = pcc_mbox_ctrl.dev;
|
|
|
|
struct mbox_chan *chan;
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Each PCC Subspace is a Mailbox Channel.
|
|
|
|
* The PCC Clients get their PCC Subspace ID
|
|
|
|
* from their own tables and pass it here.
|
|
|
|
* This returns a pointer to the PCC subspace
|
|
|
|
* for the Client to operate on.
|
|
|
|
*/
|
|
|
|
chan = get_pcc_channel(subspace_id);
|
|
|
|
|
2015-09-16 17:04:24 +03:00
|
|
|
if (IS_ERR(chan) || chan->cl) {
|
2015-01-28 00:03:57 +03:00
|
|
|
dev_err(dev, "Channel not found for idx: %d\n", subspace_id);
|
2014-11-13 03:59:38 +03:00
|
|
|
return ERR_PTR(-EBUSY);
|
|
|
|
}
|
|
|
|
|
|
|
|
spin_lock_irqsave(&chan->lock, flags);
|
|
|
|
chan->msg_free = 0;
|
|
|
|
chan->msg_count = 0;
|
|
|
|
chan->active_req = NULL;
|
|
|
|
chan->cl = cl;
|
|
|
|
init_completion(&chan->tx_complete);
|
|
|
|
|
|
|
|
if (chan->txdone_method == TXDONE_BY_POLL && cl->knows_txdone)
|
2017-09-28 13:18:52 +03:00
|
|
|
chan->txdone_method = TXDONE_BY_ACK;
|
2014-11-13 03:59:38 +03:00
|
|
|
|
2016-11-14 22:19:02 +03:00
|
|
|
spin_unlock_irqrestore(&chan->lock, flags);
|
|
|
|
|
2016-08-16 03:14:05 +03:00
|
|
|
if (pcc_doorbell_irq[subspace_id] > 0) {
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
rc = devm_request_irq(dev, pcc_doorbell_irq[subspace_id],
|
|
|
|
pcc_mbox_irq, 0, MBOX_IRQ_NAME, chan);
|
|
|
|
if (unlikely(rc)) {
|
|
|
|
dev_err(dev, "failed to register PCC interrupt %d\n",
|
|
|
|
pcc_doorbell_irq[subspace_id]);
|
2016-11-14 22:19:02 +03:00
|
|
|
pcc_mbox_free_channel(chan);
|
2016-08-16 03:14:05 +03:00
|
|
|
chan = ERR_PTR(rc);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-11-13 03:59:38 +03:00
|
|
|
return chan;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(pcc_mbox_request_channel);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pcc_mbox_free_channel - Clients call this to free their Channel.
|
|
|
|
*
|
|
|
|
* @chan: Pointer to the mailbox channel as returned by
|
|
|
|
* pcc_mbox_request_channel()
|
|
|
|
*/
|
|
|
|
void pcc_mbox_free_channel(struct mbox_chan *chan)
|
|
|
|
{
|
2016-08-16 03:14:05 +03:00
|
|
|
u32 id = chan - pcc_mbox_channels;
|
2014-11-13 03:59:38 +03:00
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
if (!chan || !chan->cl)
|
|
|
|
return;
|
|
|
|
|
2016-08-16 03:14:05 +03:00
|
|
|
if (id >= pcc_mbox_ctrl.num_chans) {
|
|
|
|
pr_debug("pcc_mbox_free_channel: Invalid mbox_chan passed\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-11-14 22:19:02 +03:00
|
|
|
if (pcc_doorbell_irq[id] > 0)
|
|
|
|
devm_free_irq(chan->mbox->dev, pcc_doorbell_irq[id], chan);
|
|
|
|
|
2014-11-13 03:59:38 +03:00
|
|
|
spin_lock_irqsave(&chan->lock, flags);
|
|
|
|
chan->cl = NULL;
|
|
|
|
chan->active_req = NULL;
|
2017-09-28 13:18:52 +03:00
|
|
|
if (chan->txdone_method == TXDONE_BY_ACK)
|
2014-11-13 03:59:38 +03:00
|
|
|
chan->txdone_method = TXDONE_BY_POLL;
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&chan->lock, flags);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(pcc_mbox_free_channel);
|
|
|
|
|
|
|
|
/**
|
2015-01-28 00:03:57 +03:00
|
|
|
* pcc_send_data - Called from Mailbox Controller code. Used
|
|
|
|
* here only to ring the channel doorbell. The PCC client
|
|
|
|
* specific read/write is done in the client driver in
|
|
|
|
* order to maintain atomicity over PCC channel once
|
|
|
|
* OS has control over it. See above for flow of operations.
|
2014-11-13 03:59:38 +03:00
|
|
|
* @chan: Pointer to Mailbox channel over which to send data.
|
2015-01-28 00:03:57 +03:00
|
|
|
* @data: Client specific data written over channel. Used here
|
|
|
|
* only for debug after PCC transaction completes.
|
2014-11-13 03:59:38 +03:00
|
|
|
*
|
|
|
|
* Return: Err if something failed else 0 for success.
|
|
|
|
*/
|
|
|
|
static int pcc_send_data(struct mbox_chan *chan, void *data)
|
|
|
|
{
|
|
|
|
struct acpi_pcct_hw_reduced *pcct_ss = chan->con_priv;
|
2016-02-17 23:21:01 +03:00
|
|
|
struct acpi_generic_address *doorbell;
|
2014-11-13 03:59:38 +03:00
|
|
|
u64 doorbell_preserve;
|
|
|
|
u64 doorbell_val;
|
|
|
|
u64 doorbell_write;
|
2016-02-17 23:21:01 +03:00
|
|
|
u32 id = chan - pcc_mbox_channels;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (id >= pcc_mbox_ctrl.num_chans) {
|
|
|
|
pr_debug("pcc_send_data: Invalid mbox_chan passed\n");
|
|
|
|
return -ENOENT;
|
|
|
|
}
|
2014-11-13 03:59:38 +03:00
|
|
|
|
2016-02-17 23:21:01 +03:00
|
|
|
doorbell = &pcct_ss->doorbell_register;
|
2014-11-13 03:59:38 +03:00
|
|
|
doorbell_preserve = pcct_ss->preserve_mask;
|
|
|
|
doorbell_write = pcct_ss->write_mask;
|
|
|
|
|
2015-01-28 00:03:57 +03:00
|
|
|
/* Sync notification from OS to Platform. */
|
2016-02-17 23:21:01 +03:00
|
|
|
if (pcc_doorbell_vaddr[id]) {
|
|
|
|
ret = read_register(pcc_doorbell_vaddr[id], &doorbell_val,
|
|
|
|
doorbell->bit_width);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
ret = write_register(pcc_doorbell_vaddr[id],
|
|
|
|
(doorbell_val & doorbell_preserve) | doorbell_write,
|
|
|
|
doorbell->bit_width);
|
|
|
|
} else {
|
|
|
|
ret = acpi_read(&doorbell_val, doorbell);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
ret = acpi_write((doorbell_val & doorbell_preserve) | doorbell_write,
|
|
|
|
doorbell);
|
|
|
|
}
|
|
|
|
return ret;
|
2014-11-13 03:59:38 +03:00
|
|
|
}
|
|
|
|
|
2015-05-04 20:36:35 +03:00
|
|
|
static const struct mbox_chan_ops pcc_chan_ops = {
|
2014-11-13 03:59:38 +03:00
|
|
|
.send_data = pcc_send_data,
|
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
* parse_pcc_subspaces -- Count PCC subspaces defined
|
2014-11-13 03:59:38 +03:00
|
|
|
* @header: Pointer to the ACPI subtable header under the PCCT.
|
|
|
|
* @end: End of subtable entry.
|
|
|
|
*
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
* Return: If we find a PCC subspace entry of a valid type, return 0.
|
|
|
|
* Otherwise, return -EINVAL.
|
2014-11-13 03:59:38 +03:00
|
|
|
*
|
|
|
|
* This gets called for each entry in the PCC table.
|
|
|
|
*/
|
2019-03-11 23:55:57 +03:00
|
|
|
static int parse_pcc_subspace(union acpi_subtable_headers *header,
|
2014-11-13 03:59:38 +03:00
|
|
|
const unsigned long end)
|
|
|
|
{
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
struct acpi_pcct_subspace *ss = (struct acpi_pcct_subspace *) header;
|
2014-11-13 03:59:38 +03:00
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
if (ss->header.type < ACPI_PCCT_TYPE_RESERVED)
|
|
|
|
return 0;
|
2014-11-13 03:59:38 +03:00
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
return -EINVAL;
|
2014-11-13 03:59:38 +03:00
|
|
|
}
|
|
|
|
|
2016-08-16 03:14:05 +03:00
|
|
|
/**
|
|
|
|
* pcc_parse_subspace_irq - Parse the PCC IRQ and PCC ACK register
|
|
|
|
* There should be one entry per PCC client.
|
|
|
|
* @id: PCC subspace index.
|
|
|
|
* @pcct_ss: Pointer to the ACPI subtable header under the PCCT.
|
|
|
|
*
|
|
|
|
* Return: 0 for Success, else errno.
|
|
|
|
*
|
|
|
|
* This gets called for each entry in the PCC table.
|
|
|
|
*/
|
|
|
|
static int pcc_parse_subspace_irq(int id,
|
|
|
|
struct acpi_pcct_hw_reduced *pcct_ss)
|
|
|
|
{
|
2017-06-05 11:39:08 +03:00
|
|
|
pcc_doorbell_irq[id] = pcc_map_interrupt(pcct_ss->platform_interrupt,
|
2016-08-16 03:14:05 +03:00
|
|
|
(u32)pcct_ss->flags);
|
|
|
|
if (pcc_doorbell_irq[id] <= 0) {
|
|
|
|
pr_err("PCC GSI %d not registered\n",
|
2017-06-05 11:39:08 +03:00
|
|
|
pcct_ss->platform_interrupt);
|
2016-08-16 03:14:05 +03:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pcct_ss->header.type
|
|
|
|
== ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {
|
|
|
|
struct acpi_pcct_hw_reduced_type2 *pcct2_ss = (void *)pcct_ss;
|
|
|
|
|
|
|
|
pcc_doorbell_ack_vaddr[id] = acpi_os_ioremap(
|
2017-06-05 11:39:08 +03:00
|
|
|
pcct2_ss->platform_ack_register.address,
|
|
|
|
pcct2_ss->platform_ack_register.bit_width / 8);
|
2016-08-16 03:14:05 +03:00
|
|
|
if (!pcc_doorbell_ack_vaddr[id]) {
|
|
|
|
pr_err("Failed to ioremap PCC ACK register\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-11-13 03:59:38 +03:00
|
|
|
/**
|
|
|
|
* acpi_pcc_probe - Parse the ACPI tree for the PCCT.
|
|
|
|
*
|
|
|
|
* Return: 0 for Success, else errno.
|
|
|
|
*/
|
|
|
|
static int __init acpi_pcc_probe(void)
|
|
|
|
{
|
|
|
|
struct acpi_table_header *pcct_tbl;
|
|
|
|
struct acpi_subtable_header *pcct_entry;
|
2016-08-16 03:14:05 +03:00
|
|
|
struct acpi_table_pcct *acpi_pcct_tbl;
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
struct acpi_subtable_proc proc[ACPI_PCCT_TYPE_RESERVED];
|
2016-08-16 03:14:05 +03:00
|
|
|
int count, i, rc;
|
2014-11-13 03:59:38 +03:00
|
|
|
acpi_status status = AE_OK;
|
|
|
|
|
|
|
|
/* Search for PCCT */
|
2016-12-14 10:04:39 +03:00
|
|
|
status = acpi_get_table(ACPI_SIG_PCCT, 0, &pcct_tbl);
|
2014-11-13 03:59:38 +03:00
|
|
|
|
2017-08-01 15:43:57 +03:00
|
|
|
if (ACPI_FAILURE(status) || !pcct_tbl)
|
2014-11-13 03:59:38 +03:00
|
|
|
return -ENODEV;
|
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
/* Set up the subtable handlers */
|
|
|
|
for (i = ACPI_PCCT_TYPE_GENERIC_SUBSPACE;
|
|
|
|
i < ACPI_PCCT_TYPE_RESERVED; i++) {
|
|
|
|
proc[i].id = i;
|
|
|
|
proc[i].count = 0;
|
|
|
|
proc[i].handler = parse_pcc_subspace;
|
|
|
|
}
|
2014-11-13 03:59:38 +03:00
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
count = acpi_table_parse_entries_array(ACPI_SIG_PCCT,
|
|
|
|
sizeof(struct acpi_table_pcct), proc,
|
|
|
|
ACPI_PCCT_TYPE_RESERVED, MAX_PCC_SUBSPACES);
|
2018-08-27 22:19:08 +03:00
|
|
|
if (count <= 0 || count > MAX_PCC_SUBSPACES) {
|
|
|
|
if (count < 0)
|
|
|
|
pr_warn("Error parsing PCC subspaces from PCCT\n");
|
|
|
|
else
|
|
|
|
pr_warn("Invalid PCCT: %d PCC subspaces\n", count);
|
2014-11-13 03:59:38 +03:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
treewide: kzalloc() -> kcalloc()
The kzalloc() function has a 2-factor argument form, kcalloc(). This
patch replaces cases of:
kzalloc(a * b, gfp)
with:
kcalloc(a * b, gfp)
as well as handling cases of:
kzalloc(a * b * c, gfp)
with:
kzalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
kzalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
kzalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
kzalloc(
- (sizeof(TYPE)) * E
+ sizeof(TYPE) * E
, ...)
|
kzalloc(
- (sizeof(THING)) * E
+ sizeof(THING) * E
, ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
kzalloc(
- sizeof(u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * (COUNT)
+ COUNT
, ...)
|
kzalloc(
- sizeof(u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(__u8) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(char) * COUNT
+ COUNT
, ...)
|
kzalloc(
- sizeof(unsigned char) * COUNT
+ COUNT
, ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_ID)
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_ID
+ COUNT_ID, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (COUNT_CONST)
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * COUNT_CONST
+ COUNT_CONST, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_ID)
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_ID
+ COUNT_ID, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (COUNT_CONST)
+ COUNT_CONST, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * COUNT_CONST
+ COUNT_CONST, sizeof(THING)
, ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kzalloc
+ kcalloc
(
- SIZE * COUNT
+ COUNT, SIZE
, ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
kzalloc(
- sizeof(TYPE) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(TYPE) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(TYPE))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * (COUNT) * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * (STRIDE)
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
|
kzalloc(
- sizeof(THING) * COUNT * STRIDE
+ array3_size(COUNT, STRIDE, sizeof(THING))
, ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
kzalloc(
- sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(THING1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(THING1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * COUNT
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
|
kzalloc(
- sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+ array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
, ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
kzalloc(
- (COUNT) * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * STRIDE * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- (COUNT) * (STRIDE) * (SIZE)
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
|
kzalloc(
- COUNT * STRIDE * SIZE
+ array3_size(COUNT, STRIDE, SIZE)
, ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(
- (E1) * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * E3
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- (E1) * (E2) * (E3)
+ array3_size(E1, E2, E3)
, ...)
|
kzalloc(
- E1 * E2 * E3
+ array3_size(E1, E2, E3)
, ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
kzalloc(sizeof(THING) * C2, ...)
|
kzalloc(sizeof(TYPE) * C2, ...)
|
kzalloc(C1 * C2 * C3, ...)
|
kzalloc(C1 * C2, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * (E2)
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(TYPE) * E2
+ E2, sizeof(TYPE)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * (E2)
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- sizeof(THING) * E2
+ E2, sizeof(THING)
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * E2
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- (E1) * (E2)
+ E1, E2
, ...)
|
- kzalloc
+ kcalloc
(
- E1 * E2
+ E1, E2
, ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
2018-06-13 00:03:40 +03:00
|
|
|
pcc_mbox_channels = kcalloc(count, sizeof(struct mbox_chan),
|
|
|
|
GFP_KERNEL);
|
2014-11-13 03:59:38 +03:00
|
|
|
if (!pcc_mbox_channels) {
|
|
|
|
pr_err("Could not allocate space for PCC mbox channels\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
pcc_doorbell_vaddr = kcalloc(count, sizeof(void *), GFP_KERNEL);
|
2016-02-17 23:21:01 +03:00
|
|
|
if (!pcc_doorbell_vaddr) {
|
2016-08-16 03:14:05 +03:00
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_free_mbox;
|
|
|
|
}
|
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
pcc_doorbell_ack_vaddr = kcalloc(count, sizeof(void *), GFP_KERNEL);
|
2016-08-16 03:14:05 +03:00
|
|
|
if (!pcc_doorbell_ack_vaddr) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_free_db_vaddr;
|
|
|
|
}
|
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
pcc_doorbell_irq = kcalloc(count, sizeof(int), GFP_KERNEL);
|
2016-08-16 03:14:05 +03:00
|
|
|
if (!pcc_doorbell_irq) {
|
|
|
|
rc = -ENOMEM;
|
|
|
|
goto err_free_db_ack_vaddr;
|
2016-02-17 23:21:01 +03:00
|
|
|
}
|
|
|
|
|
2014-11-13 03:59:38 +03:00
|
|
|
/* Point to the first PCC subspace entry */
|
|
|
|
pcct_entry = (struct acpi_subtable_header *) (
|
|
|
|
(unsigned long) pcct_tbl + sizeof(struct acpi_table_pcct));
|
|
|
|
|
2016-08-16 03:14:05 +03:00
|
|
|
acpi_pcct_tbl = (struct acpi_table_pcct *) pcct_tbl;
|
|
|
|
if (acpi_pcct_tbl->flags & ACPI_PCCT_DOORBELL)
|
|
|
|
pcc_mbox_ctrl.txdone_irq = true;
|
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
for (i = 0; i < count; i++) {
|
2016-02-17 23:21:01 +03:00
|
|
|
struct acpi_generic_address *db_reg;
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
struct acpi_pcct_subspace *pcct_ss;
|
2014-11-13 03:59:38 +03:00
|
|
|
pcc_mbox_channels[i].con_priv = pcct_entry;
|
2016-02-17 23:21:01 +03:00
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
if (pcct_entry->type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE ||
|
|
|
|
pcct_entry->type == ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE_TYPE2) {
|
|
|
|
struct acpi_pcct_hw_reduced *pcct_hrss;
|
|
|
|
|
|
|
|
pcct_hrss = (struct acpi_pcct_hw_reduced *) pcct_entry;
|
2016-08-16 03:14:05 +03:00
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
if (pcc_mbox_ctrl.txdone_irq) {
|
|
|
|
rc = pcc_parse_subspace_irq(i, pcct_hrss);
|
|
|
|
if (rc < 0)
|
|
|
|
goto err;
|
|
|
|
}
|
2016-08-16 03:14:05 +03:00
|
|
|
}
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
pcct_ss = (struct acpi_pcct_subspace *) pcct_entry;
|
2016-08-16 03:14:05 +03:00
|
|
|
|
2016-02-17 23:21:01 +03:00
|
|
|
/* If doorbell is in system memory cache the virt address */
|
|
|
|
db_reg = &pcct_ss->doorbell_register;
|
|
|
|
if (db_reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)
|
|
|
|
pcc_doorbell_vaddr[i] = acpi_os_ioremap(db_reg->address,
|
|
|
|
db_reg->bit_width/8);
|
2014-11-13 03:59:38 +03:00
|
|
|
pcct_entry = (struct acpi_subtable_header *)
|
|
|
|
((unsigned long) pcct_entry + pcct_entry->length);
|
|
|
|
}
|
|
|
|
|
mailbox: PCC: erroneous error message when parsing ACPI PCCT
There have been multiple reports of the following error message:
[ 0.068293] Error parsing PCC subspaces from PCCT
This error message is not correct. In multiple cases examined, the PCCT
(Platform Communications Channel Table) concerned is actually properly
constructed; the problem is that acpi_pcc_probe() which reads the PCCT
is making the assumption that the only valid PCCT is one that contains
subtables of one of two types: ACPI_PCCT_TYPE_HW_REDUCED_SUBSPACE or
ACPI_PCCT_TYPE_HW_REDUCED_TYPE2. The number of subtables of these
types are counted and as long as there is at least one of the desired
types, the acpi_pcc_probe() succeeds. When no subtables of these types
are found, regardless of whether or not any other subtable types are
present, the error mentioned above is reported.
In the cases reported to me personally, the PCCT contains exactly one
subtable of type ACPI_PCCT_TYPE_GENERIC_SUBSPACE. The function
acpi_pcc_probe() does not count it as a valid subtable, so believes
there to be no valid subtables, and hence outputs the error message.
An example of the PCCT being reported as erroneous yet perfectly fine
is the following:
Signature : "PCCT"
Table Length : 0000006E
Revision : 05
Checksum : A9
Oem ID : "XXXXXX"
Oem Table ID : "XXXXX "
Oem Revision : 00002280
Asl Compiler ID : "XXXX"
Asl Compiler Revision : 00000002
Flags (decoded below) : 00000001
Platform : 1
Reserved : 0000000000000000
Subtable Type : 00 [Generic Communications Subspace]
Length : 3E
Reserved : 000000000000
Base Address : 00000000DCE43018
Address Length : 0000000000001000
Doorbell Register : [Generic Address Structure]
Space ID : 01 [SystemIO]
Bit Width : 08
Bit Offset : 00
Encoded Access Width : 01 [Byte Access:8]
Address : 0000000000001842
Preserve Mask : 00000000000000FD
Write Mask : 0000000000000002
Command Latency : 00001388
Maximum Access Rate : 00000000
Minimum Turnaround Time : 0000
To fix this, we count up all of the possible subtable types for the
PCCT, and only report an error when there are none (which could mean
either no subtables, or no valid subtables), or there are too many.
We also change the logic so that if there is a valid subtable, we
do try to initialize it per the PCCT subtable contents. This is a
change in functionality; previously, the probe would have returned
right after the error message and would not have tried to use any
other subtable definition.
Tested on my personal laptop which showed the error previously; the
error message no longer appears and the laptop appears to operate
normally.
Signed-off-by: Al Stone <ahs3@redhat.com>
Reviewed-by: Prashanth Prakash <pprakash@codeaurora.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2018-05-17 01:01:41 +03:00
|
|
|
pcc_mbox_ctrl.num_chans = count;
|
2014-11-13 03:59:38 +03:00
|
|
|
|
|
|
|
pr_info("Detected %d PCC Subspaces\n", pcc_mbox_ctrl.num_chans);
|
|
|
|
|
|
|
|
return 0;
|
2016-08-16 03:14:05 +03:00
|
|
|
|
|
|
|
err:
|
|
|
|
kfree(pcc_doorbell_irq);
|
|
|
|
err_free_db_ack_vaddr:
|
|
|
|
kfree(pcc_doorbell_ack_vaddr);
|
|
|
|
err_free_db_vaddr:
|
|
|
|
kfree(pcc_doorbell_vaddr);
|
|
|
|
err_free_mbox:
|
|
|
|
kfree(pcc_mbox_channels);
|
|
|
|
return rc;
|
2014-11-13 03:59:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* pcc_mbox_probe - Called when we find a match for the
|
|
|
|
* PCCT platform device. This is purely used to represent
|
|
|
|
* the PCCT as a virtual device for registering with the
|
|
|
|
* generic Mailbox framework.
|
|
|
|
*
|
|
|
|
* @pdev: Pointer to platform device returned when a match
|
|
|
|
* is found.
|
|
|
|
*
|
|
|
|
* Return: 0 for Success, else errno.
|
|
|
|
*/
|
|
|
|
static int pcc_mbox_probe(struct platform_device *pdev)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
pcc_mbox_ctrl.chans = pcc_mbox_channels;
|
|
|
|
pcc_mbox_ctrl.ops = &pcc_chan_ops;
|
|
|
|
pcc_mbox_ctrl.dev = &pdev->dev;
|
|
|
|
|
|
|
|
pr_info("Registering PCC driver as Mailbox controller\n");
|
|
|
|
ret = mbox_controller_register(&pcc_mbox_ctrl);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
pr_err("Err registering PCC as Mailbox controller: %d\n", ret);
|
|
|
|
ret = -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2020-04-03 06:52:08 +03:00
|
|
|
static struct platform_driver pcc_mbox_driver = {
|
2014-11-13 03:59:38 +03:00
|
|
|
.probe = pcc_mbox_probe,
|
|
|
|
.driver = {
|
|
|
|
.name = "PCCT",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init pcc_init(void)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct platform_device *pcc_pdev;
|
|
|
|
|
|
|
|
if (acpi_disabled)
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
/* Check if PCC support is available. */
|
|
|
|
ret = acpi_pcc_probe();
|
|
|
|
|
|
|
|
if (ret) {
|
2015-02-05 02:40:08 +03:00
|
|
|
pr_debug("ACPI PCC probe failed.\n");
|
2014-11-13 03:59:38 +03:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
pcc_pdev = platform_create_bundle(&pcc_mbox_driver,
|
|
|
|
pcc_mbox_probe, NULL, 0, NULL, 0);
|
|
|
|
|
2015-01-14 04:10:56 +03:00
|
|
|
if (IS_ERR(pcc_pdev)) {
|
2015-02-05 02:40:08 +03:00
|
|
|
pr_debug("Err creating PCC platform bundle\n");
|
2015-01-14 04:10:56 +03:00
|
|
|
return PTR_ERR(pcc_pdev);
|
2014-11-13 03:59:38 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2015-08-05 16:40:24 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Make PCC init postcore so that users of this mailbox
|
|
|
|
* such as the ACPI Processor driver have it available
|
|
|
|
* at their init.
|
|
|
|
*/
|
|
|
|
postcore_initcall(pcc_init);
|