From patchwork Thu Feb 16 12:23:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orlando Chamberlain X-Patchwork-Id: 5501 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp276787wrn; Thu, 16 Feb 2023 04:42:09 -0800 (PST) X-Google-Smtp-Source: AK7set9EDVlrq4v4apVRaFg0Ha2zDpQbgMdu/rjulRhXjiiW/oRciGC96DMmbTCD8NMWlpOf475U X-Received: by 2002:aa7:cd06:0:b0:4ac:be0b:45ae with SMTP id b6-20020aa7cd06000000b004acbe0b45aemr5403895edw.24.1676551329233; Thu, 16 Feb 2023 04:42:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676551329; cv=none; d=google.com; s=arc-20160816; b=cIC5kEGYVCDfABhlgCNagvvn9JE+fu7l81A+K6VETERS+ghCq60ApwEGtvfaJt8sDr JKH+OmLt5TTv0WZbzV43at2MKrTNZ+vWr05/cVvGjw6mPWYYGx6JrljFZ1k3GgpGQ00n YvAxfZ9gzUo4ZoV6aA8wrojDiWELPEdoOc9+v22Z3HI/qnL3AI7lR4TwIiNGnnAjE+/f rn4v/lBkAMHivZ4ikYGsTbdMkESP/uCr/IQJvvjRwuCOKBSazOYyv1Ijc6xfy3pwb2s7 iFRnP2bDkcnfT4DeIb7YXpF/G8eu5pyRXKHop66z1K1sRliUW7lR1Yg2H6N87azba2kW 8nVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ECpjNj5Mz+6PXn6eBEkZo59C5waHc69Z45QaiskDXb4=; b=X+x4L0SGWKS3+anNbOQdvRRQVgGLp69jRn9d4F3+lauBXIIngJdzyMhPp7zvtbgD4V fXvPCyeEGFKtzY4lxY+eSi7D1XSF2mTqe9vvB5/dbMeQEynd+K6j98fP+T7bGlFJDGkp hXHxZXskoHwMR+st6dNiW5t90sfpXXUct9Ms2WqASy2j5ZZhR0lGi07jTjTsKRM/hN8B WV/9u3lJP7ceQspUzyjlmgaXyybpRtHj634nELEdRc3dRU23nOnwzOtZLhKGuDvf+VbR CtSiNr7GKbo/gkxDitLWlXsoXuXYKt+FCMmJPchtmb8SpoVrqpxpvJUNEEJxtzX13OxG AA2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GNcVmTgw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i20-20020aa7dd14000000b004ab84ab08basi2091574edv.484.2023.02.16.04.41.45; Thu, 16 Feb 2023 04:42:09 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=GNcVmTgw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230141AbjBPMZN (ORCPT + 99 others); Thu, 16 Feb 2023 07:25:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbjBPMZL (ORCPT ); Thu, 16 Feb 2023 07:25:11 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C897D359A; Thu, 16 Feb 2023 04:25:10 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id r18so1130604pgr.12; Thu, 16 Feb 2023 04:25:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ECpjNj5Mz+6PXn6eBEkZo59C5waHc69Z45QaiskDXb4=; b=GNcVmTgw8rTlypkN60A0Mt+DgwA49XDN7jFjf6uh5t7v8r/+FaoUwEfDZhlGF1X+QU CrzmS0p5365PJJAA4ZOGuoATx0z5r68iDoqZZ64i9PahFlSRzira/lRXd135lzJuNyA/ btsDU0TlcQO3H4IkXLh+ifo1IQQfSQjelu7T+J6MUzkuoMCpbfnECd6uLIzVcS3AVuM+ nhVtgMsEfOmQUJ39raUEkrZYfsEz9p3riFLoWBL+KhxOoBTz5n35X/qMq5bQ7g4WVw9z PkFhyB7QxNQ7ARfRqQ4jHZUv29VarP64QRE9Xbda4wYuuuE84NZtoBlYDmGDBfOnNet5 taOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ECpjNj5Mz+6PXn6eBEkZo59C5waHc69Z45QaiskDXb4=; b=LZtvmGqonITPBkBDtS3Fmss/OM9cORwKnb9+sW/tmvbVpF3YLjbRoDYibUtHWt3nBe krl/CGcfjH6k7zR0DNMx5GAsCkuQNl6BP2WrEep9OCm7OolCD4jWTwr0lNE180P3XUrW fb/NTviN4aXzuYgPAsb+iBNCbWEbkVoeEFYMcDRC7AypLHd30ftp8ugDHdrDIQwPRqxy 0yjYGhOQhyMXfnUskZg+AkLpwrPES+L8O8f/hh76FWk0Ie7nY+h74CmXZ8nDJ1HEajaa SHiFxs/RRgz7PlSgb/c/mQ+LKYhLUoz/8ea54cViE7w+dDHv6mFyrpFtzWneE/ghP0am 3OWQ== X-Gm-Message-State: AO0yUKUt71mh02qwQz9DAu82fUihgRKWidZrwSr16J9BJRkUERrvmzTh QM1esbBS4RSSxKyNxkKrQbw= X-Received: by 2002:aa7:8424:0:b0:5a8:380d:7822 with SMTP id q4-20020aa78424000000b005a8380d7822mr5125338pfn.23.1676550310293; Thu, 16 Feb 2023 04:25:10 -0800 (PST) Received: from localhost.localdomain ([202.53.32.211]) by smtp.gmail.com with ESMTPSA id c10-20020aa781ca000000b005a909290425sm1224055pfn.172.2023.02.16.04.25.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 04:25:09 -0800 (PST) From: Orlando Chamberlain To: Hans de Goede Cc: Mark Gross , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Wunner , Seth Forshee , Aditya Garg , Aun-Ali Zaidi , Kerem Karabay , Orlando Chamberlain Subject: [PATCH v2 0/5] apple-gmux: support MMIO gmux type on T2 Macs Date: Thu, 16 Feb 2023 23:23:38 +1100 Message-Id: <20230216122342.5918-1-orlandoch.dev@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757991486118599412?= X-GMAIL-MSGID: =?utf-8?q?1757991486118599412?= Hi All, This patch series adds support for the MMIO based gmux present on these Dual GPU Apple T2 Macs: MacBookPro15,1, MacBookPro15,3, MacBookPro16,1, MacBookPro16,4 (although amdgpu isn't working on MacBookPro16,4 [1]). Changes from v1/RFC[2]: - Drop commits "use cpu_to_be32 instead of manual reorder" and "consolidate version reading" as the former was broken and they could introduce regressions. - Only use the GMSP acpi method on MMIO gmux's. - Use a debugfs interface instead of a sysfs interface. - Document some of the chips used with MMIO gmux's. - Move changes to amdgpu and snd_hda_intel out of this patchset. # 1: has a slight change in how the switch state is read: instead of checking for x == 2, check !(x & 1) # 2: implements a system to support more than 2 gmux types # 3: start using the gmux's GMSP acpi method when handling interrupts on MMIO gmux's. This is needed for the MMIO gmux's to clear interrupts. # 4: Adds support for the MMIO based gmux on T2 macs. # 5: Add a debugfs interface to apple-gmux so data from ports can be read and written to from userspace. This can be used for more easily researching what unknown ports do, and switching gpus when vga_switcheroo isn't ready (e.g. when one gpu is bound to vfio-pci and in use by a Windows VM, I can use this to switch my internal display between Linux and Windows easily). # Issues: 1. Switching gpus at runtime has the same issue as indexed gmux's: the inactive gpu can't probe the DDC lines for eDP [3] 2. Powering on the amdgpu with vga_switcheroo doesn't work well. I'm told on the MacBookPro15,1 it works sometimes, and adding delays helps, but on my MacBookPro16,1 I haven't been able to get it to work at all: amdgpu: switched off amdgpu: switched on amdgpu 0000:03:00.0: Unable to change power state from D3hot to D0, device inaccessible amdgpu 0000:03:00.0: Unable to change power state from D3cold to D0, device inaccessible [drm] PCIE GART of 512M enabled (table at 0x00000080FEE00000). [drm] PSP is resuming... [drm:psp_hw_start [amdgpu]] *ERROR* PSP create ring failed! [drm:psp_resume [amdgpu]] *ERROR* PSP resume failed [drm:amdgpu_device_fw_loading [amdgpu]] *ERROR* resume of IP block failed -62 amdgpu 0000:03:00.0: amdgpu: amdgpu_device_ip_resume failed (-62). snd_hda_intel 0000:03:00.1: Enabling via vga_switcheroo snd_hda_intel 0000:03:00.1: Unable to change power state from D3cold to D0, device inaccessible snd_hda_intel 0000:03:00.1: CORB reset timeout#2, CORBRP = 65535 snd_hda_codec_hdmi hdaudioC0D0: Unable to sync register 0x2f0d00. -5 There are some acpi methods (PWRD, PWG1 [4, 5]) that macOS calls when changing the amdgpu's power state, but we don't use them and that could be a cause. Additionally unlike previous generation Macbooks which work better, on MacBookPro16,1 the gpu is located behind 2 pci bridges: 01:00.0 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] Navi 10 XL Upstream Port of PCI Express Switch (rev 43) 02:00.0 PCI bridge: Advanced Micro Devices, Inc. [AMD/ATI] Navi 10 XL Downstream Port of PCI Express Switch 03:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Navi 14 [Radeon RX 5500/5500M / Pro 5500M] (rev 43) 03:00.1 Audio device: Advanced Micro Devices, Inc. [AMD/ATI] Navi 10 HDMI Audio Upon attempting to power on the gpu with vga_switcheroo, all these devices except 01:00.0 have their config space filled with 1s. Rescanning pci makes the config space of all the devices go back to normal, however amdgpu still fails to resume with the same logs as above. [1]: https://lore.kernel.org/all/3AFB9142-2BD0-46F9-AEA9-C9C5D13E68E6@live.com/ [2]: https://lore.kernel.org/platform-driver-x86/20230210044826.9834-1-orlandoch.dev@gmail.com/ [3]: https://lore.kernel.org/all/9eed8ede6f15a254ad578e783b050e1c585d5a15.1439288957.git.lukas@wunner.de/ [4]: https://gist.github.com/Redecorating/6c7136b7a4ac7ce3b77d8e41740dd87b [5]: https://lore.kernel.org/all/20120710160555.GA31562@srcf.ucam.org/ Orlando Chamberlain (5): apple-gmux: use first bit to check switch state apple-gmux: refactor gmux types apple-gmux: Use GMSP acpi method for interrupt clear apple-gmux: support MMIO gmux on T2 Macs apple-gmux: add debugfs interface drivers/platform/x86/apple-gmux.c | 361 ++++++++++++++++++++++++++---- include/linux/apple-gmux.h | 52 +++-- 2 files changed, 349 insertions(+), 64 deletions(-)