Skip to content

Fix gadget mode for bcm2835. #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2017
Merged

Conversation

ED6E0F17
Copy link

@ED6E0F17 ED6E0F17 commented Mar 9, 2017

Part Revert "Revert "usb: dwc2: gadget: fix TX FIFO size and address initialization""

This part reverts commit 3fa9538.

@pelwell
Copy link
Contributor

pelwell commented Mar 9, 2017

This commit modifies an upstream file, which we try to avoid. If the commit is also upstream then you need to reference it. You also need to say what it does and why.

@Electron752
Copy link
Contributor

Somewhat related to this, I've been sending patches for 64 bit to upstream for awhile now and I know it takes awhile to get through all the branches.

What are the requirements for getting an upstream change cherrypicked? Does it need to be in mainline or can it still be in linux-next? If mainline is a requirement, does it need to be in a branch marked stable, or would a RC version be good enough. I'm specifically talking about drivers that have an upstream version but are RPI specific.

@ED6E0F17
Copy link
Author

I think this might be a device-tree issue, so it may be possible to avoid changing the upstream file.

@ED6E0F17 ED6E0F17 force-pushed the patch30f3 branch 3 times, most recently from dcacb24 to 4565626 Compare March 11, 2017 21:49
Since commit aa381a7 was reverted with 3fa9538 the g-tx-fifo-size array in the device-tree needs to match the preset values in the bcm2835.

Resolves raspberrypi#1876
@ED6E0F17
Copy link
Author

Fixed in downstream device-tree using the values read from the hardware by the patch that was reverted upstream. ( First mentioned at https://www.spinics.net/lists/linux-usb/msg134539.html )

@pelwell
Copy link
Contributor

pelwell commented Mar 12, 2017

Does that mean you will close this PR?

@ED6E0F17
Copy link
Author

Sorry for the poor wording, what I meant was:

(I have) Fixed (this) in the Downstream device-tree.

The original patch to re-land the upstream revert has been replaced with one that only touches Downstream commits.I am not convinced that the firmware is loading arrays of integers from config.txt, so it is necessary to fix this in the kernel source.

@pelwell
Copy link
Contributor

pelwell commented Mar 12, 2017

@P33M This has morphed into a PR to modify the dwc2 overlay, changing the FIFO sizes. Does this change look correct to you?

-			g-tx-fifo-size = <256 128 128 64 64 64 32>;
+			g-tx-fifo-size = <512 512 512 512 512 768>;

@popcornmix
Copy link
Collaborator

@P33M
Copy link
Contributor

P33M commented Mar 13, 2017

Our total FIFO RAM is 4k, so the size allocations look reasonable.

@pelwell pelwell merged commit 6827b48 into raspberrypi:rpi-4.9.y Mar 13, 2017
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Mar 13, 2017
kernel: BCM270X_DT: Invert Pi3 power LED to match fw change
See: raspberrypi/linux#1879

kernel: Add support for the AudioInjector Octo sound card
See: raspberrypi/linux#1884

kernel: Fix gadget mode for bcm2835
See: raspberrypi/linux#1887

kernel: bcm2835-v4l2: Fix buffer overflow problem
See: raspberrypi/linux#1890

kernel: Add support for Fe-Pi audio sound card
See: raspberrypi/linux#1867

kernel: BCM270X_DT: Flip the polarity of the CM3's HDMI HPD
See: raspberrypi/linux#1869

kernel: Add overlay for ads1115 ADCs
See: raspberrypi/linux#1864

kernel: config: Add CONFIG_CRYPTO_LZ4
See: raspberrypi/linux#1875

kernel: clk-bcm2835: Read max core clock from firmware

firmware: GPIO expander: rework so the mailbox service reads raw values
firmware: arm_loader: Check GPIO direction for low_voltage
See: raspberrypi/linux#1879

firmware: warnings: Fix some mostly spurious warnings

firmware: clock: Calculate PLL multipliers with more precision
firmware: Set up HDMI VCO same for VEC as for HDMI

firmeare: gpu_server: Move detailed logging to LOGGING_VMCS_VERBOSE category
popcornmix added a commit to Hexxeh/rpi-firmware that referenced this pull request Mar 13, 2017
kernel: BCM270X_DT: Invert Pi3 power LED to match fw change
See: raspberrypi/linux#1879

kernel: Add support for the AudioInjector Octo sound card
See: raspberrypi/linux#1884

kernel: Fix gadget mode for bcm2835
See: raspberrypi/linux#1887

kernel: bcm2835-v4l2: Fix buffer overflow problem
See: raspberrypi/linux#1890

kernel: Add support for Fe-Pi audio sound card
See: raspberrypi/linux#1867

kernel: BCM270X_DT: Flip the polarity of the CM3's HDMI HPD
See: raspberrypi/linux#1869

kernel: Add overlay for ads1115 ADCs
See: raspberrypi/linux#1864

kernel: config: Add CONFIG_CRYPTO_LZ4
See: raspberrypi/linux#1875

kernel: clk-bcm2835: Read max core clock from firmware

firmware: GPIO expander: rework so the mailbox service reads raw values
firmware: arm_loader: Check GPIO direction for low_voltage
See: raspberrypi/linux#1879

firmware: warnings: Fix some mostly spurious warnings

firmware: clock: Calculate PLL multipliers with more precision
firmware: Set up HDMI VCO same for VEC as for HDMI

firmeare: gpu_server: Move detailed logging to LOGGING_VMCS_VERBOSE category
@ED6E0F17 ED6E0F17 deleted the patch30f3 branch March 16, 2017 19:10
@popcornmix popcornmix mentioned this pull request Mar 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants