Skip to content

Commit d58305b

Browse files
torvaldstorvalds
committed
Merge tag 'pmdomain-v7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm
Pull pmdomain fixes from Ulf Hansson: - imx: Prevent hang at power down for imx8mp-blk-ctrl - thead: Fix buffer overflow for TH1520 AON driver - Change Ulf Hansson's email * tag 'pmdomain-v7.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm: MAINTAINERS, mailmap: Change Ulf Hansson's email pmdomain: imx8mp-blk-ctrl: Keep the NOC_HDCP clock enabled firmware: thead: Fix buffer overflow and use standard endian macros
2 parents 3ffcd57 + c2812c0 commit d58305b

5 files changed

Lines changed: 13 additions & 92 deletions

File tree

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,8 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
849849
Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
850850
Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
851851
Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
852+
Ulf Hansson <ulfh@kernel.org> <ulf.hansson@linaro.org>
853+
Ulf Hansson <ulfh@kernel.org> <ulf.hansson@stericsson.com>
852854
Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
853855
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
854856
Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>

‎MAINTAINERS‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6717,15 +6717,15 @@ F: include/linux/platform_data/cpuidle-exynos.h
67176717
CPUIDLE DRIVER - ARM PSCI
67186718
M: Lorenzo Pieralisi <lpieralisi@kernel.org>
67196719
M: Sudeep Holla <sudeep.holla@kernel.org>
6720-
M: Ulf Hansson <ulf.hansson@linaro.org>
6720+
M: Ulf Hansson <ulfh@kernel.org>
67216721
L: linux-pm@vger.kernel.org
67226722
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
67236723
S: Supported
67246724
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
67256725
F: drivers/cpuidle/cpuidle-psci.c
67266726

67276727
CPUIDLE DRIVER - ARM PSCI PM DOMAIN
6728-
M: Ulf Hansson <ulf.hansson@linaro.org>
6728+
M: Ulf Hansson <ulfh@kernel.org>
67296729
L: linux-pm@vger.kernel.org
67306730
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
67316731
S: Supported
@@ -6734,7 +6734,7 @@ F: drivers/cpuidle/cpuidle-psci-domain.c
67346734
F: drivers/cpuidle/cpuidle-psci.h
67356735

67366736
CPUIDLE DRIVER - DT IDLE PM DOMAIN
6737-
M: Ulf Hansson <ulf.hansson@linaro.org>
6737+
M: Ulf Hansson <ulfh@kernel.org>
67386738
L: linux-pm@vger.kernel.org
67396739
S: Supported
67406740
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
@@ -10730,7 +10730,7 @@ F: Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.yaml
1073010730
F: drivers/i2c/muxes/i2c-demux-pinctrl.c
1073110731

1073210732
GENERIC PM DOMAINS
10733-
M: Ulf Hansson <ulf.hansson@linaro.org>
10733+
M: Ulf Hansson <ulfh@kernel.org>
1073410734
L: linux-pm@vger.kernel.org
1073510735
S: Supported
1073610736
F: Documentation/devicetree/bindings/power/power?domain*
@@ -18090,7 +18090,7 @@ F: drivers/mmc/host/mmc_spi.c
1809018090
F: include/linux/spi/mmc_spi.h
1809118091

1809218092
MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
18093-
M: Ulf Hansson <ulf.hansson@linaro.org>
18093+
M: Ulf Hansson <ulfh@kernel.org>
1809418094
L: linux-mmc@vger.kernel.org
1809518095
S: Maintained
1809618096
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
@@ -24696,7 +24696,7 @@ F: drivers/media/i2c/imx415.c
2469624696
SONY MEMORYSTICK SUBSYSTEM
2469724697
M: Maxim Levitsky <maximlevitsky@gmail.com>
2469824698
M: Alex Dubov <oakad@yahoo.com>
24699-
M: Ulf Hansson <ulf.hansson@linaro.org>
24699+
M: Ulf Hansson <ulfh@kernel.org>
2470024700
L: linux-mmc@vger.kernel.org
2470124701
S: Maintained
2470224702
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git
@@ -27615,7 +27615,7 @@ F: Documentation/fb/uvesafb.rst
2761527615
F: drivers/video/fbdev/uvesafb.*
2761627616

2761727617
Ux500 CLOCK DRIVERS
27618-
M: Ulf Hansson <ulf.hansson@linaro.org>
27618+
M: Ulf Hansson <ulfh@kernel.org>
2761927619
L: linux-clk@vger.kernel.org
2762027620
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2762127621
S: Maintained

‎drivers/firmware/thead,th1520-aon.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,9 @@ int th1520_aon_power_update(struct th1520_aon_chan *aon_chan, u16 rsrc,
170170
hdr->func = TH1520_AON_PM_FUNC_SET_RESOURCE_POWER_MODE;
171171
hdr->size = TH1520_AON_RPC_MSG_NUM;
172172

173-
RPC_SET_BE16(&msg.resource, 0, rsrc);
174-
RPC_SET_BE16(&msg.resource, 2,
175-
(power_on ? TH1520_AON_PM_PW_MODE_ON :
176-
TH1520_AON_PM_PW_MODE_OFF));
173+
msg.resource = cpu_to_be16(rsrc);
174+
msg.mode = cpu_to_be16(power_on ? TH1520_AON_PM_PW_MODE_ON :
175+
TH1520_AON_PM_PW_MODE_OFF);
177176

178177
ret = th1520_aon_call_rpc(aon_chan, &msg);
179178
if (ret)

‎drivers/pmdomain/imx/imx8mp-blk-ctrl.c‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,6 @@ static void imx8mp_hdmi_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc,
352352
regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(12));
353353
regmap_clear_bits(bc->regmap, HDMI_TX_CONTROL0, BIT(3));
354354
break;
355-
case IMX8MP_HDMIBLK_PD_HDCP:
356-
regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(11));
357-
break;
358355
case IMX8MP_HDMIBLK_PD_HRV:
359356
regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(3) | BIT(4) | BIT(5));
360357
regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(15));
@@ -408,9 +405,6 @@ static void imx8mp_hdmi_blk_ctrl_power_off(struct imx8mp_blk_ctrl *bc,
408405
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(7));
409406
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(22) | BIT(24));
410407
break;
411-
case IMX8MP_HDMIBLK_PD_HDCP:
412-
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(11));
413-
break;
414408
case IMX8MP_HDMIBLK_PD_HRV:
415409
regmap_clear_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(15));
416410
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(3) | BIT(4) | BIT(5));
@@ -439,7 +433,7 @@ static int imx8mp_hdmi_power_notifier(struct notifier_block *nb,
439433
regmap_write(bc->regmap, HDMI_RTX_CLK_CTL0, 0x0);
440434
regmap_write(bc->regmap, HDMI_RTX_CLK_CTL1, 0x0);
441435
regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL0,
442-
BIT(0) | BIT(1) | BIT(10));
436+
BIT(0) | BIT(1) | BIT(10) | BIT(11));
443437
regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(0));
444438

445439
/*

‎include/linux/firmware/thead/thead,th1520-aon.h‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -97,80 +97,6 @@ struct th1520_aon_rpc_ack_common {
9797
#define RPC_GET_SVC_FLAG_ACK_TYPE(MESG) (((MESG)->svc & 0x40) >> 6)
9898
#define RPC_SET_SVC_FLAG_ACK_TYPE(MESG, ACK) ((MESG)->svc |= (ACK) << 6)
9999

100-
#define RPC_SET_BE64(MESG, OFFSET, SET_DATA) \
101-
do { \
102-
u8 *data = (u8 *)(MESG); \
103-
u64 _offset = (OFFSET); \
104-
u64 _set_data = (SET_DATA); \
105-
data[_offset + 7] = _set_data & 0xFF; \
106-
data[_offset + 6] = (_set_data & 0xFF00) >> 8; \
107-
data[_offset + 5] = (_set_data & 0xFF0000) >> 16; \
108-
data[_offset + 4] = (_set_data & 0xFF000000) >> 24; \
109-
data[_offset + 3] = (_set_data & 0xFF00000000) >> 32; \
110-
data[_offset + 2] = (_set_data & 0xFF0000000000) >> 40; \
111-
data[_offset + 1] = (_set_data & 0xFF000000000000) >> 48; \
112-
data[_offset + 0] = (_set_data & 0xFF00000000000000) >> 56; \
113-
} while (0)
114-
115-
#define RPC_SET_BE32(MESG, OFFSET, SET_DATA) \
116-
do { \
117-
u8 *data = (u8 *)(MESG); \
118-
u64 _offset = (OFFSET); \
119-
u64 _set_data = (SET_DATA); \
120-
data[_offset + 3] = (_set_data) & 0xFF; \
121-
data[_offset + 2] = (_set_data & 0xFF00) >> 8; \
122-
data[_offset + 1] = (_set_data & 0xFF0000) >> 16; \
123-
data[_offset + 0] = (_set_data & 0xFF000000) >> 24; \
124-
} while (0)
125-
126-
#define RPC_SET_BE16(MESG, OFFSET, SET_DATA) \
127-
do { \
128-
u8 *data = (u8 *)(MESG); \
129-
u64 _offset = (OFFSET); \
130-
u64 _set_data = (SET_DATA); \
131-
data[_offset + 1] = (_set_data) & 0xFF; \
132-
data[_offset + 0] = (_set_data & 0xFF00) >> 8; \
133-
} while (0)
134-
135-
#define RPC_SET_U8(MESG, OFFSET, SET_DATA) \
136-
do { \
137-
u8 *data = (u8 *)(MESG); \
138-
data[OFFSET] = (SET_DATA) & 0xFF; \
139-
} while (0)
140-
141-
#define RPC_GET_BE64(MESG, OFFSET, PTR) \
142-
do { \
143-
u8 *data = (u8 *)(MESG); \
144-
u64 _offset = (OFFSET); \
145-
*(u32 *)(PTR) = \
146-
(data[_offset + 7] | data[_offset + 6] << 8 | \
147-
data[_offset + 5] << 16 | data[_offset + 4] << 24 | \
148-
data[_offset + 3] << 32 | data[_offset + 2] << 40 | \
149-
data[_offset + 1] << 48 | data[_offset + 0] << 56); \
150-
} while (0)
151-
152-
#define RPC_GET_BE32(MESG, OFFSET, PTR) \
153-
do { \
154-
u8 *data = (u8 *)(MESG); \
155-
u64 _offset = (OFFSET); \
156-
*(u32 *)(PTR) = \
157-
(data[_offset + 3] | data[_offset + 2] << 8 | \
158-
data[_offset + 1] << 16 | data[_offset + 0] << 24); \
159-
} while (0)
160-
161-
#define RPC_GET_BE16(MESG, OFFSET, PTR) \
162-
do { \
163-
u8 *data = (u8 *)(MESG); \
164-
u64 _offset = (OFFSET); \
165-
*(u16 *)(PTR) = (data[_offset + 1] | data[_offset + 0] << 8); \
166-
} while (0)
167-
168-
#define RPC_GET_U8(MESG, OFFSET, PTR) \
169-
do { \
170-
u8 *data = (u8 *)(MESG); \
171-
*(u8 *)(PTR) = (data[OFFSET]); \
172-
} while (0)
173-
174100
/*
175101
* Defines for SC PM Power Mode
176102
*/

0 commit comments

Comments
 (0)