Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions arch/arm64/boot/dts/apple/t6050-die0.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,13 @@
/* ADT info-clock_offset [0x2100, 6]: M1-style 32768 Hz ticks, as on T6040. */
smc_rtc: rtc {
compatible = "apple,smc-rtc";
nvmem-cells = <&rtc_offset>;
nvmem-cell-names = "rtc_offset";
nvmem-cells = <&rtc_offset>, <&rtc_ctrl>, <&rtc_alarm>,
<&rtc_alarm_mask>;
nvmem-cell-names = "rtc_offset", "rtc_ctrl", "rtc_alarm",
"rtc_alarm_mask";
/* The PMIC's RTC alarm, peripheral interrupt 2 of nub-spmi0 */
interrupts-extended = <&nub_spmi0 2 IRQ_TYPE_EDGE_RISING>;
wakeup-source;
};
};

Expand Down Expand Up @@ -220,7 +225,8 @@
};

/*
* /arm-io/nub-spmi0: reg[0] 0x8a014000 +0x4000, generation 4 (no IRQ: the driver refuses one).
* /arm-io/nub-spmi0: reg[0] 0x8a014000 +0x4000, generation 4. ADT interrupts[1] is 726, the line the
* peripheral sources arrive on (inference from macOS's wake trace, not yet booted).
* No power-domains: NUB_SPMI0 is critical and on (Aura talks to the PMU here every boot), and
* binding the pwrstate driver would write the PS register at probe.
*/
Expand All @@ -229,6 +235,9 @@
reg = <0x2 0x8a014000 0x0 0x4000>;
#address-cells = <2>;
#size-cells = <0>;
interrupts = <AIC_IRQ 0 726 IRQ_TYPE_LEVEL_HIGH>;
interrupt-controller;
#interrupt-cells = <2>;

/* spmi-abbeyL1, is-primary: USID 0xe. Read-only use: cells, never a whole-device read. */
pmu: pmic@e {
Expand All @@ -245,6 +254,19 @@
reg = <0x2001 1>;
};

/* ADT spmi-abbeyL1 RTC cells, as on T6030 */
rtc_ctrl: rtc-ctrl@2000 {
reg = <0x2000 1>;
};

rtc_alarm: rtc-alarm@2008 {
reg = <0x2008 4>;
};

rtc_alarm_mask: rtc-alarm-mask@200e {
reg = <0x200e 1>;
};

rtc_offset: rtc-offset@2100 {
reg = <0x2100 6>; /* ADT info-clock_offset */
};
Expand Down
84 changes: 57 additions & 27 deletions drivers/spmi/spmi-apple-controller.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
#include <linux/spmi.h>
#include <linux/suspend.h>

#include "spmi-apple-irq.h"

/* SPMI Controller Registers */
#define SPMI_STATUS_REG 0
#define SPMI_CMD_REG 0x4
#define SPMI_RSP_REG 0x8
#define SPMI_ACT_REG 0xa4

#define SPMI_IRQ_MASK_BASE 0x20
#define SPMI_IRQ_ACK_BASE 0x60
/*
* Peripheral interrupts come first. The RX FIFO notification sits right
* after them, followed by the controller's own fault interrupts, so the
Expand All @@ -59,8 +59,6 @@
* reply FIFO. macOS acks the controller's fault interrupt (source 263, after the 256
* peripheral sources; ack words from 0x600) and empties the queue when the controller starts.
*/
#define SPMI_GEN4_IRQ_ACK_BASE 0x600
#define SPMI_GEN4_FAULT_IRQ (SPMI_MAX_PERIPHERAL_IRQS + 7)
#define SPMI_FAULT_QUEUE_MAX 64

#define REG_POLL_INTERVAL_US 10000
Expand All @@ -73,6 +71,8 @@ struct apple_spmi_hw {
u32 rx_empty;
bool legacy_irqs;
u32 num_irqs;
u32 irq_mask;
u32 irq_ack;
};

static const struct apple_spmi_hw apple_spmi_gen1 = {
Expand All @@ -82,6 +82,8 @@ static const struct apple_spmi_hw apple_spmi_gen1 = {
.rx_empty = SPMI_RX_FIFO_EMPTY,
.legacy_irqs = true,
.num_irqs = 256,
.irq_mask = APPLE_SPMI_GEN1_IRQ_MASK,
.irq_ack = APPLE_SPMI_GEN1_IRQ_ACK,
};

/* M1 Pro, Max and Ultra: 192 peripheral interrupts, notification at 192 */
Expand All @@ -92,19 +94,25 @@ static const struct apple_spmi_hw apple_spmi_t6000 = {
.rx_empty = SPMI_RX_FIFO_EMPTY,
.legacy_irqs = true,
.num_irqs = 192,
.irq_mask = APPLE_SPMI_GEN1_IRQ_MASK,
.irq_ack = APPLE_SPMI_GEN1_IRQ_ACK,
};

static const struct apple_spmi_hw apple_spmi_gen4 = {
.status = 0x200,
.command = 0x210,
.reply = 0x220,
.rx_empty = BIT(30),
.num_irqs = 256,
.irq_mask = APPLE_SPMI_GEN4_IRQ_MASK,
.irq_ack = APPLE_SPMI_GEN4_IRQ_ACK,
};

struct apple_spmi {
void __iomem *regs;
void __iomem *faults;
unsigned int nfaults;
struct device *dev;
const struct apple_spmi_hw *hw;
struct mutex fifo_lock;
struct completion fifo_rx;
Expand All @@ -121,21 +129,21 @@ struct apple_spmi {

static void apple_spmi_irq_ack_raw(struct apple_spmi *spmi, u32 irq)
{
u32 __iomem *reg = spmi->regs + SPMI_IRQ_ACK_BASE + (irq / 32) * 4;
u32 __iomem *reg = spmi->regs + spmi->hw->irq_ack + (irq / 32) * 4;

writel(BIT(irq % 32), reg);
}

static void apple_spmi_irq_mask_raw(struct apple_spmi *spmi, u32 irq)
{
u32 __iomem *reg = spmi->regs + SPMI_IRQ_MASK_BASE + (irq / 32) * 4;
u32 __iomem *reg = spmi->regs + spmi->hw->irq_mask + (irq / 32) * 4;

writel(readl(reg) & ~BIT(irq % 32), reg);
}

static void apple_spmi_irq_unmask_raw(struct apple_spmi *spmi, u32 irq)
{
u32 __iomem *reg = spmi->regs + SPMI_IRQ_MASK_BASE + (irq / 32) * 4;
u32 __iomem *reg = spmi->regs + spmi->hw->irq_mask + (irq / 32) * 4;

writel(readl(reg) | BIT(irq % 32), reg);
}
Expand Down Expand Up @@ -177,8 +185,8 @@ static inline u32 apple_spmi_pack_cmd(u8 opc, u8 sid, u16 param)
/* Ack the fault interrupt, then pop and log every queued fault record */
static void apple_spmi_drain_faults(struct device *dev, struct apple_spmi *spmi)
{
void __iomem *ack = spmi->regs + SPMI_GEN4_IRQ_ACK_BASE + (SPMI_GEN4_FAULT_IRQ / 32) * 4;
u32 bit = BIT(SPMI_GEN4_FAULT_IRQ % 32), fault;
void __iomem *ack = spmi->regs + APPLE_SPMI_GEN4_IRQ_ACK + (APPLE_SPMI_GEN4_FAULT_IRQ / 32) * 4;
u32 bit = BIT(APPLE_SPMI_GEN4_FAULT_IRQ % 32), fault;
int i;

if (!spmi->faults)
Expand Down Expand Up @@ -470,7 +478,18 @@ static void apple_spmi_irq_handler(struct irq_desc *desc)
unsigned long val, offset, bit;

chained_irq_enter(chip, desc);
val = readl(spmi->regs + SPMI_IRQ_ACK_BASE + (notify / 32) * 4);
val = readl(spmi->regs + spmi->hw->irq_ack + (notify / 32) * 4);
/*
* On gen4 the controller's own fault source shares this last ack word
* (0x620, bit 7). Its queued records must be read before the source is
* acked, or drain_faults() never sees them.
*/
if (!spmi->hw->legacy_irqs && spmi->faults &&
(val & BIT(APPLE_SPMI_GEN4_FAULT_IRQ % 32))) {
apple_spmi_drain_faults(spmi->dev, spmi);
val &= ~BIT(APPLE_SPMI_GEN4_FAULT_IRQ % 32);
handled = true;
}
raw_pending |= !!val;
if (val & BIT(notify % 32)) {
apple_spmi_irq_ack_raw(spmi, notify);
Expand All @@ -479,14 +498,14 @@ static void apple_spmi_irq_handler(struct irq_desc *desc)
}
/* Other queues' responses, such as the sleep's own commands at the debug link's cut. */
if (val & ~BIT(notify % 32)) {
writel(val & ~BIT(notify % 32), spmi->regs + SPMI_IRQ_ACK_BASE + (notify / 32) * 4);
writel(val & ~BIT(notify % 32), spmi->regs + spmi->hw->irq_ack + (notify / 32) * 4);
handled = true;
}

for (offset = 0; offset < notify / 8; offset += sizeof(val)) {
unsigned long stray;

val = readq(spmi->regs + SPMI_IRQ_ACK_BASE + offset);
val = readq(spmi->regs + spmi->hw->irq_ack + offset);
raw_pending |= !!val;
/*
* After a real sleep, sources no driver uses come up pending (on the Neo the
Expand All @@ -497,8 +516,8 @@ static void apple_spmi_irq_handler(struct irq_desc *desc)
*/
stray = val & ~spmi->irq_used[offset / sizeof(val)];
if (stray) {
writel(lower_32_bits(stray), spmi->regs + SPMI_IRQ_ACK_BASE + offset);
writel(upper_32_bits(stray), spmi->regs + SPMI_IRQ_ACK_BASE + offset + 4);
writel(lower_32_bits(stray), spmi->regs + spmi->hw->irq_ack + offset);
writel(upper_32_bits(stray), spmi->regs + spmi->hw->irq_ack + offset + 4);
handled = true;
}
if (val & spmi->irq_used[offset / sizeof(val)] &
Expand Down Expand Up @@ -528,16 +547,17 @@ static void apple_spmi_irq_handler(struct irq_desc *desc)
* unmasked, or it fires again for what was just cleared.
*/
if (handled)
readl(spmi->regs + SPMI_IRQ_ACK_BASE);
readl(spmi->regs + spmi->hw->irq_ack);
chained_irq_exit(chip, desc);
}

static void apple_spmi_teardown_irq(void *data)
{
struct apple_spmi *spmi = data;

for (size_t offset = 0; offset < (spmi->hw->num_irqs + 32) / 8; offset += 4)
writel(0, spmi->regs + SPMI_IRQ_MASK_BASE + offset);
for (size_t offset = 0; offset < spmi->hw->num_irqs / 8 + (spmi->hw->legacy_irqs ? 4 : 0);
offset += 4)
writel(0, spmi->regs + spmi->hw->irq_mask + offset);

synchronize_irq(spmi->irq);
irq_set_chained_handler_and_data(spmi->irq, NULL, NULL);
Expand All @@ -556,9 +576,10 @@ static int apple_spmi_init_irq(struct platform_device *pdev,

raw_spin_lock_init(&spmi->irq_mask_lock);

for (size_t offset = 0; offset < (spmi->hw->num_irqs + 32) / 8; offset += 4) {
writel(0, spmi->regs + SPMI_IRQ_MASK_BASE + offset);
writel(U32_MAX, spmi->regs + SPMI_IRQ_ACK_BASE + offset);
for (size_t offset = 0; offset < spmi->hw->num_irqs / 8 + (spmi->hw->legacy_irqs ? 4 : 0);
offset += 4) {
writel(0, spmi->regs + spmi->hw->irq_mask + offset);
writel(U32_MAX, spmi->regs + spmi->hw->irq_ack + offset);
}

spmi->irqd = devm_irq_domain_instantiate(&pdev->dev, &info);
Expand All @@ -570,8 +591,10 @@ static int apple_spmi_init_irq(struct platform_device *pdev,
return ret;

irq_set_chained_handler_and_data(spmi->irq, apple_spmi_irq_handler, spmi);
apple_spmi_irq_unmask_raw(spmi, spmi->hw->num_irqs);
spmi->notify_irq = true;
if (spmi->hw->legacy_irqs) {
apple_spmi_irq_unmask_raw(spmi, spmi->hw->num_irqs);
spmi->notify_irq = true;
}

return 0;
}
Expand Down Expand Up @@ -610,16 +633,25 @@ static int apple_spmi_resume_noirq(struct device *dev)
unsigned long flags;
size_t i;

if (!spmi->notify_parked)
if (!spmi->notify_parked) {
/* Gen 4 never parks the notification, but a firmware sleep entry writes the mask bank itself. */
if (spmi->hw->legacy_irqs || !spmi->irqd || !pm_resume_via_firmware())
return 0;
raw_spin_lock_irqsave(&spmi->irq_mask_lock, flags);
bitmap_to_arr32(words, spmi->irq_mask_cache, spmi->hw->num_irqs);
for (i = 0; i < spmi->hw->num_irqs / 32; i++)
writel(words[i], spmi->regs + spmi->hw->irq_mask + i * 4);
raw_spin_unlock_irqrestore(&spmi->irq_mask_lock, flags);
return 0;
}

guard(mutex)(&spmi->fifo_lock);
raw_spin_lock_irqsave(&spmi->irq_mask_lock, flags);
/* Whether the enables survive a real sleep has not been measured. */
if (pm_resume_via_firmware()) {
bitmap_to_arr32(words, spmi->irq_mask_cache, spmi->hw->num_irqs);
for (i = 0; i < spmi->hw->num_irqs / 32; i++)
writel(words[i], spmi->regs + SPMI_IRQ_MASK_BASE + i * 4);
writel(words[i], spmi->regs + spmi->hw->irq_mask + i * 4);
}
apple_spmi_irq_ack_raw(spmi, spmi->hw->num_irqs);
apple_spmi_irq_unmask_raw(spmi, spmi->hw->num_irqs);
Expand All @@ -644,6 +676,7 @@ static int apple_spmi_probe(struct platform_device *pdev)
return -ENOMEM;

spmi = spmi_controller_get_drvdata(ctrl);
spmi->dev = &pdev->dev;
spmi->hw = device_get_match_data(&pdev->dev);
if (!spmi->hw)
return -EINVAL;
Expand Down Expand Up @@ -672,9 +705,6 @@ static int apple_spmi_probe(struct platform_device *pdev)
if (spmi->irq < 0 && spmi->irq != -ENXIO)
return spmi->irq;
if (spmi->irq >= 0) {
if (!spmi->hw->legacy_irqs)
return dev_err_probe(&pdev->dev, -EOPNOTSUPP,
"Generation 4 interrupt layout is not supported\n");
ret = apple_spmi_init_irq(pdev, spmi, spmi->irq);
if (ret)
return ret;
Expand Down
36 changes: 36 additions & 0 deletions drivers/spmi/spmi-apple-irq.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Apple SPMI controller interrupt register layout.
*
* Peripheral sources 0..255 come first, then the RX FIFO notification (256) and
* the controller's own fault sources. Source n sits in bit n % 32 of word n / 32
* of both the mask bank and the ack/pending bank.
*/
#ifndef _SPMI_APPLE_IRQ_H
#define _SPMI_APPLE_IRQ_H

/* Generation 1 (T8103, T6000) */
#define APPLE_SPMI_GEN1_IRQ_MASK 0x20
#define APPLE_SPMI_GEN1_IRQ_ACK 0x60

/*
* Generation 4 (T8142, T6050): ack and pending words from 0x600, the fault source
* 263 acked at 0x620 bit 7 (traced from macOS under the hypervisor). The mask bank
* is at 0x400 (see APPLE_SPMI_GEN4_IRQ_MASK).
*/
#define APPLE_SPMI_GEN4_IRQ_ACK 0x600
#define APPLE_SPMI_GEN4_FAULT_IRQ (256 + 7)
/* Mask bank mirrors the ack bank 0x200 below; +0x400..0x41c toggle on K114c, +0x420 does not. */
#define APPLE_SPMI_GEN4_IRQ_MASK 0x400

static inline u32 apple_spmi_irq_reg(u32 base, u32 irq)
{
return base + (irq / 32) * 4;
}

static inline u32 apple_spmi_irq_bit(u32 irq)
{
return BIT(irq % 32);
}

#endif /* _SPMI_APPLE_IRQ_H */
Loading