From patchwork Fri Mar 3 11:28:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orlando Chamberlain X-Patchwork-Id: 6076 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp361112wrd; Fri, 3 Mar 2023 03:37:26 -0800 (PST) X-Google-Smtp-Source: AK7set/8qYl6JpAwoXpu1N8v12X2Ll04V4EP4BZHp+JuV0yCjjHE9WWvkZQTdDDHTUbiBI9U69h2 X-Received: by 2002:a05:6a20:9147:b0:cc:d386:ec1b with SMTP id x7-20020a056a20914700b000ccd386ec1bmr4869624pzc.12.1677843445919; Fri, 03 Mar 2023 03:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677843445; cv=none; d=google.com; s=arc-20160816; b=uEuVfWKBmvEo8gqnvFOkH5fqHRRIdW7olH4tLC20CXJvdud+z5IptQBPkJ6mFrp6Fa E7n8BhorC0VXUkGJP/Bji5ll6Qo+haWVtq4Gf75oYjSVSi7DnSZk2KrF7DkH8VnbJiDW fRHSSJT7y3MXSU09Ub2cvCx4eHc56HmnwXP/ancGV16HOJRasMH1gO7zLDctzFbo/7EB 5xBzezo0B6pjTNBF5EgsS5LhpqAo/bUf+ACOYjmFJX6xkT0CuxhRgRgfUftzJ+nJ4KHu 9EaF+IPvuLPoU3ekwiMOFyIpLnJJgShXoKxJ6955ws8r5W960M6NtWR8wMmZYsheEq2J DjdA== 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=7Jwulz43qSqRAg3Hz4KUPdCaEn1N/UKdr4QvHFAQ7G8=; b=yBIdPDDwi/oetzvzijWPzpmuuKafHjfkq3RoeOOq3znjsS/YfoITM38SFs1l+tdPaQ 1daLbYIUbiR0xipsZ9eI/iUWtBBalix7gHkuLAzi0OAg7QOG2xB4wEbnocOC4YYtbrY9 4lZI5K7JcRqTUzPvPvHuHo2quX1ANgsI3nff3zHmOyyzQiaM66i4VqOfwYUMWGI2uoJ8 XDgn/yDeHAxsMnJat2B0YJ0vsjNzIw2dAVONpfkFQcefW0ySmWMusO1GSJQWLH+7gWqV 2Ctz4srEqyjRh3Qg98PNBVwIXXiiq422bZwPbTFOikJwcjzxvMyihGhwnkZKfIpD/j9+ gzkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=C6otYZ8u; 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 b4-20020a63d304000000b00503255e8196si1781927pgg.724.2023.03.03.03.37.13; Fri, 03 Mar 2023 03:37:25 -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=C6otYZ8u; 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 S230497AbjCCLbR (ORCPT + 99 others); Fri, 3 Mar 2023 06:31:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230374AbjCCLbO (ORCPT ); Fri, 3 Mar 2023 06:31:14 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65B7910E6; Fri, 3 Mar 2023 03:30:49 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id y11so2382864plg.1; Fri, 03 Mar 2023 03:30:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677843041; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7Jwulz43qSqRAg3Hz4KUPdCaEn1N/UKdr4QvHFAQ7G8=; b=C6otYZ8u80Ulh1aprWM1QUX8OkVlgtC8QVuWg/fzlBd4l5O1pikb1TYDnIM8ykHjjs LFYhd2AXBoGABRDmr5SoY8tX+gD1KBz3EuYqQEHygI0k6LZ+Gl92muYCQRliPD9J4Wum qEpSsDDJc9+zTF/xcfKnDLdakLEDzGUz/Ivs5o16Lr+kEgwUmsZFsScR1ImaFCrERzd8 vy3P/Zoq+7rkb87IXgEA86SrqyViuEiy9WJy5Xlq9QdxrEbUMijk1O8EOEOHJeGaRw7w toyyQk1ZqkX4F4VlA8otO68SL5eAHa7iu7u2MozzPSrWqZMWuJdH0udC6+sCSejedrgN zELQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677843041; 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=7Jwulz43qSqRAg3Hz4KUPdCaEn1N/UKdr4QvHFAQ7G8=; b=7v9YzONkS7StX0XM05Xeu/N7MjsOQ+LouLCYRrBiJBAxe4+vA6tKLyYJl4zFqA7o/o s4BlS4n0cAriM03vYtGnRquqmYZD7YqkQSX/pYrWIBBrAzh3mt2ggJMUi0BQy3vVI5XU hrvC46x6QzIi+Yef172ualUlZ+w4L+5WR0DRTff9CoGAnB6ctNS292+8amKFlPxviuKx k6UC3X3ja9twxdQFejxGba4fj0MUpQqhjRcXioTj4n+/v2aYiQA7k9qvR2bgr3I/cxPo sbtp83VwrkmQPD78IX9j00ITsqqmwYHxdgYH8m5mPjGpxAiPjuQYFKQoweSTpYit2lZH LonQ== X-Gm-Message-State: AO0yUKWbAmG63KPbo5rvkRrjZJBoCJckw3hGh4m+/S2VAian7w4rxoLD zIevWLt+qqJJXySEs3ilUTWlxGUd89Y= X-Received: by 2002:a05:6a20:3caa:b0:af:7233:5bfc with SMTP id b42-20020a056a203caa00b000af72335bfcmr1472441pzj.8.1677843041564; Fri, 03 Mar 2023 03:30:41 -0800 (PST) Received: from localhost.localdomain (124-148-239-17.tpgi.com.au. [124.148.239.17]) by smtp.gmail.com with ESMTPSA id n4-20020a62e504000000b005a8c92f7c27sm1356262pff.212.2023.03.03.03.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 03:30:41 -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 v4 0/4] apple-gmux: support MMIO gmux type on T2 Macs Date: Fri, 3 Mar 2023 22:28:39 +1100 Message-Id: <20230303112842.3094-1-orlandoch.dev@gmail.com> X-Mailer: git-send-email 2.39.2 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?1758176317320362815?= X-GMAIL-MSGID: =?utf-8?q?1759346369297304919?= 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 v3[2]: - Use acpi_execute_simple_method() - Document extra info about the gmux provided by Lukas - Squash the GMSP acpi method into the support MMIO gmux commit, as we now just check if it's a MMIO gmux, not if the gmux config has a flag set. This means it's hard to seperate the two now, so making them one commit is simpler. # 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: Adds support for the MMIO based gmux on T2 macs. # 4: 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. iMacPro1,1, iMac20,1 and iMac20,2 all seem to have a gmux in their acpi tables, but they shouldn't. A check that hopefully will detect this is used, but it's untested as I don't have any of those computers. 3. 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/20230218132007.3350-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 (4): apple-gmux: use first bit to check switch state apple-gmux: refactor gmux types apple-gmux: support MMIO gmux on T2 Macs apple-gmux: add debugfs interface drivers/platform/x86/apple-gmux.c | 351 ++++++++++++++++++++++++++---- include/linux/apple-gmux.h | 70 ++++-- 2 files changed, 357 insertions(+), 64 deletions(-)