From: Yehezkel Bernat <yehezkelshb@gmail.com>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Andreas Noever <andreas.noever@gmail.com>,
Michael Jamet <michael.jamet@intel.com>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>, Lukas Wunner <lukas@wunner.de>,
Mario Limonciello <Mario.Limonciello@dell.com>,
Anthony Wong <anthony.wong@canonical.com>,
linux-acpi@vger.kernel.org
Subject: Re: [PATCH 2/8] thunderbolt: Move NVM upgrade support flag to struct icm
Date: Fri, 5 Jul 2019 13:52:49 +0300 [thread overview]
Message-ID: <CA+CmpXt5q93e2TQJzfY4afSEMPWijPU+Ks+cgrVDVqUM4=y3Cw@mail.gmail.com> (raw)
In-Reply-To: <20190705095800.43534-3-mika.westerberg@linux.intel.com>
On Fri, Jul 5, 2019 at 12:58 PM Mika Westerberg
<mika.westerberg@linux.intel.com> wrote:
>
> @@ -1913,12 +1915,7 @@ static int icm_start(struct tb *tb)
> if (IS_ERR(tb->root_switch))
> return PTR_ERR(tb->root_switch);
>
> - /*
> - * NVM upgrade has not been tested on Apple systems and they
> - * don't provide images publicly either. To be on the safe side
> - * prevent root switch NVM upgrade on Macs for now.
> - */
> - tb->root_switch->no_nvm_upgrade = x86_apple_machine;
> + tb->root_switch->no_nvm_upgrade = !icm->can_upgrade_nvm;
> tb->root_switch->rpm = icm->rpm;
>
> ret = tb_switch_add(tb->root_switch);
> @@ -2021,6 +2018,7 @@ struct tb *icm_probe(struct tb_nhi *nhi)
> switch (nhi->pdev->device) {
> case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI:
> case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI:
> + icm->can_upgrade_nvm = true;
> icm->is_supported = icm_fr_is_supported;
> icm->get_route = icm_fr_get_route;
> icm->save_devices = icm_fr_save_devices;
> @@ -2038,6 +2036,13 @@ struct tb *icm_probe(struct tb_nhi *nhi)
> case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_NHI:
> case PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_NHI:
> icm->max_boot_acl = ICM_AR_PREBOOT_ACL_ENTRIES;
> + /*
> + * NVM upgrade has not been tested on Apple systems and
> + * they don't provide images publicly either. To be on
> + * the safe side prevent root switch NVM upgrade on Macs
> + * for now.
> + */
> + icm->can_upgrade_nvm = !x86_apple_machine;
> icm->is_supported = icm_ar_is_supported;
> icm->cio_reset = icm_ar_cio_reset;
> icm->get_mode = icm_ar_get_mode;
> @@ -2054,6 +2059,7 @@ struct tb *icm_probe(struct tb_nhi *nhi)
> case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_NHI:
> case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_NHI:
> icm->max_boot_acl = ICM_AR_PREBOOT_ACL_ENTRIES;
> + icm->can_upgrade_nvm = true;
Shouldn't this be also !x86_apple_machine just like AR?
(For FR, we don't use ICM on Apple machines, as much as I remember, so it's fine
to enable it there unconditionally for ICM code path.)
> icm->is_supported = icm_ar_is_supported;
> icm->cio_reset = icm_tr_cio_reset;
> icm->get_mode = icm_ar_get_mode;
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-07-05 10:53 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-05 9:57 [PATCH 0/8] thunderbolt: Intel Ice Lake support Mika Westerberg
2019-07-05 9:57 ` [PATCH 1/8] thunderbolt: Correct path indices for PCIe tunnel Mika Westerberg
2019-07-05 9:57 ` [PATCH 2/8] thunderbolt: Move NVM upgrade support flag to struct icm Mika Westerberg
2019-07-05 10:52 ` Yehezkel Bernat [this message]
2019-07-05 10:58 ` Mika Westerberg
2019-07-09 15:11 ` Mario.Limonciello
2019-08-05 13:15 ` Mika Westerberg
2019-07-05 9:57 ` [PATCH 3/8] thunderbolt: Use 32-bit writes when writing ring producer/consumer Mika Westerberg
2019-07-05 11:09 ` Yehezkel Bernat
2019-07-05 11:24 ` Mika Westerberg
2019-07-05 16:04 ` David Laight
2019-08-07 16:13 ` Mika Westerberg
2019-08-07 16:22 ` David Laight
2019-08-07 16:36 ` 'Mika Westerberg'
2019-08-07 16:41 ` David Laight
2019-08-08 9:57 ` 'Mika Westerberg'
2019-08-12 9:01 ` David Laight
2019-07-05 9:57 ` [PATCH 4/8] thunderbolt: Do not fail adding switch if some port is not implemented Mika Westerberg
2019-07-05 9:57 ` [PATCH 5/8] thunderbolt: Hide switch attributes that are not set Mika Westerberg
2019-07-05 9:57 ` [PATCH 6/8] thunderbolt: Expose active parts of NVM even if upgrade is not supported Mika Westerberg
2019-07-05 9:57 ` [PATCH 7/8] thunderbolt: Add support for Intel Ice Lake Mika Westerberg
2019-07-05 14:44 ` Yehezkel Bernat
2019-07-05 14:51 ` Mika Westerberg
2019-07-05 15:02 ` Yehezkel Bernat
2019-08-04 18:25 ` Lukas Wunner
2019-08-05 14:16 ` Mika Westerberg
2019-07-05 9:58 ` [PATCH 8/8] ACPI / property: Add two new Thunderbolt property GUIDs to the list Mika Westerberg
2019-07-09 8:18 ` Rafael J. Wysocki
2019-07-05 10:33 ` [PATCH 0/8] thunderbolt: Intel Ice Lake support Mika Westerberg
2019-07-05 14:56 ` Yehezkel Bernat
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+CmpXt5q93e2TQJzfY4afSEMPWijPU+Ks+cgrVDVqUM4=y3Cw@mail.gmail.com' \
--to=yehezkelshb@gmail.com \
--cc=Mario.Limonciello@dell.com \
--cc=andreas.noever@gmail.com \
--cc=anthony.wong@canonical.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).