Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <9e1e536c-9ca9-f9ce-8c1e-946c91214e37@amd.com>
Date:   Tue, 11 Apr 2023 08:51:45 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.9.1
Subject: Re: [PATCH] Revert "pinctrl: amd: Disable and mask interrupts on
 resume"
To:     =?UTF-8?Q?Kornel_Dul=c4=99ba?= <korneld@chromium.org>,
        linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Basavaraj Natikar <Basavaraj.Natikar@amd.com>,
        Shyam Sundar S K <Shyam-sundar.S-k@amd.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        upstream@semihalf.com, rad@semihalf.com, mattedavis@google.com,
        Gong Richard <richard.gong@amd.com>
References: <20230411134932.292287-1-korneld@chromium.org>
Content-Language: en-US
From:   "Limonciello, Mario" <mario.limonciello@amd.com>
In-Reply-To: <20230411134932.292287-1-korneld@chromium.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZHlSSGRZTlpqWVNrMXBWdjFvNlRrSkwvRVNpcUVjODEzWWw5a1lWdExKSjBK?=
 =?utf-8?B?S1hPc0Vyd1JER3FTc1FKTVIxbVZBVFBlRm1rbkFQaHhyVGd4a3pibHhObW8v?=
 =?utf-8?B?eTJ2MXBFR3BIL1VUTHB5VHpnNy9RN01ESnRJeUFhaEtMa0szTUdFUUtZYkRW?=
 =?utf-8?B?L0lSaUF6bnFYZnYzQ2xnYkhyMXZ6Z2M4TVhLZ0haZVRUMWNoajBMWFdTeXIy?=
 =?utf-8?B?cFdPd3Y2TGVzbVFWTE9mUU56anZ1b1RLWHlweTQ4REJEME1qYXg5b0F0cHFV?=
 =?utf-8?B?bUxMaHBQU2ZUUk9yeWE4T0crUGF1ek8xZy93NFlRL1FiRmo5K3o1c1p2S3pF?=
 =?utf-8?B?Si8zbXR6ZU9EK0g2Tm04S25lNjF2amtyNDQzam93bEVEWS9JeFNTN0hzRUhy?=
 =?utf-8?B?enlDVTk3N0dsMW8vK0dKTWdSdVNkNTJaeFRadzZaa2F5Y1F3NGtiVjdlN1NQ?=
 =?utf-8?B?UXI1NW5tL2FCNVNjeHpaU3AxQmdqYitEa1hSTWNYTHhIUlo0MWkxMFdnemN0?=
 =?utf-8?B?bU1wOXIvL0RWZkdsM1RDL0hhT3RRU3p6TUxOd3o3cEw4OTJoQmpaVnZDUC8w?=
 =?utf-8?B?aGJSSVgyY2N4cUFGaE5OTDdPWElZbHNjOFcwS1ZQSGpIR2dWYlhCM0p0eWpP?=
 =?utf-8?B?Yjd2L2NDamVKYWYrYnRtZzV0OG9nbnN6ekUxQUVjbkk1SVJrN1dyeXI1Y3pm?=
 =?utf-8?B?YkNUOGRNd3dNRmpvOWJpd00xME80OVN1RE02UEV1ZVdmNGtKY1c0NlpjbGxN?=
 =?utf-8?B?U2ZhUVF0SmNLV2hBUVhCRHY5SlgwbThmTlVCdEpuRFVTSTNCUmc1K2p5U3FH?=
 =?utf-8?B?NjRaZzM5S1VKSllWcnVKTmhMWCtPUUlKc3ZsT0JxcllaZHpwVEtsU0loS1dE?=
 =?utf-8?B?WW84bzBWSUQvMFNwQW9YR2twL0s3WCt2STh3cXl0ZWdPMEVRNWRLUnFrZTJW?=
 =?utf-8?B?ekJ2SGd1VXdjZU5ubHFTaWlEaG41UXNVM2ptZWtaSnNqVkgwMHdWK2dwOW5T?=
 =?utf-8?B?cS81bHpDc0VIUWxPSWphMHVVM3pUYnBnaUdxTEZLejVWd0VobjFnMTFBWXEv?=
 =?utf-8?B?ZlNJZ2IxcTFEakxZc29vbHFya0RTZG9CV2EvM09Mc21YM3oyYWNzd3dqSU9m?=
 =?utf-8?B?NXVmYWFJTGpMSS81SXdzUm96WWZiNENKQWt6QzMxYVBjbzFObGJiMVBaaUh6?=
 =?utf-8?B?QmUzWGhQZXIvekdudDJtek41ODUybmtlTDFWOXFBYXVKR0paU0s1WWRCRzRi?=
 =?utf-8?B?UmFZMzZCdklNdWdUeDhCcEpKcDBxdTJ4VzhJNUtzTll5SnZRSGkvZVhvR0Zn?=
 =?utf-8?B?cmh1NUdUR3JKdW1OTXlvSWRKOHU1alZvVFRUSHc2ZExmWG9RS0xJVGp1M2hZ?=
 =?utf-8?B?dUVTL2E4c0o3aDY0VEl2YllEQWdteFEyeEVRUnRyOExuVEQ1czFFcjlVdzJJ?=
 =?utf-8?B?Tk5TcWFxYXdyUTJmZzgwTmdzaXJZeHBLZDNoQktuZlFCbHFEUlRrWlVudEEv?=
 =?utf-8?B?S29mZ3dJamFmcitmOTZxWHlqRFE1K2F0Q2taZEtybDcweEtTR2ZycXlRYmZ2?=
 =?utf-8?B?VjQ2UXdDT1pvYWVOc1hWT1QzV3JKR1VUc00xNk1yQ2pwMEVnY1JBZU9OTG1s?=
 =?utf-8?B?a2pZV3RibU9MTElHckRHVFVvS0FKWk1pRXBGZ0syK3RDNnVPSzJuKy9kZGpV?=
 =?utf-8?B?NDZwak5wMnpkQThaaVRyY2RlOGFERTIzTTdxTVF6YncwR3A5WTVRUVpwdnBB?=
 =?utf-8?B?UWFwczNIWlFKNUVmblVmZnBTWHRna0o2L3VSYlRuRTl6bFBCZmgyVGZwN2Zs?=
 =?utf-8?B?RXVkM3Q2eVp2SnhxZjRjMGZUMmxMVkpYS2JHZ3h4NHd0UlZsc3ZOMC91VGxr?=
 =?utf-8?B?cHFUa01zVlVsSW5Mei9SMlN5V3JTaVZBa3o5VGdUVWVPWmVIZkprMHh5QUZn?=
 =?utf-8?B?dkdmL1ZWdFFrdExxV0luS0ZDd2xhVWZ5QjY3VTIyUTZtZm56bzRSWFVSVXFE?=
 =?utf-8?B?SWVOc1JXeHpaeEU5ejU2ckxIRHZBZEovS2lmUnA2ejJJakNNVGhXSWhjcnd0?=
 =?utf-8?B?R2hiVEhuT1YvSmZnQ01UMFVPMnNlai9PcVpnN3ZNQXBkaHhEdDUxWm1XQS83?=
 =?utf-8?Q?XsgeFtyBrP51S2Jr7PlJ16gLM?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 87b4da8c-bd3c-409c-e2ad-08db3a93e322
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2023 13:51:45.0050
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YUWtsmHLcLsjMEm+/DbxJ7voD+25rRr4yqu0HGG26H81oI9VLuuvhTa7qKdiw1YvQcIc8ZxkVqAcoVLKwdY/vA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4323
X-Spam-Status: No, score=-1.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 4/11/2023 08:49, Kornel Dulęba wrote:
> This reverts commit b26cd9325be4c1fcd331b77f10acb627c560d4d7.
> 
> This patch introduces a regression on Lenovo Z13, which can't wake
> from the lid with it applied; and some unspecified AMD based Dell
> platforms are unable to wake from hitting the power button
> 
> Signed-off-by: Kornel Dulęba <korneld@chromium.org>

Link: https://bugzilla.kernel.org/show_bug.cgi?id=217315
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Cc: stable@vger.kernel.org

> ---
>   drivers/pinctrl/pinctrl-amd.c | 36 ++++++++++++++++-------------------
>   1 file changed, 16 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
> index 609821b756c2..9236a132c7ba 100644
> --- a/drivers/pinctrl/pinctrl-amd.c
> +++ b/drivers/pinctrl/pinctrl-amd.c
> @@ -872,34 +872,32 @@ static const struct pinconf_ops amd_pinconf_ops = {
>   	.pin_config_group_set = amd_pinconf_group_set,
>   };
>   
> -static void amd_gpio_irq_init_pin(struct amd_gpio *gpio_dev, int pin)
> +static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)
>   {
> -	const struct pin_desc *pd;
> +	struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
>   	unsigned long flags;
>   	u32 pin_reg, mask;
> +	int i;
>   
>   	mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) |
>   		BIT(INTERRUPT_MASK_OFF) | BIT(INTERRUPT_ENABLE_OFF) |
>   		BIT(WAKE_CNTRL_OFF_S4);
>   
> -	pd = pin_desc_get(gpio_dev->pctrl, pin);
> -	if (!pd)
> -		return;
> +	for (i = 0; i < desc->npins; i++) {
> +		int pin = desc->pins[i].number;
> +		const struct pin_desc *pd = pin_desc_get(gpio_dev->pctrl, pin);
>   
> -	raw_spin_lock_irqsave(&gpio_dev->lock, flags);
> -	pin_reg = readl(gpio_dev->base + pin * 4);
> -	pin_reg &= ~mask;
> -	writel(pin_reg, gpio_dev->base + pin * 4);
> -	raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
> -}
> +		if (!pd)
> +			continue;
>   
> -static void amd_gpio_irq_init(struct amd_gpio *gpio_dev)
> -{
> -	struct pinctrl_desc *desc = gpio_dev->pctrl->desc;
> -	int i;
> +		raw_spin_lock_irqsave(&gpio_dev->lock, flags);
>   
> -	for (i = 0; i < desc->npins; i++)
> -		amd_gpio_irq_init_pin(gpio_dev, i);
> +		pin_reg = readl(gpio_dev->base + i * 4);
> +		pin_reg &= ~mask;
> +		writel(pin_reg, gpio_dev->base + i * 4);
> +
> +		raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
> +	}
>   }
>   
>   #ifdef CONFIG_PM_SLEEP
> @@ -952,10 +950,8 @@ static int amd_gpio_resume(struct device *dev)
>   	for (i = 0; i < desc->npins; i++) {
>   		int pin = desc->pins[i].number;
>   
> -		if (!amd_gpio_should_save(gpio_dev, pin)) {
> -			amd_gpio_irq_init_pin(gpio_dev, pin);
> +		if (!amd_gpio_should_save(gpio_dev, pin))
>   			continue;
> -		}
>   
>   		raw_spin_lock_irqsave(&gpio_dev->lock, flags);
>   		gpio_dev->saved_regs[i] |= readl(gpio_dev->base + pin * 4) & PIN_IRQ_PENDING;