** Description changed:
[Impact]
The functional change is negligible - the primary goal here is to align our
tree closer to upstream to make future backports cleaner (and therefore safer).
We are currently carrying 61 SAUCE patches for the hns3 driver. All but
6 of these have gone upstream in some form. In one case, the upstream
patch corrected a mistake in the SAUCE counterpart:
e22b531b5889d UBUNTU: SAUCE: {topost} net: hns3: modify hnae_ to hnae3_
While it purports to just be a symbol rename, it also made the following
change (the test_bit() addition), which I've verified with upstream is
incorrect:
@@ -2703,7 +2703,8 @@ static int hclge_reset_wait(struct hclge_dev *hdev)
- }
-
- val = hclge_read_dev(&hdev->hw, reg);
+ }
+
+ val = hclge_read_dev(&hdev->hw, reg);
- while (hnae_get_bit(val, reg_bit) && cnt < HCLGE_RESET_WAIT_CNT) {
+ while (hnae3_get_bit(val, reg_bit) && cnt < HCLGE_RESET_WAIT_CNT &&
+ test_bit(HCLGE_STATE_RST_HANDLING, &hdev->state)) {
- msleep(HCLGE_RESET_WATI_MS);
- val = hclge_read_dev(&hdev->hw, reg);
- cnt++;
-
+ msleep(HCLGE_RESET_WATI_MS);
+ val = hclge_read_dev(&hdev->hw, reg);
+ cnt++;
In addition, several of the patches have changed in non-functional ways
(whitespace, comments, commit messages, etc). This will likely prevent
future patches from cherry-picking cleanly and, in the case of commit
messages, obfuscate which fixes we already have.
[Test Case]
1) git diff, to make sure delta after includes only the test_bit() correction
and non-functional changes.
2) Functional test on D06 hardware (the only impacted platform).
[Fix]
Revert all the SAUCE patches that have countparts upstream, and apply the
upstream cherry-picks instead.
[Regression Risk]
The git diff from before and after this series clearly shows only the one
correction and the various cosmetic changes.
** Summary changed:
- Replace hns3 SAUCE patches with upstream
+ Reconcile hns3 SAUCE patches with upstream
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1787477
Title:
Reconcile hns3 SAUCE patches with upstream
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1787477/+subscriptions
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
